[Glibc-bsd-commits] r4354 - in trunk/kfreebsd-kernel-headers: debian test

[Robert Millan]

Author: rmh
Date: 2012-08-17 11:08:14 +0000 (Fri, 17 Aug 2012)
New Revision: 4354

Added:
   trunk/kfreebsd-kernel-headers/test/sctp.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Strip __FBSDID() from all headers using it (including sctp.h).  (Closes: #684330)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-07-26 06:18:51 UTC (rev 4353)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-08-17 11:08:14 UTC (rev 4354)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.83) UNRELEASED; urgency=low
+
+  * Strip __FBSDID() from all headers using it (including sctp.h).
+    (Closes: #684330)
+
+ -- Robert Millan <rmh at debian.org>  Fri, 17 Aug 2012 13:08:05 +0200
+
 kfreebsd-kernel-headers (0.82) unstable; urgency=low
 
   * Convert __GNUCLIKE* feature tests into __GNUC__.  (Closes: #677417)

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-07-26 06:18:51 UTC (rev 4353)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-08-17 11:08:14 UTC (rev 4354)
@@ -55,6 +55,8 @@
 		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if defined(__GNUC__)/g' \
 		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if !defined(__GNUC__)/g' \
 		\
+		-e '/^\s*__FBSDID\s*(.*)\s*;$$/d' \
+		\
 		-e 's/defined\s*(\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\s*)/defined(__GNUC__)/g' \
 		-e 's/#\s*ifdef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if defined(__GNUC__)/g' \
 		-e 's/#\s*ifndef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if !defined(__GNUC__)/g' \

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2012-07-26 06:18:51 UTC (rev 4353)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2012-08-17 11:08:14 UTC (rev 4354)
@@ -10,6 +10,7 @@
 	devicestat.o \
 	in_pcb.o \
 	ppp.o \
+	sctp.o \
 	soundcard.o \
 	sys_sysctl.o \
 	stdarg.o \

Added: trunk/kfreebsd-kernel-headers/test/sctp.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/sctp.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/sctp.c	2012-08-17 11:08:14 UTC (rev 4354)
@@ -0,0 +1 @@
+#include <netinet/sctp.h>