gentoo auto-resync : 13:01:2023 - 23:50:08

6 files changed, 103 insertions, 9 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 4efa40ff600d..36fc4d4289e3 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 8736c0c04445..0debb315d27c 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -15,5 +15,5 @@ DIST tor-0.4.7.13.tar.gz.sha256sum 86 BLAKE2B 339db9869bfe485cbd328fe942cc23e60c
 DIST tor-0.4.7.13.tar.gz.sha256sum.asc 716 BLAKE2B 968a3852293ab9bcadac626862c9dc360b17de5afd00af7c46358fa2adfc03b55c02dfe029e9427efba999f553489a04388b395e8fb8fe16325e0895663c2deb SHA512 eb78e8369941d8de833e3616a9a1c1e59b0d3dde918353e2f4fa5eb5da09f038238c46f5e180844bd3cba1211a9daa6d60e9ddb5690998e27a6b7d1616aa20cc
 EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B 0a9d4c581b51b370fba88c124df05938111ea4cc404b6f134f364a705ef0d07b106b1eddedaa67ddab845948f8840745eb08032aae874b9906ea4705a30a76eb SHA512 d237932416e70bf209f389bd18ff43f7fb4e95c61f6b141ae609b90b9428550e296f23f9ea26e7f758237c1719663639cd22215629aabb56ab1a002ab734d242
 EBUILD tor-0.4.7.12.ebuild 3182 BLAKE2B dff408c48a7f2ed744feb922e8879f1c5b3c9cd6217cb713c737a8d83495b63b0d765fd937acd885d2189dd4e20f3d5933a7d755a8075b342a261ea8580a3323 SHA512 79515b99143e6f7bdcce73ff21a1af59cda3ae88b7eeeb7cb522f3366ab6a2e172cdcd073d3bb19bd9ad649d30b6a4f77b5c6c49db6a4c8782336a3bc933170a
-EBUILD tor-0.4.7.13.ebuild 3188 BLAKE2B f66585ff11b67dbab8aea85d573de6d4be4e4a336c4ed47fcd7a53b36f4f47104ece828b59ebb0bcbe721a77b1022de72c63349224c3563843ff28acdf72a608 SHA512 27b61260297e567fd34d16dd84b0a5d138e77b6c72ef8c0257369fe0166888e6634fcd367aa3ed930d2429e25775cc0d04587724c35350352809e6b3de787955
+EBUILD tor-0.4.7.13.ebuild 3182 BLAKE2B f5fbaefda683b4d4cf526cb830bddb046e00382366408e5b5fe3ed744c0c5b829724b1ca14953b9336d54e2ee6d5c111666e35ca823c2926594f212b1ddcd230 SHA512 2109dd95ff0db7f7e143071b797d005619c8de93bf0df12a7532d93a9ca033f37decfa3048658364d0f25e7f217e494b898c3ccae84216dc00b08eee8eb15639
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.13.ebuild b/net-vpn/tor/tor-0.4.7.13.ebuild
index e67b47263631..0e69297add73 100644
--- a/net-vpn/tor/tor-0.4.7.13.ebuild
+++ b/net-vpn/tor/tor-0.4.7.13.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 RESTRICT="!test? ( test )"
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 614af6717333..9731347ae2cc 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -6,7 +6,8 @@ AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d699
 DIST vpnc-0.5.3-docs.tar.xz 4816 BLAKE2B fe972fb71e74dea481593ce42225a2969608dd4d29a2f34ca1f7b5b82a71a62bfbd94d5fcd2e8db830768be1e858682904e655b8629cb164961644bc5de291e1 SHA512 e3e9f3e3651906f41a4a6b0f4247b903fb555155cbda210823f36a5613d8390b6aad7615ff88fd627ece4037b0e0f04753ac924c9cd9c1335480ca8186d476b8
 DIST vpnc-0.5.3_p20220927.tar.gz 119773 BLAKE2B 0dabadac8b5a8116c07597140b6fa31e8f7daed9448e1bf653491809453ec114c0e96d38a8103d90a8b68dd2cefa0540ed676ced3fb9d57eaf16d8be5e3f0fa1 SHA512 e8c2254042c67283749331349467b2aed29ececc26de0bc3227c9c4a14f06d9d518599b28ca979df0cbe997c8997dda8afa508a0858c80ec270922096d8f906f
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
+EBUILD vpnc-0.5.3_p20220927-r1.ebuild 2487 BLAKE2B 2768f6219e98890a1f2ba9f4560e93fb54038a746988baa9b3cb698440eeb37e02d25971f338ce7518a1c69a4b3454552a518283c0b39b8dc9494418f7586f82 SHA512 2ee97214081e83b20a5c5dd0e90e174b19072d0d7a9b085a346bd66b7d13bb802199999928ef05c9b665a16cd71f87ab78e01d8988e2fd8b385d1a6535b79b16
 EBUILD vpnc-0.5.3_p20220927.ebuild 2510 BLAKE2B a524cfd482333ebd14382e8416a0ca36bc7b9cd0bc9834c746ba9c8b40c0721a6ba3ab3535cd77db56956296529a18189bf929f0f2068d496158f57646dcb821 SHA512 3e02bd8ea01a69dbc366f371639e9d6f404a024a70bfff0870555a2a120d4e1ed92df147bd088b2c0d6a94c0bc8facc1aae027abb07f0a331f67d37691c571df
 EBUILD vpnc-0.5.3_p550-r3.ebuild 2299 BLAKE2B f16d4c12cb5ae5373a2017ab2220bd9f52bac52e13d9ca43c54184d395f50b4d4bc9481606bcf4c1fd41a666c09362fdd68bdd69b35ec93faf603113aa149c07 SHA512 0d37011d53ed0acf1b9768ed544511d543c8299e01b5c565ae00897e12fec297b36b9cd135265aa0ff36040a0367659088642e58202fd1ceeba7f9f0ad2a8272
-EBUILD vpnc-9999.ebuild 2503 BLAKE2B ff01f550e3e5fdd1d7f5fc391d900085c6634a3c29dd8477a753e0e73fc5a48650dee4dcafa14d75d206fb6a08baa2618330cfeba4560c55dec0d38eaf7f0091 SHA512 1795396518969b09181236f5d299f94e2bb85aa26547782f9108a156be0f6af2d2638df3eae54f78904bdd8475a7bc1a20ebb0a5b837b260a1a0e5cdcc7d0b03
+EBUILD vpnc-9999.ebuild 2487 BLAKE2B 2768f6219e98890a1f2ba9f4560e93fb54038a746988baa9b3cb698440eeb37e02d25971f338ce7518a1c69a4b3454552a518283c0b39b8dc9494418f7586f82 SHA512 2ee97214081e83b20a5c5dd0e90e174b19072d0d7a9b085a346bd66b7d13bb802199999928ef05c9b665a16cd71f87ab78e01d8988e2fd8b385d1a6535b79b16
 MISC metadata.xml 447 BLAKE2B c7241da58f64ef0eedf0a8f855ed7495c88ee31869b7d093ac1ec0c511dc236ce05a637464f714ee6485190461c74128cda4fb6d71b574722a4880f20a0a735a SHA512 6396504c91e1b823f66b227f2ee3f8cb5ccabf598a2ac12d1be00596d355c3d97d04036099f218e3436a9d8954468e4f953a54deefae9343b60960c0986a23a4
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild
new file mode 100644
index 000000000000..5f4e12444a64
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p20220927-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/streambinder/vpnc.git"
+else
+	inherit vcs-snapshot
+	SRC_URI="
+		https://api.github.com/repos/streambinder/vpnc/tarball/fdd0de7 -> ${P}.tar.gz
+		https://dev.gentoo.org/~soap/distfiles/${PN}-0.5.3-docs.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-libs/libgcrypt:=
+	sys-apps/iproute2[-minimal]
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}
+	>=net-vpn/vpnc-scripts-20210402-r1
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~TUN"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		vcs-snapshot_src_unpack
+		mv vpnc-0.5.3-docs/src/doc/*.md "${S}"/src/doc/ || die
+	fi
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
+}
+
+src_install() {
+	local args=(
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR='$(PREFIX)'/share/doc/${PF}
+		SYSTEMDDIR="$(systemd_get_systemunitdir)"
+		DESTDIR="${D}"
+	)
+
+	emake "${args[@]}" install
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+
+	# LICENSE file resides here, should not be installed
+	rm -r "${ED}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	tmpfiles_process vpnc-tmpfiles.conf
+
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}
diff --git a/net-vpn/vpnc/vpnc-9999.ebuild b/net-vpn/vpnc/vpnc-9999.ebuild
index d62312b59c91..5f4e12444a64 100644
--- a/net-vpn/vpnc/vpnc-9999.ebuild
+++ b/net-vpn/vpnc/vpnc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 	SRC_URI="
 		https://api.github.com/repos/streambinder/vpnc/tarball/fdd0de7 -> ${P}.tar.gz
 		https://dev.gentoo.org/~soap/distfiles/${PN}-0.5.3-docs.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -54,15 +54,19 @@ src_configure() {
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}"/usr DOCDIR='$(PREFIX)'/share/doc/${PF} DESTDIR="${D}" install
+	local args=(
+		PREFIX="${EPREFIX}"/usr
+		DOCDIR='$(PREFIX)'/share/doc/${PF}
+		SYSTEMDDIR="$(systemd_get_systemunitdir)"
+		DESTDIR="${D}"
+	)
+
+	emake "${args[@]}" install
 
 	keepdir /etc/vpnc/scripts.d
 	newinitd "${FILESDIR}"/vpnc-3.init vpnc
 	newconfd "${FILESDIR}"/vpnc.confd vpnc
 
-	dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
-	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
-
 	# LICENSE file resides here, should not be installed
 	rm -r "${ED}"/usr/share/licenses || die
 }