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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 01:40:20 +0000 (Sat, 05 Mar 2016)
New Revision: 5893

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/03_libsbuf.diff
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/patches/pty_decls.diff
Log:
Refresh patches:
- 03_libsbuf.diff
- makefiles.diff
- pty_decls.diff


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-03-05 01:27:11 UTC (rev 5892)
+++ trunk/freebsd-libs/debian/changelog	2016-03-05 01:40:20 UTC (rev 5893)
@@ -1,9 +1,13 @@
 freebsd-libs (10.3~svn296373-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot of 10.3-RC1
+  * Make get-orig-source tarball reproducible
+  * Refresh patches:
+      - 03_libsbuf.diff
+      - makefiles.diff
+      - pty_decls.diff
   * Actually use the proper build architecture compiler
     (thanks, Helmut Grohne!)
-  * Make get-orig-source tarball reproducible
   * Change source tarball compression algorithm to XZ
   * Add myself to Uploaders
 

Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2016-03-05 01:27:11 UTC (rev 5892)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2016-03-05 01:40:20 UTC (rev 5893)
@@ -3,7 +3,7 @@
 @@ -3,6 +3,7 @@
  LIB=		sbuf
  SHLIBDIR?= 	/lib
- SRCS=		subr_sbuf.c 
+ SRCS=		subr_prf.c subr_sbuf.c
 +CFLAGS+=	-I${.CURDIR}/../../sys
  
  SHLIB_MAJOR	= 6

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2016-03-05 01:27:11 UTC (rev 5892)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2016-03-05 01:40:20 UTC (rev 5893)
@@ -19,7 +19,7 @@
  MLINKS+= \
 --- a/lib/libutil/Makefile
 +++ b/lib/libutil/Makefile
-@@ -5,15 +5,11 @@
+@@ -5,16 +5,11 @@
  
  .include <bsd.own.mk>
  
@@ -29,7 +29,8 @@
  
  SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
 -	hexdump.c humanize_number.c kinfo_getfile.c kinfo_getfile.c \
--	kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c kld.c \
+-	kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \
+-	kinfo_getvmobject.c kld.c \
 -	login_auth.c login_cap.c \
 -	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
 -	pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
@@ -37,7 +38,7 @@
  	stub.c trimdomain.c uucplock.c
  INCS=	libutil.h login_cap.h
  
-@@ -25,6 +21,14 @@
+@@ -26,6 +21,14 @@
  
  CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
  
@@ -51,7 +52,7 @@
 +
  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 \
+ 	kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \
 --- a/lib/libkvm/Makefile
 +++ b/lib/libkvm/Makefile
 @@ -5,6 +5,7 @@

Modified: trunk/freebsd-libs/debian/patches/pty_decls.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/pty_decls.diff	2016-03-05 01:27:11 UTC (rev 5892)
+++ trunk/freebsd-libs/debian/patches/pty_decls.diff	2016-03-05 01:40:20 UTC (rev 5893)
@@ -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 @@
+@@ -112,7 +112,7 @@
  int	kld_load(const char *_name);
  int	login_tty(int _fd);
  int	openpty(int *_amaster, int *_aslave, char *_name,