Comment 12 for bug 19836

Message-ID: <email address hidden>
Date: Sat, 7 Jan 2006 06:51:48 -0800
From: Steve Langasek <email address hidden>
To: <email address hidden>, <email address hidden>,
 <email address hidden>
Subject: cyrus-sasl2: NMU patch for multiple bugs

--8NvZYKFJsRX2Djef
Content-Type: multipart/mixed; boundary="EuxKj2iCbKjpUGkD"
Content-Disposition: inline

--EuxKj2iCbKjpUGkD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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=3Dmedium

  * 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 continu=
es
    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 address hidden> Sat, 7 Jan 2006 04:18:58 -0800

The full patch is attached; the package will be uploading to incoming
shortly.

Thanks,
--=20
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 address hidden> http://www.debian.org/

--EuxKj2iCbKjpUGkD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cyrus-sasl2-NMU.diff"
Content-Transfer-Encoding: quoted-printable

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=3D/usr --sysconfdir=3D/etc --mandir=3D/usr/share/man=
 --with-saslauthd=3D/var/run/saslauthd --enable-login --enable-auth-sasldb=
 --with-ldap --enable-sql --enable-ntlm --enable-static --enable-alwaystrue=
 --enable-krb4)
+ ./configure --prefix=3D/usr --sysconfdir=3D/etc --mandir=3D/usr/share/man=
 --with-saslauthd=3D/var/run/saslauthd --enable-login --enable-auth-sasldb=
 --with-ldap --enable-sql --enable-ntlm --enable-static --enable-alwaystrue)
=20
  touch $@
=20
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/chang=
elog
--- 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=3Dmedium
+
+ * 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 contin=
ues
+ 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 address hidden> Sat, 7 Jan 2006 04:18:58 -0800
+
 cyrus-sasl2 (2.1.19-1.7) unstable; urgency=3Dlow
=20
   * 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 (>=3D 4), libpam0g-dev, zlib1g-dev=
, libdb4.2-dev (>=3D 3.2.9-14), libopie-dev (>=3D 2.32-8), chrpath, heimdal=
-dev (>=3D 0.4e-16), libssl-dev (>=3D 0.9.6d-1), kerberos4kth-dev (>=3D 1.1=
-11), libmysqlclient10-dev (>=3D 3.23.52), libpq-dev, libldap2-dev (>=3D 2.=
1.21), automake1.7 (>=3D 1.7.9), autoconf (>=3D2.57), dbs, groff-base, come=
rr-dev, libtool (>=3D 1.5.6)
+Build-Depends: autotools-dev, debhelper (>=3D 4), libpam0g-dev, zlib1g-dev=
, libdb4.2-dev (>=3D 3.2.9-14), libopie-dev (>=3D 2.32-8), chrpath, heimdal=
-dev (>=3D 0.4e-16), libssl-dev (>=3D 0.9.6d-1), libmysqlclient15-dev, libp=
q-dev, libldap2-dev (>=3D 2.1.21), automake1.7 (>=3D 1.7.9), autoconf (>=3D=
2.57), dbs, groff-base, comerr-dev, libtool (>=3D 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 librar=
y.
=20
-Package: libsasl2-modules-kerberos-heimdal
-Architecture: any
-Priority: optional
-Section: libs
-Replaces: libsasl2-modules-plain (<=3D 2.1.5-6)
-Conflicts: libsasl2-modules-plain (<=3D 2.1.5-6), libsasl2-modules (<=3D 2=
=2E1.7-1), libsasl2-krb4-mit
-Depends: libsasl2 (=3D ${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.=20
- .
- This package provides the KERBEROS plugin, compiled with the Heimdal libr=
ary.
-
 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.
=20
 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=
=2E1.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.0=
00000000 -0800
+@@ -701,14 +701,19 @@
+ LIB_PGSQL_DIR=3D$LIB_PGSQL
+ LIB_PGSQL=3D"$LIB_PGSQL -lpq"
+=20
+- if test -d ${with_pgsql}/include/pgsql; then
+- CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+- elif test -d ${with_pgsql}/pgsql/include; then
+- CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/pgsql/include"
++ if test -d ${with_pgsql}/include/pgsql/postgresql; then
++ CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/include/pgsql/postgresql"
++ elif test -d ${with_pgsql}/pgsql/include/postgresql; then
++ CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/pgsql/include/postgresql"
+ elif test -d ${with_pgsql}/include; then
+- CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/include"
++ CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/include/postgresql"
+ else
+- CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}"
++ pg_config_flags=3D$(pg_config --includedir)
++ if test x"$pg_config_flags" !=3D x; then
++ CPPFLAGS=3D"${CPPFLAGS} -I$pg_config_flags"
++ else
++ CPPFLAGS=3D"${CPPFLAGS} -I${with_pgsql}/postgresql"
++ fi
+ fi
+=20
+=20
+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 */
+=20
+ #ifdef HAVE_PGSQL
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+=20
+ static void *_pgsql_open(char *host, char *port, int usessl,
+ const char *user, const char *password,

--EuxKj2iCbKjpUGkD--

--8NvZYKFJsRX2Djef
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFDv9WDKN6ufymYLloRAmGDAJ46W24I1G0LepEJh9L5CTHOUqn7kwCfZRZx
roJrVfI8IAWQRc9CEhF7HsY=
=A7ug
-----END PGP SIGNATURE-----

--8NvZYKFJsRX2Djef--