diff options
Diffstat (limited to 'net-analyzer')
26 files changed, 608 insertions, 33 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 8f4cfe112fb7..5f66c55f0771 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest index 89eb836ba983..b4c9b84cd941 100644 --- a/net-analyzer/fragroute/Manifest +++ b/net-analyzer/fragroute/Manifest @@ -1,5 +1,5 @@ AUX fragroute-1.2.6-libdir.patch 4634 BLAKE2B 71fa0052f4e9b15b8ba143fac4f2a1af8bac19dafc9ecae71056b62cf6090ea0182da0b8e7986eb90318cfd3e4e57e8ae9c3a7146dbfda1ed91595ccf14d9783 SHA512 9013a8d685a66b0c7bd051ea4a95ae45140cefc11db05a1b476c07ecdeb26e99e90bd74f19698c2e7e52d4126e0415b5c3427d8028d260860f40aa1e3f95d727 AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3 -EBUILD fragroute-1.2.6-r4.ebuild 1077 BLAKE2B fbe77b23cd6c06e54e19a5630ad72b3a5631407a3583e7d00cdc18ff6f40eda745dc52192561d7855753b8b6a967174e29e30328af5e845472b16d99da656eeb SHA512 fe09d76c6f4c9ef6b701a7af484c703dd6a64e818f2258410772965b98fe0b92c8779567ee9e1d7a149d37ba1dc429c16ad14f38852a46772575c3f0a78283ca +EBUILD fragroute-1.2.6-r4.ebuild 1086 BLAKE2B 1fa32fd70460c0cb60b08f40b633e4138f4e534d0759930c445f4c22a2277d005b7c9c5bc99db8f6dc7e6edd7c562aaa0f252b6ac65259f8a6612df6d037e693 SHA512 d2d7a77d967f631eb9b0be6b08528ff394e5bc1fc86a885c6bf4c3585a728289f149da6b4f74a106db2c96971aecb97e5189f7f825c830dcba7dc18903aca464 MISC metadata.xml 365 BLAKE2B eaccdf170ee91074f81321c0b92d1859be889b9f6431f37ffc17a4b0ec798deee1eae111fffc73459ddcd50fd9ad1dc178adb02467c22c106f0f1568579aed4f SHA512 fd734224fe70b4453e6d7e61d7b61eaf08253a4de6f6f9d8c4a5b715b85f6b74a5c406a9de1cc76729ef3c329cf678cd857bc18a0afc9a75ab9bdc5c73016c24 diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild index 664c3d346e8c..4dabe888f8a2 100644 --- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild +++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - virtual/awk + app-alternatives/awk " DOCS=( INSTALL README TODO ) PATCHES=( diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 1005296b641d..48547c94a9ae 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -16,7 +16,7 @@ DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffd DIST munin-2.0.69-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 DIST munin-2.0.69.tar.gz 2258024 BLAKE2B 2d270f6f67fc9a86a592e2b7cbcf4111d6ae40bf1928b0ad0adb99ad32384810e5768c17019f9163e8b22fd8524b28257df527df023db9c1ba333691b384dd74 SHA512 4976e394e046d3fe1cbb000acdf081060188517e09abcf8b60dd7c55e0e1cdf46e33d1760368cb1423dfb9286e397df2072a2c55ba8b79adeae4ea2303130667 DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af -EBUILD munin-2.0.67-r7.ebuild 12201 BLAKE2B 335dd1b80c04d3f54ee725385b9d72f767e4661885ca47391cdb92e85ee1f12b721f5ddfcb28c582857372f09dc8cf17c7e6f33649f20e8e590bf5b595dae894 SHA512 aa599ca69388d3e7bbfb5271c34bb53fe3315370a4dc6e34cf2b55cf2fcccfa143a1d94e81525cf3ef30e6096fb82dba1e59a793c0bba37e3b42369021c17528 -EBUILD munin-2.0.69-r1.ebuild 12564 BLAKE2B 31e321eeaacfee96b60fb72e457972769b98d92b6abfde492213be2d55f9231827d45ba4ee5e22a5411bbe00642f6a60b85215653aff5c62e307c216f5f10263 SHA512 2a148dc80c771f148c135c1e623585f5a445f120b10bbf0ae1f060f2ca62fdec46f57d2b1d7d9e7870e76ffdfa68b60118b3897b54c3c287e98f6b8cba58bebe -EBUILD munin-2.0.69.ebuild 12206 BLAKE2B 612a09e9d078c6595138257a3c9e172d75162611ffd52e93a6dd8b0ae1c24dadfcb5a0b9bf1328e6de9f1e989588c2415004375a8e9211d2c1cb8c64d2a7f67c SHA512 a81df81fe9c2e89b9e7c242f1634428cf50015a1df97a37199270a95a0445ecd99be243e7521c23f882883ffbf98a54d27b6c7a685d086d4c0c45a64e26a8f6e +EBUILD munin-2.0.67-r7.ebuild 12210 BLAKE2B 617c37895b988f782b173b273e9eb5a2ef99fffc1b13a9b0d2981f5366def49df9d26214109842f2e79e121197ec544c46edd0894ca6a781596a8011533ffa8e SHA512 341f59ef4d2956cf2543862eeca71b696766a2e03189d650d1f2ff492ce53f5b92116ad93ce5890aa9b14714b6eda29b5d6c682cd7ecc1820f4f16b572d14ad0 +EBUILD munin-2.0.69-r1.ebuild 12573 BLAKE2B fc359426c56e08aa4ec63d2dd4395f4db30a3b23d07a9ee22e0fa92fd148f9b5c63bcf06410661746c1a6ba4c60e3a300e4d12e5f25f3237931739cc09da774b SHA512 a31d034a6b33a7db7e77233b717e415c5847c540b06bf0492bd821f96e4442817c2e68ba53b1ea671e5f04e968705107b1000a068f257da428ac66ccb762c649 +EBUILD munin-2.0.69.ebuild 12215 BLAKE2B 080a68bac7fad148d6205272ed093b2887ceae393ca495edd352506b5f9bc05cd10c77bbf3cc380d2159ef781a872c600130802e5c831861a599d9fcfbb3d81d SHA512 5fcb50e15646f957937ea16238c723145eb6a4a92a72deb539e30c735f5dc6030391e92c86beb85d5b12753bf5a0fee51685625830f6cbbdd7bb0d86c09619a4 MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c diff --git a/net-analyzer/munin/munin-2.0.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild index 08d21fe6d7bd..6368339dd6f6 100644 --- a/net-analyzer/munin/munin-2.0.67-r7.ebuild +++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild @@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM} dev-perl/IO-Socket-INET6 )" RDEPEND="${DEPEND_COM} - virtual/awk + app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* diff --git a/net-analyzer/munin/munin-2.0.69-r1.ebuild b/net-analyzer/munin/munin-2.0.69-r1.ebuild index 84e8a56bb83b..e47d869c5fcf 100644 --- a/net-analyzer/munin/munin-2.0.69-r1.ebuild +++ b/net-analyzer/munin/munin-2.0.69-r1.ebuild @@ -99,7 +99,7 @@ DEPEND="${DEPEND_COM} dev-perl/IO-Socket-INET6 )" RDEPEND="${DEPEND_COM} - virtual/awk + app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* diff --git a/net-analyzer/munin/munin-2.0.69.ebuild b/net-analyzer/munin/munin-2.0.69.ebuild index 4808bb940fcc..769dec8a5ea8 100644 --- a/net-analyzer/munin/munin-2.0.69.ebuild +++ b/net-analyzer/munin/munin-2.0.69.ebuild @@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM} dev-perl/IO-Socket-INET6 )" RDEPEND="${DEPEND_COM} - virtual/awk + app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 5fc9578bad07..0ecaab414de1 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -6,6 +6,10 @@ AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28fff AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300 AUX net-snmp-5.9.2-fix-LDFLAGS.patch 744 BLAKE2B 1d53469057630097c9c2a527ab276f8c30346c9b45b5ff4780cf9e51fb0f81193b9113e121a282d92268f73831fc3d4bf60ae2ea035f0eda9196351faa65f889 SHA512 7ebcc0128180c3690cd594dc3ec9c6428bff81ef31cf3b6f35be74a3d32c3753d0cb8e8b41b2dd6363a97811daa4786827a6a7a93b49804dfbb14545f157d360 +AUX net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch 9942 BLAKE2B 92214c4908da35c4cfa4c7fc0af2b93c0a577430ebdde489c89bcfc4b7d45d292f588af515f68dc13d84f285cebe63d008dccf538a027fce2a7e1a0a3f55220f SHA512 b095cb590f32410638d7d9e582eea53c19c37edb17a1e26f8bb1effc27037774ec0aede57dd54b8cebcab9fbff264911d8a6e3b0f64824fdd47c58c4724bfaab +AUX net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch 1786 BLAKE2B 3f672a9e54f2242af10cc31a91e9522f330f13d761b79e8ef6913ce7ef5916d9859cdf05037c8c3954e94dd983551fcbd81861f07b103d41e0c2012b76d3007b SHA512 a00aa1877b9ee9ad3af87bde9749a43cae993e91cfa4ff9b806c5725ac0409f389e2d866d5375f66ddd15084f73cc3dfa6af2f928448ebd1f6bfa4dcb220c93e +AUX net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch 1045 BLAKE2B 1cb4eb17363b9de90cecec0670ce220b04bdcb7e91af6931889139ba82ea69c24f399c5e4e1fd7ef3ae192372d7cd5bc5737b49a662cfeb685aab982ae321ede SHA512 0a1c51555359cec3f4294c0fe931c40e1cf1139a9a0e15fa7c75d6934b69cbedecc70b1bf44747f296274649bd39bf55ca55c0f9c4096a106e042b90698c95a1 +AUX net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch 722 BLAKE2B 00c301bbf6482f201ef2b4b82fb9899458a27e26bd0564bd98c69895f905b3abbbf5b1b8dc1ea7069059d9f1ad84a1335b84a6c151e7e75b81fc7fa3a135c578 SHA512 23e5e8920e41911dc4183a1c14b33f284a7d026a12c800dca6ddf0fa685e5a31041787599cab2671949163f539c85879e1e962128bab31ec478ebd47195ae3e0 AUX net-snmp-5.9.3-configure-clang16.patch 4779 BLAKE2B fbe551a16272c6a374ed1abdcb024e7babd15bf8854cbfec568c3c58546b3f78302ea27cbb289faa5eb84b5e8b2086505fe74bba62e76e9d1a84a09949700f26 SHA512 3b85e813b645a3a3220d1ef1b5aceee4b2ea4150159f723249171f6283c1d45a034069b3d79e5ed0faa32556a0cb662c3a8b4ad93bd69ff12d517622df21291e AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc @@ -17,5 +21,6 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc EBUILD net-snmp-5.9.3-r1.ebuild 6255 BLAKE2B 53424c917f876e72f1aa5e826253835a7944abbb2fccb8ae416d8073f29e10249e68f426d69c0c1a9977c8adade93a616b6c58ffeeb3ad43ccc87c3834b797bd SHA512 89c010837ea23ca8e83217bd6d1bcb2ba38884f78e843eda319a8b9706824f3f2793ac74d0c6924e4e7b7b61f8c43254aa6a6dbdeed97317725c20c579d008bd -EBUILD net-snmp-9999.ebuild 6160 BLAKE2B e3c896d79e70bdaae6ac5894f6d15d7e724e22f88c4a031b40aa8c360d0dcf848684ccf263861e905339d659517d7bb1c9dbfcafc3527ef026153111194a47da SHA512 3506aa3d44003596c5854fab94bd999ac640fb7954eac8dc50cd2eedba01911b69fc27ff21fc63c5166ca704335b23001dea7e66dc060fc0b2267111ba707f71 +EBUILD net-snmp-5.9.3-r2.ebuild 6358 BLAKE2B 886b9f9bd672d71f4610ba4a810629046679158cfa5264057df543a1360b85fcd45402eff77ceaf9d1519c932bc8ad651faea7783996dccb58655606f36c722b SHA512 87e3a741d6959b2f1dd4bbdeda2252e5771f4f42becf799611533fddef9dff26ba7a1f99aad91cab5768c6dd3d6fcc995e71fbd8595566f912b1d994f651470d +EBUILD net-snmp-9999.ebuild 6358 BLAKE2B 886b9f9bd672d71f4610ba4a810629046679158cfa5264057df543a1360b85fcd45402eff77ceaf9d1519c932bc8ad651faea7783996dccb58655606f36c722b SHA512 87e3a741d6959b2f1dd4bbdeda2252e5771f4f42becf799611533fddef9dff26ba7a1f99aad91cab5768c6dd3d6fcc995e71fbd8595566f912b1d994f651470d MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch new file mode 100644 index 000000000000..785f5ee57d1c --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch @@ -0,0 +1,231 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 1151979ecfba1ef10627175549d052cb76ef9d21 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:26:29 +0000 +Subject: [PATCH 1/4] Fix LDFLAGS vs LIBS ordering + +LDFLAGS must come before both LIBS & any listed objects in order +for certain valid LDFLAGS, like '-Wl,--as-needed' to work correctly +(otherwise it'll either take no effect or discard libraries when +they're needed). + +Gentoo has been carrying this patch for a while. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.top ++++ b/Makefile.top +@@ -86,11 +86,11 @@ LIBCURRENT = 40 + LIBAGE = 0 + LIBREVISION = 0 + +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o + LIB_EXTENSION = la + LIB_VERSION = + LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) +-LINK = $(LIBTOOL) --mode=link $(LINKCC) ++LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS) + # RANLIB = @RANLIB@ + RANLIB = : + +--- a/agent/Makefile.in ++++ b/agent/Makefile.in +@@ -288,26 +288,26 @@ all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) + # build stuff targets + # + getkstat: getkstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getkstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? + + getmibstat: getmibstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getmibstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? + +-snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) +- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} ++snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) ++ $(LINK) $(CFLAGS) $(LDFLAGS) -o $@ ${LAGENTOBJS} ${OUR_AGENT_LIBS} + + libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) +- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(AGENTLIB) $(LDFLAGS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(AGENTLIB) + + libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) subdirs +- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(MIBLIB) $(LDFLAGS) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(MIBLIB) + + agentlib: $(AGENTLIB) +--- a/agent/helpers/Makefile.in ++++ b/agent/helpers/Makefile.in +@@ -32,5 +32,5 @@ LOBJS = dummy.lo + all: standardall + + libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) +- $(LIB_LD_CMD) $@ $(LOBJS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(LOBJS) + $(RANLIB) $@ +--- a/apps/Makefile.in ++++ b/apps/Makefile.in +@@ -163,37 +163,37 @@ OTHERUNINSTALL=snmpinformuninstall snmptrapdperluninstall \ + # build rules + # + snmpwalk$(EXEEXT): snmpwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LIBS} + + snmpbulkwalk$(EXEEXT): snmpbulkwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LIBS} + + snmpbulkget$(EXEEXT): snmpbulkget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LIBS} + + snmptranslate$(EXEEXT): snmptranslate.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LIBS} + + snmpstatus$(EXEEXT): snmpstatus.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LIBS} + + snmpget$(EXEEXT): snmpget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpget.$(OSUFFIX) ${LIBS} + + snmpdelta$(EXEEXT): snmpdelta.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LIBS} + + snmptable$(EXEEXT): snmptable.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptable.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptable.$(OSUFFIX) ${LIBS} + + snmptest$(EXEEXT): snmptest.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptest.$(OSUFFIX) ${LIBS} + + snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) +- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${TRAPLIBS} + + snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LIBS} + + snmpinform$(EXEEXT): snmptrap$(EXEEXT) + rm -f snmpinform +@@ -204,40 +204,40 @@ snmptop$(EXEEXT): snmpps$(EXEEXT) + $(LN_S) snmpps$(EXEEXT) snmptop$(EXEEXT) + + snmpset$(EXEEXT): snmpset.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpset.$(OSUFFIX) ${LIBS} + + snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LIBS} + + snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LIBS} + + snmptls$(EXEEXT): snmptls.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptls.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptls.$(OSUFFIX) ${LIBS} + + agentxtrap$(EXEEXT): agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ agentxtrap.$(OSUFFIX) ${LDFLAGS} $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} + + snmpgetnext$(EXEEXT): snmpgetnext.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LIBS} + + encode_keychange$(EXEEXT): encode_keychange.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LIBS} + + snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LIBS} + + snmpps$(EXEEXT): snmpps.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpps.$(OSUFFIX) ${LDFLAGS} @LIBCURSES@ ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpps.$(OSUFFIX) @LIBCURSES@ ${LIBS} + + snmpping$(EXEEXT): snmpping.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpping.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lm ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpping.$(OSUFFIX) ${LIBS} -lm + + snmppcap$(EXEEXT): snmppcap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${USEAGENTLIBS} ${LIBS} -lpcap ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmppcap.$(OSUFFIX) ${USEAGENTLIBS} ${LIBS} -lpcap + + libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) +- $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) + $(RANLIB) $@ + + snmpinforminstall: +--- a/apps/snmpnetstat/Makefile.in ++++ b/apps/snmpnetstat/Makefile.in +@@ -34,4 +34,4 @@ LIBS= ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) $(VAL_LIBS) @LIBS + all: standardall + + snmpnetstat$(EXEEXT): ${LOBJS} ${USELIBS} +- ${LINK} ${CFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS} ++ ${LINK} ${CFLAGS} ${LDFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LIBS} +--- a/snmplib/Makefile.in ++++ b/snmplib/Makefile.in +@@ -229,11 +229,11 @@ all: standardall + + # how to build the libraries. + libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + # +--- a/testing/Makefile.in ++++ b/testing/Makefile.in +@@ -64,16 +64,16 @@ test-mibs: + cd $(srcdir)/rfc1213 ; ./run + + etest: etimetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ etimetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ etimetest.o $(PARSEOBJS) ${LIBS} + + ktest: keymanagetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ keymanagetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ keymanagetest.o $(PARSEOBJS) ${LIBS} + + misctest: misctest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ misctest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ misctest.o $(PARSEOBJS) ${LIBS} + + stest: scapitest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ scapitest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ scapitest.o $(PARSEOBJS) ${LIBS} + + clean: testclean + rm -f *.o core *.core $(TARG) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch new file mode 100644 index 000000000000..83d05a86f0ac --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch @@ -0,0 +1,51 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From a73bda5ca7afbeaf3cf3b73101f7541cf92147ef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:27:21 +0000 +Subject: [PATCH 2/4] Tidy up net-snmp-config output + +`net-snmp-config --libs` should return only the needed libraries linked to +libraries which external consumers should use. + +Gentoo has been carrying this patch for a while, as has Fedora. + +Bug: https://bugs.gentoo.org/693970 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/net-snmp-config.in ++++ b/net-snmp-config.in +@@ -193,13 +193,13 @@ else + #################################################### client lib + --libs) + # use this one == --netsnmp-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS + ;; + --netsnmp-libs) + echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS + ;; + --external-libs) +- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ ++ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ + ;; + #################################################### agent lib + --base-agent-libs) +@@ -210,13 +210,13 @@ else + ;; + --agent-libs) + # use this one == --netsnmp-agent-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS + ;; + --netsnmp-agent-libs) + echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS + ;; + --external-agent-libs) +- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS ++ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS + ;; + #################################################### + --version|--ver*) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch new file mode 100644 index 000000000000..8b825ae8cf5d --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch @@ -0,0 +1,30 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 7261ea344004ac42b6099acfba49c0ea731d049c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:29:45 +0000 +Subject: [PATCH 3/4] Prune Libs.private entries in netsnmp*.pc.in + +Gentoo has been carrying this patch for a while, as has Fedora. + +Bug: https://bugs.gentoo.org/693970 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/netsnmp-agent.pc.in ++++ b/netsnmp-agent.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp +-Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ++Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @LNETSNMPLIBS@ @LIBS@ +--- a/netsnmp.pc.in ++++ b/netsnmp.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmp +-Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ ++Libs.private: @LNETSNMPLIBS@ @LIBS@ +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch new file mode 100644 index 000000000000..c92c88cfbb2f --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch @@ -0,0 +1,24 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 6b70bd4ffa7a905700807eecd3e07a472e2eda55 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:31:15 +0000 +Subject: [PATCH 4/4] Search for -ltinfo in configure if needed + +Gentoo has been carrying this patch for a while. + +Bug: https://bugs.gentoo.org/883945 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -774,6 +774,7 @@ NETSNMP_SEARCH_LIBS([endwin], [curses ncurses], [ + [HAVE_LIBCURSES=FALSE],, + [LIBCURSES]) + AC_SUBST([HAVE_LIBCURSES]) ++NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) + AC_SUBST([LIBCURSES]) + + # libm for ceil +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild new file mode 100644 index 000000000000..b6009335d250 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{8..10} ) +WANT_AUTOMAKE=none + +inherit autotools distutils-r1 perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="https://www.net-snmp.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/40" +IUSE=" + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +RESTRICT="test" + +COMMON_DEPEND=" + virtual/libcrypt:= + bzip2? ( app-arch/bzip2 ) + elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + perl? ( dev-lang/perl:= ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + >=dev-libs/openssl-0.9.6d:0= + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +BDEPEND="doc? ( app-doc/doxygen )" +DEPEND="${COMMON_DEPEND}" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.8-pcap.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch + "${FILESDIR}"/${P}-configure-clang16.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_unpack() { + default + + [[ ${PV} == 9999 ]] && git-r3_src_unpack +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die + eapply "${WORKDIR}"/patches/*.patch + + default + + eautoconf +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use smux && mibs="${mibs} smux" + + # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) + use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with kmem kmem-usage) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pcap) \ + $(use_with pci) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared \ + --with-default-snmp-version="3" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all + done + + use doc && emake docsdox +} + +src_install() { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + use python && python_optimize + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + if use doc; then + docinto html + dodoc -r docs/html/* + fi + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild index 1aed4861943b..b6009335d250 100644 --- a/net-analyzer/net-snmp/net-snmp-9999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild @@ -20,7 +20,7 @@ else # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~mips ~ppc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" @@ -84,14 +84,15 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch "${FILESDIR}"/${PN}-5.8-pcap.patch - "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch - "${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch "${FILESDIR}"/${PN}-5.9-MakeMaker.patch - "${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch - "${FILESDIR}"/${PN}-99999999-tinfo.patch + "${FILESDIR}"/${P}-configure-clang16.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch ) pkg_setup() { diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index fa1c6a2ac674..72d1c495cc51 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -2,9 +2,9 @@ DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3 DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf -EBUILD netdata-1.35.1.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870 -EBUILD netdata-1.36.0.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870 -EBUILD netdata-1.36.1-r1.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711 -EBUILD netdata-1.37.0.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711 -EBUILD netdata-9999.ebuild 3923 BLAKE2B d0bb987251d17d36c82608b7d321a54f29468d79340d6f406c60ab1cf8c91c01a5871d51d0964b5d63fe9a039932136b998bca7839ea07e3dd1409fb40300660 SHA512 d4bb01715f36f64d2d5f7606afbe38471cd99da1271da982a3e0bfcc75d58b96d5e7d55754ffaeb7660fbb966908e310203c8e8c3a36b9d695f34b0581d87609 +EBUILD netdata-1.35.1.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2 +EBUILD netdata-1.36.0.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2 +EBUILD netdata-1.36.1-r1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496 +EBUILD netdata-1.37.0.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496 +EBUILD netdata-9999.ebuild 3932 BLAKE2B e826718e33e68458671e0e53fc0caee4d2f3c9d43f40b93c5db545e20980b7666daae00d855bdd9dc5d9fc4896fabf27c5ced0b3f16b6a4561be643abfb5aaf7 SHA512 6a60a4bd493efd848f0351d1b554690873e53552c473d3ce7362f4f549d1ea051a1ae04c1728c808be5cb8365c6a170768db7edcae0a876102290a71799ed94d MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484 diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild index 3df5ef6ecd47..d4f2ab18da89 100644 --- a/net-analyzer/netdata/netdata-1.35.1.ebuild +++ b/net-analyzer/netdata/netdata-1.35.1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild index 3df5ef6ecd47..d4f2ab18da89 100644 --- a/net-analyzer/netdata/netdata-1.36.0.ebuild +++ b/net-analyzer/netdata/netdata-1.36.0.ebuild @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild index 555475886149..e4af7059cb02 100644 --- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild +++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild index 555475886149..e4af7059cb02 100644 --- a/net-analyzer/netdata/netdata-1.37.0.ebuild +++ b/net-analyzer/netdata/netdata-1.37.0.ebuild @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 532e8e6f8fd3..1c367c2b30c4 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest index e21eef65818e..8b48644af62e 100644 --- a/net-analyzer/nmbscan/Manifest +++ b/net-analyzer/nmbscan/Manifest @@ -1,4 +1,4 @@ AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9 -EBUILD nmbscan-1.2.5-r1.ebuild 548 BLAKE2B b303bc2aeb9b469bb9ab5a0f3515f574852bcbda7daa1cdebae51cb1453e7a47f7d9f2715b4cba5310b74273ec67a890e2f133ef6811caa14273e5f39c244be8 SHA512 e0142a058cb9c6e046f59e22f13745a2f65fac4e369ae73b4399146730e581b21e69d8cd6ff6fdb41c639d04f9eede0a3eaa19ac9047f500e7587c1fdb7868d9 +EBUILD nmbscan-1.2.5-r1.ebuild 557 BLAKE2B 85bee5fc874459bae3f78b6435e70eb8d96fa2683ed202d586ad77b35c94a0d87a70693e3633b040e49c61a6b3da136112ddcac5283f60b871509a519bba7b8a SHA512 ecc8059e880fb66eb6bab1e3b4a279341a0d1fd36ad597ca491e95a880b73752a6c42f1c4db346f88460cd6b6f08520cab28eceb4acea62668666154606afbb7 MISC metadata.xml 684 BLAKE2B be4bc023868289d708b8deedc150eff4761956739b46ba76bd37779ed905ee9c6415636e5fb5bc794f637fcc3a9c58570e4bf3f6af11ef327bb8e3ad8f945963 SHA512 af6159546641c3dd0f9a840cfaab970b4a1b97575e0c5f4957476f6821c35190865f8cef3e22ecf8c581bf56a6c8a941c6d9e92a16b4fe38093c4c9d8862689f diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index f98da58998dd..763b105c51e1 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -15,7 +15,7 @@ RDEPEND="net-dns/bind-tools net-fs/samba net-misc/iputils sys-apps/net-tools - virtual/awk" + app-alternatives/awk" S=${WORKDIR} PATCHES=( "${FILESDIR}"/${P}-head.diff ) diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest index 68cc3300a44a..37b9de9e3cbd 100644 --- a/net-analyzer/prettyping/Manifest +++ b/net-analyzer/prettyping/Manifest @@ -1,3 +1,3 @@ DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79 -EBUILD prettyping-1.0.1.ebuild 477 BLAKE2B 8113d88cb10b321d688ae7e33a1bf816f9b199e8486baedc9bab264bf4afbe305d10287375ccff6359bab6ad0921718d5d558329a37a00df636159b504777dd1 SHA512 aab108fe1b8c6503d7e5435751e0641aeb634bcd7c022c857e36fe49dd30d3d851560579b2383344cc35c219550ca83674dbf07733b6e153d489e7990561a4ff +EBUILD prettyping-1.0.1.ebuild 486 BLAKE2B bc79f7b9a2f98e572f199d2ee1dcbcbe3c2054741a80f1cce6aad00e34b858a356be4dced8c161abc43afdd2dcd92fc70a5261914f239b7343ecd7d98f4c1271 SHA512 1b108fe6a419d9efc2181cab700a55146036aabf5cf5d92a76c551be99040598dbf6aff8ad95d937b39333ebbca97078b3712ad6aaf5580b9f5005e65bee53ee MISC metadata.xml 659 BLAKE2B 2d38a5d2e0f857515a58f5d405fc7b3d8bd2fcd8f31fe3438123d2c1681de7ed812f7c610bd48f7d17dd59d51f48c78adbf55cfb638148a22b05ca0ca3898105 SHA512 2af4b2f5b52dfb5827a03cbcab0ff11f1a5eab88aa87a6ab78dd35e004c4b42e4f5f14ff7f272ef2f5ebb4243062bfd2318cc96b1498e78962ee4fdf115f8d4e diff --git a/net-analyzer/prettyping/prettyping-1.0.1.ebuild b/net-analyzer/prettyping/prettyping-1.0.1.ebuild index ed84d65d0509..d8edee93db2a 100644 --- a/net-analyzer/prettyping/prettyping-1.0.1.ebuild +++ b/net-analyzer/prettyping/prettyping-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~x86" RDEPEND="app-shells/bash net-misc/iputils - virtual/awk" + app-alternatives/awk" src_install() { dobin prettyping diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index f7c1da2ec125..9fbd1444d641 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -4,5 +4,5 @@ AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 -EBUILD rrdtool-1.8.0-r2.ebuild 5516 BLAKE2B 2708acb85baed87bf54790bcf36b71f9005b54e90ca5c8f11ff2fdda4680b0d9847df4dad5e6bf9d9b8e9f83109403c035d1742142ee5b4def6dd22a2bdbbf15 SHA512 aef7862eb7758d9690b716590c3cdeaefdb6e1f4929b3e3d05a56f63ed4c3e57d18519f068875a00447bf42a4229a3bf775521e38fccc2b9189782508e3b77be +EBUILD rrdtool-1.8.0-r2.ebuild 5525 BLAKE2B 8208add85fe77e30cec5272703d621b9374fb59d599f8a5f876490ed316d7bb5031e29ea58651f9f508e9ebc2ddd63aea2838266973ac3acd0e77ca80a44dd8b SHA512 ca3a095ca75fa23a72492c942e5fa579388d6ec549f530a340ca10e9e6d403c23ced7f926387da410ef51a1ce497775924c78d6f3f84f15a963f5ceea92e898e MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild index 59979289af1b..faed0047ac07 100644 --- a/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild @@ -62,7 +62,7 @@ BDEPEND=" ${DISTUTILS_DEPS} sys-apps/groff virtual/pkgconfig - virtual/awk + app-alternatives/awk python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) test? ( sys-devel/bc |