adjusted patches
gotom,
A couple patch adjustments for debian glibc cvs. The sparc64-got-fix
is in glibc-2-2-branch with a slight change in syntax so it can be
depreciated from the cvs patch set. Also, the glibc2.2.6-nice.dpatch
needs a 1 line offset now for the last part to apply to syscalls.list.
A corrected version is below...
----------------------------------------------------------------------------
#! /bin/sh -e
# DP: Fix compatibility of old and new nice interfaces. Patch by HJ Lu
if [ $# -ne 2 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
-unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
--- glibc-2.2.5/resource/Versions 1998-07-02 18:32:33.000000000 -0400
+++ glibc-2.2.5/resource/Versions.new 2002-08-22 08:34:00.000000000 -0400
@@ -22,4 +22,8 @@
# s*
setrlimit64;
}
+ GLIBC_2.2.6 {
+ # The new nice interface
+ nice;
+ }
}
--- glibc-2.2.5/sysdeps/unix/sysv/linux/nice.c 2002-08-21 19:18:06.000000000 -0400
+++ glibc-2.2.5/sysdeps/unix/sysv/linux/nice.c.new 2002-08-22 08:36:51.000000000 -0400
@@ -1 +1,5 @@
+#define nice __new_nice
#include <sysdeps/unix/nice.c>
+#undef nice
+#include <shlib-compat.h>
+versioned_symbol (libc, __new_nice, nice, GLIBC_2_2_5);
--- glibc-2.2.5/sysdeps/unix/sysv/linux/syscalls.list 2001-04-22 11:38:04.000000000 -0400
+++ glibc-2.2.5/sysdeps/unix/sysv/linux/syscalls.list.new 2002-08-22 08:38:17.000000000 -0400
@@ -31,6 +31,7 @@
munlock - munlock i:ai munlock
munlockall - munlockall i: munlockall
nanosleep - nanosleep i:pp __libc_nanosleep __nanosleep nanosleep
+oldnice EXTRA nice i:i __old_nice nice@GLIBC_2.0
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
pause - pause i: __libc_pause pause
personality init-first personality i:i __personality personality
-------------------------------------------------------------------------------
Please change out the existing glibc2.2.6-nice.dpatch for this copy and
re-enable that patch.
Thanks.
Jack
Reply to: