diff options
author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2006-03-22 03:56:12 +0000 |
---|---|---|
committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2006-03-22 03:56:12 +0000 |
commit | c9a8af1cea8615f65b041f950eb1ebf0fc212b69 (patch) | |
tree | 090e006657c8ed59eb0a35340193ec00185989ef | |
parent | Fix plist *again*. This is not my day. (diff) |
- Grab maintainership.
- Upgrade to 2.4.5p1.
- Add WITH_AMANDA_DUMP_SNAPSHOT knob to use "dump -L" to take a dump.
- Add a patch to fix expr(1) argument problem for chg-zd-mtx.sh script.
- Shorten long Makefile by collect common options/variables to one
common place.
Notes
Notes:
svn path=/head/; revision=157929
36 files changed, 468 insertions, 348 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 113f47884bf3..8a23c5ea0034 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -6,25 +6,35 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.5 -PORTREVISION?= 2 +PORTVERSION= 2.4.5p1 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= amanda -DISTFILES= amanda-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server +BUILD_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + NO_LATEST_LINK= yes USE_AUTOTOOLS= autoconf:259 USE_GMAKE= yes PATCH_STRIP= +CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ + --with-amandahosts --with-fqdn \ + --with-dump-honor-nodump --with-buffered-dump \ + --disable-libtool --prefix=${PREFIX} \ + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> @@ -33,6 +43,25 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists +PLIST_SUB= SHLIBVER=${PORTVERSION} + +# amanda-server/amanda-client common part +.if defined (AMANDA_SERVER) +CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} +CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} +.endif + +.if defined (AMANDA_CONFIG) +CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} +.endif + +.if defined (AMANDA_UDPPORTRANGE) +CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} +.endif + +.if defined (AMANDA_PORTRANGE) +CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.endif # amanda-server part .if !defined(CLIENT_ONLY) @@ -66,18 +95,10 @@ pre-fetch: USE_PERL5= yes -BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-client --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -104,27 +125,10 @@ BUILD_DEPENDS+= mtx:${PORTSDIR}/misc/mtx RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .endif -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - .if defined (AMANDA_TAPE) CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE} .endif -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} -.endif - # # Before 4.0, pre-CAM scsiio.h existed .if ${OSVERSION} < 400000 @@ -148,6 +152,8 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" + @${ECHO} " -DWITH_AMANDA_DUMP_SNAPSHOT" + @${ECHO} " Use dump -L to use snapshot" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" @@ -169,17 +175,9 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" -BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar - -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-server --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-server +MAN5= amanda.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 post-install: @@ -194,21 +192,8 @@ post-install: ${TOUCH} /etc/amandates ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.if defined (WITH_AMANDA_DUMP_SNAPSHOT) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif .endif diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo index 04d70560d316..15c9c45146af 100644 --- a/misc/amanda-server/distinfo +++ b/misc/amanda-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.4.5.tar.gz) = 1960b7875424e412d042bc92a1548d7f -SHA256 (amanda-2.4.5.tar.gz) = 79f9d313b08220f9edb6557aabd75623a80b2adb3192cf01bbb0ca7f3a2223ce -SIZE (amanda-2.4.5.tar.gz) = 1541761 +MD5 (amanda-2.4.5p1.tar.gz) = 8fd967a6f63c4a91f0a38f56e2339ec8 +SHA256 (amanda-2.4.5p1.tar.gz) = 71e2716f1098f5ac6633e02e252e048ce0e76f880e2ddb531d9d261ad263fe64 +SIZE (amanda-2.4.5p1.tar.gz) = 1557400 diff --git a/misc/amanda-server/files/extra-patch-sendbackup-dump.c b/misc/amanda-server/files/extra-patch-sendbackup-dump.c new file mode 100644 index 000000000000..8d2e6b737c42 --- /dev/null +++ b/misc/amanda-server/files/extra-patch-sendbackup-dump.c @@ -0,0 +1,42 @@ +Index: client-src/sendbackup-dump.c +=================================================================== +RCS file: /home/cvs/opensources/amanda/client-src/sendbackup-dump.c,v +retrieving revision 1.1.1.2 +retrieving revision 1.5 +diff -u -r1.1.1.2 -r1.5 +--- client-src/sendbackup-dump.c 25 Jun 2003 04:39:28 -0000 1.1.1.2 ++++ client-src/sendbackup-dump.c 25 Jun 2003 04:43:20 -0000 1.5 +@@ -40,6 +40,10 @@ + #define NAUGHTY_BITS /* but then I'd have to kill you */ + #endif + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ + #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" + + static regex_t re_table[] = { +@@ -306,6 +310,12 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) ++ "L", ++#endif ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -328,6 +338,9 @@ + &dumpin, &dumpout, &mesgf, + "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa index c5029f0fdfde..3e14a6ca4b07 100644 --- a/misc/amanda-server/files/patch-aa +++ b/misc/amanda-server/files/patch-aa @@ -1,15 +1,15 @@ ---- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 -+++ man/Makefile.in Mon Nov 8 06:24:40 2004 -@@ -254,7 +254,7 @@ +--- man/Makefile.in.orig Tue Oct 25 06:23:41 2005 ++++ man/Makefile.in Wed Mar 22 12:08:22 2006 +@@ -247,7 +247,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 --COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 +-COMMON_MAN_PAGES = amanda.8 amanda.conf.5 ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5 @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ @WANT_SERVER_TRUE@ amcheckdb.8 \ -@@ -276,7 +276,7 @@ +@@ -269,7 +269,7 @@ @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 @@ -17,4 +17,4 @@ +@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8 diff --git a/misc/amanda-server/files/patch-ac b/misc/amanda-server/files/patch-ac index c2af6273b054..a9e95a3a6607 100644 --- a/misc/amanda-server/files/patch-ac +++ b/misc/amanda-server/files/patch-ac @@ -1,9 +1,9 @@ ---- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 -+++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 -@@ -41,7 +41,7 @@ - PRE_UNINSTALL = : - POST_UNINSTALL = : +--- tape-src/Makefile.in.orig Tue Oct 25 06:23:42 2005 ++++ tape-src/Makefile.in Wed Mar 22 12:10:00 2006 +@@ -43,7 +43,7 @@ + build_triplet = @build@ host_triplet = @host@ + target_triplet = @target@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) EXTRA_PROGRAMS = $(am__EXEEXT_1) diff --git a/misc/amanda-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda-server/files/patch-chg-zd-mtx.sh.in new file mode 100644 index 000000000000..555c4dffe362 --- /dev/null +++ b/misc/amanda-server/files/patch-chg-zd-mtx.sh.in @@ -0,0 +1,11 @@ +--- changer-src/chg-zd-mtx.sh.in.orig Wed Feb 9 21:58:30 2005 ++++ changer-src/chg-zd-mtx.sh.in Wed Feb 9 21:58:49 2005 +@@ -413,7 +413,7 @@ + + IsNumeric() { + test -z "$1" && return 1 +- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" ++ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" + return `expr X"$1" != X"$x"` + } + diff --git a/misc/amanda-server/files/patch-server-src_infofile.c b/misc/amanda-server/files/patch-server-src_infofile.c deleted file mode 100644 index e826e411303e..000000000000 --- a/misc/amanda-server/files/patch-server-src_infofile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/infofile.c.orig Wed Mar 16 11:15:28 2005 -+++ server-src/infofile.c Thu Jul 7 14:12:54 2005 -@@ -274,7 +274,7 @@ - rc = 0; - - nb_history = 0; -- for(i=0;i<=NB_HISTORY+1;i++) { -+ for(i=0;i<sizeof(info->history)/sizeof(info->history[0]);i++) { - info->history[i].level = -2; - } - for(rc = -2; (line = agets(infof)) != NULL; free(line)) { diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist index 52109b8f2c3b..59b5ceca2be9 100644 --- a/misc/amanda-server/pkg-plist +++ b/misc/amanda-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.5.so +lib/libamserver-%%SHLIBVER%%.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.5.so +lib/libamtape-%%SHLIBVER%%.so lib/libamtape.so lib/libamtape.la lib/libamtape.a diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index a90ac979e63a..274d146525c4 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -1,9 +1,9 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi -lib/libamanda-2.4.5.so +lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.5.so +lib/libamclient-%%SHLIBVER%%.so lib/libamclient.so lib/libamclient.la lib/libamclient.a @@ -19,11 +19,13 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX share/amanda/amadmin.8.txt share/amanda/amanda.8.txt +share/amanda/amanda.conf.5.txt share/amanda/amcheck.8.txt share/amanda/amcheckdb.8.txt share/amanda/amcleanup.8.txt @@ -54,6 +56,7 @@ share/amanda/historical.txt share/amanda/howto-afs.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt +share/amanda/howto-wrapper.txt share/amanda/howtos.txt share/amanda/index.txt share/amanda/indexing.txt diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 113f47884bf3..8a23c5ea0034 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -6,25 +6,35 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.5 -PORTREVISION?= 2 +PORTVERSION= 2.4.5p1 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= amanda -DISTFILES= amanda-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server +BUILD_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + NO_LATEST_LINK= yes USE_AUTOTOOLS= autoconf:259 USE_GMAKE= yes PATCH_STRIP= +CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ + --with-amandahosts --with-fqdn \ + --with-dump-honor-nodump --with-buffered-dump \ + --disable-libtool --prefix=${PREFIX} \ + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> @@ -33,6 +43,25 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists +PLIST_SUB= SHLIBVER=${PORTVERSION} + +# amanda-server/amanda-client common part +.if defined (AMANDA_SERVER) +CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} +CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} +.endif + +.if defined (AMANDA_CONFIG) +CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} +.endif + +.if defined (AMANDA_UDPPORTRANGE) +CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} +.endif + +.if defined (AMANDA_PORTRANGE) +CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.endif # amanda-server part .if !defined(CLIENT_ONLY) @@ -66,18 +95,10 @@ pre-fetch: USE_PERL5= yes -BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-client --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -104,27 +125,10 @@ BUILD_DEPENDS+= mtx:${PORTSDIR}/misc/mtx RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .endif -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - .if defined (AMANDA_TAPE) CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE} .endif -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} -.endif - # # Before 4.0, pre-CAM scsiio.h existed .if ${OSVERSION} < 400000 @@ -148,6 +152,8 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" + @${ECHO} " -DWITH_AMANDA_DUMP_SNAPSHOT" + @${ECHO} " Use dump -L to use snapshot" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" @@ -169,17 +175,9 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" -BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar - -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-server --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-server +MAN5= amanda.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 post-install: @@ -194,21 +192,8 @@ post-install: ${TOUCH} /etc/amandates ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.if defined (WITH_AMANDA_DUMP_SNAPSHOT) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif .endif diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo index 04d70560d316..15c9c45146af 100644 --- a/misc/amanda25-server/distinfo +++ b/misc/amanda25-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.4.5.tar.gz) = 1960b7875424e412d042bc92a1548d7f -SHA256 (amanda-2.4.5.tar.gz) = 79f9d313b08220f9edb6557aabd75623a80b2adb3192cf01bbb0ca7f3a2223ce -SIZE (amanda-2.4.5.tar.gz) = 1541761 +MD5 (amanda-2.4.5p1.tar.gz) = 8fd967a6f63c4a91f0a38f56e2339ec8 +SHA256 (amanda-2.4.5p1.tar.gz) = 71e2716f1098f5ac6633e02e252e048ce0e76f880e2ddb531d9d261ad263fe64 +SIZE (amanda-2.4.5p1.tar.gz) = 1557400 diff --git a/misc/amanda25-server/files/extra-patch-sendbackup-dump.c b/misc/amanda25-server/files/extra-patch-sendbackup-dump.c new file mode 100644 index 000000000000..8d2e6b737c42 --- /dev/null +++ b/misc/amanda25-server/files/extra-patch-sendbackup-dump.c @@ -0,0 +1,42 @@ +Index: client-src/sendbackup-dump.c +=================================================================== +RCS file: /home/cvs/opensources/amanda/client-src/sendbackup-dump.c,v +retrieving revision 1.1.1.2 +retrieving revision 1.5 +diff -u -r1.1.1.2 -r1.5 +--- client-src/sendbackup-dump.c 25 Jun 2003 04:39:28 -0000 1.1.1.2 ++++ client-src/sendbackup-dump.c 25 Jun 2003 04:43:20 -0000 1.5 +@@ -40,6 +40,10 @@ + #define NAUGHTY_BITS /* but then I'd have to kill you */ + #endif + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ + #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" + + static regex_t re_table[] = { +@@ -306,6 +310,12 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) ++ "L", ++#endif ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -328,6 +338,9 @@ + &dumpin, &dumpout, &mesgf, + "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda25-server/files/patch-aa b/misc/amanda25-server/files/patch-aa index c5029f0fdfde..3e14a6ca4b07 100644 --- a/misc/amanda25-server/files/patch-aa +++ b/misc/amanda25-server/files/patch-aa @@ -1,15 +1,15 @@ ---- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 -+++ man/Makefile.in Mon Nov 8 06:24:40 2004 -@@ -254,7 +254,7 @@ +--- man/Makefile.in.orig Tue Oct 25 06:23:41 2005 ++++ man/Makefile.in Wed Mar 22 12:08:22 2006 +@@ -247,7 +247,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 --COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 +-COMMON_MAN_PAGES = amanda.8 amanda.conf.5 ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5 @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ @WANT_SERVER_TRUE@ amcheckdb.8 \ -@@ -276,7 +276,7 @@ +@@ -269,7 +269,7 @@ @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 @@ -17,4 +17,4 @@ +@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8 diff --git a/misc/amanda25-server/files/patch-ac b/misc/amanda25-server/files/patch-ac index c2af6273b054..a9e95a3a6607 100644 --- a/misc/amanda25-server/files/patch-ac +++ b/misc/amanda25-server/files/patch-ac @@ -1,9 +1,9 @@ ---- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 -+++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 -@@ -41,7 +41,7 @@ - PRE_UNINSTALL = : - POST_UNINSTALL = : +--- tape-src/Makefile.in.orig Tue Oct 25 06:23:42 2005 ++++ tape-src/Makefile.in Wed Mar 22 12:10:00 2006 +@@ -43,7 +43,7 @@ + build_triplet = @build@ host_triplet = @host@ + target_triplet = @target@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) EXTRA_PROGRAMS = $(am__EXEEXT_1) diff --git a/misc/amanda25-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda25-server/files/patch-chg-zd-mtx.sh.in new file mode 100644 index 000000000000..555c4dffe362 --- /dev/null +++ b/misc/amanda25-server/files/patch-chg-zd-mtx.sh.in @@ -0,0 +1,11 @@ +--- changer-src/chg-zd-mtx.sh.in.orig Wed Feb 9 21:58:30 2005 ++++ changer-src/chg-zd-mtx.sh.in Wed Feb 9 21:58:49 2005 +@@ -413,7 +413,7 @@ + + IsNumeric() { + test -z "$1" && return 1 +- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" ++ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" + return `expr X"$1" != X"$x"` + } + diff --git a/misc/amanda25-server/files/patch-server-src_infofile.c b/misc/amanda25-server/files/patch-server-src_infofile.c deleted file mode 100644 index e826e411303e..000000000000 --- a/misc/amanda25-server/files/patch-server-src_infofile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/infofile.c.orig Wed Mar 16 11:15:28 2005 -+++ server-src/infofile.c Thu Jul 7 14:12:54 2005 -@@ -274,7 +274,7 @@ - rc = 0; - - nb_history = 0; -- for(i=0;i<=NB_HISTORY+1;i++) { -+ for(i=0;i<sizeof(info->history)/sizeof(info->history[0]);i++) { - info->history[i].level = -2; - } - for(rc = -2; (line = agets(infof)) != NULL; free(line)) { diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist index 52109b8f2c3b..59b5ceca2be9 100644 --- a/misc/amanda25-server/pkg-plist +++ b/misc/amanda25-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.5.so +lib/libamserver-%%SHLIBVER%%.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.5.so +lib/libamtape-%%SHLIBVER%%.so lib/libamtape.so lib/libamtape.la lib/libamtape.a diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index a90ac979e63a..274d146525c4 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -1,9 +1,9 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi -lib/libamanda-2.4.5.so +lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.5.so +lib/libamclient-%%SHLIBVER%%.so lib/libamclient.so lib/libamclient.la lib/libamclient.a @@ -19,11 +19,13 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX share/amanda/amadmin.8.txt share/amanda/amanda.8.txt +share/amanda/amanda.conf.5.txt share/amanda/amcheck.8.txt share/amanda/amcheckdb.8.txt share/amanda/amcleanup.8.txt @@ -54,6 +56,7 @@ share/amanda/historical.txt share/amanda/howto-afs.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt +share/amanda/howto-wrapper.txt share/amanda/howtos.txt share/amanda/index.txt share/amanda/indexing.txt diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 113f47884bf3..8a23c5ea0034 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -6,25 +6,35 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.5 -PORTREVISION?= 2 +PORTVERSION= 2.4.5p1 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= amanda -DISTFILES= amanda-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server +BUILD_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + NO_LATEST_LINK= yes USE_AUTOTOOLS= autoconf:259 USE_GMAKE= yes PATCH_STRIP= +CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ + --with-amandahosts --with-fqdn \ + --with-dump-honor-nodump --with-buffered-dump \ + --disable-libtool --prefix=${PREFIX} \ + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> @@ -33,6 +43,25 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists +PLIST_SUB= SHLIBVER=${PORTVERSION} + +# amanda-server/amanda-client common part +.if defined (AMANDA_SERVER) +CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} +CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} +.endif + +.if defined (AMANDA_CONFIG) +CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} +.endif + +.if defined (AMANDA_UDPPORTRANGE) +CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} +.endif + +.if defined (AMANDA_PORTRANGE) +CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.endif # amanda-server part .if !defined(CLIENT_ONLY) @@ -66,18 +95,10 @@ pre-fetch: USE_PERL5= yes -BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-client --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -104,27 +125,10 @@ BUILD_DEPENDS+= mtx:${PORTSDIR}/misc/mtx RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .endif -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - .if defined (AMANDA_TAPE) CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE} .endif -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} -.endif - # # Before 4.0, pre-CAM scsiio.h existed .if ${OSVERSION} < 400000 @@ -148,6 +152,8 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" + @${ECHO} " -DWITH_AMANDA_DUMP_SNAPSHOT" + @${ECHO} " Use dump -L to use snapshot" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" @@ -169,17 +175,9 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" -BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar - -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-server --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-server +MAN5= amanda.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 post-install: @@ -194,21 +192,8 @@ post-install: ${TOUCH} /etc/amandates ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.if defined (WITH_AMANDA_DUMP_SNAPSHOT) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif .endif diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo index 04d70560d316..15c9c45146af 100644 --- a/misc/amanda26-server/distinfo +++ b/misc/amanda26-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.4.5.tar.gz) = 1960b7875424e412d042bc92a1548d7f -SHA256 (amanda-2.4.5.tar.gz) = 79f9d313b08220f9edb6557aabd75623a80b2adb3192cf01bbb0ca7f3a2223ce -SIZE (amanda-2.4.5.tar.gz) = 1541761 +MD5 (amanda-2.4.5p1.tar.gz) = 8fd967a6f63c4a91f0a38f56e2339ec8 +SHA256 (amanda-2.4.5p1.tar.gz) = 71e2716f1098f5ac6633e02e252e048ce0e76f880e2ddb531d9d261ad263fe64 +SIZE (amanda-2.4.5p1.tar.gz) = 1557400 diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c new file mode 100644 index 000000000000..8d2e6b737c42 --- /dev/null +++ b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c @@ -0,0 +1,42 @@ +Index: client-src/sendbackup-dump.c +=================================================================== +RCS file: /home/cvs/opensources/amanda/client-src/sendbackup-dump.c,v +retrieving revision 1.1.1.2 +retrieving revision 1.5 +diff -u -r1.1.1.2 -r1.5 +--- client-src/sendbackup-dump.c 25 Jun 2003 04:39:28 -0000 1.1.1.2 ++++ client-src/sendbackup-dump.c 25 Jun 2003 04:43:20 -0000 1.5 +@@ -40,6 +40,10 @@ + #define NAUGHTY_BITS /* but then I'd have to kill you */ + #endif + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ + #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" + + static regex_t re_table[] = { +@@ -306,6 +310,12 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) ++ "L", ++#endif ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -328,6 +338,9 @@ + &dumpin, &dumpout, &mesgf, + "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda26-server/files/patch-aa b/misc/amanda26-server/files/patch-aa index c5029f0fdfde..3e14a6ca4b07 100644 --- a/misc/amanda26-server/files/patch-aa +++ b/misc/amanda26-server/files/patch-aa @@ -1,15 +1,15 @@ ---- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 -+++ man/Makefile.in Mon Nov 8 06:24:40 2004 -@@ -254,7 +254,7 @@ +--- man/Makefile.in.orig Tue Oct 25 06:23:41 2005 ++++ man/Makefile.in Wed Mar 22 12:08:22 2006 +@@ -247,7 +247,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 --COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 +-COMMON_MAN_PAGES = amanda.8 amanda.conf.5 ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5 @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ @WANT_SERVER_TRUE@ amcheckdb.8 \ -@@ -276,7 +276,7 @@ +@@ -269,7 +269,7 @@ @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 @@ -17,4 +17,4 @@ +@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8 diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac index c2af6273b054..a9e95a3a6607 100644 --- a/misc/amanda26-server/files/patch-ac +++ b/misc/amanda26-server/files/patch-ac @@ -1,9 +1,9 @@ ---- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 -+++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 -@@ -41,7 +41,7 @@ - PRE_UNINSTALL = : - POST_UNINSTALL = : +--- tape-src/Makefile.in.orig Tue Oct 25 06:23:42 2005 ++++ tape-src/Makefile.in Wed Mar 22 12:10:00 2006 +@@ -43,7 +43,7 @@ + build_triplet = @build@ host_triplet = @host@ + target_triplet = @target@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) EXTRA_PROGRAMS = $(am__EXEEXT_1) diff --git a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in new file mode 100644 index 000000000000..555c4dffe362 --- /dev/null +++ b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in @@ -0,0 +1,11 @@ +--- changer-src/chg-zd-mtx.sh.in.orig Wed Feb 9 21:58:30 2005 ++++ changer-src/chg-zd-mtx.sh.in Wed Feb 9 21:58:49 2005 +@@ -413,7 +413,7 @@ + + IsNumeric() { + test -z "$1" && return 1 +- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" ++ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" + return `expr X"$1" != X"$x"` + } + diff --git a/misc/amanda26-server/files/patch-server-src_infofile.c b/misc/amanda26-server/files/patch-server-src_infofile.c deleted file mode 100644 index e826e411303e..000000000000 --- a/misc/amanda26-server/files/patch-server-src_infofile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/infofile.c.orig Wed Mar 16 11:15:28 2005 -+++ server-src/infofile.c Thu Jul 7 14:12:54 2005 -@@ -274,7 +274,7 @@ - rc = 0; - - nb_history = 0; -- for(i=0;i<=NB_HISTORY+1;i++) { -+ for(i=0;i<sizeof(info->history)/sizeof(info->history[0]);i++) { - info->history[i].level = -2; - } - for(rc = -2; (line = agets(infof)) != NULL; free(line)) { diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist index 52109b8f2c3b..59b5ceca2be9 100644 --- a/misc/amanda26-server/pkg-plist +++ b/misc/amanda26-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.5.so +lib/libamserver-%%SHLIBVER%%.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.5.so +lib/libamtape-%%SHLIBVER%%.so lib/libamtape.so lib/libamtape.la lib/libamtape.a diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index a90ac979e63a..274d146525c4 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -1,9 +1,9 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi -lib/libamanda-2.4.5.so +lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.5.so +lib/libamclient-%%SHLIBVER%%.so lib/libamclient.so lib/libamclient.la lib/libamclient.a @@ -19,11 +19,13 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX share/amanda/amadmin.8.txt share/amanda/amanda.8.txt +share/amanda/amanda.conf.5.txt share/amanda/amcheck.8.txt share/amanda/amcheckdb.8.txt share/amanda/amcleanup.8.txt @@ -54,6 +56,7 @@ share/amanda/historical.txt share/amanda/howto-afs.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt +share/amanda/howto-wrapper.txt share/amanda/howtos.txt share/amanda/index.txt share/amanda/indexing.txt diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 113f47884bf3..8a23c5ea0034 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -6,25 +6,35 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.5 -PORTREVISION?= 2 +PORTVERSION= 2.4.5p1 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= amanda -DISTFILES= amanda-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client MASTERPORTNAME= amanda-server +BUILD_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + NO_LATEST_LINK= yes USE_AUTOTOOLS= autoconf:259 USE_GMAKE= yes PATCH_STRIP= +CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ + --with-amandahosts --with-fqdn \ + --with-dump-honor-nodump --with-buffered-dump \ + --disable-libtool --prefix=${PREFIX} \ + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ + --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +INSTALLS_SHLIB= yes .include <bsd.port.pre.mk> @@ -33,6 +43,25 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists +PLIST_SUB= SHLIBVER=${PORTVERSION} + +# amanda-server/amanda-client common part +.if defined (AMANDA_SERVER) +CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} +CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} +.endif + +.if defined (AMANDA_CONFIG) +CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} +.endif + +.if defined (AMANDA_UDPPORTRANGE) +CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} +.endif + +.if defined (AMANDA_PORTRANGE) +CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.endif # amanda-server part .if !defined(CLIENT_ONLY) @@ -66,18 +95,10 @@ pre-fetch: USE_PERL5= yes -BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client \ - ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar +BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client +RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-client --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ @@ -104,27 +125,10 @@ BUILD_DEPENDS+= mtx:${PORTSDIR}/misc/mtx RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .endif -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - .if defined (AMANDA_TAPE) CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE} .endif -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} -.endif - # # Before 4.0, pre-CAM scsiio.h existed .if ${OSVERSION} < 400000 @@ -148,6 +152,8 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" + @${ECHO} " -DWITH_AMANDA_DUMP_SNAPSHOT" + @${ECHO} " Use dump -L to use snapshot" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" @@ -169,17 +175,9 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" -BUILD_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar -RUN_DEPENDS+= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar - -CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ - --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump --with-buffered-dump \ - --without-server --disable-libtool --prefix=${PREFIX} \ - --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ - --with-gnutar=${LOCALBASE}/bin/gtar +CONFIGURE_ARGS+=--without-server +MAN5= amanda.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 post-install: @@ -194,21 +192,8 @@ post-install: ${TOUCH} /etc/amandates ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates -.if defined (AMANDA_SERVER) -CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER} -CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER} -.endif - -.if defined (AMANDA_CONFIG) -CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} -.endif - -.if defined (AMANDA_UDPPORTRANGE) -CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} -.endif - -.if defined (AMANDA_PORTRANGE) -CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} +.if defined (WITH_AMANDA_DUMP_SNAPSHOT) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif .endif diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo index 04d70560d316..15c9c45146af 100644 --- a/misc/amanda32-server/distinfo +++ b/misc/amanda32-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.4.5.tar.gz) = 1960b7875424e412d042bc92a1548d7f -SHA256 (amanda-2.4.5.tar.gz) = 79f9d313b08220f9edb6557aabd75623a80b2adb3192cf01bbb0ca7f3a2223ce -SIZE (amanda-2.4.5.tar.gz) = 1541761 +MD5 (amanda-2.4.5p1.tar.gz) = 8fd967a6f63c4a91f0a38f56e2339ec8 +SHA256 (amanda-2.4.5p1.tar.gz) = 71e2716f1098f5ac6633e02e252e048ce0e76f880e2ddb531d9d261ad263fe64 +SIZE (amanda-2.4.5p1.tar.gz) = 1557400 diff --git a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c new file mode 100644 index 000000000000..8d2e6b737c42 --- /dev/null +++ b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c @@ -0,0 +1,42 @@ +Index: client-src/sendbackup-dump.c +=================================================================== +RCS file: /home/cvs/opensources/amanda/client-src/sendbackup-dump.c,v +retrieving revision 1.1.1.2 +retrieving revision 1.5 +diff -u -r1.1.1.2 -r1.5 +--- client-src/sendbackup-dump.c 25 Jun 2003 04:39:28 -0000 1.1.1.2 ++++ client-src/sendbackup-dump.c 25 Jun 2003 04:43:20 -0000 1.5 +@@ -40,6 +40,10 @@ + #define NAUGHTY_BITS /* but then I'd have to kill you */ + #endif + ++#ifdef __FreeBSD__ ++#include <sys/param.h> ++#endif ++ + #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" + + static regex_t re_table[] = { +@@ -306,6 +310,12 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) ++ "L", ++#endif ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -328,6 +338,9 @@ + &dumpin, &dumpout, &mesgf, + "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda32-server/files/patch-aa b/misc/amanda32-server/files/patch-aa index c5029f0fdfde..3e14a6ca4b07 100644 --- a/misc/amanda32-server/files/patch-aa +++ b/misc/amanda32-server/files/patch-aa @@ -1,15 +1,15 @@ ---- man/Makefile.in.orig Fri Oct 22 09:12:40 2004 -+++ man/Makefile.in Mon Nov 8 06:24:40 2004 -@@ -254,7 +254,7 @@ +--- man/Makefile.in.orig Tue Oct 25 06:23:41 2005 ++++ man/Makefile.in Wed Mar 22 12:08:22 2006 +@@ -247,7 +247,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 --COMMON_MAN_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 +-COMMON_MAN_PAGES = amanda.8 amanda.conf.5 ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5 @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ @WANT_SERVER_TRUE@ amcheck.8 \ @WANT_SERVER_TRUE@ amcheckdb.8 \ -@@ -276,7 +276,7 @@ +@@ -269,7 +269,7 @@ @WANT_SERVER_TRUE@ amverifyrun.8 @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8 @@ -17,4 +17,4 @@ +@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8 # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 + EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8 diff --git a/misc/amanda32-server/files/patch-ac b/misc/amanda32-server/files/patch-ac index c2af6273b054..a9e95a3a6607 100644 --- a/misc/amanda32-server/files/patch-ac +++ b/misc/amanda32-server/files/patch-ac @@ -1,9 +1,9 @@ ---- tape-src/Makefile.in.orig Fri Oct 22 09:12:42 2004 -+++ tape-src/Makefile.in Mon Nov 8 06:27:54 2004 -@@ -41,7 +41,7 @@ - PRE_UNINSTALL = : - POST_UNINSTALL = : +--- tape-src/Makefile.in.orig Tue Oct 25 06:23:42 2005 ++++ tape-src/Makefile.in Wed Mar 22 12:10:00 2006 +@@ -43,7 +43,7 @@ + build_triplet = @build@ host_triplet = @host@ + target_triplet = @target@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) EXTRA_PROGRAMS = $(am__EXEEXT_1) diff --git a/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in new file mode 100644 index 000000000000..555c4dffe362 --- /dev/null +++ b/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in @@ -0,0 +1,11 @@ +--- changer-src/chg-zd-mtx.sh.in.orig Wed Feb 9 21:58:30 2005 ++++ changer-src/chg-zd-mtx.sh.in Wed Feb 9 21:58:49 2005 +@@ -413,7 +413,7 @@ + + IsNumeric() { + test -z "$1" && return 1 +- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" ++ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" + return `expr X"$1" != X"$x"` + } + diff --git a/misc/amanda32-server/files/patch-server-src_infofile.c b/misc/amanda32-server/files/patch-server-src_infofile.c deleted file mode 100644 index e826e411303e..000000000000 --- a/misc/amanda32-server/files/patch-server-src_infofile.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/infofile.c.orig Wed Mar 16 11:15:28 2005 -+++ server-src/infofile.c Thu Jul 7 14:12:54 2005 -@@ -274,7 +274,7 @@ - rc = 0; - - nb_history = 0; -- for(i=0;i<=NB_HISTORY+1;i++) { -+ for(i=0;i<sizeof(info->history)/sizeof(info->history[0]);i++) { - info->history[i].level = -2; - } - for(rc = -2; (line = agets(infof)) != NULL; free(line)) { diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist index 52109b8f2c3b..59b5ceca2be9 100644 --- a/misc/amanda32-server/pkg-plist +++ b/misc/amanda32-server/pkg-plist @@ -1,8 +1,8 @@ -lib/libamserver-2.4.5.so +lib/libamserver-%%SHLIBVER%%.so lib/libamserver.so lib/libamserver.la lib/libamserver.a -lib/libamtape-2.4.5.so +lib/libamtape-%%SHLIBVER%%.so lib/libamtape.so lib/libamtape.la lib/libamtape.a diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index a90ac979e63a..274d146525c4 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -1,9 +1,9 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi -lib/libamanda-2.4.5.so +lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la lib/libamanda.a -lib/libamclient-2.4.5.so +lib/libamclient-%%SHLIBVER%%.so lib/libamclient.so lib/libamclient.la lib/libamclient.a @@ -19,11 +19,13 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX share/amanda/amadmin.8.txt share/amanda/amanda.8.txt +share/amanda/amanda.conf.5.txt share/amanda/amcheck.8.txt share/amanda/amcheckdb.8.txt share/amanda/amcleanup.8.txt @@ -54,6 +56,7 @@ share/amanda/historical.txt share/amanda/howto-afs.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt +share/amanda/howto-wrapper.txt share/amanda/howtos.txt share/amanda/index.txt share/amanda/indexing.txt |