added patch to include gcrypt libraries to solve bug #141021.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 50 insertions, 12 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 082e13f1d236..ecf6080142bd 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.10 2006/07/19 15:33:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.11 2006/07/19 21:49:25 dragonheart Exp $
+
+  19 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/wireshark-0.99.2-libgcrypt-asneeded.patch, wireshark-0.99.2.ebuild:
+  added patch to include gcrypt libraries to solve bug #141021. Thanks to
+  Alberto Ornaghi for the bug report
 
   19 Jul 2006; Simon Stelling <blubb@gentoo.org> wireshark-0.99.2.ebuild:
   stable wrt bug 140856
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4a5fd366e2c6..ee0b0eb27bf3 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,16 +1,30 @@
-DIST wireshark-0.99.2.tar.gz 12358081 RMD160 c3ea4c0b104326b493aadf02d32b317de0741315 SHA256 ef2f857fd8d1001890b86834dc3275214f7717fa6948c27829f6575d9b8023bf size 12358081
-EBUILD wireshark-0.99.2.ebuild 3876 RMD160 680c0f96f771a25d630fce4e349c6d89b17f5607 SHA1 10cc9afd699e9012ffcfd9f5146b206bdbabba0e SHA256 0e974dc27c4f063e7e4f37e5d0f19bfb65268178fa2b128dc83fea1af0f5db7c size 3876
-MD5 10e1145156ad89418157b9518ba6ede1 wireshark-0.99.2.ebuild 3876
-RMD160 680c0f96f771a25d630fce4e349c6d89b17f5607 wireshark-0.99.2.ebuild 3876
-SHA256 0e974dc27c4f063e7e4f37e5d0f19bfb65268178fa2b128dc83fea1af0f5db7c wireshark-0.99.2.ebuild 3876
-MISC ChangeLog 1669 RMD160 4b8890b1b54c320770e6e174e04148e099b0f2e8 SHA1 08d3b92a6b13b8bb94d9a9d58ee40467b74bdf7f SHA256 ea478d02bc34e10f5df0894069e954085a120ba7b1f2e638ced29a2414a7c0ce size 1669
-MD5 e1f6b8376407733d8fa09eaaf8eb416c ChangeLog 1669
-RMD160 4b8890b1b54c320770e6e174e04148e099b0f2e8 ChangeLog 1669
-SHA256 ea478d02bc34e10f5df0894069e954085a120ba7b1f2e638ced29a2414a7c0ce ChangeLog 1669
-MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 size 241
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wireshark-0.99.2-libgcrypt-asneeded.patch 929 RMD160 06adf09d918fcd84e3e303bfd76deec1e4c859ff SHA1 f5e1e1e33e08392aacc8580c9dbe9c3b98259e70 SHA256 28a46207aaa1dc9a7a50e4db59e912f127ba7ef7dd4c6cc282ea4ffe3bc439e4
+MD5 f5f53335313638ea0bc8c0565f3e3410 files/wireshark-0.99.2-libgcrypt-asneeded.patch 929
+RMD160 06adf09d918fcd84e3e303bfd76deec1e4c859ff files/wireshark-0.99.2-libgcrypt-asneeded.patch 929
+SHA256 28a46207aaa1dc9a7a50e4db59e912f127ba7ef7dd4c6cc282ea4ffe3bc439e4 files/wireshark-0.99.2-libgcrypt-asneeded.patch 929
+DIST wireshark-0.99.2.tar.gz 12358081 RMD160 c3ea4c0b104326b493aadf02d32b317de0741315 SHA1 bf7fce12b521d297d03935883193a43dc7c89c89 SHA256 ef2f857fd8d1001890b86834dc3275214f7717fa6948c27829f6575d9b8023bf
+EBUILD wireshark-0.99.2.ebuild 4036 RMD160 e6a3e182c855e9825fb6251a5c50904651cdd1a8 SHA1 ccc97e425647ba9ca2bba9b7c987952cc501c06d SHA256 5fd1dce8dbd7c3ecb16440a1158c1dd0aa2d9e4e1a6ad995b1dd6a32a3153159
+MD5 890af05bf6dd7b59d9b1eb36cb6b3e4a wireshark-0.99.2.ebuild 4036
+RMD160 e6a3e182c855e9825fb6251a5c50904651cdd1a8 wireshark-0.99.2.ebuild 4036
+SHA256 5fd1dce8dbd7c3ecb16440a1158c1dd0aa2d9e4e1a6ad995b1dd6a32a3153159 wireshark-0.99.2.ebuild 4036
+MISC ChangeLog 1917 RMD160 d5ff1d18ca2498ae48c2178e70f3dd978f4984f4 SHA1 742139084cab0e31d0e1008bb0a31bcfba570d69 SHA256 b7323328155f6e164cd8a7d5003dc6ad061cb7b869cb3ad54c2ce9ab7dd8c367
+MD5 4060fabc9bdda479260f850ad6ba66a4 ChangeLog 1917
+RMD160 d5ff1d18ca2498ae48c2178e70f3dd978f4984f4 ChangeLog 1917
+SHA256 b7323328155f6e164cd8a7d5003dc6ad061cb7b869cb3ad54c2ce9ab7dd8c367 ChangeLog 1917
+MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02 metadata.xml 241
 MD5 c832422b7fac51e019c10c58f316c9b6 files/digest-wireshark-0.99.2 256
 RMD160 082e9a1e64bdcf57d705ae286bd44accf07ae913 files/digest-wireshark-0.99.2 256
 SHA256 b98a04fe26db29233db26717378fe1258b82b5064dc58dd40df12ee3c028b2fd files/digest-wireshark-0.99.2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEvqqnmdTrptrqvGERAu4GAJwNcklInyhg3sLeNZ8QtH0nJ1TlawCeLlal
+UBmJlI/XqN/wsX4jlhAVoCg=
+=jrhQ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.2-libgcrypt-asneeded.patch b/net-analyzer/wireshark/files/wireshark-0.99.2-libgcrypt-asneeded.patch
new file mode 100644
index 000000000000..04d4fad075c4
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.2-libgcrypt-asneeded.patch
@@ -0,0 +1,11 @@
+--- wireshark-0.99.2/epan/Makefile.am.orig	2006-07-20 07:08:41.000000000 +1000
++++ wireshark-0.99.2/epan/Makefile.am	2006-07-20 07:17:00.000000000 +1000
+@@ -84,7 +84,7 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_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
++libwireshark_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@ @LIBGCRYPT_LIBS@ -lm
+ libwireshark_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
diff --git a/net-analyzer/wireshark/wireshark-0.99.2.ebuild b/net-analyzer/wireshark/wireshark-0.99.2.ebuild
index d5b11cc3ce63..9291227b5dc4 100644
--- a/net-analyzer/wireshark/wireshark-0.99.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.2.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/wireshark/wireshark-0.99.2.ebuild,v 1.5 2006/07/19 15:33:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-0.99.2.ebuild,v 1.6 2006/07/19 21:49:25 dragonheart Exp $
 
 inherit libtool flag-o-matic eutils autotools libtool
 
@@ -50,6 +50,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-libgcrypt-asneeded.patch
+	cd "${S}"
+	AT_M4DIR="${S}/aclocal-fallback" eautoreconf
+	#elibtoolize
+}
+
 src_compile() {
 	replace-flags -O? -O