Fix static linkage and rpath, bug #332287, thank Diego Elio Pettenò for report.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 136 insertions, 2 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 5233e154b5fe..29093d257ef1 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/mrtg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.102 2010/11/09 14:16:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.103 2010/11/09 17:57:07 pva Exp $
+
+*mrtg-2.16.4-r1 (09 Nov 2010)
+
+  09 Nov 2010; Peter Volkov <pva@gentoo.org> +mrtg-2.16.4-r1.ebuild,
+  +files/mrtg-2.16.4-disable-static.patch,
+  +files/mrtg-2.16.4-no-rpath.patch:
+  Fix static linkage and rpath, bug #332287, thank Diego Elio Pettenò for
+  report.
 
   09 Nov 2010; Peter Volkov <pva@gentoo.org> mrtg-2.16.4.ebuild:
   Depend on >=dev-perl/Socket6-0.20 to avoid duplicate definitions, bug
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 934cc334d60a..046d3b131d34 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,9 +1,12 @@
+AUX mrtg-2.16.4-disable-static.patch 908 RMD160 847f1d61a77b35a3f62d0b416323052100f7081f SHA1 ec63fef69b993df0ae83f627f427283398e323c2 SHA256 d593a22d67da5e82c50a9c1f7da31917a8bbfeab85944606618ada2eea9c12ce
+AUX mrtg-2.16.4-no-rpath.patch 1163 RMD160 5b2ca85c66ed591386512d0dff41ca2cac507cef SHA1 c976852e7b6b0405e3c33ae4d76455a8ce9d4972 SHA256 08d13f0a659eb539432237c32b521d710664c3d9eef54e3da152acbfeb0b5a55
 AUX mrtg.confd 512 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 SHA1 b3248d27b94155f14240c9d4151c5a789cc152c1 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7
 AUX mrtg.rc 1388 RMD160 beb973376ed5f5f1022fdc3caa1fdc5393c18a4a SHA1 11f32fbcc911ae3200eed8a41184cea6e94f93cb SHA256 25aa80a6eac6b7ca09a577c1ff895d40a03c167892aa1f2dde39a5085b24c41a
 DIST mrtg-2.16.2.tar.gz 1078423 RMD160 2d60324f6c3bcd64fcd6b626ec6a36d4d3c92604 SHA1 44f336c79e1418b59f5a25cb5cc03a82f983fdea SHA256 ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385
 DIST mrtg-2.16.4.tar.gz 1089068 RMD160 9d7f2573fded09b16cd5b108271b9dd68d78bc18 SHA1 8d810487585c929bf48246311512f88077e10e55 SHA256 6d61fad616f6a73b2080a6ed295ec8d2a021a4e1110db42a2d35b9ad6d3037e6
 EBUILD mrtg-2.16.2-r1.ebuild 1057 RMD160 19e620ff1a041637046a61e2820f638350eb7f5b SHA1 06dd5def0b4d2c2797a0dcf091ab99c584d9642f SHA256 281eafba3e478b0b04ee894151ed613e282cd2946cf324e07d8407c6400e9ba3
 EBUILD mrtg-2.16.2.ebuild 946 RMD160 e5bce435f8cf90ab86cf9fb6209f6167621aaed6 SHA1 335e2cc2e9ef2e8ca93300cf365032bb651c7351 SHA256 d4e9d4bd111facb54d969d1dad2a3dbdf1c378789c1302b45567d9c7a30540bb
+EBUILD mrtg-2.16.4-r1.ebuild 1246 RMD160 2235a4e634f7a427434cbc9acf925fa79779c827 SHA1 f1a42495d0531e271ad3c629184bc599dccad1cb SHA256 e06f10431f8ec6cbb628db7c90e51f05f7d1300761f2d4d40ae637022aed46a9
 EBUILD mrtg-2.16.4.ebuild 1073 RMD160 0dac3e3271d463d26f7e1205879271708195d2e8 SHA1 fc505823cf96dede5ae695ed0fd23892f67e0b1a SHA256 a8540461d9e2c7fc22e890d8d189b3b48e92531061e6655df3b04825b34c616d
-MISC ChangeLog 12471 RMD160 9fb7b1ff4aa18d956f439914e3ae49696126191e SHA1 3f9b7d752aa414fff5642c98fc09c578735bc3d9 SHA256 de602da6847ae63c907faa213e6f38e59f725f518c1a519269b93828918c47b8
+MISC ChangeLog 12737 RMD160 0cbb14e8d9da244aed23feb321efc20ff0b5070f SHA1 1e6565761d0605f288e616eabc64ad4043ac633a SHA256 59951d148577cae5d2462d9c8942339de5bfa589f35bb59051308b5e4088316e
 MISC metadata.xml 221 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 SHA1 59ce39c64900516f7d583951daacb16fc01f0ea1 SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110
diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch
new file mode 100644
index 000000000000..af513a38c6e0
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch
@@ -0,0 +1,29 @@
+http://oss.oetiker.ch/mrtg-trac/ticket/97
+
+--- configure.in	2010-11-09 16:25:34 +0000
++++ configure.in	2010-11-09 16:35:39 +0000
+@@ -98,6 +98,8 @@
+ AC_ARG_WITH(png-inc,[  --with-png-inc=DIR      location of the libpng include files],
+ 		[CPPFLAGS="${CPPFLAGS} -I${withval}"])
+ 
++AC_ARG_ENABLE(static,[  --disable-static        avoid rateup static linkage with gd],
++		[AVOID_STATIC="${enableval}"],[AVOID_STATIC="no"])
+ 
+ LIBS="${LIBS} ${MATHLIBS}"
+ 
+@@ -127,9 +129,11 @@
+   CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif"
+ fi
+ 
+-AC_CHECK_LIB(gd,gdImageGd,[
+-   GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic"
+-        ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic])
++if test x$AVOID_STATIC = xyes; then
++  AC_CHECK_LIB(gd,gdImageGd,[
++    GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic"
++      ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic])
++fi
+ 
+ if test x$GDFORM_EXT = xpng; then
+   CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImagePng"
+
diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch
new file mode 100644
index 000000000000..1f634134269d
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch
@@ -0,0 +1,46 @@
+http://oss.oetiker.ch/mrtg-trac/ticket/98
+
+--- Makefile.in	2010-11-09 16:25:34 +0000
++++ Makefile.in	2010-11-09 17:13:17 +0000
+@@ -21,7 +21,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ GDFORM_EXT = @GDFORM_EXT@
+-LD_RUN_PATH = @LD_RUN_PATH@
++SET_LD_RUN_PATH = @SET_LD_RUN_PATH@
+ LIBS = @LIBS@
+ 
+ INSTALL = @INSTALL@
+@@ -30,7 +30,8 @@
+ all:	 bin/rateup subst
+ 
+ bin/rateup: bin/rateup.o
+-	LD_RUN_PATH=$(LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS)  $(LIBS) 
++	$(SET_LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS)  $(LIBS)
++
+ 
+ bin/rateup.o: $(top_srcdir)/src/rateup.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o
+
+--- configure.in	2010-11-09 17:11:20 +0000
++++ configure.in	2010-11-09 17:12:49 +0000
+@@ -141,6 +141,9 @@
+ 
+ LIBS="${GLIBS} ${LIBS}" 
+ 
++if test x$LD_RUN_PATH != x; then
++	SET_LD_RUN_PATH="LD_RUN_PATH=${LD_RUN_PATH}"
++fi
+ 
+ dnl Make sure the header is here
+ AC_CHECK_HEADER( gd.h,:,[ GDFORM_EXT="" ])
+@@ -198,7 +201,7 @@
+ AC_SUBST(PERL)
+ AC_SUBST(RRD_PERL)
+ AC_SUBST(GDFORM_EXT)
+-AC_SUBST(LD_RUN_PATH)
++AC_SUBST(SET_LD_RUN_PATH)
+ AC_SUBST(LIBS)
+ AC_SUBST(CFLAGS)
+ AC_CONFIG_HEADERS(config.h)
+
diff --git a/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild
new file mode 100644
index 000000000000..5b0ffe042bb7
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild,v 1.1 2010/11/09 17:57:07 pva Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="http://oss.oetiker.ch/mrtg/"
+SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/SNMP_Session
+	>=dev-perl/Socket6-0.20
+	>=media-libs/gd-1.8.4"
+
+src_prepare() {
+	epatch ${FILESDIR}/${P}-disable-static.patch
+	epatch ${FILESDIR}/${P}-no-rpath.patch
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	emake DESTDIR="${ED}" install || die "emake install failed"
+	mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
+
+	newinitd "${FILESDIR}/mrtg.rc" ${PN} || die
+	newconfd "${FILESDIR}/mrtg.confd" ${PN} || die
+}
+
+pkg_postinst(){
+	elog "You must configure mrtg before being able to run it. Try cfgmaker."
+	elog "The following thread may be useful:"
+	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
+}