[119] in athena10
Re: Missing pieces in Athena 10
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed Mar 12 17:04:30 2008
From: Greg Hudson <ghudson@MIT.EDU>
To: Timothy G Abbott <tabbott@mit.edu>
Cc: athena10@mit.edu
In-Reply-To: <1205271250.5928.13.camel@error-messages.mit.edu>
Content-Type: multipart/mixed; boundary="=-Pc2iny82SJsHZF8fZIAt"
Date: Wed, 12 Mar 2008 17:03:48 -0400
Message-Id: <1205355828.5845.14.camel@error-messages.mit.edu>
Mime-Version: 1.0
--=-Pc2iny82SJsHZF8fZIAt
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
On Tue, 2008-03-11 at 17:34 -0400, Greg Hudson wrote:
> Hm, not as good of a fit as I expected. debathenificator is for making
> changes to an existing system source package for all suites. What we
> want to do in this case is, for certain newer suites, combine the orig
> tarball from cyrus-sasl2 with the packaging materials (presumably
> modified slightly) from cyrus-sasl2-mit which no longer exists in those
> suites. I'll have to think on this a bit more.
My current plan is to write a debathenify-cyrus-sasl2-mit script which
uses the same interface as debathenificator scripts but not the back
end. The script would grab the orig tarfile from the cyrus-sasl2
package on the target distro and combine it with modified packaging from
cyrus-sasl2-mit from feisty.
This seems moderately workable but the diffs between the packaging in
cyrus-sasl2-mit_2.1.19.dfsg1-1 and the packaging
in /mit/debathena/packages/third/cyrus-sasl2-mit/cyrus-sasl2-mit-2.1.22.dfsg1 are more substantial than I expected. (Diffs attached for reference.) I'm now thinking that it would be better to just commit the contents of the Debathena package's debian directory to the source tree and use that, rather than retrieving and patching the cyrus-sasl2-mit packaging.
--=-Pc2iny82SJsHZF8fZIAt
Content-Disposition: attachment; filename=diff.txt
Content-Type: text/x-patch; name=diff.txt; charset=utf-8
Content-Transfer-Encoding: 7bit
Only in /tmp/blah/cyrus-sasl2-mit/debian: 13_libdb42_autotools.diff
diff -ur /tmp/blah/cyrus-sasl2-mit/debian/changelog ./changelog
--- /tmp/blah/cyrus-sasl2-mit/debian/changelog 2008-03-12 15:05:05.000000000 -0400
+++ ./changelog 2007-07-17 14:34:29.000000000 -0400
@@ -1,3 +1,17 @@
+cyrus-sasl2-mit (2.1.22.dfsg1-0debathena2) unstable; urgency=low
+
+ * Depend libsasl2-2 instead of libsasl2.
+ * Section: debathena/libs.
+
+ -- Anders Kaseorg <andersk@mit.edu> Tue, 17 Jul 2007 14:34:25 -0400
+
+cyrus-sasl2-mit (2.1.22.dfsg1-0debathena1) unstable; urgency=low
+
+ * Update to 2.1.22.dfsg1.
+ * Only build the kerberos4 plugin.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 28 Jan 2007 20:57:27 -0500
+
cyrus-sasl2-mit (2.1.19.dfsg1-1) unstable; urgency=low
* Resync with 2.1.19.dfsg1-0.2
diff -ur /tmp/blah/cyrus-sasl2-mit/debian/control ./control
--- /tmp/blah/cyrus-sasl2-mit/debian/control 2008-03-12 15:05:05.000000000 -0400
+++ ./control 2007-07-17 14:34:20.000000000 -0400
@@ -1,28 +1,17 @@
Source: cyrus-sasl2-mit
-Build-Depends: autotools-dev, debhelper (>= 4), libpam0g-dev, zlib1g-dev, libdb4.2-dev , libopie-dev (>= 2.32-8), chrpath, libkrb5-dev, libldap2-dev (>= 2.1.21), automake1.7 (>= 1.7.9), autoconf (>=2.57), dbs, groff-base, comerr-dev, libtool (>= 1.5.6), automake1.7
-Build-Conflicts: kerberos4kth-dev, libssl-dev, autoconf2.13, automake1.4
-Section: devel
+Build-Depends: autotools-dev, debhelper (>= 4), libpam0g-dev, chrpath, libkrb5-dev, automake1.7 (>= 1.7.9), autoconf (>= 2.57), dbs, groff-base, comerr-dev, libtool (>= 1.5.6), libsasl2-dev
+Build-Conflicts: kerberos4kth-dev, autoconf2.13, automake1.4
+Section: debathena/libs
Priority: optional
-Maintainer: Sam Hartman <hartmans@debian.org>
+Maintainer: Debian-Athena Project <debathena@mit.edu>
Standards-Version: 3.6.1
-Package: libsasl2-gssapi-mit
-Architecture: any
-Depends: libsasl2 (>= 2.1.19), ${shlibs:Depends}
-Conflicts: libsasl2-modules-gssapi-heimdal
-Description: GSSAPI module for SASL using MIT Kerberos
- This is the Cyrus SASL API implentation, version 2. See package
- libsasl2 and RFC 2222 for more information.
- .
- This package provides the GSSAPI module compiled against the MIT
- implementation of Kerberos.
-
Package: libsasl2-krb4-mit
-Architecture: any
-Depends: libsasl2 (>= 2.1.19), ${shlibs:Depends}
+Architecture: any
+Depends: libsasl2-2 (>= 2.1.22), ${shlibs:Depends}
Description: Kerberos4 module for SASL using MIT Kerberos
This is the Cyrus SASL API implementation, version 2. See package
- libsasl2 and RFC 2222 for more information.
- .
- This package provides the Kerberos4 module compiled against the MIT
+ libsasl2 and RFC 2222 for more information.
+ .
+ This package provides the Kerberos4 module compiled against the MIT
implementation of Kerberos.
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-dev.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-gssapi-mit.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-modules.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-modules-gssapi-heimdal.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-modules-mysql.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2-modules-sql.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2.postinst.debhelper
Only in /tmp/blah/cyrus-sasl2-mit/debian: libsasl2.postrm.debhelper
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 00_strict-aliasing.diff
Only in ./patches: 01_linksrcs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 01_maintainer_mode.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 02_versioned_symbols.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 03_saslauthd_mdoc.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 04_missing_man_pages.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 05_dbconverter.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 06_testsuite.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 08_mutex.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 09_postgres_header.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 10_fix_sasldb.al.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 11_remove_rpath.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 12_pr245818.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 13_libdb42_autotools.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 14_manpages_section.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2368_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2369_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2370_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2371_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2372_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 20_2373_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 21_237x_1_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 21_237x_2_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 21_237x_3_sasl_upstream_cvs.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 22_237x_3_sasl_upstream_cvs-FIX.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 23_gcc40_static.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 24_openssl098.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 25_postgresql_pg_config.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 26_fix_hurd_build.diff
Only in /tmp/blah/cyrus-sasl2-mit/debian/patches: 27_CVE-2006-1721.diff
diff -ur /tmp/blah/cyrus-sasl2-mit/debian/rules ./rules
--- /tmp/blah/cyrus-sasl2-mit/debian/rules 2008-03-12 15:05:05.000000000 -0400
+++ ./rules 2007-01-28 21:22:46.000000000 -0500
@@ -10,7 +10,7 @@
SCRIPT_DIR = /usr/share/dbs
# the dbs rules
-TAR_DIR := cyrus-sasl-2.1.19.dfsg1
+TAR_DIR := cyrus-sasl-2.1.22.dfsg1
include $(SCRIPT_DIR)/dbs-build.mk
# dpkg-arch rules
@@ -33,7 +33,6 @@
arrange: $(STAMP_DIR)/arrange-stamp
$(STAMP_DIR)/arrange-stamp: install
dh_testdir
- dh_movefiles -plibsasl2-gssapi-mit
dh_movefiles -plibsasl2-krb4-mit
touch $@
@@ -47,16 +46,13 @@
$(STAMP_DIR)/binary-arch-stamp: arrange
dh_testdir
dh_testroot
- dh_installdocs -plibsasl2 $(BUILD_TREE)/NEWS $(BUILD_TREE)/README debian/README.Debian $(BUILD_TREE)/doc/*.html $(BUILD_TREE)/doc/draft*.txt $(BUILD_TREE)/doc/testing.txt
- dh_installdocs -psasl2-bin $(BUILD_TREE)/saslauthd/LDAP_SASLAUTHD
dh_installdocs debian/changelog.debian_non_mit
dh_installchangelogs $(BUILD_TREE)/ChangeLog
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -plibsasl2 -V
dh_installdeb
- dh_shlibdeps -l$(shell pwd)/debian/libsasl2/usr/lib -- -Ldebian/libsasl2/DEBIAN/shlibs
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -70,9 +66,7 @@
build: $(STAMP_DIR)/build-stamp
$(STAMP_DIR)/build-stamp: config
dh_testdir
- cd $(BUILD_TREE) && $(MAKE)
- cd $(BUILD_TREE)/saslauthd && make testsaslauthd
- cd $(BUILD_TREE)/utils && make testsuite
+ $(MAKE) -C $(BUILD_TREE)
touch $@
clean:
@@ -86,26 +80,19 @@
dh_testdir
cd $(BUILD_TREE) && ( \
$(AUTOTOOLS); \
- cd saslauthd; \
- $(AUTOTOOLS); \
- cd ..; \
- ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-saslauthd=/var/run/saslauthd --enable-login --enable-auth-sasldb --with-ldap --enable-ntlm --enable-static --enable-alwaystrue --enable-krb4 --disable-digest CPPFLAGS='-I/usr/include/kerberosIV' --enable-gss_mutexes=no)
+ ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
+ --enable-static \
+ --enable-krb4 CPPFLAGS='-I/usr/include/kerberosIV' \
+ --with-saslauthd=no --disable-sample --with-dblib=none \
+ --disable-checkapop --disable-cram --disable-digest \
+ --disable-gssapi --disable-otp --disable-plain --disable-anon)
touch $@
install: $(STAMP_DIR)/install-stamp
$(STAMP_DIR)/install-stamp: build
dh_testdir
- cd $(BUILD_TREE) && $(MAKE) install DESTDIR=$(b)
- cp $(BUILD_TREE)/lib/.libs/libsasl2.a $(b)/usr/lib/
- cp $(BUILD_TREE)/saslauthd/testsaslauthd $(b)/usr/sbin/
- cp $(BUILD_TREE)/utils/.libs/testsuite $(b)/usr/sbin/sasltestsuite
- mv $(b)/usr/sbin/dbconverter-2 $(b)/usr/sbin/sasldbconverter2
- mkdir -p $(b)/usr/share/man/man8
- cp $(BUILD_TREE)/saslauthd/saslauthd.mdoc $(b)/usr/share/man/man8/saslauthd.8
- cp $(BUILD_TREE)/saslauthd/testsaslauthd.8 $(b)/usr/share/man/man8
- cp $(BUILD_TREE)/utils/*.8 $(b)/usr/share/man/man8
- chrpath -d $(b)/usr/sbin/sasldblistusers2 $(b)/usr/sbin/saslpasswd2
+ $(MAKE) -C $(BUILD_TREE) install DESTDIR=$(b)
touch $@
.PHONY: build clean binary-indep binary-arch binary install
Only in /tmp/blah/cyrus-sasl2-mit/debian: sasl2-bin.default
Only in /tmp/blah/cyrus-sasl2-mit/debian: sasl2-bin.files
Only in /tmp/blah/cyrus-sasl2-mit/debian: sasl2-bin.init
Only in /tmp/blah/cyrus-sasl2-mit/debian: sasl2-bin.postinst
--=-Pc2iny82SJsHZF8fZIAt--
