[Glibc-bsd-commits] r5223 - in trunk/freebsd-utils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-07 22:51:24 +0000 (Sat, 07 Dec 2013)
New Revision: 5223

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/002_ifconfig.diff
   trunk/freebsd-utils/debian/patches/makefiles.diff
Log:
Leave -lbsdxml untouched (latest freebsd-glue supports it).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-07 22:34:12 UTC (rev 5222)
+++ trunk/freebsd-utils/debian/changelog	2013-12-07 22:51:24 UTC (rev 5223)
@@ -10,6 +10,7 @@
     - As a side requirement, source code is moved to src/ directory to
       prevent dh_install from mistakenly installing source directories as
       if they were executable files.
+  * Leave -lbsdxml untouched (latest freebsd-glue supports it).
 
  -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 20:31:39 +0100
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2013-12-07 22:34:12 UTC (rev 5222)
+++ trunk/freebsd-utils/debian/control	2013-12-07 22:51:24 UTC (rev 5223)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7), po-debconf, sharutils,
  flex | flex-old,
  freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.2.4~),
+ freebsd-glue (>= 0.2.5~),
  kfreebsd-kernel-headers (>= 9.2~5),
  libc0.1-dev (>= 2.13-26),
  libbsd-dev (>= 0.3.0),

Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-12-07 22:34:12 UTC (rev 5222)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff	2013-12-07 22:51:24 UTC (rev 5223)
@@ -1,14 +1,3 @@
---- a/src/sbin/ifconfig/Makefile
-+++ b/src/sbin/ifconfig/Makefile
-@@ -36,7 +36,7 @@
- 
- SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
- DPADD+=	${LIBBSDXML} ${LIBSBUF}
--LDADD+=	-lbsdxml -lsbuf
-+LDADD+=	-lexpat -lsbuf -lbsd -lfreebsd-glue
- 
- SRCS+=	ifcarp.c		# SIOC[GS]VH support
- SRCS+=	ifgroup.c		# ...
 --- a/src/sbin/ifconfig/ifconfig.c
 +++ b/src/sbin/ifconfig/ifconfig.c
 @@ -76,6 +76,13 @@

Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-07 22:34:12 UTC (rev 5222)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff	2013-12-07 22:51:24 UTC (rev 5223)
@@ -1,3 +1,14 @@
+--- a/src/sbin/ifconfig/Makefile
++++ b/src/sbin/ifconfig/Makefile
+@@ -38,6 +38,8 @@
+ DPADD+=	${LIBBSDXML} ${LIBSBUF}
+ LDADD+=	-lbsdxml -lsbuf
+ 
++LDADD+= -lbsd -lfreebsd-glue
++
+ SRCS+=	ifcarp.c		# SIOC[GS]VH support
+ SRCS+=	ifgroup.c		# ...
+ SRCS+=	ifpfsync.c		# pfsync(4) support
 --- a/src/usr.sbin/ppp/Makefile
 +++ b/src/usr.sbin/ppp/Makefile
 @@ -38,10 +38,10 @@