aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/amanda-client/Makefile2
-rw-r--r--misc/amanda-server/Makefile29
-rw-r--r--misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in11
-rw-r--r--misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in11
-rw-r--r--misc/amanda25-client/Makefile2
-rw-r--r--misc/amanda25-server/Makefile29
-rw-r--r--misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in11
-rw-r--r--misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in11
-rw-r--r--misc/amanda26-client/Makefile2
-rw-r--r--misc/amanda26-server/Makefile29
-rw-r--r--misc/amanda26-server/files/patch-server-src::amcrypt-ossl-asym.sh.in11
-rw-r--r--misc/amanda26-server/files/patch-server-src::amcrypt-ossl.sh.in11
-rw-r--r--misc/amanda32-client/Makefile2
-rw-r--r--misc/amanda32-server/Makefile29
-rw-r--r--misc/amanda32-server/files/patch-server-src::amcrypt-ossl-asym.sh.in11
-rw-r--r--misc/amanda32-server/files/patch-server-src::amcrypt-ossl.sh.in11
16 files changed, 172 insertions, 40 deletions
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index b76a969b67f0..1163d8fb820d 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -client
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index ea2b4014a716..bad68ecf2c3e 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanda
PORTVERSION= 2.5.1p3
-PORTREVISION?= 4
+PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
@@ -20,9 +20,10 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
-NO_LATEST_LINK= yes
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_OPENSSL= yes
PATCH_STRIP=
CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
--with-amandahosts --with-fqdn \
@@ -32,7 +33,8 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
USE_LDCONFIG= yes
WANT_PERL= yes
-OPTIONS= GNUTAR "use GNU tar" on
+OPTIONS= GNUTAR "use GNU tar" on \
+ SSH "enable ssh-auth" off
.include <bsd.port.pre.mk>
@@ -57,6 +59,10 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG}
CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE}
.endif
+.if defined (WITH_SSH)
+CONFIGURE_ARGS+= --with-ssh-security
+.endif
+
# AMANDA_PORTRANGE is obsoleted. Use AMANDA_TCPPORTRANGE instead.
.if defined (AMANDA_PORTRANGE)
AMANDA_TCPPORTRANGE= ${AMANDA_PORTRANGE}
@@ -99,6 +105,12 @@ pre-fetch:
@${ECHO} " The default is no restriction on UDP ports."
@${ECHO} ""
+post-patch:
+ @${REINPLACE_CMD} \
+ -e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
+ ${WRKSRC}/server-src/amcrypt-ossl.sh.in \
+ ${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
+
USE_PERL5= yes
BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
@@ -116,8 +128,7 @@ MAN8= amadmin.8 amaespipe.8 amcheck.8 \
OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\
SAMBA "enable the use of smbclient" off \
MTX "enable the use of mtx changer scripts" off \
- AESPIPE "enable encryption. Needed by amcrypt" off \
- SSH "enable ssh-auth" off
+ AESPIPE "enable encryption. Needed by amcrypt" off
.if defined (WITH_PLOT)
BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
@@ -143,10 +154,6 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx
RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe
.endif
-.if defined (WITH_SSL)
-CONFIGURE_ARGS+= --with-ssh-security
-.endif
-
.if defined (AMANDA_TAPE)
CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE}
.endif
@@ -214,4 +221,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c
.endif
+# Maintainer TODO:
+# o amanda-server installs lib/libamandad.a which should be handled by
+# amanda-client only.
+
.include <bsd.port.post.mk>
diff --git a/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
new file mode 100644
index 000000000000..eeb0ea70129c
--- /dev/null
+++ b/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl-asym.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl-asym.sh.in 2008-07-12 12:11:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # optional
diff --git a/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in
new file mode 100644
index 000000000000..2eb587feb9af
--- /dev/null
+++ b/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl.sh.in 2008-07-12 12:11:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # required
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index b76a969b67f0..1163d8fb820d 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -client
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index ea2b4014a716..bad68ecf2c3e 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanda
PORTVERSION= 2.5.1p3
-PORTREVISION?= 4
+PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
@@ -20,9 +20,10 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
-NO_LATEST_LINK= yes
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_OPENSSL= yes
PATCH_STRIP=
CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
--with-amandahosts --with-fqdn \
@@ -32,7 +33,8 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
USE_LDCONFIG= yes
WANT_PERL= yes
-OPTIONS= GNUTAR "use GNU tar" on
+OPTIONS= GNUTAR "use GNU tar" on \
+ SSH "enable ssh-auth" off
.include <bsd.port.pre.mk>
@@ -57,6 +59,10 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG}
CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE}
.endif
+.if defined (WITH_SSH)
+CONFIGURE_ARGS+= --with-ssh-security
+.endif
+
# AMANDA_PORTRANGE is obsoleted. Use AMANDA_TCPPORTRANGE instead.
.if defined (AMANDA_PORTRANGE)
AMANDA_TCPPORTRANGE= ${AMANDA_PORTRANGE}
@@ -99,6 +105,12 @@ pre-fetch:
@${ECHO} " The default is no restriction on UDP ports."
@${ECHO} ""
+post-patch:
+ @${REINPLACE_CMD} \
+ -e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
+ ${WRKSRC}/server-src/amcrypt-ossl.sh.in \
+ ${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
+
USE_PERL5= yes
BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
@@ -116,8 +128,7 @@ MAN8= amadmin.8 amaespipe.8 amcheck.8 \
OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\
SAMBA "enable the use of smbclient" off \
MTX "enable the use of mtx changer scripts" off \
- AESPIPE "enable encryption. Needed by amcrypt" off \
- SSH "enable ssh-auth" off
+ AESPIPE "enable encryption. Needed by amcrypt" off
.if defined (WITH_PLOT)
BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
@@ -143,10 +154,6 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx
RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe
.endif
-.if defined (WITH_SSL)
-CONFIGURE_ARGS+= --with-ssh-security
-.endif
-
.if defined (AMANDA_TAPE)
CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE}
.endif
@@ -214,4 +221,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c
.endif
+# Maintainer TODO:
+# o amanda-server installs lib/libamandad.a which should be handled by
+# amanda-client only.
+
.include <bsd.port.post.mk>
diff --git a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
new file mode 100644
index 000000000000..eeb0ea70129c
--- /dev/null
+++ b/misc/amanda25-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl-asym.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl-asym.sh.in 2008-07-12 12:11:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # optional
diff --git a/misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in
new file mode 100644
index 000000000000..2eb587feb9af
--- /dev/null
+++ b/misc/amanda25-server/files/patch-server-src::amcrypt-ossl.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl.sh.in 2008-07-12 12:11:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # required
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index b76a969b67f0..1163d8fb820d 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -client
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index ea2b4014a716..bad68ecf2c3e 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanda
PORTVERSION= 2.5.1p3
-PORTREVISION?= 4
+PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
@@ -20,9 +20,10 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
-NO_LATEST_LINK= yes
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_OPENSSL= yes
PATCH_STRIP=
CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
--with-amandahosts --with-fqdn \
@@ -32,7 +33,8 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
USE_LDCONFIG= yes
WANT_PERL= yes
-OPTIONS= GNUTAR "use GNU tar" on
+OPTIONS= GNUTAR "use GNU tar" on \
+ SSH "enable ssh-auth" off
.include <bsd.port.pre.mk>
@@ -57,6 +59,10 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG}
CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE}
.endif
+.if defined (WITH_SSH)
+CONFIGURE_ARGS+= --with-ssh-security
+.endif
+
# AMANDA_PORTRANGE is obsoleted. Use AMANDA_TCPPORTRANGE instead.
.if defined (AMANDA_PORTRANGE)
AMANDA_TCPPORTRANGE= ${AMANDA_PORTRANGE}
@@ -99,6 +105,12 @@ pre-fetch:
@${ECHO} " The default is no restriction on UDP ports."
@${ECHO} ""
+post-patch:
+ @${REINPLACE_CMD} \
+ -e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
+ ${WRKSRC}/server-src/amcrypt-ossl.sh.in \
+ ${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
+
USE_PERL5= yes
BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
@@ -116,8 +128,7 @@ MAN8= amadmin.8 amaespipe.8 amcheck.8 \
OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\
SAMBA "enable the use of smbclient" off \
MTX "enable the use of mtx changer scripts" off \
- AESPIPE "enable encryption. Needed by amcrypt" off \
- SSH "enable ssh-auth" off
+ AESPIPE "enable encryption. Needed by amcrypt" off
.if defined (WITH_PLOT)
BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
@@ -143,10 +154,6 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx
RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe
.endif
-.if defined (WITH_SSL)
-CONFIGURE_ARGS+= --with-ssh-security
-.endif
-
.if defined (AMANDA_TAPE)
CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE}
.endif
@@ -214,4 +221,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c
.endif
+# Maintainer TODO:
+# o amanda-server installs lib/libamandad.a which should be handled by
+# amanda-client only.
+
.include <bsd.port.post.mk>
diff --git a/misc/amanda26-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda26-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
new file mode 100644
index 000000000000..eeb0ea70129c
--- /dev/null
+++ b/misc/amanda26-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl-asym.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl-asym.sh.in 2008-07-12 12:11:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # optional
diff --git a/misc/amanda26-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda26-server/files/patch-server-src::amcrypt-ossl.sh.in
new file mode 100644
index 000000000000..2eb587feb9af
--- /dev/null
+++ b/misc/amanda26-server/files/patch-server-src::amcrypt-ossl.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl.sh.in 2008-07-12 12:11:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # required
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index b76a969b67f0..1163d8fb820d 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,7 +6,7 @@
#
PKGNAMESUFFIX= -client
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index ea2b4014a716..bad68ecf2c3e 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= amanda
PORTVERSION= 2.5.1p3
-PORTREVISION?= 4
+PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
@@ -20,9 +20,10 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
-NO_LATEST_LINK= yes
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
USE_AUTOTOOLS= autoconf:261
USE_GMAKE= yes
+USE_OPENSSL= yes
PATCH_STRIP=
CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
--with-amandahosts --with-fqdn \
@@ -32,7 +33,8 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
USE_LDCONFIG= yes
WANT_PERL= yes
-OPTIONS= GNUTAR "use GNU tar" on
+OPTIONS= GNUTAR "use GNU tar" on \
+ SSH "enable ssh-auth" off
.include <bsd.port.pre.mk>
@@ -57,6 +59,10 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG}
CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE}
.endif
+.if defined (WITH_SSH)
+CONFIGURE_ARGS+= --with-ssh-security
+.endif
+
# AMANDA_PORTRANGE is obsoleted. Use AMANDA_TCPPORTRANGE instead.
.if defined (AMANDA_PORTRANGE)
AMANDA_TCPPORTRANGE= ${AMANDA_PORTRANGE}
@@ -99,6 +105,12 @@ pre-fetch:
@${ECHO} " The default is no restriction on UDP ports."
@${ECHO} ""
+post-patch:
+ @${REINPLACE_CMD} \
+ -e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
+ ${WRKSRC}/server-src/amcrypt-ossl.sh.in \
+ ${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
+
USE_PERL5= yes
BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
@@ -116,8 +128,7 @@ MAN8= amadmin.8 amaespipe.8 amcheck.8 \
OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\
SAMBA "enable the use of smbclient" off \
MTX "enable the use of mtx changer scripts" off \
- AESPIPE "enable encryption. Needed by amcrypt" off \
- SSH "enable ssh-auth" off
+ AESPIPE "enable encryption. Needed by amcrypt" off
.if defined (WITH_PLOT)
BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
@@ -143,10 +154,6 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx
RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe
.endif
-.if defined (WITH_SSL)
-CONFIGURE_ARGS+= --with-ssh-security
-.endif
-
.if defined (AMANDA_TAPE)
CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE}
.endif
@@ -214,4 +221,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c
.endif
+# Maintainer TODO:
+# o amanda-server installs lib/libamandad.a which should be handled by
+# amanda-client only.
+
.include <bsd.port.post.mk>
diff --git a/misc/amanda32-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda32-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
new file mode 100644
index 000000000000..eeb0ea70129c
--- /dev/null
+++ b/misc/amanda32-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl-asym.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl-asym.sh.in 2008-07-12 12:11:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # optional
diff --git a/misc/amanda32-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda32-server/files/patch-server-src::amcrypt-ossl.sh.in
new file mode 100644
index 000000000000..2eb587feb9af
--- /dev/null
+++ b/misc/amanda32-server/files/patch-server-src::amcrypt-ossl.sh.in
@@ -0,0 +1,11 @@
+--- server-src/amcrypt-ossl.sh.in.orig 2006-07-04 13:28:47.000000000 +0200
++++ server-src/amcrypt-ossl.sh.in 2008-07-12 12:11:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ # change these as needed
+ OPENSSL= # whatever's in $PATH
+ CIPHER=aes-256-cbc # see `openssl help` for more ciphers
+-AMANDA_HOME=~amandabackup
++AMANDA_HOME=~@CLIENT_LOGIN@
+ RANDFILE=$AMANDA_HOME/.rnd
+ export RANDFILE
+ PASSPHRASE=$AMANDA_HOME/.am_passphrase # required