Package: aolserver4
Version: 4.0.10-7
Severity: normal
Tags: patch
Hi! Similar to bug #360715, I'm seeing compile issues for more
architectures under Ubuntu (including i386). Since
pthread_kill_other_threads_np is a no-op since glibc 2.3 and is now
disappearing from the glibc headers totally, I'd like to propose that
the call be totally removed.
As an example, the attached debdiff renames and adjusts the amd64.dpatch
to suggested.
Thanks!
--
Kees Cook @outflux.net
diff -u aolserver4-4.0.10/debian/changelog aolserver4-4.0.10/debian/changelog
--- aolserver4-4.0.10/debian/changelog
+++ aolserver4-4.0.10/debian/changelog
@@ -1,3 +1,11 @@
+aolserver4 (4.0.10-7.1) unstable; urgency=low
+
+ * debian/patches/kill_other_threads.dpatch: totally drop call to
+ pthread_kill_other_threads_np since it is a no-op and will be undefined
+ shortly.
+
+ -- Kees Cook <[EMAIL PROTECTED]> Tue, 12 Dec 2006 17:06:04 -0800
+
aolserver4 (4.0.10-7) unstable; urgency=medium
* Moved to compat level 5 for debhelper and changed build-dep as consequence.
reverted:
--- aolserver4-4.0.10/debian/patches/amd64.dpatch
+++ aolserver4-4.0.10.orig/debian/patches/amd64.dpatch
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## amd64.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-diff -urNad aolserver4-4.0.10/nsd/unix.c /tmp/dpep.hUcuxt/aolserver4-4.0.10/nsd/unix.c
---- aolserver4-4.0.10/nsd/unix.c 2004-09-21 02:47:41.000000000 +0200
-+++ /tmp/dpep.hUcuxt/aolserver4-4.0.10/nsd/unix.c 2005-01-31 14:54:29.000000000 +0100
-@@ -64,7 +64,7 @@
- void
- FatalSignalHandler(int signal)
- {
--#ifdef __linux
-+#if defined( __linux ) && !defined(__x86_64__) && !defined(__powerpc64__)
- /*
- * LinuxThreads thread manager needs to kill all child threads
- * on fatal signals, else they get left behind as dead threads.
diff -u aolserver4-4.0.10/debian/patches/00list aolserver4-4.0.10/debian/patches/00list
--- aolserver4-4.0.10/debian/patches/00list
+++ aolserver4-4.0.10/debian/patches/00list
@@ -3,5 +3,5 @@
install-doc
conn.c
-amd64
+kill_other_threads
nstclinitobjs
httptime
only in patch2:
unchanged:
--- aolserver4-4.0.10.orig/debian/patches/kill_other_threads.dpatch
+++ aolserver4-4.0.10/debian/patches/kill_other_threads.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## amd64.dpatch by Kees Cook <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Totally drop call to pthread_kill_other_threads_np
+
[EMAIL PROTECTED]@
+diff -urNad aolserver4-4.0.10~/nsd/unix.c aolserver4-4.0.10/nsd/unix.c
+--- aolserver4-4.0.10~/nsd/unix.c 2005-03-06 12:00:24.000000000 -0800
++++ aolserver4-4.0.10/nsd/unix.c 2006-12-12 17:05:17.413556294 -0800
+@@ -64,7 +64,7 @@
+ void
+ FatalSignalHandler(int signal)
+ {
+-#ifdef __linux
++#if 0
+ /*
+ * LinuxThreads thread manager needs to kill all child threads
+ * on fatal signals, else they get left behind as dead threads.
