diff options
Diffstat (limited to 'net-analyzer')
15 files changed, 58 insertions, 43 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 13b7de046973..ef6d7d799fbe 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest index 08bf49f9feb6..629637ffcb75 100644 --- a/net-analyzer/flent/Manifest +++ b/net-analyzer/flent/Manifest @@ -1,3 +1,3 @@ DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74 -EBUILD flent-1.0.1-r1.ebuild 617 BLAKE2B b235dfcab6dec728c4a0649f01c43fe35c5a144705e51cb13cfe2c93ff2bb355ba46600ae3f911a5ad038a5e843abb9304ad2bef1317c9642aac5bd1c39a5b87 SHA512 a188a963edd9a0ed5a27c891e967f15d3b9c722c303eb684129736e4a0f1a67e9a835a3997d0ca3248a1e607c3754fbfe70ddd83ed6e4ce1faf5a8aae6729d45 +EBUILD flent-1.0.1-r1.ebuild 607 BLAKE2B ee1fea6a973b539c986d52ec1ce10fd040db8ecfa6a0d1e3842d17887843f684dac79f57fd2de7501b3b010f8cf8c199085eac4817cd5bfac57df0432e0fadb7 SHA512 62b5393242103203c33295b70ffe084c79e6de46c5bf7834bd1cb2e39d547a67303b5007140d8fdc5919d2648a3bfb9bfc83111344639445880d32cb48855c6e MISC metadata.xml 391 BLAKE2B 85925178db6e1ae966b020139760580a899541dba0a5160dd0a40d99a13838ff9d4884e70ae5f594f34a311ecc7a3eae00cf9d6027f538b58ef6aca3f2e6b43d SHA512 f659fc94acbe2d182b842fe2ef9a5a6f2cdbf43fc229e200586ee3a3d0a89f49eeddede26efc370b2a7710a739b50d8d83f219248628581da795b9e80a25baf7 diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild index 81ba7b9749a6..e9a575668ac4 100644 --- a/net-analyzer/flent/flent-1.0.1-r1.ebuild +++ b/net-analyzer/flent/flent-1.0.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 47147a44c706..a5cdca6f7623 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -7,5 +7,5 @@ DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b057 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411 EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a -EBUILD nagios-core-4.4.5-r5.ebuild 8080 BLAKE2B a7f849c7eac614e3f834a52440991a210e268f2462c5047cef127ec3e6f53af93e3b4e62d4a8b5ace9df3e5179e244593df0b072c9c7a19283792c2d0e3c1edb SHA512 2c2942cc48a7956708c6e0409941f98b3e4a3078af6df8c32adafce633d52dc3cace5f8df5a3240c8ca21c78d247885795f9c17f1dc1317186f75e01710124ec +EBUILD nagios-core-4.4.5-r6.ebuild 8044 BLAKE2B 14761a831bb22669589931e9d66fc50907b6caab8fce0f06a26c0098d61d8261241037f4276ec8cfb87b957b2e5c28de59df4b6c83b773ed5e8112df8f758391 SHA512 cc0d4a90b62bbb6cc7a8bf04bbe388e07106241d98133aa5f345e332bab043b72a55dda194959161580ad9f47832e0490ae9cdefc3c5a5dedd76743ad36a1ada MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild index a1922298fa0f..6ec6bb7044f5 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r5.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs user +inherit toolchain-funcs MY_P=${PN/-core}-${PV} DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation" @@ -47,7 +47,9 @@ REQUIRED_USE="apache2? ( !lighttpd )" # extract a snapshot of AngularJS, but that's only needed when USE=web. # MOD_ALIAS=apache2_modules_alias -DEPEND="dev-libs/libltdl:0 +DEPEND="acct-group/nagios + acct-user/nagios + dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( @@ -70,11 +72,6 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" -pkg_setup() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - src_configure() { local myconf diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index e5db3e56ad8b..b1d32737de3a 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -3,5 +3,5 @@ DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d395 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6 EBUILD nagios-plugins-2.2.1-r4.ebuild 3102 BLAKE2B 71b4e4382bd6ad0d2278db3a21e952cf38e551bc8f3619297ff24f508c2ffe4a4261093135e950212c8b8dab80e2cac294fc07a91bf3e273a03a09ac47822307 SHA512 9d8af2f74fd41c3bd660f72dc66665b2436671d899df8e9f06c1691df963f549320dda0dada32a39fc6214af11285fc329415e8038f35d10e245ac15f416259a -EBUILD nagios-plugins-2.3.1.ebuild 3134 BLAKE2B 755f2395aada98fc1d15ac12cb68ca3cd2f029e9e2d9bd29b1b2d1686e3a0d4442a62725f92857d18065474a72248abbfa757cd935c9be04ddc5f231469561e6 SHA512 e93e1b9d63620eab2413036c75863924d981fd85b99c07e78133c47e580d5ea8300f1a054258ca44a8e9ca5c5183579689a7f35ddd1b301819c02737e5811923 +EBUILD nagios-plugins-2.3.1-r1.ebuild 3050 BLAKE2B 9fd1e5e2c46c357bf8f4c3266dc58f1ada6aac4d932d2b07f7b2b33116a975f3a95a6cdf415c0af10e021ba3249b039da5819d06003ac9df3771327839eaea1c SHA512 5ad9ee299b4906176e6a546be5d545fb1b94163a556fd4361e68af2b6c47b00e015278b49b2b740643e7018b0480abe8caa5e072b63b5a3582c0f1f4a69ecb37 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild index e60ae3dda0cc..ec9cb103f719 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user - DESCRIPTION="Official plugins for Nagios" HOMEPAGE="http://nagios-plugins.org/" SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" @@ -106,11 +104,6 @@ src_configure() { --sysconfdir="/etc/nagios" } -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - pkg_postinst() { elog "This ebuild has a number of USE flags that determine what you" elog "are able to monitor. Depending on what you want to monitor, some" diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index 9c0f35c6aa3d..2ee465d781da 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -4,5 +4,5 @@ AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 EBUILD nrpe-3.2.1-r1.ebuild 2516 BLAKE2B c9221e5f220d7231f9c293a0fbbd5aca68600806538f8dc7bba18c03d1f9d72ab3298ef3098483475212a5f10c2c520ed7fd1914d868b5de2016001b7baf03b5 SHA512 669ba9444ddb021969ec9987fa27bd32bb059410acfdcc344e505cfd562088123fcf227d8bd0d17987670332924fe2dbfd11beaeae146aa49f3cc4a3b8f63348 -EBUILD nrpe-3.2.1-r2.ebuild 2506 BLAKE2B 464ec7948b8771c80b12de47abacd8f4f3326d21e660cd6851e0e7de2ef56b0a4deccf2a34af6ca7c10b06032ad5e0c29f9d2394a269f5732324faf7bbc80310 SHA512 97ed66451767208e94398f6cf7ca86c6e6d2ccf05660d60349e9e8f2713fd28aae6df9f05a8884636baf150b7d6e8985db6547e581c772074f3f4a972319c107 +EBUILD nrpe-3.2.1-r3.ebuild 2822 BLAKE2B 6d2b46889d9da9a40d2d67b21c62aa714b1bcc5dcb504bd5079c87f95dbd5967178ba025d84d9e577c4c8053e4cf3831f8e28814f093b6c51b9dcb5cd2ff5482 SHA512 5097efacb350bea0b2f181a43d950481ce1c1703d488dd27fbd35efe9d15d0fd28e2213f8b77ff1adbfc6d0dff19f57247c98c4cb021342e55f0669802799d51 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27 diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild index 7838b676b308..0dad49acfdf5 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild +++ b/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit systemd user +EAPI=7 +inherit systemd DESCRIPTION="Nagios Remote Plugin Executor" HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" @@ -13,7 +13,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="command-args libressl selinux ssl" -DEPEND="sys-apps/tcp-wrappers +DEPEND="acct-group/nagios + acct-user/nagios + sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -24,11 +26,6 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" ) -pkg_setup() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - src_configure() { # The configure script tries to detect what OS, distribution, and # init system you're running and changes the build/install process @@ -36,6 +33,13 @@ src_configure() { # because we don't want it guessing, for example, whether or not # to install the tmpfiles.d entry based on whether or not systemd # is currently running (OpenRC uses them too). + # + # Note: upstream defaults to using "nagios" as the default NRPE + # user and group. I have a feeling that this isn't quite correct + # on a system where "nagios" is also the user running the nagios + # server daemon. In the future, it would be nice if someone who + # actually uses NRPE could test with an unprivileged "nrpe" as + # the user and group. econf \ --libexecdir=/usr/$(get_libdir)/nagios/plugins \ --localstatedir=/var/lib/nagios \ 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 |