Comment 2 for bug 28232

Message-ID: <email address hidden>
Date: Thu, 12 Jan 2006 00:31:31 -0800
From: Steve Langasek <email address hidden>
To: <email address hidden>, <email address hidden>
Subject: fixes for heimdal RC bugs

--uQr8t48UFsdbeI+V
Content-Type: multipart/mixed; boundary="ZPt4rx8FFjLCG7dd"
Content-Disposition: inline

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

tags 346346 patch
tags 346680 patch
thanks

Attached is a patch that fixes the two RC bugs in heimdal.

You might want to drop the dozen cruft copies of patches for stale versions
of heimdal, btw. It required obscene contortions to generate this patch,
because interdiff refused to handle a 130,000 line diff. :P

--=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/

--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="heimdal-346346.diff"
Content-Transfer-Encoding: quoted-printable

diff -u heimdal-0.7.1/debian/patches/030_autotools heimdal-0.7.1/debian/pat=
ches/030_autotools
--- heimdal-0.7.1/debian/patches/030_autotools
+++ heimdal-0.7.1/debian/patches/030_autotools
@@ -123739,6 +123739,15 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=3D$?
+@@ -22598,7 +22598,7 @@
+ 2.*)
+ native_pthread_support=3Dyes
+ PTHREADS_CFLAGS=3D-pthread
+- PTHREADS_LIBS=3D-pthread
++ PTHREADS_LIBS=3D"-pthread -lpthread"
+ ;;
+ esac
+ ;;
 @@ -22716,8 +22709,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
diff -u heimdal-0.7.1/debian/changelog heimdal-0.7.1/debian/changelog
--- heimdal-0.7.1/debian/changelog
+++ heimdal-0.7.1/debian/changelog
@@ -1,3 +1,14 @@
+heimdal (0.7.1-2.1) unstable; urgency=3Dhigh
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Use -pthread -lpthread when linking shared libs, not just -pthread,
+ needed for proper linking of libgssapi on mips/mipsel. Closes: #34634=
6.
+ * Build-depend on libx11-dev, libxau-dev, libxt-dev, x-dev instead of the
+ obsolete xlibs-dev. Closes: #346680.
+
+ -- Steve Langasek <email address hidden> Wed, 11 Jan 2006 20:30:44 -0800
+
 heimdal (0.7.1-2) unstable; urgency=3Dlow
=20
   * Apply 022_ftp-roken-glob again.
diff -u heimdal-0.7.1/debian/control heimdal-0.7.1/debian/control
--- heimdal-0.7.1/debian/control
+++ heimdal-0.7.1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Brian May <email address hidden>
 Standards-Version: 3.6.2
-Build-Depends: libncurses5-dev, bison, flex, debhelper (>=3D 4.1.16), xlib=
s-dev, libedit-dev, libdb4.2-dev, libssl-dev (>=3D 0.9.7), dbs, libhesiod-d=
ev, comerr-dev (>=3D 1.35-1), libldap2-dev, ss-dev
+Build-Depends: libncurses5-dev, bison, flex, debhelper (>=3D 4.1.16), libx=
11-dev, libxau-dev, libxt-dev, x-dev, libedit-dev, libdb4.2-dev, libssl-dev=
 (>=3D 0.9.7), dbs, libhesiod-dev, comerr-dev (>=3D 1.35-1), libldap2-dev, =
ss-dev
 Build-Conflicts: heimdal-dev
=20
 Package: heimdal-docs
only in patch2:
unchanged:
--- heimdal-0.7.1.orig/debian/patches/025_pthreads
+++ heimdal-0.7.1/debian/patches/025_pthreads
@@ -0,0 +1,12 @@
+diff -Nru3 ./heimdal-0.7.1/cf/pthreads.m4 ../build-tree.new/heimdal-0.7.1/=
cf/pthreads.m4
+--- ./heimdal-0.7.1/cf/pthreads.m4 2005-09-09 05:12:28.000000000 -0700
++++ ../build-tree.new/heimdal-0.7.1/cf/pthreads.m4 2006-01-11 20:11:45.000=
000000 -0800
+@@ -32,7 +32,7 @@
+ 2.*)
+ native_pthread_support=3Dyes
+ PTHREADS_CFLAGS=3D-pthread
+- PTHREADS_LIBS=3D-pthread
++ PTHREADS_LIBS=3D"-pthread -lpthread"
+ ;;
+ esac
+ ;;

--ZPt4rx8FFjLCG7dd--

--uQr8t48UFsdbeI+V
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)

iD8DBQFDxhPiKN6ufymYLloRAiT9AJ9HYieQ+gsdasrvEpLCR1oYkCrpXQCggJs1
D23w8SBw8J6xBWiXoxnKfjU=
=0omW
-----END PGP SIGNATURE-----

--uQr8t48UFsdbeI+V--