[Pkg-cyrus-sasl2-commits] r483 - in /cyrus-sasl-2.1/branches/heimdal: ./ debian/ debian/patches/
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Sun May 24 19:45:51 UTC 2009
Author: fabbe
Date: Sun May 24 19:45:51 2009
New Revision: 483
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=483
Log:
Rebranch from main package.
Added:
cyrus-sasl-2.1/branches/heimdal/ (props changed)
- copied from r482, cyrus-sasl-2.1/tags/2.1.23.dfsg1-1/
cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.postrm
cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.preinst
cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.dirs
cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.install
cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch
Modified:
cyrus-sasl-2.1/branches/heimdal/debian/TODO
cyrus-sasl-2.1/branches/heimdal/debian/changelog
cyrus-sasl-2.1/branches/heimdal/debian/control
cyrus-sasl-2.1/branches/heimdal/debian/copyright
cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
cyrus-sasl-2.1/branches/heimdal/debian/rules
Propchange: cyrus-sasl-2.1/branches/heimdal/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: cyrus-sasl-2.1/branches/heimdal/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/TODO?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/TODO (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/TODO Sun May 24 19:45:51 2009
@@ -1,13 +1,8 @@
-General things to do:
+Perpetual TODO:
-* Move to a more current version of libdb. TEST!
-* Become more strict in handling base64 data:
- - Stop applying 0015_saslutil_decode64_fix.dpatch.
- - Watch as packages break.
- - Help fix broken packages.
-* Improve documentation.
-
-Post-etch:
-
-* Remove libsasl2-gssapi-mit transitional package.
-* Remove libsasl2-modules-gssapi-heimdal transitional package.
+ Keep this package in sync with the main package (cyrus-sasl2).
+ * Keep dependencies up to date with the main package.
+ * Port all applicable changes from the main package.
+ * Always reduce the maintenance burden by making things general so
+ that the diff between the main package and this package is as small
+ as possible.
Modified: cyrus-sasl-2.1/branches/heimdal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/changelog?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/changelog Sun May 24 19:45:51 2009
@@ -1,286 +1,164 @@
-cyrus-sasl2 (2.1.23.dfsg1-1) unstable; urgency=high
+cyrus-sasl2-heimdal (2.1.23.dfsg1-1) UNRELEASED; urgency=low
* New upstream release
- - Security fix for CVE-2009-0688 (Closes: #528749).
- - debian/patches/0020_saslauthd_manpage.dpatch: Remove, integrated
- upstream.
- - debian/rules: Change chrpath invocation to match new version number of
- libsql.so.
-
- -- Fabian Fagerholm <fabbe at debian.org> Sun, 24 May 2009 20:56:01 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-26) UNRELEASED; urgency=low
+ - Rebranch from main package to reduce diff.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Sun, 24 May 2009 22:41:59 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-26) UNRELEASED; urgency=low
* NOT RELEASED
* debian/control: Set section to debug to match override.
- -- Fabian Fagerholm <fabbe at debian.org> Sun, 10 May 2009 09:55:01 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-25) unstable; urgency=high
-
- * debian/patches/0017_db4.7.dpatch: Update db4.6 patch to db4.7.
- (Closes: #523007)
-
- -- Fabian Fagerholm <fabbe at debian.org> Sun, 10 May 2009 08:51:30 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-24) unstable; urgency=high
-
- [ Fabian Fagerholm ]
- * debian/patches/0021_no_mutex_changes_after_init.dpatch: Added patch to
- disallow mutex function changes once sasl_client_init and/or
- sasl_server_init have been called. Hand-picked and applied from upstream
- CVS revision 1.117, thanks to Eric Leblond. (Closes: #499770)
- * debian/control: Add ${misc:Depends} to applicable binary packages.
- * debian/rules, debian/libsasl2-modules, debian/libsasl2-modules-otp,
- debian/sasl2-bin: Add overrides for possible-gpl-code-linked-with-openssl
- lintian error.
- * debian/source.lintian-overrides: Add override for ancient-libtool lintian
- warning.
- * debian/sasl2-bin.postinst: Use set -e.
- * debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch: Added patch to use
- test condition for #elif preprocessor directive. Required by GCC 4.4.
- Thanks to Martin Michlmayr. (Closes: #505042)
- * debian/cyrus-sasl2-dbg.dirs, debian/cyrus-sasl2-dbg.lintian-overrides,
- debian/rules: Add override because our -dbg package is not standardly
- named.
- * debian/control: Bump libdb version to 4.7. (Closes: #523007)
- * debian/sasl2-bin.postinst: Update to reflect libdb version change.
- Not strictly necessary since there were no database format changes
- betweek 4.6 and 4.7, but in the interest of completeness...
-
- -- Fabian Fagerholm <fabbe at debian.org> Sat, 09 May 2009 22:56:52 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-23) unstable; urgency=low
-
+ -- Fabian Fagerholm <fabbe at debian.org> Sun, 10 May 2009 09:56:33 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-25) unstable; urgency=high
+
+ * Sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Sun, 10 May 2009 09:22:55 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-24) unstable; urgency=high
+
+ * Bump Standards-Version
+ * Patch from Martin Michlmayr to build with gcc 4.4 (Closes: #505054)
+ * Some cleanup based on suggestions from lintian
+ * Sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Sat, 09 May 2009 23:09:57 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-23) unstable; urgency=high
+
+ * Make binary packages binNMU safe (Closes: #496837)
* Add README.source to comply with Standards-Version 3.8.0
* Fix watch file to use dversionmangle instead of uversionmangle
- -- Roberto C. Sanchez <roberto at connexer.com> Mon, 01 Sep 2008 11:05:12 -0400
-
-cyrus-sasl2 (2.1.22.dfsg1-22) unstable; urgency=low
+ -- Roberto C. Sanchez <roberto at connexer.com> Mon, 01 Sep 2008 11:32:31 -0400
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-22) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * Bump standards-version.
+ * Sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Sat, 02 Aug 2008 16:08:58 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-21) unstable; urgency=high
+
+ [ Fabian Fagerholm ]
+ * Sync with main package (urgency=high).
[ Roberto C. Sanchez ]
- * Added Slovak translation, thanks to Ivan Masár (Closes: #489268)
-
- [ Fabian Fagerholm ]
- * Added Japanese translation, thanks to Hideki Yamane. (Closes: #493004)
- * Bump standards-version.
-
- -- Fabian Fagerholm <fabbe at debian.org> Sat, 02 Aug 2008 15:57:11 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-21) unstable; urgency=high
-
- [ Fabian Fagerholm ]
- * Add Basque translation, thanks to Piarres Beobide. (Closes: #481541)
- * Install README.Debian into libsasl2-2 package. (Closes: #485289)
-
- [ Roberto C. Sanchez ]
- * Remove bashism from debian/rules. (Closes: #484374)
+ * Remove bashism from debian/rules.
* Add Homepage field to debian/control.
- -- Fabian Fagerholm <fabbe at debian.org> Mon, 09 Jun 2008 21:27:23 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-20) unstable; urgency=high
-
- [ Fabian Fagerholm ]
- * debian/sasl2-bin.saslauthd.default, debian/sasl2-bin.README.Debian:
- Include warnings about running saslauthd with the -d option.
- (Closes: #474311)
- * debian/control: Adjust priorities to be consistent and policy-compliant.
- (Closes: #471534)
- * debian/rules: Remove generated man pages in clean target. (Partial sync
- with Ubuntu.)
- * debian/sasl2-bin.saslauthd.init: Remove bashism in init script.
- (Closes: #480613) Urgency set to high because of lenny release goal to
- make dash the default /bin/sh.
-
- -- Fabian Fagerholm <fabbe at debian.org> Tue, 13 May 2008 22:28:11 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-19) unstable; urgency=low
-
- [ Fabian Fagerholm ]
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 09 Jun 2008 21:41:26 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-20) unstable; urgency=high
+
+ [ Fabian Fagerholm ]
+ * Confirm policy-compliant and consistent priorities. (Closes: #471535)
+ * Sync with main package (urgency=high).
+
+ -- Fabian Fagerholm <fabbe at debian.org> Tue, 13 May 2008 22:19:47 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-19) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * debian/patches/0015_saslutil_decode64_fix.dpatch, debian/patches/00list:
+ Don't allow trailing CR/LF/CRLF in base64 data.
* debian/patches/00options, debian/patches/00list: Don't apply symbol
- versioning patch when building under ppc64. (Closes: #327479)
- * debian/control: Lower priority of -modules-gssapi-mit package to extra,
- because it conflicts with the -modules-gssapi-heimdal package. (Policy
- section 2.5.)
- * debian/patches/0015_saslutil_decode64_fix.dpatch, debian/patches/00list:
- Don't allow trailing CR/LF/CRLF in base64 data. (Closes: #431191)
+ versioning patch when building under ppc64.
* debian/control: Don't build-depend on -1 revisions.
- * debian/cyrus-sasl2-doc.doc-base: Adjust section.
[ Roberto C. Sanchez ]
* debian/repack.sh: Automate repackaging of DFSG-compliant tarball
- -- Fabian Fagerholm <fabbe at debian.org> Tue, 18 Mar 2008 20:04:21 +0200
-
-cyrus-sasl2 (2.1.22.dfsg1-18) unstable; urgency=high
+ -- Fabian Fagerholm <fabbe at debian.org> Tue, 18 Mar 2008 20:25:24 +0200
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-18) unstable; urgency=low
[ Fabian Fagerholm ]
* debian/control: We conform to 3.7.3.0 of the Debian policy.
* debian/control: Change Vcs-Browser to point to human-readable interface.
- * debian/patches/0018_auth_rimap_quotes.dpatch: Upstream fix for potential
- DoS attack through infinite loop. (Closes: #465561)
- * debian/patches/0019_ldap_deprecated.dpatch: Signal the use of deprecated
- LDAP functions to avoid implicit pointer conversion. (Closes: #463330)
- * debian/sasl2-bin.saslauthd.init: Eliminate bashism and use consistent
- comparison operators throughout. (Closes: #465355)
- * debian/sasl2-bin.postinst: Call db_stop to avoid hangs when starting
- saslauthd. (Closes: #459762)
- * debian/sasl2-bin.config: Don't call db_reset -- if the user has already
- seen the backup question, we don't ask again. (Closes: #464103)
- * debian/patches/0020_saslauthd_manpage.dpatch: Correct typos in saslauthd
- man page. Thanks to Thijs Kinkhorst. (Closes: #463016)
- * Add Dutch translation. (Closes: #465665)
- * debian/sasl2-bin.saslauthd.init: Remove S runlevel from Default-Stop.
+ * Version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 18 Feb 2008 17:42:03 +0200
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-17) unstable; urgency=low
[ Roberto C. Sanchez ]
- * Add Swedish translation (Closes: #460496)
-
- -- Fabian Fagerholm <fabbe at debian.org> Mon, 18 Feb 2008 15:37:12 +0200
-
-cyrus-sasl2 (2.1.22.dfsg1-17) unstable; urgency=low
+ * debian/control: Add Vcs-Broswer and Vcs-Svn tags.
+
+ [ Fabian Fagerholm ]
+ * Version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 07 Jan 2008 19:12:13 +0200
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-16) unstable; urgency=low
+
+ * debian/control: versioned depends update automatically (Closes: #446965)
+ * Version sync with main package.
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Sat, 20 Oct 2007 13:14:47 -0400
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-15) unstable; urgency=low
[ Roberto C. Sanchez ]
- * debian/control: Add Vcs-Browser and Vcs-Svn tags.
- * Add Patrick Koetter's saslfinger utility to the package.
- * debian/cyrus-sasl2-doc.doc-base: add file
-
- [ Fabian Fagerholm ]
- * debian/control, debian/patches/0017_db4.6.dpatch,
- debian/sasl2-bin.postinst: Build against libdb4.6. Thanks to Martin Pitt
- for the suggestion and patch. (Closes: #458861)
- * debian/rules: Install saslfinger directly since we have better control
- to do it in the build scripts.
- * debian/sasl2-bin.lintian-overrides: Remove unneeded overrides.
-
- -- Fabian Fagerholm <fabbe at debian.org> Mon, 07 Jan 2008 18:20:50 +0200
-
-cyrus-sasl2 (2.1.22.dfsg1-16) unstable; urgency=low
-
- * Debconf templates and debian/control reviewed by the debian-l10n-
- english team as part of the Smith review project.
- (Closes: #444377, #447176)
- * [Debconf translation updates]
- * Portuguese. (Closes: #445045)
- * Vietnamese. (Closes: #445130)
- * Galician. (Closes: #445199)
- * Tamil. (Closes: #445251)
- * German. (Closes: #442889, #445559)
- * Finnish. (Closes: #445847)
- * Brazilian Portuguese. (Closes: #446144)
- * Italian. (Closes: #446157)
- * Russian. (Closes: #446655)
- * Czech. (Closes: #446787)
- * French. (Closes: #447118)
- * Spanish.
- * debian/control: versioned depends update automatically
-
- -- Roberto C. Sanchez <roberto at connexer.com> Sat, 20 Oct 2007 13:15:28 -0400
-
-cyrus-sasl2 (2.1.22.dfsg1-15) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/sasl2-bin.saslauthd.init: allow running with NAME variable unset.
- (Closes: #436440, #436726)
- * debian/sasl2-bin.saslauthd.default: better in-file documentation.
- * debian/sasl2-bin.README.Debian: document what happens if you don't set
- the NAME variable.
+ * debian/rules: Cleanup lintian warnings and remove extra commands
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Fri, 7 Sep 2007 22:37:43 -0400
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-14) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * Version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Mon, 6 Aug 2007 09:27:57 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-13) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * debian/control: lower priority of the package to extra, because the
+ modules package depends on libroken16-heimdal, which is priority: extra.
+ * debian/rules: Merge from cyrus-sasl2. This fixes the build-twice
+ problem. See also: #424169. (Closes: #424168)
+
+ -- Fabian Fagerholm <fabbe at debian.org> Fri, 13 Jul 2007 13:28:15 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-12) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * Merge from main package; correctly version-sync on version -12 of the
+ main package. (Closes: #428041)
+
+ -- Fabian Fagerholm <fabbe at debian.org> Fri, 8 Jun 2007 13:09:02 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-11) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * Merge from main package; version sync with main package.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Thu, 7 Jun 2007 14:37:21 +0300
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-10) unstable; urgency=high
+
+ [ Fabian Fagerholm ]
+ * debian/control: use ${binary:Version} instead of ${Source-Version}.
[ Roberto C. Sanchez ]
- * debian/po/es.po: add
- * debian/po/fr.po: add, thanks to Vincent Bernat (Closes: #433371)
- * debian/po/pt.po: add, thanks to Américo Monteiro (Closes: #436556)
- * debian/po/de.po: add, thanks to Helge Kreutzmann (Closes: #438719)
- * debian/po/pt_BR.po: add, thanks to Jefferson Alexandre (Closes: #439132)
- * debian/rules: Cleanup lintian warnings
-
- -- Roberto C. Sanchez <roberto at connexer.com> Fri, 7 Sep 2007 22:30:01 -0400
-
-cyrus-sasl2 (2.1.22.dfsg1-14) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/control, debian/sasl2-bin.templates, debian/sasl2-bin.postinst,
- debian/po/templates.pot, debian/sasl2-bin.config: Build against libdb4.4.
- Upgrade the database format of /etc/sasldb2 on package upgrade. There is
- no support for automatic downgrade. (Closes: #354413, #421940)
- * debian/sasl2-bin.postinst: when creating an empty sasldb file, check for
- existence, not that it is a regular file.
- * debian/po/templates.pot: update translations template.
-
- -- Fabian Fagerholm <fabbe at debian.org> Mon, 6 Aug 2007 09:16:21 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-13) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/control, debian/sasl2-bin.templates, debian/po: make Debconf
- templates translatable. (Closes: #428048)
- * debian/rules, debian/control, debian/sasl-sample-client.sgml,
- debian/sasl-sample-server.sgml: Introduce man pages for
- sasl-sample-client and sasl-sample-server.
- * debian/rules: Allow the package to be built twice. The upstream build
- system cannot properly clean the source tree after a build, but this
- at least allows another build to be performed even though the tree is
- not exactly the same (some generated files are left, but they would be
- regenerated anyway). (Closes: #424169)
-
- -- Fabian Fagerholm <fabbe at debian.org> Fri, 13 Jul 2007 11:54:56 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-12) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/sasl2-bin.README.Debian: Small improvement to multi-init docs.
- * debian/control, debian/README.Debian: Change the wording regarding the
- need to install the modules packages, since they are not needed on all
- systems but are needed especially on servers that provide SASL
- authentication.
- * debian/control, debian/sasl2-bin.templates, debian/sasl2-bin.postinst,
- debian/rules, debian/sasl2-bin.postrm: Introduce Debconf prompt to ask
- for permission to remove /etc/sasldb2 on package purge, with fallback
- to not remove it when Debconf is not present. (Closes: #333416)
- * debian/sasl2-bin.postinst: Before creating the statoverride for the run
- directory, create it -- but only if the statoverride wasn't present
- already. The init script will recreate the directory if it's not there.
-
- -- Fabian Fagerholm <fabbe at debian.org> Fri, 8 Jun 2007 12:57:11 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-11) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/sasl2-bin.saslauthd.init: Complete rewrite to allow managing
- multiple saslauthd instances with a single init script. (Closes: #320377)
- * debian/sasl2-bin.saslauthd.default: Adjust main default file to new
- init script requirements.
- * debian/sasl2-bin.README.Debian: Document the new init script setup for
- sysadmins.
-
- -- Fabian Fagerholm <fabbe at debian.org> Thu, 7 Jun 2007 13:37:51 +0300
-
-cyrus-sasl2 (2.1.22.dfsg1-10) unstable; urgency=high
-
- [ Fabian Fagerholm ]
- * debian/control: lower priority of libsasl2-modules to optional.
- * debian/control: make libsasl2-modules suggest either the MIT or Heimdal
- GSSAPI module.
- * debian/control: change ${Source-Version} into ${binary:Version} to
- ensure that we are up to date with current practise and are binNMU-safe.
-
- [ Roberto C. Sanchez ]
- * Urgency set to high to synchronize migration with cyrus-sasl2-heimdal.
-
- -- Roberto C. Sanchez <roberto at connexer.com> Thu, 10 May 2007 20:03:45 -0400
-
-cyrus-sasl2 (2.1.22.dfsg1-9) unstable; urgency=low
-
- [ Fabian Fagerholm ]
- * debian/rules: allow turning off SQL, LDAP and GSSAPI at build time,
- to ease bootstrapping new architectures (Closes: #404268).
- * debian/control: lower priority of libsasl2 to optional (Closes: #416561).
- * debian/control: remove transitional packages, conflict with Heimdal
- GSSAPI package.
- * debian/control: build-conflict with heimdal-dev.
-
- -- Fabian Fagerholm <fabbe at debian.org> Fri, 20 Apr 2007 19:30:20 +0300
+ * Add diversion on /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22
+ (Closes: #423145)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 10 May 2007 20:03:15 -0400
+
+cyrus-sasl2-heimdal (2.1.22.dfsg1-9) unstable; urgency=low
+
+ [ Fabian Fagerholm ]
+ * Introduce new source package to build Heimdal version of GSSAPI
+ module (Closes: #419420).
+
+ -- Fabian Fagerholm <fabbe at debian.org> Fri, 20 Apr 2007 18:01:48 +0300
cyrus-sasl2 (2.1.22.dfsg1-8) unstable; urgency=high
Modified: cyrus-sasl-2.1/branches/heimdal/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/control?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/control (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/control Sun May 24 19:45:51 2009
@@ -1,146 +1,36 @@
-Source: cyrus-sasl2
+Source: cyrus-sasl2-heimdal
Section: libs
-Priority: important
+Priority: extra
Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel at lists.alioth.debian.org>
Uploaders: Fabian Fagerholm <fabbe at debian.org>, Roberto C. Sanchez <roberto at connexer.com>
-Standards-Version: 3.8.0.0
-Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.7-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), libkrb5-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man
-Build-Conflicts: heimdal-dev
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.7-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), heimdal-dev, libsqlite0-dev (>= 2.8.16), libldap2-dev (>= 2.1.30-8), chrpath, groff-base
+Build-Conflicts: libkrb5-dev
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/
Homepage: http://asg.web.cmu.edu/sasl/sasl-library.html
-Package: sasl2-bin
-Section: utils
-Priority: optional
+Package: libsasl2-modules-gssapi-heimdal
Architecture: any
-Depends: libsasl2-2 (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), db4.7-util, debconf (>= 1.4.69) | cdebconf (>= 0.39)
-Description: Cyrus SASL - administration programs for SASL users database
+Depends: libsasl2-modules (>= ${source:Version}), libsasl2-modules (<< ${source:Version}.), ${shlibs:Depends}
+Conflicts: libsasl2-modules-gssapi-mit
+Description: Pluggable Authentication Modules for SASL (GSSAPI)
This is the Cyrus SASL API implementation, version 2.1. See package
libsasl2-2 and RFC 2222 for more information.
.
- This package contains administration programs for the SASL users
- database and common binary files for plugin modules.
-
-Package: cyrus-sasl2-doc
-Section: doc
-Priority: optional
-Architecture: all
-Depends: ${misc:Depends}
-Description: Cyrus SASL - documentation
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package contains documentation for system administrators.
-
-Package: libsasl2-2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: postfix (<< 2.3.4-3), libsasl2-gssapi-mit (<< 2.1.22), libsasl2-krb4-mit (<< 2.1.22)
-Recommends: libsasl2-modules (= ${binary:Version})
-Replaces: libsasl2
-Description: Cyrus SASL - authentication abstraction library
- This is the Cyrus SASL API implementation, version 2.1.
- .
- SASL is the Simple Authentication and Security Layer, a method for
- adding authentication support to connection-based protocols. To use
- SASL, a protocol includes a command for identifying and
- authenticating a user to a server and for optionally negotiating
- protection of subsequent protocol interactions. If its use is
- negotiated, a security layer is inserted between the protocol and the
- connection. See RFC 2222 for more information.
- .
- Any of: ANONYMOUS, CRAM-MD5, DIGEST-MD5, GSSAPI (MIT or Heimdal
- Kerberos 5), NTLM, OTP, PLAIN, or LOGIN can be used. If you intend to
- use this package on a server that provides SASL authentication, then
- you must install some of the libsasl2-modules* packages.
-
-Package: libsasl2-modules
-Section: libs
-Priority: optional
-Architecture: any
-Depends: libsasl2-2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: libsasl2-modules-otp, libsasl2-modules-ldap, libsasl2-modules-sql, libsasl2-modules-gssapi-mit | libsasl2-modules-gssapi-heimdal
-Description: Cyrus SASL - pluggable authentication modules
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the following SASL modules: LOGIN, PLAIN, ANONYMOUS,
- NTLM, CRAM-MD5, and DIGEST-MD5 (with DES support).
-
-Package: libsasl2-modules-ldap
-Section: libs
-Priority: extra
-Architecture: any
-Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Cyrus SASL - pluggable authentication modules (LDAP)
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the LDAP plugin, which supports OpenLDAP.
-
-Package: libsasl2-modules-otp
-Section: libs
-Priority: extra
-Architecture: any
-Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libsasl2-modules (<< 2.1.22~)
-Description: Cyrus SASL - pluggable authentication modules (OTP)
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the OTP plugin, which supports one time passwords.
-
-Package: libsasl2-modules-sql
-Section: libs
-Priority: extra
-Architecture: any
-Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Cyrus SASL - pluggable authentication modules (SQL)
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the SQL plugin, which supports MySQL, PostgreSQL
- and SQLite.
-
-Package: libsasl2-modules-gssapi-mit
-Section: libs
-Priority: extra
-Architecture: any
-Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libsasl2-modules-gssapi-heimdal
-Description: Cyrus SASL - pluggable authentication modules (GSSAPI)
- This is the Cyrus SASL API implementation, version 2.1. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package provides the GSSAPI plugin, compiled with the MIT
+ This package provides the GSSAPI plugin, compiled with the Heimdal
Kerberos 5 library.
-Package: libsasl2-dev
-Section: libdevel
+Package: cyrus-sasl2-heimdal-dbg
+Section: debug
Architecture: any
-Priority: optional
-Depends: libsasl2-modules (= ${binary:Version}), libc6-dev, ${misc:Depends}
-Conflicts: libsasl2-2-dev
-Replaces: libsasl2-2-dev
-Description: Cyrus SASL - development files for authentication abstraction library
+Depends: cyrus-sasl2-dbg (>= ${source:Version}), cyrus-sasl2-dbg (<< ${source:Version}.), libsasl2-modules-gssapi-heimdal (= ${binary:Version})
+Description: Debugging symbols for Cyrus SASL
This is the Cyrus SASL API implementation, version 2. See package
libsasl2-2 and RFC 2222 for more information.
.
- This package includes development files for compiling programs with SASL
- support. It is needed for development purposes only.
-
-Package: cyrus-sasl2-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: libsasl2-2 (= ${binary:Version}), ${misc:Depends}
-Description: Cyrus SASL - debugging symbols
- This is the Cyrus SASL API implementation, version 2. See package
- libsasl2-2 and RFC 2222 for more information.
- .
- This package contains the debugging symbols for all Cyrus SASL packages.
- The debugging symbols can be useful when investigating crashes in the SASL
- library or tools. You may be asked to install this package if you encounter
- such a crash.
+ This package contains the debugging symbols for the Cyrus SASL Heimdal
+ GSSAPI modules package (libsasl2-modules-gssapi-heimdal). The debugging
+ symbols can be useful when investigating crashes in the SASL library or
+ tools. You may be asked to install this package if you encounter such a
+ crash.
Modified: cyrus-sasl-2.1/branches/heimdal/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/copyright?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/copyright (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/copyright Sun May 24 19:45:51 2009
@@ -47,18 +47,3 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
-The saslfinger utility was downloaded from
-http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
-
-The following copyright and license terms apply:
-
-Copyright © 2004 Patrick Koetter
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or (at
-your option) any later version.
-
-On Debian systems, the complete text of the GNU General Public License,
-version 3, can be found in /usr/share/common-licenses/GPL-3.
Added: cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.postrm
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.postrm?rev=483&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.postrm (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.postrm Sun May 24 19:45:51 2009
@@ -1,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ remove = "$1" ]; then
+ dpkg-divert --package cyrus-sasl2-heimdal-dbg --rename --remove /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22
+fi
+
Added: cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.preinst
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.preinst?rev=483&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.preinst (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/cyrus-sasl2-heimdal-dbg.preinst Sun May 24 19:45:51 2009
@@ -1,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ install = "$1" ]; then
+ dpkg-divert --package cyrus-sasl2-heimdal-dbg --divert /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22.mit --rename /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.22
+fi
+
Added: cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.dirs
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.dirs?rev=483&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.dirs (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.dirs Sun May 24 19:45:51 2009
@@ -1,0 +1,1 @@
+usr/lib/sasl2
Added: cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.install?rev=483&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.install (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/libsasl2-modules-gssapi-heimdal.install Sun May 24 19:45:51 2009
@@ -1,0 +1,1 @@
+usr/lib/sasl2/libgssapiv2.*
Added: cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch?rev=483&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch (added)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/0021_build_with_gcc44.dpatch Sun May 24 19:45:51 2009
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0021_build_with_gcc44.dpatch by <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build with gcc 4.4
+
+ at DPATCH@
+
+Index: heimdal/plugins/digestmd5.c
+===================================================================
+--- heimdal/plugins/digestmd5.c (revision 409)
++++ heimdal/plugins/digestmd5.c (working copy)
+@@ -2715,7 +2715,7 @@
+ "DIGEST-MD5", /* mech_name */
+ #ifdef WITH_RC4
+ 128, /* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 112,
+ #else
+ 1,
+@@ -4034,7 +4034,7 @@
+ "DIGEST-MD5",
+ #ifdef WITH_RC4 /* mech_name */
+ 128, /* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 112,
+ #else
+ 1,
Modified: cyrus-sasl-2.1/branches/heimdal/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/patches/00list?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/patches/00list Sun May 24 19:45:51 2009
@@ -18,5 +18,4 @@
0017_db4.7
0018_auth_rimap_quotes
0019_ldap_deprecated
-0021_no_mutex_changes_after_init
-0022_gcc4.4_preprocessor_syntax
+0021_build_with_gcc44
Modified: cyrus-sasl-2.1/branches/heimdal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/heimdal/debian/rules?rev=483&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/heimdal/debian/rules (original)
+++ cyrus-sasl-2.1/branches/heimdal/debian/rules Sun May 24 19:45:51 2009
@@ -118,9 +118,6 @@
rm -f lib/sasldb.c lib/db_berkeley.c lib/allockey.c lib/cram.c \
lib/digestmd5.c lib/otp.c lib/gssapi.c lib/plain.c \
lib/anonymous.c lib/login.c lib/ntlm.c lib/sql.c lib/ldapdb.c
-
- # Remove generated man pages
- -rm -f sasl-sample-client.8 sasl-sample-server.8
dh_clean
@@ -165,7 +162,6 @@
--with-pam \
--with-saslauthd=/var/run/saslauthd \
$(CONFIGURE_LDAP) \
- --with-pgsql=/usr/include/postgresql \
--with-configdir=/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
--with-devrandom=/dev/urandom
@@ -205,12 +201,6 @@
###
build-indep: build-indep-stamp
build-indep-stamp:
- # Build the sasl-sample-client and sasl-sample-server man pages.
- /usr/bin/docbook-to-man debian/sasl-sample-client.sgml \
- > sasl-sample-client.8
- /usr/bin/docbook-to-man debian/sasl-sample-server.sgml \
- > sasl-sample-server.8
-
touch build-indep-stamp
###
@@ -225,9 +215,6 @@
# Alter the default location and names of files to fit Debian
# policy and better integrate with the Debian system.
- mv $(TMPPKG)/usr/sbin/pluginviewer $(TMPPKG)/usr/sbin/saslpluginviewer
- mv $(TMPPKG)/usr/share/man/man8/pluginviewer.8 \
- $(TMPPKG)/usr/share/man/man8/saslpluginviewer.8
install -m 644 saslauthd/saslauthd.mdoc \
$(TMPPKG)/usr/share/man/man8/saslauthd.8
install -m 644 $(CURDIR)/debian/testsaslauthd.8 \
@@ -243,51 +230,30 @@
$(TMPPKG)/usr/sbin/sasl-sample-server
# Alter the rpath of certain binaries and shared libraries.
- chrpath -d $(TMPPKG)/usr/sbin/sasldblistusers2 \
- $(TMPPKG)/usr/sbin/saslpasswd2
- chrpath -d $(TMPPKG)/usr/lib/sasl2/libsql.so.2.0.23
-
- # Install the sasl-sample-client and -server man pages.
- dh_installman -psasl2-bin sasl-sample-client.8 sasl-sample-server.8
-
- # Install saslfinger
- install -m 644 -D $(CURDIR)/debian/saslfinger/saslfinger.1 \
- $(TMPPKG)/usr/share/man/man1/saslfinger.1
- install -m 755 -D $(CURDIR)/debian/saslfinger/saslfinger \
- $(TMPPKG)/usr/bin/saslfinger
###
# Build architecture-dependent files.
###
binary-arch: build-arch install
- dh_testdir -s
- dh_testroot -s
- dh_installdebconf -s
- dh_installchangelogs -s ChangeLog
- dh_installdocs -s
- dh_installexamples -s
- dh_installdirs -s
- cp debian/sasl2-bin.lintian-overrides \
- debian/sasl2-bin/usr/share/lintian/overrides/sasl2-bin
- cp debian/libsasl2-modules.lintian-overrides \
- debian/libsasl2-modules/usr/share/lintian/overrides/libsasl2-modules
- cp debian/libsasl2-modules-otp.lintian-overrides \
- debian/libsasl2-modules-otp/usr/share/lintian/overrides/libsasl2-modules-otp
- cp debian/cyrus-sasl2-dbg.lintian-overrides \
- debian/cyrus-sasl2-dbg/usr/share/lintian/overrides/cyrus-sasl2-dbg
- dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG)
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installdirs -a
+ dh_install -a --autodest --list-missing --sourcedir=$(TMPPKG)
dh_installinit --name=saslauthd
- dh_installman -s
- dh_link -s
- dh_strip -s --dbg-package=cyrus-sasl2-dbg
- dh_compress -s
- dh_fixperms -s
- dh_makeshlibs -s -X/usr/lib/sasl2
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
+ dh_installman -a
+ dh_link -a
+ dh_strip -a --dbg-package=cyrus-sasl2-heimdal-dbg
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a -X/usr/lib/sasl2
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
###
# Build architecture-independent files.
More information about the Pkg-cyrus-sasl2-commits
mailing list