Re: Bug#357527: [stable] cyrus-sasl2 dfsg issue
On Sat, Apr 01, 2006 at 10:06:15AM +0200, Andreas Barth wrote:
> * dann frazier (dannf@debian.org) [060401 02:08]:
> > I am already working on a fix for a sarge-based release I do for my
> > day job, so it'd be ideal if I could just do the
> > stable-proposed-updates build for Debian and use the same build for my
> > work project. Of course, I could prepare a sid NMU at the same time.
>
> I think that this is an RC-bug, and RC bugs need to be fixed. So, yes,
> doing an NMU is good. However, please no additional changes (I don't
> know what you need for your work project, that's why I'm saying that).
I've uploaded a sid NMU to the 7-day delayed queue - if there's a need to
speed this up, I can upload it directly to sid upon request.
What I changed:
I regenerated the .orig.tar.gz after removing the dlcompat dir from
the enclosed tarball. Output of debdiff follows - the only "real"
change here are path fixes in each of debian/patches/* and
debian/rules. I'll work on a sarge update w/ the same orig.tar.gz next.
Binary files /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/cyrus-sasl-2.1.19.dfsg1.tar.gz and /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/cyrus-sasl-2.1.19.dfsg1.tar.gz differ
Binary files /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/cyrus-sasl-2.1.19.tar.gz and /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/cyrus-sasl-2.1.19.tar.gz differ
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/changelog /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/changelog
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/changelog 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/changelog 2006-04-04 17:04:45.000000000 -0600
@@ -1,3 +1,12 @@
+cyrus-sasl2 (2.1.19.dfsg1-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove dlcompat-20010505 subdirectory from source package as it
+ contains non-DFSG-free source. Required regeneration of the orig.tar.gz.
+ Closes: #357527.
+
+ -- dann frazier <dannf@debian.org> Tue, 4 Apr 2006 16:38:20 -0600
+
cyrus-sasl2 (2.1.19-1.9) unstable; urgency=low
* Non-maintainer upload.
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/00_strict-aliasing.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/00_strict-aliasing.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/00_strict-aliasing.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/00_strict-aliasing.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/configure.in cyrus-sasl-2.1.19.new/configure.in
---- cyrus-sasl-2.1.19/configure.in 2004-03-09 16:54:13.000000000 +0000
-+++ cyrus-sasl-2.1.19.new/configure.in 2004-03-13 13:13:25.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/configure.in cyrus-sasl-2.1.19.dfsg1.new/configure.in
+--- cyrus-sasl-2.1.19.dfsg1/configure.in 2004-03-09 16:54:13.000000000 +0000
++++ cyrus-sasl-2.1.19.dfsg1.new/configure.in 2004-03-13 13:13:25.000000000 +0000
@@ -115,7 +115,7 @@
fi
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/01_maintainer_mode.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/01_maintainer_mode.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/01_maintainer_mode.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/01_maintainer_mode.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/configure.in cyrus-sasl-2.1.19.new/configure.in
---- cyrus-sasl-2.1.19/configure.in 2004-03-13 13:26:35.000000000 +0000
-+++ cyrus-sasl-2.1.19.new/configure.in 2004-03-13 13:26:28.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/configure.in cyrus-sasl-2.1.19.dfsg1.new/configure.in
+--- cyrus-sasl-2.1.19.dfsg1/configure.in 2004-03-13 13:26:35.000000000 +0000
++++ cyrus-sasl-2.1.19.dfsg1.new/configure.in 2004-03-13 13:26:28.000000000 +0000
@@ -61,6 +61,7 @@
dnl
AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.19)
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/02_versioned_symbols.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/02_versioned_symbols.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/02_versioned_symbols.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/02_versioned_symbols.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/lib/Makefile.am ../build-tree.new/cyrus-sasl-2.1.19/lib/Makefile.am
---- ./cyrus-sasl-2.1.19/lib/Makefile.am 2004-07-02 20:39:36.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/lib/Makefile.am 2004-07-17 19:07:03.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/lib/Makefile.am ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/lib/Makefile.am
+--- ./cyrus-sasl-2.1.19.dfsg1/lib/Makefile.am 2004-07-02 20:39:36.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/lib/Makefile.am 2004-07-17 19:07:03.000000000 +0100
@@ -60,8 +60,8 @@
lib_LTLIBRARIES = libsasl2.la
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/03_saslauthd_mdoc.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/03_saslauthd_mdoc.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/03_saslauthd_mdoc.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/03_saslauthd_mdoc.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/saslauthd/saslauthd.mdoc ../build-tree.new/cyrus-sasl-2.1.19/saslauthd/saslauthd.mdoc
---- ./cyrus-sasl-2.1.19/saslauthd/saslauthd.mdoc 2004-07-04 22:30:00.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/saslauthd/saslauthd.mdoc 2004-07-04 22:29:40.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/saslauthd/saslauthd.mdoc ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/saslauthd/saslauthd.mdoc
+--- ./cyrus-sasl-2.1.19.dfsg1/saslauthd/saslauthd.mdoc 2004-07-04 22:30:00.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/saslauthd/saslauthd.mdoc 2004-07-04 22:29:40.000000000 +0100
@@ -10,7 +10,7 @@
.\" manpage in saslauthd.8 whenever you change this source
.\" version. Only the pre-formatted manpage is installed.
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/04_missing_man_pages.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/04_missing_man_pages.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/04_missing_man_pages.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/04_missing_man_pages.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/saslauthd/testsaslauthd.8 cyrus-sasl-2.1.19.1/saslauthd/testsaslauthd.8
---- cyrus-sasl-2.1.19/saslauthd/testsaslauthd.8 1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-sasl-2.1.19.1/saslauthd/testsaslauthd.8 2004-03-13 13:54:45.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/saslauthd/testsaslauthd.8 cyrus-sasl-2.1.19.dfsg1.1/saslauthd/testsaslauthd.8
+--- cyrus-sasl-2.1.19.dfsg1/saslauthd/testsaslauthd.8 1970-01-01 01:00:00.000000000 +0100
++++ cyrus-sasl-2.1.19.dfsg1.1/saslauthd/testsaslauthd.8 2004-03-13 13:54:45.000000000 +0000
@@ -0,0 +1,16 @@
+.\" testsaslauthd - SASL2 test tool
+.\" Dima Barsky 23/12/2002
@@ -18,9 +18,9 @@
+.SH DESCRIPTION
+This tool is for testing the saslauthd daemon. Do not use it unless you
+know what you are doing. Read the source code if you need more information.
-diff -urN cyrus-sasl-2.1.19/utils/sasldbconverter2.8 cyrus-sasl-2.1.19.1/utils/sasldbconverter2.8
---- cyrus-sasl-2.1.19/utils/sasldbconverter2.8 1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-sasl-2.1.19.1/utils/sasldbconverter2.8 2004-03-13 13:54:30.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/utils/sasldbconverter2.8 cyrus-sasl-2.1.19.dfsg1.1/utils/sasldbconverter2.8
+--- cyrus-sasl-2.1.19.dfsg1/utils/sasldbconverter2.8 1970-01-01 01:00:00.000000000 +0100
++++ cyrus-sasl-2.1.19.dfsg1.1/utils/sasldbconverter2.8 2004-03-13 13:54:30.000000000 +0000
@@ -0,0 +1,23 @@
+.\" sasldbconverter-2 - Convert sasldb file into the new format
+.\" Dima Barsky 25/10/2002
@@ -45,9 +45,9 @@
+.TP
+.SH SEE ALSO
+rfc2222 \- Simple Authentication and Security Layer (SASL)
-diff -urN cyrus-sasl-2.1.19/utils/sasltestsuite.8 cyrus-sasl-2.1.19.1/utils/sasltestsuite.8
---- cyrus-sasl-2.1.19/utils/sasltestsuite.8 1970-01-01 01:00:00.000000000 +0100
-+++ cyrus-sasl-2.1.19.1/utils/sasltestsuite.8 2004-03-13 13:54:45.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/utils/sasltestsuite.8 cyrus-sasl-2.1.19.dfsg1.1/utils/sasltestsuite.8
+--- cyrus-sasl-2.1.19.dfsg1/utils/sasltestsuite.8 1970-01-01 01:00:00.000000000 +0100
++++ cyrus-sasl-2.1.19.dfsg1.1/utils/sasltestsuite.8 2004-03-13 13:54:45.000000000 +0000
@@ -0,0 +1,22 @@
+.\" sasltestsuite - SASL2 test tool
+.\" Dima Barsky 23/11/2002
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/05_dbconverter.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/05_dbconverter.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/05_dbconverter.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/05_dbconverter.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/utils/Makefile.am ../build-tree.new/cyrus-sasl-2.1.19/utils/Makefile.am
---- ./cyrus-sasl-2.1.19/utils/Makefile.am 2004-05-27 20:11:25.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/utils/Makefile.am 2004-07-17 19:17:56.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/utils/Makefile.am ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/Makefile.am
+--- ./cyrus-sasl-2.1.19.dfsg1/utils/Makefile.am 2004-05-27 20:11:25.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/Makefile.am 2004-07-17 19:17:56.000000000 +0100
@@ -45,10 +45,10 @@
all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
@@ -14,9 +14,9 @@
if NO_SASL_DB_MANS
man_MANS =
-diff -Nru3 ./cyrus-sasl-2.1.19/utils/dbconverter-2.c ../build-tree.new/cyrus-sasl-2.1.19/utils/dbconverter-2.c
---- ./cyrus-sasl-2.1.19/utils/dbconverter-2.c 2003-12-15 19:25:14.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/utils/dbconverter-2.c 2004-07-17 19:17:56.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/utils/dbconverter-2.c ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/dbconverter-2.c
+--- ./cyrus-sasl-2.1.19.dfsg1/utils/dbconverter-2.c 2003-12-15 19:25:14.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/dbconverter-2.c 2004-07-17 19:17:56.000000000 +0100
@@ -385,7 +385,7 @@
int main(int argc, char **argv)
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/06_testsuite.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/06_testsuite.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/06_testsuite.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/06_testsuite.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/utils/testsuite.c ../build-tree.new/cyrus-sasl-2.1.19/utils/testsuite.c
---- ./cyrus-sasl-2.1.19/utils/testsuite.c 2004-06-30 20:40:27.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/utils/testsuite.c 2004-07-17 19:19:51.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/utils/testsuite.c ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/testsuite.c
+--- ./cyrus-sasl-2.1.19.dfsg1/utils/testsuite.c 2004-06-30 20:40:27.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/utils/testsuite.c 2004-07-17 19:19:51.000000000 +0100
@@ -467,9 +467,9 @@
*len = strlen("sasldb");
return SASL_OK;
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/08_mutex.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/08_mutex.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/08_mutex.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/08_mutex.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/lib/common.c cyrus-sasl-2.1.19.new/lib/common.c
---- cyrus-sasl-2.1.19/lib/common.c 2004-03-10 15:51:35.000000000 +0000
-+++ cyrus-sasl-2.1.19.new/lib/common.c 2004-03-20 21:58:39.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/lib/common.c cyrus-sasl-2.1.19.dfsg1.new/lib/common.c
+--- cyrus-sasl-2.1.19.dfsg1/lib/common.c 2004-03-10 15:51:35.000000000 +0000
++++ cyrus-sasl-2.1.19.dfsg1.new/lib/common.c 2004-03-20 21:58:39.000000000 +0000
@@ -440,7 +440,7 @@
result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init);
if(result != SASL_OK) return result;
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/09_postgres_header.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/09_postgres_header.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/09_postgres_header.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/09_postgres_header.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/plugins/sql.c cyrus-sasl-2.1.19.new/plugins/sql.c
---- cyrus-sasl-2.1.19/plugins/sql.c 2004-01-08 15:30:26.000000000 +0000
-+++ cyrus-sasl-2.1.19.new/plugins/sql.c 2004-03-21 01:01:51.000000000 +0000
+diff -urN cyrus-sasl-2.1.19.dfsg1/plugins/sql.c cyrus-sasl-2.1.19.dfsg1.new/plugins/sql.c
+--- cyrus-sasl-2.1.19.dfsg1/plugins/sql.c 2004-01-08 15:30:26.000000000 +0000
++++ cyrus-sasl-2.1.19.dfsg1.new/plugins/sql.c 2004-03-21 01:01:51.000000000 +0000
@@ -180,7 +180,7 @@
#endif /* HAVE_MYSQL */
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/10_fix_sasldb.al.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/10_fix_sasldb.al.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/10_fix_sasldb.al.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/10_fix_sasldb.al.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,5 +1,5 @@
---- cyrus-sasl-2.1.19/saslauthd/configure.in 2004-03-21 12:40:16.000000000 -0500
-+++ cyrus-sasl-2.1.19.new/saslauthd/configure.in 2004-03-21 12:39:44.000000000 -0500
+--- cyrus-sasl-2.1.19.dfsg1/saslauthd/configure.in 2004-03-21 12:40:16.000000000 -0500
++++ cyrus-sasl-2.1.19.dfsg1.new/saslauthd/configure.in 2004-03-21 12:39:44.000000000 -0500
@@ -77,7 +77,7 @@
AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
SASL_DB_PATH_CHECK()
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/11_remove_rpath.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/11_remove_rpath.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/11_remove_rpath.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/11_remove_rpath.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/cmulocal/cyrus.m4 ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/cyrus.m4
---- ./cyrus-sasl-2.1.19/cmulocal/cyrus.m4 2003-10-20 16:39:43.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/cyrus.m4 2004-08-01 15:26:07.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/cmulocal/cyrus.m4 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/cyrus.m4
+--- ./cyrus-sasl-2.1.19.dfsg1/cmulocal/cyrus.m4 2003-10-20 16:39:43.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/cyrus.m4 2004-08-01 15:26:07.000000000 +0100
@@ -14,7 +14,7 @@
if test "$andrew_runpath_switch" = "none" ; then
LDFLAGS="-L$1 ${LDFLAGS}"
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/12_pr245818.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/12_pr245818.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/12_pr245818.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/12_pr245818.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -urN cyrus-sasl-2.1.19/sasldb/Makefile.am cyrus-sasl-2.1.19.new/sasldb/Makefile.am
---- cyrus-sasl-2.1.19/sasldb/Makefile.am 2004-03-10 09:51:36.000000000 -0600
-+++ cyrus-sasl-2.1.19.new/sasldb/Makefile.am 2004-05-12 23:49:15.000000000 -0500
+diff -urN cyrus-sasl-2.1.19.dfsg1/sasldb/Makefile.am cyrus-sasl-2.1.19.dfsg1.new/sasldb/Makefile.am
+--- cyrus-sasl-2.1.19.dfsg1/sasldb/Makefile.am 2004-03-10 09:51:36.000000000 -0600
++++ cyrus-sasl-2.1.19.dfsg1.new/sasldb/Makefile.am 2004-05-12 23:49:15.000000000 -0500
@@ -51,20 +51,8 @@
EXTRA_DIST = NTMakefile
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/13_libdb42_autotools.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/13_libdb42_autotools.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/13_libdb42_autotools.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/13_libdb42_autotools.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/cmulocal/berkdb.m4 ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/berkdb.m4
---- ./cyrus-sasl-2.1.19/cmulocal/berkdb.m4 2004-02-14 21:13:03.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/cmulocal/berkdb.m4 2004-07-04 12:42:28.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4
+--- ./cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4 2004-02-14 21:13:03.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/cmulocal/berkdb.m4 2004-07-04 12:42:28.000000000 +0100
@@ -211,11 +211,13 @@
BDB_LIBADD=""
fi
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/14_manpages_section.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/14_manpages_section.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/14_manpages_section.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/14_manpages_section.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl.3
---- ./cyrus-sasl-2.1.19/man/sasl.3 2002-01-10 22:48:50.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl.3 2004-07-04 14:38:49.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl.3 2002-01-10 22:48:50.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl.3 2004-07-04 14:38:49.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -10,9 +10,9 @@
.SH NAME
SASL \- SASL authentication library
.SH DESCRIPTION
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_authorize_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_authorize_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_authorize_t.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_authorize_t.3 2004-07-04 14:38:49.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_authorize_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_authorize_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_authorize_t.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_authorize_t.3 2004-07-04 14:38:49.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -22,9 +22,9 @@
.SH NAME
sasl_authorize_t \- The SASL authorization callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_auxprop.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop.3
---- ./cyrus-sasl-2.1.19/man/sasl_auxprop.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop.3 2004-07-04 14:38:48.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop.3 2004-07-04 14:38:48.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -34,9 +34,9 @@
.SH NAME
sasl_auxprop \- How to work with SASL auxilliary properties
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_auxprop_getctx.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop_getctx.3
---- ./cyrus-sasl-2.1.19/man/sasl_auxprop_getctx.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop_getctx.3 2004-07-04 14:38:48.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_getctx.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_getctx.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_getctx.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_getctx.3 2004-07-04 14:38:48.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -46,9 +46,9 @@
.SH NAME
sasl_auxprop_getctx \- Acquire an auxilliary property context
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_auxprop_request.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop_request.3
---- ./cyrus-sasl-2.1.19/man/sasl_auxprop_request.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_auxprop_request.3 2004-07-04 14:38:48.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_request.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_request.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_request.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_auxprop_request.3 2004-07-04 14:38:48.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -58,9 +58,9 @@
.SH NAME
sasl_auxprop_request \- Request Auxilliary Properties from SASL
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_callbacks.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_callbacks.3
---- ./cyrus-sasl-2.1.19/man/sasl_callbacks.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_callbacks.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_callbacks.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_callbacks.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_callbacks.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_callbacks.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -70,9 +70,9 @@
.SH NAME
sasl_callbacks \- How to work with SASL callbacks
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_canon_user_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_canon_user_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_canon_user_t.3 2001-12-10 18:35:59.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_canon_user_t.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_canon_user_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_canon_user_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_canon_user_t.3 2001-12-10 18:35:59.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_canon_user_t.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -82,9 +82,9 @@
.SH NAME
sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_chalprompt_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_chalprompt_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_chalprompt_t.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_chalprompt_t.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_chalprompt_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_chalprompt_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_chalprompt_t.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_chalprompt_t.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -94,9 +94,9 @@
.SH NAME
sasl_chalprompt_t \- Realm Acquisition Callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_checkapop.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_checkapop.3
---- ./cyrus-sasl-2.1.19/man/sasl_checkapop.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_checkapop.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_checkapop.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_checkapop.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_checkapop.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_checkapop.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -106,9 +106,9 @@
.SH NAME
sasl_checkapop \- Check an APOP challenge/response
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_checkpass.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_checkpass.3
---- ./cyrus-sasl-2.1.19/man/sasl_checkpass.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_checkpass.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_checkpass.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_checkpass.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_checkpass.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_checkpass.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -118,9 +118,9 @@
.SH NAME
sasl_checkpass \- Check a plaintext password
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_client_init.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_init.3
---- ./cyrus-sasl-2.1.19/man/sasl_client_init.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_init.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_init.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_init.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_init.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_init.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -130,9 +130,9 @@
.SH NAME
sasl_client_init \- SASL client authentication initialization
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_client_new.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_new.3
---- ./cyrus-sasl-2.1.19/man/sasl_client_new.3 2003-06-11 22:34:17.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_new.3 2004-07-04 14:38:47.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_new.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_new.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_new.3 2003-06-11 22:34:17.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_new.3 2004-07-04 14:38:47.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -142,9 +142,9 @@
.SH NAME
sasl_client_new \- Create a new client authentication object
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_client_start.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_start.3
---- ./cyrus-sasl-2.1.19/man/sasl_client_start.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_start.3 2004-07-04 14:38:46.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_start.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_start.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_start.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_start.3 2004-07-04 14:38:46.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -154,9 +154,9 @@
.SH NAME
sasl_client_start \- Begin an authentication negotiation
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_client_step.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_step.3
---- ./cyrus-sasl-2.1.19/man/sasl_client_step.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_client_step.3 2004-07-04 14:38:46.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_step.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_step.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_client_step.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_client_step.3 2004-07-04 14:38:46.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -166,9 +166,9 @@
.SH NAME
sasl_client_step \- Perform a step in the authentication negotiation
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_decode.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_decode.3
---- ./cyrus-sasl-2.1.19/man/sasl_decode.3 2001-12-04 02:06:43.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_decode.3 2004-07-04 14:38:46.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_decode.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_decode.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_decode.3 2001-12-04 02:06:43.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_decode.3 2004-07-04 14:38:46.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -178,9 +178,9 @@
.SH NAME
sasl_decode \- Decode data received
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_dispose.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_dispose.3
---- ./cyrus-sasl-2.1.19/man/sasl_dispose.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_dispose.3 2004-07-04 14:38:46.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_dispose.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_dispose.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_dispose.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_dispose.3 2004-07-04 14:38:46.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -190,9 +190,9 @@
.SH NAME
sasl_dispose \- Dispose of a SASL connection object
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_done.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_done.3
---- ./cyrus-sasl-2.1.19/man/sasl_done.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_done.3 2004-07-04 14:38:45.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_done.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_done.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_done.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_done.3 2004-07-04 14:38:45.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -202,9 +202,9 @@
.SH NAME
sasl_done \- Dispose of a SASL connection object
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_encode.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_encode.3
---- ./cyrus-sasl-2.1.19/man/sasl_encode.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_encode.3 2004-07-04 14:38:45.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_encode.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_encode.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_encode.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_encode.3 2004-07-04 14:38:45.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -214,9 +214,9 @@
.SH NAME
sasl_encode \- Encode data for transport to authenticated host
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_encodev.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_encodev.3
---- ./cyrus-sasl-2.1.19/man/sasl_encodev.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_encodev.3 2004-07-04 14:38:45.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_encodev.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_encodev.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_encodev.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_encodev.3 2004-07-04 14:38:45.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -226,9 +226,9 @@
.SH NAME
sasl_encode \- Encode data for transport to authenticated host
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_errdetail.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errdetail.3
---- ./cyrus-sasl-2.1.19/man/sasl_errdetail.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errdetail.3 2004-07-04 14:38:44.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errdetail.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errdetail.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errdetail.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errdetail.3 2004-07-04 14:38:44.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -238,9 +238,9 @@
.SH NAME
sasl_errdetail \- Retrieve detailed information about an error
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_errors.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errors.3
---- ./cyrus-sasl-2.1.19/man/sasl_errors.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errors.3 2004-07-04 14:38:44.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errors.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errors.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errors.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errors.3 2004-07-04 14:38:44.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -250,9 +250,9 @@
.SH NAME
sasl_errors \- SASL error codes
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_errstring.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errstring.3
---- ./cyrus-sasl-2.1.19/man/sasl_errstring.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_errstring.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errstring.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errstring.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_errstring.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_errstring.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -262,9 +262,9 @@
.SH NAME
sasl_errstring \- Translate a SASL return code to a human-readable form
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getopt_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getopt_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_getopt_t.3 2002-07-06 18:21:18.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getopt_t.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getopt_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getopt_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getopt_t.3 2002-07-06 18:21:18.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getopt_t.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -274,9 +274,9 @@
.SH NAME
sasl_getopt_t \- The SASL get option callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getpath_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getpath_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_getpath_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getpath_t.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getpath_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getpath_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getpath_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getpath_t.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -286,9 +286,9 @@
.SH NAME
sasl_getpath_t \- The SASL callback to indicate location of the mechanism drivers
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getprop.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getprop.3
---- ./cyrus-sasl-2.1.19/man/sasl_getprop.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getprop.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getprop.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getprop.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getprop.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getprop.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -298,9 +298,9 @@
.SH NAME
sasl_getprop \- Get a SASL property
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getrealm_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getrealm_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_getrealm_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getrealm_t.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getrealm_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getrealm_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getrealm_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getrealm_t.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -310,9 +310,9 @@
.SH NAME
sasl_getrealm_t \- Realm Acquisition Callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getsecret_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getsecret_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_getsecret_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getsecret_t.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getsecret_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getsecret_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getsecret_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getsecret_t.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -322,9 +322,9 @@
.SH NAME
sasl_getsecret_t \- The SASL callback for secrets (passwords)
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_getsimple_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getsimple_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_getsimple_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_getsimple_t.3 2004-07-04 14:38:43.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getsimple_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getsimple_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_getsimple_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_getsimple_t.3 2004-07-04 14:38:43.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -334,9 +334,9 @@
.SH NAME
sasl_getsimple_t \- The SASL callback for username/authname/realm
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_global_listmech.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_global_listmech.3
---- ./cyrus-sasl-2.1.19/man/sasl_global_listmech.3 2002-01-10 22:48:50.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_global_listmech.3 2004-07-04 14:38:42.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_global_listmech.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_global_listmech.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_global_listmech.3 2002-01-10 22:48:50.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_global_listmech.3 2004-07-04 14:38:42.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -346,9 +346,9 @@
.SH NAME
sasl_listmech \- Retrieve a list of the supported SASL mechanisms
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_idle.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_idle.3
---- ./cyrus-sasl-2.1.19/man/sasl_idle.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_idle.3 2004-07-04 14:38:42.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_idle.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_idle.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_idle.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_idle.3 2004-07-04 14:38:42.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -358,9 +358,9 @@
.SH NAME
sasl_idle \- Perform precalculations during an idle period
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_listmech.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_listmech.3
---- ./cyrus-sasl-2.1.19/man/sasl_listmech.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_listmech.3 2004-07-04 14:38:42.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_listmech.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_listmech.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_listmech.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_listmech.3 2004-07-04 14:38:42.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -370,9 +370,9 @@
.SH NAME
sasl_listmech \- Retrieve a list of the supported SASL mechanisms
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_log_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_log_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_log_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_log_t.3 2004-07-04 14:38:42.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_log_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_log_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_log_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_log_t.3 2004-07-04 14:38:42.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -382,9 +382,9 @@
.SH NAME
sasl_log_t \- The SASL logging callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_init.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_init.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_init.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_init.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_init.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_init.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_init.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_init.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -394,9 +394,9 @@
.SH NAME
sasl_server_init \- SASL server authentication initialization
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_new.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_new.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_new.3 2003-06-11 20:07:41.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_new.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_new.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_new.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_new.3 2003-06-11 20:07:41.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_new.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -406,9 +406,9 @@
.SH NAME
sasl_server_new \- Create a new server authentication object
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_start.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_start.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_start.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_start.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_start.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_start.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_start.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_start.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -418,9 +418,9 @@
.SH NAME
sasl_server_start \- Begin an authentication negotiation
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_step.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_step.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_step.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_step.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_step.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_step.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_step.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_step.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -430,9 +430,9 @@
.SH NAME
sasl_server_step \- Perform a step in the authentication negotiation
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_userdb_checkpass_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_userdb_checkpass_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_userdb_checkpass_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_userdb_checkpass_t.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_checkpass_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_checkpass_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_checkpass_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_checkpass_t.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -442,9 +442,9 @@
.SH NAME
sasl_server_userdb_checkpass_t \- Plaintext Password Verification Callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_server_userdb_setpass_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_userdb_setpass_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_server_userdb_setpass_t.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_server_userdb_setpass_t.3 2004-07-04 14:38:41.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_setpass_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_setpass_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_setpass_t.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_server_userdb_setpass_t.3 2004-07-04 14:38:41.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -454,9 +454,9 @@
.SH NAME
sasl_server_userdb_setpass_t \- UserDB Plaintext Password Setting Callback
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_setpass.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_setpass.3
---- ./cyrus-sasl-2.1.19/man/sasl_setpass.3 2001-12-04 02:06:44.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_setpass.3 2004-07-04 14:38:40.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_setpass.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_setpass.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_setpass.3 2001-12-04 02:06:44.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_setpass.3 2004-07-04 14:38:40.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -466,9 +466,9 @@
.SH NAME
sasl_setpass \- Check a plaintext password
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_setprop.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_setprop.3
---- ./cyrus-sasl-2.1.19/man/sasl_setprop.3 2002-01-09 19:07:06.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_setprop.3 2004-07-04 14:38:36.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_setprop.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_setprop.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_setprop.3 2002-01-09 19:07:06.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_setprop.3 2004-07-04 14:38:36.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -478,9 +478,9 @@
.SH NAME
sasl_setprop \- Set a SASL property
.SH SYNOPSIS
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_user_exists.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_user_exists.3
---- ./cyrus-sasl-2.1.19/man/sasl_user_exists.3 2002-07-03 21:29:48.000000000 +0100
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_user_exists.3 2004-07-04 14:38:36.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_user_exists.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_user_exists.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_user_exists.3 2002-07-03 21:29:48.000000000 +0100
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_user_exists.3 2004-07-04 14:38:36.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -490,9 +490,9 @@
.SH NAME
sasl_user_exists \- Check if a user exists on server
-diff -Nru3 ./cyrus-sasl-2.1.19/man/sasl_verifyfile_t.3 ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_verifyfile_t.3
---- ./cyrus-sasl-2.1.19/man/sasl_verifyfile_t.3 2001-12-04 02:06:45.000000000 +0000
-+++ ../build-tree.new/cyrus-sasl-2.1.19/man/sasl_verifyfile_t.3 2004-07-04 14:38:36.000000000 +0100
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/man/sasl_verifyfile_t.3 ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_verifyfile_t.3
+--- ./cyrus-sasl-2.1.19.dfsg1/man/sasl_verifyfile_t.3 2001-12-04 02:06:45.000000000 +0000
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/man/sasl_verifyfile_t.3 2004-07-04 14:38:36.000000000 +0100
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/15_lock_sasl_set_alloc.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/15_lock_sasl_set_alloc.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/15_lock_sasl_set_alloc.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/15_lock_sasl_set_alloc.diff 2006-04-04 17:04:45.000000000 -0600
@@ -12,9 +12,9 @@
This works fine in SASL 1.5, and no applications started behaving
in insane ways, so chances are it will also work with SASL 2.1
-diff -ruN cyrus-sasl-2.1.19.orig/lib/client.c cyrus-sasl-2.1.19/lib/client.c
---- cyrus-sasl-2.1.19.orig/lib/client.c 2003-11-14 14:48:43.000000000 -0200
-+++ cyrus-sasl-2.1.19/lib/client.c 2004-10-08 11:11:56.000000000 -0300
+diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/client.c cyrus-sasl-2.1.19.dfsg1/lib/client.c
+--- cyrus-sasl-2.1.19.dfsg1.orig/lib/client.c 2003-11-14 14:48:43.000000000 -0200
++++ cyrus-sasl-2.1.19.dfsg1/lib/client.c 2004-10-08 11:11:56.000000000 -0300
@@ -204,6 +204,9 @@
{ NULL, NULL }
};
@@ -25,9 +25,9 @@
if(_sasl_client_active) {
/* We're already active, just increase our refcount */
/* xxx do something with the callback structure? */
-diff -ruN cyrus-sasl-2.1.19.orig/lib/common.c cyrus-sasl-2.1.19/lib/common.c
---- cyrus-sasl-2.1.19.orig/lib/common.c 2004-10-08 10:59:42.000000000 -0300
-+++ cyrus-sasl-2.1.19/lib/common.c 2004-10-08 11:09:02.000000000 -0300
+diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c cyrus-sasl-2.1.19.dfsg1/lib/common.c
+--- cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c 2004-10-08 10:59:42.000000000 -0300
++++ cyrus-sasl-2.1.19.dfsg1/lib/common.c 2004-10-08 11:09:02.000000000 -0300
@@ -93,6 +93,7 @@
(sasl_realloc_t *) &realloc,
(sasl_free_t *) &free
@@ -45,9 +45,9 @@
_sasl_allocation_utils.malloc=m;
_sasl_allocation_utils.calloc=c;
_sasl_allocation_utils.realloc=r;
-diff -ruN cyrus-sasl-2.1.19.orig/lib/saslint.h cyrus-sasl-2.1.19/lib/saslint.h
---- cyrus-sasl-2.1.19.orig/lib/saslint.h 2004-07-06 10:42:23.000000000 -0300
-+++ cyrus-sasl-2.1.19/lib/saslint.h 2004-10-08 11:09:41.000000000 -0300
+diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/saslint.h cyrus-sasl-2.1.19.dfsg1/lib/saslint.h
+--- cyrus-sasl-2.1.19.dfsg1.orig/lib/saslint.h 2004-07-06 10:42:23.000000000 -0300
++++ cyrus-sasl-2.1.19.dfsg1/lib/saslint.h 2004-10-08 11:09:41.000000000 -0300
@@ -306,6 +306,7 @@
extern sasl_allocation_utils_t _sasl_allocation_utils;
@@ -56,9 +56,9 @@
/*
* checkpw.c
-diff -ruN cyrus-sasl-2.1.19.orig/lib/server.c cyrus-sasl-2.1.19/lib/server.c
---- cyrus-sasl-2.1.19.orig/lib/server.c 2004-07-06 10:42:23.000000000 -0300
-+++ cyrus-sasl-2.1.19/lib/server.c 2004-10-08 11:11:08.000000000 -0300
+diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/server.c cyrus-sasl-2.1.19.dfsg1/lib/server.c
+--- cyrus-sasl-2.1.19.dfsg1.orig/lib/server.c 2004-07-06 10:42:23.000000000 -0300
++++ cyrus-sasl-2.1.19.dfsg1/lib/server.c 2004-10-08 11:11:08.000000000 -0300
@@ -676,6 +676,9 @@
{ NULL, NULL }
};
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2368_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2368_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2368_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2368_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -12,14 +12,14 @@
Members:
configure.in:1.195->1.196
-Index: cyrus-sasl-2.1.19/configure.in
+Index: cyrus-sasl-2.1.19.dfsg1/configure.in
===================================================================
RCS file: /cvs/src/sasl/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
---- cyrus-sasl-2.1.19/configure.in 2 Jul 2004 19:39:34 -0000 1.195
-+++ cyrus-sasl-2.1.19/configure.in 15 Jul 2004 18:01:57 -0000 1.196
+--- cyrus-sasl-2.1.19.dfsg1/configure.in 2 Jul 2004 19:39:34 -0000 1.195
++++ cyrus-sasl-2.1.19.dfsg1/configure.in 15 Jul 2004 18:01:57 -0000 1.196
@@ -1,7 +1,7 @@
dnl configure.in for the SASL library
dnl Rob Siemborski
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2369_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2369_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2369_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2369_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -13,14 +13,14 @@
ChangeLog:1.686->1.687
plugins/gssapi.c:1.90->1.91
-Index: cyrus-sasl-2.1.19/ChangeLog
+Index: cyrus-sasl-2.1.19.dfsg1/ChangeLog
===================================================================
RCS file: /cvs/src/sasl/ChangeLog,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -r1.686 -r1.687
---- cyrus-sasl-2.1.19/ChangeLog 6 Jul 2004 14:06:24 -0000 1.686
-+++ cyrus-sasl-2.1.19/ChangeLog 15 Jul 2004 18:01:57 -0000 1.687
+--- cyrus-sasl-2.1.19.dfsg1/ChangeLog 6 Jul 2004 14:06:24 -0000 1.686
++++ cyrus-sasl-2.1.19.dfsg1/ChangeLog 15 Jul 2004 18:01:57 -0000 1.687
@@ -1,3 +1,8 @@
+2004-07-15 Rob Siemborski <rjs3@andrew.cmu.edu>
+ * configure.in, plugins/gssapi.c: Wrap all GSS calls
@@ -30,14 +30,14 @@
2004-07-06 Rob Siemborski <rjs3@andrew.cmu.edu>
* plugins/digestmd5.c: Fix potential buffer overflow, call
add_to_challenge in 2 more places (Alexey Melnikov
-Index: cyrus-sasl-2.1.19/plugins/gssapi.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c
===================================================================
RCS file: /cvs/src/sasl/plugins/gssapi.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
---- cyrus-sasl-2.1.19/plugins/gssapi.c 6 Jul 2004 21:55:47 -0000 1.90
-+++ cyrus-sasl-2.1.19/plugins/gssapi.c 15 Jul 2004 18:02:03 -0000 1.91
+--- cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c 6 Jul 2004 21:55:47 -0000 1.90
++++ cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c 15 Jul 2004 18:02:03 -0000 1.91
@@ -1,7 +1,7 @@
/* GSSAPI SASL plugin
* Leif Johansson
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2370_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2370_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2370_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2370_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -13,14 +13,14 @@
Members:
plugins/gssapi.c:1.91->1.92
-Index: cyrus-sasl-2.1.19/plugins/gssapi.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c
===================================================================
RCS file: /cvs/src/sasl/plugins/gssapi.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
---- cyrus-sasl-2.1.19/plugins/gssapi.c 15 Jul 2004 18:02:03 -0000 1.91
-+++ cyrus-sasl-2.1.19/plugins/gssapi.c 21 Jul 2004 14:39:06 -0000 1.92
+--- cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c 15 Jul 2004 18:02:03 -0000 1.91
++++ cyrus-sasl-2.1.19.dfsg1/plugins/gssapi.c 21 Jul 2004 14:39:06 -0000 1.92
@@ -1,7 +1,7 @@
/* GSSAPI SASL plugin
* Leif Johansson
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2371_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2371_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2371_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2371_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -10,14 +10,14 @@
Members:
ChangeLog:1.687->1.688
-Index: cyrus-sasl-2.1.19/ChangeLog
+Index: cyrus-sasl-2.1.19.dfsg1/ChangeLog
===================================================================
RCS file: /cvs/src/sasl/ChangeLog,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
---- cyrus-sasl-2.1.19/ChangeLog 15 Jul 2004 18:01:57 -0000 1.687
-+++ cyrus-sasl-2.1.19/ChangeLog 21 Jul 2004 14:39:49 -0000 1.688
+--- cyrus-sasl-2.1.19.dfsg1/ChangeLog 15 Jul 2004 18:01:57 -0000 1.687
++++ cyrus-sasl-2.1.19.dfsg1/ChangeLog 21 Jul 2004 14:39:49 -0000 1.688
@@ -1,3 +1,7 @@
+2004-07-21 Rob Siemborski <rjs3@andrew.cmu.edu>
+ * plugins/gssapi.c: Memory management cleanup
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2372_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2372_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2372_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2372_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -11,14 +11,14 @@
ChangeLog:1.688->1.689
plugins/digestmd5.c:1.172->1.173
-Index: cyrus-sasl-2.1.19/ChangeLog
+Index: cyrus-sasl-2.1.19.dfsg1/ChangeLog
===================================================================
RCS file: /cvs/src/sasl/ChangeLog,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
---- cyrus-sasl-2.1.19/ChangeLog 21 Jul 2004 14:39:49 -0000 1.688
-+++ cyrus-sasl-2.1.19/ChangeLog 29 Jul 2004 19:21:56 -0000 1.689
+--- cyrus-sasl-2.1.19.dfsg1/ChangeLog 21 Jul 2004 14:39:49 -0000 1.688
++++ cyrus-sasl-2.1.19.dfsg1/ChangeLog 29 Jul 2004 19:21:56 -0000 1.689
@@ -1,3 +1,7 @@
+2004-07-29 Rob Siemborski <rjs3@andrew.cmu.edu>
+ * plugins/digestmd5.c: Fix handling of client realm callback
@@ -27,14 +27,14 @@
2004-07-21 Rob Siemborski <rjs3@andrew.cmu.edu>
* plugins/gssapi.c: Memory management cleanup
(Alexey Melnikov <Alexey.Melnikov@isode.com>)
-Index: cyrus-sasl-2.1.19/plugins/digestmd5.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/digestmd5.c
===================================================================
RCS file: /cvs/src/sasl/plugins/digestmd5.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
---- cyrus-sasl-2.1.19/plugins/digestmd5.c 6 Jul 2004 14:03:49 -0000 1.172
-+++ cyrus-sasl-2.1.19/plugins/digestmd5.c 29 Jul 2004 19:21:57 -0000 1.173
+--- cyrus-sasl-2.1.19.dfsg1/plugins/digestmd5.c 6 Jul 2004 14:03:49 -0000 1.172
++++ cyrus-sasl-2.1.19.dfsg1/plugins/digestmd5.c 29 Jul 2004 19:21:57 -0000 1.173
@@ -3,7 +3,7 @@
* Rob Siemborski
* Tim Martin
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2373_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2373_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/20_2373_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/20_2373_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -10,14 +10,14 @@
Members:
plugins/cram.c:1.83->1.84
-Index: cyrus-sasl-2.1.19/plugins/cram.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/cram.c
===================================================================
RCS file: /cvs/src/sasl/plugins/cram.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
---- cyrus-sasl-2.1.19/plugins/cram.c 15 Dec 2003 20:04:22 -0000 1.83
-+++ cyrus-sasl-2.1.19/plugins/cram.c 6 Aug 2004 20:29:44 -0000 1.84
+--- cyrus-sasl-2.1.19.dfsg1/plugins/cram.c 15 Dec 2003 20:04:22 -0000 1.83
++++ cyrus-sasl-2.1.19.dfsg1/plugins/cram.c 6 Aug 2004 20:29:44 -0000 1.84
@@ -1,7 +1,7 @@
/* CRAM-MD5 SASL plugin
* Rob Siemborski
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_1_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_1_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_1_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_1_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -12,14 +12,14 @@
Members:
plugins/kerberos4.c:1.97->1.98
-Index: cyrus-sasl-2.1.19/plugins/kerberos4.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/kerberos4.c
===================================================================
RCS file: /cvs/src/sasl/plugins/kerberos4.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
---- cyrus-sasl-2.1.19/plugins/kerberos4.c 6 Feb 2004 17:23:51 -0000 1.97
-+++ cyrus-sasl-2.1.19/plugins/kerberos4.c 2 Sep 2004 15:24:01 -0000 1.98
+--- cyrus-sasl-2.1.19.dfsg1/plugins/kerberos4.c 6 Feb 2004 17:23:51 -0000 1.97
++++ cyrus-sasl-2.1.19.dfsg1/plugins/kerberos4.c 2 Sep 2004 15:24:01 -0000 1.98
@@ -1,7 +1,7 @@
/* Kerberos4 SASL plugin
* Rob Siemborski
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_2_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_2_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_2_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_2_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -10,14 +10,14 @@
Members:
plugins/cram.c:1.84->1.85
-Index: cyrus-sasl-2.1.19/plugins/cram.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/cram.c
===================================================================
RCS file: /cvs/src/sasl/plugins/cram.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
---- cyrus-sasl-2.1.19/plugins/cram.c 6 Aug 2004 20:29:44 -0000 1.84
-+++ cyrus-sasl-2.1.19/plugins/cram.c 8 Sep 2004 10:57:56 -0000 1.85
+--- cyrus-sasl-2.1.19.dfsg1/plugins/cram.c 6 Aug 2004 20:29:44 -0000 1.84
++++ cyrus-sasl-2.1.19.dfsg1/plugins/cram.c 8 Sep 2004 10:57:56 -0000 1.85
@@ -1,7 +1,7 @@
/* CRAM-MD5 SASL plugin
* Rob Siemborski
@@ -114,14 +114,14 @@
plugins/plain.c:1.63->1.64
plugins/sasldb.c:1.8->1.9
-Index: cyrus-sasl-2.1.19/plugins/anonymous.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/anonymous.c
===================================================================
RCS file: /cvs/src/sasl/plugins/anonymous.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
---- cyrus-sasl-2.1.19/plugins/anonymous.c 13 Feb 2003 19:56:03 -0000 1.50
-+++ cyrus-sasl-2.1.19/plugins/anonymous.c 8 Sep 2004 11:10:52 -0000 1.51
+--- cyrus-sasl-2.1.19.dfsg1/plugins/anonymous.c 13 Feb 2003 19:56:03 -0000 1.50
++++ cyrus-sasl-2.1.19.dfsg1/plugins/anonymous.c 8 Sep 2004 11:10:52 -0000 1.51
@@ -1,7 +1,7 @@
/* Anonymous SASL plugin
* Rob Siemborski
@@ -158,14 +158,14 @@
result = _plug_buf_alloc(cparams->utils, &text->out_buf,
&text->out_buf_len, *clientoutlen);
-Index: cyrus-sasl-2.1.19/plugins/login.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/login.c
===================================================================
RCS file: /cvs/src/sasl/plugins/login.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
---- cyrus-sasl-2.1.19/plugins/login.c 25 Jul 2003 16:11:15 -0000 1.26
-+++ cyrus-sasl-2.1.19/plugins/login.c 8 Sep 2004 11:09:10 -0000 1.27
+--- cyrus-sasl-2.1.19.dfsg1/plugins/login.c 25 Jul 2003 16:11:15 -0000 1.26
++++ cyrus-sasl-2.1.19.dfsg1/plugins/login.c 8 Sep 2004 11:09:10 -0000 1.27
@@ -2,7 +2,7 @@
* Rob Siemborski (SASLv2 Conversion)
* contributed by Rainer Schoepf <schoepf@uni-mainz.de>
@@ -211,14 +211,14 @@
*serverout = PASSWORD_CHALLENGE;
text->state = 3;
-Index: cyrus-sasl-2.1.19/plugins/plain.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/plain.c
===================================================================
RCS file: /cvs/src/sasl/plugins/plain.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
---- cyrus-sasl-2.1.19/plugins/plain.c 14 Apr 2004 17:51:27 -0000 1.63
-+++ cyrus-sasl-2.1.19/plugins/plain.c 8 Sep 2004 11:06:11 -0000 1.64
+--- cyrus-sasl-2.1.19.dfsg1/plugins/plain.c 14 Apr 2004 17:51:27 -0000 1.63
++++ cyrus-sasl-2.1.19.dfsg1/plugins/plain.c 8 Sep 2004 11:06:11 -0000 1.64
@@ -1,7 +1,7 @@
/* Plain SASL plugin
* Rob Siemborski
@@ -255,14 +255,14 @@
if (lup != clientinlen) {
SETERROR(params->utils,
-Index: cyrus-sasl-2.1.19/plugins/sasldb.c
+Index: cyrus-sasl-2.1.19.dfsg1/plugins/sasldb.c
===================================================================
RCS file: /cvs/src/sasl/plugins/sasldb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
---- cyrus-sasl-2.1.19/plugins/sasldb.c 17 Jul 2003 19:04:22 -0000 1.8
-+++ cyrus-sasl-2.1.19/plugins/sasldb.c 8 Sep 2004 11:12:33 -0000 1.9
+--- cyrus-sasl-2.1.19.dfsg1/plugins/sasldb.c 17 Jul 2003 19:04:22 -0000 1.8
++++ cyrus-sasl-2.1.19.dfsg1/plugins/sasldb.c 8 Sep 2004 11:12:33 -0000 1.9
@@ -1,7 +1,7 @@
/* SASL server API implementation
* Rob Siemborski
@@ -293,14 +293,14 @@
Members:
ChangeLog:1.689->1.690
-Index: cyrus-sasl-2.1.19/ChangeLog
+Index: cyrus-sasl-2.1.19.dfsg1/ChangeLog
===================================================================
RCS file: /cvs/src/sasl/ChangeLog,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
---- cyrus-sasl-2.1.19/ChangeLog 29 Jul 2004 19:21:56 -0000 1.689
-+++ cyrus-sasl-2.1.19/ChangeLog 10 Sep 2004 14:07:08 -0000 1.690
+--- cyrus-sasl-2.1.19.dfsg1/ChangeLog 29 Jul 2004 19:21:56 -0000 1.689
++++ cyrus-sasl-2.1.19.dfsg1/ChangeLog 10 Sep 2004 14:07:08 -0000 1.690
@@ -1,3 +1,8 @@
+2004-09-08 Alexey Melnikov <alexey.melnikov@isode.com>
+ * plugins/cram.c, plugins/anonymous.c, plugins/login.c,
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_3_sasl_upstream_cvs.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_3_sasl_upstream_cvs.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/21_237x_3_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/21_237x_3_sasl_upstream_cvs.diff 2006-04-04 17:04:45.000000000 -0600
@@ -10,14 +10,14 @@
Members:
lib/common.c:1.103->1.104
-Index: cyrus-sasl-2.1.19/lib/common.c
+Index: cyrus-sasl-2.1.19.dfsg1/lib/common.c
===================================================================
RCS file: /cvs/src/sasl/lib/common.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
---- cyrus-sasl-2.1.19/lib/common.c 6 Jul 2004 16:03:05 -0000 1.103
-+++ cyrus-sasl-2.1.19/lib/common.c 22 Sep 2004 21:35:34 -0000 1.104
+--- cyrus-sasl-2.1.19.dfsg1/lib/common.c 6 Jul 2004 16:03:05 -0000 1.103
++++ cyrus-sasl-2.1.19.dfsg1/lib/common.c 22 Sep 2004 21:35:34 -0000 1.104
@@ -1,7 +1,7 @@
/* common.c - Functions that are common to server and clinet
* Rob Siemborski
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/22_237x_3_sasl_upstream_cvs-FIX.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/22_237x_3_sasl_upstream_cvs-FIX.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/22_237x_3_sasl_upstream_cvs-FIX.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/22_237x_3_sasl_upstream_cvs-FIX.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -ruN cyrus-sasl-2.1.19.orig/lib/common.c cyrus-sasl-2.1.19/lib/common.c
---- cyrus-sasl-2.1.19.orig/lib/common.c 2004-10-16 17:48:04.000000000 -0300
-+++ cyrus-sasl-2.1.19/lib/common.c 2004-10-16 17:48:56.000000000 -0300
+diff -ruN cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c cyrus-sasl-2.1.19.dfsg1/lib/common.c
+--- cyrus-sasl-2.1.19.dfsg1.orig/lib/common.c 2004-10-16 17:48:04.000000000 -0300
++++ cyrus-sasl-2.1.19.dfsg1/lib/common.c 2004-10-16 17:48:56.000000000 -0300
@@ -1846,6 +1846,7 @@
if (! path)
return SASL_BADPARAM;
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/23_gcc40_static.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/23_gcc40_static.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/23_gcc40_static.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/23_gcc40_static.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/lib/saslint.h ../build-tree.new/cyrus-sasl-2.1.19/lib/saslint.h
---- ./cyrus-sasl-2.1.19/lib/saslint.h 2005-08-24 17:38:52.299266488 -0700
-+++ ../build-tree.new/cyrus-sasl-2.1.19/lib/saslint.h 2005-08-24 17:38:42.804506097 -0700
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/lib/saslint.h ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/lib/saslint.h
+--- ./cyrus-sasl-2.1.19.dfsg1/lib/saslint.h 2005-08-24 17:38:52.299266488 -0700
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/lib/saslint.h 2005-08-24 17:38:42.804506097 -0700
@@ -109,8 +109,6 @@
const char *appname;
} sasl_global_callbacks_t;
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/24_openssl098.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/24_openssl098.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/24_openssl098.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/24_openssl098.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -ruN cyrus-sasl-2.1.19-old/plugins/ntlm.c cyrus-sasl-2.1.19/plugins/ntlm.c
---- cyrus-sasl-2.1.19-old/plugins/ntlm.c 2004-06-30 14:50:04.000000000 +0000
-+++ cyrus-sasl-2.1.19/plugins/ntlm.c 2005-10-20 14:05:26.000000000 +0000
+diff -ruN cyrus-sasl-2.1.19.dfsg1-old/plugins/ntlm.c cyrus-sasl-2.1.19.dfsg1/plugins/ntlm.c
+--- cyrus-sasl-2.1.19.dfsg1-old/plugins/ntlm.c 2004-06-30 14:50:04.000000000 +0000
++++ cyrus-sasl-2.1.19.dfsg1/plugins/ntlm.c 2005-10-20 14:05:26.000000000 +0000
@@ -74,6 +74,7 @@
#endif /* WIN32 */
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/25_postgresql_pg_config.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/25_postgresql_pg_config.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/25_postgresql_pg_config.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/25_postgresql_pg_config.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,6 +1,6 @@
-diff -Nru3 ./cyrus-sasl-2.1.19/configure.in ../build-tree.new/cyrus-sasl-2.1.19/configure.in
---- ./cyrus-sasl-2.1.19/configure.in 2006-01-07 06:04:03.000000000 -0800
-+++ ../build-tree.new/cyrus-sasl-2.1.19/configure.in 2006-01-07 06:03:53.000000000 -0800
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/configure.in ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/configure.in
+--- ./cyrus-sasl-2.1.19.dfsg1/configure.in 2006-01-07 06:04:03.000000000 -0800
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/configure.in 2006-01-07 06:03:53.000000000 -0800
@@ -701,14 +701,19 @@
LIB_PGSQL_DIR=$LIB_PGSQL
LIB_PGSQL="$LIB_PGSQL -lpq"
@@ -27,9 +27,9 @@
fi
-diff -Nru3 ./cyrus-sasl-2.1.19/plugins/sql.c ../build-tree.new/cyrus-sasl-2.1.19/plugins/sql.c
---- ./cyrus-sasl-2.1.19/plugins/sql.c 2006-01-07 06:04:02.000000000 -0800
-+++ ../build-tree.new/cyrus-sasl-2.1.19/plugins/sql.c 2006-01-07 05:51:20.000000000 -0800
+diff -Nru3 ./cyrus-sasl-2.1.19.dfsg1/plugins/sql.c ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/plugins/sql.c
+--- ./cyrus-sasl-2.1.19.dfsg1/plugins/sql.c 2006-01-07 06:04:02.000000000 -0800
++++ ../build-tree.new/cyrus-sasl-2.1.19.dfsg1/plugins/sql.c 2006-01-07 05:51:20.000000000 -0800
@@ -180,7 +180,7 @@
#endif /* HAVE_MYSQL */
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/26_fix_hurd_build.diff /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/26_fix_hurd_build.diff
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/patches/26_fix_hurd_build.diff 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/patches/26_fix_hurd_build.diff 2006-04-04 17:04:45.000000000 -0600
@@ -1,5 +1,5 @@
---- cyrus-sasl-2.1.19/saslauthd/auth_sasldb.c.orig 2005-01-25 11:13:48.000000000 +0100
-+++ cyrus-sasl-2.1.19/saslauthd/auth_sasldb.c 2005-01-25 11:14:15.000000000 +0100
+--- cyrus-sasl-2.1.19.dfsg1/saslauthd/auth_sasldb.c.orig 2005-01-25 11:13:48.000000000 +0100
++++ cyrus-sasl-2.1.19.dfsg1/saslauthd/auth_sasldb.c 2005-01-25 11:14:15.000000000 +0100
@@ -41,6 +41,7 @@
#include <string.h>
#include <stdlib.h>
diff -Nru /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/rules /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/rules
--- /tmp/b9TluEjJkh/cyrus-sasl2-2.1.19/debian/rules 2006-04-04 17:04:45.000000000 -0600
+++ /tmp/vVqWstukj9/cyrus-sasl2-2.1.19.dfsg1/debian/rules 2006-04-04 17:04:45.000000000 -0600
@@ -10,7 +10,7 @@
SCRIPT_DIR = /usr/share/dbs
# the dbs rules
-TAR_DIR := cyrus-sasl-2.1.19
+TAR_DIR := cyrus-sasl-2.1.19.dfsg1
include $(SCRIPT_DIR)/dbs-build.mk
# dpkg-arch rules
--
dann frazier
Reply to: