summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
committerV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
commit46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
treedb33a91259730be84999e13a8d8168c799f50ac0 /net-analyzer
parente23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
gentoo resync : 20.10.2021
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin45243 -> 45232 bytes
-rw-r--r--net-analyzer/apinger/Manifest2
-rw-r--r--net-analyzer/apinger/apinger-0.6.1.ebuild4
-rw-r--r--net-analyzer/arpoison/Manifest2
-rw-r--r--net-analyzer/arpoison/arpoison-0.7.ebuild2
-rw-r--r--net-analyzer/arpwatch/Manifest2
-rw-r--r--net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild2
-rw-r--r--net-analyzer/barnyard/Manifest2
-rw-r--r--net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild2
-rw-r--r--net-analyzer/bigeye/Manifest2
-rw-r--r--net-analyzer/bigeye/bigeye-0.3-r4.ebuild6
-rw-r--r--net-analyzer/cacti/Manifest4
-rw-r--r--net-analyzer/cacti/cacti-1.2.16-r1.ebuild54
-rw-r--r--net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch29
-rw-r--r--net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch360
-rw-r--r--net-analyzer/cnet/Manifest2
-rw-r--r--net-analyzer/cnet/cnet-3.3.4.ebuild2
-rw-r--r--net-analyzer/echoping/Manifest2
-rw-r--r--net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild2
-rw-r--r--net-analyzer/iplog/Manifest2
-rw-r--r--net-analyzer/iplog/iplog-2.2.3-r3.ebuild2
-rw-r--r--net-analyzer/net-snmp/Manifest8
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild4
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild4
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild2
-rw-r--r--net-analyzer/net-snmp/net-snmp-99999999.ebuild2
-rw-r--r--net-analyzer/netselect/Manifest6
-rw-r--r--net-analyzer/netselect/netselect-0.4-r1.ebuild2
-rw-r--r--net-analyzer/netselect/netselect-0.4-r2.ebuild2
-rw-r--r--net-analyzer/netselect/netselect-9999.ebuild2
-rw-r--r--net-analyzer/packit/Manifest3
-rw-r--r--net-analyzer/packit/files/packit-1.7-configure.patch67
-rw-r--r--net-analyzer/packit/packit-1.7.ebuild2
-rw-r--r--net-analyzer/pathload/Manifest2
-rw-r--r--net-analyzer/pathload/pathload-1.3.2-r1.ebuild4
-rw-r--r--net-analyzer/scanlogd/Manifest2
-rw-r--r--net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild2
-rw-r--r--net-analyzer/traceroute-nanog/Manifest2
-rw-r--r--net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild4
-rw-r--r--net-analyzer/ttcp/Manifest2
-rw-r--r--net-analyzer/ttcp/ttcp-1.12-r2.ebuild4
-rw-r--r--net-analyzer/wireshark/Manifest2
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.8.ebuild2
-rw-r--r--net-analyzer/zmap/Manifest2
-rw-r--r--net-analyzer/zmap/zmap-2.1.1-r3.ebuild2
-rw-r--r--net-analyzer/zniper/Manifest2
-rw-r--r--net-analyzer/zniper/zniper-1.0-r2.ebuild2
47 files changed, 123 insertions, 500 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c4e3559ebf5d..3769ea973dbf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
index 7300d72803eb..c6d76cfc86ce 100644
--- a/net-analyzer/apinger/Manifest
+++ b/net-analyzer/apinger/Manifest
@@ -1,5 +1,5 @@
AUX apinger-0.4.1-fno-common.patch 193 BLAKE2B c13aa8e654dc58b9802a4b2b56b2bb4f9004a5556c46997dcee1e028b67d226057d9e09e779f91d08629bb5ff447ed6cc70739d8bcd5da39b5e59fa3bedf3e38 SHA512 f80653f38f9d4e5d6196f3c4d7643c8b9ed4198b56125a1348ea458faba7e202ffce8d36b5cc58223b76bbb5a4957405b4087d26cc67e203b55be7fe1eb1bf7a
AUX apinger-0.4.1-stray-backslash.patch 435 BLAKE2B 1a2cd0437152455ae965cdc86220a2eba3a3f30b8bb7515077982c03ba44a17a0e4de059432e0bcefc790d190d69bd128c192c01addc938a249a9573080fcaa2 SHA512 433521183c32c6bd414d5317e9c69fa2b28f3afeadaf47fdccb238a24cc245d347581d021e167bb58b191825547e349bee8b07d8a071f30771262e0abb62bb09
DIST apinger-0.6.1.tar.gz 134127 BLAKE2B 8f54d5514a5410973b5f44166741582fc16a2b0b1398eab001943e2924704ae5400e2c0ce4ca1694cadfc6fa3e47d395aa3d6affd7e4873fb172bf027c26c251 SHA512 eca6cee186d538200619188d9481154114ef9d7eae4f11f389eb61382f507d108bc64622fe99b1bae17ecc3ca7b2bc4ff4d0a3156ebf2913803e7be24b0d3f94
-EBUILD apinger-0.6.1.ebuild 653 BLAKE2B ec8919aa06aed60b9d708db4cebc956f33b1edd4cfe3a9747ab18692cac5e6e3e87d25d7cb35a87c6bf6dbffc6e91a74660bab96c53527ac9c4b0050dfdd2a7b SHA512 35a1debe8187771a35beea8771698bea355e3f27388b2c4bd4efc3d53a34f49fe67a007f5f2555b13b1aebbc18a58fd9beb3d5be407d149cd99743c4d91c1770
+EBUILD apinger-0.6.1.ebuild 667 BLAKE2B cb8d81bd6d599dc9b26ddfdfa93bbd3c69d5c7a6e8c0748dc7e3114c911f95a9c69a742db3dd1c83eefcaa6b2d9416033af5558cc15a321348fb03bb82a72bc0 SHA512 8be9c8f6f311a65bff735d1a0b4aa09b0f450986868d2371f1aa49a147c02c9f06137ca68dbde7b19dca56d612921ae55304ef40dbe394d9c5e5f741c0efe122
MISC metadata.xml 360 BLAKE2B 9588386f8e58873088c5846c8245612753d38ecbd96938c2329dc9175a34081aea587c9a320754eb6fabadbb947b6bfeacc4910e8b23f5dee52a47c9f73735be SHA512 83084dc04447a49b02e1e0449051780f878d5b92692368ba2f0a09d383f4b8cad8873e9be1a97e043d7aa441864c90a7e2d5f2c9d5c420bdfbf241bcaf806664
diff --git a/net-analyzer/apinger/apinger-0.6.1.ebuild b/net-analyzer/apinger/apinger-0.6.1.ebuild
index 46661a8ba3e7..f57c2ae57160 100644
--- a/net-analyzer/apinger/apinger-0.6.1.ebuild
+++ b/net-analyzer/apinger/apinger-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
DESCRIPTION="Alarm Pinger"
HOMEPAGE="https://github.com/Jajcus/apinger/"
SRC_URI="
- https://dev.gentoo.org/~jer/${P}.tar.gz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz
"
LICENSE="GPL-2"
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index ae584e89c4d0..56d9aeedc280 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,3 +1,3 @@
DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f
-EBUILD arpoison-0.7.ebuild 689 BLAKE2B 06b8e83b18b207b64463c8e880a4fdb2e794167a006e806695a471e9368e95e59aa2119ee47eef2573b4ac315f1b80eb47a4b2cc6e782c425be206081f4209da SHA512 2acb0792c5ec6a251acff5fd58ef4ed06410fc44fe4f68c30786eb41cfaf184ce8950804ad3f1a18d8960c95657d93ff476a430793038eec07cd00f02c366b7c
+EBUILD arpoison-0.7.ebuild 703 BLAKE2B 11b20022bf6f81343f739d43fc3f9b98581d6887cb4fa28d778d51bbe7a740572d5f670e374a6dff7ceae7caf430ab823183ebe1eb884bed5750001a58b159b2 SHA512 1a5cdc0766c1e6e968b0b335ccfe31bd003dcd63d913efab5c22e34ae980cfc082ad9cb8cebc092130bd8839e11a173079287977893fc9c97e7acf008a3bd604
MISC metadata.xml 359 BLAKE2B a850a908f091a7833a10206ca9ec2ea66bb02830ac93ef1b30aa785c2639e2b772116c2e86efa123fc4a853c5f6505bffb8e4d59ae7c92aea3647a559be97da1 SHA512 d5000b395c3bc2a94e079b30b8e834b4074cf55a0ad4e699545cc46f26135eed5913b749c06afcc82680d7b4defed934a49088c02f0e77233d03e0efe5cea49c
diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild
index edd9d089302e..625d227a73fc 100644
--- a/net-analyzer/arpoison/arpoison-0.7.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.7.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="A utility to poison ARP caches"
HOMEPAGE="http://arpoison.sourceforge.net/ http://www.arpoison.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 1d2a0fc951a4..7f41f06ec104 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -4,5 +4,5 @@ AUX arpwatch.initd-r2 828 BLAKE2B fc9836855074520ab6e8e4d7412f9094677fe25dba61bb
AUX arpwatch.service 362 BLAKE2B 45e527e7b5261a8009acdca0665077422235d5b21ebbb6818d878e21e4869fdf69317306bc4ef02617b8989a38f50a9467d69d904ada80fde1be61f77b806e2c SHA512 06424dea166eac23d4686fb96b1f14bdd46965bf400028f870ea2260e7d54a54663987c62e34e93730e6dea42e0e662578268252b31f29c26c0975bb4cb6873f
DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282
DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07
-EBUILD arpwatch-3.1-r4.ebuild 1907 BLAKE2B 01289c40c54d5256b4a0126ed6a47f1867b3e3c09eaae502cb99f380db186df6cab0afb62506ff57730c7e8a4f85e8f8256ef03be5f4d6cdd87d41c865898d77 SHA512 a98018fed7d74aa617991db685a16894a2d3c2c06458bf39a3368a745ba651ee18c9e31a74a64ed0e9a8c788bb0c6ef860680b14d452fa4218950e7b92451b58
+EBUILD arpwatch-3.1-r4.ebuild 1921 BLAKE2B 3b3b77407becf8aa321ee2d5527aff8e02c3350d1a65c5a683b2641fa371cf81a31e36ea0bde0b9af0c117b3cc5cfe51edf68fde6048b93d875ce4cf7481ecac SHA512 89c34eb210c7d8f613e1873818096e0d1a63dddb15ef13cbf9997f581db069f90d16fa7b9ec4f959e61a47218a4afa090030e27a8fe1920d3926fb259f4029be
MISC metadata.xml 742 BLAKE2B 6450c555cd2d073840a7b55b986dd06ef9bfcca83284747f960eec06bb2e4e20e3b60cf3f8321f7d737b1a9a45e256eca89a117466e0470ae30d90e49250d31d SHA512 f34b7397a71cad7092481bf0a4127aabc1bf28e9c781bf076610a3f11522053d7e3bd135ca3f983c8b0aa6802237015ea967a85e3dc207d67f04b063e1a482f1
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
index da747fae6e86..880939a9d30f 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
ETHERCODES_DATE=20200628
SRC_URI="
https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz
"
KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86"
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index f042c4f46607..ff0bc249d2f7 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -2,5 +2,5 @@ AUX barnyard.confd 663 BLAKE2B 23d63eb8f96f17b74179aa10e51aa7a92a8f10f548043fc67
AUX barnyard.rc6 620 BLAKE2B 7b59c2919d04b236e817fbe43baded639a5b918718585e07b73b01f96627370e7db44214a74c8bd535c6461585d2076c6640ca701abf7ebba1c82302fbe86ae3 SHA512 8dacb73e749b49fe3dbef061a8d5dea5d3f3861a290c846a892264eb2ebf75034121efaff91a352b6ab4639fab76ff11eeb39ce31f407a4d617c9c114e1862f5
DIST barnyard-0.2.0-patches.tar.xz 13152 BLAKE2B d68aa5298938e50bb1102628cd8ebc0fae55c12fd4094e86306a86aeab3786a096906e4b0612b3dbb0a2de6a8aeba8161fdcfccf3a6915f5492401892eaa8b57 SHA512 9ff4f45e12d12a6b33f22f32be5f258cc9352a53c91d4415c292231ee5e5b03d58ed988011df5d3f13ac0046dd02ff36e0f92b4b0044181f695856118bb9228a
DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6
-EBUILD barnyard-0.2.0-r7.ebuild 2195 BLAKE2B c8a2a80cd488ce4c0c4a9ce65445aec02a7eebd293c780ade9cdd31ad363296884d467586e0cece948d615bb1ee642af223c6d6745eda1e18d6ef80a8a5c7ec0 SHA512 2c55b97644140469ebbdc14672f9b243f24baca24ce2ca0db5ad27036f12feff156b2b873c5d479818dd8a87b3bb9df98ba25fe97469083a0abe7f096d8e7f22
+EBUILD barnyard-0.2.0-r7.ebuild 2209 BLAKE2B 5ade973f314f3bbb1f64ffea378235877c03ad972826157df0911f8980208551dcfd2008c442b084e88dbbcadaf1292332f01e23f0cb1b984bc06f9c8211d6eb SHA512 76f6d87b40186f268c212c6717f8e078a603b2eeb9b4fd64e557e43c8c28000a8b291f499439c16cd9e9c2b24252e3ca16721134f0bd53d6442a5e863954d280
MISC metadata.xml 477 BLAKE2B 2ab3e607a6cc5179827136af00eee7c3591b57906cb623a46ad533baa449de2c94dfc65758d660e57013d988c81c83259c55d457f5c249920d418714f12e1b73 SHA512 b7a26a97898fa4cc05baa15d0a43558f8ae9cfe6189a1bcfbbff48299febe2230d964612b368e2b40ac1f975d1e0fcfd018b530ae81583d6d7485f9866c6c2b3
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
index e6c4d3a4e926..94966b420485 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Fast output system for Snort"
HOMEPAGE="https://sourceforge.net/projects/barnyard"
SRC_URI="
mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
- https://dev.gentoo.org/~jer/${P}-patches.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz
"
SLOT="0"
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index 4401fd6157e2..0b3fa614a350 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -1,5 +1,5 @@
AUX bigeye-0.3-overflow.patch 364 BLAKE2B 35f659abba86474fb2d87eeb926952ba0e9c394770c17a964cc8d723de700484a889469f33b3d66f3c40df184dbfcd3d953c29c2ec13a4c4d833231fc0e97dbe SHA512 4076e00b11c5c11d432f52a536f6d32a6329b8946ea6a8db64d61c395728483e9631fd93d136390d3e34e7c05ce113f3b2e7ef2113f686bd0184b8a5cb436d18
DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af
DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0
-EBUILD bigeye-0.3-r4.ebuild 872 BLAKE2B 081eea9dbbcbd4c068be2d8839f9604019dbc8014f854474f67d83c35b2c43b8ad4da0af0e0eeb3a19ea1341326987001344e3bbed54b9305f765cfcbd18e280 SHA512 cc2df3f8ec764e8cec4a0d426f3eb7cf50d6f7bb57679109282b4132cb7f4e9f88cc67e11efed4482d9793161eb2792adc4c091bfa2f746ebcfe4d6a98bed51f
+EBUILD bigeye-0.3-r4.ebuild 883 BLAKE2B 5de9fcc71ed2c278548dfbd921e18583fd37f1f1310f202635a6d14a803d761f9ee384719a215482b76f9874e1e4138d128c46eb0aaf3b9076eaea9ba447f05f SHA512 1d4214795f1c8b088db64ef9cbc7642c0c82908f9d8bbdb05a3649b9fd646ac263f911a72209b9ff45ad423539d36e7f4e16956344437568fa2ec9a927d6c71d
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
index e9382d08ec47..f1e171347c51 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,8 +7,8 @@ inherit flag-o-matic toolchain-funcs
DESCRIPTION="network utility dump and simple honeypot utility"
HOMEPAGE="http://violating.us/projects/bigeye/"
SRC_URI="
- http://violating.us/projects/bigeye/download/${P}.tgz
- https://dev.gentoo.org/~jer/${P}-gcc34.patch.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}-gcc34.patch.xz
"
LICENSE="GPL-2"
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index daa0c26b23bb..9ce5de6b4346 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,8 +1,4 @@
-AUX cacti-1.2.16-CVE-2020-35701.patch 706 BLAKE2B 746fca9b32bc863fd701f86df53f22284de9ffec7d0ad42d7eb0376e27b9e482d82a482d937f40ec61fff41d3a7cec0fcda6e3282087c9597c32a4147e0a9c1e SHA512 f909820f8c57ca61571b15d2304567d3333563520cb5611f8f01c22c22e155104fa6958eda3605d66af7ba29b756ff826a259faf587b63e04ba20bcd09f8a9cd
-AUX cacti-1.2.16-XSS-issue-4019.patch 19600 BLAKE2B 3a9f2c7474a633c8633fdaaa5db71c124c486e796dbdbbfdc5ed53ece7cd0f45652b1e62a4355855f8512b03e5a4ca9189ee50dd2784cbd0e8d84ee9f131d0fc SHA512 f002b947c27c3b2a6ba8300eae456fca771d5283bfd9a7516239745e41b7b6521b7affed6122ffc3c8f7108a4de70cfbf2411970065bd47a9164b0a849656947
AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
-DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35
DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d
-EBUILD cacti-1.2.16-r1.ebuild 1111 BLAKE2B 15341dcd648cf686bd1f840538494b700d96df84a924b5badfe8034d03f2ce859bf9b498b45031459e23a8cc26127ab7454f85c697c4d26cced5d1862232a6a4 SHA512 94639a653783ce6589f523f5506bc6f15abc8f9f21b585b39fa168b3ed8404d34b257673a870dca10c9d99d85425735c5c4527fd54e8f62ed94ff668d47402a6
EBUILD cacti-1.2.17.ebuild 1016 BLAKE2B 3fd84d213f5f184e06eb129880a19efa6442e1004534688a7f68a2a72387beded0b1a27e0c7763e7b7c849a50c61400f0a0a2cae4341780c9dd2b011b7481d34 SHA512 33d434610d58e3962fc3f61b17b47bbf9aab2f00176053d497a4572ee2029a493aec9f27639f134ccacdaf1ff4b28cea2ca29699e136a409b30a26a0b3786f53
MISC metadata.xml 935 BLAKE2B f600d10bd7dfd3bce36a092f31a12a750548866bac21b5b66ff4fc4a876c554ee26d5c4f467830bd3fdcdaf63b0c20c53bf5ca1fb98d6497f84a04b3d8474a81 SHA512 309b48d93e91560458b50ef3c96f1da32a7b7d2dbf38eb4bdaad7b6acb4301528fb9f50b2e79398c7c6026f19efb66d2c79a46afe8e38ecd01f0a4d2d9310ca0
diff --git a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
deleted file mode 100644
index 78185ebd73d0..000000000000
--- a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edos2unix webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="https://www.cacti.net/"
-SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,pdo,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2020-35701.patch"
- "${FILESDIR}/${P}-XSS-issue-4019.patch"
-)
-
-src_compile() { :; }
-
-src_install() {
- dodoc CHANGELOG
- dodoc -r docs
- mv docs .. || die
-
- webapp_src_preinst
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${ED}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch b/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch
deleted file mode 100644
index f55b7b0a40df..000000000000
--- a/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/765019
-https://github.com/Cacti/cacti/commit/565e0604a53f4988dc5b544d01f4a631eaa80d82
-
-From 565e0604a53f4988dc5b544d01f4a631eaa80d82 Mon Sep 17 00:00:00 2001
-From: TheWitness <thewitness@cacti.net>
-Date: Thu, 24 Dec 2020 10:39:50 -0500
-Subject: [PATCH] Fixing Issue #4022
-
-SQL Injection in data_debug.php
---- a/data_debug.php
-+++ b/data_debug.php
-@@ -35,6 +35,8 @@
-
- set_default_action();
-
-+validate_request_vars();
-+
- switch (get_request_var('action')) {
- case 'actions':
- form_actions();
-@@ -123,8 +125,6 @@
-
- break;
- default:
-- validate_request_vars();
--
- $refresh = array(
- 'seconds' => get_request_var('refresh'),
- 'page' => 'data_debug.php?header=false',
diff --git a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch b/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch
deleted file mode 100644
index 1f09e572c860..000000000000
--- a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-https://github.com/Cacti/cacti/issues/4019
-
-From ef10fe1c340ed932dc18b6a566b21f9dd15933c2 Mon Sep 17 00:00:00 2001
-From: TheWitness <thewitness@cacti.net>
-Date: Wed, 23 Dec 2020 16:33:27 -0500
-Subject: [PATCH] Fixing Issue #4019
-
-* In a recent audit of core Cacti code, there were a few stored XSS issues that can be exposed
-* Also removed a few spurious title_trims, that should no longer be a problem.
---- a/automation_devices.php
-+++ b/automation_devices.php
-@@ -485,7 +485,7 @@ function draw_filter() {
- <?php
- if (cacti_sizeof($networks)) {
- foreach ($networks as $key => $name) {
-- print "<option value='" . $key . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . $name . "</option>";
-+ print "<option value='" . html_escape($key) . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . html_escape($name) . "</option>";
- }
- }
- ?>
-@@ -515,7 +515,7 @@ function draw_filter() {
- <?php
- if (cacti_sizeof($status_arr)) {
- foreach ($status_arr as $st) {
-- print "<option value='" . $st . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- }
- }
- ?>
-@@ -530,7 +530,7 @@ function draw_filter() {
- <?php
- if (cacti_sizeof($os_arr)) {
- foreach ($os_arr as $st) {
-- print "<option value='" . $st . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- }
- }
- ?>
-@@ -545,7 +545,7 @@ function draw_filter() {
- <?php
- if (cacti_sizeof($status_arr)) {
- foreach ($status_arr as $st) {
-- print "<option value='" . $st . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . $st . "</option>";
-+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>";
- }
- }
- ?>
-@@ -560,7 +560,7 @@ function draw_filter() {
- <?php
- if (cacti_sizeof($item_rows) > 0) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>";
-+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
- }
- }
- ?>
---- a/data_debug.php
-+++ b/data_debug.php
-@@ -969,7 +969,7 @@ function data_debug_filter() {
-
- if (cacti_sizeof($templates) > 0) {
- foreach ($templates as $template) {
-- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . "</option>";
-+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- }
- }
- ?>
-@@ -997,7 +997,7 @@ function data_debug_filter() {
- $profiles = array_rekey(db_fetch_assoc('SELECT id, name FROM data_source_profiles ORDER BY name'), 'id', 'name');
- if (cacti_sizeof($profiles)) {
- foreach ($profiles as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
-+ print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>';
- }
- }
- ?>
-@@ -1063,7 +1063,7 @@ function data_debug_filter() {
- <?php
- if (cacti_sizeof($item_rows) > 0) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>";
-+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>';
- }
- }
- ?>
---- a/data_sources.php
-+++ b/data_sources.php
-@@ -1361,7 +1361,7 @@ function clearFilter() {
-
- if (cacti_sizeof($templates)) {
- foreach ($templates as $template) {
-- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>';
-+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- }
- }
- ?>
---- a/lib/api_automation.php
-+++ b/lib/api_automation.php
-@@ -154,7 +154,7 @@ function clearDeviceFilter() {
-
- if (cacti_sizeof($host_templates)) {
- foreach ($host_templates as $host_template) {
-- print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n";
-+ print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>';
- }
- }
- ?>
-@@ -184,7 +184,7 @@ function clearDeviceFilter() {
- <?php
- if (cacti_sizeof($item_rows)) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>\n';
-+ print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>';
- }
- }
- ?>
-@@ -432,7 +432,7 @@ function clearFilter() {
- $hosts = get_allowed_devices();
- if (cacti_sizeof($hosts)) {
- foreach ($hosts as $host) {
-- print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . "</option>\n";
-+ print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . '</option>';
- }
- }
- ?>
-@@ -453,7 +453,7 @@ function clearFilter() {
-
- if (cacti_sizeof($templates) > 0) {
- foreach ($templates as $template) {
-- print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim($template['name'], 40) . "</option>\n";
-+ print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- }
- }
- ?>
-@@ -484,7 +484,7 @@ function clearFilter() {
- <?php
- if (cacti_sizeof($item_rows)) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- }
- }
- ?>
-@@ -718,7 +718,7 @@ function clearObjectFilter() {
- <?php
- if (cacti_sizeof($item_rows)) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>\n';
-+ print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- }
- }
- ?>
-@@ -1078,10 +1078,10 @@ function clearFilter() {
- <?php
- $host_templates = db_fetch_assoc('select id,name from host_template order by name');
-
-- if (cacti_sizeof($host_templates) > 0) {
-- foreach ($host_templates as $host_template) {
-- print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n";
-- }
-+ if (cacti_sizeof($host_templates)) {
-+ foreach ($host_templates as $host_template) {
-+ print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>';
-+ }
- }
- ?>
- </select>
-@@ -1110,7 +1110,7 @@ function clearFilter() {
- <?php
- if (cacti_sizeof($item_rows)) {
- foreach ($item_rows as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>';
- }
- }
- ?>
---- a/lib/html.php
-+++ b/lib/html.php
-@@ -998,7 +998,7 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou
- print ' selected';
- }
-
-- print '>' . title_trim(null_out_substitutions(html_escape($form_data[$id])), 75) . '</option>';
-+ print '>' . html_escape(null_out_substitutions($form_data[$id])) . '</option>';
- }
- }
- } else {
-@@ -1011,9 +1011,9 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou
- }
-
- if (isset($row['host_id'])) {
-- print '>' . title_trim(html_escape($row[$column_display]), 75) . '</option>';
-+ print '>' . html_escape($row[$column_display]) . '</option>';
- } else {
-- print '>' . title_trim(null_out_substitutions(html_escape($row[$column_display])), 75) . '</option>';
-+ print '>' . html_escape(null_out_substitutions($row[$column_display])) . '</option>';
- }
- }
- }
-@@ -2010,7 +2010,7 @@ function html_host_filter($host_id = '-1', $call_back = 'applyFilter', $sql_wher
-
- if (cacti_sizeof($devices)) {
- foreach ($devices as $device) {
-- print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . title_trim(html_escape(strip_domain($device['description'])), 40) . '</option>';
-+ print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . html_escape(strip_domain($device['description'])) . '</option>';
- }
- }
- ?>
-@@ -2385,6 +2385,7 @@ function html_common_header($title, $selectedTheme = '') {
- <meta name='apple-mobile-web-app-capable' content='yes'>
- <meta name='description' content='Monitoring tool of the Internet'>
- <meta name='mobile-web-app-capable' content='yes'>
-+ <meta name="theme-color" content="#161616"/>
- <meta http-equiv="Content-Security-Policy" content="default-src *; img-src 'self' <?php print $alternates;?> data: blob:; style-src 'self' 'unsafe-inline' <?php print $alternates;?>; script-src 'self' <?php print $script_policy;?> 'unsafe-inline' <?php print $alternates;?>; worker-src 'self'">
- <meta name='robots' content='noindex,nofollow'>
- <title><?php print $title; ?></title>
---- a/lib/html_graph.php
-+++ b/lib/html_graph.php
-@@ -212,9 +212,9 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
- <select id='graphs' onChange='applyGraphFilter()'>
- <?php
- if (cacti_sizeof($graphs_per_page)) {
-- foreach ($graphs_per_page as $key => $value) {
-- print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-- }
-+ foreach ($graphs_per_page as $key => $value) {
-+ print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n";
-+ }
- }
- ?>
- </select>
-@@ -260,7 +260,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
-
- if (cacti_sizeof($graph_timespans)) {
- foreach($graph_timespans as $value => $text) {
-- print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . "</option>\n";
-+ print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>';
- }
- }
- ?>
-@@ -293,7 +293,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
- $end_val = cacti_sizeof($graph_timeshifts)+1;
- if (cacti_sizeof($graph_timeshifts) > 0) {
- for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) {
-- print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . "</option>\n";
-+ print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>';
- }
- }
- ?>
---- a/lib/html_tree.php
-+++ b/lib/html_tree.php
-@@ -1138,7 +1138,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
-
- if (cacti_sizeof($graph_timespans)) {
- foreach($graph_timespans as $value => $text) {
-- print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . '</option>';
-+ print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>';
- }
- }
- ?>
-@@ -1171,7 +1171,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) {
- $end_val = cacti_sizeof($graph_timeshifts)+1;
- if (cacti_sizeof($graph_timeshifts)) {
- for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) {
-- print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . '</option>';
-+ print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>';
- }
- }
- ?>
---- a/managers.php
-+++ b/managers.php
-@@ -483,7 +483,7 @@ function clearFilter() {
- <?php
- if (cacti_sizeof($mibs)) {
- foreach ($mibs as $mib) {
-- print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . $mib['mib'] . '</option>';
-+ print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
- }
- }
- ?>
---- a/utilities.php
-+++ b/utilities.php
-@@ -812,7 +812,7 @@ function applyFilter() {
-
- if (cacti_sizeof($users)) {
- foreach ($users as $user) {
-- print "<option value='" . $user['username'] . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . $user['username'] . '</option>';
-+ print "<option value='" . html_escape($user['username']) . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . html_escape($user['username']) . '</option>';
- }
- }
- ?>
-@@ -1034,19 +1034,19 @@ function utilities_view_logfile() {
-
- $logfile = basename(get_nfilter_request_var('filename'));
- $logbase = basename(read_config_option('path_cactilog'));
--
-+
- if ($logfile == '') {
- $logfile = $logbase;
- }
--
-+
- if ($logfile == '') {
- $logfile = 'cacti.log';
- }
--
-+
- $logname = '';
- $logpath = '';
-
-- if (!clog_validate_filename($logfile, $logpath, $logname, true)) {
-+ if (!clog_validate_filename($logfile, $logpath, $logname, true)) {
- raise_message('clog_invalid');
- header('Location: utilities.php?action=view_logfile&filename=' . $logbase);
- exit(0);
-@@ -1171,7 +1171,7 @@ function clearFilter() {
-
- if (cacti_sizeof($logFileArray)) {
- foreach ($logFileArray as $logFile) {
-- print "<option value='" . $logFile . "'";
-+ print "<option value='" . html_escape($logFile) . "'";
-
- if (get_nfilter_request_var('filename') == $logFile) {
- print ' selected';
-@@ -1182,7 +1182,7 @@ function clearFilter() {
- $logDate = cacti_count($logParts) < 2 ? '' : $logParts[1] . (isset($logParts[2]) ? '-' . $logParts[2]:'');
- $logName = $logParts[0];
-
-- print '>' . $logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'') . '</option>';
-+ print '>' . html_escape($logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'')) . '</option>';
- }
- }
- ?>
-@@ -1807,7 +1807,7 @@ function clearFilter() {
-
- if (cacti_sizeof($templates)) {
- foreach ($templates as $template) {
-- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>';
-+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>';
- }
- }
- ?>
-@@ -2540,7 +2540,7 @@ function clearFilter() {
- <?php
- if (cacti_sizeof($mibs) > 0) {
- foreach ($mibs as $mib) {
-- print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
-+ print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>';
- }
- }
- ?>
-@@ -2804,7 +2804,7 @@ function purgeFilter() {
- <option value='-1'<?php if (get_request_var('receiver') == '-1') {?> selected<?php }?>><?php print __('Any');?></option>
- <?php
- foreach ($receivers as $receiver) {
-- print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . $receiver['hostname'] . '</option>';
-+ print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . html_escape($receiver['hostname']) . '</option>';
- }
- ?>
- </select>
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index d758fa6a940b..f979d2b726ac 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,5 +1,5 @@
AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1
AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
-EBUILD cnet-3.3.4.ebuild 923 BLAKE2B 218c669fc7d05192fdcd72617c634402da1f2bc3a76f91f6c33a6e997bc091372bb5cf1f0df5aadc92690661f30e51f386d38b0ae250fb9df03b16db761188d9 SHA512 3a856014e2eb6abdfcd9beecfdf86d76a1908d1ca5bdfa7ddde4cbd14164477bcc7422ca3c7dd572b0fb7084fdfbf439689d581d4cc02695d631daaba6231d97
+EBUILD cnet-3.3.4.ebuild 937 BLAKE2B 09b702b9266496c2b6e4985a07fd50d4abdee67ff771b22782cfe6d22618d21ac16296f2d87daa8a8ee92a868b3756aec5468dcddd358c237569cc0aaa040f48 SHA512 e4ab222f9a9cb2924e8cce13c6946b3cd0d48785c3e6ee891f6dd1ce786a72c016823e1fe21d32c3b4cb0e47f1064899b8f59e41947b417473cb7cff45bfe176
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild
index e5c251413259..2685af53c5bd 100644
--- a/net-analyzer/cnet/cnet-3.3.4.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.4.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="Network simulation tool"
HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index 28d9548dbae1..1d3a4619917e 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -3,5 +3,5 @@ AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af33
AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52
AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525
DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
-EBUILD echoping-6.0.2_p434-r4.ebuild 1394 BLAKE2B 591a3a4d5eb3057e3af156ce5c2696e947ba516cb20edd63fc37f2c8d8efc8d201a96f76fc74096913916646e78043073e9464eb4b61389e4a290e2a8a456be0 SHA512 91d2b2542a733262f5770574781c927bad4396eb42bf42b3964c7a863b05f699218b4322d42b515be5eca3bd874ff542b94ee5a8c6db6ac8c2d7b2d5254b3a38
+EBUILD echoping-6.0.2_p434-r4.ebuild 1408 BLAKE2B 31e8f9cf8d08ae22ac47cfdc7b05db308cbc432db3a1e4309d415eb820660dbe338b249b5e3374a8ef33b88dbd3c0523248eec81173c362cc2fc088441f2f059 SHA512 ea08c421b48791dc6f79d39f4a6c4214f18ea26f21147d42799a5f6fb0d8ba1629ad85108250a6d3130a85c50cbf800d5315ce287a25eaa8c71840a570c1d18f
MISC metadata.xml 703 BLAKE2B bda0e570028e3805432e43b1cd39a98e2e4d21c79a10a741038e66d7a24cb1f8d09361243c67fb970621e698ea3341ba8e68de7080cb3919f333efa089692510 SHA512 0246ee26042adcfaaeae171861eb9c8344430958d5bda151427b3c3007cb4db65c604ac115fa072f7e015a56cc06f8163adcb0cdf878dd86c0a17b3327c9b87c
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
index d71c50abb9f0..c623eb8d0390 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild
@@ -6,7 +6,7 @@ inherit autotools
DESCRIPTION="Small program to test performances of remote servers"
HOMEPAGE="http://echoping.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index 84e24123edc3..9486c2cb945e 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -2,5 +2,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811
AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34
DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed
EBUILD iplog-2.2.3-r2.ebuild 711 BLAKE2B d316c3319b05b81dc972e9bbfaa9b995de0d8efc184d4452ad9d88391f62a115db5f3ab9efee212dd2fd20d99f4fec7f41cfd14b03cfb455274dbe5bd9e2761a SHA512 bd905fd7a0a16565c57fc1e127756deef649c3b5ac8ff9f362bc305190070be9aab391db1bde97b4f7f8d5c8a9687d05aa611222d0bde46b1d992ded2022d106
-EBUILD iplog-2.2.3-r3.ebuild 705 BLAKE2B 6c0684735df2d67fdc627638ebc444c040cafb26fc545f00f6f4d3c76ac2899245ffc6cd5373da2a2d6130837b343f625fe5cd694e0058e00525c1e67ac4188e SHA512 8427570ca75e36dcbc79e711c9fab08d1ea24bf71b9d3d90e6980ccbe64c5233452ef12e87aa4996144665b966d30ca7e1cb826d63dbb176de6d7fbc1d8e6d99
+EBUILD iplog-2.2.3-r3.ebuild 702 BLAKE2B 6abe0ac6b74916e30436bb9f7bddb61e0ff63361f68c39befe0d88f335c19679640ea852e8608dd35ad21ac36ff08dde4216bca4fa512d5ac08332be7147fd09 SHA512 6e4001f8e8d268c42b62ce99ab9803de6d1c1776c7fc83af304547d25974b1ba7fc1c32953744c313a642e329eb6e89b15997d3994f47e6c5e40ff6dd1eeadc6
MISC metadata.xml 355 BLAKE2B 337b9d3630275e047ddd52222f2a94827901805a8e43cc316633048ab5ddf091f4300188d54f3eed58867b5a0f0efbbb5aa559f8182568104bb00bf2f4833afc SHA512 ae66cec4d69d91d7962a8b3b282fb429d008f6218e671d351dfae2dfc78310e066aa93e1a68dc00cd0b1ae61d0831ce6161fb5016edd6f1aa9120cb57903d384
diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
index 09cfb969491a..8733fa8e1a59 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
LICENSE="|| ( GPL-2 FDL-1.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86"
DEPEND="net-libs/libpcap"
RDEPEND="${DEPEND}"
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 71a1d790a227..7bb2dc3bfd85 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -17,8 +17,8 @@ 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.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3
DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.9-r4.ebuild 5621 BLAKE2B 4e7a0bcacd7d35addc863f2527cb8ce9c6c777ecfe2fc336b072b2b25eed7a388eeff3be3e3a52abb9c705f6bfbe17446e7ed2153867f29174c3093692bfb6f9 SHA512 c7d3fbb129a6c79675a002c0bd96728a60ed4d8d94d51f6c1b82d381c3df30cd9e86d76701bec87cfd1dae0cd7e2c7500ada0b07e7f311083bcab64088f78063
-EBUILD net-snmp-5.9-r5.ebuild 5660 BLAKE2B 4e06816e0f73142b1910c6e887c130e2ef60d8bdbcc948740fb4a330229152655da1dc04bb5bed5d6c505b15172d55daf304a4bd06ca1d560e67b1a4e70b78ad SHA512 fda3983d5c28f2bab36aa11b197990605f5677dfd698dcb398957085261aa7a30a4bac9cdffa89cddb8c263475c09f94ddd6fef320afb333dee18f2c03effcb3
-EBUILD net-snmp-5.9.1-r1.ebuild 5632 BLAKE2B c25017fad18ca6bd3cb935a20b3413c623bb3a92969f0571fdc15b4850f866c95036e98f17ccd04c2d6ff8767c75493127165e8b368180f186e7d9309e733e66 SHA512 9f661d5916033b30768699bc2ec2255a559c9ec6d95d8baa19f3af3659d67191180eede1b8c45ef9bcaf8ef7855fa2322bffc5fd90285952fcadbe2608919c86
-EBUILD net-snmp-99999999.ebuild 5567 BLAKE2B f2398dac2eec806c1a25335c3345220394eb26de535a9253c53c6690469727cbf6148a7e46a67193189678be6794e634a8627aca152d24166fe1658db2fd3cd3 SHA512 50ce4be6511a7a70f9f4e0e48101774fa4a4ceb1f39a0b3c615264a02b0f01049855f50822bac6e5cfabc312e6404570476667d3455c11627eba565cec864fff
+EBUILD net-snmp-5.9-r4.ebuild 5649 BLAKE2B 2ad2368c5417c17042296e2cd80ca3d1ff10d63396d47bf1ee134ce129440089c3c9615d25f4a0b63d86a608860d3052d0a9f86079da741bd454f09d24b21dd9 SHA512 8083919efe15a3a50ded5a9a2fa44775af327e09d59040a48af08319de756f3e4307eb15a69f1c75dd7e5559aff0afdf501a3799ae58075c7e9c4492f1d59952
+EBUILD net-snmp-5.9-r5.ebuild 5688 BLAKE2B 8c744f465bc65ea9b17d9b0549232bc28f65e9908b4c2481c189e84e68b6e62a2320bd2731a6e45ad83abdb7c22b2fb017929129318b1907ccd75852bcbc6d6e SHA512 a5d55867b08440fb09de40cc032b6fa53d434ae505cd0880fb04f12d0778993cfa8c43480d4bcce3a26f1d2af82a71037629ea7a115692f3165827d3f5a99cca
+EBUILD net-snmp-5.9.1-r1.ebuild 5646 BLAKE2B 8128a57b3e20c4ac78f3be7c1720145d97972bfc5e03151e9b2ecc43eb53a2aed72845e2fcce75bd4df669764909e30a4fdf6f554b60e6b39b77668119defe56 SHA512 32bd7bf425a899ca1a0dcbc0df578bebc6dd78a34128950962084ebeb1c1123708c4f6a77f4988aa4d5a7ec0c411840f70fa29c29f8271a5c8b9abc965b9ac5a
+EBUILD net-snmp-99999999.ebuild 5581 BLAKE2B 987b5729bee9b2fe0d3594dcd5a3b90952325f3148b20fd447e9a6534fc87b3ee4a83185d43d2664d91bcf482429fead1683033316a6c8549711cf3733823932 SHA512 b7597f0b472ef5aeaaa3b22969e44a942c33005a136250aa2a754b027437103a3e86546b025a3bab11a2c1467418bcd4138aecb0a99046332c1087afce0836a3
MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
index c2fac1bf01c8..98e333c0842a 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r4.ebuild
@@ -14,8 +14,8 @@ inherit autotools distutils-r1 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://www.net-snmp.org/"
SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
- https://dev.gentoo.org/~jer/${P}.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
"
# GPL-2 for the init scripts
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
index 790f91e2ff2d..3480413cfc4b 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r5.ebuild
@@ -14,8 +14,8 @@ inherit autotools distutils-r1 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://www.net-snmp.org/"
SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
- https://dev.gentoo.org/~jer/${P}.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz
"
# GPL-2 for the init scripts
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
index f04571172e6c..b46d354f22d4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.1-r1.ebuild
@@ -14,7 +14,7 @@ inherit autotools distutils-r1 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://www.net-snmp.org/"
SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+ https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz
https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
"
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 3d8752a4e2c9..41b0c6eba4d0 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -14,7 +14,7 @@ inherit autotools distutils-r1 git-r3 perl-module systemd
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://www.net-snmp.org/"
EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
-SRC_URI="https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz"
+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"
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index b5cc73918666..12cbf37c9eab 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -2,7 +2,7 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd
AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a
DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea
DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa
-EBUILD netselect-0.4-r1.ebuild 953 BLAKE2B 4fec5029b683d5c90616c2fd162a604984634f97e43b50b529d2fdcb01a557633fe63650bbedc796714e1accb9bd0743b9f69fcb3a459f1e8eb8f8c6a8e5f1c4 SHA512 4452e6d1342bc9456e023bd6e43d9ba0ce67af855e8d685a921cd111d19970d95481e22ab7159b636216a8d756e2264ff6f5037397cfba76068032bf9233f13d
-EBUILD netselect-0.4-r2.ebuild 1203 BLAKE2B b963ff6d6fe466517aba510de63f3d9ede48de1010d01dae72f72fdf8cf3c13db6ac29efe60acae128e67006d6871933111d1386c8b23ec4c0b5b0c9e7506328 SHA512 111e4cf8a5bafb438e1d1f3b0dcbfc350b50d29eb22e54021b6c3baf9dae34de764ecf9e41566b56635c62ad1679d19a907f1f43158bad2d310bf3ec8b01d10a
-EBUILD netselect-9999.ebuild 1144 BLAKE2B 56afffb99197144cfa811f79b15bcff52992ea6bb539e4eb51a7fc45330f5662476c9ddb14db54e2ebe868ea32ddf0c319eb8b6514dce089b0ef23f6586f32f3 SHA512 5478562b06da2080c5aebecaa267318afa19abd5b2dae30db2ccff0d329e8e0ecf55d548d1b4eb878cd35592f715154f6d958cf080bbfa91f9fb31d9c44e0bb9
+EBUILD netselect-0.4-r1.ebuild 967 BLAKE2B 4edc8e62bd917b2ab07b025dc1fd1bc2915f8b0c99c392e79c5bea64099f30f00ddbbcf84fb0d740d574867f10ef1b14318efa415510ef2d1defb993bb36b0e4 SHA512 fe9e8346cfdaf06fd8f99e46e0dda904ed4a293b3be6a0075d70554f185ba73057907f6297585dd294f70f06f5429a392b4809c0a538eccf11a7a4d24279b283
+EBUILD netselect-0.4-r2.ebuild 1217 BLAKE2B 083b5b932b5d4d95245511f4ae77a7c1c5ae420bef4d6bb0371ab83b08a50a550f22763878eda1841459d818283d9bf4d6e9c8d658656a47f800b3d86b6ef843 SHA512 a27fe0f38f9e38239d77bc921d3b06a8581ad904d9d655ff96384823e85d330bbe3126bcf0e459a7efcac5c67e6b53161080bdf36d369593ac6a74a3657676d5
+EBUILD netselect-9999.ebuild 1158 BLAKE2B bbfb32456f76e7a360e5b796c5bd6cda89cff53e3bbdefd37038655d38da420bb29d1b2e6179acb57c1c74c4ed1d48b23ae12e91177de1388d48887986394858 SHA512 928a53ecf818469203ee1d674d264ba7dd9f74206dd45f0d811b144f148ceb29e0c5016cd49d11f2db4ed8e6f81f7772333674d4fc9951ca391168737944ef81
MISC metadata.xml 364 BLAKE2B 488b33eefda9653419ada58299197665494566461fbb659916e6d345007c21262567f5953525e3f0eafcc45427e252cf54ad85a2f2cfa07d3ab535ac63238a4a SHA512 eaa99f81f964c01dacdbb0eaf29bff94ee589a42023031bad6d24d15e23515c15ade496383726bfb543e3f6d66636b0822968425820fa472a4c7094fdb15903a
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index cf688a073401..80066a138a33 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Ultrafast implementation of ping"
HOMEPAGE="http://apenwarr.ca/netselect/"
SRC_URI="
https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
- ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+ ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
"
LICENSE="BSD"
diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild
index 12cedb9b9205..c9f3a3a436d4 100644
--- a/net-analyzer/netselect/netselect-0.4-r2.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Ultrafast implementation of ping"
HOMEPAGE="http://apenwarr.ca/netselect/"
SRC_URI="
https://github.com/apenwarr/${PN}/archive/${P}.tar.gz
- ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz )
+ ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz )
"
S="${WORKDIR}/${PN}-${P}"
diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild
index 7fee270c477b..5ed3fc2fde64 100644
--- a/net-analyzer/netselect/netselect-9999.ebuild
+++ b/net-analyzer/netselect/netselect-9999.ebuild
@@ -8,7 +8,7 @@ inherit fcaps git-r3 toolchain-funcs
DESCRIPTION="Ultrafast implementation of ping"
HOMEPAGE="http://apenwarr.ca/netselect/"
EGIT_REPO_URI="https://github.com/apenwarr/${PN}"
-SRC_URI="ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz )"
+SRC_URI="ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-0.4-ipv6.patch.xz )"
S="${WORKDIR}/${PN}-${P}"
LICENSE="BSD"
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index ae28a041ab63..5be4a990e976 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,5 +1,6 @@
AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
+AUX packit-1.7-configure.patch 2331 BLAKE2B 0d679c4361d9cc66bb15dcb4d8d6df86d6c4790919bc49f898ec9f489a6e7535db9d1887db30664c6119948701d048cbd0dfd3272be7ecab89fc04b5fb01d41b SHA512 dd82380b482e72fbbf8678cfc21e4117512b35e62946f9600f57710158f45152b61e712e487c07100fa2b5ce1a84f86af7c5092bcaba5bdea9308ea076119d41
DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
+EBUILD packit-1.7.ebuild 696 BLAKE2B 79f017339ebf1f13cbad3d3520700602667d85e1e56fb6018cf0f71ae75aa46618336ea23a578e7e4a600c469f08c5adc46b1f2068d18b0f30eaaa1a601025fb SHA512 00dc5a054a9ec939fab3ba7f5b01bdc665045b9ec5cbf2a2ec8ae9db78d51d9e45878eca34ffa8acf1cd0b245ef3b20f49a89d6184b1e375b9dd788f1c4dd464
EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/packit/files/packit-1.7-configure.patch b/net-analyzer/packit/files/packit-1.7-configure.patch
new file mode 100644
index 000000000000..0f87f0408d8e
--- /dev/null
+++ b/net-analyzer/packit/files/packit-1.7-configure.patch
@@ -0,0 +1,67 @@
+https://github.com/resurrecting-open-source-projects/packit/pull/19
+https://bugs.gentoo.org/816753
+
+From 030cdc3f6ded1d206ca16dacc19aef181adba708 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 14 Oct 2021 08:11:24 +0100
+Subject: [PATCH 1/2] configure.ac: fix autoreconf with newer automake
+
+Newer automake forbids repeated calls to AM_INIT_AUTOMAKE.
+
+Bug: https://bugs.gentoo.org/816753
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,6 @@
+ AC_PREREQ([2.69])
+ AC_INIT([packit], [1.7], [https://github.com/resurrecting-open-source-projects/packit/issues])
+ AC_CONFIG_SRCDIR([src/main.c])
+-AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS(config.h)
+ AC_MSG_RESULT(beginning auto-configuration process for packit...)
+ AC_PREFIX_DEFAULT(/usr/local)
+
+From f62d3d40ff99ac39e7cbdea9991bec639a16d3a0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 14 Oct 2021 08:12:14 +0100
+Subject: [PATCH 2/2] configure.ac: don't ignore failure to find packages
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(libnet.h,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+ echo ""
+ echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+- exit;
++ exit 1;
+ fi
+
+ AC_ARG_WITH(libpcap_includes,
+@@ -161,7 +161,7 @@ AC_CHECK_HEADERS(pcap.h,, LIBPCAP="no")
+ if test "$LIBNET" = "no"; then
+ echo ""
+ echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+- exit;
++ exit 1;
+ fi
+
+ dnl Checks for library functions.
+@@ -181,7 +181,7 @@ AC_CHECK_LIB(net, libnet_build_ipv4,, LIBNET="no")
+ if test "$LIBNET" = "no"; then
+ echo ""
+ echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version."
+- exit;
++ exit 1;
+ fi
+
+ AC_ARG_WITH(libpcap_libraries,
+@@ -196,7 +196,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,, LIBPCAP="no")
+ if test "$LIBPCAP" = "no"; then
+ echo ""
+ echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version."
+- exit;
++ exit 1;
+ else
+ AC_CHECK_LIB(pcap, pcap_setnonblock,, SETNONBLOCK="no")
+ if test "$SETNONBLOCK" = "no"; then
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 6f454fbc9ba2..a1576a6b050e 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools
DESCRIPTION="network packet generator and capture tool"
@@ -19,6 +20,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.0-noopt.patch
+ "${FILESDIR}"/${PN}-1.7-configure.patch
)
src_prepare() {
diff --git a/net-analyzer/pathload/Manifest b/net-analyzer/pathload/Manifest
index 9d1d56168644..c72e2ccbbfbb 100644
--- a/net-analyzer/pathload/Manifest
+++ b/net-analyzer/pathload/Manifest
@@ -1,4 +1,4 @@
AUX pathload-1.3.2-make.patch 509 BLAKE2B 317ae2327725e2405802f08110055c970d430db0710ed82594bea5d1148bdb1f224ee335692d73713f8efcb2032d0efe54fba40a474f2f20f23fbefa76322c7e SHA512 b7e4ae8a952f9d0e8cc1ff038bbecda8164817da0d38a3d73b55cecadc550784731aa2664e2f63322b7a38fe35440d01ad12663409d7b4b67d8c5a25f844a234
DIST pathload-1.3.2.tar.gz 68524 BLAKE2B 0ea27000647c292e4d04c92574dc2d63fcdd9c16be57d9af49df8651e6f8905561c70f48b9854c69a16c4b3d16fc8bec61ffed3cbbdad7e1f18e2209e9b4f199 SHA512 9fef51c86b8aa2c28a33effe5a5bff36eebc0812f6d6744fac93df46ec0cbce8f5977d24b6ac52442386fb263550fe46e639c4a3ff4612fe92ad09d6595e5d7f
-EBUILD pathload-1.3.2-r1.ebuild 610 BLAKE2B 77da658a903ba4d575d266be9ae035e9986751cc1377c4185232c547349536bc765c65b87b307b7231fd92dad535150c34ae558d75e2bbcde38bb841141e2905 SHA512 f40a17da4ae2e6995079a658b2008a172057c9fda72f485031461bbc211bab041b82920ac85b937fce898925059338cdc6b5cfcd73d3e03459448f7c8bb999c5
+EBUILD pathload-1.3.2-r1.ebuild 624 BLAKE2B ac9f2f8b5e93eafef43766259cdff75e5d456857fefda65fdb99c27e15b42e107ed97dd6add36f6d20e99240d0b551a7d7138be579d957625a0a69d7e825b1e8 SHA512 3b4698669cec7d6ff16c5016ad31f93540a0716b149af04961883c70e1ca2d783a72671080da34f945025f2dcdc181c21f55be807ae845f3981fb02303e9e943
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
index 27b8252d8e52..47f7848cc5a8 100644
--- a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
+++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths"
HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index 35d35f25920a..0230e0669553 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -3,5 +3,5 @@ AUX scanlogd.rc 382 BLAKE2B 086a833826e21d94c5e8d8bca522dcd69f8a1d42164094b0bcbf
DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b
DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a
EBUILD scanlogd-2.2.7-r1.ebuild 903 BLAKE2B 81092044beb603269002db1767c42c2d9a1028842307f012699ca8f2d2c5673f7d4ffe30346e349e667b9c7d0a3e901fbdaf7ea5eddbbb75b52a4e68807a7625 SHA512 eceb8f2d589dbcc0e4786a34e6f8c9ef3a7037715cdfa133da2e4e1b697222ae224056a537124b95e7032e684165c99e47661561d9342a8d64d5c1e0342ca3f7
-EBUILD scanlogd-2.2.8-r1.ebuild 919 BLAKE2B b0b643c645c3158a1d221a0783ab975667818a01c72aa2782348a45c5c53be6c4f2389485e204ed5044f1c722f85ef9a0bb47acabcd8bab2c5669cd7453bc4bc SHA512 197f6aba10a39537aa2d561df78fdd44ac770de8f65a49d2526d46787b4a8c4bbcfbfd4c73f5d9e90623bc23291e8fb7f52ae022912c8a79f9d7c03e425bd806
+EBUILD scanlogd-2.2.8-r1.ebuild 917 BLAKE2B 68d4b6ee3ef7b23c02f38656f199be2c346ccc49426b36f8dfbfc013d61b5f4a339b9a453a678e1575f517128ce341910b9c3ce3745ee65bb8ee3a1f4a02fe80 SHA512 1c1d6719679b061aa361fbdf3170416adfcaf1c7464fd1699fb40345e32038a59a8b6f279da6f06bb2d8e439e758232bc06b4595a04063dd725cd7cbda40a2dd
MISC metadata.xml 444 BLAKE2B 311531fa01cf8b3e80b424f6bdabc9bf95ff66bed3953f24c978f36a98f5e08ecd674a5b7b414d2bb626bdda800e9d81f0388af5f11408b27f5bf6a7a097dcae SHA512 6def253f68d2423834a6d13b9b99f03a511da11a831a4b83151d3d310a769ad56ad9d848a02f4b2d3f2806117f1d7a47c5c2fe444e365d622f0fce0bb65d3b68
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
index df7a9b460ecc..0e6c20df4bec 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.openwall.com/scanlogd/"
LICENSE="scanlogd GPL-2" # GPL-2 for initscript
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
IUSE="+nids pcap"
REQUIRED_USE="?? ( nids pcap )"
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 1276a0591945..f311186d8a3b 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,4 +1,4 @@
DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 967 BLAKE2B 1e7e46eb3e693abfd58787468ff7c6ae3e7b77896c27f7022fbaaa9589bd962c3f9f99121c517151be2707dc967771d8296271ef246bca4b7d8eb2408a612bf6 SHA512 40cfcfc62e8b66c3b0c8d7dab4b9fa591653817f4a135efde647cdaeb7ed1074e89d73bdf346c41d9e160110aab72432df51606a2a5af1a63e0c438749f49d54
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 995 BLAKE2B 7c7660cd46a9e8803c0efc13f3b8025d537f8c2d9971820e487158faf642a26ce5c5a26a6b4683cd8f7a447d1268f6bf83923f864f7bcc12d7430c8f3544a790 SHA512 fb8d94c007e173085b258ea2b8c8b16a52f42ae0bb0b76826d19b4e5d8f7abbe2aced03cf6c2f200e26bdb6c546d656b48513198e764721ffc812507484582c6
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index d40f8a60a493..84675a594205 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -8,8 +8,8 @@ DEB_PL="1"
DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="
- https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz
- https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+ https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV/_p*}.orig.tar.gz
+ https://dev.gentoo.org/~jsmolic/distfiles/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
"
LICENSE="BSD"
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
index 377b07b5e2b0..45ed518954be 100644
--- a/net-analyzer/ttcp/Manifest
+++ b/net-analyzer/ttcp/Manifest
@@ -1,4 +1,4 @@
DIST ttcp-1.12.c 23690 BLAKE2B 972869da1e2e945702e6852648166eefae224b39715ef8495526ec7cd33cdb1e69fa10bb356a96e701f8b597c547b3090956320f947a02f1fad0b12d027b7e32 SHA512 8fc800b05fcf3590d15a87983ac7abc3646c6d4a89f7cc6b91e495066a90a6ce21f7bd7b6ab21e09f07bfa20c39bdc7bcec479449d7cd2b88639dc6cca4a432e
DIST ttcp-1.12.tar.bz2 8086 BLAKE2B 42ec3d82d56ef28527c096be7b6ea568997f0028ebf51811974fec8c444a39785996b0a51eedff6cec6c53f215e4300a3dee91e45f54dbe979d1d1c42e792ab1 SHA512 2218f801a04964dcc684bac2957f892569e4458eb7770e26d4ac5a9a5beebb16b9191cacd8e60cceee306b8fe53000248b52457cb679a3d12ad4308bb0066dbb
-EBUILD ttcp-1.12-r2.ebuild 622 BLAKE2B f12a128da60eb5d3ad277970ddc6ae2fd71aababc01f0da558b069c88c683c8cd0ad07a5c4c7dc85b9ec45878352d966c5274bd7de4d6da35af08d746c12df0c SHA512 b5a90bbf1163e6c829377dc21b64aabe666310611d9e703d46108411556772b0277f3dcd1e5f56972b41ba538fa8a1d835884540fa34689f1f834fdf3d0ecfa7
+EBUILD ttcp-1.12-r2.ebuild 633 BLAKE2B dd298aa4886a2d70ec6d7969fc0dc4aa08b43d8b680c29364e0746b659477e6f13965a7420e4a0895d84b77dba706be6ffddbb730094a32bb8f654b5a245b49b SHA512 40e90723480e231afb4c3ee51fd791ee672d4c8248d24cdc228986c66a208dba2f09b2ad5dfd04d608fcf8dcd72b7b4cca490a417ef3cffab259cc353e42d476
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
index 49e46e02dbd4..6ef77f5b49cc 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
SRC_URI="
mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jer/${P}.c
+ https://dev.gentoo.org/~jsmolic/distfiles/${P}.c
"
src_compile() {
$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ef6c006f3c63..1c2e73bb8aa0 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,7 +5,7 @@ DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747
DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
-EBUILD wireshark-3.4.8.ebuild 7267 BLAKE2B 88640570a30e4f768cde22e9465db4f3f88103f59c481315ecca850e823c6860854cf7e35168aabcb01e03e6800503b1c06d5dcbf642a84ac9ccb064c5fc2c14 SHA512 3d236e853889a637ef9e6445373f7a7500a024777f2ef979855d8d60659e1265e3d3dae6965733bdc5a346ddeba2a18363ca32b8eec89c086b2a4f8b6056f280
+EBUILD wireshark-3.4.8.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
EBUILD wireshark-3.4.9.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
EBUILD wireshark-9999.ebuild 7271 BLAKE2B 3251502459142ab9115b5c3d8a598c61a1a3adad28ad9ace5ec1911e33b9022df22b790eb79973b1d6b0cad6f1c203f17698266d0ce0a1e2552bd322fb8a8a2e SHA512 2db3952ce3bfb7c21cd9fdd5d0530a4b34d21129a246d3b4c45e63622690b538888965eeadc4071842bc46a5282166ee8360638f032966ade6ed2bc3ac8943f5
MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
index 470019b2ab7b..68cb4ab7a929 100644
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
S="${WORKDIR}/${P/_/}"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
fi
LICENSE="GPL-2"
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 0b45e999b17a..d2b6f5cd3508 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,4 +1,4 @@
DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
-EBUILD zmap-2.1.1-r3.ebuild 972 BLAKE2B f43eb3b18197a55705a1d7ca880534b1c729b4198dab34edb1c56f6a95b9cd7731d976282a6bd264aad63838c72084c837c0fab42c766a075e3ca33a9ff26eb3 SHA512 7c95d6a696c8b0b38785c87b42670fddac9000dd30d3e305f6185788a952ceb5964ebccbd183d0bb52b887b7c1b0a902c07a3adeb61844ec6d14128c9bbaac92
+EBUILD zmap-2.1.1-r3.ebuild 979 BLAKE2B 3f7bd68fc3e7e1d4fc0142f7b5504fdaa601ac06419a2069bcc9b380af201e010a3fc1fff51f58dc92bac1864ee8ed9ec265b4b25b8ef2ae079e33ef042ef57e SHA512 1c51a0bd4f222088c83b788f6be64cd2b4df5e9c0c386d91c896f520f717d0570fcedeafb1f6b6c8e20cc4fb0ac07ec76d4a2f73b9eed91cadf7334c3efe8eb6
EBUILD zmap-9999.ebuild 695 BLAKE2B 5706610795e68a00509c8202bfbbd977e8d77aa41083289aa8cdc5ea41034258c21e20efd7793fa423e43a0c1db9cb380d138b5228b4a99d689ee87af7c0f007 SHA512 a4a48dc87a2dfd6a6c49cbf91609ab259c7c1e894d25404202399d6bdf5dfdbc0eb6b0acc48840de0c35f29dc8b44008a053b1f277587a4902207401a914869d
MISC metadata.xml 1103 BLAKE2B e4f1a96e95895158f2ae5eddfd27705b3838a50b3b2188f6ab1b6ea8cf1713d1e7519e3ba61c87f82acccf59c172f559f68fb55f2d8885cd99ae1450475f483d SHA512 090657110d0e299669504e3f021147d2c4601783a9240326d2cd5c7965c7ffeecef6512455f57f54c7056a9da8b312a8f89b18ed7c309a797ea044e80a506f66
diff --git a/net-analyzer/zmap/zmap-2.1.1-r3.ebuild b/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
index bd667e0454d8..cb72b0462e21 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
IUSE="mongo redis"
RDEPEND="dev-libs/gmp:0
diff --git a/net-analyzer/zniper/Manifest b/net-analyzer/zniper/Manifest
index 0402ccca4489..b426b6c7f7ed 100644
--- a/net-analyzer/zniper/Manifest
+++ b/net-analyzer/zniper/Manifest
@@ -1,3 +1,3 @@
DIST zniper-1.0.tgz 20324 BLAKE2B ac13d55e6b59128a0336a27b73b356800d7cc4f1aea82997aee967f26b33e05f62e740ae034bea54ffb15109e3841fe503591d631be843f123466e941461037b SHA512 052683628c8094c402fd042b6329ca799bab594debf35c4e8b4f422e58b67f1acba8b40b335e519f1d2f1baca6c716be40718fd1089020a86c97c011da7003d1
-EBUILD zniper-1.0-r2.ebuild 795 BLAKE2B c5459301bba31d31208298a02d0654470d38377b18d204b8f92c8590f803231cfedd7d0b50e4ccccbe184fd8936b39ce71b9bc3c2feee8247b6eae19d6b8da8e SHA512 5459bd929d95c60ae95b01f813e7e3971facb5b953f124d247edf08bb34d96dc7374d1f3a13a73ba53b7f41c4096c74655d479d82b09b43e55be3471b1f72f94
+EBUILD zniper-1.0-r2.ebuild 809 BLAKE2B 4ad11929b81f13e1146f30c23de81062779b45ba52061401d4ca7ba23a17db9dd40e413b823752ea2ad97e682aecde1e1f6b1aa22db8d8e2ff663e6d0239a4cf SHA512 c70f4b0d381c87c7f92083985ca587e79aa7cdb868792227f72479b2fecd0e5ef75bf0964344b04a32bfec3999e1ec0d63f3d81184b6fe58313f43328e54b4ac
MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/zniper/zniper-1.0-r2.ebuild b/net-analyzer/zniper/zniper-1.0-r2.ebuild
index 86991e258434..e96de82264dd 100644
--- a/net-analyzer/zniper/zniper-1.0-r2.ebuild
+++ b/net-analyzer/zniper/zniper-1.0-r2.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="Displays and kill active TCP connections seen by the selected interface"
HOMEPAGE="http://www.signedness.org/tools/"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz"
LICENSE="BSD"
SLOT="0"