gentoo auto-resync : 15:04:2024 - 12:04:02

7 files changed, 82 insertions, 39 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index e57a18f4a163..12b0ebefb95e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/hatop/Manifest b/net-proxy/hatop/Manifest
index 72da8665a23a..74129563320c 100644
--- a/net-proxy/hatop/Manifest
+++ b/net-proxy/hatop/Manifest
@@ -1,5 +1,4 @@
-DIST hatop-0.8.1.tar.gz 136760 BLAKE2B 3692e9dd307d5f098bd3a66a3a75be5184e17d246dc94b3581d2742c9629d558dc4768baaef1c1e290825e57a651dccc926f22b4ecc98074cc8309fdda4b4b57 SHA512 25026ddd62ef43f02cfb3ef41a815adf232c8a4b3053e925dcea69696c207ffbf22966ce1177ef460071e683f5a4ec8d011d2bb2b0aa06f4a9b3e5932aae93b6
+AUX hatop-0.8.2-python312.patch 3377 BLAKE2B bdd278d3fabf1b2545946526c0c2d40fd8ef50ef9a1dd7d372095cc346b8072ade79067035b574e50a6f68ab6c67c7bb3514d69d94615e055423f8a6653d18ca SHA512 750f8868ed0c224b1327f0a353ee3d032f946304bafd338fe8fbaabe34f148c03a9d2036a98d04667c86a44f05fcb50f532ce590a8d560dac5764dca18e21da7
 DIST hatop-0.8.2.tar.gz 138013 BLAKE2B c4a86952bf892ad989c6a28aa4bec503b24cbd11ec78cc9fb89625e30f7b1d39c0f8929018df03e7c8906d1b478f31be1003b0c37be0d09916787e1825780a60 SHA512 5e772394d72962bdd014f93ee94ea59814cee33e17c1864af5b3ec97a19c2c33a6ad13f24d0cf0baf78335d9a82cee28b60a03754430b0aa9132c1dd92753cdb
-EBUILD hatop-0.8.1.ebuild 666 BLAKE2B 0ed099c503be7310ad66fe7f8cf19f2800ddb67453a1b9df613335f2e7879ace719a716ef055728c14fa7fd54c31d8f80382d1c338901ea7a9061fca10a7e4b5 SHA512 bbf95986689eedff676401d87e90ca3ea69377ba2294ef64f2ca5fd1d159a029b4a73dc4bf9e3560c365ce9dcb3c19db9c42d8c1904125eaf5853eae02b7a0f5
-EBUILD hatop-0.8.2.ebuild 666 BLAKE2B b23ebb947415e842e3933f0bca7f9154cf4bac5264052461ae7927d3ab24da785e92e94e50e308df10a07c5891fb7f2878f8eb5fe17d7f2437f4685aaab8180e SHA512 29eebd5889d65673a4e017bb29e9d9417701560135fab470567b036083d6a3c3106237b22809016037b743647f38287b08d219f23e5dc5d29d51238323af3f3a
+EBUILD hatop-0.8.2.ebuild 719 BLAKE2B 536a62916a468cfdf6b5f3fc276559a73f788300499cd8587b6532989d625e036e2fd88b1cacaa877826900ad14b4476880d15d66416b065ddedfe49391adc97 SHA512 11a2cdfb6f80e6735d2ec665ca8f07b37cc72f78e6c97e7504799afe92dbf1f8761b9cd2dbc28b351e9d9f07183a4ca1da173f424ce9a612ce00aa06c698c569
 MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5
diff --git a/net-proxy/hatop/files/hatop-0.8.2-python312.patch b/net-proxy/hatop/files/hatop-0.8.2-python312.patch
new file mode 100644
index 000000000000..68515d6d6bd1
--- /dev/null
+++ b/net-proxy/hatop/files/hatop-0.8.2-python312.patch
@@ -0,0 +1,73 @@
+From 0c0a392d319ed495a55f8ad29291c4a7cbd5077a Mon Sep 17 00:00:00 2001
+From: sblondon <stephane.blondon@gmail.com>
+Date: Tue, 19 Mar 2024 19:33:17 +0100
+Subject: [PATCH] Fix syntax warnings in Python3.12 (#17)
+
+Python3.12 added new syntax warning if strings contain invalid sequence.
+
+The change is documented in:
+https://docs.python.org/3/whatsnew/3.12.html#other-language-changes
+---
+ bin/hatop | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/bin/hatop b/bin/hatop
+index bb69311..9aa9553 100755
+--- a/bin/hatop
++++ b/bin/hatop
+@@ -196,7 +196,7 @@ HAPROXY_CLI_MAXLINES = 1000
+ CLI_MAXLINES = 1000
+ CLI_MAXHIST = 100
+ CLI_INPUT_LIMIT = 200
+-CLI_INPUT_RE = re.compile('[a-zA-Z0-9_:\.\-\+; /#%]')
++CLI_INPUT_RE = re.compile(r'[a-zA-Z0-9_:\.\-\+; /#%]')
+ CLI_INPUT_DENY_CMD = ['prompt', 'set timeout cli', 'quit']
+ 
+ # Note: Only the last 3 lines are visible instantly on 80x25
+@@ -214,20 +214,20 @@ SCREEN_YMAX = 100
+ SCREEN_HPOS = 11
+ 
+ HAPROXY_INFO_RE = {
+-'software_name':    re.compile('^Name:\s*(?P<value>\S+)'),
+-'software_version': re.compile('^Version:\s*(?P<value>\S+)'),
+-'software_release': re.compile('^Release_date:\s*(?P<value>\S+)'),
+-'nproc':            re.compile('^Nbproc:\s*(?P<value>\d+)'),
+-'procn':            re.compile('^Process_num:\s*(?P<value>\d+)'),
+-'pid':              re.compile('^Pid:\s*(?P<value>\d+)'),
+-'uptime':           re.compile('^Uptime:\s*(?P<value>[\S ]+)$'),
+-'maxconn':          re.compile('^Maxconn:\s*(?P<value>\d+)'),
+-'curconn':          re.compile('^CurrConns:\s*(?P<value>\d+)'),
+-'maxpipes':         re.compile('^Maxpipes:\s*(?P<value>\d+)'),
+-'curpipes':         re.compile('^PipesUsed:\s*(?P<value>\d+)'),
+-'tasks':            re.compile('^Tasks:\s*(?P<value>\d+)'),
+-'runqueue':         re.compile('^Run_queue:\s*(?P<value>\d+)'),
+-'node':             re.compile('^node:\s*(?P<value>\S+)'),
++'software_name':    re.compile(r'^Name:\s*(?P<value>\S+)'),
++'software_version': re.compile(r'^Version:\s*(?P<value>\S+)'),
++'software_release': re.compile(r'^Release_date:\s*(?P<value>\S+)'),
++'nproc':            re.compile(r'^Nbproc:\s*(?P<value>\d+)'),
++'procn':            re.compile(r'^Process_num:\s*(?P<value>\d+)'),
++'pid':              re.compile(r'^Pid:\s*(?P<value>\d+)'),
++'uptime':           re.compile(r'^Uptime:\s*(?P<value>[\S ]+)$'),
++'maxconn':          re.compile(r'^Maxconn:\s*(?P<value>\d+)'),
++'curconn':          re.compile(r'^CurrConns:\s*(?P<value>\d+)'),
++'maxpipes':         re.compile(r'^Maxpipes:\s*(?P<value>\d+)'),
++'curpipes':         re.compile(r'^PipesUsed:\s*(?P<value>\d+)'),
++'tasks':            re.compile(r'^Tasks:\s*(?P<value>\d+)'),
++'runqueue':         re.compile(r'^Run_queue:\s*(?P<value>\d+)'),
++'node':             re.compile(r'^node:\s*(?P<value>\S+)'),
+ }
+ 
+ HAPROXY_STAT_MAX_SERVICES = 1000
+@@ -236,9 +236,9 @@ Warning: You have reached the stat parser limit! (%d)
+ Use --filter to parse specific service stats only.
+ ''' % HAPROXY_STAT_MAX_SERVICES
+ HAPROXY_STAT_FILTER_RE = re.compile(
+-        '^(?P<iid>-?\d+)\s+(?P<type>-?\d+)\s+(?P<sid>-?\d+)$')
++        r'^(?P<iid>-?\d+)\s+(?P<type>-?\d+)\s+(?P<sid>-?\d+)$')
+ HAPROXY_STAT_PROXY_FILTER_RE = re.compile(
+-        '^(?P<pxname>[a-zA-Z0-9_:\.\-]+)$')
++        r'^(?P<pxname>[a-zA-Z0-9_:\.\-]+)$')
+ HAPROXY_STAT_COMMENT = '#'
+ HAPROXY_STAT_SEP = ','
+ HAPROXY_STAT_CSV = [
diff --git a/net-proxy/hatop/hatop-0.8.1.ebuild b/net-proxy/hatop/hatop-0.8.1.ebuild
deleted file mode 100644
index 9dc0452c3aa8..000000000000
--- a/net-proxy/hatop/hatop-0.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy status"
-HOMEPAGE="https://github.com/jhunt/hatop"
-SRC_URI="https://github.com/jhunt/hatop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	python_foreach_impl python_doscript bin/hatop
-
-	doman man/hatop.1
-
-	dodoc CHANGES.rst KEYBINDS README.rst
-}
diff --git a/net-proxy/hatop/hatop-0.8.2.ebuild b/net-proxy/hatop/hatop-0.8.2.ebuild
index e79b4979df73..a0a1364cd6bb 100644
--- a/net-proxy/hatop/hatop-0.8.2.ebuild
+++ b/net-proxy/hatop/hatop-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
@@ -22,6 +22,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 
+PATCHES=("${FILESDIR}/hatop-0.8.2-python312.patch")
+
 src_install() {
 	python_foreach_impl python_doscript bin/hatop
 
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index df87193c4367..48f3c5bc3d59 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26ca547010b8a9095982e7ee1339bea9fcbcb248f6a800a1fed63902dd2ac9724e8d6a0d47fbd1f02 SHA512 54594e7813f6618e959f8c52cab5804f9403a8f0afbbdbc3bfadb46899c5d383ec3b9ff28a2721912f1b348f7e6c53a783745b5e0fddaca689c97a0ba9ef83fa
 AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
-EBUILD trojan-1.16.0-r2.ebuild 1454 BLAKE2B 4213cc349c40cfa29c22f9c2b3d5dd077a2887d3f95e84fa89378bd8e353617d6bcf2a4b3f25525a45b99ada0ff0692927099755e163a8669bd99470a9a41759 SHA512 8bb7bcd28abdd8ad7b5ee179785f72872fdaa273e5b4f1ba3078758ac003aa8935cc87a16a882cbd68a58e44e9df09c50572edd7b410ad9c034f0da4a1220d6f
+EBUILD trojan-1.16.0-r2.ebuild 1455 BLAKE2B 53749e4f3d755888821aa1923a1cbc4aeb5f30c833c97d2e8fa217614f035debe5f931c93b2305dfb7a49ca0b9386ca664536a0e41ba07f2d53a043e71469171 SHA512 685801e95cb43e804cbe6fbfc036a56b22fb99fb7e6b1cabe372fcd3a0ce890dd6739189c601aa800d21fd626a53b772ae68e1b8962fbd6aecf8fa6afb1eb997
 MISC metadata.xml 1155 BLAKE2B 4b36b42fd226c7ffb5b28eed065d16bbf10abf68108044d64ae97b5ca46e4b2d38a95f472da080d8884a10ba06a942e9a2aa6a9c3cc79b13a51d33cb06b28859 SHA512 bdbcab7001c48932fdc01158e9b0345141ffc66f0dd413c8d387882b01c73a08dfe5668cc27cdf7f028da7ec3f18613fca46509496d37b1e8ee66efd7fc1f12f
diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 50c1e89008da..b5b332947cbb 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-any-r1 systemd readme.gentoo-r1
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"