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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-24 02:08:48 +0000 (Sun, 24 Jan 2010)
New Revision: 2948

Added:
   trunk/freebsd-utils/debian/patches/027_pppctl.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/freebsd-net-tools.install
   trunk/freebsd-utils/debian/freebsd-net-tools.manpages
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
Add pppctl binary


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-24 01:35:45 UTC (rev 2947)
+++ trunk/freebsd-utils/debian/changelog	2010-01-24 02:08:48 UTC (rev 2948)
@@ -3,10 +3,10 @@
   * mount: assume that the mount helpers are located in /sbin instead of
     looking in $PATH, which may not contain /sbin when called from 
     scripts.
-  * Add kdump binary.
+  * Add kdump and ppctl binaries.
   * Move ktrace to /usr/bin. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 23 Jan 2010 21:37:23 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 24 Jan 2010 02:54:08 +0100
 
 freebsd-utils (8.0-5) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install	2010-01-24 01:35:45 UTC (rev 2947)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install	2010-01-24 02:08:48 UTC (rev 2948)
@@ -4,3 +4,4 @@
 sbin/pfctl/pfctl		/sbin
 usr.sbin/authpf/authpf		/usr/sbin/
 usr.bin/netstat/netstat		/usr/bin/
+usr.sbin/pppctl/pppctl		/usr/sbin/

Modified: trunk/freebsd-utils/debian/freebsd-net-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.manpages	2010-01-24 01:35:45 UTC (rev 2947)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.manpages	2010-01-24 02:08:48 UTC (rev 2948)
@@ -4,3 +4,4 @@
 contrib/pf/pfctl/pfctl.8
 contrib/pf/man/*.5
 usr.bin/netstat/netstat.1
+usr.sbin/pppctl/pppctl.8

Added: trunk/freebsd-utils/debian/patches/027_pppctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/027_pppctl.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/027_pppctl.diff	2010-01-24 02:08:48 UTC (rev 2948)
@@ -0,0 +1,21 @@
+--- a/usr.sbin/pppctl.orig/Makefile
++++ b/usr.sbin/pppctl/Makefile
+@@ -4,6 +4,6 @@
+ MAN=	pppctl.8
+ 
+ DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
+-LDADD=	-lpthread -ledit -ltermcap
++LDADD=	-lpthread -ledit -ltermcap -lbsd
+ 
+ .include <bsd.prog.mk>
+--- a/usr.sbin/pppctl.orig/pppctl.c
++++ b/usr.sbin/pppctl/pppctl.c
+@@ -48,6 +48,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <bsd/unistd.h>
+ 
+ #define LINELEN 2048
+ 
+Les fichiers binaires usr.sbin/pppctl.orig/pppctl.o et usr.sbin/pppctl/pppctl.o sont différents.

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2010-01-24 01:35:45 UTC (rev 2947)
+++ trunk/freebsd-utils/debian/patches/series	2010-01-24 02:08:48 UTC (rev 2948)
@@ -29,3 +29,4 @@
 024_devfs.diff
 025_camcontrol.diff
 026_kdump.diff
+027_pppctl.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2010-01-24 01:35:45 UTC (rev 2947)
+++ trunk/freebsd-utils/debian/rules	2010-01-24 02:08:48 UTC (rev 2948)
@@ -124,6 +124,7 @@
 	$(PMAKE) -C sbin/route
 	$(PMAKE) -C usr.bin/netstat
 	$(PMAKE) -C usr.sbin/authpf
+	$(PMAKE) -C usr.sbin/pppctl
 	touch $@
 
 build-indep: build-indep-stamp
@@ -180,6 +181,7 @@
 	$(PMAKE) -C sbin/route clean
 	$(PMAKE) -C usr.bin/netstat clean
 	$(PMAKE) -C usr.sbin/authpf clean
+	$(PMAKE) -C usr.sbin/pppctl clean
 
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -rf .pc