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

Thu May 22 19:47:05 UTC 2014

Author: rmh
Date: 2014-05-22 19:47:05 +0000 (Thu, 22 May 2014)
New Revision: 5481

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
   trunk/freebsd-libs/debian/patches/libbsd_nlist.diff
   trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
   trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/patches/rlimit.diff
Log:
Add <stdint.h> include to kvm.h to fix header buildability.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================

--- trunk/freebsd-libs/debian/changelog	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/changelog	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,3 +1,9 @@
+freebsd-libs (10.0-6) unstable; urgency=medium
+
+  * Add <stdint.h> include to kvm.h to fix header buildability.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 22 May 2014 23:37:57 +0200
+
 freebsd-libs (10.0-5) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,6 +1,8 @@
---- a/lib/libkvm/kvm_vnet.c
-+++ b/lib/libkvm/kvm_vnet.c
-@@ -68,18 +68,18 @@
+Index: freebsd-libs/lib/libkvm/kvm_vnet.c
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/kvm_vnet.c
++++ freebsd-libs/lib/libkvm/kvm_vnet.c
+@@ -68,18 +68,18 @@ _kvm_vnet_selectpid(kvm_t *kd, pid_t pid
  		 * here to __{start,stop}_set_vnet.
  		 */
  #define	NLIST_START_VNET	0
@@ -26,9 +28,11 @@
  	};
  	uintptr_t procp, credp;
  #define	VMCORE_VNET_OF_PROC0
---- a/lib/libkvm/kvm_proc.c
-+++ b/lib/libkvm/kvm_proc.c
-@@ -387,6 +387,12 @@
+Index: freebsd-libs/lib/libkvm/kvm_proc.c
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/kvm_proc.c
++++ freebsd-libs/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;
  		kp->ki_siglist = proc.p_siglist;
@@ -41,3 +45,15 @@
  		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
+@@ -35,6 +35,7 @@
+ 
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
++#include <stdint.h>		/* uint64_t */
+ #include <nlist.h>
+ 
+ /* Default version symbol. */

Modified: trunk/freebsd-libs/debian/patches/assume_default_login_class.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/assume_default_login_class.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/assume_default_login_class.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,9 +1,11 @@
 
 We don't have this feature. See login.conf(5)
 
---- a/lib/libutil/login_cap.c
-+++ b/lib/libutil/login_cap.c
-@@ -324,7 +324,6 @@
+Index: freebsd-libs/lib/libutil/login_cap.c
+===================================================================
+--- freebsd-libs.orig/lib/libutil/login_cap.c
++++ freebsd-libs/lib/libutil/login_cap.c
+@@ -324,7 +324,6 @@ login_getpwclass(const struct passwd *pw
      const char	*cls = NULL;
  
      if (pwd != NULL) {

Modified: trunk/freebsd-libs/debian/patches/libbsd_nlist.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libbsd_nlist.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/libbsd_nlist.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -3,12 +3,14 @@
 <nlist.h>, however it is still required when using kvm.h in an external
 package. See #729536.
 
---- a/lib/libkvm/kvm.h
-+++ b/lib/libkvm/kvm.h
-@@ -35,7 +35,7 @@
- 
+Index: freebsd-libs/lib/libkvm/kvm.h
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/kvm.h
++++ freebsd-libs/lib/libkvm/kvm.h
+@@ -36,7 +36,7 @@
  #include <sys/cdefs.h>
  #include <sys/types.h>
+ #include <stdint.h>		/* uint64_t */
 -#include <nlist.h>
 +#include <bsd/nlist.h>
  

Modified: trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -2,8 +2,10 @@
 We can't use -D_FILE_OFFSET_BITS=64 here, as
 libdwarf.h is a public header.
 
---- a/lib/libdwarf/libdwarf.h
-+++ b/lib/libdwarf/libdwarf.h
+Index: freebsd-libs/lib/libdwarf/libdwarf.h
+===================================================================
+--- freebsd-libs.orig/lib/libdwarf/libdwarf.h
++++ freebsd-libs/lib/libdwarf/libdwarf.h
 @@ -32,7 +32,7 @@
  #include <libelf.h>
  

Modified: trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/libusb_pthread_condattr_setclock.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,5 +1,7 @@
---- a/lib/libusb/libusb10.c
-+++ b/lib/libusb/libusb10.c
+Index: freebsd-libs/lib/libusb/libusb10.c
+===================================================================
+--- freebsd-libs.orig/lib/libusb/libusb10.c
++++ freebsd-libs/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-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,5 +1,7 @@
---- a/lib/libgeom/Makefile
-+++ b/lib/libgeom/Makefile
+Index: freebsd-libs/lib/libgeom/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libgeom/Makefile
++++ freebsd-libs/lib/libgeom/Makefile
 @@ -1,6 +1,7 @@
  # $FreeBSD$
  
@@ -8,7 +10,7 @@
  SHLIBDIR?= /lib
  SRCS+=	geom_getxml.c
  SRCS+=	geom_stats.c
-@@ -16,6 +17,8 @@
+@@ -16,6 +17,8 @@ WARNS?=	3
  DPADD=	${LIBBSDXML} ${LIBSBUF}
  LDADD=	-lbsdxml -lsbuf
  
@@ -17,9 +19,11 @@
  MAN=	libgeom.3
  
  MLINKS+= \
---- a/lib/libutil/Makefile
-+++ b/lib/libutil/Makefile
-@@ -5,15 +5,11 @@
+Index: freebsd-libs/lib/libutil/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libutil/Makefile
++++ freebsd-libs/lib/libutil/Makefile
+@@ -5,15 +5,11 @@ SHLIBDIR?= /lib
  
  .include <bsd.own.mk>
  
@@ -37,7 +41,7 @@
  	stub.c trimdomain.c uucplock.c
  INCS=	libutil.h login_cap.h
  
-@@ -25,6 +21,14 @@
+@@ -25,6 +21,14 @@ CFLAGS+= -DINET6
  
  CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
  
@@ -52,9 +56,11 @@
  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 \
---- a/lib/libkvm/Makefile
-+++ b/lib/libkvm/Makefile
-@@ -5,6 +5,7 @@
+Index: freebsd-libs/lib/libkvm/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libkvm/Makefile
++++ freebsd-libs/lib/libkvm/Makefile
+@@ -5,6 +5,7 @@ LIB=	kvm
  SHLIBDIR?= /lib
  SHLIB_MAJOR=	6
  CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
@@ -62,9 +68,11 @@
  
  .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
  KVM_ARCH=${MACHINE_ARCH}
---- a/lib/libipx/Makefile
-+++ b/lib/libipx/Makefile
-@@ -7,6 +7,10 @@
+Index: freebsd-libs/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libipx/Makefile
++++ freebsd-libs/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
  
@@ -75,9 +83,11 @@
  WARNS?=	2
  
  .include <bsd.lib.mk>
---- a/lib/libelf/Makefile
-+++ b/lib/libelf/Makefile
-@@ -61,7 +61,7 @@
+Index: freebsd-libs/lib/libelf/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libelf/Makefile
++++ freebsd-libs/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/rlimit.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/rlimit.diff	2014-05-22 15:57:22 UTC (rev 5480)
+++ trunk/freebsd-libs/debian/patches/rlimit.diff	2014-05-22 19:47:05 UTC (rev 5481)
@@ -1,6 +1,8 @@
---- a/lib/libutil/login_class.c
-+++ b/lib/libutil/login_class.c
-@@ -47,6 +47,9 @@
+Index: freebsd-libs/lib/libutil/login_class.c
+===================================================================
+--- freebsd-libs.orig/lib/libutil/login_class.c
++++ freebsd-libs/lib/libutil/login_class.c
+@@ -47,6 +47,9 @@ __FBSDID("$FreeBSD$");
  #include <syslog.h>
  #include <unistd.h>
  


