[Glibc-bsd-commits] r5203 - in trunk/freebsd-utils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Nov 30 12:27:21 UTC 2013
Author: rmh
Date: 2013-11-30 12:27:21 +0000 (Sat, 30 Nov 2013)
New Revision: 5203
Removed:
trunk/freebsd-utils/debian/patches/025_camcontrol.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/006_mdconfig.diff
trunk/freebsd-utils/debian/patches/007_mount.diff
trunk/freebsd-utils/debian/patches/013_pf.diff
trunk/freebsd-utils/debian/patches/016_swapon.diff
trunk/freebsd-utils/debian/patches/022_devd.diff
trunk/freebsd-utils/debian/patches/035_nfs.diff
trunk/freebsd-utils/debian/patches/038_jail.diff
trunk/freebsd-utils/debian/patches/039_geom.diff
trunk/freebsd-utils/debian/patches/043_ppp.diff
trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff
trunk/freebsd-utils/debian/patches/makefiles.diff
trunk/freebsd-utils/debian/patches/series
Log:
Misc patchset cleanup.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/changelog 2013-11-30 12:27:21 UTC (rev 5203)
@@ -8,11 +8,12 @@
upgrades).
* Fix permissions for /dev/dri/card* devices.
* Remove a few gratuitous library dependencies.
+ * Misc patchset cleanup.
[ Guillem Jover ]
* Remove myself from Uploaders.
- -- Robert Millan <rmh at debian.org> Sat, 23 Nov 2013 20:46:23 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 30 Nov 2013 13:27:03 +0100
freebsd-utils (9.2-1) unstable; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/control 2013-11-30 12:27:21 UTC (rev 5203)
@@ -8,10 +8,10 @@
Build-Depends: debhelper (>= 7), po-debconf, sharutils,
flex | flex-old,
freebsd-buildutils (>= 9.0-8~),
- freebsd-glue (>= 0.1.15~),
+ freebsd-glue (>= 0.2.2~),
kfreebsd-kernel-headers (>= 9.2~5),
libc0.1-dev (>= 2.13-26),
- libbsd-dev (>= 0.3.0), pkg-config,
+ libbsd-dev (>= 0.3.0),
# zlib1g-dev: savecore
zlib1g-dev,
# libkvm-dev: dmesg
Modified: trunk/freebsd-utils/debian/patches/006_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -44,13 +44,3 @@
fd = open(_PATH_DEV MDCTL_NAME, O_RDWR, 0);
if (fd < 0)
---- a/sbin/mdconfig/Makefile
-+++ b/sbin/mdconfig/Makefile
-@@ -4,6 +4,6 @@
- MAN= mdconfig.8
-
- DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
--LDADD= -lutil -lgeom -lbsdxml -lsbuf
-+LDADD= -lutil -lgeom -lbsd
-
- .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -1,27 +1,5 @@
---- a/sbin/mount/mntopts.h
-+++ b/sbin/mount/mntopts.h
-@@ -37,6 +37,10 @@
- int m_altloc; /* 1 => set bit in altflags */
- };
-
-+#ifndef MNT_NFS4ACLS
-+#define MNT_NFS4ACLS 0x00000010
-+#endif
-+
- /* User-visible MNT_ flags. */
- #define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
- #define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 }
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
-@@ -264,7 +264,7 @@
- debug = 1;
- break;
- case 'F':
-- setfstab(optarg);
-+ // setfstab(optarg);
- break;
- case 'f':
- init_flags |= MNT_FORCE;
@@ -662,11 +662,13 @@
(void)printf(", reads: sync %ju async %ju",
(uintmax_t)sfp->f_syncreads,
@@ -36,52 +14,3 @@
}
(void)printf(")\n");
}
-@@ -869,7 +871,7 @@
- {
-
- (void)fprintf(stderr, "%s\n%s\n%s\n",
--"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);
-@@ -894,7 +896,7 @@
-
- if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
- strncmp(ent->f_mntfromname, "<above>", 7) == 0) {
-- strcpy(ent->f_mntfromname, (strnstr(ent->f_mntfromname, ":", 8)
-+ strcpy(ent->f_mntfromname, (memchr(ent->f_mntfromname, ':', 8)
- +1));
- }
-
---- a/sbin/mount/Makefile
-+++ b/sbin/mount/Makefile
-@@ -7,6 +7,6 @@
- # We do NOT install the getmntopts.3 man page.
-
- DPADD= ${LIBUTIL}
--LDADD= -lutil
-+LDADD= -lutil -lbsd -lfreebsd-glue
-
- .include <bsd.prog.mk>
---- a/sbin/mount/mount.8
-+++ b/sbin/mount/mount.8
-@@ -37,7 +37,6 @@
- .Sh SYNOPSIS
- .Nm
- .Op Fl adflpruvw
--.Op Fl F Ar fstab
- .Op Fl o Ar options
- .Op Fl t Cm ufs | Ar external_type
- .Nm
-@@ -96,10 +95,6 @@
- determine what the
- .Nm
- command is trying to do.
--.It Fl F Ar fstab
--Specify the
--.Pa fstab
--file to use.
- .It Fl f
- Forces the revocation of write access when trying to downgrade
- a file system mount status from read-write to read-only.
Modified: trunk/freebsd-utils/debian/patches/013_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/013_pf.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/013_pf.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -53,17 +53,7 @@
/*
* Paranoia, but this data _does_ come from outside authpf, and
-@@ -343,7 +326,9 @@
- while (1) {
- printf("\r\nHello %s. ", luser);
- printf("You are authenticated from host \"%s\"\r\n", ipsrc);
-+#if 0
- setproctitle("%s@%s", luser, ipsrc);
-+#endif
- print_message(PATH_MESSAGE);
- while (1) {
- sleep(10);
-@@ -521,9 +506,6 @@
+@@ -521,9 +504,6 @@
}
if (buf[0] == '@') {
@@ -167,25 +157,3 @@
#include "pfctl_parser.h"
#include "pfctl.h"
---- a/sbin/pfctl/Makefile
-+++ b/sbin/pfctl/Makefile
-@@ -22,7 +22,7 @@
-
- YFLAGS=
-
--LDADD+= -lm -lmd
-+LDADD+= -lm -lbsd
- DPADD+= ${LIBM} ${LIBMD}
-
- .include <bsd.prog.mk>
---- a/usr.sbin/authpf/Makefile
-+++ b/usr.sbin/authpf/Makefile
-@@ -16,7 +16,7 @@
- # XXX ALTQ:
- CFLAGS+= -DENABLE_ALTQ
-
--LDADD+= -lm -lmd -lutil
-+LDADD+= -lm -lbsd -lutil
- DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
-
- WARNS?= 3
Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -55,13 +55,3 @@
snprintf(buf, sizeof(buf), "%ld-blocks", blocksize);
break;
}
---- a/sbin/swapon/Makefile
-+++ b/sbin/swapon/Makefile
-@@ -9,6 +9,6 @@
- MLINKS+=swapon.8 swapctl.8
-
- DPADD= ${LIBUTIL}
--LDADD= -lutil
-+LDADD= -lbsd -lfreebsd-glue -lutil
-
- .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -1,9 +1,3 @@
----
- sbin/devd/Makefile | 2 +-
- sbin/devd/devd.cc | 2 ++
- sbin/devd/parse.y | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -29,9 +29,9 @@
@@ -17,17 +11,6 @@
%}
---- a/sbin/devd/Makefile
-+++ b/sbin/devd/Makefile
-@@ -9,7 +9,7 @@
- NO_SHARED?=YES
-
- DPADD= ${LIBL} ${LIBUTIL}
--LDADD= -ll -lutil
-+LDADD= -ll -lutil -lbsd
-
- YFLAGS+=-v
- CFLAGS+=-I. -I${.CURDIR}
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -1,8 +1,5 @@
Deleted: trunk/freebsd-utils/debian/patches/025_camcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/025_camcontrol.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/025_camcontrol.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -1,11 +0,0 @@
---- a/sbin/camcontrol/Makefile
-+++ b/sbin/camcontrol/Makefile
-@@ -12,7 +12,7 @@
- WARNS?= 3
- .endif
- DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL}
--LDADD= -lcam -lsbuf -lutil
-+LDADD= -lcam -lsbuf -lutil -lbsd
- MAN= camcontrol.8
-
- .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -71,51 +71,6 @@
else {
if (cp)
*cp = savedc;
---- a/usr.sbin/nfsd/Makefile
-+++ b/usr.sbin/nfsd/Makefile
-@@ -3,5 +3,7 @@
-
- PROG= nfsd
- MAN= nfsd.8 nfsv4.4 stablerestart.5
-+CFLAGS+= -I${.CURDIR}/../../sys
-+LDADD= -ltirpc -lbsd
-
- .include <bsd.prog.mk>
---- a/usr.sbin/rpc.lockd/Makefile
-+++ b/usr.sbin/rpc.lockd/Makefile
-@@ -5,23 +5,27 @@
- MAN= rpc.lockd.8
- MLINKS= rpc.lockd.8 lockd.8
- SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
-+SRCS+= nlm_prot_xdr.c sm_inter_xdr.c
-
--CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
-+CFLAGS+= -I. -I${.CURDIR}/../../include/rpcsvc
- WARNS?= 3
-
- DPADD= ${LIBRPCSVC} ${LIBUTIL}
--LDADD= -lrpcsvc -lutil
-+LDADD= -ltirpc -lbsd -lfreebsd-glue
-
- CLEANFILES= nlm_prot_svc.c nlm_prot.h test
-+CLEANFILES+= nlm_prot_xdr.c
-
--RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
-+RPCSRC= ${.CURDIR}/../../include/rpcsvc/nlm_prot.x
- RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C
-
-+.PATH: ../rpc.statd
-+
- nlm_prot_svc.c: ${RPCSRC}
- ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}
-
--nlm_prot.h: ${RPCSRC}
-- ${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
-+nlm_prot_xdr.c: ${RPCSRC}
-+ ${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
-
- test: ${.CURDIR}/test.c
- cc -o test ${.CURDIR}/test.c -lrpcsvc
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -997,7 +997,7 @@
Modified: trunk/freebsd-utils/debian/patches/038_jail.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/038_jail.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/038_jail.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -53,14 +53,3 @@
/* Set the groups while the group file is still available */
if (initgroups(pwd->pw_name, pwd->pw_gid) < 0) {
jail_warnx(j, "initgroups %s: %s", pwd->pw_name,
---- a/usr.sbin/jail/Makefile
-+++ b/usr.sbin/jail/Makefile
-@@ -7,7 +7,7 @@
- SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
-
- DPADD= ${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL}
--LDADD= -ljail -lkvm -lutil -ll
-+LDADD= -ljail -lkvm -lutil -ll -lfreebsd-glue
-
- YFLAGS+=-v
- CFLAGS+=-I. -I${.CURDIR}
Modified: trunk/freebsd-utils/debian/patches/039_geom.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/039_geom.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/039_geom.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -9,110 +9,6 @@
return (ERANGE);
number *= mult * unit;
if (number % sectorsize)
---- /dev/null
-+++ b/sbin/geom/core/expand_number.c
-@@ -0,0 +1,101 @@
-+/*-
-+ * Copyright (c) 2007 Eric Anderson <anderson at FreeBSD.org>
-+ * Copyright (c) 2007 Pawel Jakub Dawidek <pjd 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 AUTHORS 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 AUTHORS 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>
-+__FBSDID("$FreeBSD$");
-+
-+#include <sys/types.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <inttypes.h>
-+#include <libutil.h>
-+#include <stdint.h>
-+
-+/*
-+ * Convert an expression of the following forms to a uint64_t.
-+ * 1) A positive decimal number.
-+ * 2) A positive decimal number followed by a 'b' or 'B' (mult by 1).
-+ * 3) A positive decimal number followed by a 'k' or 'K' (mult by 1 << 10).
-+ * 4) A positive decimal number followed by a 'm' or 'M' (mult by 1 << 20).
-+ * 5) A positive decimal number followed by a 'g' or 'G' (mult by 1 << 30).
-+ * 6) A positive decimal number followed by a 't' or 'T' (mult by 1 << 40).
-+ * 7) A positive decimal number followed by a 'p' or 'P' (mult by 1 << 50).
-+ * 8) A positive decimal number followed by a 'e' or 'E' (mult by 1 << 60).
-+ */
-+int
-+expand_number(const char *buf, uint64_t *num)
-+{
-+ uint64_t number;
-+ unsigned shift;
-+ char *endptr;
-+
-+ number = strtoumax(buf, &endptr, 0);
-+
-+ if (endptr == buf) {
-+ /* No valid digits. */
-+ errno = EINVAL;
-+ return (-1);
-+ }
-+
-+ switch (tolower((unsigned char)*endptr)) {
-+ case 'e':
-+ shift = 60;
-+ break;
-+ case 'p':
-+ shift = 50;
-+ break;
-+ case 't':
-+ shift = 40;
-+ break;
-+ case 'g':
-+ shift = 30;
-+ break;
-+ case 'm':
-+ shift = 20;
-+ break;
-+ case 'k':
-+ shift = 10;
-+ break;
-+ case 'b':
-+ case '\0': /* No unit. */
-+ *num = number;
-+ return (0);
-+ default:
-+ /* Unrecognized unit. */
-+ errno = EINVAL;
-+ return (-1);
-+ }
-+
-+ if ((number << shift) >> shift != number) {
-+ /* Overflow */
-+ errno = ERANGE;
-+ return (-1);
-+ }
-+
-+ *num = number << shift;
-+ return (0);
-+}
--- a/sys/crypto/sha2/sha2.c
+++ b/sys/crypto/sha2/sha2.c
@@ -67,8 +67,10 @@
Modified: trunk/freebsd-utils/debian/patches/043_ppp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/043_ppp.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/043_ppp.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -1,32 +1,3 @@
-
-we don't link against libmd since it's not on debian
-http://martin.hinner.info/libmd/
-
---- a/usr.sbin/ppp/Makefile
-+++ b/usr.sbin/ppp/Makefile
-@@ -38,11 +38,11 @@
- BINMODE=4550
- BINOWN= root
- .endif
--BINGRP= network
-+BINGRP= dialout
- M4FLAGS=
-
--LDADD= -lcrypt -lmd -lutil -lz
--DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
-+LDADD= -lcrypt -lbsd -lutil -lz
-+DPADD= ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-
- .SUFFIXES: .8 .8.m4
-
-@@ -79,6 +79,7 @@
-
- .if defined(PPP_NO_SUID)
- CFLAGS+=-DNOSUID
-+LDADD+= -llockdev
- .else
- SRCS+= id.c
- .endif
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -1629,7 +1629,11 @@
Modified: trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -2,7 +2,7 @@
+++ b/sbin/devd/Makefile
@@ -11,6 +11,18 @@
DPADD= ${LIBL} ${LIBUTIL}
- LDADD= -ll -lutil -lbsd
+ LDADD= -ll -lutil
+LIBSTDC++ != \
+ g++ -print-file-name=crt1.o ; \
Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff 2013-11-30 12:27:21 UTC (rev 5203)
@@ -1,3 +1,103 @@
+--- a/usr.sbin/ppp/Makefile
++++ b/usr.sbin/ppp/Makefile
+@@ -38,10 +38,10 @@
+ BINMODE=4550
+ BINOWN= root
+ .endif
+-BINGRP= network
++BINGRP= dialout
+ M4FLAGS=
+
+-LDADD= -lcrypt -lmd -lutil -lz
++LDADD= -lcrypt -lz
+ DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
+
+ .SUFFIXES: .8 .8.m4
+@@ -79,6 +79,7 @@
+
+ .if defined(PPP_NO_SUID)
+ CFLAGS+=-DNOSUID
++LDADD+= -llockdev
+ .else
+ SRCS+= id.c
+ .endif
+--- a/usr.sbin/nfsd/Makefile
++++ b/usr.sbin/nfsd/Makefile
+@@ -3,5 +3,7 @@
+
+ PROG= nfsd
+ MAN= nfsd.8 nfsv4.4 stablerestart.5
++CFLAGS+= -I${.CURDIR}/../../sys
++LDADD= -ltirpc
+
+ .include <bsd.prog.mk>
+--- a/usr.sbin/rpc.lockd/Makefile
++++ b/usr.sbin/rpc.lockd/Makefile
+@@ -5,23 +5,27 @@
+ MAN= rpc.lockd.8
+ MLINKS= rpc.lockd.8 lockd.8
+ SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
++SRCS+= nlm_prot_xdr.c sm_inter_xdr.c
+
+-CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
++CFLAGS+= -I. -I${.CURDIR}/../../include/rpcsvc
+ WARNS?= 3
+
+ DPADD= ${LIBRPCSVC} ${LIBUTIL}
+-LDADD= -lrpcsvc -lutil
++LDADD= -ltirpc -lfreebsd-glue
+
+ CLEANFILES= nlm_prot_svc.c nlm_prot.h test
++CLEANFILES+= nlm_prot_xdr.c
+
+-RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
++RPCSRC= ${.CURDIR}/../../include/rpcsvc/nlm_prot.x
+ RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C
+
++.PATH: ../rpc.statd
++
+ nlm_prot_svc.c: ${RPCSRC}
+ ${RPCGEN} -m -o ${.TARGET} ${RPCSRC}
+
+-nlm_prot.h: ${RPCSRC}
+- ${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
++nlm_prot_xdr.c: ${RPCSRC}
++ ${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
+
+ test: ${.CURDIR}/test.c
+ cc -o test ${.CURDIR}/test.c -lrpcsvc
+--- a/sbin/swapon/Makefile
++++ b/sbin/swapon/Makefile
+@@ -9,6 +9,6 @@
+ MLINKS+=swapon.8 swapctl.8
+
+ DPADD= ${LIBUTIL}
+-LDADD= -lutil
++LDADD= -lutil-freebsd -lfreebsd-glue
+
+ .include <bsd.prog.mk>
+--- a/sbin/pfctl/Makefile
++++ b/sbin/pfctl/Makefile
+@@ -22,7 +22,7 @@
+
+ YFLAGS=
+
+-LDADD+= -lm -lmd
++LDADD+= -lm -lbsd
+ DPADD+= ${LIBM} ${LIBMD}
+
+ .include <bsd.prog.mk>
+--- a/usr.sbin/authpf/Makefile
++++ b/usr.sbin/authpf/Makefile
+@@ -16,7 +16,7 @@
+ # XXX ALTQ:
+ CFLAGS+= -DENABLE_ALTQ
+
+-LDADD+= -lm -lmd -lutil
++LDADD+= -lm -lutil-freebsd
+ DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
+
+ WARNS?= 3
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -2,7 +2,7 @@
@@ -38,17 +138,6 @@
WARNS?= 3
---- a/sbin/geom/Makefile
-+++ b/sbin/geom/Makefile
-@@ -15,7 +15,7 @@
- CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
-
- DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
--LDADD= -lgeom -lsbuf -lbsdxml -lutil
-+LDADD= -lgeom -lsbuf -lexpat -lutil
-
- .include <bsd.prog.mk>
-
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -7,18 +7,14 @@
@@ -92,15 +181,6 @@
.include <bsd.lib.mk>
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
-@@ -4,7 +4,7 @@
-
- PROG= geom
- MAN= geom.8
--SRCS= geom.c subr.c
-+SRCS= geom.c subr.c expand_number.c
-
- NO_SHARED=NO
-
@@ -12,6 +12,6 @@
CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
@@ -199,3 +279,70 @@
CFLAGS+= -DNS
.if ${MK_INET6_SUPPORT} != "no"
+--- a/sbin/mount/Makefile
++++ b/sbin/mount/Makefile
+@@ -7,6 +7,8 @@
+ # We do NOT install the getmntopts.3 man page.
+
+ DPADD= ${LIBUTIL}
+-LDADD= -lutil
++LDADD= -lutil-freebsd
++
++LDADD+= -lfreebsd-glue
+
+ .include <bsd.prog.mk>
+--- a/usr.sbin/jail/Makefile
++++ b/usr.sbin/jail/Makefile
+@@ -7,7 +7,9 @@
+ SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
+
+ DPADD= ${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL}
+-LDADD= -ljail -lkvm -lutil -ll
++LDADD= -ljail -lkvm -lutil-freebsd -ll
++
++LDADD+= -lfreebsd-glue
+
+ YFLAGS+=-v
+ CFLAGS+=-I. -I${.CURDIR}
+--- a/sbin/camcontrol/Makefile
++++ b/sbin/camcontrol/Makefile
+@@ -12,7 +12,7 @@
+ WARNS?= 3
+ .endif
+ DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL}
+-LDADD= -lcam -lsbuf -lutil
++LDADD= -lcam -lsbuf -lutil-freebsd
+ MAN= camcontrol.8
+
+ .include <bsd.prog.mk>
+--- a/sbin/mdconfig/Makefile
++++ b/sbin/mdconfig/Makefile
+@@ -4,6 +4,6 @@
+ MAN= mdconfig.8
+
+ DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
+-LDADD= -lutil -lgeom -lbsdxml -lsbuf
++LDADD= -lgeom
+
+ .include <bsd.prog.mk>
+--- a/sbin/devd/Makefile
++++ b/sbin/devd/Makefile
+@@ -9,7 +9,7 @@
+ NO_SHARED?=YES
+
+ DPADD= ${LIBL} ${LIBUTIL}
+-LDADD= -ll -lutil
++LDADD= -ll
+
+ LIBSTDC++ != \
+ g++ -print-file-name=crt1.o ; \
+--- a/usr.sbin/powerd/Makefile
++++ b/usr.sbin/powerd/Makefile
+@@ -4,6 +4,6 @@
+ MAN= powerd.8
+
+ DPADD= ${LIBUTIL}
+-LDADD= -lutil
++#LDADD= -lutil
+
+ .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2013-11-30 12:12:45 UTC (rev 5202)
+++ trunk/freebsd-utils/debian/patches/series 2013-11-30 12:27:21 UTC (rev 5203)
@@ -30,7 +30,6 @@
021_netstat.diff
022_devd.diff
024_devfs.diff
-025_camcontrol.diff
026_kdump.diff
028_vidcontrol.diff
035_nfs.diff
More information about the Glibc-bsd-commits
mailing list