robbat2     14/06/23 15:49:43

  Modified:             amanda-3.3.3.ebuild amanda-3.3.3-r1.ebuild
                        ChangeLog
  Added:                amanda-3.3.5.ebuild
  Log:
  Bump per bug #510936. Drop virtual/inetd dep per bug #506028.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.11                 app-backup/amanda/amanda-3.3.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild?r1=1.10&r2=1.11

Index: amanda-3.3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -p -w -b -B -u -u -r1.10 -r1.11
--- amanda-3.3.3.ebuild 21 May 2014 12:07:27 -0000      1.10
+++ amanda-3.3.3.ebuild 23 Jun 2014 15:49:43 -0000      1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 
1.10 2014/05/21 12:07:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 
1.11 2014/06/23 15:49:43 robbat2 Exp $
 
 EAPI=5
 inherit autotools eutils perl-module user systemd
@@ -25,7 +25,6 @@ RDEPEND="sys-libs/readline
        kerberos? ( app-crypt/mit-krb5 )
        xfs? ( sys-fs/xfsdump )
        readline? ( sys-libs/readline )
-       !systemd? ( virtual/inetd )
        !minimal? (
                dev-perl/XML-Simple
                virtual/mailx
@@ -447,6 +446,11 @@ pkg_postinst() {
        elog "If you use localhost in your disklist your restores may break."
        elog "You should replace it with the actual hostname!"
        elog "Please also see the syntax changes to amandahosts."
+       elog
+       elog "Please note that this package no longer explicitly depends on"
+       elog "virtual/inetd, as it supports modes where an inetd is not needed"
+       elog "(see bug #506028 for details)."
+
 }
 
 # We have had reports of amanda file permissions getting screwed up.



1.8                  app-backup/amanda/amanda-3.3.3-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild?r1=1.7&r2=1.8

Index: amanda-3.3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -p -w -b -B -u -u -r1.7 -r1.8
--- amanda-3.3.3-r1.ebuild      21 May 2014 12:07:27 -0000      1.7
+++ amanda-3.3.3-r1.ebuild      23 Jun 2014 15:49:43 -0000      1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 
1.7 2014/05/21 12:07:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 
1.8 2014/06/23 15:49:43 robbat2 Exp $
 
 EAPI=5
 inherit autotools eutils perl-module user systemd
@@ -25,7 +25,6 @@ RDEPEND="sys-libs/readline
        kerberos? ( app-crypt/mit-krb5 )
        xfs? ( sys-fs/xfsdump )
        readline? ( sys-libs/readline )
-       !systemd? ( virtual/inetd )
        !minimal? (
                dev-perl/XML-Simple
                virtual/mailx
@@ -450,6 +449,11 @@ pkg_postinst() {
        elog "If you use localhost in your disklist your restores may break."
        elog "You should replace it with the actual hostname!"
        elog "Please also see the syntax changes to amandahosts."
+       elog
+       elog "Please note that this package no longer explicitly depends on"
+       elog "virtual/inetd, as it supports modes where an inetd is not needed"
+       elog "(see bug #506028 for details)."
+
 }
 
 # We have had reports of amanda file permissions getting screwed up.



1.112                app-backup/amanda/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.112&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.112&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.111&r2=1.112

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -p -w -b -B -u -u -r1.111 -r1.112
--- ChangeLog   21 May 2014 12:07:27 -0000      1.111
+++ ChangeLog   23 Jun 2014 15:49:43 -0000      1.112
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/amanda
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.111 
2014/05/21 12:07:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.112 
2014/06/23 15:49:43 robbat2 Exp $
+
+*amanda-3.3.5 (23 Jun 2014)
+
+  23 Jun 2014; Robin H. Johnson <[email protected]> +amanda-3.3.5.ebuild,
+  amanda-3.3.3-r1.ebuild, amanda-3.3.3.ebuild:
+  Bump per bug #510936. Drop virtual/inetd dep per bug #506028.
 
   21 May 2014; Sergey Popov <[email protected]> amanda-3.3.3.ebuild,
   amanda-3.3.3-r1.ebuild:



1.1                  app-backup/amanda/amanda-3.3.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/amanda/amanda-3.3.5.ebuild?rev=1.1&content-type=text/plain

Index: amanda-3.3.5.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.5.ebuild,v 1.1 
2014/06/23 15:49:43 robbat2 Exp $

EAPI=5
inherit autotools eutils perl-module user systemd

DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/";
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
        virtual/awk
        app-arch/tar
        >=dev-lang/perl-5.6
        app-arch/dump
        net-misc/openssh
        >=dev-libs/glib-2.26.0
        nls? ( virtual/libintl )
        s3? ( >=net-misc/curl-7.10.0 )
        !s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
        samba? ( net-fs/samba )
        kerberos? ( app-crypt/mit-krb5 )
        xfs? ( sys-fs/xfsdump )
        readline? ( sys-libs/readline )
        !minimal? (
                dev-perl/XML-Simple
                virtual/mailx
                app-arch/mt-st
                sys-block/mtx
                gnuplot? ( sci-visualization/gnuplot )
                app-crypt/aespipe
                app-crypt/gnupg
        )"

DEPEND="${RDEPEND}
        virtual/pkgconfig
        nls? ( sys-devel/gettext )
        >=app-text/docbook-xsl-stylesheets-1.72.0
        app-text/docbook-xml-dtd
        dev-libs/libxslt
        "

IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"

MYFILESDIR="${T}/files"
ENVDIR="/etc/env.d"
ENVDFILE="97amanda"
TMPENVFILE="${T}/${ENVDFILE}"

# This is a complete list of Amanda settings that the ebuild takes from the
# build environment. This allows users to alter the behavior of the package as
# upstream intended, but keeping with Gentoo style. We store a copy of them in
# /etc/env.d/97amanda during the install, so that they are preserved for future
# installed. This variable name must not start with AMANDA_, as we do not want
# it captured into the env file.
ENV_SETTINGS_AMANDA="
AMANDA_GROUP_GID AMANDA_GROUP_NAME
AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR 
AMANDA_USER_GROUPS
AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
AMANDA_TAR_LISTDIR AMANDA_TAR
AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"

amanda_variable_setup() {

        # Setting vars
        local currentamanda

        # Grab the current settings
        currentamanda="$(set | egrep "^AMANDA_" | grep -v 
'^AMANDA_ENV_SETTINGS' | xargs)"

        # First we set the defaults
        [ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
        [ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
        [ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
        [ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
        [ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
        [ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
        [ -z "${AMANDA_USER_GROUPS}" ] && 
AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"

        # This installs Amanda, with the server. However, it could be a client,
        # just specify an alternate server name in AMANDA_SERVER.
        [ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
        [ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
        [ -z "${AMANDA_SERVER_INDEX}" ] && 
AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
        [ -z "${AMANDA_TAR_LISTDIR}" ] && 
AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
        [ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
        [ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
        [ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
        # These are left empty by default
        [ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
        [ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
        [ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
        [ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=

        # What tar to use
        [ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar

        # Now pull in the old stuff
        if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
                # We don't just source it as we don't want everything in there.
                eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep 
-v '^AMANDA_ENV_SETTINGS')
        fi

        # Re-apply the new settings if any
        [ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`

}

pkg_setup() {
        amanda_variable_setup

        # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
        # another host than HOSTNAME.
        if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
                elog "You are installing a client-only version of Amanda."
                elog "You should set the variable \$AMANDA_SERVER to point at 
your"
                elog "Amanda-tape-server, otherwise you will have to specify 
its name"
                elog "when using amrecover on the client."
                elog "For example: Use something like"
                elog "AMANDA_SERVER=\"myserver\" emerge amanda"
                elog
        fi

        enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
        enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" 
"${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
}

src_unpack() {
        # we do not want the perl src_unpack
        default_src_unpack
}

src_prepare() {

        # gentoo bug #331111
        sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
        sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am

        # bug with glibc-2.16.0
        sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h

        eautoreconf

        # places for us to work in
        mkdir -p "${MYFILESDIR}"
        # Now we store the settings we just created
        set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > 
"${TMPENVFILE}"

        # Prepare our custom files
        einfo "Building custom configuration files"
        local i # our iterator
        local sedexpr # var for sed expr
        sedexpr=''
        for i in ${ENV_SETTINGS_AMANDA} ; do
                local val
                eval "val=\"\${${i}}\""
                sedexpr="${sedexpr}s|__${i}__|${val}|g;"
        done

        # now apply the sed expr
        for i in "${FILESDIR}"/amanda-* ; do
                sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
        done

        (
                cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
                use minimal || cat 
"${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
        ) > "${T}"/amandahosts

        if ! use minimal; then
                sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
                        server-src/am{addclient,serverconfig}.pl || die
        fi
}

src_configure() {
        # fix bug #36316
        addpredict /var/cache/samba/gencache.tdb
        # fix bug #376169
        addpredict /run/blkid
        addpredict /etc/blkid.tab

        [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) 
should exist!"
        source "${TMPENVFILE}"
        local myconf

        einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
        myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
        einfo "Using ${AMANDA_SERVER_INDEX} for index server."
        myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
        einfo "Using ${AMANDA_USER_NAME} for amanda user."
        myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
        einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
        myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
        einfo "Using ${AMANDA_TAR} as Tar implementation."
        myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
        einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
        myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
        einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
        myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
        einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
        myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"

        if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z 
"${AMANDA_PORTS_BOTH}" ] ; then
                eerror "If you want _both_ UDP and TCP ports, please use only 
the"
                eerror "AMANDA_PORTS environment variable for identical ports, 
or set"
                eerror "AMANDA_PORTS_BOTH."
                die "Bad port setup!"
        fi
        if [ -n "${AMANDA_PORTS_UDP}" ]; then
                einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
                myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
        fi
        if [ -n "${AMANDA_PORTS_TCP}" ]; then
                einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
                myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
        fi
        if [ -n "${AMANDA_PORTS}" ]; then
                einfo "Using ports ${AMANDA_PORTS/,/-}"
                myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
        fi

        # Extras
        # Speed option
        myconf="${myconf} --with-buffered-dump"
        # "debugging" in the configuration is NOT debug in the conventional 
sense.
        # It is actually just useful output in the application, and should 
remain
        # enabled. There are some cases of breakage with MTX tape changers as of
        # 2.5.1p2 that it exposes when turned off as well.
        myconf="${myconf} --with-debugging"
        # Where to put our files
        myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"

        # Samba support
        myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"

        # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in 
by
        # default
        myconf="${myconf} --with-bsd-security"
        myconf="${myconf} --with-ssh-security"
        myconf="${myconf} --with-bsdudp-security"
        myconf="${myconf} --with-bsdtcp-security"

        # kerberos-security mechanism version 5
        myconf="${myconf} `use_with kerberos krb5-security`"

        # Amazon S3 support
        myconf="${myconf} `use_enable s3 s3-device`"

        # libcurl is required for S3 but otherwise optional
        if ! use s3; then
                myconf="${myconf} $(use_with curl libcurl)"
        fi

        # Client only, as requested in bug #127725
        if use minimal ; then
                myconf="${myconf} --without-server"
        else
                # amplot
                myconf="${myconf} $(use_with gnuplot)"
        fi

        # IPv6 fun.
        myconf="${myconf} `use_with ipv6`"
        # This is to prevent the IPv6-is-working test
        # As the test fails on binpkg build hosts with no IPv6.
        use ipv6 && export amanda_cv_working_ipv6=yes

        # I18N
        myconf="${myconf} `use_enable nls`"

        # Bug #296634: Perl location
        perlinfo
        myconf="${myconf} --with-amperldir=${VENDOR_LIB}"

        # Bug 296633: --disable-syntax-checks
        # Some tests are not safe for production systems
        myconf="${myconf} --disable-syntax-checks"

        # build manpages
        myconf="${myconf} --enable-manpage-build"

        # bug #483120
        tc-export AR

        econf \
                $(use_with readline) \
                ${myconf}
}

src_compile() {
        # Again, do not want the perl-module src_compile
        default_src_compile
}

src_install() {
        [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) 
should exist!"
        source ${TMPENVFILE}

        einfo "Doing stock install"
        emake DESTDIR="${D}" install || die

        # Build the envdir file
        # Don't forget this..
        einfo "Building environment file"
        (
                echo "# These settings are what was present in the environment 
when this"
                echo "# Amanda was compiled.  Changing anything below this 
comment will"
                echo "# have no effect on your application, but it merely 
exists to"
                echo "# preserve them for your next emerge of Amanda"
                cat "${TMPENVFILE}" | sed "s,=\$,='',g"
        ) >> "${MYFILESDIR}/${ENVDFILE}"

        # Env.d
        einfo "Installing environment config file"
        doenvd "${MYFILESDIR}/${ENVDFILE}"

        # Lock down next section (up until docs).
        insopts -m0640
        # Installing Amanda Xinetd Services Definition
        einfo "Installing xinetd service file"
        insinto /etc/xinetd.d
        if use minimal ; then
                newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
        else
                newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
        fi

        if ! use minimal; then
                einfo "Installing Sample Daily Cron Job for Amanda"
                insinto /etc/cron.daily
                newins "${MYFILESDIR}/amanda-cron" amanda
        fi

        einfo "Installing systemd service and socket files for Amanda"
        systemd_dounit "${FILESDIR}"/amanda.socket || die
        systemd_newunit "${FILESDIR}"/amanda.service-r1 '[email protected]' || die

        insinto /etc/amanda
        einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
        doins "${T}/amandahosts"
        fperms 600 /etc/amanda/amandahosts

        dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
        insinto "${AMANDA_USER_HOMEDIR}"
        einfo "Installing .profile for ${AMANDA_USER_NAME} user"
        newins "${MYFILESDIR}/amanda-profile" .profile

        insinto /etc/amanda
        doins "${S}/example/amanda-client.conf"
        if ! use minimal ; then
                insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
                doins "${S}/example/amanda.conf"
                doins "${S}/example/disklist"
                keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
        fi

        keepdir "${AMANDA_TAR_LISTDIR}"
        keepdir "${AMANDA_USER_HOMEDIR}/amanda"
        keepdir "${AMANDA_TMPDIR}/dumps"
        # Just make sure it exists for XFS to work...
        use xfs && keepdir /var/xfsdump/inventory

        local i
        for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
                "${AMANDA_TMPDIR}" /etc/amanda; do
                einfo "Securing directory (${i})"
                fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
        done
        # Do NOT use -R
        fperms 0700 \
                "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
                "${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
                 "${AMANDA_USER_HOMEDIR}/amanda" \
                 /etc/amanda

        if ! use minimal ; then
                fperms 0700 \
                         "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
                 /etc/amanda/${AMANDA_CONFIG_NAME}
        fi

        einfo "Setting setuid permissions"
        amanda_permissions_fix "${D}"

        # Relax permissions again
        insopts -m0644

        # docs
        einfo "Installing documentation"
        dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
        # our inetd sample
        einfo "Installing standard inetd sample"
        newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" 
amanda-inetd.amanda.sample
        # Amanda example configs
        einfo "Installing example configurations"
        rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
        mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
        docinto example1
        newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
        newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
        newdoc "${FILESDIR}/example_global.conf" global.conf

        einfo "Cleaning up dud .la files"
        perlinfo
        find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
}

pkg_postinst() {
        [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
                TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
        [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) 
should exist!"
        source "${TMPENVFILE}"

        # Migration of amandates from /etc to $localstatedir/amanda
        if [ -f "${ROOT}/etc/amandates" -a \
                ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
                einfo "Migrating amandates from /etc/ to 
${AMANDA_USER_HOMEDIR}/amanda"
                einfo "A backup is also placed at /etc/amandates.orig"
                cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
                mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
                cp -dp "${ROOT}/etc/amandates" 
"${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
        fi
        if [ -f "${ROOT}/etc/amandates" ]; then
                einfo "If you have migrated safely, please delete 
/etc/amandates"
        fi

        einfo "Checking setuid permissions"
        amanda_permissions_fix "${ROOT}"

        elog "You should configure Amanda in /etc/amanda now."
        elog
        elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
        elog "and restart xinetd afterwards!"
        elog
        elog "Otherwise, please look at 
/usr/share/doc/${PF}/inetd.amanda.sample"
        elog "as an example of how to configure your inetd."
        elog
        elog "NOTICE: If you need raw access to partitions you need to add the"
        elog "amanda user to the 'disk' group."
        elog
        elog "NOTICE: If you have a tape changer, you need to add the amanda 
user"
        elog "to the 'tape' group."
        elog
        elog "If you use localhost in your disklist your restores may break."
        elog "You should replace it with the actual hostname!"
        elog "Please also see the syntax changes to amandahosts."
        elog
        elog "Please note that this package no longer explicitly depends on"
        elog "virtual/inetd, as it supports modes where an inetd is not needed"
        elog "(see bug #506028 for details)."

}

# We have had reports of amanda file permissions getting screwed up.
# Losing setuid, becoming too lax etc.
# ONLY root and users in the amanda group should be able to run these binaries!
amanda_permissions_fix() {
        local root="$1"
        [ -z "${root}" ] && die "Failed to pass root argument to 
amanda_permissions_fix!"
        local le="/usr/libexec/amanda"
        for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
                "${le}"/rundump "${le}"/runtar "${le}"/dumper \
                "${le}"/planner ; do
                chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
                chmod u=srwx,g=rx,o= "${root}"/${i}
        done
}




Reply via email to