Comment 4 for bug 11454

Message-ID: <email address hidden>
Date: Sat, 25 Dec 2004 12:51:31 +0200
From: Kalle Olavi Niemitalo <email address hidden>
To: <email address hidden>, <email address hidden>
Subject: Re: Bug#287169: pike7.2: FTBFS: #define sp clashes with <krb5.h> of heimdal-dev 0.6.3-5

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=

tags 287169 + patch
quit

--=-=-=
Content-Type: text/plain; format=flowed

Kalle Olavi Niemitalo <email address hidden> writes:

> I have a patch for this; I'll test it some more and then post
> it.

Here it is. After applying this, please build the tree once so
that src/modules/Kerberos/kerberos.c is regenerated, before you
make a source package.

--=-=-=
Content-Type: text/x-patch; charset=iso-8859-15
Content-Disposition: attachment; filename=pike7.2_7.2.580-2_287169.diff
Content-Transfer-Encoding: quoted-printable

pike7.2 (7.2.580-2.kon.1) local; urgency=3Dlow

  * Local version!
  * src/modules/Kerberos/kerberos.cmod: Avoid defining sp as a macro when
    including <krb5.h>. (closes: Bug#287169)
  * debian/changelog (VERSION): Recognize [a-z.] in Debian version number.

 -- Kalle Olavi Niemitalo <email address hidden> Sat, 25 Dec 2004 12:19:39 +0200

diff -ru pike7.2-7.2.580-2/src/modules/Kerberos/kerberos.cmod pike7.2-7.2.5=
80-2.kon.1/src/modules/Kerberos/kerberos.cmod
=2D-- pike7.2-7.2.580-2/src/modules/Kerberos/kerberos.cmod 2004-05-13 16:09=
:19.000000000 +0300
+++ pike7.2-7.2.580-2.kon.1/src/modules/Kerberos/kerberos.cmod 2004-12-25 1=
1:18:34.000000000 +0200
@@ -4,10 +4,14 @@
  * Kerberos support for Pike.
  *
  * 2004-05-12 Henrik Grubbstr=F6m
+ * Modified on 2004-12-25 by Kalle Olavi Niemitalo
  *
  * FIXME: Currently only minimal support, and only for Kerberos 5 (not 4).
  */
=20
+/* <krb5.h> has krb5_kt_cursor::sp, so don't define sp as a macro. */
+#define NO_PIKE_SHORTHAND
+
 #include "global.h"
 #include "config.h"
=20
@@ -38,6 +42,9 @@
 #include <krb5.h>
 #endif
=20
+/* The precompiler generates code using sp rather than Pike_sp. */
+#define sp Pike_sp
+
 PIKECLASS Context
 {
   CVAR krb5_context ctx;
diff -ru pike7.2-7.2.580-2/debian/rules pike7.2-7.2.580-2.kon.1/debian/rules
=2D-- pike7.2-7.2.580-2/debian/rules 2004-12-25 11:18:01.000000000 +0200
+++ pike7.2-7.2.580-2.kon.1/debian/rules 2004-12-25 12:18:52.000000000 +0200
@@ -7,6 +7,7 @@
 # package.
 #
 # $Id: rules,v 1.37 2003/01/02 00:43:39 grendel Exp $
+# Modified on 2004-12-25 by Kalle Olavi Niemitalo.
 #
=20
 # Uncomment this to turn on verbose mode.=20
@@ -38,7 +39,7 @@
 MACHINE_OPTS=3D--with-machine-code
 endif
=20
=2DVERSION=3D$(shell dpkg-parsechangelog | grep ^Version | sed -e 's/Versio=
n: //;s/-[0-9]*$$//')
+VERSION=3D$(shell dpkg-parsechangelog | grep ^Version | LC_ALL=3DC sed -e =
's/Version: //;s/-[0-9.a-z]*$$//')
 OS=3D$(shell uname -srm|sed -e 's/ /-/g'|tr '[A-Z]' '[a-z]'|tr '/' '_')
 BUILDDIR=3Dbuild/$(OS)
 CFARGS=3D--without-rtldebug \

--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

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

iD8DBQBBzUZPHm9IGt60eMgRAhISAJsHln/R5Ev9Q6IIT3Sz4znBqHTwFQCg1KZg
VPgqtZ98xlbNs+yxoK4z1ck=
=J38A
-----END PGP SIGNATURE-----
--==-=-=--