[Glibc-bsd-commits] r6143 - in trunk/freebsd-buildutils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2017-02-13 21:28:35 +0000 (Mon, 13 Feb 2017)
New Revision: 6143

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/patches/03_glibc.diff
   trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
Log:
Build fmtree with support for MD5, SHA1, RMD160, SHA256 checksums
(Closes: #854184, #855072)
- add Build-Depends: libmd-dev
- refresh 22_ld_as_needed.diff


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2017-02-03 15:35:31 UTC (rev 6142)
+++ trunk/freebsd-buildutils/debian/changelog	2017-02-13 21:28:35 UTC (rev 6143)
@@ -1,3 +1,12 @@
+freebsd-buildutils (10.3~svn296373-7) UNRELEASED; urgency=medium
+
+  * Build fmtree with support for MD5, SHA1, RMD160, SHA256 checksums
+    (Closes: #854184, #855072)
+    - add Build-Depends: libmd-dev
+    - refresh 22_ld_as_needed.diff
+
+ -- Steven Chamberlain <stevenc at debian.org>  Mon, 13 Feb 2017 21:25:28 +0000
+
 freebsd-buildutils (10.3~svn296373-6) unstable; urgency=medium
 
   * Declare Conflicts: flex-old due to freebsd-buildutils shipping a

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2017-02-03 15:35:31 UTC (rev 6142)
+++ trunk/freebsd-buildutils/debian/control	2017-02-13 21:28:35 UTC (rev 6143)
@@ -12,6 +12,7 @@
  bison,
  dpkg-dev (>= 1.16.1.1),
  libbsd-dev (>= 0.3.0),
+ libmd-dev,
  freebsd-glue (>= 0.2.20),
  bmake,
  byacc (>= 20120115~),

Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2017-02-03 15:35:31 UTC (rev 6142)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff	2017-02-13 21:28:35 UTC (rev 6143)
@@ -9,15 +9,3 @@
  	printf("\n");
  }
  
---- a/src/usr.sbin/mtree/Makefile
-+++ b/src/usr.sbin/mtree/Makefile
-@@ -10,9 +10,6 @@
- SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
- SRCS+=	specspec.c
- 
--CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
--DPADD=	${LIBMD}
--LDADD=	-lmd
- 
- .if ${MK_NMTREE} == "no"
- LINKS=	${BINDIR}/fmtree ${BINDIR}/mtree

Modified: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff	2017-02-03 15:35:31 UTC (rev 6142)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff	2017-02-13 21:28:35 UTC (rev 6143)
@@ -1,7 +1,5 @@
-Index: freebsd-buildutils/src/usr.bin/make/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/make/Makefile
-+++ freebsd-buildutils/src/usr.bin/make/Makefile
+--- a/src/usr.bin/make/Makefile
++++ b/src/usr.bin/make/Makefile
 @@ -6,6 +6,7 @@
  
  PROG=	make
@@ -10,22 +8,19 @@
  SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
  	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
  	util.c var.c
-Index: freebsd-buildutils/src/usr.sbin/mtree/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/usr.sbin/mtree/Makefile
-+++ freebsd-buildutils/src/usr.sbin/mtree/Makefile
-@@ -9,6 +9,7 @@ PROG=	fmtree
- MAN=	fmtree.8 mtree.5
- SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
- SRCS+=	specspec.c
-+LDADD+=	-lbsd
+--- a/src/usr.sbin/mtree/Makefile
++++ b/src/usr.sbin/mtree/Makefile
+@@ -12,7 +12,7 @@
  
+ CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
+ DPADD=	${LIBMD}
+-LDADD=	-lmd
++LDADD=	-lmd -lbsd
  
  .if ${MK_NMTREE} == "no"
-Index: freebsd-buildutils/src/usr.bin/brandelf/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/brandelf/Makefile
-+++ freebsd-buildutils/src/usr.bin/brandelf/Makefile
+ LINKS=	${BINDIR}/fmtree ${BINDIR}/mtree
+--- a/src/usr.bin/brandelf/Makefile
++++ b/src/usr.bin/brandelf/Makefile
 @@ -1,5 +1,6 @@
  # $FreeBSD$
  
@@ -33,10 +28,8 @@
 +LDADD=	-lbsd
  
  .include <bsd.prog.mk>
-Index: freebsd-buildutils/src/usr.bin/cksum/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/cksum/Makefile
-+++ freebsd-buildutils/src/usr.bin/cksum/Makefile
+--- a/src/usr.bin/cksum/Makefile
++++ b/src/usr.bin/cksum/Makefile
 @@ -3,6 +3,7 @@
  
  PROG=	cksum
@@ -45,10 +38,8 @@
  SIMLINKS=	${BINDIR}/cksum ${BINDIR}/sum
  MLINKS=	cksum.1 sum.1
  
-Index: freebsd-buildutils/src/usr.bin/file2c/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/file2c/Makefile
-+++ freebsd-buildutils/src/usr.bin/file2c/Makefile
+--- a/src/usr.bin/file2c/Makefile
++++ b/src/usr.bin/file2c/Makefile
 @@ -3,6 +3,7 @@
  .include <bsd.own.mk>