diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-11-26 01:51:58 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-11-26 01:51:58 +0000 |
| commit | 8838f5b2b04316ed6a7ab28d5b69c3933048b54d (patch) | |
| tree | b10ab77bf1931c6e84f1864bb0860ab8923c10e5 /app-backup | |
| parent | Punt old (diff) | |
| download | gentoo-2-8838f5b2b04316ed6a7ab28d5b69c3933048b54d.tar.gz gentoo-2-8838f5b2b04316ed6a7ab28d5b69c3933048b54d.tar.bz2 gentoo-2-8838f5b2b04316ed6a7ab28d5b69c3933048b54d.zip | |
Bug #248838, avoid a too-generic binary named dump in /usr/bin.
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc2-00338-g65fc716 x86_64)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/amanda/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-2.6.0_p2-r4.ebuild | 7 | ||||
| -rw-r--r-- | app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch | 19 |
3 files changed, 30 insertions, 2 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog index e03341d263fe..bcae36802aff 100644 --- a/app-backup/amanda/ChangeLog +++ b/app-backup/amanda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/amanda # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.47 2008/11/19 02:13:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.48 2008/11/26 01:51:57 robbat2 Exp $ + + 26 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/amanda-2.6.0_p2-syslocpath.patch, amanda-2.6.0_p2-r4.ebuild: + Bug #248838, avoid a too-generic binary named dump in /usr/bin. *amanda-2.6.0_p2-r4 (19 Nov 2008) diff --git a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild index e1ecf15deed9..8092028d7777 100644 --- a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild +++ b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.1 2008/11/19 02:13:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.2 2008/11/26 01:51:57 robbat2 Exp $ inherit autotools eutils @@ -143,6 +143,11 @@ src_unpack() { "${FILESDIR}"/${PN}-2.6.0p2-amcrypt-ossl-asym-race-fix.patch \ || die "Failed to apply race fix for encryption" + # gentoo bug 248838, check /sbin stuff before /bin + EPATCH_OPTS="-d ${S} -p1" epatch \ + "${FILESDIR}"/amanda-2.6.0_p2-syslocpath.patch \ + || die "Failed to fix sysloc path bug" + cd "${S}" epatch "${FILESDIR}"/s3-list-keys.diff cd "${S}"/device-src diff --git a/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch b/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch new file mode 100644 index 000000000000..ecd3fd190626 --- /dev/null +++ b/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch @@ -0,0 +1,19 @@ +We should check /sbin and /usr/sbin earlier in the configure process. +If there is a binary named 'dump' that is not a filesystem dump command (which +is normally found in /usr/sbin) that occurs in the /usr/bin, then configure can +hang. + +Gentoo-bug: 248838 +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> +diff -Nuar --exclude '*~' amanda-2.6.0p2.orig/config/amanda/progs.m4 amanda-2.6.0p2/config/amanda/progs.m4 +--- amanda-2.6.0p2.orig/config/amanda/progs.m4 2008-02-15 13:35:57.000000000 -0800 ++++ amanda-2.6.0p2/config/amanda/progs.m4 2008-11-25 17:46:56.879917150 -0800 +@@ -24,7 +24,7 @@ + # + AC_DEFUN([AMANDA_INIT_PROGS], + [ +- SYSPATH="/bin:/usr/bin:/sbin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc" ++ SYSPATH="/sbin:/bin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc" + # expand prefix or exec_prefix in LOCPATH + LOCPATH=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix |