[Glibc-bsd-commits] r5507 - in trunk/freebsd-libs/debian: . patches

christoph at alioth.debian.org christoph at alioth.debian.org
Sun Aug 31 18:34:13 UTC 2014 

Author: christoph
Date: 2014-08-31 18:34:13 +0000 (Sun, 31 Aug 2014)
New Revision: 5507

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/05_libipx.diff
   trunk/freebsd-libs/debian/patches/cdefs_macros.diff
   trunk/freebsd-libs/debian/patches/dwarf.diff
   trunk/freebsd-libs/debian/patches/elf.diff
   trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
Refresh patches for 10.1

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/changelog	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,9 +1,16 @@
-freebsd-libs (10.0-7) UNRELEASED; urgency=medium
+freebsd-libs (10.1~pre1-1) UNRELEASED; urgency=medium
 
+  * Snapshot from upstream release branch
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 31 Aug 2014 11:13:09 -0700
+
+freebsd-libs (10.0-7) unstable; urgency=medium
+
+  [ Steven Chamberlain ]
   * Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
     From upstream 10-STABLE.  Thanks, Scott Howard.  (Closes: #749157)
 
- -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 13 Jul 2014 21:47:01 +0100
+ -- Christoph Egger <christoph at debian.org>  Sun, 31 Aug 2014 11:11:57 -0700
 
 freebsd-libs (10.0-6) unstable; urgency=medium
 

Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,16 +1,20 @@
---- a/lib/libipx/Makefile
-+++ b/lib/libipx/Makefile
+Index: freebsd-libs/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libipx/Makefile
++++ freebsd-libs/lib/libipx/Makefile
 @@ -1,6 +1,7 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/lib/libipx/Makefile 201381 2010-01-02 09:58:07Z ed $
  
  LIB=	ipx
 +SHLIB_MAJOR=    2
  SHLIBDIR?= /lib
  SRCS=	ipx_addr.c ipx_ntoa.c
  MAN=	ipx.3
---- a/sys/netipx/ipx.h
-+++ b/sys/netipx/ipx.h
-@@ -146,6 +146,7 @@
+Index: freebsd-libs/sys/netipx/ipx.h
+===================================================================
+--- freebsd-libs.orig/sys/netipx/ipx.h
++++ freebsd-libs/sys/netipx/ipx.h
+@@ -146,6 +146,7 @@ struct ipx_addr {
  	u_short		x_port;
  };
  
@@ -18,7 +22,7 @@
  /*
   * Socket address
   */
-@@ -156,6 +157,8 @@
+@@ -156,6 +157,8 @@ struct sockaddr_ipx {
  	char		sipx_zero[2];
  };
  #define sipx_port sipx_addr.x_port

Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -2,9 +2,11 @@
 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 @@
+Index: freebsd-libs/lib/libcam/camlib.h
+===================================================================
+--- freebsd-libs.orig/lib/libcam/camlib.h
++++ freebsd-libs/lib/libcam/camlib.h
+@@ -151,12 +151,12 @@ int			cam_get_device(const char *path, c
   * Buffer encoding/decoding routines, from the old SCSI library.
   */
  int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
@@ -19,7 +21,7 @@
  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 @@
+@@ -169,7 +169,7 @@ int csio_build_visit(struct ccb_scsiio *
  		     int (*arg_get)(void *hook, char *field_name),
  		     void *gethook);
  int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
@@ -28,8 +30,10 @@
  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
+Index: freebsd-libs/lib/libnetgraph/netgraph.h
+===================================================================
+--- freebsd-libs.orig/lib/libnetgraph/netgraph.h
++++ freebsd-libs/lib/libnetgraph/netgraph.h
 @@ -48,9 +48,9 @@
  
  __BEGIN_DECLS
@@ -42,9 +46,11 @@
  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
-@@ -245,7 +245,7 @@
+Index: freebsd-libs/lib/libusb/libusb.h
+===================================================================
+--- freebsd-libs.orig/lib/libusb/libusb.h
++++ freebsd-libs/lib/libusb/libusb.h
+@@ -268,7 +268,7 @@ typedef struct libusb_endpoint_descripto
  	uint8_t	bSynchAddress;
  	uint8_t *extra;
  	int	extra_length;
@@ -53,7 +59,7 @@
  
  typedef struct libusb_ss_endpoint_companion_descriptor {
  	uint8_t bLength;
-@@ -253,7 +253,7 @@
+@@ -276,7 +276,7 @@ typedef struct libusb_ss_endpoint_compan
  	uint8_t bMaxBurst;
  	uint8_t bmAttributes;
  	uint16_t wBytesPerInterval;
@@ -62,7 +68,7 @@
  
  typedef struct libusb_interface_descriptor {
  	uint8_t	bLength;
-@@ -268,12 +268,12 @@
+@@ -291,12 +291,12 @@ typedef struct libusb_interface_descript
  	struct libusb_endpoint_descriptor *endpoint;
  	uint8_t *extra;
  	int	extra_length;
@@ -77,7 +83,7 @@
  
  typedef struct libusb_config_descriptor {
  	uint8_t	bLength;
-@@ -287,7 +287,7 @@
+@@ -310,7 +310,7 @@ typedef struct libusb_config_descriptor
  	struct libusb_interface *interface;
  	uint8_t *extra;
  	int	extra_length;
@@ -86,7 +92,7 @@
  
  typedef struct libusb_usb_2_0_device_capability_descriptor {
  	uint8_t bLength;
-@@ -295,7 +295,7 @@
+@@ -318,7 +318,7 @@ typedef struct libusb_usb_2_0_device_cap
  	uint8_t bDevCapabilityType;
  	uint32_t bmAttributes;
  #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
@@ -95,7 +101,7 @@
  
  typedef struct libusb_ss_usb_device_capability_descriptor {
  	uint8_t bLength;
-@@ -311,7 +311,7 @@
+@@ -334,7 +334,7 @@ typedef struct libusb_ss_usb_device_capa
  	uint8_t bFunctionalitySupport;
  	uint8_t bU1DevExitLat;
  	uint16_t wU2DevExitLat;
@@ -104,7 +110,7 @@
  
  typedef struct libusb_bos_descriptor {
  	uint8_t bLength;
-@@ -320,7 +320,7 @@
+@@ -343,7 +343,7 @@ typedef struct libusb_bos_descriptor {
  	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;
@@ -113,7 +119,7 @@
  
  typedef struct libusb_control_setup {
  	uint8_t	bmRequestType;
-@@ -336,7 +336,7 @@
+@@ -359,7 +359,7 @@ typedef struct libusb_iso_packet_descrip
  	uint32_t length;
  	uint32_t actual_length;
  	enum libusb_transfer_status status;
@@ -122,7 +128,7 @@
  
  typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
  
-@@ -354,7 +354,7 @@
+@@ -377,7 +377,7 @@ typedef struct libusb_transfer {
  	uint8_t *buffer;
  	int	num_iso_packets;
  	struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -131,9 +137,11 @@
  
  /* Library initialisation */
  
---- a/lib/libusb/libusb20_desc.h
-+++ b/lib/libusb/libusb20_desc.h
-@@ -102,7 +102,7 @@
+Index: freebsd-libs/lib/libusb/libusb20_desc.h
+===================================================================
+--- freebsd-libs.orig/lib/libusb/libusb20_desc.h
++++ freebsd-libs/lib/libusb/libusb20_desc.h
+@@ -102,7 +102,7 @@ struct libusb20_me_struct {
  	void   *ptr;			/* data pointer */
  	uint16_t len;			/* defaults to zero */
  	uint16_t type;			/* defaults to LIBUSB20_ME_IS_EMPTY */
@@ -142,7 +150,7 @@
  
  struct libusb20_me_format {
  	const uint8_t *format;		/* always set */
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ struct libusb20_me_format {
  	   LIBUSB20_ME_IS_##un##SIGNED ,				\
  	   (size) & 0xFF, ((size) / 0x100) & 0xFF, )		\
    LIBUSB20_NOT(ismeta) ( u##int##bits##_t				\
@@ -151,7 +159,7 @@
  
  #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
    LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -561,7 +561,7 @@
+@@ -561,7 +561,7 @@ enum libusb20_iso_usage_type {
  struct libusb20_endpoint {
  	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
  	struct libusb20_me_struct extra;
@@ -160,7 +168,7 @@
  
  struct libusb20_interface {
  	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -570,14 +570,14 @@
+@@ -570,14 +570,14 @@ struct libusb20_interface {
  	struct libusb20_endpoint *endpoints;
  	uint8_t	num_altsetting;
  	uint8_t	num_endpoints;
@@ -177,9 +185,11 @@
  
  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
-@@ -71,9 +71,9 @@
+Index: freebsd-libs/sys/sys/sbuf.h
+===================================================================
+--- freebsd-libs.orig/sys/sys/sbuf.h
++++ freebsd-libs/sys/sys/sbuf.h
+@@ -71,9 +71,9 @@ int		 sbuf_bcpy(struct sbuf *, const voi
  int		 sbuf_cat(struct sbuf *, const char *);
  int		 sbuf_cpy(struct sbuf *, const char *);
  int		 sbuf_printf(struct sbuf *, const char *, ...)

Modified: trunk/freebsd-libs/debian/patches/dwarf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/dwarf.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/dwarf.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,14 +1,16 @@
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
+Index: freebsd-libs/lib/libdwarf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libdwarf/Makefile
++++ freebsd-libs/lib/libdwarf/Makefile
 @@ -1,6 +1,6 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/lib/libdwarf/Makefile 225227 2011-08-28 09:26:48Z kib $
  
 -LIB=	dwarf
 +LIB=	dwarf-freebsd
  
  SRCS=	\
  	dwarf_abbrev.c		\
-@@ -20,7 +20,8 @@
+@@ -20,7 +20,8 @@ SRCS=	\
  
  INCS=	dwarf.h libdwarf.h
  

Modified: trunk/freebsd-libs/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/elf.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,14 +1,16 @@
---- a/lib/libelf/Makefile
-+++ b/lib/libelf/Makefile
+Index: freebsd-libs/lib/libelf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libelf/Makefile
++++ freebsd-libs/lib/libelf/Makefile
 @@ -1,6 +1,6 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/lib/libelf/Makefile 238741 2012-07-24 16:03:28Z ache $
  
 -LIB=	elf
 +LIB=	elf-freebsd
  
  SRCS=	elf_begin.c						\
  	elf_cntl.c						\
-@@ -171,6 +171,8 @@
+@@ -171,6 +171,8 @@ libelf_convert.c:	elf_types.m4 libelf_co
  libelf_fsize.c:		elf_types.m4 libelf_fsize.m4
  libelf_msize.c:		elf_types.m4 libelf_msize.m4
  

Modified: trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,6 +1,8 @@
---- a/lib/libkvm/kvm.h
-+++ b/lib/libkvm/kvm.h
-@@ -42,7 +42,8 @@
+Index: freebsd-libs/lib/libkvm/kvm.h
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/kvm.h
++++ freebsd-libs/lib/libkvm/kvm.h
+@@ -43,7 +43,8 @@
  #define	VRS_KEY		"VERSION"
  
  #ifndef _SIZE_T_DECLARED

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2014-08-31 18:34:13 UTC (rev 5507)
@@ -3,7 +3,7 @@
 --- freebsd-libs.orig/lib/libgeom/Makefile
 +++ freebsd-libs/lib/libgeom/Makefile
 @@ -1,6 +1,7 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/lib/libgeom/Makefile 192376 2009-05-19 12:10:48Z trasz $
  
  LIB=	geom
 +SHLIB_MAJOR= 1

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/patches/series	2014-08-31 18:34:13 UTC (rev 5507)
@@ -1,7 +1,4 @@
 # Patches from (or merged in) upstream
-svn_HEAD_Makefile.inc.diff
-libusb_handle_events_completed.diff
-empty_libusb_call_macro.diff
 
 # Patches that are in good shape for merging upstream
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-08-27 21:42:18 UTC (rev 5506)
+++ trunk/freebsd-libs/debian/rules	2014-08-31 18:34:13 UTC (rev 5507)
@@ -36,9 +36,9 @@
 endif
 
 SOURCE = freebsd-libs
-SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
+#SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
 #SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
+SVN		:= https://svn0.us-west.freebsd.org/base/stable/$(major)
 #SVN		:= https://svn0.us-west.freebsd.org/base/head
 ORIGDIR = $(SOURCE)-$(tar_version)
 TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
@@ -50,7 +50,7 @@
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) \
-	SHLIB_MAJOR=0 \
+	SHLIB_MAJOR=0 MK_TESTS=yes\
 	bmake \
 	$(NULL)
 PMAKE = \

More information about the Glibc-bsd-commits mailing list