[Glibc-bsd-commits] r2843 - in trunk/freebsd-utils/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Sat Nov 14 13:44:49 UTC 2009
Author: ps-guest
Date: 2009-11-14 13:44:48 +0000 (Sat, 14 Nov 2009)
New Revision: 2843
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/002_ifconfig.diff
trunk/freebsd-utils/debian/patches/004_kldconfig.diff
trunk/freebsd-utils/debian/patches/014_route.diff
trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff
trunk/freebsd-utils/debian/patches/016_swapon.diff
trunk/freebsd-utils/debian/patches/series
trunk/freebsd-utils/debian/rules
Log:
preliminary freebsd-utils 8.0
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/changelog 2009-11-14 13:44:48 UTC (rev 2843)
@@ -1,3 +1,10 @@
+freebsd-utils (8.0-0) EXPERIMENTAL; urgency=low
+
+ [ Petr Salinger ]
+ * Based on FreeBSD 8.0.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sat, 14 Nov 2009 10:53:32 +0100
+
freebsd-utils (7.2-9) unstable; urgency=low
* debian/rules: adjust start priority of freebsd-utils.init and
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/control 2009-11-14 13:44:48 UTC (rev 2843)
@@ -4,7 +4,7 @@
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: debhelper (>= 7), quilt, po-debconf, freebsd-buildutils,
- libkvm-dev (>= 7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.10.1),
+ libkvm-dev (>= 8.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.10.1),
flex | flex-old, kfreebsd-kernel-headers (>= 0.31),
libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
# libkvm-dev: dmesg
Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2009-11-14 13:44:48 UTC (rev 2843)
@@ -13,9 +13,11 @@
sbin/ifconfig/ifvlan.c | 2 ++
12 files changed, 53 insertions(+), 32 deletions(-)
---- a/sbin/ifconfig/Makefile
-+++ b/sbin/ifconfig/Makefile
-@@ -20,18 +20,18 @@
+Index: freebsd-utils/sbin/ifconfig/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/Makefile 2009-11-14 13:34:56.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/Makefile 2009-11-14 13:35:34.000000000 +0000
+@@ -20,22 +20,22 @@
SRCS+= af_atalk.c # AppleTalk support
SRCS+= ifclone.c # clone device support
@@ -23,13 +25,21 @@
+#SRCS+= ifmac.c # MAC support
SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support
SRCS+= ifvlan.c # SIOC[GS]ETVLAN support
- SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support
-SRCS+= ifgre.c # GRE keys etc
+#SRCS+= ifgre.c # GRE keys etc
+ SRCS+= ifgif.c # GIF reversed header workaround
+-SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
+-DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL}
+-LDADD+= -lbsdxml -ljail -lsbuf
+-
-SRCS+= ifcarp.c # SIOC[GS]VH support
-SRCS+= ifgroup.c # ...
-SRCS+= ifpfsync.c # pfsync(4) support
++#SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
++#DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL}
++#LDADD+= -lbsdxml -ljail -lsbuf
++
+#SRCS+= ifcarp.c # SIOC[GS]VH support
+#SRCS+= ifgroup.c # ...
+#SRCS+= ifpfsync.c # pfsync(4) support
@@ -41,7 +51,7 @@
.if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
SRCS+= af_ipx.c # IPX support
-@@ -42,6 +42,7 @@
+@@ -46,6 +46,7 @@
MAN= ifconfig.8
CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
@@ -49,8 +59,10 @@
WARNS?= 0
.include <bsd.prog.mk>
---- a/sbin/ifconfig/ifcarp.c
-+++ b/sbin/ifconfig/ifcarp.c
+Index: freebsd-utils/sbin/ifconfig/ifcarp.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifcarp.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifcarp.c 2009-11-14 13:34:57.000000000 +0000
@@ -43,6 +43,7 @@
#include <ctype.h>
#include <stdio.h>
@@ -59,8 +71,10 @@
#include <stdlib.h>
#include <unistd.h>
#include <err.h>
---- a/sbin/ifconfig/ifconfig.c
-+++ b/sbin/ifconfig/ifconfig.c
+Index: freebsd-utils/sbin/ifconfig/ifconfig.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifconfig.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifconfig.c 2009-11-14 13:34:57.000000000 +0000
@@ -44,10 +44,14 @@
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -76,7 +90,16 @@
#include <net/ethernet.h>
#include <net/if.h>
-@@ -74,6 +78,13 @@
+@@ -67,7 +71,7 @@
+ #include <err.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <jail.h>
++#include <sys/jail.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -75,6 +79,13 @@
#include "ifconfig.h"
@@ -90,16 +113,49 @@
/*
* Since "struct ifreq" is composed of various union members, callers
* should pay special attention to interprete the value.
-@@ -618,7 +629,7 @@
+@@ -155,7 +166,7 @@
+ all = downonly = uponly = namesonly = noload = verbose = 0;
+
+ /* Parse leading line options */
+- strlcpy(options, "adklmnuv", sizeof(options));
++ strlcpy(options, "+adklmnuv", sizeof(options));
+ for (p = opts; p != NULL; p = p->next)
+ strlcat(options, p->opt, sizeof(options));
+ while ((c = getopt(argc, argv, options)) != -1) {
+@@ -641,9 +652,10 @@
+ if (ioctl(s, SIOCDIFPHYADDR, &ifr) < 0)
+ err(1, "SIOCDIFPHYADDR");
}
++#if 0
static void
+-setifvnet(const char *jname, int dummy __unused, int s,
++setifvnet(const char *jname, int dummy, int s,
+ const struct afswtch *afp)
+ {
+ struct ifreq my_ifr;
+@@ -657,7 +669,7 @@
+ }
+
+ static void
+-setifrvnet(const char *jname, int dummy __unused, int s,
++setifrvnet(const char *jname, int dummy, int s,
+ const struct afswtch *afp)
+ {
+ struct ifreq my_ifr;
+@@ -670,8 +682,10 @@
+ err(1, "SIOCSIFRVNET(%d, %s)", my_ifr.ifr_jid, my_ifr.ifr_name);
+ }
+
++#endif
++
+ static void
-setifnetmask(const char *addr, int dummy __unused, int s,
+setifnetmask(const char *addr, int dummy, int s,
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL) {
-@@ -628,7 +639,7 @@
+@@ -681,7 +695,7 @@
}
static void
@@ -108,7 +164,7 @@
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL)
-@@ -636,7 +647,7 @@
+@@ -689,7 +703,7 @@
}
static void
@@ -117,7 +173,7 @@
const struct afswtch *afp)
{
const struct afswtch *inet;
-@@ -669,7 +680,7 @@
+@@ -722,7 +736,7 @@
/*ARGSUSED*/
static void
@@ -126,7 +182,7 @@
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL)
-@@ -729,7 +740,7 @@
+@@ -782,7 +796,7 @@
}
static void
@@ -135,7 +191,7 @@
const struct afswtch *afp)
{
strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -739,7 +750,7 @@
+@@ -792,7 +806,7 @@
}
static void
@@ -144,7 +200,7 @@
const struct afswtch *afp)
{
strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -749,7 +760,7 @@
+@@ -802,7 +816,7 @@
}
static void
@@ -153,8 +209,21 @@
const struct afswtch *afp)
{
char *newname;
---- a/sbin/ifconfig/af_inet6.c
-+++ b/sbin/ifconfig/af_inet6.c
+@@ -1054,8 +1068,10 @@
+ DEF_CMD_ARG2("tunnel", settunnel),
+ DEF_CMD("-tunnel", 0, deletetunnel),
+ DEF_CMD("deletetunnel", 0, deletetunnel),
++#if 0
+ DEF_CMD_ARG("vnet", setifvnet),
+ DEF_CMD_ARG("-vnet", setifrvnet),
++#endif
+ DEF_CMD("link0", IFF_LINK0, setifflags),
+ DEF_CMD("-link0", -IFF_LINK0, setifflags),
+ DEF_CMD("link1", IFF_LINK1, setifflags),
+Index: freebsd-utils/sbin/ifconfig/af_inet6.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/af_inet6.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/af_inet6.c 2009-11-14 13:34:57.000000000 +0000
@@ -42,7 +42,6 @@
#include <stdlib.h>
#include <string.h>
@@ -172,7 +241,7 @@
#include "ifconfig.h"
-@@ -74,7 +75,7 @@
+@@ -70,7 +71,7 @@
static char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/
static void
@@ -181,7 +250,7 @@
const struct afswtch *afp)
{
if (afp->af_getprefix != NULL)
-@@ -83,7 +84,7 @@
+@@ -79,7 +80,7 @@
}
static void
@@ -190,7 +259,7 @@
const struct afswtch *afp)
{
if (afp->af_af != AF_INET6)
-@@ -118,21 +119,21 @@
+@@ -114,21 +115,21 @@
}
static void
@@ -215,7 +284,7 @@
const struct afswtch *afp)
{
struct ifaddrs *ifap, *ifa;
-@@ -178,7 +179,7 @@
+@@ -174,7 +175,7 @@
}
static void
@@ -224,7 +293,7 @@
{
struct sockaddr_in6 *sin, null_sin;
struct in6_ifreq ifr6;
-@@ -518,7 +519,7 @@
+@@ -514,7 +515,7 @@
};
static void
@@ -233,9 +302,11 @@
{
ip6lifetime++; /* print IPv6 address lifetime */
}
---- a/sbin/ifconfig/ifclone.c
-+++ b/sbin/ifconfig/ifclone.c
-@@ -41,6 +41,7 @@
+Index: freebsd-utils/sbin/ifconfig/ifclone.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifclone.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifclone.c 2009-11-14 13:34:57.000000000 +0000
+@@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -243,7 +314,7 @@
#include <unistd.h>
#include "ifconfig.h"
-@@ -150,7 +151,7 @@
+@@ -174,7 +175,7 @@
};
static void
@@ -252,8 +323,10 @@
{
list_cloners();
exit(0);
---- a/sbin/ifconfig/af_link.c
-+++ b/sbin/ifconfig/af_link.c
+Index: freebsd-utils/sbin/ifconfig/af_link.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/af_link.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/af_link.c 2009-11-14 13:34:57.000000000 +0000
@@ -46,13 +46,15 @@
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -271,9 +344,11 @@
{
/* XXX no const 'cuz LLADDR is defined wrong */
struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
---- a/sbin/ifconfig/ifieee80211.c
-+++ b/sbin/ifconfig/ifieee80211.c
-@@ -87,6 +87,10 @@
+Index: freebsd-utils/sbin/ifconfig/ifieee80211.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifieee80211.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifieee80211.c 2009-11-14 13:34:57.000000000 +0000
+@@ -90,6 +90,10 @@
#include <fcntl.h>
#include <inttypes.h>
#include <stdio.h>
@@ -284,8 +359,10 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
---- a/sbin/ifconfig/af_atalk.c
-+++ b/sbin/ifconfig/af_atalk.c
+Index: freebsd-utils/sbin/ifconfig/af_atalk.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/af_atalk.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/af_atalk.c 2009-11-14 13:34:57.000000000 +0000
@@ -55,7 +55,7 @@
/* XXX FIXME -- should use strtoul for better parsing. */
@@ -313,9 +390,11 @@
{
struct sockaddr_at *sat, null_sat;
struct netrange *nr;
---- a/sbin/ifconfig/af_inet.c
-+++ b/sbin/ifconfig/af_inet.c
-@@ -42,7 +42,6 @@
+Index: freebsd-utils/sbin/ifconfig/af_inet.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/af_inet.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/af_inet.c 2009-11-14 13:34:57.000000000 +0000
+@@ -42,13 +42,13 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -323,13 +402,14 @@
#include <netinet/in.h>
#include <net/if_var.h> /* for struct ifaddr */
-@@ -51,12 +50,13 @@
+ #include <netinet/in_var.h>
+ #include <arpa/inet.h>
#include <netdb.h>
++#include <ifaddrs.h>
#include "ifconfig.h"
-+#include <ifaddrs.h>
- static struct ifaliasreq in_addreq;
+@@ -56,7 +56,7 @@
static struct ifreq in_ridreq;
static void
@@ -338,8 +418,10 @@
{
struct sockaddr_in *sin, null_sin;
---- a/sbin/ifconfig/af_ipx.c
-+++ b/sbin/ifconfig/af_ipx.c
+Index: freebsd-utils/sbin/ifconfig/af_ipx.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/af_ipx.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/af_ipx.c 2009-11-14 13:34:57.000000000 +0000
@@ -41,9 +41,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -360,8 +442,10 @@
{
struct sockaddr_ipx *sipx, null_sipx;
---- a/sbin/ifconfig/ifgre.c
-+++ b/sbin/ifconfig/ifgre.c
+Index: freebsd-utils/sbin/ifconfig/ifgre.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifgre.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifgre.c 2009-11-14 13:34:57.000000000 +0000
@@ -65,7 +65,7 @@
}
@@ -371,8 +455,10 @@
const struct afswtch *afp)
{
uint32_t grekey = atol(val);
---- a/sbin/ifconfig/ifvlan.c
-+++ b/sbin/ifconfig/ifvlan.c
+Index: freebsd-utils/sbin/ifconfig/ifvlan.c
+===================================================================
+--- freebsd-utils.orig/sbin/ifconfig/ifvlan.c 2009-11-14 13:34:57.000000000 +0000
++++ freebsd-utils/sbin/ifconfig/ifvlan.c 2009-11-14 13:34:57.000000000 +0000
@@ -52,6 +52,8 @@
#include <err.h>
#include <errno.h>
@@ -382,14 +468,3 @@
#include "ifconfig.h"
#ifndef lint
---- a/sbin/ifconfig/ifconfig.c
---- b/sbin/ifconfig/ifconfig.c
-@@ -154,7 +154,7 @@
- all = downonly = uponly = namesonly = noload = verbose = 0;
-
- /* Parse leading line options */
-- strlcpy(options, "adklmnuv", sizeof(options));
-+ strlcpy(options, "+adklmnuv", sizeof(options));
- for (p = opts; p != NULL; p = p->next)
- strlcat(options, p->opt, sizeof(options));
- while ((c = getopt(argc, argv, options)) != -1) {
Modified: trunk/freebsd-utils/debian/patches/004_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2009-11-14 13:44:48 UTC (rev 2843)
@@ -2,8 +2,10 @@
sbin/kldconfig/kldconfig.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
---- a/sbin/kldconfig/kldconfig.c
-+++ b/sbin/kldconfig/kldconfig.c
+Index: freebsd-utils/sbin/kldconfig/kldconfig.c
+===================================================================
+--- freebsd-utils.orig/sbin/kldconfig/kldconfig.c 2009-11-14 10:43:32.000000000 +0000
++++ freebsd-utils/sbin/kldconfig/kldconfig.c 2009-11-14 10:44:33.000000000 +0000
@@ -40,14 +40,8 @@
#include <string.h>
#include <unistd.h>
@@ -30,8 +32,10 @@
{
char pathbuf[MAXPATHLEN+1];
struct pathentry *pe;
---- a/sbin/kldconfig/Makefile
-+++ b/sbin/kldconfig/Makefile
+Index: freebsd-utils/sbin/kldconfig/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/kldconfig/Makefile 2009-11-14 10:43:32.000000000 +0000
++++ freebsd-utils/sbin/kldconfig/Makefile 2009-11-14 10:44:33.000000000 +0000
@@ -29,5 +29,6 @@
PROG= kldconfig
MAN= kldconfig.8
@@ -39,3 +43,26 @@
+LDADD= -lbsd
.include <bsd.prog.mk>
+Index: freebsd-utils/sbin/kldload/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/kldload/Makefile 2009-11-14 10:44:52.000000000 +0000
++++ freebsd-utils/sbin/kldload/Makefile 2009-11-14 10:45:23.000000000 +0000
+@@ -29,5 +29,6 @@
+ PROG= kldload
+ MAN= kldload.8
+ WARNS?= 5
++LDADD= -lbsd
+
+ .include <bsd.prog.mk>
+Index: freebsd-utils/sbin/kldunload/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/kldunload/Makefile 2009-11-14 10:45:00.000000000 +0000
++++ freebsd-utils/sbin/kldunload/Makefile 2009-11-14 10:45:33.000000000 +0000
+@@ -28,6 +28,7 @@
+
+ PROG= kldunload
+ MAN= kldunload.8
++LDADD= -lbsd
+ WARNS?= 6
+
+ .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/014_route.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_route.diff 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/014_route.diff 2009-11-14 13:44:48 UTC (rev 2843)
@@ -2,10 +2,10 @@
sbin/route/route.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-Index: b/sbin/route/route.c
+Index: freebsd-utils/sbin/route/route.c
===================================================================
---- a/sbin/route/route.c
-+++ b/sbin/route/route.c
+--- freebsd-utils.orig/sbin/route/route.c 2009-04-14 23:05:36.000000000 +0000
++++ freebsd-utils/sbin/route/route.c 2009-11-14 10:24:14.000000000 +0000
@@ -63,10 +63,13 @@
#include <paths.h>
#include <stdio.h>
@@ -17,10 +17,10 @@
#include <ifaddrs.h>
+#include <time.h>
+#include "../../lib/linkaddr.h"
-
+
struct keytab {
char *kt_cp;
-@@ -110,7 +112,7 @@
+@@ -110,7 +113,7 @@
int prefixlen();
extern char *iso_ntoa();
@@ -29,7 +29,7 @@
void
usage(cp)
-@@ -134,7 +136,7 @@
+@@ -134,7 +137,7 @@
if (argc < 2)
usage((char *)NULL);
@@ -38,17 +38,10 @@
switch(ch) {
case 'n':
nflag = 1;
-@@ -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;
-
---- a/sbin/route/Makefile
-+++ b/sbin/route/Makefile
+Index: freebsd-utils/sbin/route/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/route/Makefile 2006-07-27 13:26:29.000000000 +0000
++++ freebsd-utils/sbin/route/Makefile 2009-11-14 10:24:14.000000000 +0000
@@ -7,6 +7,7 @@
MAN= route.8
SRCS= route.c keywords.h
Modified: trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2009-11-14 13:44:48 UTC (rev 2843)
@@ -2,31 +2,33 @@
usr.sbin/rpc.umntall/rpc.umntall.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---- a/usr.sbin/rpc.umntall/rpc.umntall.c
-+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
+Index: freebsd-utils/usr.sbin/rpc.umntall/rpc.umntall.c
+===================================================================
+--- freebsd-utils.orig/usr.sbin/rpc.umntall/rpc.umntall.c 2009-11-14 10:36:50.000000000 +0000
++++ freebsd-utils/usr.sbin/rpc.umntall/rpc.umntall.c 2009-11-14 10:42:56.000000000 +0000
@@ -176,8 +176,7 @@
try.tv_sec = 3;
try.tv_usec = 0;
-- clp = clnt_create_timed(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp",
+- clp = clnt_create_timed(hostname, MOUNTPROG, MOUNTVERS, "udp",
- &try);
-+ clp = clnt_create(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp");
++ clp = clnt_create(hostname, MOUNTPROG, MOUNTVERS, "udp");
if (clp == NULL) {
- warnx("%s: %s", hostname, clnt_spcreateerror("RPCPROG_MNT"));
+ warnx("%s: %s", hostname, clnt_spcreateerror("MOUNTPROG"));
return (0);
@@ -204,13 +203,12 @@
try.tv_sec = 3;
try.tv_usec = 0;
-- clp = clnt_create_timed(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp",
+- clp = clnt_create_timed(hostname, MOUNTPROG, MOUNTVERS, "udp",
- &try);
-+ clp = clnt_create(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp");
++ clp = clnt_create(hostname, MOUNTPROG, MOUNTVERS, "udp");
if (clp == NULL) {
- warnx("%s: %s", hostname, clnt_spcreateerror("RPCPROG_MNT"));
+ warnx("%s: %s", hostname, clnt_spcreateerror("MOUNTPROG"));
return (0);
}
- clp->cl_auth = authsys_create_default();
+ clp->cl_auth = authunix_create_default();
- clnt_stat = clnt_call(clp, RPCMNT_UMOUNT, (xdrproc_t)xdr_dir, dirp,
+ clnt_stat = clnt_call(clp, MOUNTPROC_UMNT, (xdrproc_t)xdr_dir, dirp,
(xdrproc_t)xdr_void, (caddr_t)0, try);
if (clnt_stat != RPC_SUCCESS)
Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff 2009-11-14 13:44:48 UTC (rev 2843)
@@ -6,35 +6,37 @@
sbin/swapon/swapon.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
---- a/sbin/swapon/swapon.c
-+++ b/sbin/swapon/swapon.c
+Index: freebsd-utils/sbin/swapon/swapon.c
+===================================================================
+--- freebsd-utils.orig/sbin/swapon/swapon.c 2009-11-14 13:35:38.000000000 +0000
++++ freebsd-utils/sbin/swapon/swapon.c 2009-11-14 13:40:51.000000000 +0000
@@ -41,6 +41,7 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.22.18.1 2008/11/25 02:59:29 kensmith Exp $");
+ __FBSDID("$FreeBSD$");
+#include <sys/swap.h>
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/sysctl.h>
-@@ -70,6 +71,8 @@
+@@ -71,6 +72,8 @@
int ch, doall;
- int sflag = 0, lflag = 0, hflag = 0;
+ int sflag = 0, lflag = 0, hflag = 0, qflag = 0;
+ setprogname (argv[0]);
+
if ((ptr = strrchr(argv[0], '/')) == NULL)
ptr = argv[0];
if (strstr(ptr, "swapon"))
-@@ -79,7 +82,7 @@
+@@ -80,7 +83,7 @@
orig_prog = which_prog;
doall = 0;
-- while ((ch = getopt(argc, argv, "AadlhksU")) != -1) {
-+ while ((ch = getopt(argc, argv, "AadlhksUve")) != -1) {
+- while ((ch = getopt(argc, argv, "AadghklmqsU")) != -1) {
++ while ((ch = getopt(argc, argv, "AadghklmqsUve")) != -1) {
switch(ch) {
case 'A':
if (which_prog == SWAPCTL) {
-@@ -121,6 +124,9 @@
+@@ -132,6 +135,9 @@
usage();
}
break;
@@ -44,22 +46,25 @@
case '?':
default:
usage();
-@@ -228,7 +234,8 @@
+@@ -271,7 +277,8 @@
hlen = 10;
break;
default:
- getbsize(&hlen, &blocksize);
+ blocksize = 1024 * 1024;
+ hlen = 10;
+ snprintf(buf, sizeof(buf), "%ld-blocks", blocksize);
break;
}
-
---- a/sbin/swapon/Makefile
-+++ b/sbin/swapon/Makefile
-@@ -7,5 +7,6 @@
- LINKS+= ${BINDIR}/swapon ${BINDIR}/swapctl
- MLINKS= swapon.8 swapoff.8
+Index: freebsd-utils/sbin/swapon/Makefile
+===================================================================
+--- freebsd-utils.orig/sbin/swapon/Makefile 2009-11-14 13:35:38.000000000 +0000
++++ freebsd-utils/sbin/swapon/Makefile 2009-11-14 13:36:03.000000000 +0000
+@@ -9,6 +9,6 @@
MLINKS+=swapon.8 swapctl.8
-+LDADD= -lbsd
- .include <bsd.prog.mk>
+ DPADD= ${LIBUTIL}
+-LDADD= -lutil
++LDADD= -lbsd -lutil
+
+ .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/patches/series 2009-11-14 13:44:48 UTC (rev 2843)
@@ -16,5 +16,5 @@
016_swapon.diff
017_sysctl.diff
018_umount.diff
-019_kenv_sources.diff
+#019_kenv_sources.diff
020_lib.diff
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2009-11-14 13:38:09 UTC (rev 2842)
+++ trunk/freebsd-utils/debian/rules 2009-11-14 13:44:48 UTC (rev 2843)
@@ -15,6 +15,7 @@
VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
+SVN=http://svn.freebsd.org/base/releng/8.0
ORIGDIR=freebsd-utils-$(VERSION)
PATH:=/usr/lib/freebsd:$(PATH)
DESTDIR=$(CURDIR)/debian/tmp
More information about the Glibc-bsd-commits
mailing list