gentoo auto-resync : 28:07:2023 - 16:37:22

8 files changed, 167 insertions, 6 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a45542691345..52c2ef41a9a6 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest
index f01be2b38b32..d513ae1e545a 100644
--- a/net-analyzer/gsa/Manifest
+++ b/net-analyzer/gsa/Manifest
@@ -2,6 +2,9 @@ DIST gsa-21.4.2-node_modules.tar.gz 86572528 BLAKE2B 1aec3d8636241d7cd4ca591133c
 DIST gsa-21.4.4.tar.gz 2471442 BLAKE2B b3ac937a87038d93e90223f7c33d087b0dbb043c4fcaa8a00c9d44148e686c064fdcc311899b7b3b4084658d23193bc128fb809f22621583898551f4348ece6f SHA512 5a7b45132a049adf608ccd8988d69a415290cc57d6e7537835a78e19aafb5dfdf204197576f69277726587efaccce189c1ccab55c43e5a0a7855c538b3bc4b67
 DIST gsa-22.5.0-node_modules.tar.xz 26394052 BLAKE2B 77e74ccacecd681e846884af463ee0605eb46c21dd0cd001f3240d4cfd97b91d3ce241bda50996e3ec047824e937383f8c80e0b8014b93bf3d6d067a9afec929 SHA512 221dde765497e6c97773d18b04b3d381b2f003c42995e935661ac7e35c9b18984a92336259d803174ad62387a5d653df12c0899c495334561f71df6d4290f0c8
 DIST gsa-22.5.0.tar.gz 3586703 BLAKE2B 33d9f5e32ccc33e4c1d24665bd7ba0819dc22281772c7ebba24d8c82f93bcc21e8b90f3e0666b9ed8846e2a88417f8bf5999619577c15c307485a7ce3243d104 SHA512 2f119f3d8b213cb10abc7b2a25052e943518f8a2c5950f6eb6e5227bf30f7467ddbcf78bbed5f499b96a0bb517c5033f38477f332a14f449b7b04e7b7902843b
+DIST gsa-22.5.3-node_modules.tar.xz 23161212 BLAKE2B 4bd48e37034cbe8b142392247f7c3231d97bea3d2327833f5d9fbe6b964b5a8f0f61a7d8db0750291fd750fb24bf401e0a6691123e876d76da68810662779df6 SHA512 2863e937bdfad8207a57d03d67f0fb573435845823ce2533fab4002ac25e37903ab21d6e53f272d39bfb900d4793c907d33d56dfe1b88469ad5a4ffcd3201613
+DIST gsa-22.5.3.tar.gz 3620562 BLAKE2B 1b2104bea4d5cb39d9faab05e0e6b1ac0b15c6d342f2066808b3b00fb9e4a07efd8d792eeb2ec1507172e3188770ba428ff5d2a913d00db40d28f899bea23d9f SHA512 fb7ee8b65cfac67789fe392c5734ef2267f80a9f6ac42272e02f21b266f7933c06d5aef33bfa1bedf2782016e26ca849a764f7150ecc8cc6fa8d206c6dd1ae71
 EBUILD gsa-21.4.4.ebuild 1036 BLAKE2B 9b929e395348dd2ab4eb93a377d23feb32689be41a95df04bde261860081f981349f122256e9f1133e277ed5b9c2e995100ee2e8c5cb4e692f4333877bb3b6d7 SHA512 9fe0def0a89ad904eeb9fe729e4a260ce186e6de1ef1f8cba36700b14bad32c2d37bb8f0f6d857146700dd84dce15747033cec93649b7bbdb3582e7da5be796e
-EBUILD gsa-22.5.0.ebuild 956 BLAKE2B 0a017a612b32c0c8e5fe824b89ba85fda0a4b6cf9a8be83f526ae1b416b86fe690aa1284c39ba00956c99e7c23d89f40331f3388cb7be6744bb2deeb10c151d5 SHA512 aff75c354d203856cb3ff84a66a3eccf9418aab7af7b4b0a2aa61da7fc52da6dd3353fe0caf96eccd22e0547515edd747448ba1d51cb09eb0544f6cf68af3a87
+EBUILD gsa-22.5.0.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
+EBUILD gsa-22.5.3.ebuild 1228 BLAKE2B be936887cbe2723c0c89003595507cb75db951b116acffc41998ae11b5052b0053ba021ad5390df9e9835dd7341947b1f0895c5f94bbb77e372d592cdf3b94e9 SHA512 d88984e01cb9446d1e202cadedbd679c9741c89326d63997942e2646885373d7b2ceb0c9bd5e3576fae87d684c455cc3ed96d6ba7bc91c07e612deecfe94f436
 MISC metadata.xml 971 BLAKE2B 92a5deb08a91782bb2de586d1aa5dde2365748bfab065b310c369cbdab1e468d6ea4ab57df8e0a97a02f8b96613302cd8ec9c878c2ddacdf922fd5973f759643 SHA512 623adaaee62c9c2e27be7a6741edab7a770ab49902eb094bc71711fc822e3108d851fe0420c6744ed9ef91c8da7c57e518c884381e6f3952387c6e2636e46f5e
diff --git a/net-analyzer/gsa/gsa-22.5.0.ebuild b/net-analyzer/gsa/gsa-22.5.0.ebuild
index e25fbab90bcd..4c4f40abe0b8 100644
--- a/net-analyzer/gsa/gsa-22.5.0.ebuild
+++ b/net-analyzer/gsa/gsa-22.5.0.ebuild
@@ -28,6 +28,12 @@ src_prepare() {
 	default
 	# We will use pre-generated npm stuff.
 	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+
+	# Make SVGR not traverse the path up to / looking for a
+	# configuration file. Fixes
+	# Error: EACCES: permission denied, open '/.config/svgrrc'
+	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
+	echo "runtimeConfig: false" > .svgrrc.yml || die
 }
 
 src_compile() {
diff --git a/net-analyzer/gsa/gsa-22.5.3.ebuild b/net-analyzer/gsa/gsa-22.5.3.ebuild
new file mode 100644
index 000000000000..4c4f40abe0b8
--- /dev/null
+++ b/net-analyzer/gsa/gsa-22.5.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_NODE_N="node_modules"
+MY_NODE_PV="${PV}"
+
+DESCRIPTION="Greenbone Security Assistant"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa"
+SRC_URI="
+	https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~flow/distfiles/${PN}/${P}-${MY_NODE_N}.tar.xz
+"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=net-libs/nodejs-14.0.0[ssl]
+	>=sys-apps/yarn-1.15.2
+"
+
+MY_NODE_DIR="${S}/${MY_NODE_N}/"
+
+src_prepare() {
+	default
+	# We will use pre-generated npm stuff.
+	mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules"
+
+	# Make SVGR not traverse the path up to / looking for a
+	# configuration file. Fixes
+	# Error: EACCES: permission denied, open '/.config/svgrrc'
+	# in case a directory /.config exists, see https://bugs.gentoo.org/909731
+	echo "runtimeConfig: false" > .svgrrc.yml || die
+}
+
+src_compile() {
+	# setting correct PATH for finding react-js
+	NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \
+			yarn --offline build || die
+}
+
+src_install() {
+	insinto "usr/share/gvm/gsad/web"
+	doins -r build/*
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 1ad3e9f4717b..ce69e63a37f9 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,5 +1,7 @@
 AUX mtr-0.88-tinfo.patch 494 BLAKE2B 5eba829ab106aa74799780da890b39a37f69a0cb2cf644a739d1a4e6484507bc42427995069d03ddcad811a99baae9211db907b82a3efb328edec075eee92b57 SHA512 165bcdd1aa04e7786e2e8eeab4e85d5c592198b7b9a39f2c13a229870fba47d36fc92b136277d7d4e0a241ef96c714954a78f9e1091ab71255cd5b8d88bf2fd8
+AUX mtr-0.95-fortify-source-3.patch 1440 BLAKE2B 4690e843d35cdb3dffb1d2c51bb2535b5761ab078372992716e19bd6b9f3a3dd67ab5d9f3579114545da5904988c5f5e412f218dbbaf1da820dc7aca2198efae SHA512 6e2515a6c12676d14441435b2bcddcdcd8d57d058fd881a1941be8699124d1d72e59255e8707f797e9b03ef2e31e69a1d4ded71f98c3e60366d1b808428b4592
 DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
+EBUILD mtr-0.95-r1.ebuild 1594 BLAKE2B 399e98014ed3dcd98dc0797dd095eefc7a12d2fff6586c9a99b1aef27bb8a0b5502eded598a17517dbc5b06ddef820563ac0c963e1a202898f040ff8f61001ac SHA512 cd9d7a94032d66f563056d36c382784314fe6461fa489b5405efb15c2d293fc5177e6e72e1f231fb7a1e9b108b0c18baef8b68737b595cb8a88b466017870be6
 EBUILD mtr-0.95.ebuild 1552 BLAKE2B 2332a9d6e582d72b7545220001b6be3dc9fab9588c8a30727db57d3a778ec9778051c2c6963c28259658574498a84ba737b13eb073fbebba4a2414fd62da6079 SHA512 303c980eabbae6686cd6343db52060453d82f3a2505865772441f8d47f6fe75c6bd8fcf291744a906aed3755be7b6582990379c5d28d8c2c92df3f56fe2effa8
-EBUILD mtr-9999.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544
+EBUILD mtr-9999.ebuild 1551 BLAKE2B 1e04cb86382f29dbfa9d9ab9b1361986a73ed6e94e998be53e2aba1f829b0a7a9625b39975a90274a4ee4006dfb9964d891ed0280a26fda3a61d56b052a077dd SHA512 ae3235d52a2c2743b121c595c9032208db4cda64187a24b6b5b2242362775314e9ad2b994b439abc67145194adfb51a700e491324848bd6d003cc76d92509877
 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2
diff --git a/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch
new file mode 100644
index 000000000000..0c3d593915e4
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/911389
+https://github.com/traviscross/mtr/pull/468
+https://github.com/traviscross/mtr/commit/a1548b40c0dcf6dd44c5e6906f829e249428436b
+
+From 5908af4c19188cb17b62f23368b6ef462831a0cb Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <meissner@suse.de>
+Date: Tue, 11 Apr 2023 16:05:36 +0200
+Subject: [PATCH] fixed the sizes passed into snprintf
+
+--- a/ui/report.c
++++ b/ui/report.c
+@@ -140,7 +140,7 @@ void report_close(
+             continue;
+ 
+         snprintf(fmt, sizeof(fmt), "%%%ds", data_fields[j].length);
+-        snprintf(buf + len, sizeof(buf), fmt, data_fields[j].title);
++        snprintf(buf + len, sizeof(buf) - len, fmt, data_fields[j].title);
+         len += data_fields[j].length;
+     }
+     printf("%s\n", buf);
+@@ -172,10 +172,10 @@ void report_close(
+ 
+             /* 1000.0 is a temporary hack for stats usec to ms, impacted net_loss. */
+             if (strchr(data_fields[j].format, 'f')) {
+-                snprintf(buf + len, sizeof(buf), data_fields[j].format,
++                snprintf(buf + len, sizeof(buf) - len, data_fields[j].format,
+                          data_fields[j].net_xxx(at) / 1000.0);
+             } else {
+-                snprintf(buf + len, sizeof(buf), data_fields[j].format,
++                snprintf(buf + len, sizeof(buf) - len, data_fields[j].format,
+                          data_fields[j].net_xxx(at));
+             }
+             len += data_fields[j].length;
+
diff --git a/net-analyzer/mtr/mtr-0.95-r1.ebuild b/net-analyzer/mtr/mtr-0.95-r1.ebuild
new file mode 100644
index 000000000000..a2c2010db273
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.95-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 fcaps
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/traviscross/mtr"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gtk +ipinfo +ipv6 jansson ncurses"
+# TODO: This is an inherited RESTRICT - figure out why!
+RESTRICT="test"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jansson? ( dev-libs/jansson:= )
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+	"${FILESDIR}"/${P}-fortify-source-3.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ipinfo) \
+		$(use_with jansson) \
+		$(use_with ncurses) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 42b6aeb30b04..af05bfe6419c 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools bash-completion-r1 fcaps
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2"
@@ -28,7 +28,7 @@ RDEPEND="
 		x11-libs/gtk+:3
 	)
 	jansson? ( dev-libs/jansson:= )
-	ncurses? ( sys-libs/ncurses:0= )
+	ncurses? ( sys-libs/ncurses:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"