Add support for NetBSD wedge names.

Bump versions.

4 files changed, 82 insertions, 4 deletions

diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index cfc28f28167..c6d7f2520af 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2015/08/09 22:50:09 dholland Exp $
+# $NetBSD: Makefile,v 1.73 2016/02/29 05:50:40 mlelstv Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
-PKGREVISION=		9
+PKGREVISION=		10
 
 COMMENT=		Common libraries and binaries for Amanda
 
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index ae0faa039e2..4b256c51271 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2015/11/25 12:53:29 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.42 2016/02/29 05:50:40 mlelstv Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -81,6 +81,7 @@ CONFIGURE_ARGS+=	--with-dump-honor-nodump
 CONFIGURE_ARGS+=	--disable-installperms
 
 LDFLAGS.SunOS+=		-lsocket
+LDFLAGS.NetBSD+=	-lutil
 
 INSTALL_MAKE_FLAGS+=	SETUID_GROUP=${ROOT_GROUP}
 
diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
index 10ea035e08a..c650cc61090 100644
--- a/sysutils/amanda-common/distinfo
+++ b/sysutils/amanda-common/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:32:05 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/02/29 05:50:40 mlelstv Exp $
 
 SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
 RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
@@ -8,6 +8,7 @@ SHA1 (patch-Makefile.am) = 005201b7a9b4e875c45362456e100c57fcf700f3
 SHA1 (patch-amandad-src_Makefile.am) = bdff2c06da0ee6c88237c56568fe20c5cefedd7a
 SHA1 (patch-application-src_Makefile.am) = 3a5f256ab7e2439c2e19c4f75234d3a677707cc2
 SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
+SHA1 (patch-client-src_getfsent.c) = 56ce707aa974d91864e7d8099ceae96c50281704
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
 SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
 SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3
diff --git a/sysutils/amanda-common/patches/patch-client-src_getfsent.c b/sysutils/amanda-common/patches/patch-client-src_getfsent.c
new file mode 100644
index 00000000000..0356957722b
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-client-src_getfsent.c
@@ -0,0 +1,76 @@
+$NetBSD: patch-client-src_getfsent.c,v 1.1 2016/02/29 05:50:40 mlelstv Exp $
+
+Support looking up devices by name.
+
+--- client-src/getfsent.c.orig	2012-02-21 12:36:41.000000000 +0100
++++ client-src/getfsent.c	2016-02-28 09:39:42.565217334 +0100
+@@ -41,6 +41,12 @@
+ 
+ static char *dev2rdev(char *);
+ 
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++/* #include <util.h> */
++const char     *getdiskrawname(char *, size_t, const char *);
++const char     *getfsspecname(char *, size_t, const char *);
++#endif
++
+ /*
+  * You are in a twisty maze of passages, all alike.
+  * Geesh.
+@@ -74,10 +80,20 @@
+     struct fstab *sys_fsent = getfsent();
+     static char *xfsname = NULL, *xmntdir = NULL;
+     static char *xfstype = NULL, *xmntopts = NULL;
++#if defined __NetBSD__ && __NetBSD_Version__ >= 699000000
++    char buf[MAXPATHLEN];
++    const char *spec;
++#endif
+ 
+     if(!sys_fsent)
+ 	return 0;
++#if defined __NetBSD__ && __NetBSD_Version__ >= 699000000
++    spec = getfsspecname(buf, sizeof(buf), sys_fsent->fs_spec);
++    if (spec == NULL) spec = sys_fsent->fs_spec;
++    fsent->fsname  = xfsname  = newstralloc(xfsname, spec);
++#else
+     fsent->fsname  = xfsname  = newstralloc(xfsname,  sys_fsent->fs_spec);
++#endif
+     fsent->mntdir  = xmntdir  = newstralloc(xmntdir,  sys_fsent->fs_file);
+     fsent->freq    = sys_fsent->fs_freq;
+     fsent->passno  = sys_fsent->fs_passno;
+@@ -429,10 +445,15 @@
+ dev2rdev(
+     char *	name)
+ {
+-  char *fname = NULL;
+   struct stat st;
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++  char buf[MAXPATHLEN];
++  const char *raw;
++#else
++  char *fname = NULL;
+   char *s;
+   int ch;
++#endif
+ 
+   if(stat(name, &st) == 0 && !S_ISBLK(st.st_mode)) {
+     /*
+@@ -441,6 +462,10 @@
+     return stralloc(name);
+   }
+ 
++#if (defined __NetBSD__ && __NetBSD_Version__ >= 699000000)
++  raw = getdiskrawname(buf, sizeof(buf), name);
++  if (raw) return stralloc(raw);
++#else /* ! (defined __NetBSD__ && __NetBSD_Version__ >= 699000000) */
+   s = name;
+   ch = *s++;
+ 
+@@ -464,6 +489,7 @@
+     ch = *s++;
+   }
+   amfree(fname);
++#endif
+   return stralloc(name);			/* no match */
+ }
+