gentoo auto-resync : 13:10:2024 - 04:04:06

7 files changed, 148 insertions, 13 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 7ac01a819946..139f578537de 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index cad30ea9cbcc..84a7ba9d862a 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -2,5 +2,5 @@ AUX 2.6.0-force-gentoo-classpath.patch 14044 BLAKE2B 6d62bad667cb816d0341458545a
 AUX i2p.init 278 BLAKE2B 2e26e9d25e21494d2f6a221a3c332f1afe475513096eb7c51a0fbc4cacc8e9bd418f98d622cb054f55d7b7c4941054be8b6314f9b19c249e9ad0e77893980ca6 SHA512 1edb33cd0df28de95e02b1015e86cbc44c867a8df1260abb0565bc232c2cccc2625d36fdefa4a050ea3215d938c1ff0521a591a0bc2b27d57ca6be621795cd52
 AUX i2p.service 172 BLAKE2B 8523af82e33d7a8f5b37138f8d28c7adb4c08607b84813f35b42f11064c0ec2768bf443eca32bd7b281ed084d6b820b23977c55a1cd5b8ad058ab18117b83f90 SHA512 c87574c968f4142b3dbe556dab86438765dc8b9b23475dca8c7e268d2963e5dffcd9175bb749b2d42c3fc7fe75d9175158f56cb78f0fa4faa7d6029fdf4b8e6c
 DIST i2psource_2.6.0.tar.bz2 33486530 BLAKE2B c9a39f4700c590a4e9e6ba621f24d1b6b181e6e69433493259bd59113231c2023c506419298ae6ed158808c0a45bed91038ab92c96147973ec947a787f91f56c SHA512 fdabd15084d0f66474d70e4786951be31e7a0fb4bf8094cd1a442beebd3c81d5f00d88ddc4b79b79d1494e2ad469c2b8028279e1259cd80a6ba68b6265d1be2e
-EBUILD i2p-2.6.0.ebuild 8303 BLAKE2B 9692f2829f0bc544ed2ce361775102066d052dfd7826670760fe93b72882214a70bb118dc7c297cf980652b3ec68b694bfdf79e0151ce8d498f6f935ed99acb4 SHA512 d311f4a2f3129bed0e9df73ca3cbce3e00997098d55d17db299afbc304cef3067bd3dc0ffd4b21699c995b77a652fb1a91a1c4fefe1245322a686b3107f39e66
+EBUILD i2p-2.6.0.ebuild 8298 BLAKE2B 24cf2f7f007c78b902c0f15a262a307949009ed8feb55b13900ea8fd4956a086109fdc82bec731e25bf58926675dbd96a1dc1304d58a181965b828631fbd8a14 SHA512 edd608cac75ed841b54b9252e7b028ae6f3c3f957ec72aa7d00d4c36c500d4c1e7cd73800fae73af6fbdb6d51bc7251be1670effa2fce7d5c5fbc957bbdfabf0
 MISC metadata.xml 743 BLAKE2B 020f7bd72231ce0cb37929330c1f73be6cd91e5d13f86202c6d5da5b2ced53e2b3df172dcf63fb37ae2028019376422ffa7fc8ad94f206f0996984294f353503 SHA512 c1cd68d0fe33ca5b738973fedf764141d490430afa968b325b4a2bc853e6206c0c1683724ff5e4829ac97482b40490cfb3b14b03711149a84baa1e6ecc27dbee
diff --git a/net-vpn/i2p/i2p-2.6.0.ebuild b/net-vpn/i2p/i2p-2.6.0.ebuild
index cd09727e633a..ca1158d884ea 100644
--- a/net-vpn/i2p/i2p-2.6.0.ebuild
+++ b/net-vpn/i2p/i2p-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://files.i2p-projekt.de/${PV}/i2psource_${PV}.tar.bz2"
 LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 LANGS=(
 	ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
 	sr sv tk tr uk vi zh zh-TW
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 7a821fefda5d..f95e6aba1f13 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,6 +1,8 @@
 AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
 DIST libreswan-4.15.tar.gz 3728498 BLAKE2B f2fd0955c73fb7278f4b2dbce3c1fa483406502c12340746426c77faa39143252e9b5f0b2c0cb60e238a962789b22b1f5b33a5bf5a42e79bb7e513fb2f12855f SHA512 49a60688bb4a5241dbd791bdde0c71ae80cfb7383bb841ea0788a9d0237569d7ad79e59985c700526e3807817ddae77ebd57521897526fbb8fb93ffbea631efe
 DIST libreswan-5.0.tar.gz 3957806 BLAKE2B c7ff493c332ac63d416651e9a85254bfe3c749dc812ff682b8aa99c35887cc6976d23fb5a5013196e0973681a2d7054167d06d29b33ca6d93809e35a130e4bb0 SHA512 b1c7cebe1ffc21aeaae76f2562764195d535ff5d51fb6ad570046678df19387df68f2d52586eb290844019cbdc17e6192773f9110531a26cf1583e2c016289c6
+DIST libreswan-5.1.tar.gz 4031106 BLAKE2B fa2e4b5ed93bfedd1bbbcc7b2fcd585178f02951aaf719bf5f600258a085e084ea15b60061d3f380e52062be57a5823952ff96297cf4990343413f395e1c9188 SHA512 9ee8b071be414737c61529420af22b789d8968e99e376250afe42e1a5890d864dc2697ecfeb33a6c50de38a361bddf125852a8eb86318e544fc2f162f8ff6522
 EBUILD libreswan-4.15.ebuild 3586 BLAKE2B 959c608b98ee1b84d6159b14d42faa5c2afbff89e6065a1907425d7ee60c1cb17052c084bb22c2f9c51c1fdf4dfa7e2f82414c7b211ccac554d9a8f4d38eac2a SHA512 cd6f241e70e39f62382fc90d4a5308bb7a16e7d61f3e68d4c52bcf0844eec3608949bc2d6dd883515e913676497563ca70adf86fbbac6fa37bcdbe6147fdf571
 EBUILD libreswan-5.0.ebuild 3585 BLAKE2B ca5b12930242adb893c2cd477bedbef3dce4c0f4d936ba46474b6ed0b7f4fe2578db2072698c1ae53c452a04cc6072d7d78a3e251075fecb3c0d811eb54878c7 SHA512 40c2b646becfe2841905dd7519442de622c8253090afea2916bc223a16b1b1123dd69878d19cff2214e435b5a698e698c6641c194a572002ed2bb2019d55bda5
+EBUILD libreswan-5.1.ebuild 3585 BLAKE2B ca5b12930242adb893c2cd477bedbef3dce4c0f4d936ba46474b6ed0b7f4fe2578db2072698c1ae53c452a04cc6072d7d78a3e251075fecb3c0d811eb54878c7 SHA512 40c2b646becfe2841905dd7519442de622c8253090afea2916bc223a16b1b1123dd69878d19cff2214e435b5a698e698c6641c194a572002ed2bb2019d55bda5
 MISC metadata.xml 472 BLAKE2B 4e17159bafff8a30ddc9388ff6068458ef948b9854f78f7f03fd8b0fa78ee9b9e2bf21a2cead24381702c0513a39a375df77eb42bc74389069dc41f5c0522749 SHA512 1f27565366ef12eafe4a8aa548fba67ddee5b662ccba672c9d3cdb1463e1b944040ab11c455d8bb8459b911aa00cc4cff82dcd7e26404c6867c6eb4ec94402ff
diff --git a/net-vpn/libreswan/libreswan-5.1.ebuild b/net-vpn/libreswan/libreswan-5.1.ebuild
new file mode 100644
index 000000000000..c9e2f853b153
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-5.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd flag-o-matic toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="caps curl dnssec +ikev1 ldap networkmanager pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	virtual/libcrypt:=
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= net-dns/dnssec-root )
+	ldap? ( net-nds/openldap:= )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
+
+usetf() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+
+	use elibc_musl && append-cflags -DGLIBC_KERN_FLIP_HEADERS
+
+	export PREFIX=/usr
+	export DEFAULT_DNSSEC_ROOTKEY_FILE=/etc/dnssec/icannbundle.pem
+	export EXAMPLE_IPSEC_SYSCONFDIR=/usr/share/doc/${PF}
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export INITSYSTEM=$(usex systemd systemd openrc)
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_IKEV1=$(usetf ikev1)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems \
+		INITSYSTEM=systemd \
+		SYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" \
+		all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems \
+		  INITSYSTEM=systemd \
+		  SYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		  SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" \
+		  DESTDIR="${D}" \
+		  install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-vpn/networkmanager-libreswan/Manifest b/net-vpn/networkmanager-libreswan/Manifest
index 8cb8faa16ed6..c0cd821c267f 100644
--- a/net-vpn/networkmanager-libreswan/Manifest
+++ b/net-vpn/networkmanager-libreswan/Manifest
@@ -1,5 +1,5 @@
-DIST NetworkManager-libreswan-1.2.14.tar.xz 402108 BLAKE2B 6be276c7fdd5dd588f0d35a1f1b1f1c8ffa902fc6b3d586c870afa2b0c44b58f55e38e55d1e12e68fdeb5fc9c16793185216e1efe3fb773ab63f240fdde9892a SHA512 4dec676c906ab67151321e29a050805c1c2b927da4f15fd3555f3f78758d416bbdd05a664a0e063089211b458abbf9904e82f230cd32cdc4fd5123a73fbe5742
 DIST NetworkManager-libreswan-1.2.16.tar.xz 406668 BLAKE2B 58008ed6b6e45a0cb26ec7cd59180f5be99bfd6959fb9cbcdf3dd62139e3fbe785fccb3fdcbe9f1d1387700b97ae539020d5036804c99d6bd95dd6fd22c625e0 SHA512 1e775a525df5ae6dafa2ccc04af345e5cc04d74ea9f532614f4fd2b388c1016940a1db8347ac670fe396f075b5c9234afea59e777ecbd6ce647db9f3247cd7ad
-EBUILD networkmanager-libreswan-1.2.14-r1.ebuild 933 BLAKE2B c2f28b3f294b6f9c289c42c4f267e57afe02b3acf4907c3196ecbae0edf6e13075ad0deb654932bfabc8c35eeffe58bc183e4329354e00f3106fde4025632aae SHA512 c522a56f4b944c78f5272db628d344d3c5fe41883b6d8b45264437e0472261ca87ceda9819b3fbc8ac9ca601f604b9467ded430d04f88521045c91beb2dd305c
+DIST NetworkManager-libreswan-1.2.22.tar.xz 426628 BLAKE2B 7f4709d5ee2d44a491a5b53a441a2f8e64e7f41c8635fdc3f19cbe4af5201f073ef816e7bc8fa27aba6cb80468660a294f0d464062e88ef9e7dcc9985b8091e0 SHA512 80885a276344ab512fb7b3d4b9932525787006781f3c8e0ab93343b78172f1d971c7753df53f21db8f45ea873469d80fc1e12f8d56d6e05d31a536069ff46e16
 EBUILD networkmanager-libreswan-1.2.16.ebuild 884 BLAKE2B 069fa302eb980b27e0d0d93caed2379dd72a8aef3a655c72fc7e6253a0d4742dc2d0e5aa06f84aab7930860a7268d743bb05d9ab28b42af21b8bc8dddfac94e9 SHA512 451457a0dca870ec1e8e92cff4c49ff159bb7cb247e34b110ce2207aa14ece20801ac9ba9a49471045cef617e087af7b94a696bec7b807b47902bdca609e9bc5
+EBUILD networkmanager-libreswan-1.2.22.ebuild 884 BLAKE2B f160ed885f6020f3da3093f819d43022262bf5b5a9d726be286199cbc6533afb59977faf1688d7887df8e0f8c89b5fa9c638a191354cb26d489ea63fe21b2d0c SHA512 fffe1f3a48e8de6af143a9ac35bd82de1febb79cc880ba00bc9feaa764a3ee585fcb687384aa2008511fca82f4fe2bedc30bf26dccd0a6e6824b5395601641eb
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.14-r1.ebuild b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.22.ebuild
index 56dc1cf4e91b..970691dee221 100644
--- a/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.14-r1.ebuild
+++ b/net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,14 +16,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
-	>=dev-libs/glib-2.32:2
+	>=dev-libs/glib-2.36:2
 	>=dev-libs/libnl-3.2.8:3
 	>=net-misc/networkmanager-1.2.0:=
 	net-vpn/libreswan
 	gtk? (
 		app-crypt/libsecret
-		>=gnome-extra/nm-applet-1.2.0
+
 		>=x11-libs/gtk+-3.4:3
+
+		>=gui-libs/gtk-4.0:4
+		>=gnome-extra/nm-applet-1.2.0
 	)
 "
 DEPEND="${RDEPEND}"
@@ -33,12 +36,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
-
-	gnome2_src_prepare
-}
-
 src_configure() {
 	local myconf=(
 		--disable-more-warnings
@@ -46,6 +43,7 @@ src_configure() {
 		--with-dist-version=Gentoo
 		--without-libnm-glib
 		$(use_with gtk gnome)
+		$(use_with gtk gtk4)
 	)
 	gnome2_src_configure "${myconf[@]}"
 }