Missed patches added, bug 202866 reported by <kroemmelbein AT gmx.de>

Package-Manager: portage-2.1.3.19

4 files changed, 38 insertions, 5 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 9f4d14477272..1a0718e60278 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.69 2007/12/20 14:19:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.70 2007/12/20 17:49:23 pva Exp $
+
+  20 Dec 2007; <pva@gentoo.org> +files/wireshark-0.99.7-asneeded.patch,
+  +files/wireshark-0.99.7-libgcrypt.patch:
+  Missed patches added, bug 202866 reported by <kroemmelbein AT gmx.de>
 
 *wireshark-0.99.7 (20 Dec 2007)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 81cd0903384f..669fcf83bcae 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -18,6 +18,14 @@ AUX wireshark-0.99.6-lm.patch 1010 RMD160 80caa547e0ea4f8a84f42d349961d0684a47a6
 MD5 dd59d3fe8563f26a2f41eece4df07494 files/wireshark-0.99.6-lm.patch 1010
 RMD160 80caa547e0ea4f8a84f42d349961d0684a47a692 files/wireshark-0.99.6-lm.patch 1010
 SHA256 0dfe8eb230a6cc09794de6252f3ada80fc1f740d54849882e491c52be563b8dd files/wireshark-0.99.6-lm.patch 1010
+AUX wireshark-0.99.7-asneeded.patch 339 RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b SHA1 ec2b8952f8fe55471e923c086a6e9b48e06ce7a8 SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478
+MD5 e0c5d785bc887eadb2a4fc42a4dd782f files/wireshark-0.99.7-asneeded.patch 339
+RMD160 faa516dd3dfd8bd6218f66d3bedb5490b0896f5b files/wireshark-0.99.7-asneeded.patch 339
+SHA256 9fc8b3ec3fcf1cca714c78c28c1883503abfcfce4fe175e43c6d7ec14ddc9478 files/wireshark-0.99.7-asneeded.patch 339
+AUX wireshark-0.99.7-libgcrypt.patch 1460 RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 SHA1 c0aec79a244b1d9e133de903c6953493958d2ef0 SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814
+MD5 f5616c6212db9c61bcb71002f1c74bb5 files/wireshark-0.99.7-libgcrypt.patch 1460
+RMD160 50746197a57eb99b86d192c8a3d5068cee527f07 files/wireshark-0.99.7-libgcrypt.patch 1460
+SHA256 01fd754829b3bc4714389dac9eaaf8d4f4457277794d60d69a55450042610814 files/wireshark-0.99.7-libgcrypt.patch 1460
 AUX wireshark-epan_dissectors_packet-diameter.diff 1106 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d SHA1 c37922ea7e2d12115aaa55ffe361f4724cbfd9f0 SHA256 cf8a00c20abf51456d90b4ff0b6cd19bd64e2796a7268c355a1c482e434c3505
 MD5 6cfe46e4398d7657b708cf8014f93e72 files/wireshark-epan_dissectors_packet-diameter.diff 1106
 RMD160 600471845a90d24f6bb65b46c9d2f8e9c851a78d files/wireshark-epan_dissectors_packet-diameter.diff 1106
@@ -40,10 +48,10 @@ EBUILD wireshark-0.99.7.ebuild 4902 RMD160 e52d75abb47caa773f0a6d3c405b2ad73815c
 MD5 beade42730128a9e4fbeadd94f64bd15 wireshark-0.99.7.ebuild 4902
 RMD160 e52d75abb47caa773f0a6d3c405b2ad73815cc33 wireshark-0.99.7.ebuild 4902
 SHA256 c88f2ec31a6039bbe7f16ff8d10d95f2c036b2f6fc7d6dd1d9da2f925956086b wireshark-0.99.7.ebuild 4902
-MISC ChangeLog 10285 RMD160 cb3493fc6ce5f627aa00a9ce3b4fbeaf14e7d3d1 SHA1 146db40a1a687b131a62bd1cb78a2348de337f98 SHA256 ce82b5c24be6035e7211a9a4b474e2e9ea2af48f39b8b7187d545711d2d59a9a
-MD5 df68ae95eee99f67dad8c2c23fbe5397 ChangeLog 10285
-RMD160 cb3493fc6ce5f627aa00a9ce3b4fbeaf14e7d3d1 ChangeLog 10285
-SHA256 ce82b5c24be6035e7211a9a4b474e2e9ea2af48f39b8b7187d545711d2d59a9a ChangeLog 10285
+MISC ChangeLog 10473 RMD160 bff830ac59e80a99d0fefba937a9027284b5322a SHA1 8e0f9e4f8ac31a7026b9a571d13865f51dc9c79c SHA256 2dc4b36c121a70ada58889ac6fceed6ecde744aee29f0a683daa713a888dd57e
+MD5 b4c2448580ddc8c95fff29bb3cb3e8e0 ChangeLog 10473
+RMD160 bff830ac59e80a99d0fefba937a9027284b5322a ChangeLog 10473
+SHA256 2dc4b36c121a70ada58889ac6fceed6ecde744aee29f0a683daa713a888dd57e ChangeLog 10473
 MISC metadata.xml 241 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be SHA1 3f1b8ff204522d99acbe339fe83cbc916d460554 SHA256 684412188c16efe278e263e010f4bf09d33f17f2762d4829516e3e3a47ab3c02
 MD5 94e03a4ff2917efc81b0e0f07040afde metadata.xml 241
 RMD160 e54fec44f06e7d8c93e399d9bd98e56f231920be metadata.xml 241
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
new file mode 100644
index 000000000000..36069368e141
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-asneeded.patch
@@ -0,0 +1,10 @@
+--- ./epan/dissectors/Makefile.am.orig	2007-12-11 16:38:03.000000000 +0300
++++ ./epan/dissectors/Makefile.am	2007-12-11 16:38:37.000000000 +0300
+@@ -32,6 +32,7 @@
+ 
+ libasndissectors_la_SOURCES = \
+ 	$(ASN_DISSECTOR_SRC)
++libasndissectors_la_LIBADD = ../../wiretap/libwiretap.la
+ 
+ libpidldissectors_la_SOURCES = \
+ 	$(PIDL_DISSECTOR_SRC)
diff --git a/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch b/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch
new file mode 100644
index 000000000000..c8184df7b25d
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-0.99.7-libgcrypt.patch
@@ -0,0 +1,11 @@
+--- ./epan/Makefile.am.orig	2007-12-11 13:23:59.000000000 +0300
++++ ./epan/Makefile.am	2007-12-11 13:24:36.000000000 +0300
+@@ -115,7 +115,7 @@
+ #
+ # Add the object files for missing routines, if any.
+ #
+-libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
++libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib) @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
+ libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la crypt/libairpdcap.la ftypes/libftypes.la dfilter/libdfilter.la dissectors/libcleandissectors.la dissectors/libdissectors.la dissectors/libasndissectors.la dissectors/libpidldissectors.la $(wslua_lib)
+ 
+ #EXTRA_PROGRAMS = reassemble_test