pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils Update to 3.3.9, fixing CVE-2016-10729 and CV...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a3c7b1273d1
branches:  trunk
changeset: 315418:2a3c7b1273d1
user:      spz <spz%pkgsrc.org@localhost>
date:      Fri Nov 23 22:33:13 2018 +0000

description:
Update to 3.3.9, fixing CVE-2016-10729 and CVE-2016-10730

Upstream release notes:

Release Notes for 3.3.9:

    new --with-security-file configure option
        It set the default security file.
        default to /etc/amanda-security.conf
    security-fix
        All previous release of amanda allow the 'amanda' user
        to execute any code as root, and to execute an interactive shell
        as root.
        This is a security vulnerability if you do not trust the 'amanda' user.
        There is no need to upgrade if you trust the 'amanda' user
        and the account is secure
            good password.
            secure xinetd.conf setting.
            secure .amandahosts setting.
        The 'amanda' user can read all files in the machine, it is
        what a backup program do.
        The set of fix disable the abilities to run unwanted code
        as root or to write file anywhere in the filesystem.
    /etc/amanda-security.conf/etc/amanda-security.conf
        A file that contains security setting.
        It list all binaries amanda can execute as root.
        restore_by_amanda_user
            It tell if the 'amanda' user can do restore as root.
            It allow the 'amanda' user to write files anywhere
            in the filesystem.
    amgtar/amstar/ambsdtar/runtar
        Disable arguments that can fork program.
        Verify the realpath (with symbolic link resolved) is
        in the amanda-security.conf file.
        Verify the tar/star/bsdtar realpath program is secure
            owned by root and modifiable only by root.
        On restore, check the restore_by_amanda_user setting
        if not run by root.

Release Notes for 3.3.8:

    s3 devices
        New NEARLINE S3-STORAGE-CLASS for Google storage.
        New AWS4 STORAGE-API
    amcryptsimple
        Works with newer gpg2.
    amgtar
        Default SPARSE value is NO if tar < 1.28.
        Because a bug in tar with some filesystem.
    amstar
        support include in backup mode.
    ampgsql
        Add FULL-WAL property.
    Many bugs fix.

Release Notes for 3.3.7p1:

    Fix build in 3.3.7.

Release Notes for 3.3.7:

    amvault
        new --no-interactivity argument.
        new --src-labelstr argument.
    amdump
        compute crc32 of the streams and write them to the debug files.
    chg-robot
        Add a BROKEN-DRIVE-LOADED-SLOT property.
    Many bugs fix.

Release Notes for 3.3.6:

    ambsdtar
        new application that use BSD tar to do the backup.
    Many bugs fix.

Release Notes for 3.3.5:

    amtape
        faster 'verify' command.
    fix parsing of config override arguments.
    amsamba
        Add REGEX-MATCH property.
    amvault
        Print progress status.
    ndmp device
        INDIRECT property default to yes.
    Many bugs fix.

Release Notes for 3.3.4:

    amreport
        new --format argument
        new 'json' and 'json_raw' format.
    amanda.conf
        new REPORT-FORMAT option.
    amtape
        new 'verify' command.
    amadmin
        new 'force-level-1' command.
    ampgsql
        Add VERBOSE property.
    S3 device
        handle DURABLE_REDUCED_AVAILABILITY for google storage.
    Many bugs fix.

Release Notes for 3.3.3:

    amdump.X log files use timestamp instead of number, amdump
    and amdump.1 are maintained as symlink.
    chg-disk
        Use the changerfile for the statefile.
    s3 device
        Support CASTOR storage
    amanda.conf
        New REPORT-USE-MEDIA and REPORT-NEXT-MEDIA setting.
    amfetchdump
        New --extract, --directory, --data-path and
        --application-property arguments. It allow to do the extraction
        on the server.
    --exact-match argument to many command, and '=' prefix to expression.
        It diable use of expression for host, disk, level and datestamp
        on command line argument.
    All changer scripts.
        Add LOCK-TIMEOUT property.
    Many bug fix

Release Notes for 3.3.2:

    amgtar
        New IGNORE-ZEROS property
    amsamba
        Fix use of subdir for restore
    s3 device
        New PROXY property
        New PASSWORD, USERNAME, TENANT_ID, TENANT_NAME properties
        New STORAGE_API property
        New S3_MULTI_DELETE property
        New CLIENT_ID, CLIENT_SECRET and REFRESH_TOKEN properties
        New CREATE-BUCKET property
        New PROJECT-ID property
        New REUSE-CONNECTION property
        Works with swift and google storage.
    NDMP device
        Add INDIRECT property
    amanda.conf
        Add 'max-warnings', The maximum number of warning lines in the report.
        Default 'columspec' changed to:
        HostName=0:-12:12,Disk=1:-11:11,Level=1:-1:1,OrigKB=1:-7:0,OutKB=1:-7:0, Compress=1:-6:1,DumpTime=1:-7:7,Dumprate=1:-6:1,TapeTime=1:-6:6, TapeRate=1:-6:1
    amadmin
        Add --no-default and --print-source arguments for config and
        disklist command.
    amfetchdump
        Print progress.
        Add --decrypt, --no-decrypt, --server-decrypt, --client-decrypt,
        --compress, --no-compress, --server-compress and
        --client-compress options.
    fix for compilation with newer glib
    fix for compilation on cigwin
    Many bug fix

diffstat:

 sysutils/amanda-client/Makefile                                    |  11 +-
 sysutils/amanda-client/PLIST                                       |   3 +-
 sysutils/amanda-common/Makefile                                    |   4 +-
 sysutils/amanda-common/PLIST                                       |  14 ++-
 sysutils/amanda-common/distinfo                                    |  34 +++---
 sysutils/amanda-common/options.mk                                  |  17 +++-
 sysutils/amanda-common/patches/patch-Makefile.am                   |  13 ++-
 sysutils/amanda-common/patches/patch-application-src_Makefile.am   |   6 +-
 sysutils/amanda-common/patches/patch-common-src_Makefile.in        |  13 +-
 sysutils/amanda-common/patches/patch-common-src_conffile.c         |  10 +-
 sysutils/amanda-common/patches/patch-common-src_genversion.c       |  18 +++
 sysutils/amanda-common/patches/patch-common-src_glib-util.c        |  15 ---
 sysutils/amanda-common/patches/patch-common-src_glib-util.h        |  15 ---
 sysutils/amanda-common/patches/patch-config_amanda_config_flags.m4 |  15 +++
 sysutils/amanda-common/patches/patch-config_amanda_dumpers.m4      |  13 +--
 sysutils/amanda-common/patches/patch-config_amanda_tape.m4         |  49 ----------
 sysutils/amanda-common/patches/patch-device-src_device.c           |  27 -----
 sysutils/amanda-common/patches/patch-ndmp-src_ndmp2__xdr.c         |   6 +-
 sysutils/amanda-common/patches/patch-ndmp-src_ndmp3__xdr.c         |   6 +-
 sysutils/amanda-common/patches/patch-ndmp-src_ndmp4__xdr.c         |   6 +-
 sysutils/amanda-common/version.mk                                  |   4 +-
 sysutils/amanda-plot/Makefile                                      |   4 +-
 sysutils/amanda-server/Makefile                                    |   4 +-
 23 files changed, 133 insertions(+), 174 deletions(-)

diffs (truncated from 588 to 300 lines):

diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-client/Makefile
--- a/sysutils/amanda-client/Makefile   Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-client/Makefile   Fri Nov 23 22:33:13 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2018/08/22 09:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2018/11/23 22:33:13 spz Exp $
 #
 
 PKGNAME=               amanda-client-${AMANDA_VERSION}
-PKGREVISION=           5
+#PKGREVISION=          1
 
 COMMENT=               Client part of Amanda, a network backup system
 
@@ -40,6 +40,13 @@
 CONFIGURE_ARGS+=       --with-dump-use-snapshot --with-rundump
 .endif
 
+PLIST_VARS+=           amanda-bsdtar
+.if !empty(PKG_OPTIONS:Mamanda-bsdtar)
+MANPAGES+=             ambsdtar.8
+SPECIAL_PERMS+=                libexec/amanda/application/ambsdtar ${AM_PROG_PERMS}
+PLIST.amanda-bsdtar=   yes
+.endif
+
 SPECIAL_PERMS+=                libexec/amanda/application/amgtar ${AM_PROG_PERMS}
 SPECIAL_PERMS+=                libexec/amanda/application/amstar ${AM_PROG_PERMS}
 SPECIAL_PERMS+=                libexec/amanda/calcsize ${AM_PROG_PERMS}
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-client/PLIST
--- a/sysutils/amanda-client/PLIST      Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-client/PLIST      Fri Nov 23 22:33:13 2018 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2012/07/30 07:21:10 sbd Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/11/23 22:33:13 spz Exp $
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Application.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Application/Zfs.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Application/libApplication.la
 lib/amanda/libamclient.la
 libexec/amanda/amandad
+${PLIST.amanda-bsdtar}libexec/amanda/application/ambsdtar
 libexec/amanda/application/amgtar
 libexec/amanda/application/amlog-script
 libexec/amanda/application/ampgsql
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/Makefile
--- a/sysutils/amanda-common/Makefile   Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/Makefile   Fri Nov 23 22:33:13 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2018/08/22 09:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2018/11/23 22:33:13 spz Exp $
 
 PKGNAME=               amanda-common-${AMANDA_VERSION}
-PKGREVISION=           12
+#PKGREVISION=          1
 
 COMMENT=               Common libraries and binaries for Amanda
 
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/PLIST
--- a/sysutils/amanda-common/PLIST      Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/PLIST      Fri Nov 23 22:33:13 2018 +0000
@@ -1,4 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2015/02/09 18:35:12 gdt Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/11/23 22:33:13 spz Exp $
+etc/amanda/amanda-security.conf
+lib/amanda/libamanda.la
+lib/amanda/libamandad.la
+lib/amanda/libamar.la
+lib/amanda/libamglue.la
+lib/amanda/libamxfer.la
+lib/charset.alias
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Archive.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/BigIntCompat.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/ClientService.pm
@@ -6,12 +13,14 @@
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Config/FoldingHash.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Constants.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Debug.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Extract.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Feature.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Header.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/Binary.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/LineProtocol.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/MainLoop.pm
 ${PLIST.ndmp}${PERL5_SUB_INSTALLVENDORLIB}/Amanda/NDMP.pm
+${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Message.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Paths.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Process.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script.pm
@@ -42,6 +51,7 @@
 ${PLIST.ndmp}libexec/amanda/ndmjob
 man/man5/amanda-archive-format.5
 man/man5/amanda-client.conf.5
+man/man5/amanda-security.conf.5
 man/man5/amanda.conf.5
 man/man7/amanda-auth.7
 man/man7/amanda-match.7
@@ -66,6 +76,8 @@
 share/doc/amanda/example/amanda-client-postgresql.conf
 share/doc/amanda/example/amanda-client.conf
 share/doc/amanda/example/amanda.conf
+share/doc/amanda/example/amandaclient.xml
+share/doc/amanda/example/amandaserver.xml
 share/doc/amanda/example/chg-multi.conf
 share/doc/amanda/example/chg-scsi.conf
 share/doc/amanda/example/disklist
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/distinfo
--- a/sysutils/amanda-common/distinfo   Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/distinfo   Fri Nov 23 22:33:13 2018 +0000
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.21 2016/06/11 21:07:27 dholland Exp $
+$NetBSD: distinfo,v 1.22 2018/11/23 22:33:13 spz Exp $
 
-SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98
-RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d
-SHA512 (amanda-3.3.1.tar.gz) = 86b7b127c81e75bdc60bebbaf06e474667c364e66b3c12ed6797f1a5ef6971010bc20e4b596488586e0cde6cdbb7e0a96679cabf04d2e427d9eb2922347ebd66
-Size (amanda-3.3.1.tar.gz) = 4328574 bytes
-SHA1 (patch-Makefile.am) = 005201b7a9b4e875c45362456e100c57fcf700f3
+SHA1 (amanda-3.3.9.tar.gz) = aff8af309edace21985434c041e3c46052db0ee1
+RMD160 (amanda-3.3.9.tar.gz) = 8f96be4318a86405b1d7045b899777d933f2abc4
+SHA512 (amanda-3.3.9.tar.gz) = 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
+Size (amanda-3.3.9.tar.gz) = 4673301 bytes
+SHA1 (patch-Makefile.am) = 172dc9b2419c0acb989034e382e4137e69b051e2
+SHA1 (patch-Makefile.in) = 391b7bb8cd0e8d0b90f36b6a76877118dd468a01
 SHA1 (patch-amandad-src_Makefile.am) = bdff2c06da0ee6c88237c56568fe20c5cefedd7a
-SHA1 (patch-application-src_Makefile.am) = 3a5f256ab7e2439c2e19c4f75234d3a677707cc2
+SHA1 (patch-application-src_Makefile.am) = 8b448d2c7dbda4d731d6985374e2a6786b0ac8d1
+SHA1 (patch-autogen) = a5a7addd91ddb62e3270c149fa3af1ca6c56a1bd
 SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442
 SHA1 (patch-client-src_getfsent.c) = 903a921b8679ddcff1fdd838ffdce16a6d8da46f
 SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec
 SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6
-SHA1 (patch-common-src_Makefile.in) = 422e4d519d8797e686d62cfeca8cda2e8a4a8bb3
-SHA1 (patch-common-src_conffile.c) = b25e6a7e7f7c6841e28aa93587996b017bfefc2c
-SHA1 (patch-common-src_glib-util.c) = 8b62499f6730843fbf9e872adc80978b77b5573f
-SHA1 (patch-common-src_glib-util.h) = 6d5b14acd7a44b17a52ebc697f5354db2a4b04f9
+SHA1 (patch-common-src_Makefile.in) = b4f3dee5a64806c3e8228af68ccbd94ecfd2d8cc
+SHA1 (patch-common-src_conffile.c) = 764c2db25c16558dea4221d3e85e7cef3d52b6c5
+SHA1 (patch-common-src_genversion.c) = a457850d9377e9d074baeaf3b7c4cb66a047c486
 SHA1 (patch-common-src_security-util.h) = c628cc19a624da2cfabdb7d488bc2cd2d4b955a4
-SHA1 (patch-config_amanda_dumpers.m4) = 3d0cf6133b003de53e05929d2ce04eaa0f614819
+SHA1 (patch-config_amanda_config_flags.m4) = cf79825e49b52b0c0440185291c8cf91ff32f9b2
+SHA1 (patch-config_amanda_dumpers.m4) = ebd2f9932cb5e9e883cedb626a4ca774af87365d
 SHA1 (patch-config_amanda_krb5-security.m4) = c82af0e106e49b59994b40f12ed5b1c165a8497f
-SHA1 (patch-config_amanda_tape.m4) = ac8da578326756eeadd935bdeddb202ea990c006
 SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133c7766693
 SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5
-SHA1 (patch-device-src_device.c) = 31cb823dcce0f7f3d9de8f9def1a0f025ab10876
 SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a
 SHA1 (patch-example_amanda.conf.in) = 4be9bd71f9965d9dd351ae2666ee1cb99e8aea94
 SHA1 (patch-example_chg-multi-conf) = 2a586e02e5766d89c71061a5b344dc13d98ed56a
 SHA1 (patch-example_template.d_advanced.conf.in) = 654d896c321b81f5db15fddd8a1c08a528921d8a
 SHA1 (patch-man_xml-source_amanda.conf.5.xml) = a5a40433fc011c43524076f6c4164e51b2639836
-SHA1 (patch-ndmp-src_ndmp2__xdr.c) = 9ae6d78c2192ece83a1aa141cb04c9761969ca5b
-SHA1 (patch-ndmp-src_ndmp3__xdr.c) = a080c7337ede4fe75f9735fb3355d0aa16b0af6c
-SHA1 (patch-ndmp-src_ndmp4__xdr.c) = 339b0d539754127446acf6456fb385f00b1fbcc3
+SHA1 (patch-ndmp-src_ndmp2__xdr.c) = c8cc0ae047e58a25d1490c9cb7b72cb7d88b20c8
+SHA1 (patch-ndmp-src_ndmp3__xdr.c) = 951d2d98ad20ecf09cdc82f9ed6828dfd047b06b
+SHA1 (patch-ndmp-src_ndmp4__xdr.c) = ed9876975e73d6da7f9f54eecc117415ddd02cde
 SHA1 (patch-oldrecover-src_Makefile.am) = 9127c1523937da3955662cc0b0921d05bca75248
 SHA1 (patch-perl_Amanda_Report_human.pm) = 3f23c333e5892b13915267a646837b8118d50128
 SHA1 (patch-perl_Amanda_Xfer.pm) = 7389672ce0ed08d8b5f6548a6bb466ef4e18ab1d
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/options.mk
--- a/sysutils/amanda-common/options.mk Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/options.mk Fri Nov 23 22:33:13 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2017/03/28 12:50:26 bouyer Exp $
+# $NetBSD: options.mk,v 1.14 2018/11/23 22:33:13 spz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.amanda
 # Common options.
-PKG_SUPPORTED_OPTIONS+=        inet6 amanda-fqdn amanda-ssh kerberos ndmp
+PKG_SUPPORTED_OPTIONS+=        inet6 amanda-bsdtar amanda-fqdn amanda-ssh kerberos ndmp
 PKG_SUGGESTED_OPTIONS+=        inet6 amanda-fqdn amanda-ssh
 # Client options.
 PKG_SUPPORTED_OPTIONS+=        amanda-smb amanda-dump-snap
@@ -11,6 +11,13 @@
 PKG_SUGGESTED_OPTIONS+=        amanda-dump-snap
 .endif
 
+.if (${OPSYS} == "NetBSD" || \
+     ${OPSYS} == "FreeBSD" || \
+     ${OPSYS} == "DragonFly" || \
+     ${OPSYS} == "OpenBSD")
+PKG_SUGGESTED_OPTIONS+=        amanda-bsdtar
+.endif
+
 PKG_OPTIONS_LEGACY_VARS+=      AMANDA_FQDN:amanda-fqdn
 PKG_OPTIONS_LEGACY_VARS+=      AMANDA_SSH:amanda-ssh
 PKG_OPTIONS_LEGACY_VARS+=      AMANDA_SMB:amanda-smb
@@ -24,6 +31,12 @@
 CONFIGURE_ARGS+=       --without-ipv6
 .endif
 
+.if !empty(PKG_OPTIONS:Mamanda-bsdtar)
+CONFIGURE_ARGS+=        --with-bsdtar=/usr/bin/tar
+.else
+CONFIGURE_ARGS+=        --without-bsdtar
+.endif
+
 .if !empty(PKG_OPTIONS:Mamanda-fqdn)
 CONFIGURE_ARGS+=        --with-fqdn
 .endif
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/patches/patch-Makefile.am
--- a/sysutils/amanda-common/patches/patch-Makefile.am  Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/patches/patch-Makefile.am  Fri Nov 23 22:33:13 2018 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2018/11/23 22:33:13 spz Exp $
 
---- Makefile.am.orig   2012-02-21 11:36:51.000000000 +0000
+--- Makefile.am.orig   2016-02-09 22:52:51.000000000 +0000
 +++ Makefile.am
+@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.10 foreign
+ include $(top_srcdir)/config/automake/vars.am
+ include $(top_srcdir)/config/automake/installperms.am
+ 
+-ACLOCAL_AMFLAGS = --force -I config -I . -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive -I /usr/share/aclocal
++ACLOCAL_AMFLAGS = --force -I config -I . -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive 
+ 
+ if WANT_CLIENT
+ CLIENT_SUBDIRS = client-src application-src
 @@ -43,7 +43,7 @@ SUBDIRS = . \
        packaging \
        installcheck
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/patches/patch-application-src_Makefile.am
--- a/sysutils/amanda-common/patches/patch-application-src_Makefile.am  Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/patches/patch-application-src_Makefile.am  Fri Nov 23 22:33:13 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-application-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $
+$NetBSD: patch-application-src_Makefile.am,v 1.2 2018/11/23 22:33:13 spz Exp $
 
 Link with installed librarys from amanda-common.
 
---- application-src/Makefile.am.orig   2012-02-21 11:36:45.000000000 +0000
+--- application-src/Makefile.am.orig   2016-02-09 22:52:46.000000000 +0000
 +++ application-src/Makefile.am
 @@ -42,10 +42,10 @@ applicationdir = $(APPLICATION_DIR)
- applicationexec_PROGRAMS = amgtar amstar
+ applicationexec_PROGRAMS = ambsdtar amgtar amstar
  applicationexec_SCRIPTS = $(SCRIPTS_PERL)
  
 -LDADD = ../common-src/libamanda.la \
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/patches/patch-common-src_Makefile.in
--- a/sysutils/amanda-common/patches/patch-common-src_Makefile.in       Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/patches/patch-common-src_Makefile.in       Fri Nov 23 22:33:13 2018 +0000
@@ -1,12 +1,13 @@
-$NetBSD: patch-common-src_Makefile.in,v 1.1 2014/01/06 22:15:06 joerg Exp $
+$NetBSD: patch-common-src_Makefile.in,v 1.2 2018/11/23 22:33:13 spz Exp $
 
---- common-src/Makefile.in.orig        2014-01-05 23:13:17.000000000 +0000
+--- common-src/Makefile.in.orig        2016-02-09 22:53:07.000000000 +0000
 +++ common-src/Makefile.in
-@@ -1704,6 +1704,7 @@ genversion_SOURCES = genversion.c svn-in
+@@ -1969,6 +1969,8 @@ genversion_SOURCES = genversion.c svn-in
  genversion_LDADD = $(libamanda_la_LIBADD)     \
        ../gnulib/libgnu.la
  
 +genversion.la: genversion.h
- 
- # these are used for testing only:
- TEST_PROGS = file bsdsecurity
++
+ etcamandadir = ${CONFIG_DIR}
+ etcamanda_FILE = amanda-security.conf
+ etcamanda_DATA = ${etcamanda_FILE}
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/patches/patch-common-src_conffile.c
--- a/sysutils/amanda-common/patches/patch-common-src_conffile.c        Fri Nov 23 21:37:17 2018 +0000
+++ b/sysutils/amanda-common/patches/patch-common-src_conffile.c        Fri Nov 23 22:33:13 2018 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-common-src_conffile.c,v 1.1 2015/08/09 22:50:10 dholland Exp $
+$NetBSD: patch-common-src_conffile.c,v 1.2 2018/11/23 22:33:13 spz Exp $
 
 Update the defaults for a few things to use LOCALSTATEDIR (which will
 be $VARBASE/amanda) instead of compiling in /usr/adm, which no system
 has shipped in the last twenty years or so.  PR 38958.
 
---- common-src/conffile.c.orig 2012-02-21 11:36:51.000000000 +0000
+--- common-src/conffile.c.orig 2016-02-09 22:52:51.000000000 +0000
 +++ common-src/conffile.c
-@@ -35,6 +35,7 @@
+@@ -36,6 +36,7 @@
  #include "util.h"
  #include "conffile.h"
  #include "clock.h"
@@ -14,7 +14,7 @@
  #include <glib.h>
  
  /*
-@@ -5330,9 +5331,9 @@ init_defaults(
+@@ -5295,9 +5296,9 @@ init_defaults(
      conf_init_str   (&conf_data[CNF_LABELSTR]             , ".*");
      conf_init_str   (&conf_data[CNF_TAPELIST]             , "tapelist");
      conf_init_str   (&conf_data[CNF_DISKFILE]             , "disklist");
@@ -26,4 +26,4 @@
 +    conf_init_str   (&conf_data[CNF_INDEXDIR]             , LOCALSTATEDIR "/index");
      conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "DEFAULT_TAPE");
      conf_init_identlist(&conf_data[CNF_HOLDINGDISK]          , NULL);
-     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , 10);
+     conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , CONF_UNIT_NONE, 10);
diff -r 905a006218c9 -r 2a3c7b1273d1 sysutils/amanda-common/patches/patch-common-src_genversion.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000



Home | Main Index | Thread Index | Old Index