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

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Mon Jun 23 19:41:24 UTC 2008 

Author: ps-guest
Date: 2008-06-23 19:41:23 +0000 (Mon, 23 Jun 2008)
New Revision: 2191

Added:
   trunk/freebsd-utils/debian/patches/017_kbsd7.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/freebsd-utils.manpages
   trunk/freebsd-utils/debian/patches/001_mount.diff
   trunk/freebsd-utils/debian/rules
Log:
* another changes for freebsd-utils 7.0


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/changelog	2008-06-23 19:41:23 UTC (rev 2191)
@@ -1,3 +1,11 @@
+freebsd-utils (7.0-1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 7.0
+  * apply sed fixes only once
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 15 Jan 2007 13:43:29 +0100
+
 freebsd-utils (6.3-1) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/control	2008-06-23 19:41:23 UTC (rev 2191)
@@ -9,7 +9,7 @@
 # libfreebsd (>= 0.0-5): ifconfig
 # libipx-dev: ifconfig
 # libkiconv-dev: mount_*
-# libc0.1-dev (>= 2.3.6.ds1-9): ifconfig
+# libc0.1-dev (>= 2.7-13): ifconfig
 Standards-Version: 3.7.3
 
 Package: freebsd-utils

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2008-06-23 19:41:23 UTC (rev 2191)
@@ -23,5 +23,4 @@
 build-tree/src/sbin/mount_nullfs/mount_nullfs		/sbin
 build-tree/src/sbin/mount_reiserfs/mount_reiserfs	/sbin
 build-tree/src/sbin/mount_udf/mount_udf			/sbin
-build-tree/src/sbin/mount_umapfs/mount_umapfs		/sbin
 build-tree/src/sbin/mount_unionfs/mount_unionfs		/sbin

Modified: trunk/freebsd-utils/debian/freebsd-utils.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.manpages	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/freebsd-utils.manpages	2008-06-23 19:41:23 UTC (rev 2191)
@@ -8,14 +8,12 @@
 build-tree/src/sbin/mount_hpfs/mount_hpfs.8
 build-tree/src/sbin/mount/mount.8
 build-tree/src/sbin/mount_msdosfs/mount_msdosfs.8
-build-tree/src/sbin/mount_nfs4/mount_nfs4.8
 build-tree/src/sbin/mount_nfs/mount_nfs.8
 build-tree/src/sbin/mount_ntfs/mount_ntfs.8
 build-tree/src/sbin/mount_nullfs/mount_nullfs.8
 build-tree/src/sbin/mount_reiserfs/mount_reiserfs.8
 build-tree/src/sbin/mount_std/mount_std.8
 build-tree/src/sbin/mount_udf/mount_udf.8
-build-tree/src/sbin/mount_umapfs/mount_umapfs.8
 build-tree/src/sbin/mount_unionfs/mount_unionfs.8
 build-tree/src/sbin/swapon/swapon.8
 build-tree/src/sbin/sysctl/sysctl.8

Modified: trunk/freebsd-utils/debian/patches/001_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_mount.diff	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/patches/001_mount.diff	2008-06-23 19:41:23 UTC (rev 2191)
@@ -1,11 +1,13 @@
---- src/sbin/mount/mount_fs.c~	2006-03-18 13:51:27.000000000 +0100
-+++ src/sbin/mount/mount_fs.c	2006-03-18 13:52:39.000000000 +0100
-@@ -59,6 +59,8 @@
- #include <string.h>
- #include <unistd.h>
+Index: src/sbin/mount/mount_fs.c
+===================================================================
+--- src.orig/sbin/mount/mount_fs.c	2008-06-23 21:09:37.547503000 +0000
++++ src/sbin/mount/mount_fs.c	2008-06-23 21:10:00.000000000 +0000
+@@ -52,7 +52,7 @@
+ #include <sys/mount.h>
  
+ #include <err.h>
+-#include <getopt.h>
 +#include <bsd/getopt.h>
-+
- #include "extern.h"
- #include "mntopts.h"
- 
+ #include <libgen.h>
+ #include <stdio.h>
+ #include <stdlib.h>

Added: trunk/freebsd-utils/debian/patches/017_kbsd7.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/017_kbsd7.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/017_kbsd7.diff	2008-06-23 19:41:23 UTC (rev 2191)
@@ -0,0 +1,70 @@
+Index: src/sbin/ifconfig/af_inet.c
+===================================================================
+--- src.orig/sbin/ifconfig/af_inet.c	2008-06-23 19:42:20.000000000 +0000
++++ src/sbin/ifconfig/af_inet.c	2008-06-23 21:02:58.000000000 +0000
+@@ -42,7 +42,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <ifaddrs.h>
+ 
+ #include <netinet/in.h>
+ #include <net/if_var.h>		/* for struct ifaddr */
+@@ -51,6 +50,7 @@
+ #include <netdb.h>
+ 
+ #include "ifconfig.h"
++#include <ifaddrs.h>
+ 
+ static struct ifaliasreq in_addreq;
+ static struct ifreq in_ridreq;
+Index: src/sbin/ifconfig/af_ipx.c
+===================================================================
+--- src.orig/sbin/ifconfig/af_ipx.c	2008-06-23 19:42:20.000000000 +0000
++++ src/sbin/ifconfig/af_ipx.c	2008-06-23 21:02:58.000000000 +0000
+@@ -41,9 +41,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <ifaddrs.h>
+ 
+ #include <net/if_var.h>
++#include <ifaddrs.h>
+ #define IPTUNNEL
+ #include <netipx/ipx.h>
+ #include <netipx/ipx_if.h>
+Index: src/sbin/mdconfig/Makefile
+===================================================================
+--- src.orig/sbin/mdconfig/Makefile	2006-04-01 16:34:45.000000000 +0000
++++ src/sbin/mdconfig/Makefile	2008-06-23 21:03:22.000000000 +0000
+@@ -5,6 +5,6 @@
+ MLINKS=		mdconfig.8 vnconfig.8
+ 
+ DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
+-LDADD+=	-lutil -lgeom -lbsdxml -lsbuf
++LDADD+=	-lutil -lgeom -lsbuf
+ 
+ .include <bsd.prog.mk>
+Index: src/sbin/mount/mount.c
+===================================================================
+--- src.orig/sbin/mount/mount.c	2008-06-23 19:42:22.000000000 +0000
++++ src/sbin/mount/mount.c	2008-06-23 21:04:53.000000000 +0000
+@@ -208,7 +208,9 @@
+ {
+ 	struct pidfh *pfh;
+ 	pid_t mountdpid; 
+-
++#if 1
++#warning missing pidfile_open(), pidfile_remove()
++#else
+ 	pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid);
+ 	if (pfh != NULL) {
+ 		/* Mountd is not running. */
+@@ -222,6 +224,7 @@
+ 	/* We have mountd(8) PID in mountdpid varible, let's signal it. */
+ 	if (kill(mountdpid, SIGHUP) == -1)
+ 		err(1, "signal mountd");
++#endif
+ }
+ 
+ int

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2008-06-23 15:54:19 UTC (rev 2190)
+++ trunk/freebsd-utils/debian/rules	2008-06-23 19:41:23 UTC (rev 2191)
@@ -42,9 +42,6 @@
 	done
 # FIXME: netstat
 
-clean::
-	rm -f debian/kbdcontrol.templates
-
 build/kbdcontrol:: apply-patches
 	set -e ; for i in usr.sbin/kbdcontrol \
 	; do \
@@ -53,18 +50,24 @@
 	sed -e "s/@choices@/`cd $(DEB_SRCDIR)/share/syscons/keymaps && echo *.kbd | sed -e \"s/ /, /g\"`/g" \
 	< debian/kbdcontrol.templates.in > debian/kbdcontrol.templates
 
-pre-build:: $(_cdbs_tarball_stamps)
-	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
+clean::
+	rm -f debian/kbdcontrol.templates debian/stamp-sed
+
+pre-build:: debian/stamp-sed
+debian/stamp-sed: $(_cdbs_tarball_stamps)
+	find $(DEB_SRCDIR) -name "*.[hcy]" | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" \
 		-e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*/ /g" \
 		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
-		-e "s/^LDADD=/LDADD+=/g" \
 		-e "s/getline/bsd_&/g" \
 	; done)
-	set -e ; find $(DEB_SRCDIR)/contrib/pf/ -type f | (while read i ; do \
+	find $(DEB_SRCDIR) -name Makefile | (set -e ; while read i ; do sed -i $$i \
+		-e "s/^LDADD=/LDADD+=/g" \
+	; done)
+	set -e ; find $(DEB_SRCDIR)/contrib/pf/ -name "*.[hcy]" | (while read i ; do \
 		sed -i $$i \
 		-e 's/defined\( \|\t\)*(\( \|\t\)*__FreeBSD__\( \|\t\)*)/defined(__FreeBSD_kernel__)/g' \
 		-e 's/#\( \|\t\)*ifdef\( \|\t\)*__FreeBSD__/#ifdef __FreeBSD_kernel__/g' \
 		-e 's/#\( \|\t\)*ifndef\( \|\t\)*__FreeBSD__/#ifndef __FreeBSD_kernel__/g' \
 	; done)
-
+	touch debian/stamp-sed

More information about the Glibc-bsd-commits mailing list