r1349 - in glibc-package/trunk/debian/patches: all any hurd-i386 i386 sparc
Author: aurel32
Date: 2006-04-08 15:26:46 +0000 (Sat, 08 Apr 2006)
New Revision: 1349
Modified:
glibc-package/trunk/debian/patches/all/locale-ru_RU.diff
glibc-package/trunk/debian/patches/any/local-base.diff
glibc-package/trunk/debian/patches/any/local-forward-backward-collation.diff
glibc-package/trunk/debian/patches/any/local-makeconfig.diff
glibc-package/trunk/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff
glibc-package/trunk/debian/patches/hurd-i386/local-enable-ldconfig.diff
glibc-package/trunk/debian/patches/i386/local-sse-oldkernel.diff
glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff
Log:
Now that we are using quilt, remove dpatch specific parts
Modified: glibc-package/trunk/debian/patches/all/locale-ru_RU.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/locale-ru_RU.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/all/locale-ru_RU.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Change default charset for 'russian' locale alias
# DP: Related bugs: #62586
# DP: Dpatch author: Ben Collins
@@ -9,20 +6,6 @@
# DP: Status Details: http://sources.redhat.com/bugzilla/show_bug.cgi?id=120
# DP: Date: 2002-03-10
-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
-
-# append the patch here and adjust the -p? flag in the patch calls.
diff -urN glibc-2.2.5.orig/intl/locale.alias glibc-2.2.5/intl/locale.alias
--- glibc-2.2.5.orig/intl/locale.alias Sun Jul 22 16:24:50 2001
+++ glibc-2.2.5/intl/locale.alias Sun Mar 10 23:00:09 2002
Modified: glibc-package/trunk/debian/patches/any/local-base.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-base.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/any/local-base.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,22 +1,6 @@
-#! /bin/sh -e
-
# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: hjl libc-base patch
-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 -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-
2003-05-15 <hongjiu.lu@intel.com>
* elf/do-lookup.h (FCT): Try the base version, the first
Modified: glibc-package/trunk/debian/patches/any/local-forward-backward-collation.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-forward-backward-collation.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/any/local-forward-backward-collation.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Description: Fix segfault when strings contain a mix of forward
# and backward rules.
# DP: Related bugs: #310635 BZ645
@@ -12,19 +10,6 @@
# DP: echo 2d d194 0a 2d d194 0a | xxd -r -p | sort
# DP: Date: 2006-03-17
-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
-
Index: glibc-2.3.6/string/strxfrm_l.c
===================================================================
--- glibc-2.3.6.orig/string/strxfrm_l.c
Modified: glibc-package/trunk/debian/patches/any/local-makeconfig.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-makeconfig.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/any/local-makeconfig.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,22 +1,7 @@
-#! /bin/sh -e
-
# DP: Carried over from glibc2.2, need to figure out why it's here.
# DP: (Probably has something to do with fakeroot)
# DP: Date: (Updated 2005-01-02 gotom)
-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 -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
--- Makeconfig 15 Dec 2004 18:51:47 -0000 1.302
+++ Makeconfig 2 Jan 2005 08:36:24 -0000
@@ -541,10 +541,11 @@
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Add SIOCGIFHWADDR ioctls for hurd-i386.
# DP: Related bugs: #295117
# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
@@ -9,22 +6,6 @@
# DP: Status Details: Currently not applied in cvs, but it's needed.
# DP: Date: 2005-07-17
-PATCHLEVEL=0
-
-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 -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
2004-08-03 Marco Gerards <metgerards@student.han.nl>
* sysdeps/mach/hurd/bits/ioctls.h (SIOCGIFHWADDR): New macro.
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-enable-ldconfig.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-enable-ldconfig.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-enable-ldconfig.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
# DP: Description: Enable ldconfig and such on hurd-i386
# DP: Author: Jeff Bailey <jbailey@nisa.net>
# DP: Related Bugs: #309489
@@ -9,19 +7,6 @@
# DP: Hurd. We should review this when the ELF standard supports runpath.
# DP: Date: 08 Apr 2003
-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
-
diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/configure glibc-2.3.2/sysdeps/mach/hurd/configure
--- glibc-2.3.2.old/sysdeps/mach/hurd/configure 2003-02-25 19:46:36.000000000 -0500
+++ glibc-2.3.2/sysdeps/mach/hurd/configure 2003-04-08 17:35:13.000000000 -0400
Modified: glibc-package/trunk/debian/patches/i386/local-sse-oldkernel.diff
===================================================================
--- glibc-package/trunk/debian/patches/i386/local-sse-oldkernel.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/i386/local-sse-oldkernel.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Disable SSE for 2.2.x kernels.
# DP: Related bugs: 218524
# DP: Author: Daniel Jacobowitz <dan@debian.org>
@@ -9,20 +6,6 @@
# DP: Date: 2003-11-01 (Updated 2003-11-02) (Updated 2004-01-02)
# DP: Date: (Updated 2005-01-03 gotom)
-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 -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
2005-01-03 GOTO Masanori <gotom@debian.org>
* sysdeps/i386/dl-machine.h: Remove including dl-procinfo.h.
Modified: glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff 2006-04-08 15:24:22 UTC (rev 1348)
+++ glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff 2006-04-08 15:26:46 UTC (rev 1349)
@@ -1,20 +1,5 @@
-#! /bin/sh -e
-
# DP: Fix ldconfig so that lib64 searches are implicit.
-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.3/elf/ldconfig.c~ Tue Mar 20 11:44:35 2001
+++ glibc-2.2.3/elf/ldconfig.c Tue Apr 24 18:14:05 2001
@@ -287,6 +287,26 @@
Reply to: