[Glibc-bsd-commits] r4084 - in trunk/freebsd-utils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Feb 5 14:29:43 UTC 2012
Author: rmh
Date: 2012-02-05 14:29:42 +0000 (Sun, 05 Feb 2012)
New Revision: 4084
Removed:
trunk/freebsd-utils/debian/patches/tmp_glibc.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/series
Log:
Remove tmp_glibc.diff, build-depend on libc0.1-dev 2.13-26 instead.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2012-02-05 13:15:55 UTC (rev 4083)
+++ trunk/freebsd-utils/debian/changelog 2012-02-05 14:29:42 UTC (rev 4084)
@@ -3,8 +3,9 @@
* Rename freebsd-geom to geom.
* Add geli(8) symlink.
* Add init script for GELI.
+ * Remove tmp_glibc.diff, build-depend on libc0.1-dev 2.13-26 instead.
- -- Robert Millan <rmh at debian.org> Sat, 04 Feb 2012 00:05:53 +0100
+ -- Robert Millan <rmh at debian.org> Sun, 05 Feb 2012 15:26:17 +0100
freebsd-utils (9.0-1) unstable; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2012-02-05 13:15:55 UTC (rev 4083)
+++ trunk/freebsd-utils/debian/control 2012-02-05 14:29:42 UTC (rev 4084)
@@ -7,7 +7,7 @@
flex | flex-old,
freebsd-buildutils (>= 9.0-3),
kfreebsd-kernel-headers (>= 0.70),
- libc0.1-dev (>= 2.13-11),
+ libc0.1-dev (>= 2.13-26),
libbsd-dev (>= 0.3.0), pkg-config,
# zlib1g-dev: savecore
zlib1g-dev,
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2012-02-05 13:15:55 UTC (rev 4083)
+++ trunk/freebsd-utils/debian/patches/series 2012-02-05 14:29:42 UTC (rev 4084)
@@ -43,5 +43,4 @@
041_delete_key.diff
043_ppp.diff
044_mount_exec.diff
-tmp_glibc.diff
ifconfig_nojail.diff
Deleted: trunk/freebsd-utils/debian/patches/tmp_glibc.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/tmp_glibc.diff 2012-02-05 13:15:55 UTC (rev 4083)
+++ trunk/freebsd-utils/debian/patches/tmp_glibc.diff 2012-02-05 14:29:42 UTC (rev 4084)
@@ -1,136 +0,0 @@
-
-Temporary patch, may hopefully be removed after glibc update.
-
---- /dev/null
-+++ b/extra/getvfsbyname.c
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright (c) 1995
-+ * 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 <stddef.h>
-+#include <sys/mount.h>
-+#include <sys/sysctl.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+/*
-+ * Given a filesystem name, determine if it is resident in the kernel,
-+ * and if it is resident, return its xvfsconf structure.
-+ */
-+int
-+getvfsbyname(fsname, vfcp)
-+ const char *fsname;
-+ struct xvfsconf *vfcp;
-+{
-+ struct xvfsconf *xvfsp;
-+ size_t buflen;
-+ int cnt, i;
-+
-+ if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
-+ return (-1);
-+ xvfsp = malloc(buflen);
-+ if (xvfsp == NULL)
-+ return (-1);
-+ if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
-+ free(xvfsp);
-+ return (-1);
-+ }
-+ cnt = buflen / sizeof(struct xvfsconf);
-+ for (i = 0; i < cnt; i++) {
-+ if (strcmp(fsname, xvfsp[i].vfc_name) == 0) {
-+ memcpy(vfcp, xvfsp + i, sizeof(struct xvfsconf));
-+ free(xvfsp);
-+ return (0);
-+ }
-+ }
-+ free(xvfsp);
-+ errno = ENOENT;
-+ return (-1);
-+}
---- a/sbin/nfsiod/Makefile
-+++ b/sbin/nfsiod/Makefile
-@@ -2,6 +2,9 @@
- # $FreeBSD$
-
- PROG= nfsiod
-+SRCS= nfsiod.c getvfsbyname.c
- MAN= nfsiod.8
-
-+.PATH: ${.CURDIR}/../../extra
-+
- .include <bsd.prog.mk>
---- a/sbin/umount/Makefile
-+++ b/sbin/umount/Makefile
-@@ -3,13 +3,13 @@
- # $FreeBSD$
-
- PROG= umount
--SRCS= umount.c vfslist.c mounttab.c
-+SRCS= umount.c vfslist.c mounttab.c getvfsbyname.c
- MAN= umount.8
-
- MOUNT= ${.CURDIR}/../mount
- UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
- CFLAGS+= -I${MOUNT} -I${UMNTALL}
-
--.PATH: ${MOUNT} ${UMNTALL}
-+.PATH: ${MOUNT} ${UMNTALL} ${.CURDIR}/../../extra
-
- .include <bsd.prog.mk>
---- a/usr.sbin/mountd/Makefile
-+++ b/usr.sbin/mountd/Makefile
-@@ -2,14 +2,14 @@
- # $FreeBSD$
-
- PROG= mountd
--SRCS= mountd.c getmntopts.c
-+SRCS= mountd.c getmntopts.c getvfsbyname.c
- MAN= exports.5 netgroup.5 mountd.8
-
- MOUNT= ${.CURDIR}/../../sbin/mount
- CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
- WARNS?= 2
-
--.PATH: ${MOUNT}
-+.PATH: ${MOUNT} ${.CURDIR}/../../extra
-
- DPADD= ${LIBUTIL}
- LDADD= -ltirpc -lbsd
---- a/sbin/ifconfig/ifconfig.c
-+++ b/sbin/ifconfig/ifconfig.c
-@@ -311,7 +311,7 @@
- }
- cp = ifa->ifa_name;
-
-- if ((ifa->ifa_flags & IFF_CANTCONFIG) != 0)
-+ if ((ifa->ifa_flags & 0x10000) != 0)
- continue;
- if (downonly && (ifa->ifa_flags & IFF_UP) != 0)
- continue;
More information about the Glibc-bsd-commits
mailing list