summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-05-25 09:56:10 +0000
committerMike Frysinger <vapier@gentoo.org>2015-05-25 09:56:10 +0000
commit75a79d3ca9c2b1bfc675e84d85d86ef440dea20b (patch)
tree986e9645f111a1fe194b861fda28f6086d2517b9 /net-misc
parentVersion bump (diff)
downloadgentoo-2-75a79d3ca9c2b1bfc675e84d85d86ef440dea20b.tar.gz
gentoo-2-75a79d3ca9c2b1bfc675e84d85d86ef440dea20b.tar.bz2
gentoo-2-75a79d3ca9c2b1bfc675e84d85d86ef440dea20b.zip
Fix by Andrew Miller to use printf instead of echo -n #529992 by Diego Elio Pettenò.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/netkit-routed/ChangeLog9
-rw-r--r--net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch20
-rw-r--r--net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild13
3 files changed, 34 insertions, 8 deletions
diff --git a/net-misc/netkit-routed/ChangeLog b/net-misc/netkit-routed/ChangeLog
index 5a324a1f8fed..7217de475f9d 100644
--- a/net-misc/netkit-routed/ChangeLog
+++ b/net-misc/netkit-routed/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/netkit-routed
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/ChangeLog,v 1.22 2012/09/26 18:45:31 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/ChangeLog,v 1.23 2015/05/25 09:56:10 vapier Exp $
+
+ 25 May 2015; Mike Frysinger <vapier@gentoo.org>
+ +files/netkit-routed-0.17-printf.patch, netkit-routed-0.17-r4.ebuild:
+ Fix by Andrew Miller to use printf instead of echo -n #529992 by Diego Elio
+ Pettenò.
26 Sep 2012; Michael Palimaka <kensington@gentoo.org>
-netkit-routed-0.17-r3.ebuild:
diff --git a/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch b/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch
new file mode 100644
index 000000000000..16607a22b9b1
--- /dev/null
+++ b/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch
@@ -0,0 +1,20 @@
+echo -n isn't supported by all shells, use printf instead, which is portable.
+
+Patch by Andrew Miller.
+
+https://bugs.gentoo.org/529992
+
+--- a/configure
++++ b/configure
+@@ -235,10 +235,7 @@
+
+ echo 'Generating MCONFIG...'
+ (
+- echo -n '# Generated by configure (confgen version 2) on '
+- date
+- echo '#'
+- echo
++ printf "#\n# Generated by configure (confgen version 2) on $(date)\n#\n\n"
+
+ echo "SBINDIR=$SBINDIR"
+ echo "MANDIR=$MANDIR"
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild
index ded712750d97..7373021e7a23 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild,v 1.6 2012/07/12 15:55:28 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-routed/netkit-routed-0.17-r4.ebuild,v 1.7 2015/05/25 09:56:10 vapier Exp $
-EAPI="2"
+EAPI="5"
inherit eutils toolchain-funcs
@@ -16,8 +16,9 @@ KEYWORDS="alpha ~amd64 ~mips ppc sparc x86"
IUSE=""
src_prepare() {
- sed -i configure -e '/^LDFLAGS=/d' || die sed configure
+ sed -i configure -e '/^LDFLAGS=/d' || die
epatch "${FILESDIR}"/${P}-time.patch
+ epatch "${FILESDIR}"/${P}-printf.patch #529992
}
src_configure() {
@@ -27,11 +28,11 @@ src_configure() {
src_install() {
# ripquery
- dosbin ripquery/ripquery || die
+ dosbin ripquery/ripquery
doman ripquery/ripquery.8
# routed
- dosbin routed/routed || die
+ dosbin routed/routed
dosym routed /usr/sbin/in.routed
doman routed/routed.8
dosym routed.8 /usr/share/man/man8/in.routed.8