gentoo resync : 17.01.2010

6 files changed, 34 insertions, 13 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 61232d779a35..4ecab8f7f1cb 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,7 +1,8 @@
-AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
+AUX wireshark-2.4-androiddump.patch 1167 BLAKE2B dcbb99f89e25f83e28bf4d7e1379967ba98bac6b712d897e68329a85f2f19ec6ecbc0a87c59db39c619eba1e27227577b9efe2399add981a93ed589f5baade38 SHA512 b5553ff8f80309791741f7d7e82364ab754a905b062f3b477ee542ee59ce7bbe0a272c517188b0480769e170c73d2a37260222b7d517796f9b16a9b6dc0d17ef
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
-AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
+AUX wireshark-99999999-about_dialog-plugins_add_description.patch 758 BLAKE2B cdb787a6deb112708d0f39307a845e0d3594233903db1994db2fa17f61c1dd3afc6692a33b2e5694b001d7935ed076a039f15af7b98b26b612338157fa095fdb SHA512 88c07c85b36c1d5d7f3476a58f6c8af6c8f280cee147e32bfd64e848437221698a821bec9c6afed845a8a3bdd3e3f1ce2bfde33bb511a60a953c0bb4fe26a982
+AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
@@ -9,6 +10,6 @@ DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 98d31a260b2f5f74a567161e9dc0c136bb6
 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530
 EBUILD wireshark-3.0.3.ebuild 6555 BLAKE2B 15e190ef89a4ec08342d68ae383b100294d5e63a9f5ada2bbd895419f9aca1c0d9008ba02e8e22a5c23f5d7dd1c63d248de6d8ab8d24a1320ee637801786b661 SHA512 e4e20eb5b47aa02831626969d93672798dd460dcea865818b840d7b9f18f1d2a83b14d4bacb81543eb999f838c429536605cc9a478fff069e9ee4d6241da3387
 EBUILD wireshark-3.0.7.ebuild 6593 BLAKE2B a296ff8807c208aa809e5aca04a7e2c9b1ad30f8287eb6c5dd765a34771f67a3410dfe76d2f73793958ccdc93c95ffa0d8cd0d80a96196c0e8b39ebaef1710b7 SHA512 761798113a2db0ce1c37c70f115987c60e5a99bde42ca85662ba141108d857d94de05e9c0b37d4a4c9b4a02e59a3389b30f56b0490a6b707e580ec033af672f9
-EBUILD wireshark-3.2.1.ebuild 6718 BLAKE2B 3c2cedfb955f07c93f84ea62b9af397febd7caf65b648438234775709f222a8895afa1638aa356c991c00ce8ffba100d4f16e814c02188843332ca5615bdc9d3 SHA512 4753448804f896123c849dafb593a443789c7830988bf063cfd70b6449b5571b9d9f7b960f501056faee097b9cc1f3d47310081929c776b09ee837e85657f9eb
-EBUILD wireshark-99999999.ebuild 6659 BLAKE2B ccf541efd87e59e2cd4519ab35bef2805ed5bfc47ff035c09b3fa120cc28af43d9e73ae23fd7d1176d6cc602b53f76e0c51422c05f0586497a6ff00dfd2b3e79 SHA512 0163f63e17c3458d2380992776f8ccec60d566ca42c49ad248d83f41f1ff76a45e9b279041d5e2d42fb02a4556f66de01b7795715d206f9286638b8c38801971
+EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B b6b458d9170660f4dbb04f21bf2c3bfaaa4de1398a06e7912ad876d957fb926def74042c0149b0f482d192c48c48d5749a3145ed0e442bbd7fb7101891251cad SHA512 a9049918fb39372acb1cd70743948d12092af48dac36984d5b47e13e0e5c59ab35bbaa33aff366998b41d899b651048e22b4c061cd8feb20449015b6b30e585d
+EBUILD wireshark-99999999.ebuild 6732 BLAKE2B 126ed5c6b185754d36ec76d60118911ad9e37021c1b10d73b1d59c32710a32f4d4808957a26b72e806de4698d066aef325edfd8faa2798b23f58ad7912bfe65c SHA512 442a910a5df8f91085af414cf48037826490dc06fc3d55f17ce3e7ebba4965d6c3e5940c41e6b6da221e21847386e7c60963eb2e37e5fc103650365fa2639108
 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2
diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
index e67ab21b6a8d..2272ef891c27 100644
--- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
+++ b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch
@@ -1,7 +1,7 @@
 --- a/extcap/androiddump.c
 +++ b/extcap/androiddump.c
-@@ -363,13 +363,13 @@
-     pcap = pcap_open_dead_with_tstamp_precision(encap_ext, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO);
+@@ -438,13 +438,13 @@
+     pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO);
      extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo);
      if (!extcap_dumper.dumper.pcap) {
 -        g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap));
@@ -15,8 +15,8 @@
 +        g_warning("Write to %s failed: %s", fifo, g_strerror(errno));
      }
  #else
-     int err = 0;
-@@ -416,7 +416,7 @@
+     wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
+@@ -480,7 +480,7 @@
  
      pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer);
      if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) {
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
new file mode 100644
index 000000000000..5506c6ec2ad4
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch
@@ -0,0 +1,18 @@
+--- a/ui/qt/about_dialog.cpp
++++ b/ui/qt/about_dialog.cpp
+@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const
+     return QStringList() << tr("Name") << tr("Email");
+ }
+ 
+-#if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+ static void plugins_add_description(const char *name, const char *version,
+                                     const char *types, const char *filename,
+                                     void *user_data)
+@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, const char *version,
+     QStringList plugin_row = QStringList() << name << version << types << filename;
+     *plugin_data << plugin_row;
+ }
+-#endif
+ 
+ PluginListModel::PluginListModel(QObject * parent) : AStringListListModel(parent)
+ {
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
index 9715de676f16..3d3a2a9c9323 100644
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
+++ b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch
@@ -1,15 +1,15 @@
 --- a/extcap/CMakeLists.txt
 +++ b/extcap/CMakeLists.txt
-@@ -68,6 +68,8 @@
+@@ -91,6 +91,8 @@ if(BUILD_androiddump)
  		if(HAVE_LIBPCAP)
  			set(androiddump_LIBS
  				ui
 +				wiretap
 +				wsutil
  				${GLIB2_LIBRARIES}
- 				${PCAP_LIBRARIES}
- 			)
-@@ -78,6 +80,7 @@
+ 				${WIN_WS2_32_LIBRARY}
+ 				$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
+@@ -102,6 +104,7 @@ if(BUILD_androiddump)
  		set(androiddump_LIBS
  			ui
  			wiretap
diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
index 931de56a7b37..521ee2a97f08 100644
--- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 LICENSE="GPL-2"
 
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc64 x86"
 IUSE="
 	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
@@ -86,6 +86,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index a228b3f00e24..eb3257e5fc4c 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -86,6 +86,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
 	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
 	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch