diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2006-12-13 04:33:05 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2006-12-13 04:33:05 +0000 |
| commit | 2c91971ae0042fde91df7df64ae255929e174441 (patch) | |
| tree | 967c340dc4d800857bdf9bb752902c502c0c2420 /app-backup | |
| parent | arm/ia64/s390/sh stable (diff) | |
| download | gentoo-2-2c91971ae0042fde91df7df64ae255929e174441.tar.gz gentoo-2-2c91971ae0042fde91df7df64ae255929e174441.tar.bz2 gentoo-2-2c91971ae0042fde91df7df64ae255929e174441.zip | |
Added tar 1.16 patch, added IUSE=minimal, both requested in bug #127725.
(Portage version: 2.1.2_rc3-r4)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/amanda/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-2.5.1_p2.ebuild | 11 | ||||
| -rw-r--r-- | app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch | 15 |
3 files changed, 29 insertions, 3 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog index 9871f3d60025..53e20836b054 100644 --- a/app-backup/amanda/ChangeLog +++ b/app-backup/amanda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/amanda # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.16 2006/12/12 15:59:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.17 2006/12/13 04:33:05 jer Exp $ + + 13 Dec 2006; Jeroen Roovers <jer@gentoo.org> + +files/amanda-2.5.1_p2-tar-1.16.patch, amanda-2.5.1_p2.ebuild: + Added tar 1.16 patch, added IUSE=minimal, both requested in bug #127725. *amanda-2.5.1_p2 (12 Dec 2006) diff --git a/app-backup/amanda/amanda-2.5.1_p2.ebuild b/app-backup/amanda/amanda-2.5.1_p2.ebuild index 321f86edc77c..7c1e607a04a0 100644 --- a/app-backup/amanda/amanda-2.5.1_p2.ebuild +++ b/app-backup/amanda/amanda-2.5.1_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.1_p2.ebuild,v 1.1 2006/12/12 15:59:08 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.1_p2.ebuild,v 1.2 2006/12/13 04:33:05 jer Exp $ inherit eutils @@ -32,7 +32,7 @@ DEPEND="${RDEPEND} sys-devel/autoconf sys-devel/automake" -IUSE="berkdb debug gdbm samba xfs" +IUSE="berkdb debug gdbm minimal samba xfs" S="${WORKDIR}/${P/_/}" MYFILESDIR="${WORKDIR}/files" @@ -109,6 +109,10 @@ src_unpack() { unpack "${A}" # Fix glitch with recognizing tar-1.14.90 EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch" + # Fix tar 1.16 changes + # ( http://cvs.savannah.gnu.org/viewcvs/tar/NEWS?rev=1.125&root=tar ) + EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-tar-1.16.patch || die "Failed to add tar 1.16 patch" + # now the real fun amanda_variable_setup # places for us to work in @@ -176,6 +180,9 @@ src_compile() { # Force the correct TAR myconf="${myconf} --with-gnutar=/bin/tar" + # Client only, as requested in bug #127725 + use minimal && myconf="${myconf} --without-server" + econf ${myconf} || die "econf failed!" emake -j1 || die "emake failed!" diff --git a/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch b/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch new file mode 100644 index 000000000000..5d77aad9ffdf --- /dev/null +++ b/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch @@ -0,0 +1,15 @@ +--- client-src/sendbackup.c. 2006-07-25 20:27:56.000000000 +0200 ++++ client-src/sendbackup.c 2006-12-13 03:31:03.000000000 +0100 +@@ -597,6 +597,12 @@ + } + #endif + ++ if(pid == tarpid) { ++ if(ret == 1) { ++ rc = 0; ++ } ++ } ++ + #ifdef IGNORE_TAR_ERRORS + if(pid == tarpid) { + /* |