diff options
36 files changed, 468 insertions, 236 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 2b60d34ec8e4..33c5d5629d80 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.5.0p2 +PORTVERSION= 2.5.1p1 PORTREVISION?= 0 PKGNAMESUFFIX?= -server PORTEPOCH= 1 @@ -20,9 +20,6 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client -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 @@ -31,11 +28,11 @@ 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 + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} INSTALLS_SHLIB= yes +OPTIONS= GNUTAR "use GNU tar" on + .include <bsd.port.pre.mk> CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -63,6 +60,13 @@ CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .endif +.if defined(WITH_GNUTAR) +CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +.endif + # amanda-server part .if !defined(CLIENT_ONLY) @@ -70,9 +74,6 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " -DWITH_PLOT to enable ploting, requires X11 libraries" - @${ECHO} " -DWITH_SAMBA to enable the use of smbclient" - @${ECHO} " -DWITH_MTX to enable the use of mtx changer scripts" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @@ -101,11 +102,16 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amaespipe.8 amcheck.8 \ - amcheckdb.8 amcleanup.8 amcrypt.8 amdd.8 \ + amcheckdb.8 amcleanup.8 \ + amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ amoverview.8 amreport.8 amrmtape.8 amstatus.8 \ amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.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 + .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot @@ -153,8 +159,6 @@ 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" @@ -178,9 +182,11 @@ pre-fetch: CONFIGURE_ARGS+=--without-server -MAN5= amanda.conf.5 +MAN5= amanda.conf.5 amanda-client.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 +OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off + post-install: ${MKDIR} ${PREFIX}/share/examples/amanda ${CP} -R ${WRKSRC}/example/amanda.conf \ diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo index 69e586bba7d7..129e0e246764 100644 --- a/misc/amanda-server/distinfo +++ b/misc/amanda-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.5.0p2.tar.gz) = 073828b8b5a5c377a08f8f19b5eccf85 -SHA256 (amanda-2.5.0p2.tar.gz) = ba691f9b7607431d642eca57ff25b328df83eba7149479587bfabcd0adc3ea2c -SIZE (amanda-2.5.0p2.tar.gz) = 1744317 +MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016 +SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b +SIZE (amanda-2.5.1p1.tar.gz) = 1884119 diff --git a/misc/amanda-server/files/extra-patch-sendbackup-dump.c b/misc/amanda-server/files/extra-patch-sendbackup-dump.c index 8d2e6b737c42..79764a121f76 100644 --- a/misc/amanda-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda-server/files/extra-patch-sendbackup-dump.c @@ -1,14 +1,8 @@ -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 +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +@@ -35,6 +35,10 @@ + #include "clock.h" + #include "version.h" +#ifdef __FreeBSD__ +#include <sys/param.h> @@ -16,8 +10,8 @@ diff -u -r1.1.1.2 -r1.5 + #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 @@ + static amregex_t re_table[] = { +@@ -370,6 +374,12 @@ dumpkeys = vstralloc(level_str, options->no_record ? "" : "u", @@ -30,9 +24,9 @@ diff -u -r1.1.1.2 -r1.5 "s", #ifdef HAVE_HONOR_NODUMP "h", -@@ -328,6 +338,9 @@ +@@ -392,6 +402,9 @@ &dumpin, &dumpout, &mesgf, - "dump", + cmd, config, dumpkeys, +#ifdef __FreeBSD__ + "64", diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa index b52dbe5b5f3f..3f21a3181ae0 100644 --- a/misc/amanda-server/files/patch-aa +++ b/misc/amanda-server/files/patch-aa @@ -1,31 +1,39 @@ ---- man/Makefile.in.orig Mon May 8 20:51:44 2006 -+++ man/Makefile.in Fri Jun 9 07:18:19 2006 -@@ -40,7 +40,7 @@ - @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES) - @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES) - @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES) --@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) -+@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) - subdir = man - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -260,8 +260,8 @@ +--- man/Makefile.in.orig Tue Sep 5 23:08:22 2006 ++++ man/Makefile.in Thu Sep 7 14:14:52 2006 +@@ -193,8 +193,8 @@ + WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@ + WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@ +-WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@ +-WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@ ++WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@ ++WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@ + WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@ + WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@ +@@ -261,13 +261,13 @@ target_os = @target_os@ target_vendor = @target_vendor@ - AMPLOT_MAN8_PAGES = amplot.8 + @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8 -COMMON_MAN8_PAGES = amanda.8 --COMMON_MAN5_PAGES = amanda.conf.5 +-COMMON_MAN5_PAGES = amanda.conf.5 \ +@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 - SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \ + amanda-client.conf.5 + + + #if WANT_SERVER +-SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \ amcheck.8 \ amcheckdb.8 \ -@@ -286,7 +286,7 @@ - amaespipe.8 + amcleanup.8 \ +@@ -294,7 +294,7 @@ + #endif @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 -@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8 - man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) - man5_MANS = $(COMMON_MAN5_PAGES) + man8_MANS = $(COMMON_MAN8_PAGES) \ + $(AMPLOT_MAN8_PAGES) \ + $(SERVER_MAN8_PAGES) \ diff --git a/misc/amanda-server/files/patch-ae b/misc/amanda-server/files/patch-ae index c52b8e445369..5b539bea3d43 100644 --- a/misc/amanda-server/files/patch-ae +++ b/misc/amanda-server/files/patch-ae @@ -1,9 +1,9 @@ ---- client-src/sendbackup-gnutar.c.orig Sat Jan 4 12:46:08 2003 -+++ client-src/sendbackup-gnutar.c Thu Oct 23 19:22:31 2003 -@@ -480,7 +480,11 @@ - - start_index(options->createindex, dumpout, mesgf, indexf, indexcmd); - +--- client-src/sendbackup-gnutar.c.orig Wed Jul 26 03:35:21 2006 ++++ client-src/sendbackup-gnutar.c Thu Sep 7 12:13:59 2006 +@@ -543,7 +543,11 @@ + my_argv[i++] = g_options->config; + else + my_argv[i++] = "NOCONFIG"; +#ifdef GNUTAR + my_argv[i++] = "GNUTAR"; +#else diff --git a/misc/amanda-server/files/patch-amanda.conf.5 b/misc/amanda-server/files/patch-amanda.conf.5 new file mode 100644 index 000000000000..ec18732bee43 --- /dev/null +++ b/misc/amanda-server/files/patch-amanda.conf.5 @@ -0,0 +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. +- .TP ++.TP + \fBchunksize\fR \fB int\fR + + Default: diff --git a/misc/amanda-server/patch-sendbackup-dump.c b/misc/amanda-server/patch-sendbackup-dump.c new file mode 100644 index 000000000000..a11c4d68f6c1 --- /dev/null +++ b/misc/amanda-server/patch-sendbackup-dump.c @@ -0,0 +1,24 @@ +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:56:23 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:58:27 2006 +@@ -370,6 +370,9 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -391,8 +394,10 @@ + dumppid = pipespawn(cmd, STDIN_PIPE, + &dumpin, &dumpout, &mesgf, + cmd, config, +- "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist index 4e168478a019..807ba8730fc9 100644 --- a/misc/amanda-server/pkg-plist +++ b/misc/amanda-server/pkg-plist @@ -45,6 +45,8 @@ sbin/amcheck sbin/amcheckdb sbin/amcleanup sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym sbin/amdd sbin/amdump sbin/amfetchdump diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index aa9754105df0..957458414c34 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -1,6 +1,10 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi dumper/generic-dumper dumper/gnutar +lib/libamandad-%%SHLIBVER%%.so +lib/libamandad.so +lib/libamandad.la +lib/libamandad.a lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la @@ -21,18 +25,26 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +sbin/amoldrecover share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX +share/amanda/ReleaseNotes share/amanda/amadmin.8.txt +share/amanda/amaespipe.8.txt +share/amanda/amanda-client.conf.5.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 +share/amanda/amcrypt-asym-ossl.8.txt +share/amanda/amcrypt-ossl.8.txt +share/amanda/amcrypt.8.txt share/amanda/amdd.8.txt share/amanda/amdump.8.txt +share/amanda/amfetchdump.8.txt share/amanda/amflush.8.txt share/amanda/amgetconf.8.txt share/amanda/amlabel.8.txt @@ -56,6 +68,7 @@ share/amanda/exclude.txt share/amanda/faq.txt share/amanda/historical.txt share/amanda/howto-afs.txt +share/amanda/howto-auth.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt share/amanda/howto-wrapper.txt diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index 2b60d34ec8e4..33c5d5629d80 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.5.0p2 +PORTVERSION= 2.5.1p1 PORTREVISION?= 0 PKGNAMESUFFIX?= -server PORTEPOCH= 1 @@ -20,9 +20,6 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client -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 @@ -31,11 +28,11 @@ 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 + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} INSTALLS_SHLIB= yes +OPTIONS= GNUTAR "use GNU tar" on + .include <bsd.port.pre.mk> CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -63,6 +60,13 @@ CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .endif +.if defined(WITH_GNUTAR) +CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +.endif + # amanda-server part .if !defined(CLIENT_ONLY) @@ -70,9 +74,6 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " -DWITH_PLOT to enable ploting, requires X11 libraries" - @${ECHO} " -DWITH_SAMBA to enable the use of smbclient" - @${ECHO} " -DWITH_MTX to enable the use of mtx changer scripts" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @@ -101,11 +102,16 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amaespipe.8 amcheck.8 \ - amcheckdb.8 amcleanup.8 amcrypt.8 amdd.8 \ + amcheckdb.8 amcleanup.8 \ + amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ amoverview.8 amreport.8 amrmtape.8 amstatus.8 \ amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.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 + .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot @@ -153,8 +159,6 @@ 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" @@ -178,9 +182,11 @@ pre-fetch: CONFIGURE_ARGS+=--without-server -MAN5= amanda.conf.5 +MAN5= amanda.conf.5 amanda-client.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 +OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off + post-install: ${MKDIR} ${PREFIX}/share/examples/amanda ${CP} -R ${WRKSRC}/example/amanda.conf \ diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo index 69e586bba7d7..129e0e246764 100644 --- a/misc/amanda25-server/distinfo +++ b/misc/amanda25-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.5.0p2.tar.gz) = 073828b8b5a5c377a08f8f19b5eccf85 -SHA256 (amanda-2.5.0p2.tar.gz) = ba691f9b7607431d642eca57ff25b328df83eba7149479587bfabcd0adc3ea2c -SIZE (amanda-2.5.0p2.tar.gz) = 1744317 +MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016 +SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b +SIZE (amanda-2.5.1p1.tar.gz) = 1884119 diff --git a/misc/amanda25-server/files/extra-patch-sendbackup-dump.c b/misc/amanda25-server/files/extra-patch-sendbackup-dump.c index 8d2e6b737c42..79764a121f76 100644 --- a/misc/amanda25-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda25-server/files/extra-patch-sendbackup-dump.c @@ -1,14 +1,8 @@ -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 +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +@@ -35,6 +35,10 @@ + #include "clock.h" + #include "version.h" +#ifdef __FreeBSD__ +#include <sys/param.h> @@ -16,8 +10,8 @@ diff -u -r1.1.1.2 -r1.5 + #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 @@ + static amregex_t re_table[] = { +@@ -370,6 +374,12 @@ dumpkeys = vstralloc(level_str, options->no_record ? "" : "u", @@ -30,9 +24,9 @@ diff -u -r1.1.1.2 -r1.5 "s", #ifdef HAVE_HONOR_NODUMP "h", -@@ -328,6 +338,9 @@ +@@ -392,6 +402,9 @@ &dumpin, &dumpout, &mesgf, - "dump", + cmd, config, dumpkeys, +#ifdef __FreeBSD__ + "64", diff --git a/misc/amanda25-server/files/patch-aa b/misc/amanda25-server/files/patch-aa index b52dbe5b5f3f..3f21a3181ae0 100644 --- a/misc/amanda25-server/files/patch-aa +++ b/misc/amanda25-server/files/patch-aa @@ -1,31 +1,39 @@ ---- man/Makefile.in.orig Mon May 8 20:51:44 2006 -+++ man/Makefile.in Fri Jun 9 07:18:19 2006 -@@ -40,7 +40,7 @@ - @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES) - @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES) - @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES) --@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) -+@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) - subdir = man - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -260,8 +260,8 @@ +--- man/Makefile.in.orig Tue Sep 5 23:08:22 2006 ++++ man/Makefile.in Thu Sep 7 14:14:52 2006 +@@ -193,8 +193,8 @@ + WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@ + WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@ +-WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@ +-WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@ ++WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@ ++WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@ + WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@ + WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@ +@@ -261,13 +261,13 @@ target_os = @target_os@ target_vendor = @target_vendor@ - AMPLOT_MAN8_PAGES = amplot.8 + @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8 -COMMON_MAN8_PAGES = amanda.8 --COMMON_MAN5_PAGES = amanda.conf.5 +-COMMON_MAN5_PAGES = amanda.conf.5 \ +@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 - SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \ + amanda-client.conf.5 + + + #if WANT_SERVER +-SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \ amcheck.8 \ amcheckdb.8 \ -@@ -286,7 +286,7 @@ - amaespipe.8 + amcleanup.8 \ +@@ -294,7 +294,7 @@ + #endif @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 -@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8 - man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) - man5_MANS = $(COMMON_MAN5_PAGES) + man8_MANS = $(COMMON_MAN8_PAGES) \ + $(AMPLOT_MAN8_PAGES) \ + $(SERVER_MAN8_PAGES) \ diff --git a/misc/amanda25-server/files/patch-ae b/misc/amanda25-server/files/patch-ae index c52b8e445369..5b539bea3d43 100644 --- a/misc/amanda25-server/files/patch-ae +++ b/misc/amanda25-server/files/patch-ae @@ -1,9 +1,9 @@ ---- client-src/sendbackup-gnutar.c.orig Sat Jan 4 12:46:08 2003 -+++ client-src/sendbackup-gnutar.c Thu Oct 23 19:22:31 2003 -@@ -480,7 +480,11 @@ - - start_index(options->createindex, dumpout, mesgf, indexf, indexcmd); - +--- client-src/sendbackup-gnutar.c.orig Wed Jul 26 03:35:21 2006 ++++ client-src/sendbackup-gnutar.c Thu Sep 7 12:13:59 2006 +@@ -543,7 +543,11 @@ + my_argv[i++] = g_options->config; + else + my_argv[i++] = "NOCONFIG"; +#ifdef GNUTAR + my_argv[i++] = "GNUTAR"; +#else diff --git a/misc/amanda25-server/files/patch-amanda.conf.5 b/misc/amanda25-server/files/patch-amanda.conf.5 new file mode 100644 index 000000000000..ec18732bee43 --- /dev/null +++ b/misc/amanda25-server/files/patch-amanda.conf.5 @@ -0,0 +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. +- .TP ++.TP + \fBchunksize\fR \fB int\fR + + Default: diff --git a/misc/amanda25-server/patch-sendbackup-dump.c b/misc/amanda25-server/patch-sendbackup-dump.c new file mode 100644 index 000000000000..a11c4d68f6c1 --- /dev/null +++ b/misc/amanda25-server/patch-sendbackup-dump.c @@ -0,0 +1,24 @@ +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:56:23 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:58:27 2006 +@@ -370,6 +370,9 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -391,8 +394,10 @@ + dumppid = pipespawn(cmd, STDIN_PIPE, + &dumpin, &dumpout, &mesgf, + cmd, config, +- "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist index 4e168478a019..807ba8730fc9 100644 --- a/misc/amanda25-server/pkg-plist +++ b/misc/amanda25-server/pkg-plist @@ -45,6 +45,8 @@ sbin/amcheck sbin/amcheckdb sbin/amcleanup sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym sbin/amdd sbin/amdump sbin/amfetchdump diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index aa9754105df0..957458414c34 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -1,6 +1,10 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi dumper/generic-dumper dumper/gnutar +lib/libamandad-%%SHLIBVER%%.so +lib/libamandad.so +lib/libamandad.la +lib/libamandad.a lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la @@ -21,18 +25,26 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +sbin/amoldrecover share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX +share/amanda/ReleaseNotes share/amanda/amadmin.8.txt +share/amanda/amaespipe.8.txt +share/amanda/amanda-client.conf.5.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 +share/amanda/amcrypt-asym-ossl.8.txt +share/amanda/amcrypt-ossl.8.txt +share/amanda/amcrypt.8.txt share/amanda/amdd.8.txt share/amanda/amdump.8.txt +share/amanda/amfetchdump.8.txt share/amanda/amflush.8.txt share/amanda/amgetconf.8.txt share/amanda/amlabel.8.txt @@ -56,6 +68,7 @@ share/amanda/exclude.txt share/amanda/faq.txt share/amanda/historical.txt share/amanda/howto-afs.txt +share/amanda/howto-auth.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt share/amanda/howto-wrapper.txt diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 2b60d34ec8e4..33c5d5629d80 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.5.0p2 +PORTVERSION= 2.5.1p1 PORTREVISION?= 0 PKGNAMESUFFIX?= -server PORTEPOCH= 1 @@ -20,9 +20,6 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client -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 @@ -31,11 +28,11 @@ 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 + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} INSTALLS_SHLIB= yes +OPTIONS= GNUTAR "use GNU tar" on + .include <bsd.port.pre.mk> CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -63,6 +60,13 @@ CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .endif +.if defined(WITH_GNUTAR) +CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +.endif + # amanda-server part .if !defined(CLIENT_ONLY) @@ -70,9 +74,6 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " -DWITH_PLOT to enable ploting, requires X11 libraries" - @${ECHO} " -DWITH_SAMBA to enable the use of smbclient" - @${ECHO} " -DWITH_MTX to enable the use of mtx changer scripts" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @@ -101,11 +102,16 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amaespipe.8 amcheck.8 \ - amcheckdb.8 amcleanup.8 amcrypt.8 amdd.8 \ + amcheckdb.8 amcleanup.8 \ + amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ amoverview.8 amreport.8 amrmtape.8 amstatus.8 \ amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.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 + .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot @@ -153,8 +159,6 @@ 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" @@ -178,9 +182,11 @@ pre-fetch: CONFIGURE_ARGS+=--without-server -MAN5= amanda.conf.5 +MAN5= amanda.conf.5 amanda-client.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 +OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off + post-install: ${MKDIR} ${PREFIX}/share/examples/amanda ${CP} -R ${WRKSRC}/example/amanda.conf \ diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo index 69e586bba7d7..129e0e246764 100644 --- a/misc/amanda26-server/distinfo +++ b/misc/amanda26-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.5.0p2.tar.gz) = 073828b8b5a5c377a08f8f19b5eccf85 -SHA256 (amanda-2.5.0p2.tar.gz) = ba691f9b7607431d642eca57ff25b328df83eba7149479587bfabcd0adc3ea2c -SIZE (amanda-2.5.0p2.tar.gz) = 1744317 +MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016 +SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b +SIZE (amanda-2.5.1p1.tar.gz) = 1884119 diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c index 8d2e6b737c42..79764a121f76 100644 --- a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c @@ -1,14 +1,8 @@ -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 +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +@@ -35,6 +35,10 @@ + #include "clock.h" + #include "version.h" +#ifdef __FreeBSD__ +#include <sys/param.h> @@ -16,8 +10,8 @@ diff -u -r1.1.1.2 -r1.5 + #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 @@ + static amregex_t re_table[] = { +@@ -370,6 +374,12 @@ dumpkeys = vstralloc(level_str, options->no_record ? "" : "u", @@ -30,9 +24,9 @@ diff -u -r1.1.1.2 -r1.5 "s", #ifdef HAVE_HONOR_NODUMP "h", -@@ -328,6 +338,9 @@ +@@ -392,6 +402,9 @@ &dumpin, &dumpout, &mesgf, - "dump", + cmd, config, dumpkeys, +#ifdef __FreeBSD__ + "64", diff --git a/misc/amanda26-server/files/patch-aa b/misc/amanda26-server/files/patch-aa index b52dbe5b5f3f..3f21a3181ae0 100644 --- a/misc/amanda26-server/files/patch-aa +++ b/misc/amanda26-server/files/patch-aa @@ -1,31 +1,39 @@ ---- man/Makefile.in.orig Mon May 8 20:51:44 2006 -+++ man/Makefile.in Fri Jun 9 07:18:19 2006 -@@ -40,7 +40,7 @@ - @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES) - @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES) - @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES) --@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) -+@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) - subdir = man - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -260,8 +260,8 @@ +--- man/Makefile.in.orig Tue Sep 5 23:08:22 2006 ++++ man/Makefile.in Thu Sep 7 14:14:52 2006 +@@ -193,8 +193,8 @@ + WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@ + WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@ +-WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@ +-WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@ ++WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@ ++WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@ + WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@ + WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@ +@@ -261,13 +261,13 @@ target_os = @target_os@ target_vendor = @target_vendor@ - AMPLOT_MAN8_PAGES = amplot.8 + @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8 -COMMON_MAN8_PAGES = amanda.8 --COMMON_MAN5_PAGES = amanda.conf.5 +-COMMON_MAN5_PAGES = amanda.conf.5 \ +@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 - SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \ + amanda-client.conf.5 + + + #if WANT_SERVER +-SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \ amcheck.8 \ amcheckdb.8 \ -@@ -286,7 +286,7 @@ - amaespipe.8 + amcleanup.8 \ +@@ -294,7 +294,7 @@ + #endif @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 -@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8 - man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) - man5_MANS = $(COMMON_MAN5_PAGES) + man8_MANS = $(COMMON_MAN8_PAGES) \ + $(AMPLOT_MAN8_PAGES) \ + $(SERVER_MAN8_PAGES) \ diff --git a/misc/amanda26-server/files/patch-ae b/misc/amanda26-server/files/patch-ae index c52b8e445369..5b539bea3d43 100644 --- a/misc/amanda26-server/files/patch-ae +++ b/misc/amanda26-server/files/patch-ae @@ -1,9 +1,9 @@ ---- client-src/sendbackup-gnutar.c.orig Sat Jan 4 12:46:08 2003 -+++ client-src/sendbackup-gnutar.c Thu Oct 23 19:22:31 2003 -@@ -480,7 +480,11 @@ - - start_index(options->createindex, dumpout, mesgf, indexf, indexcmd); - +--- client-src/sendbackup-gnutar.c.orig Wed Jul 26 03:35:21 2006 ++++ client-src/sendbackup-gnutar.c Thu Sep 7 12:13:59 2006 +@@ -543,7 +543,11 @@ + my_argv[i++] = g_options->config; + else + my_argv[i++] = "NOCONFIG"; +#ifdef GNUTAR + my_argv[i++] = "GNUTAR"; +#else diff --git a/misc/amanda26-server/files/patch-amanda.conf.5 b/misc/amanda26-server/files/patch-amanda.conf.5 new file mode 100644 index 000000000000..ec18732bee43 --- /dev/null +++ b/misc/amanda26-server/files/patch-amanda.conf.5 @@ -0,0 +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. +- .TP ++.TP + \fBchunksize\fR \fB int\fR + + Default: diff --git a/misc/amanda26-server/patch-sendbackup-dump.c b/misc/amanda26-server/patch-sendbackup-dump.c new file mode 100644 index 000000000000..a11c4d68f6c1 --- /dev/null +++ b/misc/amanda26-server/patch-sendbackup-dump.c @@ -0,0 +1,24 @@ +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:56:23 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:58:27 2006 +@@ -370,6 +370,9 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -391,8 +394,10 @@ + dumppid = pipespawn(cmd, STDIN_PIPE, + &dumpin, &dumpout, &mesgf, + cmd, config, +- "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist index 4e168478a019..807ba8730fc9 100644 --- a/misc/amanda26-server/pkg-plist +++ b/misc/amanda26-server/pkg-plist @@ -45,6 +45,8 @@ sbin/amcheck sbin/amcheckdb sbin/amcleanup sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym sbin/amdd sbin/amdump sbin/amfetchdump diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index aa9754105df0..957458414c34 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -1,6 +1,10 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi dumper/generic-dumper dumper/gnutar +lib/libamandad-%%SHLIBVER%%.so +lib/libamandad.so +lib/libamandad.la +lib/libamandad.a lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la @@ -21,18 +25,26 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +sbin/amoldrecover share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX +share/amanda/ReleaseNotes share/amanda/amadmin.8.txt +share/amanda/amaespipe.8.txt +share/amanda/amanda-client.conf.5.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 +share/amanda/amcrypt-asym-ossl.8.txt +share/amanda/amcrypt-ossl.8.txt +share/amanda/amcrypt.8.txt share/amanda/amdd.8.txt share/amanda/amdump.8.txt +share/amanda/amfetchdump.8.txt share/amanda/amflush.8.txt share/amanda/amgetconf.8.txt share/amanda/amlabel.8.txt @@ -56,6 +68,7 @@ share/amanda/exclude.txt share/amanda/faq.txt share/amanda/historical.txt share/amanda/howto-afs.txt +share/amanda/howto-auth.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt share/amanda/howto-wrapper.txt diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 2b60d34ec8e4..33c5d5629d80 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.5.0p2 +PORTVERSION= 2.5.1p1 PORTREVISION?= 0 PKGNAMESUFFIX?= -server PORTEPOCH= 1 @@ -20,9 +20,6 @@ COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client -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 @@ -31,11 +28,11 @@ 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 + --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} INSTALLS_SHLIB= yes +OPTIONS= GNUTAR "use GNU tar" on + .include <bsd.port.pre.mk> CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -63,6 +60,13 @@ CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} .endif +.if defined(WITH_GNUTAR) +CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \ + --with-gnutar=${LOCALBASE}/bin/gtar +BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar +.endif + # amanda-server part .if !defined(CLIENT_ONLY) @@ -70,9 +74,6 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " -DWITH_PLOT to enable ploting, requires X11 libraries" - @${ECHO} " -DWITH_SAMBA to enable the use of smbclient" - @${ECHO} " -DWITH_MTX to enable the use of mtx changer scripts" @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @@ -101,11 +102,16 @@ RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amaespipe.8 amcheck.8 \ - amcheckdb.8 amcleanup.8 amcrypt.8 amdd.8 \ + amcheckdb.8 amcleanup.8 \ + amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ amoverview.8 amreport.8 amrmtape.8 amstatus.8 \ amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.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 + .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot @@ -153,8 +159,6 @@ 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" @@ -178,9 +182,11 @@ pre-fetch: CONFIGURE_ARGS+=--without-server -MAN5= amanda.conf.5 +MAN5= amanda.conf.5 amanda-client.conf.5 MAN8= amanda.8 amrecover.8 amrestore.8 +OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off + post-install: ${MKDIR} ${PREFIX}/share/examples/amanda ${CP} -R ${WRKSRC}/example/amanda.conf \ diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo index 69e586bba7d7..129e0e246764 100644 --- a/misc/amanda32-server/distinfo +++ b/misc/amanda32-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.5.0p2.tar.gz) = 073828b8b5a5c377a08f8f19b5eccf85 -SHA256 (amanda-2.5.0p2.tar.gz) = ba691f9b7607431d642eca57ff25b328df83eba7149479587bfabcd0adc3ea2c -SIZE (amanda-2.5.0p2.tar.gz) = 1744317 +MD5 (amanda-2.5.1p1.tar.gz) = 253a7c1d4e913c2516b21ab9f53a9016 +SHA256 (amanda-2.5.1p1.tar.gz) = 9ccf3cb2556d9b4f612072f4b0f5baa2b605a352316ae12e203e6c59404e7b1b +SIZE (amanda-2.5.1p1.tar.gz) = 1884119 diff --git a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c index 8d2e6b737c42..79764a121f76 100644 --- a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c @@ -1,14 +1,8 @@ -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 +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +@@ -35,6 +35,10 @@ + #include "clock.h" + #include "version.h" +#ifdef __FreeBSD__ +#include <sys/param.h> @@ -16,8 +10,8 @@ diff -u -r1.1.1.2 -r1.5 + #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 @@ + static amregex_t re_table[] = { +@@ -370,6 +374,12 @@ dumpkeys = vstralloc(level_str, options->no_record ? "" : "u", @@ -30,9 +24,9 @@ diff -u -r1.1.1.2 -r1.5 "s", #ifdef HAVE_HONOR_NODUMP "h", -@@ -328,6 +338,9 @@ +@@ -392,6 +402,9 @@ &dumpin, &dumpout, &mesgf, - "dump", + cmd, config, dumpkeys, +#ifdef __FreeBSD__ + "64", diff --git a/misc/amanda32-server/files/patch-aa b/misc/amanda32-server/files/patch-aa index b52dbe5b5f3f..3f21a3181ae0 100644 --- a/misc/amanda32-server/files/patch-aa +++ b/misc/amanda32-server/files/patch-aa @@ -1,31 +1,39 @@ ---- man/Makefile.in.orig Mon May 8 20:51:44 2006 -+++ man/Makefile.in Fri Jun 9 07:18:19 2006 -@@ -40,7 +40,7 @@ - @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES) - @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES) - @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES) --@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) -+@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES) - subdir = man - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -260,8 +260,8 @@ +--- man/Makefile.in.orig Tue Sep 5 23:08:22 2006 ++++ man/Makefile.in Thu Sep 7 14:14:52 2006 +@@ -193,8 +193,8 @@ + WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@ + WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@ +-WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@ +-WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@ ++WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@ ++WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@ + WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@ + WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@ + WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@ +@@ -261,13 +261,13 @@ target_os = @target_os@ target_vendor = @target_vendor@ - AMPLOT_MAN8_PAGES = amplot.8 + @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8 -COMMON_MAN8_PAGES = amanda.8 --COMMON_MAN5_PAGES = amanda.conf.5 +-COMMON_MAN5_PAGES = amanda.conf.5 \ +@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8 -+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 - SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \ + amanda-client.conf.5 + + + #if WANT_SERVER +-SERVER_MAN8_PAGES = amadmin.8 \ ++@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \ amcheck.8 \ amcheckdb.8 \ -@@ -286,7 +286,7 @@ - amaespipe.8 + amcleanup.8 \ +@@ -294,7 +294,7 @@ + #endif @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 -@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8 - man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) - man5_MANS = $(COMMON_MAN5_PAGES) + man8_MANS = $(COMMON_MAN8_PAGES) \ + $(AMPLOT_MAN8_PAGES) \ + $(SERVER_MAN8_PAGES) \ diff --git a/misc/amanda32-server/files/patch-ae b/misc/amanda32-server/files/patch-ae index c52b8e445369..5b539bea3d43 100644 --- a/misc/amanda32-server/files/patch-ae +++ b/misc/amanda32-server/files/patch-ae @@ -1,9 +1,9 @@ ---- client-src/sendbackup-gnutar.c.orig Sat Jan 4 12:46:08 2003 -+++ client-src/sendbackup-gnutar.c Thu Oct 23 19:22:31 2003 -@@ -480,7 +480,11 @@ - - start_index(options->createindex, dumpout, mesgf, indexf, indexcmd); - +--- client-src/sendbackup-gnutar.c.orig Wed Jul 26 03:35:21 2006 ++++ client-src/sendbackup-gnutar.c Thu Sep 7 12:13:59 2006 +@@ -543,7 +543,11 @@ + my_argv[i++] = g_options->config; + else + my_argv[i++] = "NOCONFIG"; +#ifdef GNUTAR + my_argv[i++] = "GNUTAR"; +#else diff --git a/misc/amanda32-server/files/patch-amanda.conf.5 b/misc/amanda32-server/files/patch-amanda.conf.5 new file mode 100644 index 000000000000..ec18732bee43 --- /dev/null +++ b/misc/amanda32-server/files/patch-amanda.conf.5 @@ -0,0 +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. +- .TP ++.TP + \fBchunksize\fR \fB int\fR + + Default: diff --git a/misc/amanda32-server/patch-sendbackup-dump.c b/misc/amanda32-server/patch-sendbackup-dump.c new file mode 100644 index 000000000000..a11c4d68f6c1 --- /dev/null +++ b/misc/amanda32-server/patch-sendbackup-dump.c @@ -0,0 +1,24 @@ +--- client-src/sendbackup-dump.c.orig Fri Sep 8 13:56:23 2006 ++++ client-src/sendbackup-dump.c Fri Sep 8 13:58:27 2006 +@@ -370,6 +370,9 @@ + + dumpkeys = vstralloc(level_str, + options->no_record ? "" : "u", ++#ifdef __FreeBSD__ ++ "b", ++#endif + "s", + #ifdef HAVE_HONOR_NODUMP + "h", +@@ -391,8 +394,10 @@ + dumppid = pipespawn(cmd, STDIN_PIPE, + &dumpin, &dumpout, &mesgf, + cmd, config, +- "dump", + dumpkeys, ++#ifdef __FreeBSD__ ++ "64", ++#endif + "1048576", + #ifdef HAVE_HONOR_NODUMP + "0", diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist index 4e168478a019..807ba8730fc9 100644 --- a/misc/amanda32-server/pkg-plist +++ b/misc/amanda32-server/pkg-plist @@ -45,6 +45,8 @@ sbin/amcheck sbin/amcheckdb sbin/amcleanup sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym sbin/amdd sbin/amdump sbin/amfetchdump diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index aa9754105df0..957458414c34 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -1,6 +1,10 @@ @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi dumper/generic-dumper dumper/gnutar +lib/libamandad-%%SHLIBVER%%.so +lib/libamandad.so +lib/libamandad.la +lib/libamandad.a lib/libamanda-%%SHLIBVER%%.so lib/libamanda.so lib/libamanda.la @@ -21,18 +25,26 @@ libexec/amanda/sendbackup libexec/amanda/sendsize libexec/amanda/versionsuffix sbin/amrecover +sbin/amoldrecover share/amanda/Appendix.txt share/amanda/COPYRIGHT share/amanda/COPYRIGHT-APACHE share/amanda/COPYRIGHT-REGEX +share/amanda/ReleaseNotes share/amanda/amadmin.8.txt +share/amanda/amaespipe.8.txt +share/amanda/amanda-client.conf.5.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 +share/amanda/amcrypt-asym-ossl.8.txt +share/amanda/amcrypt-ossl.8.txt +share/amanda/amcrypt.8.txt share/amanda/amdd.8.txt share/amanda/amdump.8.txt +share/amanda/amfetchdump.8.txt share/amanda/amflush.8.txt share/amanda/amgetconf.8.txt share/amanda/amlabel.8.txt @@ -56,6 +68,7 @@ share/amanda/exclude.txt share/amanda/faq.txt share/amanda/historical.txt share/amanda/howto-afs.txt +share/amanda/howto-auth.txt share/amanda/howto-cygwin.txt share/amanda/howto-filedriver.txt share/amanda/howto-wrapper.txt |