r3912 - in glibc-package/trunk/debian: . patches patches/any patches/s390
Author: aurel32
Date: 2009-10-30 07:51:16 +0000 (Fri, 30 Oct 2009)
New Revision: 3912
Added:
glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff
Removed:
glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Replace patches/s390/submitted-getutmpx.diff by upstream version
(patches/any/cvs-getutmpx-compat.diff).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-10-29 11:15:46 UTC (rev 3911)
+++ glibc-package/trunk/debian/changelog 2009-10-30 07:51:16 UTC (rev 3912)
@@ -11,8 +11,10 @@
* kfreebsd/local-sysdeps.diff: update to revision 2817 (from glibc-bsd).
Fixes <netinet/icmp6.h>. Closes: #552138.
* Disable PIE on MIPS/MIPSEL.
+ * Replace patches/s390/submitted-getutmpx.diff by upstream version
+ (patches/any/cvs-getutmpx-compat.diff).
- -- Aurelien Jarno <aurel32@debian.org> Thu, 29 Oct 2009 12:15:25 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 30 Oct 2009 08:50:28 +0100
eglibc (2.10.1-3) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-getutmpx-compat.diff 2009-10-30 07:51:16 UTC (rev 3912)
@@ -0,0 +1,24 @@
+2009-10-29 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10847]
+ * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with
+ getutmpx symbol.
+
+--- a/sysdeps/gnu/getutmp.c
++++ b/sysdeps/gnu/getutmp.c
+@@ -19,10 +19,12 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <utmp.h>
++#ifndef _UTMPX_H
+ /* This is an ugly hack but we must not see the getutmpx declaration. */
+-#define getutmpx XXXgetutmpx
+-#include <utmpx.h>
+-#undef getutmpx
++# define getutmpx XXXgetutmpx
++# include <utmpx.h>
++# undef getutmpx
++#endif
+
+ void
+ getutmp (const struct utmpx *utmpx, struct utmp *utmp)
Deleted: glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff
===================================================================
--- glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff 2009-10-29 11:15:46 UTC (rev 3911)
+++ glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff 2009-10-30 07:51:16 UTC (rev 3912)
@@ -1,30 +0,0 @@
-2009-10-26 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c: redefine
- strong_alias instead of weak_alias before the include.
- Alias __getutmpx to __getutmp in this file.
-
-diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
-index 2a14e12..acb6270 100644
---- a/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
-+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
-@@ -26,13 +26,17 @@
-
- #include "utmp-compat.h"
-
--#undef weak_alias
--#define weak_alias(n,a)
-+#undef strong_alias
-+#define strong_alias(n,a)
- #define getutmp __getutmp
- #define getutmpx __getutmpx
- #include "sysdeps/gnu/getutmp.c"
- #undef getutmp
- #undef getutmpx
-+#undef strong_alias
-+#define strong_alias(name, aliasname) _strong_alias(name, aliasname)
-+
-+strong_alias (__getutmp, __getutmpx)
-
- default_symbol_version (__getutmp, getutmp, UTMP_COMPAT_BASE);
- default_symbol_version (__getutmpx, getutmpx, UTMP_COMPAT_BASE);
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-10-29 11:15:46 UTC (rev 3911)
+++ glibc-package/trunk/debian/patches/series 2009-10-30 07:51:16 UTC (rev 3912)
@@ -130,7 +130,6 @@
s390/submitted-nexttowardf.diff
s390/submitted-siginfo.diff
-s390/submitted-getutmpx.diff
sh4/local-fpscr_values.diff
@@ -207,3 +206,4 @@
any/submitted-missing-etc-resolv.conf.diff
any/submitted-localedef-mmap.diff
any/submitted-confname.h.diff
+any/cvs-getutmpx-compat.diff
Reply to: