From 3ca7a521e79841f7247feb67780a70722c997d55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Sep 2022 21:10:49 +0100 Subject: gentoo auto-resync : 27:09:2022 - 21:10:48 --- net-analyzer/Manifest.gz | Bin 44723 -> 44713 bytes net-analyzer/fail2ban/Manifest | 4 +- net-analyzer/fail2ban/fail2ban-1.0.1.ebuild | 133 ++++++++++++++++++++++++++ net-analyzer/fail2ban/fail2ban-9999.ebuild | 12 ++- net-analyzer/wireshark/Manifest | 2 +- net-analyzer/wireshark/wireshark-3.6.8.ebuild | 2 +- 6 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 net-analyzer/fail2ban/fail2ban-1.0.1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 78c8901bfc64..b0d8a4befcf7 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index c57f76c0a611..89df75a58997 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -5,6 +5,8 @@ AUX fail2ban-0.11.2-fix-systemd-test.patch 863 BLAKE2B 4f506097ceb1d62a076d695a5 AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0 AUX fail2ban-0.11.2-upstream-openrc.patch 8205 BLAKE2B ee85888dbd5ed9b7aa5b8edaba7a0eff430df4677b33c37223d04b46d8b39ff29ded81be8fdd77d0e92e14654e2fb9726064772232af393a053bd3234843218b SHA512 bc4d3ba2c8c1008efe128abe07f6c5125479bf4fb5b96c38b9e5e6401da30faf1a58242b1e01e71638ff922c7e020e16b789f013a0227a8aa6f5bba232dacfd4 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 +DIST fail2ban-1.0.1.tar.gz 582122 BLAKE2B 1fe1e5b3d6a1790304c29066b7a8edcb5a6ea11bea6fd8a2bf5f42a4725db1d5bfdd9ed1215a51bfc0eeccafa8a0e93c45940e897ceba7335965126f9b913ab0 SHA512 a4d0ee5405225b1ec950f3209bc304c1168c644d06309a187d77119f6bea12c382db046130a86411aad4210b458a16ee092269dc7953400950969a34550c6da5 EBUILD fail2ban-0.11.2-r4.ebuild 3867 BLAKE2B 5119d5d09bb26701bb6f740759437aa4c1f52f4cff3eec90729291c5ff742ca7cd349b32d9fddddbf441b07f48c489da7e18dba5daf47f668c45c9e96aae4851 SHA512 a3dd3e4d7b8ede3606282366eeede6a5fc2b817cb7a9004476e84ac2d5dc6eb813e25abc74fa803d1f7a0349356121aa2c790b21c984a18d0a5e08edf0ac3e01 -EBUILD fail2ban-9999.ebuild 3592 BLAKE2B e012b5ac063218af64f4299b2666f2dabc1dd2a497ec049479d058b0590cf3e9531d03d6fde0373bba7f77be83df360e01469d7470637a65860e4ce4609f8ac6 SHA512 056cd95cf7673b5fbae675ebe6c9598cdd4be046003b48e843621127260275f76e98fd5367d626e580df91479e691b522ed288675144f4fe2aa3f7f062d02185 +EBUILD fail2ban-1.0.1.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a +EBUILD fail2ban-9999.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0 diff --git a/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild new file mode 100644 index 000000000000..cf108a52442c --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{8..11} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd" + +RDEPEND=" + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + || ( + dev-python/python-systemd[${PYTHON_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_USEDEP}] + )' 'python*' ) + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die +} + +python_compile() { + ./fail2ban-2to3 || die + distutils-r1_python_compile +} + +python_test() { + bin/fail2ban-testcases \ + --no-network \ + --no-gamin \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -r fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} = 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then + elog "For most jail.conf configurations, it is recommended you install either" + elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" + elog "to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi + + if has_version sys-apps/systemd[-python] ; then + elog "If you want to track logins through sys-apps/systemd's" + elog "journal backend, then reinstall sys-apps/systemd with USE=python" + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index e4e61c3a52a1..cf108a52442c 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -1,20 +1,21 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{8..11} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles DESCRIPTION="Scans log files and bans IPs that show malicious signs" HOMEPAGE="https://www.fail2ban.org/" + if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}" + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" inherit git-r3 else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi @@ -59,6 +60,9 @@ python_test() { --no-network \ --no-gamin \ --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -r fail2ban.egg-info || die } python_install_all() { diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 94cdba867048..c97b409640cf 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -9,7 +9,7 @@ DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B e4f3a9aca102a2f9fa519e429ad262f2 EBUILD wireshark-3.4.11.ebuild 7457 BLAKE2B 05a0c93f8b8137ecb865ad4cc5f409685c79ce8dab0694e2d89b18bda7b8760e6162f5bdd4843fb8e5a21c69cfd62608b31fcb707636c8f6592c5664f64ccf55 SHA512 51cb14b1866282aa3bc83d697aaa999d1ab2a839fcf778483bd290f0366f9a105b5f2813c00f67779c1df60a443cfb7243176857e3ee5b91549447a941b75509 EBUILD wireshark-3.6.3.ebuild 7088 BLAKE2B 739c59ec85023365cd17a6ed7e77f1d9a50a541bb19c53d2df6848895c0f7e21c9d76d72f2246dd1ca1df8a4fb32cda36349417140e054bd3064a62eb2b673c4 SHA512 c47811d1cb475de60906b2bff0f6423c0eb9a955dba9d4e7cf378022b028665c3d8e7c315ca5afc886f581a5f6dd450e65b976942e57d3d602f31e1863196d4f EBUILD wireshark-3.6.6.ebuild 7286 BLAKE2B b38c93d1d5e04baa2e2b93916f31c60b832a33e67772788c9ad32dce2fc389b95d5b4f502db4bcf91568e0e25d4c4583ec296788c256b9560f90d64d3e7e55b8 SHA512 998880fb8514364ec6d193a63a0a706075da934ae84e29e843fb6efab03eed829c4f3c97199999e1dec188f7845ba3a79196ef7b6b1df828c666f4dce945d31c -EBUILD wireshark-3.6.8.ebuild 7287 BLAKE2B 06d94054d433adda14fbe61d63d6cd9230f0a126fae7352586b5ce300cf54542877815aba55dd2473f7f21f1ec3b6feeaabd781325dddb1582848d8ed1bcf3a7 SHA512 3232f3c97ca079d50e787f1717be89e7f665eee086d9e27dceaf1cc9a1f0321a244f57ac3b5b6ca2ef135a3958d7694c0ecc0f90399480c63783b472b254bf4a +EBUILD wireshark-3.6.8.ebuild 7286 BLAKE2B b38c93d1d5e04baa2e2b93916f31c60b832a33e67772788c9ad32dce2fc389b95d5b4f502db4bcf91568e0e25d4c4583ec296788c256b9560f90d64d3e7e55b8 SHA512 998880fb8514364ec6d193a63a0a706075da934ae84e29e843fb6efab03eed829c4f3c97199999e1dec188f7845ba3a79196ef7b6b1df828c666f4dce945d31c EBUILD wireshark-4.0.0_rc2.ebuild 7763 BLAKE2B af1c84e4e7bab4f2050cc7c7ea2e498a9cc725ff2b5193b9bc691123198c34c2fd4036099328d0feed1d37f27bae9c21c5a31bf326d8581662e68408d9380770 SHA512 b0ee44b576ffb06019f79f44854c97cfb17184cbf8dcb177089056cdc8a762fbe2d563945cf673cd20cd236504e7c1fca630a5ee4ed73bded18d5b6a18227bf9 EBUILD wireshark-9999.ebuild 7763 BLAKE2B af1c84e4e7bab4f2050cc7c7ea2e498a9cc725ff2b5193b9bc691123198c34c2fd4036099328d0feed1d37f27bae9c21c5a31bf326d8581662e68408d9380770 SHA512 b0ee44b576ffb06019f79f44854c97cfb17184cbf8dcb177089056cdc8a762fbe2d563945cf673cd20cd236504e7c1fca630a5ee4ed73bded18d5b6a18227bf9 MISC metadata.xml 5459 BLAKE2B b70c4a0bad70faa4307870203662510479fbdad88e526b3cef966483406918a53c10fd3c134640e5b7f9280140a3ddf63c5ab50ec12b681233cb746dc4ac17bb SHA512 506c668b0fc6d0d1a2e4b6a09fef39c92fd4a9c03ed51968156c184a47c5ea14af4d794c17751edf58302c889e4278d7ab1b5b0ecdfa7ae76d90b7206af11069 diff --git a/net-analyzer/wireshark/wireshark-3.6.8.ebuild b/net-analyzer/wireshark/wireshark-3.6.8.ebuild index 38bd8ecc25ad..373d120f39a6 100644 --- a/net-analyzer/wireshark/wireshark-3.6.8.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.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 ~riscv x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86" fi LICENSE="GPL-2" -- cgit v1.2.3