r953 - in glibc-package/trunk/debian: . patches sysdeps
Author: gotom
Date: 2005-07-17 13:39:56 +0000 (Sun, 17 Jul 2005)
New Revision: 953
Added:
glibc-package/trunk/debian/patches/hurd-ioctl-pfinet.dpatch
glibc-package/trunk/debian/patches/hurd-libpthread-indirect-loading.dpatch
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/00list
glibc-package/trunk/debian/patches/hurd-enable-ldconfig.dpatch
glibc-package/trunk/debian/sysdeps/gnu.mk
Log:
* start 2.3.5-3.
* Michael Banck <mbanck@debian.org>:
- debian/patches/hurd-enable-ldconfig.dpatch: Added to build ldconfig
again on Hurd. (Closes: #309489)
- debian/sysdeps/gnu.mk: Hurd-i386 needs --without-tls option to build.
- debian/patches/hurd-libpthread-indirect-loading.dpatch: Added to
make libpthread load indirectly on Hurd. (Closes: #312488)
- debian/patches/hurd-ioctl-pfinet.dpatch: Added to support part of
SIOCGIFHWADDR for pfinet on Hurd. (Closes: #295117)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/changelog 2005-07-17 13:39:56 UTC (rev 953)
@@ -1,3 +1,18 @@
+glibc (2.3.5-3) experimental; urgency=low
+
+ * GOTO Masanori <gotom@debian.org>
+
+ * Michael Banck <mbanck@debian.org>:
+ - debian/patches/hurd-enable-ldconfig.dpatch: Added to build ldconfig
+ again on Hurd. (Closes: #309489)
+ - debian/sysdeps/gnu.mk: Hurd-i386 needs --without-tls option to build.
+ - debian/patches/hurd-libpthread-indirect-loading.dpatch: Added to
+ make libpthread load indirectly on Hurd. (Closes: #312488)
+ - debian/patches/hurd-ioctl-pfinet.dpatch: Added to support part of
+ SIOCGIFHWADDR for pfinet on Hurd. (Closes: #295117)
+
+ -- GOTO Masanori <gotom@debian.org> Sun, 17 Jul 2005 17:27:30 +0900
+
glibc (2.3.5-2) experimental; urgency=low
* Debconf5 release.
Modified: glibc-package/trunk/debian/patches/00list
===================================================================
--- glibc-package/trunk/debian/patches/00list 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/patches/00list 2005-07-17 13:39:56 UTC (rev 953)
@@ -27,7 +27,7 @@
glibc23-cmov
libgcc-compat-all
libgcc-compat-other
-#hurd-enable-ldconfig # g: later
+hurd-enable-ldconfig
#30_glibc232-base # g: suspended
sparcv8-target
50_glibc232-arm-dwarf2-buildfix
@@ -71,3 +71,5 @@
glibc235-gcc4-sparc-mv8
glibc235-gcc4-mips-inline
glibc235-gcc4-mips-sysdeps
+hurd-libpthread-indirect-loading
+hurd-ioctl-pfinet
Modified: glibc-package/trunk/debian/patches/hurd-enable-ldconfig.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/hurd-enable-ldconfig.dpatch 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/patches/hurd-enable-ldconfig.dpatch 2005-07-17 13:39:56 UTC (rev 953)
@@ -2,6 +2,7 @@
# DP: Description: Enable ldconfig and such on hurd-i386
# DP: Author: Jeff Bailey <jbailey@nisa.net>
+# DP: Related Bugs: #309489
# DP: Upstream status: Not submitted
# DP: Status Details: Upstream disagrees with this patch, but I'm
# DP: putting it in so that we have expected Debian behaviour on the
@@ -30,13 +31,12 @@
fi
+
+use_ldconfig=yes
-diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/configure.in glibc-2.3.2/sysdeps/mach/hurd/configure.in
---- glibc-2.3.2.old/sysdeps/mach/hurd/configure.in 2002-10-23 02:21:18.000000000 -0400
-+++ glibc-2.3.2/sysdeps/mach/hurd/configure.in 2003-04-08 17:35:17.000000000 -0400
-@@ -62,3 +62,5 @@
- fi])
-
- hurd_MIG_RETCODE
+--- glibc-2.3.2.old/sysdeps/mach/hurd/configure.in.orig 2005-05-30 17:31:32.000000000 +0200
++++ glibc-2.3.2/sysdeps/mach/hurd/configure.in 2005-05-30 17:44:30.000000000 +0200
+@@ -36,3 +36,5 @@
+ if test "x$libc_cv_hurd_version" != xok; then
+ AC_MSG_ERROR(Hurd headers not installed or too old)
+ fi
+
+use_ldconfig=yes
diff -urN glibc-2.3.2.old/elf/ldconfig.c glibc-2.3.2/elf/ldconfig.c
Added: glibc-package/trunk/debian/patches/hurd-ioctl-pfinet.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/hurd-ioctl-pfinet.dpatch 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/patches/hurd-ioctl-pfinet.dpatch 2005-07-17 13:39:56 UTC (rev 953)
@@ -0,0 +1,46 @@
+#! /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>
+# DP: Patch author: Marco Gerards <metgerards@student.han.nl>
+# DP: Upstream status: Pending
+# 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.
+
+Index: sysdeps/mach/hurd/bits/ioctls.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/ioctls.h,v
+retrieving revision 1.7
+diff -u -p -u -p -r1.7 ioctls.h
+--- sysdeps/mach/hurd/bits/ioctls.h 6 Jul 2001 04:55:58 -0000 1.7
++++ sysdeps/mach/hurd/bits/ioctls.h 3 Aug 2004 13:55:34 -0000
+@@ -226,6 +226,7 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
+ #define SIOCSIFADDR _IOW('i', 12, struct ifreq) /* set ifnet address */
+ #define OSIOCGIFADDR _IOWR('i',13, struct ifreq) /* get ifnet address */
+ #define SIOCGIFADDR _IOWR('i',33, struct ifreq) /* get ifnet address */
++#define SIOCGIFHWADDR _IOWR('i',39, struct ifreq) /* get hwaddress */
+ #define SIOCSIFDSTADDR _IOW('i', 14, struct ifreq) /* set p-p address */
+ #define OSIOCGIFDSTADDR _IOWR('i',15, struct ifreq) /* get p-p address */
+ #define SIOCGIFDSTADDR _IOWR('i',34, struct ifreq) /* get p-p address */
Added: glibc-package/trunk/debian/patches/hurd-libpthread-indirect-loading.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/hurd-libpthread-indirect-loading.dpatch 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/patches/hurd-libpthread-indirect-loading.dpatch 2005-07-17 13:39:56 UTC (rev 953)
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+
+# DP: Description: Make libpthread load indirectly
+# DP: Related bugs: #312488
+# http://lists.gnu.org/archive/html/bug-hurd/2005-05/msg00029.html
+# DP: Patch Author: Roland McGrath
+# DP: Dpatch author: Michael Banck <mbanck@debian.org>
+# DP: Upstream status: Not applied
+# DP: Date: 08 Jun 2005
+
+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
+
+Index: sysdeps/mach/hurd/i386/init-first.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/i386/init-first.c,v
+retrieving revision 1.43
+diff -B -b -p -u -r1.43 init-first.c
+--- sysdeps/mach/hurd/i386/init-first.c 13 Sep 2004 00:42:46 -0000
+ 1.43
++++ sysdeps/mach/hurd/i386/init-first.c 3 May 2005 00:11:14 -0000
+@@ -54,7 +55,7 @@ extern int __libc_argc attribute_hidden;
+ extern char **__libc_argv attribute_hidden;
+ extern char **_dl_argv;
+
+-void *(*_cthread_init_routine) (void); /* Returns new SP to use. */
++extern void *(*_cthread_init_routine) (void) __attribute__ ((weak));
+ void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__));
+
+ /* Things that want to be run before _hurd_init or much anything else.
+@@ -203,7 +204,7 @@ init (int *data)
+ code as the return address, and the argument data immediately above
+ that on the stack. */
+
+- if (_cthread_init_routine)
++ if (&_cthread_init_routine && _cthread_init_routine)
+ {
+ /* Initialize cthreads, which will allocate us a new stack to run on. */
+ int *newsp = (*_cthread_init_routine) ();
+
Modified: glibc-package/trunk/debian/sysdeps/gnu.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/gnu.mk 2005-07-17 07:24:52 UTC (rev 952)
+++ glibc-package/trunk/debian/sysdeps/gnu.mk 2005-07-17 13:39:56 UTC (rev 953)
@@ -19,3 +19,6 @@
true
endef
+# TLS is broken currently and results in Mach panicing
+libc_extra_config_options := $(extra_config_options) --without-tls
+
Reply to: