[Glibc-bsd-commits] r5286 - in trunk/kfreebsd-kernel-headers/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-02 17:01:15 +0000 (Thu, 02 Jan 2014)
New Revision: 5286

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Rename MAXLOGNAME to __kernel_MAXLOGNAME to avoid collision with Glibc (which now sets MAXLOGNAME to a different value).

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-02 16:56:13 UTC (rev 5285)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-01-02 17:01:15 UTC (rev 5286)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (9.2~6) unstable; urgency=low
+
+  * Rename MAXLOGNAME to __kernel_MAXLOGNAME to avoid collision with
+    Glibc (which now sets MAXLOGNAME to a different value).
+
+ -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 16:20:12 +0100
+
 kfreebsd-kernel-headers (9.2~5) unstable; urgency=low
 
   [ Guillem Jover ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2014-01-02 16:56:13 UTC (rev 5285)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2014-01-02 17:01:15 UTC (rev 5286)
@@ -19,7 +19,7 @@
 +#if 0
  #define	MAXINTERP	PATH_MAX	/* max interpreter file name length */
 +#endif
- #define	MAXLOGNAME	17		/* max login name length (incl. NUL) */
+ #define	__kernel_MAXLOGNAME	17		/* max login name length (incl. NUL) */
  #define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
  #define	NCARGS		ARG_MAX		/* max bytes for an exec function */
 +#if 0

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2014-01-02 16:56:13 UTC (rev 5285)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2014-01-02 17:01:15 UTC (rev 5286)
@@ -84,6 +84,7 @@
 		-e 's/__size_t/__this_is_a_temporary_kludge__size_t/g' $(shell ## see rev 184135 in GCC SVN ##) \
 		\
 		-e 's/\(\s\|^\|(\)\(__\)\?ino_t\(\s\|)\|;\)/\1__kernel_ino_t\3/g' \
+		-e 's/\(\s\|^\|(\)\(__\)\?MAXLOGNAME\(\s\|)\|;\)/\1__kernel_MAXLOGNAME\3/g' \
 	; done)
 	echo "#include <sys/kern/param.h>" > misc/osreldate.h
 	echo "#include <stdint.h>" > misc/sys/stdint.h