diff options
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/Manifest.gz | bin | 46999 -> 47000 bytes | |||
| -rw-r--r-- | net-analyzer/ntopng/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch | 12 | ||||
| -rw-r--r-- | net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild (renamed from net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild) | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-99999999.ebuild | 3 |
6 files changed, 11 insertions, 14 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 69cf58d2d815..ac7f68bf1647 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index f71c1090b477..7c8fe07d76f8 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -2,12 +2,12 @@ AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1 AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029 AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee -AUX ntopng-3.8.1-PKG_CONFIG.patch 3059 BLAKE2B e11205bf3e6dcfa5fd00860b42f6f55046b160f3f607952a510a462966e52f878a8e7cbafbb684dbf1a7a715e2fa2cabd22dc51f90332de5404a724e97c9ecbc SHA512 e5498a81edf664269a44e5f9d776938ae12f2ff8a611570d5923ba23fbfb69e23cfead2311357e4528996c189853cf7fdb307d9c307bff0f9f4309fd4591ee3a +AUX ntopng-3.8.1-PKG_CONFIG.patch 2994 BLAKE2B 4ff178522c28f93d19550080e1338970413fa5a25dfcd4745fc3ab8a8ccb27166771285e68ee1b47353b610121630cd62c1c1c9b8672e5b59d13957185ca7ffc SHA512 77516304306ac66e6d691679209a9a93ef481c38a6eab4681430cf5864387664389e016ccab6106f576c90dfbd398b9f8711be61783c05017bf3c1dd1e99905c AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f EBUILD ntopng-3.8-r1.ebuild 1729 BLAKE2B da6fc2d159813ca2505dae2bc82038fcc7831768adf03d2cbce74ef7ee9fc8268953819641015e0a98550b3ef19e7f42cb63da7c19e6e0f1edf6139f0326165c SHA512 3d71d06d03a0bb2c67be93701cb5a13058d50b029bc1a9f80d630fc687742dbfc7054be34a73c9c4f2f457c44692cec076b4d627a8f6d8b02d06352a4921d39e -EBUILD ntopng-3.8.1-r2.ebuild 1912 BLAKE2B 9e073878fe2fcea73878b783abe608c899733975463d3e277cffae2abc285ba296c733a055ea7076ac1c09f57c0a5a9f725dc690d0ad0d810f0fa5571a83d028 SHA512 47d0bf663096213abda2f19ec71f730551ded735321cf8c7bde23949128a62c58f99e4e1fefcc3db63906f0b8390fb81c5850db8392cc350e0ee9d2e7fd36bf4 +EBUILD ntopng-3.8.1-r3.ebuild 1916 BLAKE2B 70b89a531144f15f89ec8d61c4e2851a8788e31abc2533b1f941dcca0231532d98eb8af749226ae0491130de9c4f10c122ccc391f7fab93c538aee4cd8244519 SHA512 bf6a351d4e5c3092e794e7c50489c72d30bfcef5fded136494539067b96a639e9278e95d4b4978c265167e5897c16f2a2db9f9e7ccdee3a74c0dee1e1e049d35 MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73 diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch index 91811d66bbd4..12117d791bcd 100644 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch +++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch @@ -81,15 +81,15 @@ else ZEROMQ_LIB = $(ZMQ_STATIC) endif -@@ -107,9 +107,9 @@ +@@ -106,11 +106,6 @@ + ZEROMQ_INC=-I$(ZEROMQ_HOME)/include ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a endif - +- - HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) -+ HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd; echo $$?) - ifeq ($(HAS_ZSTD), 0) +- ifeq ($(HAS_ZSTD), 0) - ZSTD_LIB = $(shell pkg-config --libs libzstd) -+ ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd) - endif +- endif endif + ###### diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild index fb5e82a01945..25938565c762 100644 --- a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild +++ b/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ DEPEND=" dev-libs/openssl net-analyzer/rrdtool net-libs/libpcap - net-libs/zeromq:= + >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap sys-libs/zlib diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 926cc7de8221..3bf12723b313 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -11,5 +11,5 @@ DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac68 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 6787 BLAKE2B b6b458d9170660f4dbb04f21bf2c3bfaaa4de1398a06e7912ad876d957fb926def74042c0149b0f482d192c48c48d5749a3145ed0e442bbd7fb7101891251cad SHA512 a9049918fb39372acb1cd70743948d12092af48dac36984d5b47e13e0e5c59ab35bbaa33aff366998b41d899b651048e22b4c061cd8feb20449015b6b30e585d -EBUILD wireshark-99999999.ebuild 6689 BLAKE2B b2454aa1c3134927a6f2bdd7c3efa745575c1aecad6ba512631ff694fb2be8082dcea6d15d50d5553e97565b1b397217869b2ac8385ba44a3e7481e607117af2 SHA512 023c11adbcdddb2a241fd4cb8019430a99536b5493f2835273774f0201ff151370fb3ff7414497457a8998fd8a485ce1ef723720bb35bad47fae2f1af450abd4 +EBUILD wireshark-99999999.ebuild 6528 BLAKE2B 7a3a8cfbc12176764972d4e797e78f0c6ebfde3b4b961f0e7293478c0b070de64238ca953af186556d264019426a8149b81592bb47d96d7b9fdf226ec2098fd1 SHA512 7fa10e18a062b19586e6acad5f60aac39eaa6558940a552c9b5ce99ea57ce40722b803b4435d02c46f7d0664f3518df084e091f043261f2046b75f92873d6f03 MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2 diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 4e0c85ef50a3..d3c4cd86d65c 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -84,10 +84,7 @@ REQUIRED_USE=" " PATCHES=( "${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 ) |