[Glibc-bsd-commits] r3994 - in trunk/freebsd-libs/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Jan 21 00:21:25 UTC 2012
Author: rmh
Date: 2012-01-21 00:21:25 +0000 (Sat, 21 Jan 2012)
New Revision: 3994
Added:
trunk/freebsd-libs/debian/patches/cdefs_macros.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/patches/02_libcam.diff
trunk/freebsd-libs/debian/patches/03_libsbuf.diff
trunk/freebsd-libs/debian/patches/11_netgraph.diff
trunk/freebsd-libs/debian/patches/12_usb.diff
trunk/freebsd-libs/debian/patches/series
Log:
cdefs_macros.diff: Replace all use of BSDish cdefs macros that affect exported headers. (Closes: #656562)
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/changelog 2012-01-21 00:21:25 UTC (rev 3994)
@@ -3,8 +3,10 @@
* Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.
* cpumask_t.diff: Workaround for removal of cpumask_t in kfreebsd-9
headers.
+ * cdefs_macros.diff: Replace all use of BSDish cdefs macros that
+ affect exported headers. (Closes: #656562)
- -- Robert Millan <rmh at debian.org> Sat, 21 Jan 2012 01:00:47 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 21 Jan 2012 01:21:17 +0100
freebsd-libs (8.3~svn229725-2) unstable; urgency=low
Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff 2012-01-21 00:21:25 UTC (rev 3994)
@@ -1,9 +1,3 @@
----
- lib/libcam/Makefile | 3 +--
- lib/libcam/camlib.c | 1 +
- lib/libcam/camlib.h | 9 +++------
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -6,8 +6,7 @@
@@ -16,31 +10,3 @@
MAN= cam.3 cam_cdbparse.3
---- a/lib/libcam/camlib.h
-+++ b/lib/libcam/camlib.h
-@@ -150,13 +150,11 @@
- /*
- * Buffer encoding/decoding routines, from the old SCSI library.
- */
--int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
-- __printflike(2, 3);
-+int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...);
- int csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
- void (*arg_put)(void *, int, void *, int, char *),
- void *puthook);
--int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
-- __printflike(3, 4);
-+int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...);
- int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
- void (*arg_put)(void *, int, void *, int, char *),
- void *puthook);
-@@ -168,8 +166,7 @@
- int timeout, const char *cmd_spec,
- int (*arg_get)(void *hook, char *field_name),
- void *gethook);
--int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
-- __printflike(2, 3);
-+int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...);
- int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
- int (*arg_get)(void *hook, char *field_name),
- void *gethook);
Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff 2012-01-21 00:21:25 UTC (rev 3994)
@@ -1,9 +1,3 @@
----
- lib/libsbuf/Makefile | 1 +
- sys/kern/subr_sbuf.c | 1 +
- sys/sys/sbuf.h | 9 ++++-----
- 3 files changed, 6 insertions(+), 5 deletions(-)
-
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@@ -4,6 +4,7 @@
@@ -26,16 +20,3 @@
struct sbuf;
struct sbuf_drain_data;
-@@ -68,10 +69,8 @@
- int sbuf_bcpy(struct sbuf *, const void *, size_t);
- int sbuf_cat(struct sbuf *, const char *);
- int sbuf_cpy(struct sbuf *, const char *);
--int sbuf_printf(struct sbuf *, const char *, ...)
-- __printflike(2, 3);
--int sbuf_vprintf(struct sbuf *, const char *, __va_list)
-- __printflike(2, 0);
-+int sbuf_printf(struct sbuf *, const char *, ...);
-+int sbuf_vprintf(struct sbuf *, const char *, va_list);
- int sbuf_putc(struct sbuf *, int);
- void sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
- int sbuf_trim(struct sbuf *);
Modified: trunk/freebsd-libs/debian/patches/11_netgraph.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/11_netgraph.diff 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/patches/11_netgraph.diff 2012-01-21 00:21:25 UTC (rev 3994)
@@ -1,6 +1,6 @@
--- a/lib/libnetgraph/netgraph.h
+++ b/lib/libnetgraph/netgraph.h
-@@ -43,14 +43,15 @@
+@@ -43,6 +43,7 @@
#ifndef _NETGRAPH_H_
#define _NETGRAPH_H_
@@ -8,16 +8,6 @@
#include <sys/types.h>
#include <netgraph/ng_message.h>
- __BEGIN_DECLS
- int NgMkSockNode(const char *, int *, int *);
--int NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
-+int NgNameNode(int, const char *, const char *, ...);
- int NgSendMsg(int, const char *, int, int, const void *, size_t);
--int NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
-+int NgSendAsciiMsg(int, const char *, const char *, ...);
- int NgSendReplyMsg(int, const char *,
- const struct ng_mesg *, const void *, size_t);
- int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
--- a/lib/libnetgraph/sock.c
+++ b/lib/libnetgraph/sock.c
@@ -44,6 +44,8 @@
Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff 2012-01-21 00:21:25 UTC (rev 3994)
@@ -29,57 +29,6 @@
#ifdef __cplusplus
extern "C" {
-@@ -242,7 +243,7 @@
- uint8_t bSynchAddress;
- uint8_t *extra;
- int extra_length;
--} libusb_endpoint_descriptor __aligned(sizeof(void *));
-+} libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
-
- typedef struct libusb_ss_endpoint_companion_descriptor {
- uint8_t bLength;
-@@ -265,12 +266,12 @@
- struct libusb_endpoint_descriptor *endpoint;
- uint8_t *extra;
- int extra_length;
--} libusb_interface_descriptor __aligned(sizeof(void *));
-+} libusb_interface_descriptor __attribute__((__aligned__(sizeof(void *))));
-
- typedef struct libusb_interface {
- struct libusb_interface_descriptor *altsetting;
- int num_altsetting;
--} libusb_interface __aligned(sizeof(void *));
-+} libusb_interface __attribute__((__aligned__(sizeof(void *))));
-
- typedef struct libusb_config_descriptor {
- uint8_t bLength;
-@@ -284,7 +285,7 @@
- struct libusb_interface *interface;
- uint8_t *extra;
- int extra_length;
--} libusb_config_descriptor __aligned(sizeof(void *));
-+} libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
-
- typedef struct libusb_usb_2_0_device_capability_descriptor {
- uint8_t bLength;
-@@ -333,7 +334,7 @@
- uint32_t length;
- uint32_t actual_length;
- enum libusb_transfer_status status;
--} libusb_iso_packet_descriptor __aligned(sizeof(void *));
-+} libusb_iso_packet_descriptor __attribute__((__aligned__(sizeof(void *))));
-
- typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-
-@@ -352,7 +353,7 @@
- void *os_priv;
- int num_iso_packets;
- struct libusb_iso_packet_descriptor iso_packet_desc[0];
--} libusb_transfer __aligned(sizeof(void *));
-+} libusb_transfer __attribute__((__aligned__(sizeof(void *))));
-
- /* Library initialisation */
-
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
@@ -45,6 +45,8 @@
@@ -91,47 +40,3 @@
#ifdef __cplusplus
extern "C" {
#endif
-@@ -98,7 +100,7 @@
- void *ptr; /* data pointer */
- uint16_t len; /* defaults to zero */
- uint16_t type; /* defaults to LIBUSB20_ME_IS_EMPTY */
--} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
-+} __attribute__((__aligned__(LIBUSB20_ME_STRUCT_ALIGN)));
-
- struct libusb20_me_format {
- const uint8_t *format; /* always set */
-@@ -120,7 +122,7 @@
- LIBUSB20_ME_IS_##un##SIGNED , \
- (size) & 0xFF, ((size) / 0x100) & 0xFF, ) \
- LIBUSB20_NOT(ismeta) ( u##int##bits##_t \
-- __aligned((bits) / 8) field a; )
-+ __attribute__((__aligned__((bits) / 8))) field a; )
-
- #define LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
- LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -557,7 +559,7 @@
- struct libusb20_endpoint {
- struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
- struct libusb20_me_struct extra;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
-
- struct libusb20_interface {
- struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -566,14 +568,14 @@
- struct libusb20_endpoint *endpoints;
- uint8_t num_altsetting;
- uint8_t num_endpoints;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
-
- struct libusb20_config {
- struct LIBUSB20_CONFIG_DESC_DECODED desc;
- struct libusb20_me_struct extra;
- struct libusb20_interface *interface;
- uint8_t num_interface;
--} __aligned(sizeof(void *));
-+} __attribute__((__aligned__(sizeof(void *))));
-
- uint8_t libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
- uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
Added: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff 2012-01-21 00:21:25 UTC (rev 3994)
@@ -0,0 +1,193 @@
+
+With exported headers using a hacked <sys/cdefs.h> is not enough, since
+they're used by external programs. Manual patching is required...
+
+--- a/lib/libcam/camlib.h
++++ b/lib/libcam/camlib.h
+@@ -151,12 +151,12 @@
+ * Buffer encoding/decoding routines, from the old SCSI library.
+ */
+ int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
+- __printflike(2, 3);
++ __attribute((format(printf, (2), (3))));
+ int csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
+ void (*arg_put)(void *, int, void *, int, char *),
+ void *puthook);
+ int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
+- __printflike(3, 4);
++ __attribute((format(printf, (3), (4))));
+ int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
+ void (*arg_put)(void *, int, void *, int, char *),
+ void *puthook);
+@@ -169,7 +169,7 @@
+ int (*arg_get)(void *hook, char *field_name),
+ void *gethook);
+ int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
+- __printflike(2, 3);
++ __attribute((format(printf, (2), (3))));
+ int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
+ int (*arg_get)(void *hook, char *field_name),
+ void *gethook);
+--- a/lib/libnetgraph/netgraph.h
++++ b/lib/libnetgraph/netgraph.h
+@@ -48,9 +48,9 @@
+
+ __BEGIN_DECLS
+ int NgMkSockNode(const char *, int *, int *);
+-int NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
++int NgNameNode(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
+ int NgSendMsg(int, const char *, int, int, const void *, size_t);
+-int NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
++int NgSendAsciiMsg(int, const char *, const char *, ...) __attribute((format(printf, (3), (4))));
+ int NgSendReplyMsg(int, const char *,
+ const struct ng_mesg *, const void *, size_t);
+ int NgRecvMsg(int, struct ng_mesg *, size_t, char *);
+--- a/lib/libusb/libusb.h
++++ b/lib/libusb/libusb.h
+@@ -242,7 +242,7 @@
+ uint8_t bSynchAddress;
+ uint8_t *extra;
+ int extra_length;
+-} libusb_endpoint_descriptor __aligned(sizeof(void *));
++} libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_ss_endpoint_companion_descriptor {
+ uint8_t bLength;
+@@ -250,7 +250,7 @@
+ uint8_t bMaxBurst;
+ uint8_t bmAttributes;
+ uint16_t wBytesPerInterval;
+-} libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
++} libusb_ss_endpoint_companion_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_interface_descriptor {
+ uint8_t bLength;
+@@ -265,12 +265,12 @@
+ struct libusb_endpoint_descriptor *endpoint;
+ uint8_t *extra;
+ int extra_length;
+-} libusb_interface_descriptor __aligned(sizeof(void *));
++} libusb_interface_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_interface {
+ struct libusb_interface_descriptor *altsetting;
+ int num_altsetting;
+-} libusb_interface __aligned(sizeof(void *));
++} libusb_interface __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_config_descriptor {
+ uint8_t bLength;
+@@ -284,7 +284,7 @@
+ struct libusb_interface *interface;
+ uint8_t *extra;
+ int extra_length;
+-} libusb_config_descriptor __aligned(sizeof(void *));
++} libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_usb_2_0_device_capability_descriptor {
+ uint8_t bLength;
+@@ -292,7 +292,7 @@
+ uint8_t bDevCapabilityType;
+ uint32_t bmAttributes;
+ #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT (1 << 1)
+-} libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
++} libusb_usb_2_0_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_ss_usb_device_capability_descriptor {
+ uint8_t bLength;
+@@ -308,7 +308,7 @@
+ uint8_t bFunctionalitySupport;
+ uint8_t bU1DevExitLat;
+ uint16_t wU2DevExitLat;
+-} libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
++} libusb_ss_usb_device_capability_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_bos_descriptor {
+ uint8_t bLength;
+@@ -317,7 +317,7 @@
+ uint8_t bNumDeviceCapabilities;
+ struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
+ struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+-} libusb_bos_descriptor __aligned(sizeof(void *));
++} libusb_bos_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef struct libusb_control_setup {
+ uint8_t bmRequestType;
+@@ -333,7 +333,7 @@
+ uint32_t length;
+ uint32_t actual_length;
+ enum libusb_transfer_status status;
+-} libusb_iso_packet_descriptor __aligned(sizeof(void *));
++} libusb_iso_packet_descriptor __attribute__((__aligned__(sizeof(void *))));
+
+ typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
+
+@@ -352,7 +352,7 @@
+ void *os_priv;
+ int num_iso_packets;
+ struct libusb_iso_packet_descriptor iso_packet_desc[0];
+-} libusb_transfer __aligned(sizeof(void *));
++} libusb_transfer __attribute__((__aligned__(sizeof(void *))));
+
+ /* Library initialisation */
+
+--- a/lib/libusb/libusb20_desc.h
++++ b/lib/libusb/libusb20_desc.h
+@@ -98,7 +98,7 @@
+ void *ptr; /* data pointer */
+ uint16_t len; /* defaults to zero */
+ uint16_t type; /* defaults to LIBUSB20_ME_IS_EMPTY */
+-} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
++} __attribute__((__aligned__(LIBUSB20_ME_STRUCT_ALIGN)));
+
+ struct libusb20_me_format {
+ const uint8_t *format; /* always set */
+@@ -120,7 +120,7 @@
+ LIBUSB20_ME_IS_##un##SIGNED , \
+ (size) & 0xFF, ((size) / 0x100) & 0xFF, ) \
+ LIBUSB20_NOT(ismeta) ( u##int##bits##_t \
+- __aligned((bits) / 8) field a; )
++ __attribute__((__aligned__((bits) / 8))) field a; )
+
+ #define LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
+ LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
+@@ -557,7 +557,7 @@
+ struct libusb20_endpoint {
+ struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
+ struct libusb20_me_struct extra;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+
+ struct libusb20_interface {
+ struct LIBUSB20_INTERFACE_DESC_DECODED desc;
+@@ -566,14 +566,14 @@
+ struct libusb20_endpoint *endpoints;
+ uint8_t num_altsetting;
+ uint8_t num_endpoints;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+
+ struct libusb20_config {
+ struct LIBUSB20_CONFIG_DESC_DECODED desc;
+ struct libusb20_me_struct extra;
+ struct libusb20_interface *interface;
+ uint8_t num_interface;
+-} __aligned(sizeof(void *));
++} __attribute__((__aligned__(sizeof(void *))));
+
+ uint8_t libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
+ uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
+--- a/sys/sys/sbuf.h
++++ b/sys/sys/sbuf.h
+@@ -69,9 +69,9 @@
+ int sbuf_cat(struct sbuf *, const char *);
+ int sbuf_cpy(struct sbuf *, const char *);
+ int sbuf_printf(struct sbuf *, const char *, ...)
+- __printflike(2, 3);
++ __attribute((format(printf, (2), (3))));
+ int sbuf_vprintf(struct sbuf *, const char *, __va_list)
+- __printflike(2, 0);
++ __attribute((format(printf, (2), (0))));
+ int sbuf_putc(struct sbuf *, int);
+ void sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
+ int sbuf_trim(struct sbuf *);
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2012-01-21 00:19:20 UTC (rev 3993)
+++ trunk/freebsd-libs/debian/patches/series 2012-01-21 00:21:25 UTC (rev 3994)
@@ -1,3 +1,4 @@
+cdefs_macros.diff
00_sbuf_page_size.diff
01_sys_cam.diff
02_libcam.diff
More information about the Glibc-bsd-commits
mailing list