Comment 12 for bug 15288

Message-ID: <email address hidden>
Date: Wed, 24 Aug 2005 19:58:39 -0700
From: Steve Langasek <email address hidden>
To: <email address hidden>
Subject: Re: cyrus-sasl2: FTBFS (amd64/gcc-4.0): static declaration of 'global_callbacks' follows
 non-static declaration

--q8dntDJTu318bll0
Content-Type: multipart/mixed; boundary="7vAdt9JsdkkzRPKN"
Content-Disposition: inline

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

Hi Dima,

I have prepared an NMU for cyrus-sasl2 to fix this bug, and to update the
build-dependencies for postgresql support. Please find the patch attached.

I will be uploading this package to the DELAYED/2-day queue on gluck.

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/

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

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,14 @@
+cyrus-sasl2 (2.1.19-1.6) unstable; urgency=3Dmedium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfixes.
+ * Drop the extern declaration of a static variable global_callbacks,
+ allowing the package to build with gcc-4.0 (closes: #285605).
+ * Build-Depend on libpq-dev instead of on postgresql-dev, as the
+ latter package name is obsolete. (Ref: #315177)
+
+ -- Steve Langasek <email address hidden> Wed, 24 Aug 2005 17:41:57 -0700
+
 cyrus-sasl2 (2.1.19-1.5) unstable; urgency=3Demergency
=20
   * NMU
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), postgresql-dev, libldap2-dev (>=
=3D 2.1.21), automake1.7 (>=3D 1.7.9), autoconf (>=3D2.57), dbs, groff-base=
, comerr-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), 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-Conflicts: autoconf2.13, automake1.4
 Section: devel
 Priority: important
only in patch2:
unchanged:
--- cyrus-sasl2-2.1.19.orig/debian/patches/23_gcc40_static.diff
+++ cyrus-sasl2-2.1.19/debian/patches/23_gcc40_static.diff
@@ -0,0 +1,12 @@
+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
+@@ -109,8 +109,6 @@
+ const char *appname;
+ } sasl_global_callbacks_t;
+=20
+-extern sasl_global_callbacks_t global_callbacks;
+-
+ typedef struct _sasl_external_properties=20
+ {
+ sasl_ssf_t ssf;

--7vAdt9JsdkkzRPKN--

--q8dntDJTu318bll0
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)

iD8DBQFDDTPfKN6ufymYLloRAnHwAJ9GWFDrasOWrnbdPtRuV5c/a6kdrQCgiwxR
0V0tIvaOMos3NpdX1BO3f/4=
=N47+
-----END PGP SIGNATURE-----

--q8dntDJTu318bll0--