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

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Sat Oct 4 16:47:40 UTC 2014 

Author: ps-guest
Date: 2014-10-04 16:47:39 +0000 (Sat, 04 Oct 2014)
New Revision: 5582

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/02_libcam.diff
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/05_libipx.diff
   trunk/freebsd-libs/debian/patches/08_libdevstat.diff
   trunk/freebsd-libs/debian/patches/12_usb.diff
   trunk/freebsd-libs/debian/patches/13_jail.diff
   trunk/freebsd-libs/debian/patches/14_alias.diff
   trunk/freebsd-libs/debian/patches/assume_default_login_class.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/libbsd_nlist.diff
   trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
   trunk/freebsd-libs/debian/patches/libusb_backward.diff
   trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/patches/pty_decls.diff
   trunk/freebsd-libs/debian/patches/rlimit.diff
   trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
   trunk/freebsd-libs/debian/rules
Log:
sync with 10.1 releng



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/changelog	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,5 +1,7 @@
-freebsd-libs (10.1~svn271690-2) UNRELEASED; urgency=medium
+freebsd-libs (10.1~svn272500-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot of 10.1 releng branch
+
   [ Steven Chamberlain ]
   * Match up libutil.h declarations of openpty, forkpty with those in
     GNU libc pty.h, in case an application includes both (fixes FTBFS of

Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libcam/Makefile
 +++ b/lib/libcam/Makefile
-@@ -6,8 +6,7 @@
+@@ -6,8 +6,7 @@ SRCS=		camlib.c scsi_cmdparse.c scsi_all
  		ata_all.c smp_all.c
  INCS=		camlib.h
  

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libkvm/kvm_vnet.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_vnet.c
-+++ freebsd-libs/lib/libkvm/kvm_vnet.c
+--- a/lib/libkvm/kvm_vnet.c
++++ b/lib/libkvm/kvm_vnet.c
 @@ -68,18 +68,18 @@ _kvm_vnet_selectpid(kvm_t *kd, pid_t pid
  		 * here to __{start,stop}_set_vnet.
  		 */
@@ -28,10 +26,8 @@
  	};
  	uintptr_t procp, credp;
  #define	VMCORE_VNET_OF_PROC0
-Index: freebsd-libs/lib/libkvm/kvm_proc.c
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm_proc.c
-+++ freebsd-libs/lib/libkvm/kvm_proc.c
+--- a/lib/libkvm/kvm_proc.c
++++ b/lib/libkvm/kvm_proc.c
 @@ -387,6 +387,12 @@ nopgrp:
  		kp->ki_runtime = cputick2usec(proc.p_rux.rux_runtime);
  		kp->ki_pid = proc.p_pid;
@@ -45,10 +41,8 @@
  		SIGSETOR(kp->ki_siglist, mtd.td_siglist);
  		kp->ki_sigmask = mtd.td_sigmask;
  		kp->ki_xstat = proc.p_xstat;
-Index: freebsd-libs/lib/libkvm/kvm.h
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm.h
-+++ freebsd-libs/lib/libkvm/kvm.h
+--- a/lib/libkvm/kvm.h
++++ b/lib/libkvm/kvm.h
 @@ -35,6 +35,7 @@
  
  #include <sys/cdefs.h>

Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,19 +1,15 @@
-Index: freebsd-libs/lib/libipx/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libipx/Makefile
-+++ freebsd-libs/lib/libipx/Makefile
+--- a/lib/libipx/Makefile
++++ b/lib/libipx/Makefile
 @@ -1,6 +1,7 @@
- # $FreeBSD: stable/10/lib/libipx/Makefile 201381 2010-01-02 09:58:07Z ed $
+ # $FreeBSD$
  
  LIB=	ipx
 +SHLIB_MAJOR=    2
  SHLIBDIR?= /lib
  SRCS=	ipx_addr.c ipx_ntoa.c
  MAN=	ipx.3
-Index: freebsd-libs/sys/netipx/ipx.h
-===================================================================
---- freebsd-libs.orig/sys/netipx/ipx.h
-+++ freebsd-libs/sys/netipx/ipx.h
+--- a/sys/netipx/ipx.h
++++ b/sys/netipx/ipx.h
 @@ -146,6 +146,7 @@ struct ipx_addr {
  	u_short		x_port;
  };

Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -5,7 +5,7 @@
 
 --- a/lib/libdevstat/Makefile
 +++ b/lib/libdevstat/Makefile
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ SRCS=	devstat.c
  INCS=	devstat.h
  
  DPADD=	${LIBKVM}
@@ -14,7 +14,7 @@
  
  MAN=	devstat.3
  
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ MLINKS+=devstat.3 buildmatch.3
  MLINKS+=devstat.3 compute_stats.3
  MLINKS+=devstat.3 compute_etime.3
  

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libusb/Makefile
 +++ b/lib/libusb/Makefile
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,7 @@ WARNS?=		2
  
  DPADD=		${LIBPTHREAD}
  LDADD=		${PTHREAD_LIBS}

Modified: trunk/freebsd-libs/debian/patches/13_jail.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/13_jail.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/13_jail.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libjail/Makefile
 +++ b/lib/libjail/Makefile
-@@ -5,6 +5,7 @@
+@@ -5,6 +5,7 @@ SHLIBDIR?= /lib
  SHLIB_MAJOR= 1
  SRCS=	jail.c jail_getid.c
  INCS=	jail.h

Modified: trunk/freebsd-libs/debian/patches/14_alias.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_alias.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/14_alias.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libalias/libalias/Makefile
 +++ b/lib/libalias/libalias/Makefile
-@@ -9,5 +9,6 @@
+@@ -9,5 +9,6 @@ MAN=	libalias.3
  SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
  INCS=	alias.h
  NO_WERROR=

Modified: trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/assume_default_login_class.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/assume_default_login_class.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,10 +1,8 @@
 
 We don't have this feature. See login.conf(5)
 
-Index: freebsd-libs/lib/libutil/login_cap.c
-===================================================================
---- freebsd-libs.orig/lib/libutil/login_cap.c
-+++ freebsd-libs/lib/libutil/login_cap.c
+--- a/lib/libutil/login_cap.c
++++ b/lib/libutil/login_cap.c
 @@ -324,7 +324,6 @@ login_getpwclass(const struct passwd *pw
      const char	*cls = NULL;
  

Modified: trunk/freebsd-libs/debian/patches/cdefs_macros.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/cdefs_macros.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -2,10 +2,8 @@
 With exported headers using a hacked <sys/cdefs.h> is not enough, since
 they're used by external programs.  Manual patching is required...
 
-Index: freebsd-libs/lib/libcam/camlib.h
-===================================================================
---- freebsd-libs.orig/lib/libcam/camlib.h
-+++ freebsd-libs/lib/libcam/camlib.h
+--- a/lib/libcam/camlib.h
++++ b/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.
   */
@@ -30,10 +28,8 @@
  int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
  		      int (*arg_get)(void *hook, char *field_name),
  		      void *gethook);
-Index: freebsd-libs/lib/libnetgraph/netgraph.h
-===================================================================
---- freebsd-libs.orig/lib/libnetgraph/netgraph.h
-+++ freebsd-libs/lib/libnetgraph/netgraph.h
+--- a/lib/libnetgraph/netgraph.h
++++ b/lib/libnetgraph/netgraph.h
 @@ -48,9 +48,9 @@
  
  __BEGIN_DECLS
@@ -46,10 +42,8 @@
  int	NgSendReplyMsg(int, const char *,
  		const struct ng_mesg *, const void *, size_t);
  int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
-Index: freebsd-libs/lib/libusb/libusb.h
-===================================================================
---- freebsd-libs.orig/lib/libusb/libusb.h
-+++ freebsd-libs/lib/libusb/libusb.h
+--- a/lib/libusb/libusb.h
++++ b/lib/libusb/libusb.h
 @@ -268,7 +268,7 @@ typedef struct libusb_endpoint_descripto
  	uint8_t	bSynchAddress;
  	uint8_t *extra;
@@ -137,10 +131,8 @@
  
  /* Library initialisation */
  
-Index: freebsd-libs/lib/libusb/libusb20_desc.h
-===================================================================
---- freebsd-libs.orig/lib/libusb/libusb20_desc.h
-+++ freebsd-libs/lib/libusb/libusb20_desc.h
+--- a/lib/libusb/libusb20_desc.h
++++ b/lib/libusb/libusb20_desc.h
 @@ -102,7 +102,7 @@ struct libusb20_me_struct {
  	void   *ptr;			/* data pointer */
  	uint16_t len;			/* defaults to zero */
@@ -185,10 +177,8 @@
  
  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);
-Index: freebsd-libs/sys/sys/sbuf.h
-===================================================================
---- freebsd-libs.orig/sys/sys/sbuf.h
-+++ freebsd-libs/sys/sys/sbuf.h
+--- a/sys/sys/sbuf.h
++++ b/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 *);

Modified: trunk/freebsd-libs/debian/patches/dwarf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/dwarf.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/dwarf.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,9 +1,7 @@
-Index: freebsd-libs/lib/libdwarf/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libdwarf/Makefile
-+++ freebsd-libs/lib/libdwarf/Makefile
+--- a/lib/libdwarf/Makefile
++++ b/lib/libdwarf/Makefile
 @@ -1,6 +1,6 @@
- # $FreeBSD: stable/10/lib/libdwarf/Makefile 225227 2011-08-28 09:26:48Z kib $
+ # $FreeBSD$
  
 -LIB=	dwarf
 +LIB=	dwarf-freebsd

Modified: trunk/freebsd-libs/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/elf.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,9 +1,7 @@
-Index: freebsd-libs/lib/libelf/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libelf/Makefile
-+++ freebsd-libs/lib/libelf/Makefile
+--- a/lib/libelf/Makefile
++++ b/lib/libelf/Makefile
 @@ -1,6 +1,6 @@
- # $FreeBSD: stable/10/lib/libelf/Makefile 238741 2012-07-24 16:03:28Z ache $
+ # $FreeBSD$
  
 -LIB=	elf
 +LIB=	elf-freebsd

Modified: trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libkvm/kvm.h
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm.h
-+++ freebsd-libs/lib/libkvm/kvm.h
+--- a/lib/libkvm/kvm.h
++++ b/lib/libkvm/kvm.h
 @@ -43,7 +43,8 @@
  #define	VRS_KEY		"VERSION"
  

Modified: trunk/freebsd-libs/debian/patches/libbsd_nlist.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libbsd_nlist.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/libbsd_nlist.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -3,10 +3,8 @@
 <nlist.h>, however it is still required when using kvm.h in an external
 package. See #729536.
 
-Index: freebsd-libs/lib/libkvm/kvm.h
-===================================================================
---- freebsd-libs.orig/lib/libkvm/kvm.h
-+++ freebsd-libs/lib/libkvm/kvm.h
+--- a/lib/libkvm/kvm.h
++++ b/lib/libkvm/kvm.h
 @@ -36,7 +36,7 @@
  #include <sys/cdefs.h>
  #include <sys/types.h>

Modified: trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -2,10 +2,8 @@
 We can't use -D_FILE_OFFSET_BITS=64 here, as
 libdwarf.h is a public header.
 
-Index: freebsd-libs/lib/libdwarf/libdwarf.h
-===================================================================
---- freebsd-libs.orig/lib/libdwarf/libdwarf.h
-+++ freebsd-libs/lib/libdwarf/libdwarf.h
+--- a/lib/libdwarf/libdwarf.h
++++ b/lib/libdwarf/libdwarf.h
 @@ -32,7 +32,7 @@
  #include <libelf.h>
  

Modified: trunk/freebsd-libs/debian/patches/libusb_backward.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_backward.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/libusb_backward.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -5,7 +5,7 @@
 
 --- a/lib/libusbhid/Makefile
 +++ b/lib/libusbhid/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ LIB=	usbhid
  MAN=	usbhid.3
  
  LDADD= -lbsd

Modified: trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libusb/libusb10.c
-===================================================================
---- freebsd-libs.orig/lib/libusb/libusb10.c
-+++ freebsd-libs/lib/libusb/libusb10.c
+--- a/lib/libusb/libusb10.c
++++ b/lib/libusb/libusb10.c
 @@ -43,6 +43,11 @@
  #include <sys/endian.h>
  #endif

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,9 +1,7 @@
-Index: freebsd-libs/lib/libgeom/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libgeom/Makefile
-+++ freebsd-libs/lib/libgeom/Makefile
+--- a/lib/libgeom/Makefile
++++ b/lib/libgeom/Makefile
 @@ -1,6 +1,7 @@
- # $FreeBSD: stable/10/lib/libgeom/Makefile 192376 2009-05-19 12:10:48Z trasz $
+ # $FreeBSD$
  
  LIB=	geom
 +SHLIB_MAJOR= 1
@@ -19,10 +17,8 @@
  MAN=	libgeom.3
  
  MLINKS+= \
-Index: freebsd-libs/lib/libutil/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libutil/Makefile
-+++ freebsd-libs/lib/libutil/Makefile
+--- a/lib/libutil/Makefile
++++ b/lib/libutil/Makefile
 @@ -5,15 +5,11 @@ SHLIBDIR?= /lib
  
  .include <bsd.own.mk>
@@ -56,10 +52,8 @@
  MAN+=	expand_number.3 flopen.3 fparseln.3 hexdump.3 \
  	humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
  	kinfo_getproc.3 kinfo_getvmmap.3 kld.3 login_auth.3 login_cap.3 \
-Index: freebsd-libs/lib/libkvm/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libkvm/Makefile
-+++ freebsd-libs/lib/libkvm/Makefile
+--- a/lib/libkvm/Makefile
++++ b/lib/libkvm/Makefile
 @@ -5,6 +5,7 @@ LIB=	kvm
  SHLIBDIR?= /lib
  SHLIB_MAJOR=	6
@@ -68,10 +62,8 @@
  
  .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
  KVM_ARCH=${MACHINE_ARCH}
-Index: freebsd-libs/lib/libipx/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libipx/Makefile
-+++ freebsd-libs/lib/libipx/Makefile
+--- a/lib/libipx/Makefile
++++ b/lib/libipx/Makefile
 @@ -7,6 +7,10 @@ SRCS=	ipx_addr.c ipx_ntoa.c
  MAN=	ipx.3
  MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
@@ -83,10 +75,8 @@
  WARNS?=	2
  
  .include <bsd.lib.mk>
-Index: freebsd-libs/lib/libelf/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libelf/Makefile
-+++ freebsd-libs/lib/libelf/Makefile
+--- a/lib/libelf/Makefile
++++ b/lib/libelf/Makefile
 @@ -61,7 +61,7 @@ INCS=	libelf.h gelf.h
  # problems when a header file in sys depends on a file in another
  # part of the tree, e.g. a machine dependent header.

Modified: trunk/freebsd-libs/debian/patches/pty_decls.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/pty_decls.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/pty_decls.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libutil/libutil.h
 +++ b/lib/libutil/libutil.h
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ int	extattr_namespace_to_string(int _att
  int	extattr_string_to_namespace(const char *_string, int *_attrnamespace);
  int	flopen(const char *_path, int _flags, ...);
  int	forkpty(int *_amaster, char *_name,
@@ -9,7 +9,7 @@
  void	hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
  int	humanize_number(char *_buf, size_t _len, int64_t _number,
  	    const char *_suffix, int _scale, int _flags);
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ int	kld_isloaded(const char *_name);
  int	kld_load(const char *_name);
  int	login_tty(int _fd);
  int	openpty(int *_amaster, int *_aslave, char *_name,

Modified: trunk/freebsd-libs/debian/patches/rlimit.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/rlimit.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/rlimit.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,7 +1,5 @@
-Index: freebsd-libs/lib/libutil/login_class.c
-===================================================================
---- freebsd-libs.orig/lib/libutil/login_class.c
-+++ freebsd-libs/lib/libutil/login_class.c
+--- a/lib/libutil/login_class.c
++++ b/lib/libutil/login_class.c
 @@ -47,6 +47,9 @@ __FBSDID("$FreeBSD$");
  #include <syslog.h>
  #include <unistd.h>

Modified: trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/patches/sysconf_cpuset_size.diff	2014-10-04 16:47:39 UTC (rev 5582)
@@ -1,6 +1,6 @@
 --- a/lib/libmemstat/memstat_uma.c
 +++ b/lib/libmemstat/memstat_uma.c
-@@ -305,6 +305,7 @@
+@@ -305,6 +305,7 @@ memstat_kvm_uma(struct memory_type_list
  	char name[MEMTYPE_MAXNAME];
  	cpuset_t all_cpus;
  	long cpusetsize;
@@ -8,7 +8,7 @@
  	kvm_t *kvm;
  
  	kvm = (kvm_t *)kvm_handle;
-@@ -328,8 +329,9 @@
+@@ -328,8 +329,9 @@ memstat_kvm_uma(struct memory_type_list
  		list->mtl_error = ret;
  		return (-1);
  	}

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-10-04 16:46:41 UTC (rev 5581)
+++ trunk/freebsd-libs/debian/rules	2014-10-04 16:47:39 UTC (rev 5582)
@@ -37,8 +37,8 @@
 
 SOURCE = freebsd-libs
 #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/releng/$(version)
+#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

More information about the Glibc-bsd-commits mailing list