[Pkg-cyrus-sasl2-commits] r560 - in /cyrus-sasl-2.1/branches/package-consolidate/debian: README.Debian-NMU changelog control cyrus-sasl2-heimdal-dbg.postrm cyrus-sasl2-heimdal-dbg.preinst libsasl2-modules-gssapi-heimdal.dirs libsasl2-modules-gssapi-heimdal.install rules
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Fri Aug 20 01:36:08 UTC 2010
Author: roberto
Date: Fri Aug 20 01:36:08 2010
New Revision: 560
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=560
Log:
Merge cyrus-sasl2 and cyrus-sasl2-heimdal source packages (Closes: #568358)
Added:
cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.postrm
cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.preinst
cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.dirs
cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.install
Removed:
cyrus-sasl-2.1/branches/package-consolidate/debian/README.Debian-NMU
Modified:
cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
cyrus-sasl-2.1/branches/package-consolidate/debian/control
cyrus-sasl-2.1/branches/package-consolidate/debian/rules
Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/changelog?rev=560&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/changelog Fri Aug 20 01:36:08 2010
@@ -1,8 +1,8 @@
cyrus-sasl2 (2.1.23.dfsg1-6) UNRELEASED; urgency=low
- * NOT RELEASED YET
-
- -- Roberto C. Sanchez <roberto at connexer.com> Tue, 03 Aug 2010 15:29:09 -0400
+ * Merge cyrus-sasl2 and cyrus-sasl2-heimdal source packages (Closes: #568358)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 19 Aug 2010 20:45:57 -0400
cyrus-sasl2 (2.1.23.dfsg1-5.1) unstable; urgency=low
Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/control
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/control?rev=560&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/control (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/control Fri Aug 20 01:36:08 2010
@@ -4,7 +4,7 @@
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.3
-Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.8-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | 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-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, automake1.9, autoconf, libtool, libdb4.8-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libopie-dev (>= 2.32-10), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, 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
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/
@@ -125,6 +125,17 @@
This package includes development files for compiling programs with SASL
support. It is needed for development purposes only.
+Package: libsasl2-modules-gssapi-heimdal
+Architecture: any
+Depends: libsasl2-modules (= ${binary:Version}), ${shlibs:Depends}, ${misc: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 provides the GSSAPI plugin, compiled with the Heimdal
+ Kerberos 5 library.
+
Package: cyrus-sasl2-dbg
Section: debug
Architecture: any
@@ -138,3 +149,17 @@
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.
+
+Package: cyrus-sasl2-heimdal-dbg
+Section: debug
+Architecture: any
+Depends: cyrus-sasl2-dbg (= ${binary:Version}), libsasl2-modules-gssapi-heimdal (= ${binary:Version}), ${misc:Depends}
+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 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.
Added: cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.postrm
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.postrm?rev=560&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.postrm (added)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.postrm Fri Aug 20 01:36:08 2010
@@ -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.23
+fi
+
Added: cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.preinst
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.preinst?rev=560&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.preinst (added)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/cyrus-sasl2-heimdal-dbg.preinst Fri Aug 20 01:36:08 2010
@@ -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.23.mit --rename /usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23
+fi
+
Added: cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.dirs
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.dirs?rev=560&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.dirs (added)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.dirs Fri Aug 20 01:36:08 2010
@@ -1,0 +1,1 @@
+usr/lib/sasl2
Added: cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.install
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.install?rev=560&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.install (added)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/libsasl2-modules-gssapi-heimdal.install Fri Aug 20 01:36:08 2010
@@ -1,0 +1,1 @@
+usr/lib/sasl2/libgssapiv2.*
Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/rules?rev=560&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/rules (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/rules Fri Aug 20 01:36:08 2010
@@ -67,7 +67,8 @@
awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
# Some convenience variables
-export TMPPKG := $(CURDIR)/debian/tmp
+export TMPPKG_MIT := $(CURDIR)/debian/tmp-mit
+export TMPPKG_HEIMDAL := $(CURDIR)/debian/tmp-heimdal
AUTOFILES=acinclude.m4 aclocal.m4 config/config.sub config/config.guess \
config/ltmain.sh config/libtool.m4
@@ -135,12 +136,14 @@
touch configure
$(AUTOTOOLS)
(cd saslauthd && $(AUTOTOOLS) && cd ..)
+ (mkdir build-mit; cd build-mit; \
LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --with-gss_impl=mit \
--enable-static \
--enable-shared \
--enable-alwaystrue \
@@ -168,8 +171,46 @@
--with-pgsql=/usr/include/postgresql \
--with-configdir=/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
- --with-devrandom=/dev/urandom
-
+ --with-devrandom=/dev/urandom; \
+ cd ..)
+ (mkdir build-heimdal; cd build-heimdal; \
+ LDFLAGS="$(LDFLAGS) -Wl,-z,defs" CFLAGS="$(CFLAGS)" ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-gss_impl=heimdal \
+ --enable-static \
+ --enable-shared \
+ --enable-alwaystrue \
+ --enable-checkapop \
+ --enable-cram \
+ --enable-digest \
+ --enable-otp \
+ --disable-srp \
+ --disable-srp-setpass \
+ --disable-krb4 \
+ $(CONFIGURE_GSSAPI) \
+ --enable-gss_mutexes \
+ --enable-auth-sasldb \
+ --enable-plain \
+ --enable-anon \
+ --enable-login \
+ --enable-ntlm \
+ --disable-passdss \
+ $(CONFIGURE_SQL) \
+ $(CONFIGURE_LDAPDB) \
+ --disable-macos-framework \
+ --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; \
+ cd ..)
+
# Prepare to build sample-{client,server}
cp -f $(CURDIR)/debian/sample/config.h $(CURDIR)/sample/config.h
@@ -187,13 +228,25 @@
build-arch-stamp: config.status
dh_testdir
+ (cd built-mit; \
# Ugly hack: the CMU build system is broken.
# Certain symlinks get created too late, resulting in a
# build failure. We work around this by running make twice,
# ignoring the first failure.
- -$(MAKE)
+ -$(MAKE); \
# Here we run make again (this comment makes build log more readable)
- $(MAKE)
+ $(MAKE); \
+ cd ..)
+
+ (cd built-heimdal; \
+ # Ugly hack: the CMU build system is broken.
+ # Certain symlinks get created too late, resulting in a
+ # build failure. We work around this by running make twice,
+ # ignoring the first failure.
+ -$(MAKE); \
+ # Here we run make again (this comment makes build log more readable)
+ $(MAKE); \
+ cd ..)
# Build sample-{client,server}
make -f $(CURDIR)/debian/sample/Makefile -C $(CURDIR)/sample T=$(CURDIR)
@@ -221,40 +274,41 @@
dh_testroot
dh_clean -k
- $(MAKE) install DESTDIR=$(TMPPKG)
+ (cd built-mit; $(MAKE) install DESTDIR=$(TMPPKG_MIT))
+ (cd built-heimdal; $(MAKE) install DESTDIR=$(TMPPKG_HEIMDAL))
# 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
+ mv $(TMPPKG_MIT)/usr/sbin/pluginviewer $(TMPPKG_MIT)/usr/sbin/saslpluginviewer
+ mv $(TMPPKG_MIT)/usr/share/man/man8/pluginviewer.8 \
+ $(TMPPKG_MIT)/usr/share/man/man8/saslpluginviewer.8
install -m 644 saslauthd/saslauthd.mdoc \
- $(TMPPKG)/usr/share/man/man8/saslauthd.8
+ $(TMPPKG_MIT)/usr/share/man/man8/saslauthd.8
install -m 644 $(CURDIR)/debian/testsaslauthd.8 \
- $(TMPPKG)/usr/share/man/man8/testsaslauthd.8
- mv $(TMPPKG)/usr/sbin/dbconverter-2 $(TMPPKG)/usr/sbin/sasldbconverter2
+ $(TMPPKG_MIT)/usr/share/man/man8/testsaslauthd.8
+ mv $(TMPPKG_MIT)/usr/sbin/dbconverter-2 $(TMPPKG_MIT)/usr/sbin/sasldbconverter2
install -m 644 utils/sasldbconverter2.8 \
- $(TMPPKG)/usr/share/man/man8/sasldbconverter2.8
+ $(TMPPKG_MIT)/usr/share/man/man8/sasldbconverter2.8
# Install sample-{client,server} with Debianized names
install -m 755 -D $(CURDIR)/sample/sample-client \
- $(TMPPKG)/usr/bin/sasl-sample-client
+ $(TMPPKG_MIT)/usr/bin/sasl-sample-client
install -m 755 -D $(CURDIR)/sample/sample-server \
- $(TMPPKG)/usr/sbin/sasl-sample-server
+ $(TMPPKG_MIT)/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
+ chrpath -d $(TMPPKG_MIT)/usr/sbin/sasldblistusers2 \
+ $(TMPPKG_MIT)/usr/sbin/saslpasswd2
+ chrpath -d $(TMPPKG_MIT)/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
+ $(TMPPKG_MIT)/usr/share/man/man1/saslfinger.1
install -m 755 -D $(CURDIR)/debian/saslfinger/saslfinger \
- $(TMPPKG)/usr/bin/saslfinger
+ $(TMPPKG_MIT)/usr/bin/saslfinger
###
# Build architecture-dependent files.
@@ -273,11 +327,13 @@
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
- dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG)
+ dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_MIT) -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev
+ dh_install -s --autodest --list-missing --sourcedir=$(TMPPKG_HEIMDAL) -plibsasl2-modules-gssapi-heimdal
dh_installinit --name=saslauthd start 20 2 3 4 5 . stop 20 1 .
dh_installman -s
dh_link -s
- dh_strip -s --dbg-package=cyrus-sasl2-dbg
+ dh_strip -s -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-otp -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev --dbg-package=cyrus-sasl2-dbg
+ dh_strip -s -plibsasl2-modules-gssapi-heimdal --dbg-package=cyrus-sasl2-heimdal-dbg
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s -X/usr/lib/sasl2
More information about the Pkg-cyrus-sasl2-commits
mailing list