summaryrefslogtreecommitdiff
path: root/net-vpn
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-16 09:32:48 +0100
commit9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
treeb690ddc0ca30f1472887edbb0b8313629bfcbbb2 /net-vpn
parentb17a3ef12038de50228bade1f05502c74e135321 (diff)
gentoo resync : 16.09.2020
Diffstat (limited to 'net-vpn')
-rw-r--r--net-vpn/Manifest.gzbin6878 -> 6866 bytes
-rw-r--r--net-vpn/corkscrew/Manifest4
-rw-r--r--net-vpn/corkscrew/corkscrew-2.0-r1.ebuild40
-rw-r--r--net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch12
-rw-r--r--net-vpn/corkscrew/metadata.xml3
-rw-r--r--net-vpn/httptunnel/Manifest5
-rw-r--r--net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch12
-rw-r--r--net-vpn/httptunnel/httptunnel-3.3-r2.ebuild27
-rw-r--r--net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild27
-rw-r--r--net-vpn/i2p/Manifest5
-rw-r--r--net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch25
-rw-r--r--net-vpn/i2p/i2p-0.9.47.ebuild (renamed from net-vpn/i2p/i2p-0.9.44-r2.ebuild)4
-rw-r--r--net-vpn/i2pd/Manifest6
-rw-r--r--net-vpn/i2pd/i2pd-2.33.0.ebuild (renamed from net-vpn/i2pd/i2pd-2.30.0.ebuild)30
-rw-r--r--net-vpn/i2pd/metadata.xml3
-rw-r--r--net-vpn/networkmanager-strongswan/Manifest2
-rw-r--r--net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild50
-rw-r--r--net-vpn/openconnect/Manifest4
-rw-r--r--net-vpn/openconnect/openconnect-8.09-r1.ebuild2
-rw-r--r--net-vpn/openconnect/openconnect-9999.ebuild2
-rw-r--r--net-vpn/peervpn/Manifest2
-rw-r--r--net-vpn/peervpn/metadata.xml4
-rw-r--r--net-vpn/tinc/Manifest2
-rw-r--r--net-vpn/tinc/metadata.xml1
-rw-r--r--net-vpn/vpnc/Manifest6
-rw-r--r--net-vpn/vpnc/files/vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch (renamed from net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch)0
-rw-r--r--net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild (renamed from net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild)9
-rw-r--r--net-vpn/wireguard-modules/Manifest4
-rw-r--r--net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild (renamed from net-vpn/wireguard-modules/wireguard-modules-1.0.20200729-r1.ebuild)0
-rw-r--r--net-vpn/wireguard-tools/Manifest4
-rw-r--r--net-vpn/wireguard-tools/wireguard-tools-1.0.20200827.ebuild (renamed from net-vpn/wireguard-tools/wireguard-tools-1.0.20200820.ebuild)0
31 files changed, 169 insertions, 126 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index cc2fd3947a87..87c49d8d8c3f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
index c2869b695d38..0bbcb5b297bc 100644
--- a/net-vpn/corkscrew/Manifest
+++ b/net-vpn/corkscrew/Manifest
@@ -1,3 +1,5 @@
+AUX corkscrew-2.0-crlf-with-authfile.patch 666 BLAKE2B 589586fdc113c5e7467c591dd3cc9300dcc536cfa230fdfe272c931e830d889ebcd43aaf0f0eb4dd245c04daad8cb195bbe53ca93dcbaa6183940d27dc349a75 SHA512 030e5a0b176e9f7180bf737b70e230b06565a80e10106c4bcd444a9e7293286068a0192401dda8886479fe68b6c644350aa2d047f655e846b22204a248605b9e
DIST corkscrew-2.0.tar.gz 56749 BLAKE2B 4685b373af3a6d19cbd50b42c7fb421cd1c9b872d9682280aba52933869ba723940e959619f6f6d31d93f117d8d1803c79bcd50a86edadcd66a9ffd1df84b3f0 SHA512 bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f
+EBUILD corkscrew-2.0-r1.ebuild 1246 BLAKE2B e41b238395dd4c0dadb4c59d3525e732bdc03cca09f7cb2ba371182cb4110ad2a4afae162bcde704f027b4f7bbe6991cfac01836313c77a0a0c777dc00b579c8 SHA512 a35120c8eee1b4f865a93b08900f2c398002163b089b9708ac0c71bc5eca23cf36483d65a654808973d728fc46aec693ee2b9deb39cc4a7793a86571e58fe1ac
EBUILD corkscrew-2.0.ebuild 985 BLAKE2B 156f288df81e6d554f4c34a548d6bfa074e0042e75c261ad0bb5e5843c555a394e04dacfc840b090245c45c496b19010e76e56fd9c5f94cef6df0cf3589eca36 SHA512 f8bee38825cf415c8af32936cb6537968198c1b5a9e3619e6863b8e3bd41b1b8e6ed58943878be84077ee3220d328fa7c9afc6de812fd870e95aa79e0d12523b
-MISC metadata.xml 490 BLAKE2B daac99b874d38d9ca50bdea11d51bc098c232c09d64e0c5a80e3d23e7e6379ccf9426101f26e4c7bffdbd9ab2428d2aa4e0818f278ad841831213197e4284e0c SHA512 5eb192864e8d355c8437a1f62f05cceda9608392cc66c76a0a47c4ff5aa37bc47debbb1b756cb27ce7553156ff0813f7224639a1cc6fb57fd7b81e3d147146fb
+MISC metadata.xml 393 BLAKE2B 24208f0e307707f49ad8ad3c9f24f5e4b21c3b8750f29607ea2a644c4998fab9d6e27b30a95a9d37d10d5662d70c796b842bd3c8cc13a9435beed09b79f4676e SHA512 3a8fb57c70452056885eae869d55a49d29edb4c23f524cfc5b35b9ab8023a1084cbc11c3f16dea27d9f153845d27bcc1b1539f59b5fd4c2e4aac87e6b322b8d6
diff --git a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
new file mode 100644
index 000000000000..cd46ea513c7d
--- /dev/null
+++ b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils autotools
+
+DESCRIPTION="a tool for tunneling SSH through HTTP proxies"
+HOMEPAGE="https://github.com/patpadgett/corkscrew/"
+# This is the old distfile URL; the github site does not have exact matching
+# checksum, but the content is otherwise identical.
+SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+DOCS="AUTHORS ChangeLog README TODO"
+
+src_prepare() {
+ # Fix \r\n per bug 652342
+ eapply "${FILESDIR}/${P}-crlf-with-authfile.patch"
+
+ # Christoph Mende <angelos@gentoo.org (23 Jun 2010)
+ # Shipped configure doesn't work with some locales (bug #305771)
+ # Shipped missing doesn't work with new configure, so we'll force
+ # regeneration
+ rm -f install-sh missing mkinstalldirs || die
+
+ # Samuli Suominen <ssuominen@gentoo.org> (24 Jun 2012)
+ # AC_HEADER_STDC is called separately and #include <string.h> is
+ # without #ifdef in corkscrew.c. Instead of using AC_C_PROTOTYPES,
+ # remove the call entirely as unused wrt bug #423193
+ sed -i -e 's:AM_C_PROTOTYPES:dnl &:' configure.in || die
+
+ mv configure.{in,ac} || die
+
+ eautoreconf
+ default
+}
diff --git a/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch b/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch
new file mode 100644
index 000000000000..1e750bc74115
--- /dev/null
+++ b/net-vpn/corkscrew/files/corkscrew-2.0-crlf-with-authfile.patch
@@ -0,0 +1,12 @@
+diff -ur corkscrew-2.0/corkscrew.c corkscrew-2.0.new/corkscrew.c
+--- corkscrew-2.0/corkscrew.c 2001-08-23 14:27:32.000000000 -0400
++++ corkscrew-2.0.new/corkscrew.c 2018-04-03 11:06:53.268025605 -0400
+@@ -219,7 +219,7 @@
+ strncat(uri, destport, sizeof(uri) - strlen(uri) - 1);
+ strncat(uri, " HTTP/1.0", sizeof(uri) - strlen(uri) - 1);
+ if ((argc == 6) || (argc == 7)) {
+- strncat(uri, "\nProxy-Authorization: Basic ", sizeof(uri) - strlen(uri) - 1);
++ strncat(uri, "\r\nProxy-Authorization: Basic ", sizeof(uri) - strlen(uri) - 1);
+ strncat(uri, base64_encode(up), sizeof(uri) - strlen(uri) - 1);
+ }
+ strncat(uri, linefeed, sizeof(uri) - strlen(uri) - 1);
diff --git a/net-vpn/corkscrew/metadata.xml b/net-vpn/corkscrew/metadata.xml
index 306c354edf5b..d0dda636d40b 100644
--- a/net-vpn/corkscrew/metadata.xml
+++ b/net-vpn/corkscrew/metadata.xml
@@ -5,9 +5,6 @@
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
-<longdescription>
-Corkscrew is a tool for tunneling SSH through HTTP proxies.
-</longdescription>
<longdescription lang="ja">
Corkscrew は HTTP プロクシ経由の SSH トンネルを構築するツールです。
</longdescription>
diff --git a/net-vpn/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
index 981c9bcb5386..1b1036a27c7b 100644
--- a/net-vpn/httptunnel/Manifest
+++ b/net-vpn/httptunnel/Manifest
@@ -1,4 +1,7 @@
AUX httptunnel-3.3-fix_write_stdin.patch 541 BLAKE2B a78b27f43fd7babde70c084030c7d5a57974c9c13bb0db231cf8d66537d505d2eb7fd2180a00842438dd74bd5b655668b97c61f3e53f0a6ea9e5969dde71c44a SHA512 d8a0cf3319c31f67a7e7bdf097923d52c619aa39cf80e261475213c1fcfaf43297f2a797952bcee413ecc78e78c15f817bc6f783ed525b07940fbe053e49fb6b
+AUX httptunnel-3.3_p20180119-respect-AR.patch 291 BLAKE2B 8f3ef913882c828f08dc047d6890135f0646d200c2e97b5a5cd3788655e39d4e42c69bfe5e1a596ccebd7a32d64d253fab3bc357410168ec0b8ac1a6a3e5933d SHA512 18f2529230d50a79ec6bb3b473357c86fce7f5f72597f662f06f4fe5c6deebd7697a4ee9207e3043437346cc49d80488ba1e1a6599e996e07eb3f8dc068ce1e4
DIST httptunnel-3.3.tar.gz 262749 BLAKE2B d16c06f709befd45e13ac8f13c13242c90d045a23cbb6f39b8d8355d5a9e56643bb7766d4d8ae6dece16686d555850fa4a0e682fc9bb3e33ec7a5144311e517b SHA512 84503e27e84cd39441a7592d6446e30fce07a54b940e4398407dc105fabc6c8f96d3b5d05137d6dab22b2088c5b114728551337429748c900bd6fe7d6b6109e5
-EBUILD httptunnel-3.3-r2.ebuild 648 BLAKE2B a3c0cf33f4c25d9f026491706ac5b8f2f6c81787fd4e729d1c48f78d9b6bf116e1e6938d44cf585b0a3c22642fb7ba15653f22fa730b96157f5716d7c29b416f SHA512 db768a9b4a98844d83a78d8119c4e4596053aa1d7858ff64e1908580be3d863b6378423463f1c3d43773dae702a3e53d38dde27f8bfc12b74cf298f79196dd7a
+DIST httptunnel-3.3_p20180119.tar.gz 376338 BLAKE2B 6625a0ef0bef7afad4ca9b5791abe51d72553877c31dfcb4e4d0bfd6d0e3bf3a0a9f7c529db6a9f9c60726e7e79284959ed8a8bf64e1165e40265341f39cbaf6 SHA512 593efe9ebdc3c41338306e5038cacd63ec171d228ebf13ba52949c353b1d45666bc836ce34102735a383b6cc91f2df1c01e87c2ab1cf5e650fe5fe7fcc658de0
+EBUILD httptunnel-3.3-r2.ebuild 441 BLAKE2B ebb377eaae23e879258a9b559a08eebba3bc9e01ca22486fb7d14d24ca8bc97fadb2dad33ad305bd14ea3c91e3cc3240287a6ea9df5d6e82aed2c7ecdb80ba5b SHA512 9fd5006d2c9c7765f2c9fb198bbf4d48bc6abb7ab20a8b1f7b8706f469b67afb58e19889a4443c48e7d692d41e47669d2d9b56553e626da005f853b2a7909ac3
+EBUILD httptunnel-3.3_p20180119.ebuild 644 BLAKE2B f774b7a0c671d2e2f42535dd43ca44781d88e365f9131a765ff273b89ce970008ee5245033259ada42e63b62f5cadf6550ebb0a1c9d526d8b17c0cef3990916b SHA512 5d144b5ce29fb82cd05aa3641549acf9994f6e576002ecbb8c73b8efc0a7f8cadd050aa193ef0f0410d4fc7d67d44d70a35590e4c974a2dff551cab00717c24b
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch b/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch
new file mode 100644
index 000000000000..bdc6b7fb5a4a
--- /dev/null
+++ b/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index acd5843..f5ad65d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+ dnl Checks for libraries.
+ AC_CHECK_FUNC([gethostent], :, [AC_CHECK_LIB(nsl, gethostent)])
diff --git a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
index f5232f19e9f4..f5887a74bbf4 100644
--- a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
+++ b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
@@ -1,30 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
-HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
+HOMEPAGE="https://github.com/larsbrinkhoff/httptunnel"
SRC_URI="http://www.nocrew.org/software/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="amd64 ppc x86"
-IUSE=""
SLOT="0"
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix_write_stdin.patch
- tc-export CC
-}
-
-src_configure() {
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man || die
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-fix_write_stdin.patch
+)
diff --git a/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild b/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
new file mode 100644
index 000000000000..c22f99897765
--- /dev/null
+++ b/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="f440dcb3c341d22428898952c343ad9fa6e9e7f5"
+DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
+HOMEPAGE="https://github.com/larsbrinkhoff/httptunnel"
+SRC_URI="https://github.com/larsbrinkhoff/httptunnel/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3_p20180119-respect-AR.patch"
+)
+
+src_prepare() {
+ default
+
+ tc-export AR RANLIB
+ eautoreconf
+}
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 06e7c711611b..364ca822bcf9 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,7 +1,8 @@
+AUX i2p-0.9.47-DataHelper-decompress-fix-length-check.patch 1110 BLAKE2B 9e34a568f94baed130c6f9dd3cda2f6ae6e409d7c41bff8fca5226fa6e84d989b46e84672440c8dcfb861d237075093c8a7bfab50d7b2385ca376e11524bc876 SHA512 204150b938fafe5b521d381ed6c517624cec3b47d564d84ae21e7884d87348a3fd4387b193e466df5c152f6262e29e1e88f9f970a78cf516839099b16fd5938a
AUX i2p.init 394 BLAKE2B 477566594bb2da98e65faf0a54be434d2684b23903f1762db674b9c21e7a1647566441b1974594194ff0e43187869af7c8487062183d9250cba01e4faba20bc1 SHA512 c748ebc130b4d5d0860eaf511f3e844b3c3b1291bcc9fc42ea3d3622b8be4f782c1153645f4d4f8e3374649390c533e3264d24afde0b72fd5bdae88e7da6c754
AUX i2p.service 253 BLAKE2B 2647a1920083fedf88b351b084d3a4d177393065da3dc7aecbeb09e1afc3373116f972c40db4500f76fe1a983ac24503d9a95ee08917ff7625946e4928449512 SHA512 59639b4f78637e5b03ed67b7e08d21bc873c844b474df3ed9101b34934a4c22aef46db1b66cbdc9aad2438ee84f130230c368a78b5bb1017843f016bba6c30e5
-DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
-EBUILD i2p-0.9.44-r2.ebuild 6141 BLAKE2B f976651689de16ad75c84d1e649df8569a0b84d12996d196facb220152102165d5a693e8214b500f59237e9385129d2fa47f18b5140e755236ae948e9aa2adf4 SHA512 247a2b2fae9736529e9e4c1424a924da9e1dec822c4a7d7d742a77331730cb5e5b42541ce4a7a0590d0c04049171b96e37cc48b4a547958560500ee2f7683152
+DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
EBUILD i2p-0.9.45.ebuild 6141 BLAKE2B f976651689de16ad75c84d1e649df8569a0b84d12996d196facb220152102165d5a693e8214b500f59237e9385129d2fa47f18b5140e755236ae948e9aa2adf4 SHA512 247a2b2fae9736529e9e4c1424a924da9e1dec822c4a7d7d742a77331730cb5e5b42541ce4a7a0590d0c04049171b96e37cc48b4a547958560500ee2f7683152
+EBUILD i2p-0.9.47.ebuild 6219 BLAKE2B f8f9dec30525d43bad24a7972fa9df12746fc70b4bce1931eacb07eab7dfe771d50ccb7d651452e37ab88aeda25e7d40254fc55b1723b8496e6e90279f16dd22 SHA512 e5a3ff6e87e53baf70f9e1f77302b500572345d42bea2a6706a39d422c2529162d7678237e7decd6a4f873f8e38141d98763fbbfefe6c7d5eddc0ad9d91b05b1
MISC metadata.xml 709 BLAKE2B b429dbd7d8c4c6d7e9f829d77fc30f8bb0147d3a4e252874d5f1f905a45e7b46f380ea7d25f5a52d871545fff4891a80756bc227d61e101c2bcf17f6e72584bb SHA512 e5e3dd0ec86672394b94e5d740c21a014e42c7d3be502a1bac15f809b39fea25e00493cd70f441752e65da253424945e2fb5c7a86c9b31898f4a17d2ad19bafe
diff --git a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
new file mode 100644
index 000000000000..b728cc28cb15
--- /dev/null
+++ b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
@@ -0,0 +1,25 @@
+# from https://trac.i2p2.de/ticket/2770
+From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
+From: zzz <zzz@mail.i2p>
+Date: Wed, 2 Sep 2020 15:57:04 +0000
+Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
+ #2770)
+
+---
+ core/java/src/net/i2p/data/DataHelper.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
+index aaa47797c3..39f766e6fa 100644
+--- a/core/java/src/net/i2p/data/DataHelper.java
++++ b/core/java/src/net/i2p/data/DataHelper.java
+@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
+ */
+ public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
+ if (orig == null) return orig;
+- if (length < 23)
++ // normal overhead is 23 bytes, but a compress of zero bytes is 20 bytes
++ if (length < 20)
+ throw new IOException("length");
+ if (length < 65559 && orig[offset + 10] == 0x01)
+ return zeroDecompress(orig, offset, length);
diff --git a/net-vpn/i2p/i2p-0.9.44-r2.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
index 8949446a2663..a775e06556d9 100644
--- a/net-vpn/i2p/i2p-0.9.44-r2.ebuild
+++ b/net-vpn/i2p/i2p-0.9.47.ebuild
@@ -54,6 +54,10 @@ EANT_BUILD_TARGET="pkg"
EANT_TEST_TARGET="junit.test"
JAVA_ANT_ENCODING="UTF-8"
+PATCHES=(
+ "${FILESDIR}/${P}-DataHelper-decompress-fix-length-check.patch"
+)
+
src_prepare() {
if use test; then
# no *streaming as requiring >dev-java/mockito-1.9.5
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 07e812c2913d..6a55c3034154 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -5,12 +5,12 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.30.0.tar.gz 1087411 BLAKE2B adfd6d2eebb2bbd0fe931a9a96110d0bf540ceff18231afc88ba4df7b428ec702297871ecafb812cd130e68eb8f6127e3f7a4645631df7ca2a723d0a45d8723c SHA512 d27c5e5b7ae7c78be14ad96ac458c0f3a45e31ee5fbdf59d5c6278d0195909badc5917a258b5de37d6a255c20a8c3cb0c0ddc3291a110444a96f475b662a119b
DIST i2pd-2.31.0.tar.gz 1092238 BLAKE2B 61424b8d5796511a1bae4d0274b86fa198e0fb2e590312e7e5039533bca2ded494f9bdd7406951c82a99259772581ee716159f6500921f9fb8b5fd4aa217ce9a SHA512 af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
DIST i2pd-2.32.0.tar.gz 1098880 BLAKE2B 0b5db302cac78c6993fd7c25362bad512c0597222059c21d0902c1378228425bafc6e39040c1a99122b66dfca106db64ff69783b23e40caf528764f7ec1709c6 SHA512 f76eb2744b55b4099914cb42e7fe6821e3b7b3dbbc93d491a83cfb8cd9fb67e6559f20891874215060a3797b5f66051480e49670032c952fcddf91aa96e0e41e
DIST i2pd-2.32.1.tar.gz 1099034 BLAKE2B be32443d2d686247459e74396202ff5fc595be27b7a4e207aa756f35c6b65fe05b006491bb9b8a564bc2b3c1144dae1dcba8dcfdff95cedfb032ca137f30d617 SHA512 2c492942526b5d6dd787baaf6ad31b036c593d633a36ba951c02d3289607be5e43562057622deee51db724854eef6f4bd67eaec62699b07aad47ee49fd291783
-EBUILD i2pd-2.30.0.ebuild 2647 BLAKE2B ccad7ceaf795f8ef6fd2e6f1b12a849313a3d2b1dd22eaf7500cac5795a72dc46ff743e99c699966e3ff5e3a7e7c7c88202bc1fb2ddfd8311807c2b5e2a53d03 SHA512 9dc942c5aaa75a060e33fb947c451fd7408f39f695e125cc11d8fdb53b1a5c05510714cb19e4226e8150aba7d3e6099ea007e3587700af44d3269ccdbc66b5be
+DIST i2pd-2.33.0.tar.gz 1101578 BLAKE2B d569a7900bda1fecc19f6ec966cd004d04599993193de9bcda89620dff9909889c14165aca457e6a5fa0539614304af11be573329b9a54596684d3232ee28833 SHA512 7a3e7a8a908be8a12b675fda4ce923cb2b0eaf3e9b12a513b9ae7b56e9ecb593eef0ea278debb4027406d50ee9a46599a6792a54ce2e2f4e2c44c1fc82479910
EBUILD i2pd-2.31.0.ebuild 2437 BLAKE2B 8e7e6c41aee82040a0202e16b272e9a0e73f19837aad7116734b019cddcefd0dcf017eb39770b8cd64bf73e996133c51abaadaa07c263a8a336be6b04b9219e8 SHA512 b6ee8b144168f1fe97010f920a1f64351bba82f733a591a5ccf38dc553d774d07d94d3213d7442ba8e1d88e3e0b7552c311697ae01db2f4307c66dfb2139ccd9
EBUILD i2pd-2.32.0.ebuild 2385 BLAKE2B c7bf3ba9a9253aeab8dd3b73da080cfc97ec9b14d7751dfeae127101a7a8c7aa39344cb911db78a9c20821c7816b12e21bc364f540c3681e8099df68e5143515 SHA512 b216e0088a0deaff9987ac0dc2a05188badc83c82ef87572fbe229c2fff852aed376fe5c6f5ee3895ad904d601036827536afee211a614bd78ffbb467fc70f0a
EBUILD i2pd-2.32.1.ebuild 2383 BLAKE2B 712f839637188daa1e78e5c89d7b728c585a905fe5593d80cfcb9fb14a7ea82e6346484f975f854004ca5d2276ebb71dabd553a4cec4609e3a19d8ecfab8d955 SHA512 0c51d8c302e2222ea9d48a31007367a4805b290616c060ebaa968311e0d29ef34810f9eccbb3ed2e8de284f995893874410c8cb6cbb0e54f1f1167575da2dc8c
-MISC metadata.xml 746 BLAKE2B 19ce9011646f5793a21b6b8a87b5a6b13d91d367498ba7b6ed206f86c4b90e3e2209dcecca50ba4ea8e2897e238dcb82fd022f67f09ad3bb6be1ae8ce58cfd50 SHA512 768ec384eecda39dab6987a896218970f8dd5daf20923b346b079c154b1f1dc8cb6d055b2128d7baea4f9c269344ec957071028c5e449a6c7429f931b8c0fdd8
+EBUILD i2pd-2.33.0.ebuild 2387 BLAKE2B e196864e0e52c694af51a72573dff6b670ca8babd00fd1bb47ad9ad39be97f7e4f0df16b41b69f3657437bc3074b40f5df76372a8c8aac6cd8b633de32437e4a SHA512 e47b0bb709174825dd6ca3d28e48589a00fc2eeb9a681f9c46aef379996965e2812bca136ffe7ea0e763dd0d6b88e53afa19d7fb2e22890b8e2e0cd35d048f0f
+MISC metadata.xml 683 BLAKE2B 85b4a13c13c88a69ecbfbb10e60881bc583b6539a42cf4ac8d061537bb6c0ed55dd2d15ced732f69ce46afe4b0381d7d7233fef9ad8dad4a9eb51e49aa904706 SHA512 5c6c84f95f4264eb3a33cc6c0de0f0890063ba2ca3cb56852303f919e1c4a152d7a3b1c593c0ba066e5485ee9e843ffc2836ea89ed8ee42aa56c1b602d5a2a62
diff --git a/net-vpn/i2pd/i2pd-2.30.0.ebuild b/net-vpn/i2pd/i2pd-2.33.0.ebuild
index b305f25c71f5..acc70c57b412 100644
--- a/net-vpn/i2pd/i2pd-2.30.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.33.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit systemd cmake toolchain-funcs
+inherit cmake toolchain-funcs systemd
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -11,41 +11,32 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp"
-# if using libressl, require >=boost-1.65, see #597798
RDEPEND="
acct-user/i2pd
acct-group/i2pd
!static? (
dev-libs/boost:=[threads]
!libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? (
- dev-libs/libressl:0=
- >=dev-libs/boost-1.65:=
- )
- upnp? ( net-libs/miniupnpc )
+ libressl? ( dev-libs/libressl:0= )
+ upnp? ( net-libs/miniupnpc:= )
)"
DEPEND="${RDEPEND}
static? (
dev-libs/boost:=[static-libs,threads]
+ sys-libs/zlib[static-libs]
!libressl? ( dev-libs/openssl:0=[static-libs] )
- libressl? (
- dev-libs/libressl:0=[static-libs]
- >=dev-libs/boost-1.65:=
- )
- sys-libs/zlib:=[static-libs]
- upnp? ( net-libs/miniupnpc[static-libs] )
- )
- websocket? ( dev-cpp/websocketpp )"
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ upnp? ( net-libs/miniupnpc:=[static-libs] )
+ )"
CMAKE_USE_DIR="${S}/build"
DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
-PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch"
- "${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
+PATCHES=( "${FILESDIR}/i2pd-2.25.0-lib-path.patch" )
pkg_pretend() {
if use i2p-hardening && ! tc-is-gcc; then
@@ -61,7 +52,6 @@ src_configure() {
-DWITH_PCH=OFF
-DWITH_STATIC=$(usex static ON OFF)
-DWITH_UPNP=$(usex upnp ON OFF)
- -DWITH_WEBSOCKETS=$(usex websocket ON OFF)
-DWITH_LIBRARY=ON
-DWITH_BINARY=ON
)
diff --git a/net-vpn/i2pd/metadata.xml b/net-vpn/i2pd/metadata.xml
index cf0e4a0905e4..412f0dd2b43a 100644
--- a/net-vpn/i2pd/metadata.xml
+++ b/net-vpn/i2pd/metadata.xml
@@ -17,9 +17,6 @@
<flag name="i2p-hardening">
Compile with hardening on vanilla compilers/linkers
</flag>
- <flag name="websocket">
- Enable websocket server
- </flag>
</use>
<upstream>
<remote-id type="github">PurpleI2P/i2pd</remote-id>
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 58143cfe16d8..f611127b522c 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
DIST NetworkManager-strongswan-1.5.2.tar.bz2 300735 BLAKE2B f8ac0002d14bc79b33b897785eb60ac46d43d29c2e897a9d2249c905a524bd7e8942d8bb535a551956b81be0af16b6fa8876a8c636aadc06d2c068a4b21b403e SHA512 c79f011470778ae05f80b71330acfd7df75363fd089624007e9bdd82b75513a23eaaa3ef10141f780df075eb501ee675e4c293710e0a4c5fd9d4f4b0565bae59
-EBUILD networkmanager-strongswan-1.4.5-r2.ebuild 917 BLAKE2B 8163558c167b08e633ef46a30e5b1b664fc7e6121a2724b1fb65f301efe0de10ad4c46b7d7576b1765cd11ff42ba58f2efb2f73300582a64ddf5b1b567e26539 SHA512 83930fd4237db1d9771d6f8e80daab49baaa299d15b95fd7c4bc7bfee263d1a94dadfb86a442667fc629a34fee7a600bf3c96aac82311639c4d5966f5219125c
EBUILD networkmanager-strongswan-1.5.2.ebuild 978 BLAKE2B b3b985a307cae9b27f24912b1a4592b4b32a84f1ea816747839ed24cd360c32c01e89f2cf7931a4cf9bd916a4f35b444ccd0f1db8bfe209eb9280770567167f3 SHA512 a86a679dc9615c53202357e0e956154364994eefde2deb65dfc634a927492d69aa7f2e202c7db827955537a8bd2ae8c4e30505ed8cbf57a80d700910b1762a82
MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
deleted file mode 100644
index 334738c79eeb..000000000000
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
-
-DESCRIPTION="NetworkManager StrongSwan plugin"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- app-crypt/libsecret
- >=net-libs/libnma-1.1.0
- net-misc/networkmanager
- net-vpn/strongswan[networkmanager]
- x11-libs/gtk+:3
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-util/intltool
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local myeconfargs=(
- # Don't enable all warnings, as some are treated as errors and the compilation will fail
- --disable-more-warnings
- --disable-static
- --without-libnm-glib
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 12572ff7cc1a..11b0ed6e7c44 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -5,6 +5,6 @@ AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa504
AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd
DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
-EBUILD openconnect-8.09-r1.ebuild 3087 BLAKE2B 36f1d0ee4483b25c1ff04d700df395130c88fde77294794bde248dac7e9865180e13d547b7160dbd79defa2478960379b985b82f26584c3d50ad9418287ba789 SHA512 4fb41c706c6993ed8a2da80a3ed1ac15a1355427d1b89ef9cbd91da386aff9d6895eb442af6bf6bb9ba72c880414e7a642ae6d61796d04ad7a3853aca110bf52
-EBUILD openconnect-9999.ebuild 3005 BLAKE2B 8c279c574aa355a0c5325d145031623d2dcd11476a9be3f6d30a862b4fa9ee7f4e9faf03332dd2a51345c9f4287f7cc1e0936572005aabbb05fe3e0c497e1db3 SHA512 98734450f88bbeb0b292895ef4b43bcc0d1044df4aa8f02c0f3f09b3c436fbb10401070d3422ab43b474d59fc779aa07c13caecf268679a1845d44f593ed5c92
+EBUILD openconnect-8.09-r1.ebuild 3095 BLAKE2B 2b9f88751028da80c8dd3e0c39128ecc940f99633f2749f41ae5ef5560890603e7642c0885dd986c37a5c8d452b98f1bc9fb19b8ace4bc6f5a1a1f2f7602ebe8 SHA512 f61df9f3ad778ee35add92ee7a8df860e1454dfe3c73ec444852eabe955b4fa9adc1f2d6218941bebd89f6eeb2feb55ce126ba92109a3f3b1c6457dc90391300
+EBUILD openconnect-9999.ebuild 3013 BLAKE2B f376c7b9e4f3b48cb983d13e5164035416c29c50a9eb0818443c5c41ef74df09adabfc64c7f34161ab065096974bf70db9686c95c01780e4e5696a458578bbd4 SHA512 d758170016064de6193cb0fdf3ff8af3b473da65f72fc0a16d5312fc3a037256bb9684cf2e5dc364e1383a3bc59d8783c7d8d722297c04328ca20104d850f340
MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild
index 0df25a9e26cf..6fbcc8462485 100644
--- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild
+++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
PYTHON_REQ_USE="xml"
inherit linux-info python-any-r1
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index bda6b965640b..d341fc87dca1 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
PYTHON_REQ_USE="xml"
inherit linux-info python-any-r1
diff --git a/net-vpn/peervpn/Manifest b/net-vpn/peervpn/Manifest
index 72f994dc8641..864486820550 100644
--- a/net-vpn/peervpn/Manifest
+++ b/net-vpn/peervpn/Manifest
@@ -4,4 +4,4 @@ AUX peervpn.logrotated 87 BLAKE2B c6b72aed372a87d766a9ba0e69b48929fd2484743c5576
AUX peervpn.service 256 BLAKE2B 51abeea30d4ebe81a7b9acf1ae0e5e8b65ddcaedd4ae2c3f0e6ab3e4524d75d9848328bfed737f8b39effeedd68e7d7ed9f1376ac144ae27c4d77b0603fdd496 SHA512 d2d7336ed77324f30d3a4d83fe47b43bbafc3340525eac862bd7637e3a72a70dba1dc9ea21ed59e1606c8d1c03c3ee5ab9da73b49e71cf70e536369ae9ecf01c
DIST peervpn-0.044.tar.gz 81948 BLAKE2B 7fcf4805846b304c8d26ab06a5f56fa7aa281eab05860f192e635ba12173954cd00502328239771b1882b0b74c8f24f796c51e86fd5d39765f51d2aa26953c6b SHA512 5dd8e056287a905f3aaddf93d6dad917047e6f7da30942f412ff7b2846afd26fb9f4e500cfcb76966b4045db2a37096f1aa43b87e777ff31c2e467aa0415cdba
EBUILD peervpn-0.044-r5.ebuild 1984 BLAKE2B 06f2d9ccae4306a25c09cc6f4e88667cf99512f15bb8e44160e3a4abcb047780dae809b80886719550a5d9726af45ea06d4e76916904b9ce4efcff528a33892a SHA512 aa5dbbe642f80062f87e0696ca24cb6e0b5b6972c6e21ebcca8f1967adc2ab42566b3087f1c370e6c4be9ffe019a09c475a3a09f2af92a106a65091a167ce21a
-MISC metadata.xml 306 BLAKE2B 23943cc835dbc20f40533bd627de75557c7995bb72195979385903e53834c0961fd4b3e0346aabf10020aa9df18a619e138a1504e9e1f1614fda1a840a0d0f1e SHA512 29286f5271bd2e6cb8aa39d626bc581cdfce7206e3a76e964418b460c20ab844e096a009db6c3ef1f3bc09f56622a2e388bce8aeeedd3be65d936e244915a7db
+MISC metadata.xml 252 BLAKE2B 8efaf3584f131c0b67db417959443281e33ebeed3f51ed5032692c2ce88d38528a099940e970b171502aebdb8f0d203406350a9c46d6e700d75e8c40210b07d6 SHA512 b1d67eead7ededffaba731f36dca9165a9d55ac8fcde9fb15e136b7e4d10931eb3e2af6ffa0a6b8f1a4a2085145f3f30a87e32f3c01359a42a9365279457e119
diff --git a/net-vpn/peervpn/metadata.xml b/net-vpn/peervpn/metadata.xml
index d4216eaa7140..3e0eb5a02d53 100644
--- a/net-vpn/peervpn/metadata.xml
+++ b/net-vpn/peervpn/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zmedico@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">peervpn/peervpn</remote-id>
</upstream>
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index b783f41a3975..8741ead0093b 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -13,4 +13,4 @@ DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b
EBUILD tinc-1.0.35-r2.ebuild 1349 BLAKE2B a082f910398173e5956af8fa52782557a263ca1877a7ea710afe0f11f1b82830e851efbf735d92e2e67b267d3bbe85ffb64c28337a59685f41b4355b955f842b SHA512 f765a2da03b5526bdef70fdb50c7efddc0b27d978b97526cb3e0048f1570c9a69ec8376768f462b8d79769eb1185b13b6b42881796471ccafbec246fae2ba41e
EBUILD tinc-1.0.36.ebuild 1064 BLAKE2B d0f3f10c386ea9549d55c9b9bca434892ee16ceecc9b035e7e1f890c37198add7556ab5935743ae67b8d8437d0f559bc369ef8058d1d835e84dc123b95aba078 SHA512 a490dab876713a817d4bb32cdbdc8a4651bb26f1c96fc7e61ae7666d632430a22e29ea43778d9351051f9b21cbb7255e5cf029311dcad7fb4e537415dbc07db8
EBUILD tinc-1.1_pre17-r1.ebuild 2290 BLAKE2B 22fc027a87502a50c2e3b616661ff57d61c1c77310e96ad9e57d9d2fa2720b738228b2c292167f13f91518d81fa2526bbd8f9bb99221323f77d2212fbb913919 SHA512 2f4df288a4347ffe4696a61b23389d97d65283ab712d8ae1233a45bafa15ee59da585030a9d4b9ff2d9f41738ae1ce954835540ad44d0bc876ac0d1a5e8f81a8
-MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
+MISC metadata.xml 638 BLAKE2B 5aecfad9b7e648fce87e8f9f9713c0cc3c6042a7d67b68c67b58b85c681f41827c4d6bd72bc9b2f759d4ec1c6ad838aa3a6f328cf3394b2e77405b24e6f3dd47 SHA512 494ed9caf18ea348c6e8f80a597e1a45bbfa2c5a41a711539141d7e27ef83182c9593dcfc64b3b384036b989636962f10c4eee02e84011d77075d1a69951061f
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index f6ec81bf4f88..4a5658e3ec40 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -9,7 +9,6 @@
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
- <longdescription>tinc is an easy to configure VPN implementation.</longdescription>
<use>
<!--
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index 9fd9d402da7f..584588668139 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -1,8 +1,8 @@
-AUX vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
+AUX vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch 915 BLAKE2B e7611c54b57e2bfe0b6d9e56c4bdcc22de6f24a2af1752e30b1f41aa4e22ca721a0b665f36dc713e7b3264408df5b4a729ef421dff3df8a52336476444a6ba07 SHA512 ce5724db1778f390ddd2b601d2402f06549f81cd2ea0098868922bb03e1ecdf7d3aade40aface2710e471052484b795ce9b3437d136e4f04c02d81a900429148
AUX vpnc-3.init 2197 BLAKE2B 8f88a7f27207e1ab4f2e9b4f31ceb06668f26fcace00dd169237766775ff72d9db1df0827f2ddea76144085270a85c801d1ffc14bbeb175dbbecdb21bb50c69f SHA512 d05a362606f314c0c275b2354308431c9aa53d8c83172fa86d34c28573f0ea527b1aa9e2dcb8341f212600bd3a50ba8ea3038a05b494ac008297b03e528abd97
AUX vpnc-tmpfiles.conf 29 BLAKE2B cc5cf7d24be2117a95c339667771121df32d813680a32cbda995a1fd2e90cd6b93f6b9b749b28a4f34aea417001b330ca53ed5a3291de9d7b2d99965342f603f SHA512 21635c67b89ca04880eca6c53e47b2b4ed27f992415d466d27a634af3393b1aa7a75cf09b8ad1a6a80cd2f93c508eb8cc6876ae20bfe3a1c66b7cd09f1e7661d
AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e263fc27c60500a3e6da59f1e905611aec39a62dfcc3c4b746a580a8a106fc6be9384d716955d SHA512 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633
AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
-DIST vpnc-0.5.3_p550-r1.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
-EBUILD vpnc-0.5.3_p550-r1.ebuild 2185 BLAKE2B 408c5c45d31849ab31fb31716457baa0751e2ffb3dc517244feeb0dcf6f6679cea6fc59492ff4f54da01a6fe2879248e843f792c4616653ef57b1266749acafe SHA512 0989f0800bac556430206b7a4f8f5cc0b0ed87a51501cb695d2f280de83405d79787dd9be4a0ee482f2f90370738cbc9175fc2c013510c3887a759761bf6c89c
+DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
+EBUILD vpnc-0.5.3_p550-r2.ebuild 2222 BLAKE2B dfb28bb7ca291d8aec19a35f85e594cb1cfbbf23bd29ad53f7af1b668091749ede2f7bc7151a849637510edb091b21eb655902eaa919c19b71bcf2ec88662260 SHA512 0ffa5a8a59f9935c004362a8ba063cf7c10d89698e000a87381157679efcd59290bd4e264641a3bba0caa035d8119dd5b938436f29d28f75c5eb42ee1af171c8
MISC metadata.xml 364 BLAKE2B ad78bc77b84330fe5680966fa276e821746d7a950e326fde42fa8d330ed176fca5a7dc31831e9af97c28a243aabcb693ff0016d93fae1b702c10f968167b26fc SHA512 5d31b14522ea8c365ead3dd5bfa2370ed6347259f023b17bd19707628ce5e1d0141c340869846de508e3268f79ff298bb93026adc4a798e4774054ee06672174
diff --git a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch
index e574b51fba63..e574b51fba63 100644
--- a/net-vpn/vpnc/files/vpnc-0.5.3_p550-r1-var-run-fhs-3.0.patch
+++ b/net-vpn/vpnc/files/vpnc-0.5.3_p550-r2-var-run-fhs-3.0.patch
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
index 8e9eeda195c7..529bf1d4e355 100644
--- a/net-vpn/vpnc/vpnc-0.5.3_p550-r1.ebuild
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit linux-info systemd toolchain-funcs vcs-snapshot
+inherit linux-info systemd tmpfiles toolchain-funcs vcs-snapshot
DESCRIPTION="Free client for Cisco VPN routing software"
HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
@@ -23,8 +23,7 @@ DEPEND="
!gnutls? ( dev-libs/openssl:0= )"
RDEPEND="${DEPEND}
resolvconf? ( virtual/resolvconf )
- selinux? ( sec-policy/selinux-vpn )
-"
+ selinux? ( sec-policy/selinux-vpn )"
CONFIG_CHECK="~TUN"
@@ -45,7 +44,7 @@ src_install() {
newconfd "${FILESDIR}"/vpnc.confd vpnc
sed -e "s:/usr/local:${EPREFIX}/usr:" -i "${ED}"/etc/vpnc/vpnc-script || die
- systemd_dotmpfilesd "${FILESDIR}"/vpnc-tmpfiles.conf
+ dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
# COPYING file resides here, should not be installed
@@ -53,6 +52,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process vpnc-tmpfiles.conf
+
elog "You can generate a configuration file from the original Cisco profiles of your"
elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
diff --git a/net-vpn/wireguard-modules/Manifest b/net-vpn/wireguard-modules/Manifest
index ff60619fa439..703ec38b3ec5 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1,3 +1,3 @@
-DIST wireguard-linux-compat-1.0.20200729.tar.xz 262464 BLAKE2B 2ab0ccd173889941e65f588564a5815df5b47c08c1f5dfdeb8b0c4f1ec3a91ee4664d96fac390c1a30cf5067b9dd9c3b17c43dc459bdcd9f317348e1aa098d76 SHA512 8eb06eb7e56340e9088f53d887716777cf07cd4b3330cc41243ae7d6d63ed469d2710b84fd1a3fca0118dfb8c8c77377ba4ec4de3ffe1e7d0541ec25115525c5
-EBUILD wireguard-modules-1.0.20200729-r1.ebuild 3486 BLAKE2B 2a201c656281cd4a83df1129776c0ec17800683c0f844373cbd05fe2153fff4f9d91e4464d532951294ff7ef1ef52cd6de3802a74aa0fe6c34ffe6a585913e5f SHA512 aafd74e5c34c5f92dea25f45d8a5220cf8a620c5b30b1360e622f3c1e3e4dd9de793a1413a868a4cc4547f68eade0a373a6e47f15636f37237097125c69eddb2
+DIST wireguard-linux-compat-1.0.20200908.tar.xz 262708 BLAKE2B e1621237c6a76a6b8111eb26d2547c7335d87f8e11110db29fd6d7b8c56993d0998383a2beab682c75caa0de183f17e345b0f96794a7c9e5b2cd04281d558ce0 SHA512 e13f243a7a72a4d4bd326af40439b7760b6ea8b452e67ddff1c844dc62bc53e2dc2c1738f98c7a45b6b24566d0ed9dc0dc3e9006fcb668f0314aac2ab9eaeb87
+EBUILD wireguard-modules-1.0.20200908.ebuild 3486 BLAKE2B 2a201c656281cd4a83df1129776c0ec17800683c0f844373cbd05fe2153fff4f9d91e4464d532951294ff7ef1ef52cd6de3802a74aa0fe6c34ffe6a585913e5f SHA512 aafd74e5c34c5f92dea25f45d8a5220cf8a620c5b30b1360e622f3c1e3e4dd9de793a1413a868a4cc4547f68eade0a373a6e47f15636f37237097125c69eddb2
MISC metadata.xml 661 BLAKE2B bb9a48b3a4f3162f8ccec522734cbc8ffdc7a92868cc7dc32adc1f7ef89f7b2eab1df573bed421d4b76204f9f38ad4fee45f9db4b41c7dc3b86d9d9bb3120a8f SHA512 e9daa3bb8fa72cc60373a3187610231cf396bc5014f33412b65d069ffd02caa659c426819aa76d46a0dd15e8cb579325b46df5296a3b2136d020ec378e5f98a5
diff --git a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729-r1.ebuild b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
index 198636c9d9a4..198636c9d9a4 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-1.0.20200729-r1.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-1.0.20200908.ebuild
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 3ac1bb90313b..9711c21dcca7 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,6 +1,6 @@
AUX wg-quick.init 885 BLAKE2B 440224b688b1a1b4762bac7ac3bd6cb6fbee546543f1da70fcf5ee1c6d213ff62c43d502fd88d1778913455cc233b6419b3176690b471a71aaf2792671045eee SHA512 3de3edb359a786bdb8de06f496caced1293048c2ec489073c0525b4eca61365424ffde6a7eb899d7672db38872b6c67436b2e39019e92300ca5e590ba02c2e84
DIST wireguard-tools-1.0.20200513.tar.xz 94500 BLAKE2B 34a39533018416df382d180da76d6494feec1d40208c9df427c1979817dbe138c217fe4c4f4cf5cecd3c4053e6f73f1863d1e0a9ed2cad41899dda5387c15844 SHA512 4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c
-DIST wireguard-tools-1.0.20200820.tar.xz 94812 BLAKE2B 68e3db7cc337e8cf0b35d192f38d6303696c19956661a10d253241864a8b22c666b99ea62d9533bc661353c77a7df4333e336ee00235d9492347beaf58b78396 SHA512 d30ff3c4381e65cd0a751110e66f3ad1aa274b22962da748af6373210d3e4824d066a74655156d7a3d1fe6f96187a49408bc590a8023bc706c1824c0546b874c
+DIST wireguard-tools-1.0.20200827.tar.xz 94788 BLAKE2B d7d881a56819c028b37c11b9a44e3304a0f49250aa6ce3da894802dc2546b755f790ddd3fbc14ec1e0f653ead744434ee540c20226373122d131d7deeae94544 SHA512 843b70050d24f142262b672daee44cdccab508b52f42b19a32c275a17d40fd8fb66136a22ef2a4602217e821703bb36a261e474b465807308f52e6a0ee49e267
EBUILD wireguard-tools-1.0.20200513.ebuild 4006 BLAKE2B f4232d1407542539df55e3dcffde13421fc0ac49adec0f0d6f57bcc606416c2e845eb180243acec3151ec36f814902dd088f8c36290ecff3bf3ce40c297ba603 SHA512 6cc57a52d4a2c193799a3b497c79786cf03ab763a6ed7bcc2ae8956212a19a1dc6a67ade1074d7001e30e266c888c0a29ac93e5cb6b776b6b4146d917f8883bb
-EBUILD wireguard-tools-1.0.20200820.ebuild 4014 BLAKE2B 7cbfad529059e2e54e3e2d9c8aae986c8e15cc58a17679c8f315e4fa68d98f961a433f35c67c88e563978989be12f1a438b8a34861d09a6fe6a94645a5e535ae SHA512 5232fd852509d26b6014f9222c4d0c7e9b57bd87ba23bd44fc3d926d4e7818fae5b51eed9dbeb6633b7a2cd9e81c37b85b55c6e4ad6d427c78dabe7a186575fa
+EBUILD wireguard-tools-1.0.20200827.ebuild 4014 BLAKE2B 7cbfad529059e2e54e3e2d9c8aae986c8e15cc58a17679c8f315e4fa68d98f961a433f35c67c88e563978989be12f1a438b8a34861d09a6fe6a94645a5e535ae SHA512 5232fd852509d26b6014f9222c4d0c7e9b57bd87ba23bd44fc3d926d4e7818fae5b51eed9dbeb6633b7a2cd9e81c37b85b55c6e4ad6d427c78dabe7a186575fa
MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200820.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200827.ebuild
index f61364d1c25e..f61364d1c25e 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200820.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200827.ebuild