r4643 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2011-05-08 18:49:52 +0000 (Sun, 08 May 2011)
New Revision: 4643
Added:
glibc-package/trunk/debian/patches/any/cvs-sys-param-ARG_MAX.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/any/cvs-sys-param-ARG_MAX.diff from upstream to fix
bassackwards tests for ARG_MAX in sys/param.h. Closes: #583433.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-08 18:47:05 UTC (rev 4642)
+++ glibc-package/trunk/debian/changelog 2011-05-08 18:49:52 UTC (rev 4643)
@@ -4,6 +4,8 @@
sysconf().
* Add patches/any/cvs-resolv-tld.diff from upstream to fix resolution
of unqualified domain names.
+ * Add patches/any/cvs-sys-param-ARG_MAX.diff from upstream to fix
+ bassackwards tests for ARG_MAX in sys/param.h. Closes: #583433.
-- Aurelien Jarno <aurel32@debian.org> Wed, 04 May 2011 19:53:33 +0200
Added: glibc-package/trunk/debian/patches/any/cvs-sys-param-ARG_MAX.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sys-param-ARG_MAX.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-sys-param-ARG_MAX.diff 2011-05-08 18:49:52 UTC (rev 4643)
@@ -0,0 +1,26 @@
+2011-03-05 Jonathan Nieder <jrnieder@gmail.com>
+
+ * sysdeps/unix/sysv/linux/sys/param.h: Fix an #ifndef __undef_ARG_MAX
+ where #ifdef was intended. The intent is to prevent ARG_MAX from
+ being defined by the kernel headers.
+
+diff --git a/sysdeps/unix/sysv/linux/sys/param.h b/sysdeps/unix/sysv/linux/sys/param.h
+index 19c119a..da8f5e4 100644
+--- a/sysdeps/unix/sysv/linux/sys/param.h
++++ b/sysdeps/unix/sysv/linux/sys/param.h
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1995-1997,2000,2001,2003,2008 Free Software Foundation, Inc.
++/* Copyright (C) 1995-1997,2000,2001,2003,2008,2011
++ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -28,7 +29,7 @@
+ #include <linux/param.h>
+
+ /* The kernel headers defines ARG_MAX. The value is wrong, though. */
+-#ifndef __undef_ARG_MAX
++#ifdef __undef_ARG_MAX
+ # undef ARG_MAX
+ # undef __undef_ARG_MAX
+ #endif
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-05-08 18:47:05 UTC (rev 4642)
+++ glibc-package/trunk/debian/patches/series 2011-05-08 18:49:52 UTC (rev 4643)
@@ -249,3 +249,4 @@
any/submitted-fwrite-wur.diff
any/local-dl-deps.diff
any/cvs-resolv-tld.diff
+any/cvs-sys-param-ARG_MAX.diff
Reply to: