[Glibc-bsd-commits] r4874 - in trunk/freebsd-utils/debian: . local/include patches
Robert Millan
rmh at alioth.debian.org
Tue Aug 6 12:13:47 UTC 2013
Author: rmh
Date: 2013-08-06 12:13:47 +0000 (Tue, 06 Aug 2013)
New Revision: 4874
Removed:
trunk/freebsd-utils/debian/local/include/netinet/
trunk/freebsd-utils/debian/patches/020_lib.diff
trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/002_ifconfig.diff
trunk/freebsd-utils/debian/patches/014_route.diff
trunk/freebsd-utils/debian/patches/021_netstat.diff
trunk/freebsd-utils/debian/patches/series
trunk/freebsd-utils/debian/rules
Log:
Reduce the patchset even further by using trimdomain, link_addr and link_ntoa from freebsd-glue.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/changelog 2013-08-06 12:13:47 UTC (rev 4874)
@@ -1,6 +1,8 @@
freebsd-utils (9.1-5) UNRELEASED; urgency=low
* Misc adjustments for freebsd-glue 0.1.0.
+ * Reduce the patchset even further by using trimdomain, link_addr and
+ link_ntoa from freebsd-glue.
-- Robert Millan <rmh at debian.org> Sun, 04 Aug 2013 17:30:14 +0200
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/control 2013-08-06 12:13:47 UTC (rev 4874)
@@ -9,7 +9,7 @@
Build-Depends: debhelper (>= 7), po-debconf, sharutils,
flex | flex-old,
freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.1.0~),
+ freebsd-glue (>= 0.1.1~),
kfreebsd-kernel-headers (>= 9.1-3~),
libc0.1-dev (>= 2.13-26),
libbsd-dev (>= 0.3.0), pkg-config,
Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2013-08-06 12:13:47 UTC (rev 4874)
@@ -14,7 +14,7 @@
SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
DPADD+= ${LIBBSDXML} ${LIBSBUF}
-LDADD+= -lbsdxml -lsbuf
-+LDADD+= -lexpat -lsbuf -lfreebsd-glue
++LDADD+= -lexpat -lsbuf -lbsd -lfreebsd-glue
SRCS+= ifcarp.c # SIOC[GS]VH support
SRCS+= ifgroup.c # ...
@@ -22,14 +22,6 @@
SRCS+= ifbridge.c # bridge support
SRCS+= iflagg.c # lagg support
-@@ -65,6 +62,7 @@
- MAN= ifconfig.8
-
- CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
-+LDADD+= -lbsd ../../lib/linkaddr.o
- WARNS?= 2
-
- .include <bsd.prog.mk>
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -76,6 +76,13 @@
@@ -64,26 +56,3 @@
ifr.ifr_buffer.buffer = descr;
ifr.ifr_buffer.length = descrlen;
if (ioctl(s, SIOCGIFDESCR, &ifr) == 0) {
---- a/sbin/ifconfig/af_link.c
-+++ b/sbin/ifconfig/af_link.c
-@@ -47,6 +47,8 @@
- #include <net/if_types.h>
- #include <net/ethernet.h>
-
-+#include "../../lib/linkaddr.h"
-+
- #include "ifconfig.h"
-
- static struct ifreq link_ridreq;
---- a/sbin/ifconfig/ifieee80211.c
-+++ b/sbin/ifconfig/ifieee80211.c
-@@ -83,6 +83,9 @@
- #include <fcntl.h>
- #include <inttypes.h>
- #include <stdio.h>
-+
-+
-+#include "../../lib/linkaddr.h"
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
Modified: trunk/freebsd-utils/debian/patches/014_route.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_route.diff 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/014_route.diff 2013-08-06 12:13:47 UTC (rev 4874)
@@ -1,8 +1,3 @@
----
- sbin/route/Makefile | 1 +
- sbin/route/route.c | 7 +++++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -64,10 +64,13 @@
@@ -15,7 +10,7 @@
#include <unistd.h>
#include <ifaddrs.h>
+#include <time.h>
-+#include "../../lib/linkaddr.h"
++
struct keytab {
const char *kt_cp;
@@ -28,13 +23,3 @@
switch(ch) {
case 'n':
nflag = 1;
---- a/sbin/route/Makefile
-+++ b/sbin/route/Makefile
-@@ -7,6 +7,7 @@
- MAN= route.8
- SRCS= route.c keywords.h
- WARNS?= 3
-+LDADD= ../../lib/linkaddr.o
- CLEANFILES+=keywords.h _keywords.tmp
-
- CFLAGS+= -DNS
Deleted: trunk/freebsd-utils/debian/patches/020_lib.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/020_lib.diff 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/020_lib.diff 2013-08-06 12:13:47 UTC (rev 4874)
@@ -1,333 +0,0 @@
----
- lib/Makefile | 12 ++++
- lib/linkaddr.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/linkaddr.h | 32 +++++++++++
- lib/trimdomain.c | 113 ++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 312 insertions(+)
-
---- /dev/null
-+++ b/lib/Makefile
-@@ -0,0 +1,14 @@
-+CFLAGS = -I/usr/include/freebsd
-+
-+SRCS = linkaddr.c trimdomain.c
-+
-+OBJS = $(SRCS:%.c=%.o)
-+
-+%.o: %.c
-+ $(CC) -o $@ $(MK_CFLAGS) $(CFLAGS) -c $<
-+
-+all: $(OBJS)
-+
-+clean:
-+ rm -f $(OBJS)
-+
---- /dev/null
-+++ b/lib/linkaddr.c
-@@ -0,0 +1,155 @@
-+/*-
-+ * Copyright (c) 1990, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. 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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-+ */
-+
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
-+#endif /* LIBC_SCCS and not lint */
-+#include <sys/cdefs.h>
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if_dl.h>
-+#include <string.h>
-+
-+/* States*/
-+#define NAMING 0
-+#define GOTONE 1
-+#define GOTTWO 2
-+#define RESET 3
-+/* Inputs */
-+#define DIGIT (4*0)
-+#define END (4*1)
-+#define DELIM (4*2)
-+#define LETTER (4*3)
-+
-+void
-+link_addr(addr, sdl)
-+ const char *addr;
-+ struct sockaddr_dl *sdl;
-+{
-+ char *cp = sdl->sdl_data;
-+ char *cplim = sdl->sdl_len + (char *)sdl;
-+ int byte = 0, state = NAMING, new;
-+
-+ bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-+ sdl->sdl_family = AF_LINK;
-+ do {
-+ state &= ~LETTER;
-+ if ((*addr >= '0') && (*addr <= '9')) {
-+ new = *addr - '0';
-+ } else if ((*addr >= 'a') && (*addr <= 'f')) {
-+ new = *addr - 'a' + 10;
-+ } else if ((*addr >= 'A') && (*addr <= 'F')) {
-+ new = *addr - 'A' + 10;
-+ } else if (*addr == 0) {
-+ state |= END;
-+ } else if (state == NAMING &&
-+ (((*addr >= 'A') && (*addr <= 'Z')) ||
-+ ((*addr >= 'a') && (*addr <= 'z'))))
-+ state |= LETTER;
-+ else
-+ state |= DELIM;
-+ addr++;
-+ switch (state /* | INPUT */) {
-+ case NAMING | DIGIT:
-+ case NAMING | LETTER:
-+ *cp++ = addr[-1];
-+ continue;
-+ case NAMING | DELIM:
-+ state = RESET;
-+ sdl->sdl_nlen = cp - sdl->sdl_data;
-+ continue;
-+ case GOTTWO | DIGIT:
-+ *cp++ = byte;
-+ /* FALLTHROUGH */
-+ case RESET | DIGIT:
-+ state = GOTONE;
-+ byte = new;
-+ continue;
-+ case GOTONE | DIGIT:
-+ state = GOTTWO;
-+ byte = new + (byte << 4);
-+ continue;
-+ default: /* | DELIM */
-+ state = RESET;
-+ *cp++ = byte;
-+ byte = 0;
-+ continue;
-+ case GOTONE | END:
-+ case GOTTWO | END:
-+ *cp++ = byte;
-+ /* FALLTHROUGH */
-+ case RESET | END:
-+ break;
-+ }
-+ break;
-+ } while (cp < cplim);
-+ sdl->sdl_alen = cp - LLADDR(sdl);
-+ new = cp - (char *)sdl;
-+ if (new > sizeof(*sdl))
-+ sdl->sdl_len = new;
-+ return;
-+}
-+
-+static char hexlist[] = "0123456789abcdef";
-+
-+char *
-+link_ntoa(sdl)
-+ const struct sockaddr_dl *sdl;
-+{
-+ static char obuf[64];
-+ char *out = obuf;
-+ int i;
-+ u_char *in = (u_char *)LLADDR(sdl);
-+ u_char *inlim = in + sdl->sdl_alen;
-+ int firsttime = 1;
-+
-+ if (sdl->sdl_nlen) {
-+ bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-+ out += sdl->sdl_nlen;
-+ if (sdl->sdl_alen)
-+ *out++ = ':';
-+ }
-+ while (in < inlim) {
-+ if (firsttime)
-+ firsttime = 0;
-+ else
-+ *out++ = '.';
-+ i = *in++;
-+ if (i > 0xf) {
-+ out[1] = hexlist[i & 0xf];
-+ i >>= 4;
-+ out[0] = hexlist[i];
-+ out += 2;
-+ } else
-+ *out++ = hexlist[i];
-+ }
-+ *out = 0;
-+ return (obuf);
-+}
---- /dev/null
-+++ b/lib/linkaddr.h
-@@ -0,0 +1,32 @@
-+/*-
-+ * Copyright (c) 1990, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. 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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-+ */
-+
-+#include <netinet/ether.h>
-+void link_addr(const char *addr, struct sockaddr_dl *sdl);
-+char *link_ntoa(const struct sockaddr_dl *sdl);
---- /dev/null
-+++ b/lib/trimdomain.c
-@@ -0,0 +1,113 @@
-+/*-
-+ * Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
-+ * Based on original work by Atsushi Murai <amurai at FreeBSD.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. 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 AUTHOR 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 AUTHOR 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.
-+ *
-+ */
-+
-+#include <sys/cdefs.h>
-+#include <sys/param.h>
-+
-+#include <libutil.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+static int isDISP(const char *);
-+
-+/*-
-+ * Trim the current domain name from fullhost, but only if the result
-+ * is less than or equal to hostsize in length.
-+ *
-+ * This function understands $DISPLAY type fullhosts.
-+ *
-+ * For example:
-+ *
-+ * trimdomain("abcde.my.domain", 5) -> "abcde"
-+ * trimdomain("abcde.my.domain", 4) -> "abcde.my.domain"
-+ * trimdomain("abcde.my.domain:0.0", 9) -> "abcde:0.0"
-+ * trimdomain("abcde.my.domain:0.0", 8) -> "abcde.my.domain:0.0"
-+ */
-+void
-+trimdomain(char *fullhost, int hostsize)
-+{
-+ static size_t dlen;
-+ static int first = 1;
-+ static char domain[MAXHOSTNAMELEN];
-+ char *end, *s;
-+ size_t len;
-+
-+ if (first) {
-+ /* XXX: Should we assume that our domain is this persistent ? */
-+ first = 0;
-+ if (gethostname(domain, sizeof(domain) - 1) == 0 &&
-+ (s = strchr(domain, '.')) != NULL)
-+ memmove(domain, s + 1, strlen(s + 1) + 1);
-+ else
-+ domain[0] = '\0';
-+ dlen = strlen(domain);
-+ }
-+
-+ if (domain[0] == '\0')
-+ return;
-+
-+ s = fullhost;
-+ end = s + hostsize + 1;
-+ if ((s = memchr(s, '.', (size_t)(end - s))) != NULL) {
-+ if (strncasecmp(s + 1, domain, dlen) == 0) {
-+ if (s[dlen + 1] == '\0') {
-+ /* Found -- lose the domain. */
-+ *s = '\0';
-+ } else if (s[dlen + 1] == ':' &&
-+ isDISP(s + dlen + 2) &&
-+ (len = strlen(s + dlen + 1)) < (size_t)(end - s)) {
-+ /* Found -- shuffle the DISPLAY back. */
-+ memmove(s, s + dlen + 1, len + 1);
-+ }
-+ }
-+ }
-+}
-+
-+/*
-+ * Is the given string NN or NN.NN where ``NN'' is an all-numeric string ?
-+ */
-+static int
-+isDISP(const char *disp)
-+{
-+ size_t w;
-+ int res;
-+
-+ w = strspn(disp, "0123456789");
-+ res = 0;
-+ if (w > 0) {
-+ if (disp[w] == '\0')
-+ res = 1; /* NN */
-+ else if (disp[w] == '.') {
-+ disp += w + 1;
-+ w = strspn(disp, "0123456789");
-+ if (w > 0 && disp[w] == '\0')
-+ res = 1; /* NN.NN */
-+ }
-+ }
-+ return (res);
-+}
Modified: trunk/freebsd-utils/debian/patches/021_netstat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-08-06 12:13:47 UTC (rev 4874)
@@ -1,11 +1,3 @@
----
- usr.bin/netstat/Makefile | 1
- usr.bin/netstat/main.c | 114 ++++++++++++++++++++++-----------------------
- usr.bin/netstat/mroute6.c | 1
- usr.bin/netstat/netgraph.c | 4 -
- usr.bin/netstat/netstat.h | 13 +++++
- 5 files changed, 74 insertions(+), 59 deletions(-)
-
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -76,8 +76,8 @@
@@ -33,11 +25,11 @@
+/* Only used internally, so can be outside the range of valid IP protocols. */
+#define IPPROTO_DIVERT 258 /* divert pseudo-protocol */
+
-+extern void trimdomain(char *fullhost, int hostsize);
-+extern void link_addr(const char *addr, struct sockaddr_dl *sdl);
-+extern char *link_ntoa(const struct sockaddr_dl *sdl);
+
+
++
++
++
extern int Aflag; /* show addresses of protocol control block */
extern int aflag; /* show all sockets (including servers) */
extern int bflag; /* show i/f total bytes in/out */
@@ -47,7 +39,7 @@
BINMODE=2555
DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD= -lkvm -lmemstat -lutil
-+LDADD+= -lrt -lbsd ../../lib/linkaddr.o ../../lib/trimdomain.o
++LDADD+= -lrt -lbsd -lfreebsd-glue
.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+= netgraph.c
Deleted: trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff 2013-08-06 12:13:47 UTC (rev 4874)
@@ -1,54 +0,0 @@
-#
-# To be removed when this function is available in libbsd
-#
-
----
- usr.sbin/arp/arp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
-
---- a/usr.sbin/arp/arp.c
-+++ b/usr.sbin/arp/arp.c
-@@ -113,6 +113,43 @@
-
- #define SETFUNC(f) { if (func) usage(); func = (f); }
-
-+static char hexlist[] = "0123456789abcdef";
-+
-+char *
-+link_ntoa(sdl)
-+ const struct sockaddr_dl *sdl;
-+{
-+ static char obuf[64];
-+ char *out = obuf;
-+ int i;
-+ u_char *in = (u_char *)LLADDR(sdl);
-+ u_char *inlim = in + sdl->sdl_alen;
-+ int firsttime = 1;
-+
-+ if (sdl->sdl_nlen) {
-+ bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-+ out += sdl->sdl_nlen;
-+ if (sdl->sdl_alen)
-+ *out++ = ':';
-+ }
-+ while (in < inlim) {
-+ if (firsttime)
-+ firsttime = 0;
-+ else
-+ *out++ = '.';
-+ i = *in++;
-+ if (i > 0xf) {
-+ out[1] = hexlist[i & 0xf];
-+ i >>= 4;
-+ out[0] = hexlist[i];
-+ out += 2;
-+ } else
-+ *out++ = hexlist[i];
-+ }
-+ *out = 0;
-+ return (obuf);
-+}
-+
- int
- main(int argc, char *argv[])
- {
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/patches/series 2013-08-06 12:13:47 UTC (rev 4874)
@@ -28,7 +28,6 @@
016_swapon.diff
017_sysctl.diff
018_umount.diff
-020_lib.diff
021_netstat.diff
022_devd.diff
024_devfs.diff
@@ -37,7 +36,6 @@
027_pppctl.diff
028_vidcontrol.diff
029_arp.diff
-030_arp_libbsd.diff
031_savecore.diff
035_nfs.diff
038_jail.diff
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2013-08-06 12:12:06 UTC (rev 4873)
+++ trunk/freebsd-utils/debian/rules 2013-08-06 12:13:47 UTC (rev 4874)
@@ -110,11 +110,6 @@
tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
rm -rf $(ORIGDIR)
-lib: lib-stamp
-lib-stamp:
- $(MAKE) -C lib
- touch $@
-
build-arch: freebsd-utils gbde kbdcontrol vidcontrol kldutils freebsd-net-tools freebsd-nfs-utils freebsd-ppp powerd
freebsd-utils: freebsd-utils-stamp
@@ -180,7 +175,7 @@
touch $@
freebsd-net-tools: freebsd-net-tools-stamp
-freebsd-net-tools-stamp: lib-stamp
+freebsd-net-tools-stamp:
$(PMAKE) -C sbin/ifconfig -DWITHOUT_JAIL
$(PMAKE) -C sbin/pfctl
$(PMAKE) -C sbin/route
@@ -196,7 +191,7 @@
touch $@
freebsd-nfs-utils: freebsd-nfs-utils-stamp
-freebsd-nfs-utils-stamp: lib-stamp
+freebsd-nfs-utils-stamp:
# $(PMAKE) -C usr.bin/showmount
$(PMAKE) -C sbin/mount_nfs
$(PMAKE) -C sbin/nfsiod
More information about the Glibc-bsd-commits
mailing list