[Glibc-bsd-commits] r2488 - in trunk/freebsd-utils/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Mon May 4 11:00:09 UTC 2009
Author: ps-guest
Date: 2009-05-04 11:00:07 +0000 (Mon, 04 May 2009)
New Revision: 2488
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/patches/007_mount.diff
trunk/freebsd-utils/debian/patches/014_route.diff
trunk/freebsd-utils/debian/rules
Log:
freebsd-utils based on FreeBSD 7.2
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2009-05-04 10:59:27 UTC (rev 2487)
+++ trunk/freebsd-utils/debian/changelog 2009-05-04 11:00:07 UTC (rev 2488)
@@ -1,3 +1,10 @@
+freebsd-utils (7.2-1) UNSTABLE; urgency=low
+
+ [ Petr Salinger ]
+ * Based on FreeBSD 7.2.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 04 May 2009 12:00:00 +0200
+
freebsd-utils (7.1-5) unstable; urgency=low
[ Guillem Jover ]
Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff 2009-05-04 10:59:27 UTC (rev 2487)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff 2009-05-04 11:00:07 UTC (rev 2488)
@@ -4,6 +4,8 @@
sbin/mount/mount_fs.c | 2 +-
3 files changed, 15 insertions(+), 12 deletions(-)
+Index: b/sbin/mount/mount_fs.c
+===================================================================
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -52,7 +52,7 @@
@@ -15,9 +17,11 @@
#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
+Index: b/sbin/mount/mount.c
+===================================================================
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
-@@ -60,6 +60,8 @@
+@@ -58,6 +58,8 @@
#include <unistd.h>
#include <libutil.h>
@@ -26,31 +30,31 @@
#include "extern.h"
#include "mntopts.h"
#include "pathnames.h"
-@@ -159,10 +161,9 @@
+@@ -168,12 +170,9 @@
exit (1);
case 0: /* Child. */
/* Go find an executable. */
- execvP(execname, _PATH_SYSPATH, argv);
+ execvp(execname, argv);
if (errno == ENOENT) {
-- warn("exec %s not found in %s", execname,
-- _PATH_SYSPATH);
-+ warn("exec %s not found", execname);
+ warn("exec %s not found", execname);
+- if (execname[0] != '/') {
+- warnx("in path: %s", _PATH_SYSPATH);
+- }
}
exit(1);
default: /* Parent. */
-@@ -209,7 +210,9 @@
+@@ -218,6 +217,9 @@
+ static void
+ restart_mountd(void)
{
- 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. */
-@@ -223,6 +226,7 @@
+ struct pidfh *pfh;
+ pid_t mountdpid;
+
+@@ -234,6 +236,7 @@
/* We have mountd(8) PID in mountdpid varible, let's signal it. */
if (kill(mountdpid, SIGHUP) == -1)
err(1, "signal mountd");
@@ -58,7 +62,7 @@
}
int
-@@ -239,7 +243,7 @@
+@@ -250,7 +253,7 @@
options = NULL;
vfslist = NULL;
vfstype = "ufs";
@@ -67,7 +71,7 @@
switch (ch) {
case 'a':
all = 1;
-@@ -247,9 +251,6 @@
+@@ -258,9 +261,6 @@
case 'd':
debug = 1;
break;
@@ -77,7 +81,7 @@
case 'f':
init_flags |= MNT_FORCE;
break;
-@@ -616,11 +617,13 @@
+@@ -642,11 +642,13 @@
(void)printf(", reads: sync %ju async %ju",
(uintmax_t)sfp->f_syncreads,
(uintmax_t)sfp->f_asyncreads);
@@ -91,7 +95,7 @@
}
(void)printf(")\n");
}
-@@ -798,7 +801,7 @@
+@@ -836,7 +838,7 @@
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -100,7 +104,7 @@
" mount [-dfpruvw] special | node",
" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
exit(1);
-@@ -815,7 +818,7 @@
+@@ -853,7 +855,7 @@
if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
strncmp(ent->f_mntfromname, "<above>", 7) == 0) {
@@ -109,6 +113,8 @@
+1));
}
+Index: b/sbin/mount/Makefile
+===================================================================
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -8,6 +8,6 @@
Modified: trunk/freebsd-utils/debian/patches/014_route.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_route.diff 2009-05-04 10:59:27 UTC (rev 2487)
+++ trunk/freebsd-utils/debian/patches/014_route.diff 2009-05-04 11:00:07 UTC (rev 2488)
@@ -2,6 +2,8 @@
sbin/route/route.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
+Index: b/sbin/route/route.c
+===================================================================
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -63,10 +63,12 @@
@@ -35,15 +37,17 @@
switch(ch) {
case 'n':
nflag = 1;
-@@ -819,7 +821,7 @@
- else if (IN_CLASSC(addr))
- mask = IN_CLASSC_NET;
- else if (IN_MULTICAST(addr))
-- mask = IN_CLASSD_NET;
-+ mask = 0xf0000000;
- else
- mask = 0xffffffff;
- }
+@@ -821,7 +823,7 @@
+ else if (IN_CLASSC(addr))
+ mask = IN_CLASSC_NET;
+ else if (IN_MULTICAST(addr))
+- mask = IN_CLASSD_NET;
++ mask = 0xf0000000;
+ else
+ mask = 0xffffffff;
+
+Index: b/sbin/route/Makefile
+===================================================================
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -10,6 +10,7 @@
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2009-05-04 10:59:27 UTC (rev 2487)
+++ trunk/freebsd-utils/debian/rules 2009-05-04 11:00:07 UTC (rev 2488)
@@ -14,8 +14,8 @@
endif
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
-VERSION=7.1
+RELENG=RELENG_7_2_0_RELEASE
+VERSION=7.2
PATH:=/usr/lib/freebsd:$(PATH)
DESTDIR=$(CURDIR)/debian/tmp
PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -153,7 +153,7 @@
$(PMAKE) -C sbin/ifconfig clean
$(PMAKE) -C sbin/pfctl clean
$(PMAKE) -C sbin/route clean
- $(PMAKE) -C usr.bin/netstat clean
+# $(PMAKE) -C usr.bin/netstat clean
$(PMAKE) -C usr.sbin/authpf clean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -rf .pc
More information about the Glibc-bsd-commits
mailing list