- Upgrade to 2.5.1p2.

- Add a patch to fix amfetchdump to dump core [1].
- Fix GNUTAR, DUMP_SNAPSHOT options handling [2].

Submitted by:	Andy Hilker <ah@cryptobank.de> [1][2]
PR:		ports/105635 [1], ports/105942 [2]

16 files changed, 128 insertions, 56 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 33c5d5629d80..5863c9898774 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.5.1p1
+PORTVERSION=	2.5.1p2
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 CONFIGURE_ARGS+=	--with-portrange=${AMANDA_PORTRANGE}
 .endif
 
-.if defined(WITH_GNUTAR)
+.if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
 BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
@@ -199,7 +199,7 @@ post-install:
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
-.if defined (WITH_AMANDA_DUMP_SNAPSHOT)
+.if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
 .endif
 
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 129e0e246764..4911428f9c6e 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016
-SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b
-SIZE (amanda-2.5.1p1.tar.gz) = 1884119
+MD5 (amanda-2.5.1p2.tar.gz) = 6811f8a296650a6c0f64766b6e6abbe1
+SHA256 (amanda-2.5.1p2.tar.gz) = 845f70b9c455a8a8e3552282a18a65e895c5f72e312496dcfcf5f546148450d7
+SIZE (amanda-2.5.1p2.tar.gz) = 1889800
diff --git a/misc/amanda-server/files/patch-amanda.conf.5 b/misc/amanda-server/files/patch-amanda.conf.5
index ec18732bee43..a1ef3a5c6eeb 100644
--- a/misc/amanda-server/files/patch-amanda.conf.5
+++ b/misc/amanda-server/files/patch-amanda.conf.5
@@ -1,11 +1,11 @@
---- man/amanda.conf.5.orig	Wed Jun 14 16:11:30 2006
-+++ man/amanda.conf.5	Wed Jun 14 16:13:12 2006
-@@ -627,7 +627,7 @@
- Amount of space that can be used in this holding disk area.
- If the value is zero, all available space on the file system is used.
- If the value is negative, \fBAmanda\fR will use all available space minus that value.
+--- man/amanda.conf.5.orig	Fri Nov 10 00:01:50 2006
++++ man/amanda.conf.5	Wed Nov 29 09:47:28 2006
+@@ -586,7 +586,7 @@
+ and put one space before it. The hostname column will be 10 characters wide with
+ no space to the left. The output KBytes column is seven characters wide
+ with one space before it.
 -  .TP
 +.TP
- \fBchunksize\fR \fB int\fR
- 
+ \fBincludefile\fR \fB string\fR
  Default:
+ \fBnone\fR. The name of an
diff --git a/misc/amanda-server/files/patch-restore.c b/misc/amanda-server/files/patch-restore.c
new file mode 100644
index 000000000000..2c0d8a8fab66
--- /dev/null
+++ b/misc/amanda-server/files/patch-restore.c
@@ -0,0 +1,18 @@
+--- restore-src/restore.c.orig	Wed Nov 29 09:49:01 2006
++++ restore-src/restore.c	Wed Nov 29 09:49:19 2006
+@@ -1692,13 +1692,13 @@
+     seentapes_t *seentapes = NULL;
+     int ret;
+ 
++    if(!prompt_out) prompt_out = stderr;
++
+     dbprintf(("search_tapes(prompt_out=%d, prompt_in=%d,  use_changer=%d, "
+ 	      "tapelist=%p, "
+ 	      "match_list=%p, flags=%p, features=%p)\n",
+ 	      fileno(prompt_out), fileno(prompt_in), use_changer, tapelist,
+ 	      match_list, flags, their_features));
+-
+-    if(!prompt_out) prompt_out = stderr;
+ 
+     if(flags->blocksize)
+ 	blocksize = (size_t)flags->blocksize;
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 33c5d5629d80..5863c9898774 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.5.1p1
+PORTVERSION=	2.5.1p2
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 CONFIGURE_ARGS+=	--with-portrange=${AMANDA_PORTRANGE}
 .endif
 
-.if defined(WITH_GNUTAR)
+.if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
 BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
@@ -199,7 +199,7 @@ post-install:
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
-.if defined (WITH_AMANDA_DUMP_SNAPSHOT)
+.if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
 .endif
 
diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo
index 129e0e246764..4911428f9c6e 100644
--- a/misc/amanda25-server/distinfo
+++ b/misc/amanda25-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016
-SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b
-SIZE (amanda-2.5.1p1.tar.gz) = 1884119
+MD5 (amanda-2.5.1p2.tar.gz) = 6811f8a296650a6c0f64766b6e6abbe1
+SHA256 (amanda-2.5.1p2.tar.gz) = 845f70b9c455a8a8e3552282a18a65e895c5f72e312496dcfcf5f546148450d7
+SIZE (amanda-2.5.1p2.tar.gz) = 1889800
diff --git a/misc/amanda25-server/files/patch-amanda.conf.5 b/misc/amanda25-server/files/patch-amanda.conf.5
index ec18732bee43..a1ef3a5c6eeb 100644
--- a/misc/amanda25-server/files/patch-amanda.conf.5
+++ b/misc/amanda25-server/files/patch-amanda.conf.5
@@ -1,11 +1,11 @@
---- man/amanda.conf.5.orig	Wed Jun 14 16:11:30 2006
-+++ man/amanda.conf.5	Wed Jun 14 16:13:12 2006
-@@ -627,7 +627,7 @@
- Amount of space that can be used in this holding disk area.
- If the value is zero, all available space on the file system is used.
- If the value is negative, \fBAmanda\fR will use all available space minus that value.
+--- man/amanda.conf.5.orig	Fri Nov 10 00:01:50 2006
++++ man/amanda.conf.5	Wed Nov 29 09:47:28 2006
+@@ -586,7 +586,7 @@
+ and put one space before it. The hostname column will be 10 characters wide with
+ no space to the left. The output KBytes column is seven characters wide
+ with one space before it.
 -  .TP
 +.TP
- \fBchunksize\fR \fB int\fR
- 
+ \fBincludefile\fR \fB string\fR
  Default:
+ \fBnone\fR. The name of an
diff --git a/misc/amanda25-server/files/patch-restore.c b/misc/amanda25-server/files/patch-restore.c
new file mode 100644
index 000000000000..2c0d8a8fab66
--- /dev/null
+++ b/misc/amanda25-server/files/patch-restore.c
@@ -0,0 +1,18 @@
+--- restore-src/restore.c.orig	Wed Nov 29 09:49:01 2006
++++ restore-src/restore.c	Wed Nov 29 09:49:19 2006
+@@ -1692,13 +1692,13 @@
+     seentapes_t *seentapes = NULL;
+     int ret;
+ 
++    if(!prompt_out) prompt_out = stderr;
++
+     dbprintf(("search_tapes(prompt_out=%d, prompt_in=%d,  use_changer=%d, "
+ 	      "tapelist=%p, "
+ 	      "match_list=%p, flags=%p, features=%p)\n",
+ 	      fileno(prompt_out), fileno(prompt_in), use_changer, tapelist,
+ 	      match_list, flags, their_features));
+-
+-    if(!prompt_out) prompt_out = stderr;
+ 
+     if(flags->blocksize)
+ 	blocksize = (size_t)flags->blocksize;
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 33c5d5629d80..5863c9898774 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.5.1p1
+PORTVERSION=	2.5.1p2
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 CONFIGURE_ARGS+=	--with-portrange=${AMANDA_PORTRANGE}
 .endif
 
-.if defined(WITH_GNUTAR)
+.if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
 BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
@@ -199,7 +199,7 @@ post-install:
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
-.if defined (WITH_AMANDA_DUMP_SNAPSHOT)
+.if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
 .endif
 
diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo
index 129e0e246764..4911428f9c6e 100644
--- a/misc/amanda26-server/distinfo
+++ b/misc/amanda26-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016
-SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b
-SIZE (amanda-2.5.1p1.tar.gz) = 1884119
+MD5 (amanda-2.5.1p2.tar.gz) = 6811f8a296650a6c0f64766b6e6abbe1
+SHA256 (amanda-2.5.1p2.tar.gz) = 845f70b9c455a8a8e3552282a18a65e895c5f72e312496dcfcf5f546148450d7
+SIZE (amanda-2.5.1p2.tar.gz) = 1889800
diff --git a/misc/amanda26-server/files/patch-amanda.conf.5 b/misc/amanda26-server/files/patch-amanda.conf.5
index ec18732bee43..a1ef3a5c6eeb 100644
--- a/misc/amanda26-server/files/patch-amanda.conf.5
+++ b/misc/amanda26-server/files/patch-amanda.conf.5
@@ -1,11 +1,11 @@
---- man/amanda.conf.5.orig	Wed Jun 14 16:11:30 2006
-+++ man/amanda.conf.5	Wed Jun 14 16:13:12 2006
-@@ -627,7 +627,7 @@
- Amount of space that can be used in this holding disk area.
- If the value is zero, all available space on the file system is used.
- If the value is negative, \fBAmanda\fR will use all available space minus that value.
+--- man/amanda.conf.5.orig	Fri Nov 10 00:01:50 2006
++++ man/amanda.conf.5	Wed Nov 29 09:47:28 2006
+@@ -586,7 +586,7 @@
+ and put one space before it. The hostname column will be 10 characters wide with
+ no space to the left. The output KBytes column is seven characters wide
+ with one space before it.
 -  .TP
 +.TP
- \fBchunksize\fR \fB int\fR
- 
+ \fBincludefile\fR \fB string\fR
  Default:
+ \fBnone\fR. The name of an
diff --git a/misc/amanda26-server/files/patch-restore.c b/misc/amanda26-server/files/patch-restore.c
new file mode 100644
index 000000000000..2c0d8a8fab66
--- /dev/null
+++ b/misc/amanda26-server/files/patch-restore.c
@@ -0,0 +1,18 @@
+--- restore-src/restore.c.orig	Wed Nov 29 09:49:01 2006
++++ restore-src/restore.c	Wed Nov 29 09:49:19 2006
+@@ -1692,13 +1692,13 @@
+     seentapes_t *seentapes = NULL;
+     int ret;
+ 
++    if(!prompt_out) prompt_out = stderr;
++
+     dbprintf(("search_tapes(prompt_out=%d, prompt_in=%d,  use_changer=%d, "
+ 	      "tapelist=%p, "
+ 	      "match_list=%p, flags=%p, features=%p)\n",
+ 	      fileno(prompt_out), fileno(prompt_in), use_changer, tapelist,
+ 	      match_list, flags, their_features));
+-
+-    if(!prompt_out) prompt_out = stderr;
+ 
+     if(flags->blocksize)
+ 	blocksize = (size_t)flags->blocksize;
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 33c5d5629d80..5863c9898774 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.5.1p1
+PORTVERSION=	2.5.1p2
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 CONFIGURE_ARGS+=	--with-portrange=${AMANDA_PORTRANGE}
 .endif
 
-.if defined(WITH_GNUTAR)
+.if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
 BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
@@ -199,7 +199,7 @@ post-install:
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
-.if defined (WITH_AMANDA_DUMP_SNAPSHOT)
+.if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
 .endif
 
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 129e0e246764..4911428f9c6e 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016
-SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b
-SIZE (amanda-2.5.1p1.tar.gz) = 1884119
+MD5 (amanda-2.5.1p2.tar.gz) = 6811f8a296650a6c0f64766b6e6abbe1
+SHA256 (amanda-2.5.1p2.tar.gz) = 845f70b9c455a8a8e3552282a18a65e895c5f72e312496dcfcf5f546148450d7
+SIZE (amanda-2.5.1p2.tar.gz) = 1889800
diff --git a/misc/amanda32-server/files/patch-amanda.conf.5 b/misc/amanda32-server/files/patch-amanda.conf.5
index ec18732bee43..a1ef3a5c6eeb 100644
--- a/misc/amanda32-server/files/patch-amanda.conf.5
+++ b/misc/amanda32-server/files/patch-amanda.conf.5
@@ -1,11 +1,11 @@
---- man/amanda.conf.5.orig	Wed Jun 14 16:11:30 2006
-+++ man/amanda.conf.5	Wed Jun 14 16:13:12 2006
-@@ -627,7 +627,7 @@
- Amount of space that can be used in this holding disk area.
- If the value is zero, all available space on the file system is used.
- If the value is negative, \fBAmanda\fR will use all available space minus that value.
+--- man/amanda.conf.5.orig	Fri Nov 10 00:01:50 2006
++++ man/amanda.conf.5	Wed Nov 29 09:47:28 2006
+@@ -586,7 +586,7 @@
+ and put one space before it. The hostname column will be 10 characters wide with
+ no space to the left. The output KBytes column is seven characters wide
+ with one space before it.
 -  .TP
 +.TP
- \fBchunksize\fR \fB int\fR
- 
+ \fBincludefile\fR \fB string\fR
  Default:
+ \fBnone\fR. The name of an
diff --git a/misc/amanda32-server/files/patch-restore.c b/misc/amanda32-server/files/patch-restore.c
new file mode 100644
index 000000000000..2c0d8a8fab66
--- /dev/null
+++ b/misc/amanda32-server/files/patch-restore.c
@@ -0,0 +1,18 @@
+--- restore-src/restore.c.orig	Wed Nov 29 09:49:01 2006
++++ restore-src/restore.c	Wed Nov 29 09:49:19 2006
+@@ -1692,13 +1692,13 @@
+     seentapes_t *seentapes = NULL;
+     int ret;
+ 
++    if(!prompt_out) prompt_out = stderr;
++
+     dbprintf(("search_tapes(prompt_out=%d, prompt_in=%d,  use_changer=%d, "
+ 	      "tapelist=%p, "
+ 	      "match_list=%p, flags=%p, features=%p)\n",
+ 	      fileno(prompt_out), fileno(prompt_in), use_changer, tapelist,
+ 	      match_list, flags, their_features));
+-
+-    if(!prompt_out) prompt_out = stderr;
+ 
+     if(flags->blocksize)
+ 	blocksize = (size_t)flags->blocksize;