[Glibc-bsd-commits] r2189 - in trunk/freebsd-utils: . debian debian/patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Mon Jun 23 15:52:28 UTC 2008
Author: ps-guest
Date: 2008-06-23 15:52:28 +0000 (Mon, 23 Jun 2008)
New Revision: 2189
Added:
trunk/freebsd-utils/debian/pf_ruleset.c
Modified:
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/001_mount.diff
trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff
trunk/freebsd-utils/debian/patches/010_sysctl_other.diff
trunk/freebsd-utils/debian/patches/012_net-tools.diff
trunk/freebsd-utils/debian/patches/015_pf.diff
trunk/freebsd-utils/debian/patches/016_mdconfig.diff
trunk/freebsd-utils/debian/patches/series
trunk/freebsd-utils/debian/rules
trunk/freebsd-utils/fetch
Log:
* preliminary freebsd-utils based on 7.0
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/control 2008-06-23 15:52:28 UTC (rev 2189)
@@ -3,7 +3,7 @@
Priority: important
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6.ds1-9), flex | flex-old, kfreebsd-kernel-headers (>= 0.27), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, freebsd6-buildutils, libkvm-dev (>=7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6.ds1-9), flex | flex-old, kfreebsd-kernel-headers (>= 0.30), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev
# libkvm-dev: dmesg
# libgeom-dev : ccdconfig
# libfreebsd (>= 0.0-5): ifconfig
Modified: trunk/freebsd-utils/debian/patches/001_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_mount.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/001_mount.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,11 +1,11 @@
---- src/sbin/mount/mount_ufs.c~ 2006-03-18 13:51:27.000000000 +0100
-+++ src/sbin/mount/mount_ufs.c 2006-03-18 13:52:39.000000000 +0100
-@@ -50,6 +50,8 @@
- #include <stdlib.h>
+--- 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>
+#include <bsd/getopt.h>
+
- #include <ufs/ufs/ufsmount.h>
+ #include "extern.h"
+ #include "mntopts.h"
- #include "extern.h"
Modified: trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,16 +1,17 @@
-diff -ur src.old/sbin/mount/mount.c src/sbin/mount/mount.c
---- src.old/sbin/mount/mount.c 2006-03-19 20:56:08.000000000 +0100
-+++ src/sbin/mount/mount.c 2006-03-19 20:56:47.000000000 +0100
-@@ -137,7 +137,7 @@
+Index: src/sbin/mount/mount.c
+===================================================================
+--- src.orig/sbin/mount/mount.c
++++ src/sbin/mount/mount.c
+@@ -239,7 +239,7 @@
options = NULL;
vfslist = NULL;
vfstype = "ufs";
-- while ((ch = getopt(argc, argv, "adlF:fo:prwt:uv")) != -1)
-+ while ((ch = getopt(argc, argv, "adlfo:prwt:uv")) != -1)
+- while ((ch = getopt(argc, argv, "adF:flo:prt:uvw")) != -1)
++ while ((ch = getopt(argc, argv, "adflo:prt:uvw")) != -1)
switch (ch) {
case 'a':
all = 1;
-@@ -145,9 +145,6 @@
+@@ -247,9 +247,6 @@
case 'd':
debug = 1;
break;
@@ -20,7 +21,7 @@
case 'f':
init_flags |= MNT_FORCE;
break;
-@@ -716,7 +716,7 @@
+@@ -798,7 +795,7 @@
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -29,9 +30,10 @@
" mount [-dfpruvw] special | node",
" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
exit(1);
-diff -ur src.old/sbin/umount/umount.c src/sbin/umount/umount.c
---- src.old/sbin/umount/umount.c 2006-03-19 20:56:08.000000000 +0100
-+++ src/sbin/umount/umount.c 2006-03-19 20:57:21.000000000 +0100
+Index: src/sbin/umount/umount.c
+===================================================================
+--- src.orig/sbin/umount/umount.c
++++ src/sbin/umount/umount.c
@@ -94,7 +94,7 @@
sync();
@@ -60,7 +62,7 @@
errs = umountall(typelist);
break;
case 0:
-@@ -577,6 +574,6 @@
+@@ -592,6 +589,6 @@
(void)fprintf(stderr, "%s\n%s\n",
"usage: umount [-fv] special | node | fsid",
Modified: trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/003_mount_syspath_weirdo.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,15 +1,17 @@
---- src/sbin/mount/mount.c~ 2006-03-19 20:51:12.000000000 +0100
-+++ src/sbin/mount/mount.c 2006-03-19 20:52:07.000000000 +0100
-@@ -465,10 +465,9 @@
- exit(mount_ufs(argc, (char * const *) argv));
-
+Index: src/sbin/mount/mount.c
+===================================================================
+--- src.orig/sbin/mount/mount.c
++++ src/sbin/mount/mount.c
+@@ -159,10 +159,9 @@
+ exit (1);
+ case 0: /* Child. */
/* Go find an executable. */
-- execvP(execname, _PATH_SYSPATH, (char * const *)argv);
-+ execvp(execname, (char * const *)argv);
+- execvP(execname, _PATH_SYSPATH, argv);
++ execvp(execname, argv);
if (errno == ENOENT) {
-- warn("exec mount_%s not found in %s", vfstype,
+- warn("exec %s not found in %s", execname,
- _PATH_SYSPATH);
-+ warn("exec mount_%s not found", vfstype);
++ warn("exec %s not found", execname);
}
exit(1);
- /* NOTREACHED */
+ default: /* Parent. */
Modified: trunk/freebsd-utils/debian/patches/010_sysctl_other.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/010_sysctl_other.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/010_sysctl_other.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,20 +1,20 @@
---- src/sbin/sysctl/sysctl.c~ 2006-03-18 16:00:32.000000000 +0100
-+++ src/sbin/sysctl/sysctl.c 2006-03-18 16:02:57.000000000 +0100
-@@ -319,16 +319,7 @@
+Index: src/sbin/sysctl/sysctl.c
+===================================================================
+--- src.orig/sbin/sysctl/sysctl.c
++++ src/sbin/sysctl/sysctl.c
+@@ -339,6 +339,7 @@
static int
S_loadavg(int l2, void *p)
{
-- struct loadavg *tv = (struct loadavg*)p;
--
-- if (l2 != sizeof(*tv)) {
-- warnx("S_loadavg %d != %d", l2, sizeof(*tv));
-- return (0);
-- }
-- printf(hflag ? "{ %'.2f %'.2f %'.2f }" : "{ %.2f %.2f %.2f }",
-- (double)tv->ldavg[0]/(double)tv->fscale,
-- (double)tv->ldavg[1]/(double)tv->fscale,
-- (double)tv->ldavg[2]/(double)tv->fscale);
-+/* bah.. */
++#if 0
+ struct loadavg *tv = (struct loadavg*)p;
+
+ if (l2 != sizeof(*tv)) {
+@@ -349,6 +350,7 @@
+ (double)tv->ldavg[0]/(double)tv->fscale,
+ (double)tv->ldavg[1]/(double)tv->fscale,
+ (double)tv->ldavg[2]/(double)tv->fscale);
++#endif
return (0);
}
Modified: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,7 +1,8 @@
-diff -ur src.old/sbin/ifconfig/Makefile src/sbin/ifconfig/Makefile
---- src.old/sbin/ifconfig/Makefile 2006-05-04 16:40:04.000000000 +0200
-+++ src/sbin/ifconfig/Makefile 2006-05-04 16:44:05.000000000 +0200
-@@ -18,16 +18,16 @@
+Index: src/sbin/ifconfig/Makefile
+===================================================================
+--- src.orig/sbin/ifconfig/Makefile
++++ src/sbin/ifconfig/Makefile
+@@ -20,17 +20,17 @@
SRCS+= af_atalk.c # AppleTalk support
SRCS+= ifclone.c # clone device support
@@ -12,20 +13,23 @@
SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support
-SRCS+= ifcarp.c # SIOC[GS]VH support
+-SRCS+= ifgroup.c # ...
-SRCS+= ifpfsync.c # pfsync(4) support
+#SRCS+= ifcarp.c # SIOC[GS]VH support
++#SRCS+= ifgroup.c # ...
+#SRCS+= ifpfsync.c # pfsync(4) support
-SRCS+= ifbridge.c # bridge support
+-SRCS+= iflagg.c # lagg support
+#SRCS+= ifbridge.c # bridge support
--SRCS+= iflagg.c # lagg support
+#SRCS+= iflagg.c # lagg support
- .if !defined(RELEASE_CRUNCH)
+ .if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
SRCS+= af_ipx.c # IPX support
-diff -ur src.old/sbin/ifconfig/ifcarp.c src/sbin/ifconfig/ifcarp.c
---- src.old/sbin/ifconfig/ifcarp.c 2006-05-04 16:40:04.000000000 +0200
-+++ src/sbin/ifconfig/ifcarp.c 2006-05-04 16:44:05.000000000 +0200
+Index: src/sbin/ifconfig/ifcarp.c
+===================================================================
+--- src.orig/sbin/ifconfig/ifcarp.c
++++ src/sbin/ifconfig/ifcarp.c
@@ -43,6 +43,7 @@
#include <ctype.h>
#include <stdio.h>
@@ -34,9 +38,10 @@
#include <stdlib.h>
#include <unistd.h>
#include <err.h>
-diff -ur src.old/sbin/ifconfig/ifconfig.c src/sbin/ifconfig/ifconfig.c
---- src.old/sbin/ifconfig/ifconfig.c 2006-05-04 16:40:04.000000000 +0200
-+++ src/sbin/ifconfig/ifconfig.c 2006-05-04 16:44:05.000000000 +0200
+Index: src/sbin/ifconfig/ifconfig.c
+===================================================================
+--- src.orig/sbin/ifconfig/ifconfig.c
++++ src/sbin/ifconfig/ifconfig.c
@@ -44,10 +44,14 @@
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -52,10 +57,11 @@
#include <net/ethernet.h>
#include <net/if.h>
-diff -u src/sbin/ifconfig/af_inet6.c src/sbin/ifconfig/af_inet6.c
---- src/sbin/ifconfig/af_inet6.c 2005-06-16 21:37:09.000000000 +0200
-+++ src/sbin/ifconfig/af_inet6.c 2006-08-25 21:22:49.000000000 +0200
-@@ -43,7 +43,6 @@
+Index: src/sbin/ifconfig/af_inet6.c
+===================================================================
+--- src.orig/sbin/ifconfig/af_inet6.c
++++ src/sbin/ifconfig/af_inet6.c
+@@ -42,7 +42,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -63,7 +69,7 @@
#include <arpa/inet.h>
-@@ -54,6 +53,8 @@
+@@ -53,6 +52,8 @@
#include <netdb.h>
#include <netinet6/nd6.h> /* Define ND6_INFINITE_LIFETIME */
@@ -72,9 +78,10 @@
#include "ifconfig.h"
-diff -u src/sbin/ifconfig/ifclone.c src/sbin/ifconfig/ifclone.c
---- src/sbin/ifconfig/ifclone.c 2004-12-08 20:18:07.000000000 +0100
-+++ src/sbin/ifconfig/ifclone.c 2006-08-25 21:21:56.000000000 +0200
+Index: src/sbin/ifconfig/ifclone.c
+===================================================================
+--- src.orig/sbin/ifconfig/ifclone.c
++++ src/sbin/ifconfig/ifclone.c
@@ -41,6 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -83,9 +90,10 @@
#include <unistd.h>
#include "ifconfig.h"
-diff -u src/sbin/ifconfig/af_link.c src/sbin/ifconfig/af_link.c
---- src/sbin/ifconfig/af_link.c 2004-12-31 20:46:27.000000000 +0100
-+++ src/sbin/ifconfig/af_link.c 2006-08-25 21:20:02.000000000 +0200
+Index: src/sbin/ifconfig/af_link.c
+===================================================================
+--- src.orig/sbin/ifconfig/af_link.c
++++ src/sbin/ifconfig/af_link.c
@@ -46,6 +46,7 @@
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -94,12 +102,13 @@
#include "ifconfig.h"
-diff -ur src.old/sbin/ifconfig/ifieee80211.c src/sbin/ifconfig/ifieee80211.c
---- src.old/sbin/ifconfig/ifieee80211.c 2006-05-04 16:40:04.000000000 +0200
-+++ src/sbin/ifconfig/ifieee80211.c 2006-05-04 16:44:05.000000000 +0200
-@@ -84,6 +84,9 @@
- #include <errno.h>
+Index: src/sbin/ifconfig/ifieee80211.c
+===================================================================
+--- src.orig/sbin/ifconfig/ifieee80211.c
++++ src/sbin/ifconfig/ifieee80211.c
+@@ -87,6 +87,9 @@
#include <fcntl.h>
+ #include <inttypes.h>
#include <stdio.h>
+#include <stdint.h>
+#include <netinet/ether.h>
@@ -107,10 +116,11 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-diff -ur src.old/sbin/route/route.c src/sbin/route/route.c
---- src.old/sbin/route/route.c 2006-05-04 16:40:04.000000000 +0200
-+++ src/sbin/route/route.c 2006-05-04 16:44:09.000000000 +0200
-@@ -63,10 +64,12 @@
+Index: src/sbin/route/route.c
+===================================================================
+--- src.orig/sbin/route/route.c
++++ src/sbin/route/route.c
+@@ -63,10 +63,12 @@
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
@@ -123,12 +133,12 @@
struct keytab {
char *kt_cp;
-@@ -134,7 +134,7 @@
+@@ -134,7 +136,7 @@
if (argc < 2)
usage((char *)NULL);
- while ((ch = getopt(argc, argv, "nqdtv")) != -1)
+ while ((ch = getopt(argc, argv, "+nqdtv")) != -1)
- switch(ch) {
- case 'n':
- nflag = 1;
+ switch(ch) {
+ case 'n':
+ nflag = 1;
Modified: trunk/freebsd-utils/debian/patches/015_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_pf.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/015_pf.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -1,7 +1,8 @@
-diff -urN src/contrib/pf/authpf/authpf.c src/contrib/pf/authpf/authpf.c
---- 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 @@
+Index: src/contrib/pf/authpf/authpf.c
+===================================================================
+--- src.orig/contrib/pf/authpf/authpf.c
++++ src/contrib/pf/authpf/authpf.c
+@@ -35,7 +35,8 @@
#ifdef __FreeBSD_kernel__
#include <inttypes.h>
#endif
@@ -11,18 +12,18 @@
#include <pwd.h>
#include <signal.h>
#include <stdio.h>
-@@ -103,8 +103,9 @@
- char *cp;
+@@ -92,8 +93,9 @@
+ gid_t gid;
uid_t uid;
char *shell;
-+#if 0
++#if 0
login_cap_t *lc;
-
+#endif
config = fopen(PATH_CONFFILE, "r");
-
- if ((cp = getenv("SSH_TTY")) == NULL) {
-@@ -147,15 +148,16 @@
+ if (config == NULL) {
+ syslog(LOG_ERR, "can not open %s (%m)", PATH_CONFFILE);
+@@ -139,15 +141,16 @@
syslog(LOG_ERR, "cannot find user for uid %u", uid);
goto die;
}
@@ -32,7 +33,7 @@
shell = (char *)login_getcapstr(lc, "shell", pw->pw_shell,
pw->pw_shell);
else
-+#endif
++#endif
shell = pw->pw_shell;
-
+#if 0
@@ -42,19 +43,20 @@
if (strcmp(shell, PATH_AUTHPF_SHELL)) {
syslog(LOG_ERR, "wrong shell for user %s, uid %u",
pw->pw_name, pw->pw_uid);
-@@ -313,7 +315,9 @@
+@@ -317,7 +320,9 @@
while (1) {
printf("\r\nHello %s. ", luser);
printf("You are authenticated from host \"%s\"\r\n", ipsrc);
-+#if 0
++#if 0
setproctitle("%s@%s", luser, ipsrc);
-+#endif
++#endif
print_message(PATH_MESSAGE);
while (1) {
sleep(10);
-diff -urN src/contrib/pf/pfctl/parse.y src/contrib/pf/pfctl/parse.y
---- src/contrib/pf/pfctl/parse.y 2007-01-09 11:00:24.000000000 +0100
-+++ src/contrib/pf/pfctl/parse.y 2007-01-09 10:18:46.000000000 +0100
+Index: src/contrib/pf/pfctl/parse.y
+===================================================================
+--- src.orig/contrib/pf/pfctl/parse.y
++++ src/contrib/pf/pfctl/parse.y
@@ -56,7 +56,7 @@
#include <limits.h>
#include <pwd.h>
@@ -64,7 +66,7 @@
#include "pfctl_parser.h"
#include "pfctl.h"
-@@ -394,6 +396,7 @@
+@@ -401,6 +401,7 @@
} v;
int lineno;
} YYSTYPE;
@@ -72,9 +74,10 @@
#define DYNIF_MULTIADDR(addr) ((addr).type == PF_ADDR_DYNIFTL && \
(!((addr).iflags & PFI_AFLAG_NOALIAS) || \
-diff -urN src/contrib/pf/pfctl/pf_print_state.c src/contrib/pf/pfctl/pf_print_state.c
---- src/contrib/pf/pfctl/pf_print_state.c 2007-01-09 11:00:24.000000000 +0100
-+++ src/contrib/pf/pfctl/pf_print_state.c 2007-01-09 10:15:37.000000000 +0100
+Index: src/contrib/pf/pfctl/pf_print_state.c
+===================================================================
+--- src.orig/contrib/pf/pfctl/pf_print_state.c
++++ src/contrib/pf/pfctl/pf_print_state.c
@@ -34,7 +34,21 @@
#include <sys/types.h>
@@ -97,13 +100,14 @@
#include <net/if.h>
#define TCPSTATES
#include <netinet/tcp_fsm.h>
-diff -urN src/contrib/pf/pfctl/pfctl.h src/contrib/pf/pfctl/pfctl.h
---- src/contrib/pf/pfctl/pfctl.h 2007-01-09 11:00:24.000000000 +0100
-+++ src/contrib/pf/pfctl/pfctl.h 2007-01-09 10:06:36.000000000 +0100
-@@ -34,6 +34,12 @@
- #ifndef _PFCTL_H_
- #define _PFCTL_H_
+Index: src/contrib/pf/pfctl/pfctl.h
+===================================================================
+--- src.orig/contrib/pf/pfctl/pfctl.h
++++ src/contrib/pf/pfctl/pfctl.h
+@@ -36,6 +36,12 @@
+ enum pfctl_show { PFCTL_SHOW_RULES, PFCTL_SHOW_LABELS, PFCTL_SHOW_NOTHING };
+
+#include <bsd/string.h>
+#include <bsd/random.h>
+#define __BSD_VISIBLE 1
@@ -113,9 +117,10 @@
enum { PFRB_TABLES = 1, PFRB_TSTATS, PFRB_ADDRS, PFRB_ASTATS,
PFRB_IFACES, PFRB_TRANS, PFRB_MAX };
struct pfr_buffer {
-diff -urN src/contrib/pf/pfctl/pfctl_parser.c src/contrib/pf/pfctl/pfctl_parser.c
---- src/contrib/pf/pfctl/pfctl_parser.c 2007-01-09 11:00:24.000000000 +0100
-+++ src/contrib/pf/pfctl/pfctl_parser.c 2007-01-09 10:04:29.000000000 +0100
+Index: src/contrib/pf/pfctl/pfctl_parser.c
+===================================================================
+--- src.orig/contrib/pf/pfctl/pfctl_parser.c
++++ src/contrib/pf/pfctl/pfctl_parser.c
@@ -42,7 +42,7 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -125,9 +130,9 @@
#include <netinet/icmp6.h>
#include <net/pfvar.h>
#include <arpa/inet.h>
-@@ -58,6 +58,14 @@
- #include <err.h>
+@@ -59,6 +59,14 @@
#include <ifaddrs.h>
+ #include <unistd.h>
+#include <bsd/ip_icmp.h>
+#include <bsd/bsd.h>
@@ -140,28 +145,24 @@
#include "pfctl_parser.h"
#include "pfctl.h"
-diff -urN src/sbin/pfctl/Makefile src/sbin/pfctl/Makefile
---- src/sbin/pfctl/Makefile 2007-01-09 10:59:51.000000000 +0100
-+++ src/sbin/pfctl/Makefile 2007-01-09 09:48:06.000000000 +0100
-@@ -19,7 +19,7 @@
+Index: src/sbin/pfctl/Makefile
+===================================================================
+--- src.orig/sbin/pfctl/Makefile
++++ src/sbin/pfctl/Makefile
+@@ -21,7 +21,7 @@
YFLAGS=
-LDADD+= -lm -lmd
-+LDADD+= -lm
- DPADD+= ${LIBM}
++LDADD+= -lm
+ DPADD+= ${LIBM} ${LIBMD}
.include <bsd.prog.mk>
-diff -urN src/usr.sbin/authpf/Makefile src/usr.sbin/authpf/Makefile
---- src/usr.sbin/authpf/Makefile 2007-01-09 10:59:54.000000000 +0100
-+++ src/usr.sbin/authpf/Makefile 2007-01-09 09:45:02.000000000 +0100
-@@ -11,12 +11,12 @@
-
- SRCS= authpf.c
-
--CFLAGS+= -I${.CURDIR}/../../contrib/pf/pfctl -Wall -Werror
-+CFLAGS+= -I${.CURDIR}/../../contrib/pf/pfctl -Wall
-
+Index: src/usr.sbin/authpf/Makefile
+===================================================================
+--- src.orig/usr.sbin/authpf/Makefile
++++ src/usr.sbin/authpf/Makefile
+@@ -16,7 +16,7 @@
# XXX ALTQ:
CFLAGS+= -DENABLE_ALTQ
Modified: trunk/freebsd-utils/debian/patches/016_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_mdconfig.diff 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/016_mdconfig.diff 2008-06-23 15:52:28 UTC (rev 2189)
@@ -2,17 +2,19 @@
* revert change from 1.43.2.4 to 1.43.2.5
it expects kld_isloaded() and kld_load() in libutil
---- src/sbin/mdconfig/mdconfig.c
+Index: src/sbin/mdconfig/mdconfig.c
+===================================================================
+--- src.orig/sbin/mdconfig/mdconfig.c
+++ src/sbin/mdconfig/mdconfig.c
-@@ -29,6 +29,7 @@
- #include <sys/stat.h>
+@@ -41,6 +41,7 @@
+ static int md_find(char *, const char *);
+ static int md_query(char *name);
+ static int md_list(char *units, int opt);
++static void mdmaybeload(void);
+ static char *geom_config_get(struct gconf *g, char *name);
+ static void md_prthumanval(char *length);
- int list(const int);
-+void mdmaybeload(void);
- int query(const int, const int);
- void usage(void);
-
-@@ -238,9 +239,7 @@
+@@ -253,9 +254,7 @@
}
mdio.md_version = MDIOVERSION;
@@ -23,9 +25,9 @@
fd = open("/dev/" MDCTL_NAME, O_RDWR, 0);
if (fd < 0)
err(1, "open(/dev/%s)", MDCTL_NAME);
-@@ -356,3 +355,21 @@
-
- return (0);
+@@ -454,3 +453,21 @@
+ {
+ return (md_list(name, OPT_UNIT));
}
+
+void
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/patches/series 2008-06-23 15:52:28 UTC (rev 2189)
@@ -14,3 +14,4 @@
014_kldconfig.diff
015_pf.diff
016_mdconfig.diff
+017_kbsd7.diff
Added: trunk/freebsd-utils/debian/pf_ruleset.c
===================================================================
--- trunk/freebsd-utils/debian/pf_ruleset.c (rev 0)
+++ trunk/freebsd-utils/debian/pf_ruleset.c 2008-06-23 15:52:28 UTC (rev 2189)
@@ -0,0 +1,502 @@
+
+/*-
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $
+ */
+
+#include <sys/cdefs.h>
+/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtonum.c,v 1.2 2006/03/14 19:53:03 ache Exp $"); */
+
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#define INVALID 1
+#define TOOSMALL 2
+#define TOOLARGE 3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+ const char **errstrp)
+{
+ long long ll = 0;
+ char *ep;
+ int error = 0;
+ struct errval {
+ const char *errstr;
+ int err;
+ } ev[4] = {
+ { NULL, 0 },
+ { "invalid", EINVAL },
+ { "too small", ERANGE },
+ { "too large", ERANGE },
+ };
+
+ ev[0].err = errno;
+ errno = 0;
+ if (minval > maxval)
+ error = INVALID;
+ else {
+ ll = strtoll(numstr, &ep, 10);
+ if (errno == EINVAL || numstr == ep || *ep != '\0')
+ error = INVALID;
+ else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+ error = TOOSMALL;
+ else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+ error = TOOLARGE;
+ }
+ if (errstrp != NULL)
+ *errstrp = ev[error].errstr;
+ errno = ev[error].err;
+ if (error)
+ ll = 0;
+
+ return (ll);
+}
+
+
+
+
+/* $OpenBSD: pf_ruleset.c,v 1.1 2006/10/27 13:56:51 mcbride Exp $ */
+
+/*
+ * Copyright (c) 2001 Daniel Hartmeier
+ * Copyright (c) 2002,2003 Henning Brauer
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Effort sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F30602-01-2-0537.
+ *
+ */
+
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <bsd/string.h>
+#ifdef _KERNEL
+# include <sys/systm.h>
+#endif /* _KERNEL */
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+
+#include <net/if.h>
+#include <net/pfvar.h>
+
+#ifdef INET6
+#include <netinet/ip6.h>
+#endif /* INET6 */
+
+
+#ifdef _KERNEL
+# define DPFPRINTF(format, x...) \
+ if (pf_status.debug >= PF_DEBUG_NOISY) \
+ printf(format , ##x)
+#ifdef __FreeBSD_kernel__
+#define rs_malloc(x) malloc(x, M_TEMP, M_NOWAIT)
+#else
+#define rs_malloc(x) malloc(x, M_TEMP, M_WAITOK)
+#endif
+#define rs_free(x) free(x, M_TEMP)
+
+#else
+/* Userland equivalents so we can lend code to pfctl et al. */
+
+# include <arpa/inet.h>
+# include <errno.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <string.h>
+# define rs_malloc(x) malloc(x)
+# define rs_free(x) free(x)
+
+# ifdef PFDEBUG
+# include <sys/stdarg.h>
+# define DPFPRINTF(format, x...) fprintf(stderr, format , ##x)
+# else
+# define DPFPRINTF(format, x...) ((void)0)
+# endif /* PFDEBUG */
+#endif /* _KERNEL */
+
+
+struct pf_anchor_global pf_anchors;
+struct pf_anchor pf_main_anchor;
+
+#ifndef __FreeBSD_kernel__
+/* XXX: hum? */
+int pf_get_ruleset_number(u_int8_t);
+void pf_init_ruleset(struct pf_ruleset *);
+int pf_anchor_setup(struct pf_rule *,
+ const struct pf_ruleset *, const char *);
+int pf_anchor_copyout(const struct pf_ruleset *,
+ const struct pf_rule *, struct pfioc_rule *);
+void pf_anchor_remove(struct pf_rule *);
+#endif
+
+static __inline int pf_anchor_compare(struct pf_anchor *, struct pf_anchor *);
+
+RB_GENERATE(pf_anchor_global, pf_anchor, entry_global, pf_anchor_compare);
+RB_GENERATE(pf_anchor_node, pf_anchor, entry_node, pf_anchor_compare);
+
+static __inline int
+pf_anchor_compare(struct pf_anchor *a, struct pf_anchor *b)
+{
+ int c = strcmp(a->path, b->path);
+
+ return (c ? (c < 0 ? -1 : 1) : 0);
+}
+
+int
+pf_get_ruleset_number(u_int8_t action)
+{
+ switch (action) {
+ case PF_SCRUB:
+ case PF_NOSCRUB:
+ return (PF_RULESET_SCRUB);
+ break;
+ case PF_PASS:
+ case PF_DROP:
+ return (PF_RULESET_FILTER);
+ break;
+ case PF_NAT:
+ case PF_NONAT:
+ return (PF_RULESET_NAT);
+ break;
+ case PF_BINAT:
+ case PF_NOBINAT:
+ return (PF_RULESET_BINAT);
+ break;
+ case PF_RDR:
+ case PF_NORDR:
+ return (PF_RULESET_RDR);
+ break;
+ default:
+ return (PF_RULESET_MAX);
+ break;
+ }
+}
+
+void
+pf_init_ruleset(struct pf_ruleset *ruleset)
+{
+ int i;
+
+ memset(ruleset, 0, sizeof(struct pf_ruleset));
+ for (i = 0; i < PF_RULESET_MAX; i++) {
+ TAILQ_INIT(&ruleset->rules[i].queues[0]);
+ TAILQ_INIT(&ruleset->rules[i].queues[1]);
+ ruleset->rules[i].active.ptr = &ruleset->rules[i].queues[0];
+ ruleset->rules[i].inactive.ptr = &ruleset->rules[i].queues[1];
+ }
+}
+
+struct pf_anchor *
+pf_find_anchor(const char *path)
+{
+ struct pf_anchor *key, *found;
+
+ key = (struct pf_anchor *)rs_malloc(sizeof(*key));
+ memset(key, 0, sizeof(*key));
+ strlcpy(key->path, path, sizeof(key->path));
+ found = RB_FIND(pf_anchor_global, &pf_anchors, key);
+ rs_free(key);
+ return (found);
+}
+
+struct pf_ruleset *
+pf_find_ruleset(const char *path)
+{
+ struct pf_anchor *anchor;
+
+ while (*path == '/')
+ path++;
+ if (!*path)
+ return (&pf_main_ruleset);
+ anchor = pf_find_anchor(path);
+ if (anchor == NULL)
+ return (NULL);
+ else
+ return (&anchor->ruleset);
+}
+
+struct pf_ruleset *
+pf_find_or_create_ruleset(const char *path)
+{
+ char *p, *q, *r;
+ struct pf_ruleset *ruleset;
+#ifdef __FreeBSD_kernel__
+ struct pf_anchor *anchor = NULL, *dup, *parent = NULL;
+#else
+ struct pf_anchor *anchor, *dup, *parent = NULL;
+#endif
+
+ if (path[0] == 0)
+ return (&pf_main_ruleset);
+ while (*path == '/')
+ path++;
+ ruleset = pf_find_ruleset(path);
+ if (ruleset != NULL)
+ return (ruleset);
+ p = (char *)rs_malloc(MAXPATHLEN);
+ bzero(p, MAXPATHLEN);
+ strlcpy(p, path, MAXPATHLEN);
+ while (parent == NULL && (q = strrchr(p, '/')) != NULL) {
+ *q = 0;
+ if ((ruleset = pf_find_ruleset(p)) != NULL) {
+ parent = ruleset->anchor;
+ break;
+ }
+ }
+ if (q == NULL)
+ q = p;
+ else
+ q++;
+ strlcpy(p, path, MAXPATHLEN);
+ if (!*q) {
+ rs_free(p);
+ return (NULL);
+ }
+ while ((r = strchr(q, '/')) != NULL || *q) {
+ if (r != NULL)
+ *r = 0;
+ if (!*q || strlen(q) >= PF_ANCHOR_NAME_SIZE ||
+ (parent != NULL && strlen(parent->path) >=
+ MAXPATHLEN - PF_ANCHOR_NAME_SIZE - 1)) {
+ rs_free(p);
+ return (NULL);
+ }
+ anchor = (struct pf_anchor *)rs_malloc(sizeof(*anchor));
+ if (anchor == NULL) {
+ rs_free(p);
+ return (NULL);
+ }
+ memset(anchor, 0, sizeof(*anchor));
+ RB_INIT(&anchor->children);
+ strlcpy(anchor->name, q, sizeof(anchor->name));
+ if (parent != NULL) {
+ strlcpy(anchor->path, parent->path,
+ sizeof(anchor->path));
+ strlcat(anchor->path, "/", sizeof(anchor->path));
+ }
+ strlcat(anchor->path, anchor->name, sizeof(anchor->path));
+ if ((dup = RB_INSERT(pf_anchor_global, &pf_anchors, anchor)) !=
+ NULL) {
+ printf("pf_find_or_create_ruleset: RB_INSERT1 "
+ "'%s' '%s' collides with '%s' '%s'\n",
+ anchor->path, anchor->name, dup->path, dup->name);
+ rs_free(anchor);
+ rs_free(p);
+ return (NULL);
+ }
+ if (parent != NULL) {
+ anchor->parent = parent;
+ if ((dup = RB_INSERT(pf_anchor_node, &parent->children,
+ anchor)) != NULL) {
+ printf("pf_find_or_create_ruleset: "
+ "RB_INSERT2 '%s' '%s' collides with "
+ "'%s' '%s'\n", anchor->path, anchor->name,
+ dup->path, dup->name);
+ RB_REMOVE(pf_anchor_global, &pf_anchors,
+ anchor);
+ rs_free(anchor);
+ rs_free(p);
+ return (NULL);
+ }
+ }
+ pf_init_ruleset(&anchor->ruleset);
+ anchor->ruleset.anchor = anchor;
+ parent = anchor;
+ if (r != NULL)
+ q = r + 1;
+ else
+ *q = 0;
+ }
+ rs_free(p);
+ return (&anchor->ruleset);
+}
+
+void
+pf_remove_if_empty_ruleset(struct pf_ruleset *ruleset)
+{
+ struct pf_anchor *parent;
+ int i;
+
+ while (ruleset != NULL) {
+ if (ruleset == &pf_main_ruleset || ruleset->anchor == NULL ||
+ !RB_EMPTY(&ruleset->anchor->children) ||
+ ruleset->anchor->refcnt > 0 || ruleset->tables > 0 ||
+ ruleset->topen)
+ return;
+ for (i = 0; i < PF_RULESET_MAX; ++i)
+ if (!TAILQ_EMPTY(ruleset->rules[i].active.ptr) ||
+ !TAILQ_EMPTY(ruleset->rules[i].inactive.ptr) ||
+ ruleset->rules[i].inactive.open)
+ return;
+ RB_REMOVE(pf_anchor_global, &pf_anchors, ruleset->anchor);
+ if ((parent = ruleset->anchor->parent) != NULL)
+ RB_REMOVE(pf_anchor_node, &parent->children,
+ ruleset->anchor);
+ rs_free(ruleset->anchor);
+ if (parent == NULL)
+ return;
+ ruleset = &parent->ruleset;
+ }
+}
+
+int
+pf_anchor_setup(struct pf_rule *r, const struct pf_ruleset *s,
+ const char *name)
+{
+ char *p, *path;
+ struct pf_ruleset *ruleset;
+
+ r->anchor = NULL;
+ r->anchor_relative = 0;
+ r->anchor_wildcard = 0;
+ if (!name[0])
+ return (0);
+ path = (char *)rs_malloc(MAXPATHLEN);
+ bzero(path, MAXPATHLEN);
+ if (name[0] == '/')
+ strlcpy(path, name + 1, MAXPATHLEN);
+ else {
+ /* relative path */
+ r->anchor_relative = 1;
+ if (s->anchor == NULL || !s->anchor->path[0])
+ path[0] = 0;
+ else
+ strlcpy(path, s->anchor->path, MAXPATHLEN);
+ while (name[0] == '.' && name[1] == '.' && name[2] == '/') {
+ if (!path[0]) {
+ printf("pf_anchor_setup: .. beyond root\n");
+ rs_free(path);
+ return (1);
+ }
+ if ((p = strrchr(path, '/')) != NULL)
+ *p = 0;
+ else
+ path[0] = 0;
+ r->anchor_relative++;
+ name += 3;
+ }
+ if (path[0])
+ strlcat(path, "/", MAXPATHLEN);
+ strlcat(path, name, MAXPATHLEN);
+ }
+ if ((p = strrchr(path, '/')) != NULL && !strcmp(p, "/*")) {
+ r->anchor_wildcard = 1;
+ *p = 0;
+ }
+ ruleset = pf_find_or_create_ruleset(path);
+ rs_free(path);
+ if (ruleset == NULL || ruleset->anchor == NULL) {
+ printf("pf_anchor_setup: ruleset\n");
+ return (1);
+ }
+ r->anchor = ruleset->anchor;
+ r->anchor->refcnt++;
+ return (0);
+}
+
+int
+pf_anchor_copyout(const struct pf_ruleset *rs, const struct pf_rule *r,
+ struct pfioc_rule *pr)
+{
+ pr->anchor_call[0] = 0;
+ if (r->anchor == NULL)
+ return (0);
+ if (!r->anchor_relative) {
+ strlcpy(pr->anchor_call, "/", sizeof(pr->anchor_call));
+ strlcat(pr->anchor_call, r->anchor->path,
+ sizeof(pr->anchor_call));
+ } else {
+ char *a, *p;
+ int i;
+
+ a = (char *)rs_malloc(MAXPATHLEN);
+ bzero(a, MAXPATHLEN);
+ if (rs->anchor == NULL)
+ a[0] = 0;
+ else
+ strlcpy(a, rs->anchor->path, MAXPATHLEN);
+ for (i = 1; i < r->anchor_relative; ++i) {
+ if ((p = strrchr(a, '/')) == NULL)
+ p = a;
+ *p = 0;
+ strlcat(pr->anchor_call, "../",
+ sizeof(pr->anchor_call));
+ }
+ if (strncmp(a, r->anchor->path, strlen(a))) {
+ printf("pf_anchor_copyout: '%s' '%s'\n", a,
+ r->anchor->path);
+ rs_free(a);
+ return (1);
+ }
+ if (strlen(r->anchor->path) > strlen(a))
+ strlcat(pr->anchor_call, r->anchor->path + (a[0] ?
+ strlen(a) + 1 : 0), sizeof(pr->anchor_call));
+ rs_free(a);
+ }
+ if (r->anchor_wildcard)
+ strlcat(pr->anchor_call, pr->anchor_call[0] ? "/*" : "*",
+ sizeof(pr->anchor_call));
+ return (0);
+}
+
+void
+pf_anchor_remove(struct pf_rule *r)
+{
+ if (r->anchor == NULL)
+ return;
+ if (r->anchor->refcnt <= 0) {
+ printf("pf_anchor_remove: broken refcount\n");
+ r->anchor = NULL;
+ return;
+ }
+ if (!--r->anchor->refcnt)
+ pf_remove_if_empty_ruleset(&r->anchor->ruleset);
+ r->anchor = NULL;
+}
+
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/debian/rules 2008-06-23 15:52:28 UTC (rev 2189)
@@ -21,12 +21,12 @@
build/freebsd-utils:: apply-patches
set -e ; for i in sbin/{ccdconfig,dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
- sbin/mount_{autofs,cd9660,ext2fs,hpfs,msdosfs,ntfs,nullfs,reiserfs,udf,umapfs,unionfs} \
+ sbin/mount_{autofs,cd9660,ext2fs,hpfs,msdosfs,ntfs,nullfs,reiserfs,udf,unionfs} \
usr.bin/ktrace \
; do \
$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
done
-# FIXME: add mount_{xfs,nfs,nfs4},chflags
+# FIXME: add mount_{xfs,nfs},chflags
build/module-init-tools:: apply-patches
set -e ; for i in sbin/kld{load,stat,unload,config} \
@@ -35,6 +35,7 @@
done
build/net-tools:: apply-patches
+ cp -p debian/pf_ruleset.c build-tree/src/sbin/pfctl/
set -e ; for i in sbin/{ifconfig,route,pfctl} usr.sbin/authpf \
; do \
$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch 2008-06-23 15:51:45 UTC (rev 2188)
+++ trunk/freebsd-utils/fetch 2008-06-23 15:52:28 UTC (rev 2189)
@@ -2,7 +2,7 @@
set -ex
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_6_3_0_RELEASE
+RELENG=RELENG_7_0_0_RELEASE
rm -rf src
@@ -18,7 +18,7 @@
src/sbin/ifconfig src/sbin/route src/usr.bin/netstat \
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_{cd9660,ext2fs,hpfs,msdosfs,nfs,ntfs,nullfs,udf,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} \
More information about the Glibc-bsd-commits
mailing list