diff options
Diffstat (limited to 'net-vpn')
-rw-r--r-- | net-vpn/Manifest.gz | bin | 8070 -> 8069 bytes | |||
-rw-r--r-- | net-vpn/libreswan/Manifest | 2 | ||||
-rw-r--r-- | net-vpn/libreswan/files/libreswan-5.1-without-libcurl.patch | 72 | ||||
-rw-r--r-- | net-vpn/libreswan/libreswan-5.1-r1.ebuild | 137 | ||||
-rw-r--r-- | net-vpn/protonvpn-cli/Manifest | 2 | ||||
-rw-r--r-- | net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r2.ebuild | 4 |
6 files changed, 214 insertions, 3 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex d7b352217e84..99142253058c 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest index f95e6aba1f13..dc8b63173120 100644 --- a/net-vpn/libreswan/Manifest +++ b/net-vpn/libreswan/Manifest @@ -1,8 +1,10 @@ AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f +AUX libreswan-5.1-without-libcurl.patch 2055 BLAKE2B 55dfba94e0abb5cbf23745bf2d7863209487901df80b26955413789736a2799427213843d5a9abb9db4b2a120c5124158d8204a6cabeeae80b886b556e551cfa SHA512 260d606f80880dbe5ff4d3b97829aed4018aabaeaf472ec669302c9379d54101c3d818c842bf13bf606a598ab033f268d188fdb4ca6f1b3d7ca3c7452b2528bc 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-r1.ebuild 3639 BLAKE2B 0fc15a15a6860759f339a63873b42af806687c0f7e970d558d92c41ff5a48c39f3a750f79b27b91f839084b10bf1fc1897da9a25b998bbfd13a46f468a0e8093 SHA512 0440bd12b95ef58938e9fdd10c7c82f208197fe23408a90c462dbca3195bd2034f05a2d6c2e791e1ef7d592206b59b1f8b7e70f5102990a9f59c70bdc1cc9406 EBUILD libreswan-5.1.ebuild 3585 BLAKE2B ca5b12930242adb893c2cd477bedbef3dce4c0f4d936ba46474b6ed0b7f4fe2578db2072698c1ae53c452a04cc6072d7d78a3e251075fecb3c0d811eb54878c7 SHA512 40c2b646becfe2841905dd7519442de622c8253090afea2916bc223a16b1b1123dd69878d19cff2214e435b5a698e698c6641c194a572002ed2bb2019d55bda5 MISC metadata.xml 472 BLAKE2B 4e17159bafff8a30ddc9388ff6068458ef948b9854f78f7f03fd8b0fa78ee9b9e2bf21a2cead24381702c0513a39a375df77eb42bc74389069dc41f5c0522749 SHA512 1f27565366ef12eafe4a8aa548fba67ddee5b662ccba672c9d3cdb1463e1b944040ab11c455d8bb8459b911aa00cc4cff82dcd7e26404c6867c6eb4ec94402ff diff --git a/net-vpn/libreswan/files/libreswan-5.1-without-libcurl.patch b/net-vpn/libreswan/files/libreswan-5.1-without-libcurl.patch new file mode 100644 index 000000000000..e83683324e83 --- /dev/null +++ b/net-vpn/libreswan/files/libreswan-5.1-without-libcurl.patch @@ -0,0 +1,72 @@ +From 9f0336036caa92eb5f82841d200027c95991fd13 Mon Sep 17 00:00:00 2001 +From: Andrew Cagney <cagney@gnu.org> +Date: Mon, 14 Oct 2024 11:09:17 -0400 +Subject: [PATCH] building: fix USE_LIBCURL=false + +close #1845 Libreswan 5.1 no longer compiles without libcurl support +--- + programs/pluto/fetch.c | 13 ++++--------- + programs/pluto/rcv_whack.c | 2 -- + 2 files changed, 4 insertions(+), 11 deletions(-) + +diff --git a/programs/pluto/fetch.c b/programs/pluto/fetch.c +index 299b7ff405..9bc60b9801 100644 +--- a/programs/pluto/fetch.c ++++ b/programs/pluto/fetch.c +@@ -19,8 +19,6 @@ + * + */ + +-#if defined(LIBCURL) || defined(LIBLDAP) /* essentially whole body of file */ +- + #include <pthread.h> /* Must be the first include file */ + #include <stdlib.h> + #include <errno.h> +@@ -30,7 +28,6 @@ + #include <cert.h> + #include <certdb.h> + +- + #include "constants.h" + #include "defs.h" + #include "log.h" +@@ -153,9 +150,11 @@ static err_t fetch_curl(const char *url, chunk_t *blob, struct logger *logger) + + #else /* LIBCURL */ + +-static err_t fetch_curl(const char *url UNUSED, +- chunk_t *blob UNUSED) ++static err_t fetch_curl(const char *url, ++ chunk_t *blob, ++ struct logger *logger) + { ++ ldbg(logger, "%s() ignoring %s %p", __func__, url, blob->ptr); + return "not compiled with libcurl support"; + } + +@@ -578,7 +577,3 @@ void free_crl_fetch(void) + } + #endif + } +- +-#else /* defined(LIBCURL) || defined(LIBLDAP) */ +-/* we'll just ignore for now - this is all going away anyway */ +-#endif +diff --git a/programs/pluto/rcv_whack.c b/programs/pluto/rcv_whack.c +index 7959e9ec1f..a7f811f319 100644 +--- a/programs/pluto/rcv_whack.c ++++ b/programs/pluto/rcv_whack.c +@@ -522,13 +522,11 @@ static void whack_process(const struct whack_message *const m, struct show *s) + dbg_whack(s, "purgeocsp: stop:"); + } + +-#if defined(LIBCURL) || defined(LIBLDAP) + if (m->whack_fetchcrls) { + dbg_whack(s, "fetchcrls: start:"); + whack_fetchcrls(s); + dbg_whack(s, "fetchcrls: stop:"); + } +-#endif + + if (m->whack_rereadcerts) { + dbg_whack(s, "rereadcerts: start:"); diff --git a/net-vpn/libreswan/libreswan-5.1-r1.ebuild b/net-vpn/libreswan/libreswan-5.1-r1.ebuild new file mode 100644 index 000000000000..1e8b49a3595c --- /dev/null +++ b/net-vpn/libreswan/libreswan-5.1-r1.ebuild @@ -0,0 +1,137 @@ +# 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 )" + +PATCHES=( "${FILESDIR}/${P}-without-libcurl.patch" ) + +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/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest index 99988e330acb..a39dace88af8 100644 --- a/net-vpn/protonvpn-cli/Manifest +++ b/net-vpn/protonvpn-cli/Manifest @@ -1,3 +1,3 @@ DIST protonvpn-cli-2.2.11.tar.gz 641106 BLAKE2B 916560e32716e1d29dbfa3ae513df3976dbe4bb667ad9b541f96caefba89636f74f2c13dc8b7d08b22dcc90b380904aa497cc529af8c6ca5865fad67f885acd9 SHA512 95d1681ccdd91ad43d4b0e4976c10e0d9c99bc6264fe9324a59d3495235a8439450574a18ed38c86dc4513cf754684328f2d060389e0a49bd61b5ce81356cfcb -EBUILD protonvpn-cli-2.2.11-r2.ebuild 827 BLAKE2B 4e0e8307b8a012056f26bc12a55ff43cb72e464cf0c8c398a218939646de610471f98c0e34b2942d7a91ef4336b7785a2c5ee63986107fe4ddf99cffe842abdc SHA512 fa60cea988444be1687996a3f3df693d07951034167821d4502f8241d0209bfe3363137ca7c7a42a6570e722cc307958b36732ab5227183a434fec6c0556289c +EBUILD protonvpn-cli-2.2.11-r2.ebuild 828 BLAKE2B 22a44aa3e7a30dcca48e6212ff187ce839f57ce1e19def64fecf332d69c3841076adc799e3d2856dd603d08efe137aed6e97208e56b4374c12da81dda2837df1 SHA512 8772d11fadd39ef89776588dfbefbc098e919a37e0f38cfd821f4527f480ab1cdab7e47235400b5fb53bf5b7050bca75701e2cd325c9f142a5788211f4706e26 MISC metadata.xml 458 BLAKE2B 5f414d668fe83c63a28753d3b116fc7990e768b09ae2e3fbc21f655e0662d2202a4608ac98baacf7ed9cc88f0249b88f3798afa5d86c7298f81cba112680fe76 SHA512 00430efd28d4a463a6f6f41a23d2cee4ba59a02e80d701922fb1fa5caeace4c6d7568bf72077fb9471242726a1582ae76e81effe897ef5876d981434cadd2d4a diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r2.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r2.ebuild index 14149fe874e3..ed82b3452335 100644 --- a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r2.ebuild +++ b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ RDEPEND=" dev-python/docopt[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/pythondialog:0[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] net-vpn/openvpn " |