[Pkg-cyrus-sasl2-commits] r116 - in /cyrus-sasl-2.1/trunk/debian:
changelog
patches/0009_sasldb_al.dpatch patches/0010_maintainer_mode.dpatch
patches/0011_saslauthd_ac_prog_libtool.dpatch patches/00list rules
fabbe at users.alioth.debian.org
fabbe at users.alioth.debian.org
Wed Nov 1 22:55:42 CET 2006
Author: fabbe
Date: Wed Nov 1 22:55:42 2006
New Revision: 116
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=116
Log:
Enable sasldb support in saslauthd, deal with all the breakage that is caused, plus some small cleanups. Enable building of the test suite.
Added:
cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch (with props)
cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch (with props)
cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch (with props)
Modified:
cyrus-sasl-2.1/trunk/debian/changelog
cyrus-sasl-2.1/trunk/debian/patches/00list
cyrus-sasl-2.1/trunk/debian/rules
Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=116&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Wed Nov 1 22:55:42 2006
@@ -13,10 +13,16 @@
line 51 to avoid errors when it contains a space-separated list.
* debian/rules: socket directory is /var/run/saslauthd, fix typo.
* debian/sasl2-bin.saslauthd.default: -T option doesn't work, remove.
- * debian/sasl2-bin.saslauthd.default: sasldb is no longer available with
- saslauthd, reflect this in the comment about available mechs.
-
- -- Fabian Fagerholm <fabbe at debian.org> Wed, 1 Nov 2006 22:00:38 +0200
+ * debian/rules: enable sasldb support in saslauthd.
+ * debian/rules: add test target (currently just builds the test suite).
+ * debian/rules: clean up unneccessary file copying.
+ * debian/patches/0009_sasldb_al.dpatch: fix building saslauthd with
+ sasldb support.
+ * debian/patches/0010_maintainer_mode.dpatch: use AM_MAINTAINER_MODE.
+ * debian/patches/0011_saslauthd_ac_prog_libtool.dpatch: use AC_PROG_LIBTOOL
+ in saslauthd's configure.in.
+
+ -- Fabian Fagerholm <fabbe at debian.org> Wed, 1 Nov 2006 23:54:23 +0200
cyrus-sasl2 (2.1.22-0~pre04) experimental; urgency=low
Added: cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch?rev=116&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch Wed Nov 1 22:55:42 2006
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0009_sasldb_al.dpatch by <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix linking with libsasldb.a when saslauthd is built with sasldb
+## DP: support.
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/configure.in 2006-11-01 23:24:24.000000000 +0200
+@@ -77,7 +77,7 @@
+ AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
+ SASL_DB_PATH_CHECK()
+ SASL_DB_CHECK()
+- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
++ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
+ fi
+
+ AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
Propchange: cyrus-sasl-2.1/trunk/debian/patches/0009_sasldb_al.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch?rev=116&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch Wed Nov 1 22:55:42 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0010_maintainer_mode.dpatch by <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable maintainer mode to avoid auto* problems.
+
+ at DPATCH@
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300
++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200
+@@ -62,6 +62,8 @@
+ AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
+ CMU_INIT_AUTOMAKE
+
++AM_MAINTAINER_MODE
++
+ # and include our config dir scripts
+ ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
+
Propchange: cyrus-sasl-2.1/trunk/debian/patches/0010_maintainer_mode.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch?rev=116&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch Wed Nov 1 22:55:42 2006
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0011_saslauthd_ac_prog_libtool.dpatch by <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable libtool use.
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
+--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200
+@@ -25,6 +25,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+
+ dnl Checks for build foo
+ CMU_C___ATTRIBUTE__
Propchange: cyrus-sasl-2.1/trunk/debian/patches/0011_saslauthd_ac_prog_libtool.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=116&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Wed Nov 1 22:55:42 2006
@@ -6,3 +6,6 @@
0006_library_mutexes
0007_manpages_section
0008_one_time_sasl_set_alloc
+0009_sasldb_al
+0010_maintainer_mode
+0011_saslauthd_ac_prog_libtool
Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=116&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Wed Nov 1 22:55:42 2006
@@ -91,11 +91,9 @@
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
mv -f config/config.sub config.sub.old
- cp -f /usr/share/misc/config.sub config/config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
mv -f config/config.guess config.guess.old
- cp -f /usr/share/misc/config.guess config/config.guess
endif
# Avoid problems with timestamp skew and autotools.
@@ -120,6 +118,7 @@
--disable-krb4 \
--enable-gssapi \
--enable-gss_mutexes \
+ --enable-auth-sasldb \
--enable-plain \
--enable-anon \
--enable-login \
@@ -170,7 +169,7 @@
###
# Install the built files in their corresponding package directories.
###
-install: build-arch build-indep
+install: build-arch build-indep test
dh_testdir
dh_testroot
dh_clean -k
@@ -236,6 +235,14 @@
dh_builddeb -i
###
+# Run tests to check that the build is ok
+###
+test: build-arch build-indep
+ dh_testdir
+ cd saslauthd && make testsaslauthd
+ cd utils && make testsuite
+
+###
# Assemble the binary packages.
###
binary: binary-indep binary-arch
More information about the Pkg-cyrus-sasl2-commits
mailing list