[Glibc-bsd-commits] r5269 - in trunk/freebsd-smbfs/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-29 19:57:56 +0000 (Sun, 29 Dec 2013)
New Revision: 5269

Removed:
   trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff
Modified:
   trunk/freebsd-smbfs/debian/changelog
   trunk/freebsd-smbfs/debian/control
   trunk/freebsd-smbfs/debian/patches/series
Log:
Remove obsolete getvfsbyname.diff (getvfsbyname() is now provided by glibc).

Modified: trunk/freebsd-smbfs/debian/changelog
===================================================================
--- trunk/freebsd-smbfs/debian/changelog	2013-12-29 19:44:07 UTC (rev 5268)
+++ trunk/freebsd-smbfs/debian/changelog	2013-12-29 19:57:56 UTC (rev 5269)
@@ -5,6 +5,8 @@
 
   [ Robert Millan ]
   * Fetch source code securely (https) in get-orig-source.
+  * Remove obsolete getvfsbyname.diff (getvfsbyname() is now provided by
+    glibc).
 
  -- Guillem Jover <guillem at debian.org>  Mon, 29 Jul 2013 12:31:38 +0200
 

Modified: trunk/freebsd-smbfs/debian/control
===================================================================
--- trunk/freebsd-smbfs/debian/control	2013-12-29 19:44:07 UTC (rev 5268)
+++ trunk/freebsd-smbfs/debian/control	2013-12-29 19:57:56 UTC (rev 5269)
@@ -8,6 +8,7 @@
  kfreebsd-kernel-headers (>= 0.59),
  libkiconv-dev,
  libbsd-dev,
+ libc0.1-dev (>= 2.13-8),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-smbfs/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-smbfs/
 Standards-Version: 3.9.2

Deleted: trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff
===================================================================
--- trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff	2013-12-29 19:44:07 UTC (rev 5268)
+++ trunk/freebsd-smbfs/debian/patches/getvfsbyname.diff	2013-12-29 19:57:56 UTC (rev 5269)
@@ -1,84 +0,0 @@
---- /dev/null
-+++ b/usr.sbin/mount_smbfs/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/usr.sbin/mount_smbfs/Makefile
-+++ b/usr.sbin/mount_smbfs/Makefile
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- PROG=	mount_smbfs
--SRCS=	mount_smbfs.c getmntopts.c
-+SRCS=	mount_smbfs.c getmntopts.c getvfsbyname.c
- MAN=	mount_smbfs.8
- 
- MOUNTDIR=	${.CURDIR}/../../sbin/mount

Modified: trunk/freebsd-smbfs/debian/patches/series
===================================================================
--- trunk/freebsd-smbfs/debian/patches/series	2013-12-29 19:44:07 UTC (rev 5268)
+++ trunk/freebsd-smbfs/debian/patches/series	2013-12-29 19:57:56 UTC (rev 5269)
@@ -1,7 +1,6 @@
 smbutil.diff
 af_netbios.diff
 makefile.diff
-getvfsbyname.diff
 config_file.diff
 optreset.diff
 uid_format.diff