4 files changed, 8 insertions, 44 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 68aa8dd7c26b..7fc55ef91215 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amanda
-PORTVERSION=	3.3.6
-PORTREVISION=	5
+PORTVERSION=	3.3.9
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -32,7 +31,7 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-user=${USERS} --with-group=${AMANDA_GROUP} \
 		--with-bsdtcp-security --with-bsdudp-security \
 		--with-ssh-security \
-		--disable-installperms
+		--disable-installperms --with-security-file=${ETCDIR}/security.conf
 CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl-amanda
 PKG_MESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 0db7427d35a2..a9792b4e5cb0 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c
-SIZE (amanda-3.3.6.tar.gz) = 4571518
+TIMESTAMP = 1495955665
+SHA256 (amanda-3.3.9.tar.gz) = 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41
+SIZE (amanda-3.3.9.tar.gz) = 4673301
diff --git a/misc/amanda-server/files/patch-perl__Makefile.in b/misc/amanda-server/files/patch-perl__Makefile.in
deleted file mode 100644
index 138fbf8a1269..000000000000
--- a/misc/amanda-server/files/patch-perl__Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- perl/Makefile.in.orig	2014-07-09 16:23:26.000000000 +0200
-+++ perl/Makefile.in	2014-09-12 16:42:55.653005667 +0200
-@@ -1812,13 +1812,15 @@
- # PACKAGE: Amanda::Extract
- 
- # PACKAGE: Amanda::Script
-+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
-+@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm
- Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
- 	Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
--	$(am__append_7) Amanda/Xfer.pm $(am__append_10) \
-+	$(am__append_7) $(am__append_xfer) $(am__append_10) \
- 	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
- 	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
- 	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
--	Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
-+	$(am__append_const) Amanda/Script_App.pm Amanda/Extract.pm \
- 	$(am__append_16) $(am__append_17) Amanda/Script.pm
- 
- # PACKAGE: Amanda::Archive
-@@ -1947,12 +1949,12 @@
- @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
- 
- # PACKAGE: Amanda::Xfer
--libXferdir = $(amperldir)/auto/Amanda/Xfer
--libXfer_LTLIBRARIES = libXfer.la
--libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
--libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libXfer_la_LIBADD = amglue/libamglue.la \
--	$(top_builddir)/xfer-src/libamxfer.la
-+@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer
-+@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la
-+@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/xfer-src/libamxfer.la
- 
- 
- # PACKAGE: Amanda::NDMP
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index abbda283cc32..d69ead4e2d2b 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -3,6 +3,7 @@
 @comment
 @comment plist for misc/amanda-server below
 @comment
+%%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
 %%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so
 %%SERVER_ONLY%%lib/amanda/libamdevice.a
 %%SERVER_ONLY%%lib/amanda/libamdevice.so
@@ -33,6 +34,7 @@
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
@@ -258,6 +260,7 @@
 %%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz
 %%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz
 %%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
+%%CLIENT_ONLY%%man/man5/amanda-security.conf.5.gz
 %%CLIENT_ONLY%%man/man7/amanda-applications.7.gz
 %%CLIENT_ONLY%%man/man7/amanda-auth.7.gz
 %%CLIENT_ONLY%%man/man7/amanda-match.7.gz