r1867 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2006-10-21 21:56:00 +0000 (Sat, 21 Oct 2006)
New Revision: 1867
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/local-no-pagesize.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
Merge from unstable
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-21 20:55:48 UTC (rev 1866)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-21 21:56:00 UTC (rev 1867)
@@ -213,6 +213,14 @@
-- Clint Adams <schizo@debian.org> Sun, 28 May 2006 03:28:14 +0200
+glibc (2.3.6.ds1-7) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * New any/local-no-pagesize.diff (remove the usage of PAGE_SIZE) by
+ Steve Langasek. Closes: #394385.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 21 Oct 2006 22:41:39 +0200
+
glibc (2.3.6.ds1-6) unstable; urgency=low
[ Aurelien Jarno ]
@@ -224,14 +232,14 @@
-- Aurelien Jarno <aurel32@debian.org> Sat, 7 Oct 2006 23:54:49 +0200
-glibc (2.3.6.ds1-5) UNRELEASED; urgency=low
+glibc (2.3.6.ds1-5) unstable; urgency=low
[ Aurelien Jarno ]
* debian/local/manpages/ldconfig.8: Update the manpage. Closes: #325921.
* debian/local/manpages/ld.so.8: Update the manpage. Closes: #171145,
#357676, #280027.
* rules.d/debhelper.mk: don't make ld.so.8.gz or ld.so.conf executable.
- * debian/FAQ: specify that LD_ASSUME_KERNEL does not work on amd64.
+ * debian/FAQ: specify that LD_ASSUME_KERNEL does not work on amd64.
Closes: #386924.
* patches/any/cvs-sqrt.diff: New patch from upstream to fix sqrt computation
for negative imaginary number. Closes: #388852.
@@ -247,7 +255,7 @@
* First weekday is Sunday in Brazil. Closes: #385859
Thanks Gunther and Felipe Augusto van de Wiel.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Aug 2006 21:04:20 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 1 Oct 2006 18:48:27 +0200
glibc (2.3.6.ds1-4) unstable; urgency=low
Added: glibc-package/branches/glibc-2.5/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-no-pagesize.diff (rev 0)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-no-pagesize.diff 2006-10-21 21:56:00 UTC (rev 1867)
@@ -0,0 +1,99 @@
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/alpha/sys/user.h 2001-07-06 06:56:13.000000000 +0200
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/alpha/sys/user.h 2006-10-21 22:38:36.108043157 +0200
+@@ -23,6 +23,7 @@
+ only. Don't read too much into it. Don't use it for anything other
+ than gdb/strace unless you know what you are doing. */
+
++#include <unistd.h>
+ #include <asm/page.h>
+ #include <asm/reg.h>
+
+@@ -41,7 +42,7 @@
+ char u_comm[32]; /* user command name */
+ };
+
+-#define NBPG PAGE_SIZE
++#define NBPG sysconf(_SC_PAGESIZE)
+ #define UPAGES 1
+ #define HOST_TEXT_START_ADDR (u.start_code)
+ #define HOST_DATA_START_ADDR (u.start_data)
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/i386/sys/user.h 2001-07-06 06:56:17.000000000 +0200
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/i386/sys/user.h 2006-10-21 22:38:40.748151944 +0200
+@@ -23,6 +23,8 @@
+ too much into it. Don't use it for anything other than GDB unless
+ you know what you are doing. */
+
++#include <unistd.h>
++
+ struct user_fpregs_struct
+ {
+ long int cwd;
+@@ -92,8 +94,7 @@
+ int u_debugreg [8];
+ };
+
+-#define PAGE_SHIFT 12
+-#define PAGE_SIZE (1UL << PAGE_SHIFT)
++#define PAGE_SIZE sysconf(_SC_PAGESIZE)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+ #define NBPG PAGE_SIZE
+ #define UPAGES 1
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/ia64/sys/user.h 2002-08-25 05:57:38.000000000 +0200
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/ia64/sys/user.h 2006-10-21 22:38:50.554268504 +0200
+@@ -21,6 +21,7 @@
+
+ #include <features.h>
+ #include <sys/types.h>
++#include <unistd.h>
+
+ /* This definition comes directly from the kernel headers. If
+ anything changes in them this header has to be changed, too. */
+@@ -45,7 +46,7 @@
+ char u_comm[32]; /* User command name. */
+ };
+
+-#define NBPG PAGE_SIZE
++#define NBPG sysconf(_SC_PAGESIZE)
+ #define UPAGES 1
+ #define HOST_TEXT_START_ADDR (u.start_code)
+ #define HOST_DATA_START_ADDR (u.start_data)
+--- glibc-2.3.6.orig/ports/sysdeps/unix/sysv/linux/mips/sys/user.h 2004-11-24 05:37:35.000000000 +0100
++++ glibc-2.3.6/ports/sysdeps/unix/sysv/linux/mips/sys/user.h 2006-10-21 22:39:01.575151737 +0200
+@@ -20,6 +20,7 @@
+ #define _SYS_USER_H 1
+
+ #include <sgidefs.h>
++#include <unistd.h>
+
+ /* The whole purpose of this file is for GDB and GDB only. Don't read
+ too much into it. Don't use it for anything other than GDB unless
+@@ -207,8 +208,7 @@
+
+ #endif
+
+-#define PAGE_SHIFT 12
+-#define PAGE_SIZE (1UL << PAGE_SHIFT)
++#define PAGE_SIZE sysconf(_SC_PAGESIZE)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+ #define NBPG PAGE_SIZE
+ #define UPAGES 1
+--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/x86_64/sys/user.h 2004-11-05 00:37:34.000000000 +0100
++++ glibc-2.3.6/sysdeps/unix/sysv/linux/x86_64/sys/user.h 2006-10-21 22:39:08.237872033 +0200
+@@ -24,6 +24,7 @@
+ you know what you are doing. */
+
+ #include <bits/wordsize.h>
++#include <unistd.h>
+
+ #if __WORDSIZE == 64
+
+@@ -164,8 +165,7 @@
+ };
+ #endif /* __WORDSIZE */
+
+-#define PAGE_SHIFT 12
+-#define PAGE_SIZE (1UL << PAGE_SHIFT)
++#define PAGE_SIZE sysconf(_SC_PAGESIZE)
+ #define PAGE_MASK (~(PAGE_SIZE-1))
+ #define NBPG PAGE_SIZE
+ #define UPAGES 1
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-21 20:55:48 UTC (rev 1866)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-21 21:56:00 UTC (rev 1867)
@@ -105,6 +105,7 @@
any/local-linuxthreads-tst-sighandler.diff -p1
any/local-localedef-fix-trampoline.diff -p1
any/local-makeconfig.diff -p0
+any/local-no-pagesize.diff -p1
any/local-nss-upgrade.diff -p1
any/local-rtld.diff -p1
any/local-sysctl.diff -p1
Reply to: