[Glibc-bsd-commits] r1868 - in trunk/freebsd-utils: . debian
debian/patches
Petr Salinger
ps-guest at alioth.debian.org
Fri Jan 12 21:37:24 CET 2007
Author: ps-guest
Date: 2007-01-12 21:37:24 +0100 (Fri, 12 Jan 2007)
New Revision: 1868
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
trunk/freebsd-utils/debian/patches/015_pf.diff
trunk/freebsd-utils/fetch
Log:
* freebsd-utils based on FreeBSD 6.2
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2007-01-12 17:33:24 UTC (rev 1867)
+++ trunk/freebsd-utils/debian/changelog 2007-01-12 20:37:24 UTC (rev 1868)
@@ -1,10 +1,11 @@
-freebsd-utils (6.1-8) UNRELEASED; urgency=low
+freebsd-utils (6.2-0.1) UNRELEASED; urgency=low
[ Aurelien Jarno ]
* Remove /etc/init.d/kldutils and /etc/init.d/kfreebsd-common before
removing the symlinks.
[ Petr Salinger ]
+ * based on FreeBSD 6.2
* build pfctl and authpf, but don't install them for now
-- Aurelien Jarno <aurel32 at debian.org> Wed, 20 Dec 2006 10:03:56 +0100
Modified: trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2007-01-12 17:33:24 UTC (rev 1867)
+++ trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2007-01-12 20:37:24 UTC (rev 1868)
@@ -5,8 +5,8 @@
options = NULL;
vfslist = NULL;
vfstype = "ufs";
-- while ((ch = getopt(argc, argv, "adF:fo:prwt:uv")) != -1)
-+ while ((ch = getopt(argc, argv, "adfo:prwt:uv")) != -1)
+- while ((ch = getopt(argc, argv, "adlF:fo:prwt:uv")) != -1)
++ while ((ch = getopt(argc, argv, "adlfo:prwt:uv")) != -1)
switch (ch) {
case 'a':
all = 1;
@@ -20,12 +20,12 @@
case 'f':
init_flags |= MNT_FORCE;
break;
-@@ -707,7 +704,7 @@
+@@ -716,7 +716,7 @@
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
--"usage: mount [-adfpruvw] [-F fstab] [-o options] [-t ufs | external_type]",
-+"usage: mount [-adfpruvw] [-o options] [-t ufs | external_type]",
+-"usage: mount [-adflpruvw] [-F fstab] [-o options] [-t ufs | external_type]",
++"usage: mount [-adflpruvw] [-o options] [-t ufs | external_type]",
" mount [-dfpruvw] special | node",
" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
exit(1);
Modified: trunk/freebsd-utils/debian/patches/015_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_pf.diff 2007-01-12 17:33:24 UTC (rev 1867)
+++ trunk/freebsd-utils/debian/patches/015_pf.diff 2007-01-12 20:37:24 UTC (rev 1868)
@@ -2,9 +2,9 @@
--- src/contrib/pf/authpf/authpf.c 2007-01-09 11:00:24.000000000 +0100
+++ src/contrib/pf/authpf/authpf.c 2007-01-09 09:52:19.000000000 +0100
@@ -44,7 +44,8 @@
-
- #include <err.h>
- #include <errno.h>
+ #ifdef __FreeBSD_kernel__
+ #include <inttypes.h>
+ #endif
-#include <login_cap.h>
+//#include <login_cap.h>
+#include <bsd/string.h>
Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch 2007-01-12 17:33:24 UTC (rev 1867)
+++ trunk/freebsd-utils/fetch 2007-01-12 20:37:24 UTC (rev 1868)
@@ -18,23 +18,17 @@
src/sbin/kldconfig src/sbin/kldload src/sbin/kldstat src/sbin/kldunload \
src/sbin/mount_std src/sbin/umount src/usr.sbin/rpc.umntall \
src/sbin/mount_{cd9660,ext2fs,hpfs,msdosfs,nfs,nfs4,ntfs,nullfs,udf,umapfs,unionfs} \
+ src/sbin/mount{,_autofs,_reiserfs} \
src/usr.bin/{ktrace,kdump} src/usr.sbin/jail src/usr.sbin/ppp{,ctl,d} \
src/sbin/{mdconfig,ccdconfig,ipfw} \
src/{contrib/pf,sbin/pfctl,usr.sbin/authpf} \
src/usr.sbin/kbdcontrol src/share/syscons/keymaps \
src/bin/chflags \
; do
- cvs ${action} -r RELENG_6_1_0_RELEASE $i
+ cvs ${action} -r RELENG_6_2_0_RELEASE $i
test -e $i
done
-for i in \
- src/sbin/mount{,_autofs,_reiserfs} \
- ; do
- cvs ${action} -r RELENG_6_1_0_RELEASE $i
- test -e $i
-done
-
rm -f src.tar.gz
tar -czpf src.tar.gz src
rm -rf src
More information about the Glibc-bsd-commits
mailing list