r3898 - in glibc-package/trunk/debian: . patches patches/s390
Author: aurel32
Date: 2009-10-26 14:42:46 +0000 (Mon, 26 Oct 2009)
New Revision: 3898
Added:
glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/s390/submitted-getutmpx.diff: new patch to fix getutmpx() on
s390. Closes: #544838.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-10-23 14:50:39 UTC (rev 3897)
+++ glibc-package/trunk/debian/changelog 2009-10-26 14:42:46 UTC (rev 3898)
@@ -3,8 +3,12 @@
[ Samuel Thibault ]
* patches/hurd-i386/local-bigmem.diff: Fix patch.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 23 Oct 2009 08:48:29 +0200
+ [ Aurelien Jarno ]
+ * patches/s390/submitted-getutmpx.diff: new patch to fix getutmpx() on
+ s390. Closes: #544838.
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 26 Oct 2009 15:42:33 +0100
+
eglibc (2.10.1-2) unstable; urgency=low
[ Petr Salinger ]
Added: glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff
===================================================================
--- glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff (rev 0)
+++ glibc-package/trunk/debian/patches/s390/submitted-getutmpx.diff 2009-10-26 14:42:46 UTC (rev 3898)
@@ -0,0 +1,36 @@
+2009-10-26 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c: don't include
+ "sysdeps/gnu/getutmp.c", use a copy of the code instead.
+
+--- a/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
++++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutmp.c
+@@ -17,6 +17,7 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#include <assert.h>
+ #include <string.h>
+ #include <utmp.h>
+ /* This is an ugly hack but we must not see the getutmpx declaration. */
+@@ -26,13 +27,13 @@
+
+ #include "utmp-compat.h"
+
+-#undef weak_alias
+-#define weak_alias(n,a)
+-#define getutmp __getutmp
+-#define getutmpx __getutmpx
+-#include "sysdeps/gnu/getutmp.c"
+-#undef getutmp
+-#undef getutmpx
++void
++__getutmp (const struct utmpx *utmpx, struct utmp *utmp)
++{
++ assert (sizeof (struct utmp) == sizeof (struct utmpx));
++ memcpy (utmp, utmpx, sizeof (struct utmp));
++}
++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-23 14:50:39 UTC (rev 3897)
+++ glibc-package/trunk/debian/patches/series 2009-10-26 14:42:46 UTC (rev 3898)
@@ -130,6 +130,7 @@
s390/submitted-nexttowardf.diff
s390/submitted-siginfo.diff
+s390/submitted-getutmpx.diff
sh4/local-fpscr_values.diff
Reply to: