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 -- 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 heimdal-0.7.1/debian/patches/030_autotools
heimdal-0.7.1/debian/patches/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=$?
+@@ -22598,7 +22598,7 @@
+ 2.*)
+ native_pthread_support=yes
+ PTHREADS_CFLAGS=-pthread
+- PTHREADS_LIBS=-pthread
++ PTHREADS_LIBS="-pthread -lpthread"
+ ;;
+ esac
+ ;;
@@ -22716,8 +22709,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $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=high
+
+ * 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: #346346.
+ * Build-depend on libx11-dev, libxau-dev, libxt-dev, x-dev instead of the
+ obsolete xlibs-dev. Closes: #346680.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Wed, 11 Jan 2006 20:30:44 -0800
+
heimdal (0.7.1-2) unstable; urgency=low
* 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 PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: libncurses5-dev, bison, flex, debhelper (>= 4.1.16), xlibs-dev,
libedit-dev, libdb4.2-dev, libssl-dev (>= 0.9.7), dbs, libhesiod-dev,
comerr-dev (>= 1.35-1), libldap2-dev, ss-dev
+Build-Depends: libncurses5-dev, bison, flex, debhelper (>= 4.1.16),
libx11-dev, libxau-dev, libxt-dev, x-dev, libedit-dev, libdb4.2-dev, libssl-dev
(>= 0.9.7), dbs, libhesiod-dev, comerr-dev (>= 1.35-1), libldap2-dev, ss-dev
Build-Conflicts: heimdal-dev
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.000000000 -0800
+@@ -32,7 +32,7 @@
+ 2.*)
+ native_pthread_support=yes
+ PTHREADS_CFLAGS=-pthread
+- PTHREADS_LIBS=-pthread
++ PTHREADS_LIBS="-pthread -lpthread"
+ ;;
+ esac
+ ;;
signature.asc
Description: Digital signature
