From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- net-vpn/Manifest.gz | Bin 4545 -> 4550 bytes net-vpn/i2pd/Manifest | 2 +- net-vpn/i2pd/i2pd-2.23.0.ebuild | 18 ++-- net-vpn/openvpn/Manifest | 3 +- net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 158 ++++++++++++++++++++++++++++++++ net-vpn/openvpn/openvpn-9999.ebuild | 4 +- 6 files changed, 172 insertions(+), 13 deletions(-) create mode 100644 net-vpn/openvpn/openvpn-2.4.6-r1.ebuild (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index 58c87f34859f..ce50ef0a9cce 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest index e6903269e997..4dc870ca8358 100644 --- a/net-vpn/i2pd/Manifest +++ b/net-vpn/i2pd/Manifest @@ -15,5 +15,5 @@ EBUILD i2pd-2.20.0.ebuild 3166 BLAKE2B 5a62ee83bd80beca39b265a8a6806c733d047066d EBUILD i2pd-2.21.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3 EBUILD i2pd-2.21.1.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3 EBUILD i2pd-2.22.0.ebuild 3140 BLAKE2B 62e6f83535bb2067918b2a331b62a69a4b0138bde9e59abb6270759aa3d1fef08574ef5d02765bafb9bc9beaa3600ab82aa3acc134f97c245f494d585cd52107 SHA512 ed9c1091fe233788a5e73d9e5afe194e57cd3801cb2c71054ad3ad14f68d9b880163e75eb7d94512a7022303f92471bf444076c0e20e2ae6f54b1d6e5f56a8e3 -EBUILD i2pd-2.23.0.ebuild 3140 BLAKE2B 91040336cf1b6a8b55bc720cf519e9c71c4feeee1e664d50fcf9a241957d8c23670ffe3082877c8f343197149a4fd98e64fe945279db2bdc437f860a9dbdc322 SHA512 17ebbb09fb555d6db61010b724e48acdd1603bb6e15bf20b5ea61ec6bed61addb323ac986c2906a764240ce249d2106117ccdb6062b83924416e96916f3bc7a2 +EBUILD i2pd-2.23.0.ebuild 3154 BLAKE2B ff277675b1d37d58d674eceaac7a1639b0956946e2f8bb6849acf50f6a20165780f0ddecc138e402968c20d4514f0ad4e44122cd8fb2ff5cea764290905cf86c SHA512 b0b8b97067ce62ad1837621456a0b1136541ba7187f4513ca6ca50b61f25b5693361e9341729abe2486da554032ecbb4cf01c55d07a794d82991ae76b483f314 MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553 diff --git a/net-vpn/i2pd/i2pd-2.23.0.ebuild b/net-vpn/i2pd/i2pd-2.23.0.ebuild index 963416b932a4..719f88b1a2ce 100644 --- a/net-vpn/i2pd/i2pd-2.23.0.ebuild +++ b/net-vpn/i2pd/i2pd-2.23.0.ebuild @@ -15,23 +15,23 @@ IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp we # if using libressl, require >=boost-1.65, see #597798 RDEPEND=" !static? ( - dev-libs/boost[threads] - !libressl? ( dev-libs/openssl:0[-bindist] ) + dev-libs/boost:=[threads] + !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( - dev-libs/libressl:0 - >=dev-libs/boost-1.65 + dev-libs/libressl:0= + >=dev-libs/boost-1.65:= ) upnp? ( net-libs/miniupnpc ) )" DEPEND="${RDEPEND} static? ( - dev-libs/boost[static-libs,threads] - !libressl? ( dev-libs/openssl:0[static-libs] ) + dev-libs/boost:=[static-libs,threads] + !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( - dev-libs/libressl:0[static-libs] - >=dev-libs/boost-1.65 + dev-libs/libressl:0=[static-libs] + >=dev-libs/boost-1.65:= ) - sys-libs/zlib[static-libs] + sys-libs/zlib:=[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp )" diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest index 0efd3bcdb7be..e5c7198e457a 100644 --- a/net-vpn/openvpn/Manifest +++ b/net-vpn/openvpn/Manifest @@ -6,6 +6,7 @@ AUX openvpn-external-cmocka.patch 2083 BLAKE2B 4e9f0a2ca509a4c37d2efe061ed7a027b AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2e51b25a91a8e1fcf9d29bba90fe58e40bf0197793a76fc1e83d8b6d677228cdc5e5333253b1a3 SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8 +EBUILD openvpn-2.4.6-r1.ebuild 4586 BLAKE2B db7c3da2659728384d6bb78beb8ffa632c66dba467403d87250bdbaa4bdc008b6d4e73dda30c1bf747517927256e144ab0e49e2f419525937d293cc14f38082e SHA512 ba63e3d5cade6cae6ae13126aa974798caba94a2806d0f1da2610c891072b349af73f874f6374817d3d509e1e633cf2b1fd2afbf873c9fb5790059758dc6987d EBUILD openvpn-2.4.6.ebuild 4577 BLAKE2B e8828ba11b3d6026ebddd2f7c64aa351881b99f9bdc2ad480347db796eaf1fa139e1d3478135e53287439a97bd6904e6911b0ff361110b9d6e32e454ff76c6e6 SHA512 b906ae2d8281893d36ed87bf4b6a58c9d8dfd11dedc2f78bdbaf00f246a32a987b50347dd6142c9224e4744bb34146b154e31c9f68b9d938dc21c1bc12a4bf92 -EBUILD openvpn-9999.ebuild 4339 BLAKE2B 8df1da9cb15614c3f0f71d4233209b302517df5d7e7c1eb3b81f8b5ceb71ed94717a9c1599ad21b4cc33f194a5c713d71f4e473bede6fc9b43a2a23e7b4ef2fe SHA512 7d10a8ea396aa773500904e4ecb9722ba30976a1655bea3d6534c062b2e0fa7137d75a6dbcfffecd1a14e26f520a6ebc04eec4584d3f0acc6d8ac733452badd3 +EBUILD openvpn-9999.ebuild 4343 BLAKE2B 1da475ccc626cf4381fd58c78c028cc979894801962a8c5cdf55ff373cbab461ac7721052c384a4f506d0b2a70208069e576d3ce2c24e0c248f83a9ed704bd45 SHA512 2ad94c32bf75c559ecfa3ff93415c02774b266ef6c5ea0bcda8e4c4b1b7045ce782e63b32a23fab1afae34ba50a2185172e6ec8c36e6ff334b84d581630a4504 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild new file mode 100644 index 000000000000..81d3d655a383 --- /dev/null +++ b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic user systemd linux-info + +DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" +SRC_URI="https://swupdate.openvpn.net/community/releases/${P}.tar.gz + test? ( https://raw.githubusercontent.com/OpenVPN/${PN}/v${PV}/tests/unit_tests/${PN}/mock_msg.h )" +HOMEPAGE="https://openvpn.net/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~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" + +REQUIRED_USE="static? ( !plugins !pkcs11 ) + mbedtls? ( ssl !libressl ) + pkcs11? ( ssl ) + !plugins? ( !pam !down-root ) + inotify? ( plugins )" + +CDEPEND=" + kernel_linux? ( + iproute2? ( sys-apps/iproute2[-minimal] ) + !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) + ) + pam? ( virtual/pam ) + ssl? ( + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-0.9.8:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + mbedtls? ( net-libs/mbedtls ) + ) + lz4? ( app-arch/lz4 ) + lzo? ( >=dev-libs/lzo-1.07 ) + pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) + systemd? ( sys-apps/systemd )" +DEPEND="${CDEPEND} + test? ( dev-util/cmocka )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-openvpn )" + +CONFIG_CHECK="~TUN" + +PATCHES=( + "${FILESDIR}/${PN}-external-cmocka.patch" + "${FILESDIR}/${PN}-2.4.5-libressl-macro-fix.patch" +) + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + eautoreconf + + if use test; then + cp "${DISTDIR}/mock_msg.h" tests/unit_tests/${PN} || die + fi +} + +src_configure() { + use static && append-ldflags -Xcompiler -static + SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ + TMPFILES_DIR="/usr/lib/tmpfiles.d" \ + IFCONFIG=/bin/ifconfig \ + ROUTE=/bin/route \ + econf \ + $(usex mbedtls '--with-crypto-library=mbedtls' '') \ + $(use_enable inotify async-push) \ + $(use_enable ssl crypto) \ + $(use_enable lz4) \ + $(use_enable lzo) \ + $(use_enable pkcs11) \ + $(use_enable plugins) \ + $(use_enable iproute2) \ + $(use_enable pam plugin-auth-pam) \ + $(use_enable down-root plugin-down-root) \ + $(use_enable test tests) \ + $(use_enable systemd) +} + +src_test() { + make check || die "top-level tests failed" + pushd tests/unit_tests > /dev/null || die + make check || die "unit tests failed" + popd > /dev/null || die +} + +src_install() { + default + find "${ED}/usr" -name '*.la' -delete + # install documentation + dodoc AUTHORS ChangeLog PORTS README README.IPv6 + + # Install some helper scripts + keepdir /etc/openvpn + exeinto /etc/openvpn + doexe "${FILESDIR}/up.sh" + doexe "${FILESDIR}/down.sh" + + # Install the init script and config file + newinitd "${FILESDIR}/${PN}-2.1.init" openvpn + newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn + + # install examples, controlled by the respective useflag + if use examples ; then + # dodoc does not supportly support directory traversal, #15193 + insinto /usr/share/doc/${PF}/examples + doins -r sample contrib + fi +} + +pkg_postinst() { + # Add openvpn user so openvpn servers can drop privs + # Clients should run as root so they can change ip addresses, + # dns information and other such things. + enewgroup openvpn + enewuser openvpn "" "" "" openvpn + + if use x64-macos; then + elog "You might want to install tuntaposx for TAP interface support:" + elog "http://tuntaposx.sourceforge.net" + fi + + elog "The openvpn init script expects to find the configuration file" + elog "openvpn.conf in /etc/openvpn along with any extra files it may need." + elog "" + elog "To create more VPNs, simply create a new .conf file for it and" + elog "then create a symlink to the openvpn init script from a link called" + elog "openvpn.newconfname - like so" + elog " cd /etc/openvpn" + elog " ${EDITOR##*/} foo.conf" + elog " cd /etc/init.d" + elog " ln -s openvpn openvpn.foo" + elog "" + elog "You can then treat openvpn.foo as any other service, so you can" + elog "stop one vpn and start another if you need to." + + if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then + ewarn "" + ewarn "WARNING: If you use the remote keyword then you are deemed to be" + ewarn "a client by our init script and as such we force up,down scripts." + ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you" + ewarn "can move your scripts to." + fi + + if use plugins ; then + einfo "" + einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins" + fi +} diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index 60662fa4fd3a..eb65ce756e96 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -33,8 +33,8 @@ CDEPEND=" pam? ( virtual/pam ) ssl? ( !mbedtls? ( - !libressl? ( >=dev-libs/openssl-0.9.8:* ) - libressl? ( dev-libs/libressl ) + !libressl? ( >=dev-libs/openssl-0.9.8:0= ) + libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls ) ) -- cgit v1.2.3