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

[Robert Millan]

Author: rmh
Date: 2012-04-07 21:09:07 +0000 (Sat, 07 Apr 2012)
New Revision: 4177

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Add sed rule to replace __printflike.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-07 11:29:00 UTC (rev 4176)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-04-07 21:09:07 UTC (rev 4177)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.79) UNRELEASED; urgency=low
+
+  * Add sed rule to replace __printflike.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 07 Apr 2012 23:08:55 +0200
+
 kfreebsd-kernel-headers (0.78) unstable; urgency=low
 
   * Add <net/ppp_defs.h>, alongside ppp.c test.  (Closes: #663008)

Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff	2012-04-07 11:29:00 UTC (rev 4176)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff	2012-04-07 21:09:07 UTC (rev 4177)
@@ -1,7 +1,3 @@
----
- sys/sys/conf.h |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
 --- a/sys/sys/conf.h
 +++ b/sys/sys/conf.h
 @@ -43,6 +43,7 @@
@@ -12,34 +8,3 @@
  #include <sys/queue.h>
  #endif
  
-@@ -259,10 +260,10 @@
- void	dev_rel(struct cdev *dev);
- void	dev_strategy(struct cdev *dev, struct buf *bp);
- struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
--		int _perms, const char *_fmt, ...) __printflike(6, 7);
-+		int _perms, const char *_fmt, ...);
- struct cdev *make_dev_cred(struct cdevsw *_devsw, int _unit,
- 		struct ucred *_cr, uid_t _uid, gid_t _gid, int _perms,
--		const char *_fmt, ...) __printflike(7, 8);
-+		const char *_fmt, ...);
- #define	MAKEDEV_REF		0x01
- #define	MAKEDEV_WHTOUT		0x02
- #define	MAKEDEV_NOWAIT		0x04
-@@ -272,14 +273,14 @@
- struct cdev *make_dev_credf(int _flags,
- 		struct cdevsw *_devsw, int _unit,
- 		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
--		const char *_fmt, ...) __printflike(8, 9);
-+		const char *_fmt, ...);
- int	make_dev_p(int _flags, struct cdev **_cdev, struct cdevsw *_devsw,
- 		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
--		const char *_fmt, ...) __printflike(8, 9);
-+		const char *_fmt, ...);
- struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
- 		__printflike(2, 3);
- int	make_dev_alias_p(int _flags, struct cdev **_cdev, struct cdev *_pdev,
--		const char *_fmt, ...) __printflike(4, 5);
-+		const char *_fmt, ...);
- int	make_dev_physpath_alias(int _flags, struct cdev **_cdev,
- 	        struct cdev *_pdev, struct cdev *_old_alias,
-                 const char *_physpath);

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-04-07 11:29:00 UTC (rev 4176)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-04-07 21:09:07 UTC (rev 4177)
@@ -63,6 +63,7 @@
 		-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
 		-e 's/__aligned(\([^)]*\?\))/ __attribute__((aligned(\1)))/g' \
 		-e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
+		-e 's/__printflike(\([0-9]\+\),\s*\([0-9]\+\))/__attribute__((__format__ (__printf__, \1, \2)))/g' \
 		\
 		-e 's/defined\s*(\s*_SYS_CDEFS_H_\s*)/defined(_SYS_CDEFS_H)/g' \
 		-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \