summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2006-04-26 02:53:14 +0000
committerDaniel Black <dragonheart@gentoo.org>2006-04-26 02:53:14 +0000
commit6902e40d30b3765a0b16a48f1456f3ab56492c3f (patch)
tree23c85dc3a32c23117644540a38478fce1fb91f9d /net-analyzer/ethereal
parentversion bump as per bug #126379. Includes 6 updates from freepops web pages. (diff)
downloadgentoo-2-6902e40d30b3765a0b16a48f1456f3ab56492c3f.tar.gz
gentoo-2-6902e40d30b3765a0b16a48f1456f3ab56492c3f.tar.bz2
gentoo-2-6902e40d30b3765a0b16a48f1456f3ab56492c3f.zip
as-needed.patch to include other libs. bug #131252 thanks to Mike and Hanno
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'net-analyzer/ethereal')
-rw-r--r--net-analyzer/ethereal/ChangeLog6
-rw-r--r--net-analyzer/ethereal/ethereal-0.99.0.ebuild7
-rw-r--r--net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch12
3 files changed, 20 insertions, 5 deletions
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 1dc7d73eb2dc..9e091fb96b17 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/ethereal
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.174 2006/04/26 02:16:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.175 2006/04/26 02:53:14 dragonheart Exp $
+
+ 26 Apr 2006; Daniel Black <dragonheart@gentoo.org>
+ +files/ethereal-0.99.0-as-needed.patch, ethereal-0.99.0.ebuild:
+ as-needed.patch to include other libs. bug #131252 thanks to Mike and Hanno
26 Apr 2006; Jason Wever <weeve@gentoo.org> ethereal-0.99.0.ebuild:
Stable on SPARC wrt security bug #130505.
diff --git a/net-analyzer/ethereal/ethereal-0.99.0.ebuild b/net-analyzer/ethereal/ethereal-0.99.0.ebuild
index 0d395c437155..373e909d8069 100644
--- a/net-analyzer/ethereal/ethereal-0.99.0.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.99.0.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/net-analyzer/ethereal/ethereal-0.99.0.ebuild,v 1.3 2006/04/26 02:16:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.99.0.ebuild,v 1.4 2006/04/26 02:53:14 dragonheart Exp $
inherit libtool flag-o-matic eutils autotools libtool
@@ -49,10 +49,9 @@ pkg_setup() {
src_unpack() {
unpack ${A}
- cd "${S}"
# bug 117716
- epatch "${FILESDIR}/${PN}-0.10.14-asneeded.patch"
-
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+ cd "${S}"
AT_M4DIR="${S}/aclocal-fallback" eautomake
elibtoolize
}
diff --git a/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch b/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch
new file mode 100644
index 000000000000..4adc90485f50
--- /dev/null
+++ b/net-analyzer/ethereal/files/ethereal-0.99.0-as-needed.patch
@@ -0,0 +1,12 @@
+diff -uNr ethereal-0.99.0.orig/epan/Makefile.am ethereal-0.99.0/epan/Makefile.am
+--- ethereal-0.99.0.orig/epan/Makefile.am 2006-04-17 14:46:53.000000000 +0000
++++ ethereal-0.99.0/epan/Makefile.am 2006-04-25 21:21:15.000000000 +0000
+@@ -84,7 +84,7 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
++libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+ libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+
+ tvbtest: tvbtest.o tvbuff.o except.o strutil.o