tags 345737 patch tags 345880 patch thanks Hi Dima, Henrique,
I've prepared an NMU to fix the krb4 dependency in cyrus-sasl2, and also to
update to libmysqlclient15 and future-proof the package against the
anticipated changes in postgresql -dev packages (bug #315177). The
changelog entry is as follows:
cyrus-sasl2 (2.1.19-1.8) unstable; urgency=medium
* Non-maintainer upload.
* Medium-urgency upload for RC bugfixes.
* Rebuild against current heimdal packages, dropping the build-dependency
on the obsolete and soon-to-be-removed krb4 package; also drop the
(misnamed) libsasl2-modules-kerberos-heimdal package as a result.
Closes: #345737, 345880.
* Drop mention of KERBEROS_V4 in the libsasl2 package description.
* Build against libmysqlclient15 instead of the obsolete libmysqlclient10
for libsasl2-modules-sql.
* debian/patches/25_postgresql_pg_config.diff:
Use pg-config --includedir in configure.in, so that cyrus-sasl2 continues
to build when the postgresql include path changes as the postgresql
maintainers are planning to do; and adjust the include path in
plugins/sql.c accordingly. Closes: #315177.
-- Steve Langasek <[EMAIL PROTECTED]> Sat, 7 Jan 2006 04:18:58 -0800
The full patch is attached; the package will be uploading to incoming
shortly.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
[EMAIL PROTECTED] http://www.debian.org/
diff -u cyrus-sasl2-2.1.19/debian/rules cyrus-sasl2-2.1.19/debian/rules
--- cyrus-sasl2-2.1.19/debian/rules
+++ cyrus-sasl2-2.1.19/debian/rules
@@ -35,7 +35,6 @@
dh_testdir
dh_movefiles -plibsasl2
dh_movefiles -plibsasl2-modules-gssapi-heimdal
- dh_movefiles -plibsasl2-modules-kerberos-heimdal
dh_movefiles -plibsasl2-modules-sql
dh_movefiles
touch $@
@@ -93,7 +92,7 @@
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-sql --enable-ntlm --enable-static --enable-alwaystrue
--enable-krb4)
+ ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
--with-saslauthd=/var/run/saslauthd --enable-login --enable-auth-sasldb
--with-ldap --enable-sql --enable-ntlm --enable-static --enable-alwaystrue)
touch $@
reverted:
--- cyrus-sasl2-2.1.19/debian/libsasl2-modules-kerberos-heimdal.files
+++ cyrus-sasl2-2.1.19.orig/debian/libsasl2-modules-kerberos-heimdal.files
@@ -1 +0,0 @@
-usr/lib/sasl2/libkerberos*
diff -u cyrus-sasl2-2.1.19/debian/changelog cyrus-sasl2-2.1.19/debian/changelog
--- cyrus-sasl2-2.1.19/debian/changelog
+++ cyrus-sasl2-2.1.19/debian/changelog
@@ -1,3 +1,22 @@
+cyrus-sasl2 (2.1.19-1.8) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfixes.
+ * Rebuild against current heimdal packages, dropping the build-dependency
+ on the obsolete and soon-to-be-removed krb4 package; also drop the
+ (misnamed) libsasl2-modules-kerberos-heimdal package as a result.
+ Closes: #345737, 345880.
+ * Drop mention of KERBEROS_V4 in the libsasl2 package description.
+ * Build against libmysqlclient15 instead of the obsolete libmysqlclient10
+ for libsasl2-modules-sql.
+ * debian/patches/25_postgresql_pg_config.diff:
+ Use pg-config --includedir in configure.in, so that cyrus-sasl2 continues
+ to build when the postgresql include path changes as the postgresql
+ maintainers are planning to do; and adjust the include path in
+ plugins/sql.c accordingly. Closes: #315177.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 7 Jan 2006 04:18:58 -0800
+
cyrus-sasl2 (2.1.19-1.7) unstable; urgency=low
* Non-maintainer upload.
diff -u cyrus-sasl2-2.1.19/debian/control cyrus-sasl2-2.1.19/debian/control
--- cyrus-sasl2-2.1.19/debian/control
+++ cyrus-sasl2-2.1.19/debian/control
@@ -1,5 +1,5 @@
Source: cyrus-sasl2
-Build-Depends: autotools-dev, debhelper (>= 4), libpam0g-dev, zlib1g-dev,
libdb4.2-dev (>= 3.2.9-14), libopie-dev (>= 2.32-8), chrpath, heimdal-dev (>=
0.4e-16), libssl-dev (>= 0.9.6d-1), kerberos4kth-dev (>= 1.1-11),
libmysqlclient10-dev (>= 3.23.52), libpq-dev, libldap2-dev (>= 2.1.21),
automake1.7 (>= 1.7.9), autoconf (>=2.57), dbs, groff-base, comerr-dev, libtool
(>= 1.5.6)
+Build-Depends: autotools-dev, debhelper (>= 4), libpam0g-dev, zlib1g-dev,
libdb4.2-dev (>= 3.2.9-14), libopie-dev (>= 2.32-8), chrpath, heimdal-dev (>=
0.4e-16), libssl-dev (>= 0.9.6d-1), libmysqlclient15-dev, libpq-dev,
libldap2-dev (>= 2.1.21), automake1.7 (>= 1.7.9), autoconf (>=2.57), dbs,
groff-base, comerr-dev, libtool (>= 1.5.6)
Build-Conflicts: autoconf2.13, automake1.4
Section: devel
Priority: important
@@ -55,19 +55,6 @@
.
This package provides the GSSAPI plugin, compiled with the Heimdal library.
-Package: libsasl2-modules-kerberos-heimdal
-Architecture: any
-Priority: optional
-Section: libs
-Replaces: libsasl2-modules-plain (<= 2.1.5-6)
-Conflicts: libsasl2-modules-plain (<= 2.1.5-6), libsasl2-modules (<= 2.1.7-1),
libsasl2-krb4-mit
-Depends: libsasl2 (= ${Source-Version}), ${shlibs:Depends}
-Description: Pluggable Authentication Modules for SASL
- This is the Cyrus SASL API implementation, version 2. See package
- libsasl2 and RFC 2222 for more information.
- .
- This package provides the KERBEROS plugin, compiled with the Heimdal library.
-
Package: libsasl2
Architecture: any
Section: libs
@@ -86,9 +73,9 @@
This is the Cyrus SASL API implementation, version 2.
.
Any of: ANONYMOUS, CRAM-MD5, DIGEST-MD5, GSSAPI (MIT Kerberos 5 or Heimdal
- Kerberos 5), KERBEROS_V4, OTP, PLAIN, or LOGIN can be used. This package
- is unusable without the SASL plugins. Most likely you will need to install
- the libsasl2-modules package.
+ Kerberos 5), OTP, PLAIN, or LOGIN can be used. This package is unusable
+ without the SASL plugins. Most likely you will need to install the
+ libsasl2-modules package.
Package: libsasl2-dev
Architecture: any
only in patch2:
unchanged:
--- cyrus-sasl2-2.1.19.orig/debian/patches/25_postgresql_pg_config.diff
+++ cyrus-sasl2-2.1.19/debian/patches/25_postgresql_pg_config.diff
@@ -0,0 +1,41 @@
+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
+@@ -701,14 +701,19 @@
+ LIB_PGSQL_DIR=$LIB_PGSQL
+ LIB_PGSQL="$LIB_PGSQL -lpq"
+
+- if test -d ${with_pgsql}/include/pgsql; then
+- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+- elif test -d ${with_pgsql}/pgsql/include; then
+- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
++ if test -d ${with_pgsql}/include/pgsql/postgresql; then
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql/postgresql"
++ elif test -d ${with_pgsql}/pgsql/include/postgresql; then
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include/postgresql"
+ elif test -d ${with_pgsql}/include; then
+- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include"
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql"
+ else
+- CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
++ pg_config_flags=$(pg_config --includedir)
++ if test x"$pg_config_flags" != x; then
++ CPPFLAGS="${CPPFLAGS} -I$pg_config_flags"
++ else
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/postgresql"
++ fi
+ 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
+@@ -180,7 +180,7 @@
+ #endif /* HAVE_MYSQL */
+
+ #ifdef HAVE_PGSQL
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+
+ static void *_pgsql_open(char *host, char *port, int usessl,
+ const char *user, const char *password,
signature.asc
Description: Digital signature
