summaryrefslogtreecommitdiff
path: root/net-vpn
diff options
context:
space:
mode:
Diffstat (limited to 'net-vpn')
-rw-r--r--net-vpn/Manifest.gzbin6019 -> 6205 bytes
-rw-r--r--net-vpn/i2p/Manifest4
-rw-r--r--net-vpn/i2p/i2p-0.9.40.ebuild158
-rw-r--r--net-vpn/i2p/i2p-0.9.44.ebuild213
-rw-r--r--net-vpn/i2pd/Manifest6
-rw-r--r--net-vpn/i2pd/i2pd-2.27.0.ebuild6
-rw-r--r--net-vpn/i2pd/i2pd-2.28.0.ebuild6
-rw-r--r--net-vpn/i2pd/i2pd-2.29.0.ebuild6
-rw-r--r--net-vpn/libreswan/Manifest2
-rw-r--r--net-vpn/libreswan/libreswan-3.29.ebuild2
-rw-r--r--net-vpn/networkmanager-strongswan/Manifest2
-rw-r--r--net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild2
-rw-r--r--net-vpn/networkmanager-wireguard/Manifest4
-rw-r--r--net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild (renamed from net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128.ebuild)4
-rw-r--r--net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild2
-rw-r--r--net-vpn/openconnect/Manifest4
-rw-r--r--net-vpn/openconnect/openconnect-8.05.ebuild4
-rw-r--r--net-vpn/openconnect/openconnect-9999.ebuild4
-rw-r--r--net-vpn/openfortivpn/Manifest2
-rw-r--r--net-vpn/openfortivpn/openfortivpn-1.9.0.ebuild38
-rw-r--r--net-vpn/openvpn/Manifest2
-rw-r--r--net-vpn/openvpn/openvpn-2.4.7-r1.ebuild2
-rw-r--r--net-vpn/strongswan/Manifest6
-rw-r--r--net-vpn/strongswan/strongswan-5.8.1.ebuild2
-rw-r--r--net-vpn/strongswan/strongswan-5.8.2.ebuild (renamed from net-vpn/strongswan/strongswan-5.7.2.ebuild)6
-rw-r--r--net-vpn/tor/Manifest4
-rw-r--r--net-vpn/tor/tor-0.4.0.6.ebuild91
-rw-r--r--net-vpn/tor/tor-0.4.1.7.ebuild2
-rw-r--r--net-vpn/wireguard-modules/Manifest4
-rw-r--r--net-vpn/wireguard-modules/metadata.xml (renamed from net-vpn/wireguard/metadata.xml)1
-rw-r--r--net-vpn/wireguard-modules/wireguard-modules-0.0.20200105.ebuild100
-rw-r--r--net-vpn/wireguard-modules/wireguard-modules-9999.ebuild100
-rw-r--r--net-vpn/wireguard-tools/Manifest4
-rw-r--r--net-vpn/wireguard-tools/metadata.xml11
-rw-r--r--net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild104
-rw-r--r--net-vpn/wireguard-tools/wireguard-tools-9999.ebuild104
-rw-r--r--net-vpn/wireguard/Manifest4
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20191212.ebuild148
-rw-r--r--net-vpn/wireguard/wireguard-9999.ebuild148
39 files changed, 682 insertions, 630 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 40dde170a66a..c526b887924c 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 4bc38fc63d96..3cfd139a978c 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,7 @@
AUX i2p.init 394 BLAKE2B 477566594bb2da98e65faf0a54be434d2684b23903f1762db674b9c21e7a1647566441b1974594194ff0e43187869af7c8487062183d9250cba01e4faba20bc1 SHA512 c748ebc130b4d5d0860eaf511f3e844b3c3b1291bcc9fc42ea3d3622b8be4f782c1153645f4d4f8e3374649390c533e3264d24afde0b72fd5bdae88e7da6c754
AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
-EBUILD i2p-0.9.40.ebuild 4595 BLAKE2B f38118ecfa74d41697d35e586b9a616a32d127062ef97d3741d4ad48c8a4c6cec518c8ed241c3f82bb503e93715e4ea941cd4204e47714804e5a67024354d73a SHA512 55c6a8f9d6cbdef72113df1542a3565ca9d1bbd8cfd01d276a1413a7657c2befce2f3c7359484e2cef3dc2cb6dc48a97a103ee94080d04a0bca1b30d4d8c8bbc
+DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
EBUILD i2p-0.9.42.ebuild 6225 BLAKE2B 1191fc6452dab8b179e7a9573fbc014b3f718cf0392113c4d507675198b3102159e0c8b840834ec737430770d7e1c86aa9e01707848436f3fe27e04b1f555bfa SHA512 8b4830fba40964931dce526061db07afc573a8861d69e8f6e16ae28b251eedf500c0216ae37b12572aced63e4771f76f329818e4ecb11853fa5b65ef9ba734ae
+EBUILD i2p-0.9.44.ebuild 6237 BLAKE2B 90e340122c208dab0b0c43c3fe4d4777b4503a810a67ba66848e0e1a2b96f6c0630b3bef3798787026cb7741bb1e9db8ee09b2e2551c7881016257cc1aa49683 SHA512 93380cd1fc627857fecd2dda90f23c13e4e619e55e6bbb25294cc625117998a1e7441f6afdcb44f89a4c76f134f5d4944b9a0f6fcae74efe2116dbf874b5f24c
MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/i2p-0.9.40.ebuild b/net-vpn/i2p/i2p-0.9.40.ebuild
deleted file mode 100644
index 5ec499b0567c..000000000000
--- a/net-vpn/i2p/i2p-0.9.40.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 systemd user
-
-DESCRIPTION="A privacy-centric, anonymous network"
-HOMEPAGE="https://geti2p.net"
-SRC_URI="https://download.i2p2.de/releases/${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"
-
-# Until the deps reach other arches
-KEYWORDS="~amd64 ~x86"
-IUSE='nls test'
-RESTRICT="!test? ( test )"
-
-# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CP_DEPEND='dev-java/bcprov:1.50
- dev-java/jrobin:0
- dev-java/slf4j-api:0
- dev-java/tomcat-jstl-impl:0
- dev-java/tomcat-jstl-spec:0
- dev-java/java-service-wrapper:0
- dev-java/commons-logging:0
- dev-java/slf4j-simple:0
- java-virtuals/servlet-api:3.1
-'
-
-DEPEND="${CP_DEPEND}
- dev-java/eclipse-ecj:*
- nls? ( >=sys-devel/gettext-0.19 )
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit4:0
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- )
-"
-
-RDEPEND="${CP_DEPEND}
- virtual/jre:1.8
- net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET='junit.test'
-JAVA_ANT_ENCODING="UTF-8"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- enewgroup i2p
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
- # as early as possible to allow generic patches to be applied
- default
-
- java-ant_rewrite-classpath
-
- java-pkg-2_src_prepare
-
- # We're on GNU/Linux, we don't need .exe files
- echo "noExe=true" > override.properties || die
- if ! use nls; then
- echo "require.gettext=false" >> override.properties || die
- fi
-
- # avoid auto starting browser
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
- 'installer/resources/clients.config' || die
-
- # generate wrapper classpath, keeping the default to be replaced later
- i2p_cp='' # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib cp i=2
- for lib in ${i2p_cp//,/ }
- do
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
-
- # add generated cp and hardcode system VM
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
- -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
- -i 'installer/resources/wrapper.config' || die
-
- # replace paths as the installer would
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
- -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-
- if use test; then
- # no *streaming as requiring >dev-java/mockito-1.9.5
- sed -e '/junit\.test.*streaming/d' \
- -i build.xml ||
- die 'unable to remove ministreaming tests'
- fi
-}
-
-src_test() {
- # store built version of jars, overwritten by testing
- mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
- die 'unable to save jars before tests'
-
- # generate test classpath
- local cp
- cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
- EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
-
- # redo work undone by testing
- mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
- die 'unable to restore jars after tests'
-}
-
-src_install() {
- # cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # we remove system installed jar and install the others
- rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
- die 'unable to remove locally built jar already found in system'
- java-pkg_dojar lib/*.jar
-
- # create own launcher
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
- # Install main files and basic documentation
- insinto '/usr/share/i2p'
- doins blocklist.txt hosts.txt *.config
- dodoc history.txt INSTALL-headless.txt LICENSE.txt
- doman man/*
-
- # Install other directories
- doins -r certificates docs eepsite geoip scripts
- java-pkg_dowar webapps/*.war
-
- # Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup user
- keepdir '/var/lib/i2p/.i2p'
- fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p to avoid being overwritten."
- elog 'I2P can be configured through the web interface at http://localhost:7657/console'
-}
diff --git a/net-vpn/i2p/i2p-0.9.44.ebuild b/net-vpn/i2p/i2p-0.9.44.ebuild
new file mode 100644
index 000000000000..ae09784ef1be
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.44.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${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"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+COMMON_DEPEND="
+ dev-java/bcprov:1.50
+ dev-java/jrobin:0
+ dev-java/slf4j-api:0
+ dev-java/tomcat-jstl-impl:0
+ dev-java/tomcat-jstl-spec:0
+ dev-java/java-service-wrapper:0
+ dev-java/commons-logging:0
+ dev-java/slf4j-simple:0
+ java-virtuals/servlet-api:3.1
+"
+
+DEPEND="${COMMON_DEPEND}
+ dev-java/eclipse-ecj:*
+ nls? ( >=sys-devel/gettext-0.19 )
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-user/i2p
+ acct-group/i2p
+ virtual/jre:1.8
+ net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+
+src_prepare() {
+ if use test; then
+ # no *streaming as requiring >dev-java/mockito-1.9.5
+ sed -e "/streaming.*junit\.test/d" \
+ -i build.xml ||
+ die "unable to remove ministreaming tests"
+ fi
+
+ # as early as possible to allow generic patches to be applied
+ default
+
+ java-ant_rewrite-classpath
+
+ java-pkg-2_src_prepare
+
+ # We're on GNU/Linux, we don't need .exe files
+ echo "noExe=true" > override.properties || die
+ if ! use nls; then
+ echo "require.gettext=false" >> override.properties || die
+ fi
+
+ # avoid auto starting browser
+ sed -i "s|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|" \
+ "installer/resources/clients.config" || die
+
+ # generate wrapper classpath, keeping the default to be replaced later
+ i2p_cp="" # global forced by java-pkg_gen-cp
+ java-pkg_gen-cp i2p_cp
+ local lib i=2
+ local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
+ for lib in ${i2p_cp//,/ }
+ do
+ cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+ done
+
+ # add generated cp, hardcode system VM, setting system's conf
+ sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \
+ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
+ -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
+ -e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
+ -e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
+ -e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
+ -i installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ local prop i=2
+ for prop in \
+ "i2p.dir.base=${EPREFIX}/usr/share/i2p" \
+ "i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
+ "i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
+ "i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
+ "i2p.dir.log=${EPREFIX}/var/log/i2p" \
+ "i2p.dir.pid=${EPREFIX}/tmp" \
+ "i2p.dir.temp=${EPREFIX}/tmp"
+ do
+ echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ done
+}
+
+src_test() {
+ # store built version of jars, overwritten by testing
+ mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+ die "unable to save jars before tests"
+
+ # generate test classpath
+ local cp
+ cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+ EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+ # redo work undone by testing
+ mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+ die "unable to restore jars after tests"
+}
+
+src_install() {
+ # cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # we remove system installed jar and install the others
+ rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ die "unable to remove locally built jar already found in system"
+ java-pkg_dojar lib/*.jar
+
+ # create own launcher
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+ # Install main files and basic documentation
+ insinto "/usr/share/i2p"
+ doins blocklist.txt hosts.txt *.config
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt
+ doman man/*
+
+ # Install other directories
+ doins -r certificates docs eepsite geoip scripts
+ java-pkg_dowar webapps/*.war
+
+ # Install daemon files
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup log
+ keepdir /var/log/i2p
+ fowners i2p:i2p /var/log/i2p
+
+ # setup user
+ keepdir /var/lib/i2p
+ keepdir /var/lib/i2p/app
+ keepdir /var/lib/i2p/router
+ keepdir /var/lib/i2p/config
+ fowners i2p:i2p /var/lib/i2p
+}
+
+pkg_postinst() {
+ local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
+
+ [ -e "${old_i2pdir}" ] || return
+
+ elog "User is now delegated to acct-user, ${new_i2pdir} is split"
+ elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
+
+ migrate() {
+ local dest="${1}"
+ shift
+
+ local ret=true
+ for src
+ do
+ [ -e "${src}" ] || continue
+ mv "${src}" "${dest}" || ret=false
+ done
+
+ $ret
+ }
+
+ ebegin "Migrating"
+ local ret=0
+ chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
+ migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
+ migrate "${new_i2pdir}/config" \
+ "${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
+ ret=1
+ migrate "${new_i2pdir}/router" \
+ "${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
+ ret=1
+ migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
+ ret=1
+ rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
+ rmdir "${old_i2pdir}" || ret=1
+
+ if ! eend $ret
+ then
+ ewarn "There was some file remaining in ${old_i2pdir}."
+ ewarn "Please check it there is something of value there."
+ ewarn "remove it when migration is done."
+ fi
+}
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index df9c587b8f18..d552e7f99b07 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -8,7 +8,7 @@ AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f
DIST i2pd-2.27.0.tar.gz 1073766 BLAKE2B 331407c6bed3ed49e2438590a814ce91301bfe318d45f0726568877a966fee217b94a37152206652672b221e62d41dc252b8cacdac3e96117c896f4de00c39d4 SHA512 260cef32503bb459f3e7e07940f303b542bead54c9b6faf63f61e8d76250155c375fa75ce80ce3862d8eb2445e106e3c99ed829c9acbc9eb728364082f938f96
DIST i2pd-2.28.0.tar.gz 1079208 BLAKE2B 2cc84ff156c05395ce13fd0cbabb667d44d88df252c02775dee3af0ea2715487ea35614175a4dcd6f4af8a2f8fc071857beb67e85620d32e952341db04b3be7d SHA512 9bcae8dfb5a2c77b03e4c4d4816b1666f2a0d95e0c806f952a095182dfc62bdc142f5cde6a9643f7a3c6d385f906c00011b4d291fe53ab177d36d63b6a698599
DIST i2pd-2.29.0.tar.gz 1079654 BLAKE2B 762f06908342c7e6508f47f7bd7479454f0a4594647aa9e0a9be5e7f6ae28140a1073e10138f3e210b7add943a31617260b475d9ee5915c367dc4f80b3036bb1 SHA512 dfa1c212c217eb2eae40f3f8151d35164c52df630e658dcb261cc9532623377dee376d1c493e8b8bdcae3245ae389e06adf5ef551951d4e139f1626b8432c15b
-EBUILD i2pd-2.27.0.ebuild 2766 BLAKE2B 99fc058cebe05cee7050e49d09f23257fe88efcad4c1cb62d1000bca15041a37e981eeb39d8df920e28d675417d4343380fbb12b50251c5effb635de13ffd6be SHA512 5ad6e70aa4ee0af6609610efde2baf94f896cc31303537cf441355e7079033b3c873528d6a31185554050d6cbe9df442b65dd40309c92b5c20ae2c1337b6e86c
-EBUILD i2pd-2.28.0.ebuild 2766 BLAKE2B 99fc058cebe05cee7050e49d09f23257fe88efcad4c1cb62d1000bca15041a37e981eeb39d8df920e28d675417d4343380fbb12b50251c5effb635de13ffd6be SHA512 5ad6e70aa4ee0af6609610efde2baf94f896cc31303537cf441355e7079033b3c873528d6a31185554050d6cbe9df442b65dd40309c92b5c20ae2c1337b6e86c
-EBUILD i2pd-2.29.0.ebuild 2665 BLAKE2B debfbc5647e1fc202dcfa4ffb2cfa4cf7bff63220a77158c8299d1e6651301eabb42eb5e189772007aeadca63d3cd3578777f8660309944104ec6eefa63ec9c4 SHA512 10c8f55871508db35df0e6e78f17e880f759cb86dbba2dabf2b12418484ea2f98aacbe4d7f07f3006f1e5cec889790952095cbc0b4549935bf46dc9e009bb51f
+EBUILD i2pd-2.27.0.ebuild 2748 BLAKE2B e8a5face9eba3fd7117818e6387c4e203e3febe5986b0fa3fe0be1adaf62690a405a1f884c65ba37a251006b6a82e88ef80559fc8e8cf0f084a978cbe5f6e174 SHA512 0fd96e06c96f10d4dca586b6125bd343fae713d18ecbc6fc35bf3b39ec32e90cc2dc736b16c5fe04246b361282056e8f18ec7bcecf4c1d7ca3e3f8eae0130c4a
+EBUILD i2pd-2.28.0.ebuild 2748 BLAKE2B e8a5face9eba3fd7117818e6387c4e203e3febe5986b0fa3fe0be1adaf62690a405a1f884c65ba37a251006b6a82e88ef80559fc8e8cf0f084a978cbe5f6e174 SHA512 0fd96e06c96f10d4dca586b6125bd343fae713d18ecbc6fc35bf3b39ec32e90cc2dc736b16c5fe04246b361282056e8f18ec7bcecf4c1d7ca3e3f8eae0130c4a
+EBUILD i2pd-2.29.0.ebuild 2647 BLAKE2B 95b39a0b23d2b90c71bcd2c1fe66d69c67d2311ba30efe4712a853327adaf0ed45cb63fbb66d45bec7d2f4ba546e35fc2fb7c49253d644e5dab3a7e98c20bdbc SHA512 b2ae95c09eadee724525e4562cf3dc978011e19d4d21063388ddefe1c5f008871bc5f0da670dfa0e8852cd4b470b23f712f9097a88cc1bd6b2b046f8e9e44c0a
MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
diff --git a/net-vpn/i2pd/i2pd-2.27.0.ebuild b/net-vpn/i2pd/i2pd-2.27.0.ebuild
index 099b9151f166..a24bc8dd650f 100644
--- a/net-vpn/i2pd/i2pd-2.27.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.27.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
-DWITH_LIBRARY=ON
-DWITH_BINARY=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# config
insinto /etc/i2pd
diff --git a/net-vpn/i2pd/i2pd-2.28.0.ebuild b/net-vpn/i2pd/i2pd-2.28.0.ebuild
index 099b9151f166..a24bc8dd650f 100644
--- a/net-vpn/i2pd/i2pd-2.28.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.28.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
-DWITH_LIBRARY=ON
-DWITH_BINARY=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# config
insinto /etc/i2pd
diff --git a/net-vpn/i2pd/i2pd-2.29.0.ebuild b/net-vpn/i2pd/i2pd-2.29.0.ebuild
index 5982e199dbce..06d8abe7e506 100644
--- a/net-vpn/i2pd/i2pd-2.29.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.29.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -65,11 +65,11 @@ src_configure() {
-DWITH_LIBRARY=ON
-DWITH_BINARY=ON
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# config
insinto /etc/i2pd
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 1cb8af101d7b..feac60cda5e0 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,3 +1,3 @@
DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
-EBUILD libreswan-3.29.ebuild 3059 BLAKE2B 61b9d5e5c1b10d0b56506ac025afdb02b72581444ddef171f2323febb72e79c43a581d767a6ab8429da97fba7245e6b078d1c6db11ad892f83c3e6baab0f3b37 SHA512 f3893d22e0ee2d41f34447ae12371137d378d5b0544f2b2bb35cef2dc00d66edd3d86ed45a7e49953ef2c446ace3c92b78106bcf5bb89843e95b3e055b7e618b
+EBUILD libreswan-3.29.ebuild 3064 BLAKE2B 3b9a53bacd2843b2ea42856448e202702f5c1cc15d9882dcce707742d845802282d5eb9b272726e09bae5e9a948b988de346a71ce7759471e5401a3bb6aedee0 SHA512 9af817db6009d96d6ccdc5380def2899e03570ef9b4e14b00f97b7690ae26dc4fb1a7df02dbceab1997c6797b39d4e8542a2e1f1cd1604d3d6f17452e7f5f5b4
MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.29.ebuild b/net-vpn/libreswan/libreswan-3.29.ebuild
index 7d64aba2bee2..b0f25268995f 100644
--- a/net-vpn/libreswan/libreswan-3.29.ebuild
+++ b/net-vpn/libreswan/libreswan-3.29.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit systemd toolchain-funcs
SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
HOMEPAGE="https://libreswan.org/"
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 70b859d8500e..b28f8ad33826 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,5 +1,5 @@
DIST NetworkManager-strongswan-1.4.4.tar.bz2 305677 BLAKE2B 24d99cd3f3844b6ffd47d076153ff8f80a92e575ca7f8da01141be2a48c39a759ee60e17ccdd4928e3c625fa9caae39d8f3cf2c76481adbcdda91fd00ee9e8a2 SHA512 e3e2dd9f5b961255f897ca1912f9deb34ac62628ff40289ff0f8f3900746482f2f32d390c64b88c10f10b8a99388e27099abedb7157d77c173524dc763a32155
DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
EBUILD networkmanager-strongswan-1.4.4-r1.ebuild 936 BLAKE2B 78207ea40d5d41d8bda68ba8f6b17f1ffdcd7e32bd38eea7969a3cbc7963eba1f1b5b37edaddd7b62013519813b066f0836563222f470a46bac7d70713876e8b SHA512 a075b1a11aabfdcbf77643341b821e7dd2dd42985326939fea165348d89374c1c9a331b084b88bfc20755ae4dc2fca83b35cd016df732e8e8906073788e1d581
-EBUILD networkmanager-strongswan-1.4.5.ebuild 938 BLAKE2B 724227fcc4b69c3349ef731d40961012185b0493b813d7d6a1d12cf6d8af7b62c142502b01c693e6c7f12b29d326e7fb7c50dc2ee5be4085c8460cafe7e735b4 SHA512 d4cb58a862f228c0bdfccdf9f88f4473b8ca42c5b4a9a5d3a9415489d49c6f8f13d2328536fb2c1e24b41250c5db06d26047fc95691bd34b90b52c98381a1ed4
+EBUILD networkmanager-strongswan-1.4.5.ebuild 937 BLAKE2B 33513300bdd65cb15781efe51c1a4f2cd15e8102112af14d94ef1341742be99f1a237f84ef53e1062d2f47342e2a79cf35a8fa1388561f614e4712b25c7d5493 SHA512 5d0ffc3d027cc723d1ecce7e70d85939ce2bc31a145acff4f36c6d1abdccf7ba4a52eb5a496e836ccc3e7ffb19bab77ac289149c7168b685315c3eed3e87b3c2
MISC metadata.xml 325 BLAKE2B da2fbfdaf5a51c3c6513f31b232b157bffe4864190935c363f54df5389d044b0ed0829db75703a297ef85dd123301e68296d868317d294f9356cd6e9dba94a66 SHA512 74543db61d0c4222e3e36d41d18b0da04b440b2b13e42d78cb202d36366842569c6af971c48d2b97043b4e7c9f37bf12e1d15e074f5b97f31e3a120c614233d9
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
index 693a6bd16112..2038508b9dbd 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+glib"
RDEPEND="
diff --git a/net-vpn/networkmanager-wireguard/Manifest b/net-vpn/networkmanager-wireguard/Manifest
index 1f58d82d2505..7b4c06942e0a 100644
--- a/net-vpn/networkmanager-wireguard/Manifest
+++ b/net-vpn/networkmanager-wireguard/Manifest
@@ -1,4 +1,4 @@
DIST networkmanager-wireguard-0_pre20191128.tar.gz 238536 BLAKE2B e926c08c68df3e452a7ba25c66e7678969594002cb45a03ca26af32c86b021260c7836157fe9244c07223bf2e1c821ee64c3535c392f3636217c6ae67d8b800a SHA512 4ed9566a18be01b1be7d92da4663a292e17804a706045d58f08640e2fe81f9672880f20d1657b70eafc769b2688f72928c6fa601c0011bde91347902a222e670
-EBUILD networkmanager-wireguard-0_pre20191128.ebuild 1108 BLAKE2B a9b5fe4e990857054317862e05c0fdeb9a97bbf7b7bad24b68480c73e3382c45fb621b350bdddfc12d584e6affd338dd4ce2634ade0861cc74c6d9f9a411f657 SHA512 923054ddc00dd65d42d14a316e60b7b8ff8cf697ea77cb4dc22cad536d520a98589cc25a906ee1cc27e9193f00aa9197e32fa3965e5032abe8fbb50466d1b4e4
-EBUILD networkmanager-wireguard-9999.ebuild 954 BLAKE2B ab4a7d1a75c0d5fe19bc1e5e4ac325a46d1af7e3cc7addddfbdce17005abf6e8895ad24994017e9d7624cfb2f1876903a4ad85be3d729f8f512dd32991678d4c SHA512 3f3f29ba18e44f5bb56afd8ba9f59385295b6c03ecdf18054561a838c9ee60358df286e6195d5fb67c83b022ca67268bf8e681debda2ceda6f15247448ede457
+EBUILD networkmanager-wireguard-0_pre20191128-r2.ebuild 1124 BLAKE2B cf9679ff70de9493c20d0ff1f453f43991fa150a60c69b73d6c36f643a764dd6ae7e0448e1fab86f653c7e1d4e26194fae21ed66b57f5aa766256c42b5cf222e SHA512 a2e0b957c41fc77fac4faef6da9a207ae3f76cb60cecf1fe50ca536c87c83cc3b05a6d5c025200380c717fa301fe6ea99361d33308b51e4dc8ac3bde77f35886
+EBUILD networkmanager-wireguard-9999.ebuild 970 BLAKE2B 7bc0b2a6872732888cff0c85f59d953f8767404d7d55a3e248bb02062131890f45393ee0fad4d91346833b1da6426a4e0a472c8f9053e5f98fa330466dabd04f SHA512 42b896fa00cb6f3c5ef2fc60e5dff1f85385b1e758b951f1c5ebdc368804d53516a8f5fae868f678cc72d75963e70b7a5bce663b572bdaf309392c61c7f4a5dc
MISC metadata.xml 554 BLAKE2B 17fea861188a788f83bea73820f206f479c834f9715687b379d098dcee78d94e056d64a2a659b86952010f8b064b8b3fad757f888866424ba709ea5200209bc1 SHA512 d3003837b1c0af95b0a55ce91661b07be14662e904508118712cc95ddf5250e929a31347041962edec1cd0d7c33b5e34e339381cf00df58b401c034c6f6388f6
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild
index 2779b36f5cff..0786a2a6e888 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ REQUIRED_USE="glib? ( gtk )"
RDEPEND="
net-misc/networkmanager
- net-vpn/wireguard
+ net-vpn/wireguard-tools[wg-quick]
glib? ( dev-libs/glib )
gtk? (
app-crypt/libsecret
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
index 311751ee1d93..e2fe0d2911b8 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-9999.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="glib? ( gtk )"
RDEPEND="
net-misc/networkmanager
- net-vpn/wireguard
+ net-vpn/wireguard-tools[wg-quick]
glib? ( dev-libs/glib )
gtk? (
app-crypt/libsecret
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index e9ba4b5a70fa..30440f9fd866 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -3,6 +3,6 @@ AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa504
AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15
DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a
-EBUILD openconnect-8.05.ebuild 3647 BLAKE2B e0b20122e71045793dbfcb66c56c47037169e9fe9a07daf37ed006c3ca545790c884d35dd26c52599ea50aeb234cc0738534a054da2c887151b9aae0dee9c09f SHA512 d7e59bf715b70d393f13074acff9293f31c1ec29553a08cec3de309acc9bcac00c3381051fe4376ef34c0ffd9fb28c4ceaf72cee346ecc86b7965e871f7a7854
-EBUILD openconnect-9999.ebuild 3652 BLAKE2B ac70d76584cd14439234b062d36cf5ddb845b1afacebc918c5a192b34e323870c42784817513a396349389156a4c06cf6879f0fc4013150bf104bc3446c8cd8f SHA512 dd769d358266f197be0edacba22863db42fb4f47752955e984579fbfee403fb12f26529e8c29a36ff96542eaeacaa920593824bfed630568b389ec7775224b92
+EBUILD openconnect-8.05.ebuild 3643 BLAKE2B 998ecde1403b7cc58aa6048f6e953a9551253d8b5639d2fa18fb7c21eb77f29ea89bdcdb3c7a97d2c929d29fdf940be73aa3a0fc514640f72507c427e3113c63 SHA512 f0e3126f22c548f325467558b2fef5fa7a51a13c68f761193edbc1a24d777c9653d3980d94af4c6319832e04186a28113c570704e4f1d898f67fe6cca73bd07e
+EBUILD openconnect-9999.ebuild 3648 BLAKE2B aa809f90e704a13821d3d2f4bef7cac4ecfae29b5c6aca7b55f903b3c3e327790ab465116ea139334b57cfc01526cc532cf9715b4c80492c9b334c5876a14123 SHA512 a123088922b3f92ee430beadafbda94d114e29e294e4d03cb0bc6ed8d8459da374b7d456f6f82d61fcf92c199cfc3c56e634b33b7dad53f30a7f580e1454ce08
MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild
index 1288c9d12a72..99f9981c5e39 100644
--- a/net-vpn/openconnect/openconnect-8.05.ebuild
+++ b/net-vpn/openconnect/openconnect-8.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit linux-info python-any-r1 readme.gentoo-r1
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index d6159955545a..3baa6c138c59 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
PYTHON_REQ_USE="xml"
inherit linux-info python-any-r1 readme.gentoo-r1
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 3889924eef80..4d9b1ed04ff6 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,7 +1,5 @@
DIST openfortivpn-1.10.0.tar.gz 74872 BLAKE2B 98b6840aedb72592d95f12c011823119f1622154f1ebe20da867e6e0b8b2da666928a74d8712564d743d37b9c1ef24d9e1764cd11e86b53d4969594f549e68d6 SHA512 504cc489c298a59b958afe8278e3d7089fa2f5c21b0ce4c1c6e8bd99ccc670f86ba48812b844dffae04930d3398ac38e7a27768022e972f45b81f19e8400801e
DIST openfortivpn-1.11.0.tar.gz 77325 BLAKE2B af899a0e096f439fd85bf65d5a6bf620fd970177ab2afbf4b4bcfec6fdd34179ec7e239ceadcf0fe326c8eb9d281e7c19756e2ea444e96c58a203f0c32795163 SHA512 09a1d2deea932be80306a2a394aae8553e23389668844dd16d69626bdf1e6c28f58c0d45483fbb994b046e4e4cce4bf6e1e79fcd3ebc2c4d93870f431a8553f4
-DIST openfortivpn-1.9.0.tar.gz 71903 BLAKE2B 0f37b782944e96ba043b82bb172cdd90badf501a31f4ef253cdfc2ea59f4d478ccb4de15514df279059ad41ff3d872e2521ebc64af56844e5d3dd719e8965e18 SHA512 bea07d173f84562e37bbd925fc9ca1ffc4b91442792d29dd5f78849a44df7f4f677f306bb9020ca3ebdc4da1d5635bb4e746455c4ccf9ef1598c8100dcb2df7a
EBUILD openfortivpn-1.10.0.ebuild 761 BLAKE2B 486e22bbfc2a1541c99bf596b88bfaece6bb701a7d8fb31c2d245745c67ae687ab8abb6967a5129832bd9a511ed43c9782b7ef14b2df9e1016099ace4880b583 SHA512 ddfe172d12c5bd34e5458dee0f13a35934392f1f73858a14218ef10e657ab123eb6e09ecf7aef0a2f48416e7b7721c436d3a2612e149853a093652da8c84459d
EBUILD openfortivpn-1.11.0.ebuild 762 BLAKE2B 2eeb69de1ae4095f5a1e8f3a37d543839c5aacbf68eae8ba200d084ac0de4d74c6b1afaf9321036ff77eb1689a799fa836fae13b45e66386c3f2badfb3a87fb3 SHA512 8bf74ff6e0879764089b4fdafef90bbe1737446ce3ac4dda9349031a32f4b6aab17a6f847feee314616f30a08ffe5395903726b99a28b93ed91f724551c05815
-EBUILD openfortivpn-1.9.0.ebuild 763 BLAKE2B 08493890f4639410b0ac11123ba8babeca5e1888586bf4bc84e7fb8e00c3170a8b26a7b342aed2174c2ed65f8cfcbe9be8df7b687d967995b2cdaae437032bb0 SHA512 8d8abd0fa604fcef6d156ac14e085a19f3418e5ea569947e8085017c55b4028c5e2a7437cd7efc05b8b822e3397c2d459835bb6a4aa5ea5873b50ec4fd2a1512
MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.9.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.9.0.ebuild
deleted file mode 100644
index ba9f16f59256..000000000000
--- a/net-vpn/openfortivpn/openfortivpn-1.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="A Fortinet compatible VPN client"
-HOMEPAGE="https://github.com/adrienverge/openfortivpn"
-SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception openssl"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="libressl"
-
-DEPEND="
- net-dialup/ppp
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPP ~PPP_ASYNC"
-
-src_prepare() {
- default
-
- sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
-
- eautoreconf
-}
-
-src_install() {
- default
-
- keepdir /etc/openfortivpn
-}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 9ff67a01d637..da3e2b1c5feb 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -11,6 +11,6 @@ DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5
DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c
EBUILD openvpn-2.4.6-r1.ebuild 4588 BLAKE2B c68c2dfb20f51f0a35bfee4209d1f432881544f75b5c538274f195f0b49261d62bfc6ce9e50866617770e01abb79b3d072eb65b7245094d9c02d54c6176ac658 SHA512 d7a71ebf1d3626863cb9e5d9fd30c3bf575074c6397ba286a18ad2e9007eed55b8883f1cb23a079f132f2b19d3b61022ff04f013ee4ae765c27a257b1cc13ed5
EBUILD openvpn-2.4.6.ebuild 4579 BLAKE2B 7654c570040a0eeaec4fcbbbc07adbe272a991d48ca12c4247da73d8cfd82f5ea1564dab005e547af2896740d7b146d54c10e79089d127f941c4527b84450245 SHA512 5dc3167ccf82020e32c3fab2832169ce889eea698dc68b29f90d481cf6d8a7826baf70bbc5971df59548006bcc6c8d015a03db865e6bd87de8a8c11628250537
-EBUILD openvpn-2.4.7-r1.ebuild 4628 BLAKE2B 47dcfdceb8ef5831c9e6d85983776dc3cdbcec0a750329fa8ccaaa6a7247e2603648743c04b7d5e9273be874a0b530cd5129a016cc9241646d852a3402f9fc0e SHA512 f0bcc199b3586b4d66d8f6a8623d86a3cda6acbb90d4c82ec64671a0ba8cec40aa093113b48b033e8602fc4a3a14a023bbcbebada5230f4875623f055211e59e
+EBUILD openvpn-2.4.7-r1.ebuild 4625 BLAKE2B b424d222f3cc7a69586661f8663c859a22e4ee8ed6290a2dd2a0820ff8a50284c1678ec9f9aeda4252a572c6a29f481f1713b7ec433debecd1a9374eb67b80e3 SHA512 9fa27692ef03a6fb27d1db0a7d0af4c828aa97942343867cc347debd97876a9ce97ecf3647368e39ebf527d293bc0e998f8d084baa4b2a5b32ac621df094238d
EBUILD openvpn-9999.ebuild 4331 BLAKE2B cdeb6248a8b28fc74cc90317af98ac26a99d23957e9178607908a8e132323034dfcdc2e4061c838e94e5bb7c785dff34a65ce25960600ec74ed1734dabceac46 SHA512 bc4c0b1e3f7aef764001624198f7316fa67476d9cdda3ff2a696b7463d8bdd2f04c66713cb3351a6296f570926c852c1f0f211df1c93f3be491cd7c09bb9f68b
MISC metadata.xml 998 BLAKE2B 800c147b67d26d0ae3856c3aebfd7bec9326aaa67ffcb16b57e00ad722b8154bcd4cd6daef741ebb0f12032ef986e0b3b5a4cf99014df1fbd54699a98ed13a0c SHA512 d7e07e98986611dc410a3ab1b0bf2bb3925fcc9f3388c9649ce7a01baa2fa076d7766b4e1b9749048aa1d1850cb9053e8822ce7a1870002805c176c6a60e6db8
diff --git a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
index 09518d64afef..eb39228f15d7 100644
--- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam"
IUSE+=" pkcs11 +plugins selinux +ssl static systemd test userland_BSD"
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 67b1221cec75..f7bb92d26530 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,6 +1,6 @@
AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
-DIST strongswan-5.7.2.tar.bz2 4997818 BLAKE2B e5a160ea8d31ae14c9731e414e42653ecb12f259fbe76ec7289f44afe5687f4123d89750a8f57c9ea006aec7f0be28e0f0c56d6c0a4bc96f0e1ba69c29da904f SHA512 e2169dbbc0c03737e34af90d7bc07e444408c5e2ac1f81764eeccbac8b142b984ce9ed512a89071075a930e0997632267f6912aa5b352eee2edbd551b5a64e7e
DIST strongswan-5.8.1.tar.bz2 4517921 BLAKE2B 07a82309515a054b267a063fc0e2f49fd03d16b221b1ee26a33c8d367df140797320e1ef7007a39074e40c472022d941656b3ae93d2eb860152cdc5a5d3dbc8a SHA512 630d24643b3d61e931bb25cdd083ad3c55f92fe41f3fcd3198012eee486fb3b1a16dc3f80936162afb7da9e471d45d92b7d183a00153a558babb2a79e5f6813f
-EBUILD strongswan-5.7.2.ebuild 9442 BLAKE2B 3cf9b9086aadaf9b7b75ac090f1757709803522f6a31b5a185c4bdab9a879b9e26dffff5566128e962a419d080df96184572c481d28eb042abfde9263e566b6d SHA512 10a0e43b03e4cd3db251bd65ddffd855c880b6fb02840c5de4c38d2a11a3e860a9fc89d224d60e884cd38dd0b20c821b3d9abd7a6be5fc6655f6cb2c87084521
-EBUILD strongswan-5.8.1.ebuild 9509 BLAKE2B 4a7f29a3fa47d8a393efb3c773ec62b553b1a52449a90c5f458e74d8ba2b447f5f66e47d1314903da01d808f5f3b63c4a12e4776abbcc8caedef1145f07ed45f SHA512 b504e7fa6461b6727aaa7c12ce9d94508a0f48d775ae5292a2bf5dd393f2e1f2b34b8252642ff2b04ac6aefcdfd29c1e8e81f2316be32ed6f35c00295ab4e37a
+DIST strongswan-5.8.2.tar.bz2 4533402 BLAKE2B edbfa8dbe1ac00c140cfe9e906ac7aa1b6f3ddfd528dec84e7b1799e5ecdd0f6114679168ebcff9185c8abae78b46dfc43ddc4dabecd44f720285bd175d7a249 SHA512 423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d
+EBUILD strongswan-5.8.1.ebuild 9507 BLAKE2B 3912bd097b1c8f7d5b5aed00ff9396b2863ae3165f9f656e4dd6f0793f9b02d321115f23ad3c21558d6b2be13ebd6f14d28513209a703c61870b528cde566ec3 SHA512 17b8df9b5eab7c26425208e3d14d1b2596f3373d88314337cc2d397da574665d94bdca61a35ed6a143e5bc807f4b5514f7066841802a328b18f693c28e434fb9
+EBUILD strongswan-5.8.2.ebuild 9511 BLAKE2B f37d1e5df9fe27fd642cdcceab53d5f39a425f33cf1ea8c599845528f3539a0ab844386b82f5adeaef7003820423e708d967dd9a2335972a2af09afacb3d8b36 SHA512 6be26d31dcd7e9563116cf3d7e4298c82ce84ec2e53ef6358dcd408fbd09141861d6436322a4fbf6c6d855a2fe613c048e45dac50b0e46f0e35265638e381801
MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/strongswan-5.8.1.ebuild b/net-vpn/strongswan/strongswan-5.8.1.ebuild
index ba14f7ef8a2c..168a76a9f0d3 100644
--- a/net-vpn/strongswan/strongswan-5.8.1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
LICENSE="GPL-2 RSA DES"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/strongswan/strongswan-5.7.2.ebuild b/net-vpn/strongswan/strongswan-5.8.2.ebuild
index 2c19bfbd44ab..2ab3a0ed5d3a 100644
--- a/net-vpn/strongswan/strongswan-5.7.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.8.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
LICENSE="GPL-2 RSA DES"
SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
@@ -178,6 +178,10 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
+ if ! use systemd; then
+ rm -rf "${ED}"/lib/systemd || die
+ fi
+
doinitd "${FILESDIR}"/ipsec
local dir_ugid
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index fa563dd4954d..417e4d227efd 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,11 +7,9 @@ AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c5
AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.0.6.tar.gz 7380018 BLAKE2B d013fdb5c253be934e28d312fb1e9f03b679651a42878859375d12620fcbe30e077870b1714f2e52f5d7836351dbb1cc0805535c2a7e32256ebf1fce1ba68d63 SHA512 6ed701e5a3c05437877b7c3891c924655f2e47585ac3e2e6ac2fb5604a3ebf8a945f17f03e042d491d4d956da653ba110aa7e5f8bfa231fc0476d36a0a7f02e5
DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B 34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5 SHA512 f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
DIST tor-0.4.2.5.tar.gz 7596836 BLAKE2B 0c7fa5d427f9d0683846c1023a4539ae4042c0d26f1c5afff20037f0681f6ea0dfb735e9c0e9d14bd7dddbfd5a0023064dc6e6cf6e6629402a6a13248129e6c5 SHA512 e63157713caa3590324f652f17c5c5634bab015dcde5c7832eb725351c3a91c1051dd8a95650502703e9c3dd5daefc2867ff3d20530dfec17310bb3dd4bb5b7d
EBUILD tor-0.4.0.5.ebuild 2260 BLAKE2B ff4a22c81179b1fee52c812fb672daf85222b686774ce3654cd0a7cd8efc5657c19fdd67f0a0367f224c21467dd05ae298abbc2c6e9b2963e49398bd841da32c SHA512 8ec4875689f48aecab48074764c67423720cf1beacf30727753ac9d79b7ad2fd0a7dd29c02e9372b19ed1030d5fe0f853055e2605f5226540b898930fda62713
-EBUILD tor-0.4.0.6.ebuild 2265 BLAKE2B 921ddc2a62e9577ed6a683d5a5648f519b1951ded86d02f802f273e43ba38c60ed76898d379da7eff656a093435128b2a693505c23a55ae9b5163bc11144f37b SHA512 bea8c2d97f9c8e951ba6f82f0586770e8adf34206ca0fb34e25e9180741305febf346afececffbb5070ea2c1f18ce8eb8af87da60dabbccf7ac026e2f2398599
-EBUILD tor-0.4.1.7.ebuild 2233 BLAKE2B d123128ba7fbd043e8d97ff122f011b2c3882e67ee50968870b5739ee20be1cb9835e9c20b0e348737c2f9e1bcb64a74e0cf1ca3f45049bf977f062fdd5f1744 SHA512 ccdd5a061eedb05ca810f08b529b84f6ae287a406aff79a90300c650deb803a1d9132e717911c0ba23a9d2ced4cdffd432bea59155b5fe1d6ba4a3e9fc1c9af1
+EBUILD tor-0.4.1.7.ebuild 2228 BLAKE2B 8fb5b646f254fa5cc654c6c9f7eb7d0210e149575fdbc3bcf15e0d687b04cf7d34c37540192ea83dcd8e7f47e8d0f4f3d1ab9134b6a8c5f5846c409d1046b39c SHA512 25629021a44ac69d65c4d385de128c87aa749d6d8c996420f580e16049c9ee7afaf7b756c7818323b546e581b15ba09106e038e36b858649ca51e02a78f42d21
EBUILD tor-0.4.2.5.ebuild 2289 BLAKE2B e2d53844303c811a9b4a515418afbe3bc83e93a558afbe6231f8a5860757d2685bdb875968494250a023c146412ec58cde66bd87dbc8b3918b5f889917fe1e34 SHA512 a6acfde2cfbf4e608a5c2c8be80371e6b4c889d4872c627fe2d3264f375044080f18f52bd0123e02e796fcc5c36188a9be25c0c27791763fbc7e48b2529d31e3
MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.0.6.ebuild b/net-vpn/tor/tor-0.4.0.6.ebuild
deleted file mode 100644
index cfb78c50ce3f..000000000000
--- a/net-vpn/tor/tor-0.4.0.6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd user
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
- dev-libs/libevent[ssl]
- sys-libs/zlib
- caps? ( sys-libs/libcap )
- man? ( app-text/asciidoc )
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
- use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
- export ac_cv_lib_cap_cap_init=$(usex caps)
- econf \
- --localstatedir="${EPREFIX}/var" \
- --enable-system-torrc \
- --disable-android \
- --disable-libfuzzer \
- --disable-module-dirauth \
- --enable-pic \
- --disable-rust \
- --disable-restart-debugging \
- --disable-zstd-advanced-apis \
- $(use_enable man asciidoc) \
- $(use_enable lzma) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable test unittests) \
- $(use_enable test coverage) \
- $(use_enable zstd)
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r8 tor
- systemd_dounit contrib/dist/tor.service
-
- keepdir /var/lib/tor
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-
-}
diff --git a/net-vpn/tor/tor-0.4.1.7.ebuild b/net-vpn/tor/tor-0.4.1.7.ebuild
index 8085c15bf0ad..81e7a01b64f3 100644
--- a/net-vpn/tor/tor-0.4.1.7.ebuild
+++ b/net-vpn/tor/tor-0.4.1.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~ppc-macos"
IUSE="caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd"
DEPEND="
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
new file mode 100644
index 000000000000..272e70d80056
--- /dev/null
+++ b/net-vpn/wireguard-modules/Manifest
@@ -0,0 +1,4 @@
+DIST wireguard-linux-compat-0.0.20200105.tar.xz 261236 BLAKE2B 679902e7bea78c42fb49ec51141b1d543e966056fa341eb058266b7810dfeca09c5eb81a4c93e695762581f01fe1212acd8d5f4846a3bed8c37451b112d2d78e SHA512 a27d863e7af9ecbdad784d9ebd6b7613cb6a3a8749d2552c0ecc932c606ed08effc9600813d8cc6801748041456d6e59aab28b9ba486986c88f3d2e90a9209bd
+EBUILD wireguard-modules-0.0.20200105.ebuild 3446 BLAKE2B f835ad396e15c7618cc6702b5c2e3e467be486496285eaf0304059667c65f8b48a754477071cb87cd03ba4e1b6b5ad0ccc60cffc7942920f17ca68f708d1e7b9 SHA512 c967a4990c3ebb10355a936a736c06a6d149371ba5f75ad1cccb023e3d387ae5a6f39b2af17c562ebd802369db5fb6e075f93b40f10ed1871a0d7eaef7a1229b
+EBUILD wireguard-modules-9999.ebuild 3446 BLAKE2B 210f244cd0df0062bf3330f7dfd551aa9827fbc719ecdf76906f323edddb4e8f0713c9f7bc8302c10e615518d3b4a9f4da551f9412c138f9cd4d850bdacd1327 SHA512 1d3890fe6b5408fb6b623b9a2d3976c89b89183492482d9fe41d04238acda943600637cb43852f4511622742a599cc913eb02bf7c39c917a463a4d55673ba380
+MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard/metadata.xml b/net-vpn/wireguard-modules/metadata.xml
index d5c30b1930c0..3b5b3d014e70 100644
--- a/net-vpn/wireguard/metadata.xml
+++ b/net-vpn/wireguard-modules/metadata.xml
@@ -6,7 +6,6 @@
<name>Jason A. Donenfeld</name>
</maintainer>
<use>
- <flag name="tools">Compile the wg(8) tool and related helpers. You probably want this enabled.</flag>
<flag name="module">Compile the actual WireGuard kernel module. Most certainly you want this enabled, unless you're doing something strange.</flag>
<flag name="module-src">Install the module source code to /usr/src, in case you like building kernel modules yourself.</flag>
<flag name="debug">Enable verbose debug reporting in dmesg of various WireGuard peer and device information.</flag>
diff --git a/net-vpn/wireguard-modules/wireguard-modules-0.0.20200105.ebuild b/net-vpn/wireguard-modules/wireguard-modules-0.0.20200105.ebuild
new file mode 100644
index 000000000000..e0049debd888
--- /dev/null
+++ b/net-vpn/wireguard-modules/wireguard-modules-0.0.20200105.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="module"
+inherit linux-mod bash-completion-r1
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.zx2c4.com/wireguard-linux-compat"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
+ S="${WORKDIR}/wireguard-linux-compat-${PV}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +module module-src"
+
+DEPEND=""
+RDEPEND="${DEPEND} !<virtual/wireguard-1"
+
+MODULE_NAMES="wireguard(kernel/drivers/net:src)"
+BUILD_TARGETS="module"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
+
+pkg_setup() {
+ if use module; then
+ linux-mod_pkg_setup
+ if kernel_is -ge 5 6 0; then
+ eerror
+ eerror "WireGuard has been merged upstream in Linux 5.6. Therefore,"
+ eerror "you no longer need this compatibility ebuild. Instead, simply"
+ eerror "enable CONFIG_WIREGUARD=y in your kernel configuration."
+ eerror
+ die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do not use this package."
+ elif kernel_is -lt 3 10 0; then
+ die "This version of ${PN} requires Linux >= 3.10."
+ fi
+ fi
+}
+
+src_compile() {
+ BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
+ use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
+ use module && linux-mod_src_compile
+}
+
+src_install() {
+ use module && linux-mod_src_install
+ use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
+}
+
+pkg_postinst() {
+ if use module-src && ! use module; then
+ einfo
+ einfo "You have enabled the module-src USE flag without the module USE"
+ einfo "flag. This means that sources are installed to"
+ einfo "${ROOT}/usr/src/wireguard instead of having the"
+ einfo "kernel module compiled. You will need to compile the module"
+ einfo "yourself. Most likely, you don't want this USE flag, and should"
+ einfo "rather use USE=module"
+ einfo
+ fi
+
+ if use module; then
+ linux-mod_pkg_postinst
+ local old new
+ if [[ $(uname -r) != "${KV_FULL}" ]]; then
+ ewarn
+ ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
+ ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
+ ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
+ ewarn "which this module was built."
+ ewarn
+ elif [[ -f /sys/module/wireguard/version ]] && \
+ old="$(< /sys/module/wireguard/version)" && \
+ new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
+ [[ $old != "$new" ]]; then
+ ewarn
+ ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
+ ewarn "However, the old version is still running on your system. In order to use the"
+ ewarn "new version, you will need to remove the old module and load the new one. As"
+ ewarn "root, you can accomplish this with the following commands:"
+ ewarn
+ ewarn " # rmmod wireguard"
+ ewarn " # modprobe wireguard"
+ ewarn
+ ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
+ ewarn "to gracefully remove them yourself prior."
+ ewarn
+ fi
+ fi
+}
diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
new file mode 100644
index 000000000000..7c5072266bfc
--- /dev/null
+++ b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE="module"
+inherit linux-mod bash-completion-r1
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.zx2c4.com/wireguard-linux-compat"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${PV}.tar.xz"
+ S="${WORKDIR}/wireguard-linux-compat-${PV}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +module module-src"
+
+DEPEND=""
+RDEPEND="${DEPEND} !<virtual/wireguard-1"
+
+MODULE_NAMES="wireguard(kernel/drivers/net:src)"
+BUILD_TARGETS="module"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
+
+pkg_setup() {
+ if use module; then
+ linux-mod_pkg_setup
+ if kernel_is -ge 5 6 0; then
+ eerror
+ eerror "WireGuard has been merged upstream in Linux 5.6. Therefore,"
+ eerror "you no longer need this compatibility ebuild. Instead, simply"
+ eerror "enable CONFIG_WIREGUARD=y in your kernel configuration."
+ eerror
+ die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do not use this package."
+ elif kernel_is -lt 3 10 0; then
+ die "This version of ${PN} requires Linux >= 3.10."
+ fi
+ fi
+}
+
+src_compile() {
+ BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
+ use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
+ use module && linux-mod_src_compile
+}
+
+src_install() {
+ use module && linux-mod_src_install
+ use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
+}
+
+pkg_postinst() {
+ if use module-src && ! use module; then
+ einfo
+ einfo "You have enabled the module-src USE flag without the module USE"
+ einfo "flag. This means that sources are installed to"
+ einfo "${ROOT}/usr/src/wireguard instead of having the"
+ einfo "kernel module compiled. You will need to compile the module"
+ einfo "yourself. Most likely, you don't want this USE flag, and should"
+ einfo "rather use USE=module"
+ einfo
+ fi
+
+ if use module; then
+ linux-mod_pkg_postinst
+ local old new
+ if [[ $(uname -r) != "${KV_FULL}" ]]; then
+ ewarn
+ ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
+ ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
+ ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
+ ewarn "which this module was built."
+ ewarn
+ elif [[ -f /sys/module/wireguard/version ]] && \
+ old="$(< /sys/module/wireguard/version)" && \
+ new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
+ [[ $old != "$new" ]]; then
+ ewarn
+ ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
+ ewarn "However, the old version is still running on your system. In order to use the"
+ ewarn "new version, you will need to remove the old module and load the new one. As"
+ ewarn "root, you can accomplish this with the following commands:"
+ ewarn
+ ewarn " # rmmod wireguard"
+ ewarn " # modprobe wireguard"
+ ewarn
+ ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
+ ewarn "to gracefully remove them yourself prior."
+ ewarn
+ fi
+ fi
+}
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
new file mode 100644
index 000000000000..f3ccc756cefa
--- /dev/null
+++ b/net-vpn/wireguard-tools/Manifest
@@ -0,0 +1,4 @@
+DIST wireguard-tools-1.0.20200102.tar.xz 91496 BLAKE2B efe42dfc08c8eceb5831deaa57cd274599a0a92ac3489a49e8e633388bb6ebaaab0f48ad6f7338d539ec247fafca9491c7296de654e6539a8a392c428d47ca7e SHA512 a4275eefc55b2a7ed3935a46a2098f9b0acdfaf0e1ed33ca42b51a186b388b53425ded5887e2cfc5be2802d6a453b8ebbf0294800ec1307a2dc21f46bd040da6
+EBUILD wireguard-tools-1.0.20200102.ebuild 3418 BLAKE2B a1b7cec18e18dc7377bf13e9a7df742c8b0e7d4d2f7286d4ee0d9d11351f31c8af870c175f7d47b0659b56ce0eb9b7902b875084d9128cd57f3f2daa81d56298 SHA512 416381574733ed505be1342e21bb39c7a9a49c6120f873bef46b304e9d9d0f79680aa805b052af0e9adad1544806e2130a714d693a6d1edf2c1d5abb028504dc
+EBUILD wireguard-tools-9999.ebuild 3418 BLAKE2B af103c528778ada99dcf4817b6c5e2412796ff5b2b0e5cfb82158c529ce2207da3e90f31fba0bf4c782ae5db493e828ae8b87ee6b53dddc842c4a4f341a71106 SHA512 eacad7bc249b59de795f3f7b2e9c11e3d39dce0c4b73ec67bd9e9a5ced69d27997cca7bd1054d52c902ee28b1b690ae9bbf8ec236ec5a443ab8f5d3a174562ab
+MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/metadata.xml b/net-vpn/wireguard-tools/metadata.xml
new file mode 100644
index 000000000000..652da2d16d0c
--- /dev/null
+++ b/net-vpn/wireguard-tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <use>
+ <flag name="wg-quick">Install the wg-quick(8) helper tool. Most users want to use this.</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild
new file mode 100644
index 000000000000..5600d6cff472
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/libmnl"
+RDEPEND="${DEPEND}
+ wg-quick? (
+ || ( net-firewall/nftables net-firewall/iptables )
+ virtual/resolvconf
+ )
+ !<virtual/wireguard-1
+"
+
+wg_quick_optional_config_nob() {
+ CONFIG_CHECK="$CONFIG_CHECK ~$1"
+ declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+ use wg-quick || return 0
+ wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+ wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+ wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+ if has_version net-firewall/nftables; then
+ wg_quick_optional_config_nob NF_TABLES
+ wg_quick_optional_config_nob NF_TABLES_IPV4
+ wg_quick_optional_config_nob NF_TABLES_IPV6
+ wg_quick_optional_config_nob NFT_CT
+ wg_quick_optional_config_nob NFT_FIB
+ wg_quick_optional_config_nob NFT_FIB_IPV4
+ wg_quick_optional_config_nob NFT_FIB_IPV6
+ elif has_version net-firewall/iptables; then
+ wg_quick_optional_config_nob NETFILTER_XTABLES
+ wg_quick_optional_config_nob NETFILTER_XT_MARK
+ wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+ wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+ wg_quick_optional_config_nob IP6_NF_RAW
+ wg_quick_optional_config_nob IP_NF_RAW
+ wg_quick_optional_config_nob IP6_NF_FILTER
+ wg_quick_optional_config_nob IP_NF_FILTER
+ fi
+ linux-info_pkg_setup
+}
+
+src_compile() {
+ emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ dodoc README.md
+ dodoc -r contrib
+ emake \
+ WITH_BASHCOMPLETION=yes \
+ WITH_SYSTEMDUNITS=yes \
+ WITH_WGQUICK=$(usex wg-quick) \
+ DESTDIR="${D}" \
+ BASHCOMPDIR="$(get_bashcompdir)" \
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+ PREFIX="${EPREFIX}/usr" \
+ -C src install
+}
+
+pkg_postinst() {
+ einfo
+ einfo "After installing WireGuard, if you'd like to try sending some packets through"
+ einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+ einfo "test example script:"
+ einfo
+ einfo " \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
+ einfo
+ einfo "This will automatically setup interface wg0, through a very insecure transport"
+ einfo "that is only suitable for demonstration purposes. You can then try loading the"
+ einfo "hidden website or sending pings:"
+ einfo
+ einfo " \$ chromium http://192.168.4.1"
+ einfo " \$ ping 192.168.4.1"
+ einfo
+ einfo "If you'd like to redirect your internet traffic, you can run it with the"
+ einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
+ einfo "purposes. It is for quick testing only."
+ einfo
+ einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+ einfo
+}
diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
new file mode 100644
index 000000000000..bd16ac3af082
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/libmnl"
+RDEPEND="${DEPEND}
+ wg-quick? (
+ || ( net-firewall/nftables net-firewall/iptables )
+ virtual/resolvconf
+ )
+ !<virtual/wireguard-1
+"
+
+wg_quick_optional_config_nob() {
+ CONFIG_CHECK="$CONFIG_CHECK ~$1"
+ declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
+}
+
+pkg_setup() {
+ use wg-quick || return 0
+ wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+ wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+ wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+ if has_version net-firewall/nftables; then
+ wg_quick_optional_config_nob NF_TABLES
+ wg_quick_optional_config_nob NF_TABLES_IPV4
+ wg_quick_optional_config_nob NF_TABLES_IPV6
+ wg_quick_optional_config_nob NFT_CT
+ wg_quick_optional_config_nob NFT_FIB
+ wg_quick_optional_config_nob NFT_FIB_IPV4
+ wg_quick_optional_config_nob NFT_FIB_IPV6
+ elif has_version net-firewall/iptables; then
+ wg_quick_optional_config_nob NETFILTER_XTABLES
+ wg_quick_optional_config_nob NETFILTER_XT_MARK
+ wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+ wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+ wg_quick_optional_config_nob IP6_NF_RAW
+ wg_quick_optional_config_nob IP_NF_RAW
+ wg_quick_optional_config_nob IP6_NF_FILTER
+ wg_quick_optional_config_nob IP_NF_FILTER
+ fi
+ linux-info_pkg_setup
+}
+
+src_compile() {
+ emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ dodoc README.md
+ dodoc -r contrib
+ emake \
+ WITH_BASHCOMPLETION=yes \
+ WITH_SYSTEMDUNITS=yes \
+ WITH_WGQUICK=$(usex wg-quick) \
+ DESTDIR="${D}" \
+ BASHCOMPDIR="$(get_bashcompdir)" \
+ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+ PREFIX="${EPREFIX}/usr" \
+ -C src install
+}
+
+pkg_postinst() {
+ einfo
+ einfo "After installing WireGuard, if you'd like to try sending some packets through"
+ einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+ einfo "test example script:"
+ einfo
+ einfo " \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
+ einfo
+ einfo "This will automatically setup interface wg0, through a very insecure transport"
+ einfo "that is only suitable for demonstration purposes. You can then try loading the"
+ einfo "hidden website or sending pings:"
+ einfo
+ einfo " \$ chromium http://192.168.4.1"
+ einfo " \$ ping 192.168.4.1"
+ einfo
+ einfo "If you'd like to redirect your internet traffic, you can run it with the"
+ einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
+ einfo "purposes. It is for quick testing only."
+ einfo
+ einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+ einfo
+}
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
deleted file mode 100644
index afc240e105f7..000000000000
--- a/net-vpn/wireguard/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST WireGuard-0.0.20191212.tar.xz 333024 BLAKE2B 89bf2fc6a76b5a20e3d468581fe509178eb177760b3084577fdcba46b6c3ca4228e4f06f9e666bf901f8401b4109a3e1646c527195d5598fb2dd8c655813a4a7 SHA512 3e6b3841c72f0b30dab6e61ba07a865c5601617047f90a228cefc4ed6eb0511b9c76d745df9a89dfc71791937e1268bbc0b1cfa6f7291b77a4db0f2fb14d272a
-EBUILD wireguard-0.0.20191212.ebuild 5329 BLAKE2B 971467aad5f0b524255bbbc46f5fdd267dd04dbbd76e4253224e80cffc3c6f1aaa58d46ddc5a86eb021b9c667157f88bf0a4766fca1f22eaa2366665eb4cffbe SHA512 8a2182da7b547fb287f62cb6673be2cc4899423656e81e1d8b41b26de20ca1b12bae1503d917b175afa82918382ccce7b5373ae422e69db82d83c6a30d0e72d5
-EBUILD wireguard-9999.ebuild 5329 BLAKE2B 971467aad5f0b524255bbbc46f5fdd267dd04dbbd76e4253224e80cffc3c6f1aaa58d46ddc5a86eb021b9c667157f88bf0a4766fca1f22eaa2366665eb4cffbe SHA512 8a2182da7b547fb287f62cb6673be2cc4899423656e81e1d8b41b26de20ca1b12bae1503d917b175afa82918382ccce7b5373ae422e69db82d83c6a30d0e72d5
-MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20191212.ebuild b/net-vpn/wireguard/wireguard-0.0.20191212.ebuild
deleted file mode 100644
index e405c52079de..000000000000
--- a/net-vpn/wireguard/wireguard-0.0.20191212.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
- KEYWORDS=""
-else
- SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
- S="${WORKDIR}/WireGuard-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module +tools module-src"
-
-DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables net-firewall/iptables ) )"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
-
-wg_quick_optional_config_nob() {
- CONFIG_CHECK="$CONFIG_CHECK ~$1"
- declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
-}
-
-pkg_setup() {
- if use module; then
- if use tools; then
- wg_quick_optional_config_nob IP_ADVANCED_ROUTER
- wg_quick_optional_config_nob IP_MULTIPLE_TABLES
- wg_quick_optional_config_nob NETFILTER_XT_MARK
- wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
- wg_quick_optional_config_nob IP6_NF_RAW
- wg_quick_optional_config_nob IP_NF_RAW
- fi
-
- linux-mod_pkg_setup
- kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
- fi
-}
-
-src_compile() {
- BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
- use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
- use module && linux-mod_src_compile
- use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- use module && linux-mod_src_install
- if use tools; then
- dodoc README.md
- dodoc -r contrib/examples
- emake \
- WITH_BASHCOMPLETION=yes \
- WITH_SYSTEMDUNITS=yes \
- WITH_WGQUICK=yes \
- DESTDIR="${D}" \
- BASHCOMPDIR="$(get_bashcompdir)" \
- PREFIX="${EPREFIX}/usr" \
- -C src/tools install
- fi
- use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
- if use module-src && ! use module; then
- einfo
- einfo "You have enabled the module-src USE flag without the module USE"
- einfo "flag. This means that sources are installed to"
- einfo "${ROOT}usr/src/wireguard instead of having the"
- einfo "kernel module compiled. You will need to compile the module"
- einfo "yourself. Most likely, you don't want this USE flag, and should"
- einfo "rather use USE=module"
- einfo
- fi
- use module && linux-mod_pkg_postinst
-
- einfo
- einfo "This software is experimental and has not yet been released."
- einfo "As such, it may contain significant issues. Please do not file"
- einfo "bug reports with Gentoo, but rather direct them upstream to:"
- einfo
- einfo " team@wireguard.com security@wireguard.com"
- einfo
-
- if use tools; then
- einfo
- einfo "After installing WireGuard, if you'd like to try sending some packets through"
- einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
- einfo "test example script:"
- einfo
- einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
- einfo
- einfo "This will automatically setup interface wg0, through a very insecure transport"
- einfo "that is only suitable for demonstration purposes. You can then try loading the"
- einfo "hidden website or sending pings:"
- einfo
- einfo " \$ chromium http://192.168.4.1"
- einfo " \$ ping 192.168.4.1"
- einfo
- einfo "If you'd like to redirect your internet traffic, you can run it with the"
- einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
- einfo "purposes. It is for quick testing only."
- einfo
- einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
- einfo
- fi
- if use module; then
- local old new
- if [[ $(uname -r) != "${KV_FULL}" ]]; then
- ewarn
- ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
- ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
- ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
- ewarn "which this module was built."
- ewarn
- elif [[ -f /sys/module/wireguard/version ]] && \
- old="$(< /sys/module/wireguard/version)" && \
- new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
- [[ $old != "$new" ]]; then
- ewarn
- ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
- ewarn "However, the old version is still running on your system. In order to use the"
- ewarn "new version, you will need to remove the old module and load the new one. As"
- ewarn "root, you can accomplish this with the following commands:"
- ewarn
- ewarn " # rmmod wireguard"
- ewarn " # modprobe wireguard"
- ewarn
- ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
- ewarn "to gracefully remove them yourself prior."
- ewarn
- fi
- fi
-}
diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
deleted file mode 100644
index e405c52079de..000000000000
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MODULES_OPTIONAL_USE="module"
-inherit linux-mod bash-completion-r1
-
-DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
- KEYWORDS=""
-else
- SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
- S="${WORKDIR}/WireGuard-${PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +module +tools module-src"
-
-DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables net-firewall/iptables ) )"
-RDEPEND="${DEPEND}"
-
-MODULE_NAMES="wireguard(kernel/drivers/net:src)"
-BUILD_TARGETS="module"
-CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
-
-wg_quick_optional_config_nob() {
- CONFIG_CHECK="$CONFIG_CHECK ~$1"
- declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
-}
-
-pkg_setup() {
- if use module; then
- if use tools; then
- wg_quick_optional_config_nob IP_ADVANCED_ROUTER
- wg_quick_optional_config_nob IP_MULTIPLE_TABLES
- wg_quick_optional_config_nob NETFILTER_XT_MARK
- wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
- wg_quick_optional_config_nob IP6_NF_RAW
- wg_quick_optional_config_nob IP_NF_RAW
- fi
-
- linux-mod_pkg_setup
- kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
- fi
-}
-
-src_compile() {
- BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
- use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
- use module && linux-mod_src_compile
- use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
- use module && linux-mod_src_install
- if use tools; then
- dodoc README.md
- dodoc -r contrib/examples
- emake \
- WITH_BASHCOMPLETION=yes \
- WITH_SYSTEMDUNITS=yes \
- WITH_WGQUICK=yes \
- DESTDIR="${D}" \
- BASHCOMPDIR="$(get_bashcompdir)" \
- PREFIX="${EPREFIX}/usr" \
- -C src/tools install
- fi
- use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
-}
-
-pkg_postinst() {
- if use module-src && ! use module; then
- einfo
- einfo "You have enabled the module-src USE flag without the module USE"
- einfo "flag. This means that sources are installed to"
- einfo "${ROOT}usr/src/wireguard instead of having the"
- einfo "kernel module compiled. You will need to compile the module"
- einfo "yourself. Most likely, you don't want this USE flag, and should"
- einfo "rather use USE=module"
- einfo
- fi
- use module && linux-mod_pkg_postinst
-
- einfo
- einfo "This software is experimental and has not yet been released."
- einfo "As such, it may contain significant issues. Please do not file"
- einfo "bug reports with Gentoo, but rather direct them upstream to:"
- einfo
- einfo " team@wireguard.com security@wireguard.com"
- einfo
-
- if use tools; then
- einfo
- einfo "After installing WireGuard, if you'd like to try sending some packets through"
- einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
- einfo "test example script:"
- einfo
- einfo " \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
- einfo
- einfo "This will automatically setup interface wg0, through a very insecure transport"
- einfo "that is only suitable for demonstration purposes. You can then try loading the"
- einfo "hidden website or sending pings:"
- einfo
- einfo " \$ chromium http://192.168.4.1"
- einfo " \$ ping 192.168.4.1"
- einfo
- einfo "If you'd like to redirect your internet traffic, you can run it with the"
- einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
- einfo "purposes. It is for quick testing only."
- einfo
- einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
- einfo
- fi
- if use module; then
- local old new
- if [[ $(uname -r) != "${KV_FULL}" ]]; then
- ewarn
- ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
- ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
- ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
- ewarn "which this module was built."
- ewarn
- elif [[ -f /sys/module/wireguard/version ]] && \
- old="$(< /sys/module/wireguard/version)" && \
- new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
- [[ $old != "$new" ]]; then
- ewarn
- ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
- ewarn "However, the old version is still running on your system. In order to use the"
- ewarn "new version, you will need to remove the old module and load the new one. As"
- ewarn "root, you can accomplish this with the following commands:"
- ewarn
- ewarn " # rmmod wireguard"
- ewarn " # modprobe wireguard"
- ewarn
- ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
- ewarn "to gracefully remove them yourself prior."
- ewarn
- fi
- fi
-}