r1272 - in glibc-package/branches/glibc-2.4/debian: . patches
Author: schizo
Date: 2006-03-09 00:45:33 +0000 (Thu, 09 Mar 2006)
New Revision: 1272
Removed:
glibc-package/branches/glibc-2.4/debian/patches/sparc-socket-weakalias.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
- Remove sparc-socket-weakalias.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 00:36:57 UTC (rev 1271)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 00:45:33 UTC (rev 1272)
@@ -1,6 +1,7 @@
-glibc (2.3.999-1) UNRELEASED; urgency=low
+glibc (2.3.999-2) UNRELEASED; urgency=low
- * 2.4
+ * New upstream version 2.4.
+ - Remove sparc-socket-weakalias.diff (merged upstream).
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 00:36:57 UTC (rev 1271)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 00:45:33 UTC (rev 1272)
@@ -78,7 +78,6 @@
#hppa-fenv-align.diff -p1
#glibc235-hppa-fpu.diff -p1
#eh-frame-terminator.diff -p1
-#sparc-socket-weakalias.diff -p0
#powerpc-socket-weakalias.diff -p0
#arm-socket-weakalias.diff -p0
#divdi3-moddi3.diff -p0
Deleted: glibc-package/branches/glibc-2.4/debian/patches/sparc-socket-weakalias.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/sparc-socket-weakalias.diff 2006-03-09 00:36:57 UTC (rev 1271)
+++ glibc-package/branches/glibc-2.4/debian/patches/sparc-socket-weakalias.diff 2006-03-09 00:45:33 UTC (rev 1272)
@@ -1,72 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix __bind redefinition problem
-# DP: Related bugs:
-# DP: Dpatch author: Clint Adams
-# DP: Patch author: Clint Adams
-# DP: Upstream status: Not Submitted
-# DP: Status Details:
-# DP: Date: 2005-12-10
-
-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.
-
---- sysdeps/unix/sysv/linux/sparc/sparc32/socket.S.old 2003-08-31 13:23:11.000000000 -0400
-+++ sysdeps/unix/sysv/linux/sparc/sparc32/socket.S 2005-12-10 12:46:23.313930095 -0500
-@@ -40,7 +40,11 @@
- The .S files for the other calls just #define socket and #include this. */
-
- #ifndef __socket
--#define __socket P(__,socket)
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .globl __socket
-@@ -105,4 +109,6 @@
-
- END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
---- sysdeps/unix/sysv/linux/sparc/sparc64/socket.S.old 2003-08-31 13:23:11.000000000 -0400
-+++ sysdeps/unix/sysv/linux/sparc/sparc64/socket.S 2005-12-10 12:46:23.313930095 -0500
-@@ -40,7 +40,11 @@
- The .S files for the other calls just #define socket and #include this. */
-
- #ifndef __socket
--#define __socket P(__,socket)
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .globl __socket
-@@ -105,4 +109,6 @@
-
- END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
Reply to: