From d686178111d92f8f02d92f0cb447880baa6111f2 Mon Sep 17 00:00:00 2001 From: Laszlo Valko Date: Wed, 29 Apr 2020 03:09:56 +0200 Subject: [PATCH] Updated net-vpn/softether to 4.34.9745_beta. --- net-vpn/softether/Manifest | 9 +- .../files/softether-4.04-sandbox.patch | 4 +- .../files/softether-4.25-compile-flags.patch | 130 ++++++++++++++++++ .../softether/softether-4.24_beta9651.ebuild | 68 --------- .../softether/softether-4.28_beta9669.ebuild | 68 --------- .../softether/softether-4.34.9745_beta.ebuild | 86 ++++++++++++ 6 files changed, 222 insertions(+), 143 deletions(-) create mode 100644 net-vpn/softether/files/softether-4.25-compile-flags.patch delete mode 100644 net-vpn/softether/softether-4.24_beta9651.ebuild delete mode 100644 net-vpn/softether/softether-4.28_beta9669.ebuild create mode 100644 net-vpn/softether/softether-4.34.9745_beta.ebuild diff --git a/net-vpn/softether/Manifest b/net-vpn/softether/Manifest index ca707c4..9a53ba6 100644 --- a/net-vpn/softether/Manifest +++ b/net-vpn/softether/Manifest @@ -1,12 +1,11 @@ -AUX softether-4.04-sandbox.patch 771 BLAKE2B 773652cc8f239fc335cffda4b941d2bd57756b141550a83096a5b58e6e89c6d9826cf178dae54b6064e4d05d47028b09b6b3010f2e2760b9c8b6554b8ab86391 SHA512 2b3942337b4ecae197e9382c4895eedf43bae76222838475f95c9d60fc78bd16f0ae93f952d4d36de207d51276acb629c8172fd01a1c39b11592a97a9de1c42b +AUX softether-4.04-sandbox.patch 775 BLAKE2B 2b8c577e853afda5004a344413ab3dd5e2b1a0fd8ec0800a7790f2798e7c7c7997e541cd4b055fbb86106dbccddba84a7eb6015a5ed8de8470afb420352d49d3 SHA512 4742927b11caea67bd183bf26d24a1ca70ca6a764f0b263bd4aa54784759c883358bd3cb16edd3b27ce8aaa84fb230002441dfb0ecfab9b3398e6ecc06c9159d +AUX softether-4.25-compile-flags.patch 7107 BLAKE2B a6f138fb2f0b08db32235e7f3f4d260942aa69c17c904c856b40da6b5a0e0ffe547da8cf1240a0efad978906800bdb06c84857452fd046bbba61317df63ef401 SHA512 220662d5ba181229e1ba4aad1b8125244f3dde88a7e9bef01516740fb14353652573b742aac6593891283bbafb7ec0c4c084b6dcd30912de082ee8d59ea28373 AUX softether-bridge.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b AUX softether-bridge.initd 1012 BLAKE2B 58699bf0fa96986a77a2b81161a5f21aaeda56e42cd6e2ff76a07842dee400d413b02966173c5b7ce3f152277518eaee9b6eda8c68588326d25dc469e4e87e05 SHA512 73c56bd43bcbfd22841d91953b961f5b109d11a674daee1b4c8e3e147471b0f710f281ec173f369e63098697709e6286e510bb74e46013049faf4ef538d0c519 AUX softether-client.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b AUX softether-client.initd 1012 BLAKE2B ad11ba665a890af15f866d21dc8fd3bed78b4d94ed34cc644a57cebf77d73e5ad3de0cbb090431b155fb4e7fa6fffe4f0327b82c7f3668d4738a4e0365d7fc8c SHA512 82193c7706865c23e1f7784ce5672dfe402366d7487245faabbb2668ba722a1945ac0aa26ee63357a12d85853c7071dbc0ab87b5598fbbc9587435984175f953 AUX softether-server.confd 36 BLAKE2B aa4efb532188bfffbb4ee9393c458a3769ef497242b623b0c79f55fe6a3bbac3e30ca6b2cafb13b003e024dff14f097978e94bd2fb77be4f6b8a203aa03f337d SHA512 2261dc21b23b0e745b611c4e79a3ce940068007512308b2acef9db860e8b6fa86693447968ddeed1dbe9d25601f1ace88064ea49f106a450f65eee24dfb11e2b AUX softether-server.initd 1012 BLAKE2B 1f95a0974034fcc625977a9cf8f6d53e4717f6d1338622f37bb13a1002db430026dcbf03a41b89280ca4b586941141913ce1ae03ee8c9ed18ebea0edb8615465 SHA512 53c17c72670952b472bc70666870bfcd3eb7dc11ce4d00e77319969554c002d013af7b4688c6c610350ae657deaebba014a5d495165e3073f23a84ada6c11af8 -DIST softether-src-v4.24-9651-beta.tar.gz 33744399 BLAKE2B 943ee9804c142929365556ad0a846105189097169613be0d53a554d5221564941b6363a739925ea151d2e9cee3b36c70764778071ccd5d49df38f8269521e826 SHA512 397c7d989301eb93af471ae2bd1211967ac4119c28705d90a4274a18a2f0068947408f197300d9938c5f499e838c4848fdd9a94170ac2204e73f7e677e01e1c2 -DIST softether-src-v4.28-9669-beta.tar.gz 33795085 BLAKE2B 773784f35d97313be5f33ab0076d3014a444f9a5e4944f64e7635ce1329c2c3cfe99388b5a60fbfdc5c1a3b8883a263473b899f30acd623d87db1f4e4e454095 SHA512 9e3a016aed041973e23b591657208244d33952b4a4ed34b39aefb3cecc0692c4e0ffc1eaba4b88c8bc305370ddb23b3cba4da55fde23fcb1068de92ecd79c15b -EBUILD softether-4.24_beta9651.ebuild 1662 BLAKE2B fa8fd09d234c44d508797b0d6469b4452b7ff5698855c7d1ba36cdfb5b336badd68895aaa90d76fe0372d74f3d4262d4cedaac3453ec5f823955275f7a718fd8 SHA512 a798d2079463f628d491a8120ffbc89b656ce303155e834815afe7f9e298e71ac98d2534e189273ce10689c2d869016875bb3c525e276886458e2fde62a0ca93 -EBUILD softether-4.28_beta9669.ebuild 1662 BLAKE2B 68029ad327bb25a050cf8738dbb22ad9019066585044baffd23a57f9413a30fbb210f1b40ce2a614727dad04fae68a8e74311e610e31f89b2bc1c1cfb80b4a6c SHA512 26afd4d6899a10d6d466811b610e494a0c34127cc946e008443e83ae30e04ae6f45c481922dd58af773445b6286e9c63f5522ce32dd806b2b9ba4236cb7ad644 +DIST v4.34-9745-beta.tar.gz 59121057 BLAKE2B f25f5f1064223a4b44998442e65143972754d71729f10d03af0c7bcb437f1b59b6172a924315ac904583c2c982ac5e2a5370fc9e4590fcc36c9121a976208551 SHA512 747b569bf60acf06032f76a1dc5eb5352f74da8bfe4511908d7ba45c3ac67eb3dc9a8f3c1885f4b89f9f915f4f617c7f59da3c63cb0c376396f8ba90e447e045 +EBUILD softether-4.34.9745_beta.ebuild 2297 BLAKE2B 1c8031ea2d25de245d81c5c959bb4ef99ee01c2c0e6983124519d7b0d472e2d0d75ed461d5a3955123a4af19699ca72ec38d9302905e704aac5818f1a582012e SHA512 52721adfb53d4adf6547250a911f8474b1bd5618c860f79685e477a2fbe8bd34d0ca053795bac469cad6051a1f3af267eddaa01d35632471e3f9e6e649dff040 MISC metadata.xml 1015 BLAKE2B febf7c27f3ced24ae27ff810e21d1d5995a2e9cb2cef54488019c0e32505200c30b72f08bc5fac57dbd4932500a3f6a2188ad491d60400a99a83dcc2710d8efe SHA512 c11c41731fd992670c74343c54ba5b390da650b99a1292cd2a0f882ff876e8f6341ab0bcca9fb3b464b0e77ee0d09247c240bc880369fe13ca61435bbfc72217 diff --git a/net-vpn/softether/files/softether-4.04-sandbox.patch b/net-vpn/softether/files/softether-4.04-sandbox.patch index 65136a5..b7482eb 100644 --- a/net-vpn/softether/files/softether-4.04-sandbox.patch +++ b/net-vpn/softether/files/softether-4.04-sandbox.patch @@ -1,5 +1,5 @@ ---- src/Mayaqua/Unix.c.org 2014-03-05 07:24:37.000000000 +0200 -+++ src/Mayaqua/Unix.c 2014-03-05 07:24:48.000000000 +0200 +--- a/src/Mayaqua/Unix.c.org 2014-03-05 07:24:37.000000000 +0200 ++++ b/src/Mayaqua/Unix.c 2014-03-05 07:24:48.000000000 +0200 @@ -2150,14 +2150,14 @@ #endif // RLIMIT_NPROC diff --git a/net-vpn/softether/files/softether-4.25-compile-flags.patch b/net-vpn/softether/files/softether-4.25-compile-flags.patch new file mode 100644 index 0000000..884a350 --- /dev/null +++ b/net-vpn/softether/files/softether-4.25-compile-flags.patch @@ -0,0 +1,130 @@ +diff -Nru v4.25-9656.orig/src/makefiles/linux_32bit.mak v4.25-9656/src/makefiles/linux_32bit.mak +--- v4.25-9656.orig/src/makefiles/linux_32bit.mak 2018-01-15 05:00:42.000000000 +0300 ++++ v4.25-9656/src/makefiles/linux_32bit.mak 2018-06-04 00:06:00.475000000 +0300 +@@ -24,14 +24,15 @@ + # Variables + + #CC=gcc ++RANLIB?=ranlib + + OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char + + OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz + +-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char ++OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ ${CFLAGS} -fsigned-char + +-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz ++OPTIONS_LINK_RELEASE=${CFLAGS} ${LDFLAGS} -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz + + INSTALL_BINDIR=/usr/bin/ + INSTALL_VPNSERVER_DIR=/usr/vpnserver/ +@@ -324,8 +325,8 @@ + + tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnserver.a +- ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o +- ranlib tmp/as/vpnserver.a ++ $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o ++ $(RANLIB) tmp/as/vpnserver.a + + bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2 +@@ -339,8 +340,8 @@ + + tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnclient.a +- ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o +- ranlib tmp/as/vpnclient.a ++ $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o ++ $(RANLIB) tmp/as/vpnclient.a + + bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2 +@@ -354,8 +355,8 @@ + + tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnbridge.a +- ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o +- ranlib tmp/as/vpnbridge.a ++ $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o ++ $(RANLIB) tmp/as/vpnbridge.a + + bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2 +@@ -369,8 +370,8 @@ + + tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpncmd.a +- ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o +- ranlib tmp/as/vpncmd.a ++ $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o ++ $(RANLIB) tmp/as/vpncmd.a + + bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2 +diff -Nru v4.25-9656.orig/src/makefiles/linux_64bit.mak v4.25-9656/src/makefiles/linux_64bit.mak +--- v4.25-9656.orig/src/makefiles/linux_64bit.mak 2018-01-15 05:00:42.000000000 +0300 ++++ v4.25-9656/src/makefiles/linux_64bit.mak 2018-06-04 00:06:10.592000000 +0300 +@@ -24,14 +24,15 @@ + # Variables + + #CC=gcc ++RANLIB?=ranlib + + OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64 + + OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz + +-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64 ++OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ ${CFLAGS} -fsigned-char + +-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz ++OPTIONS_LINK_RELEASE=${CFLAGS} ${LDFLAGS} -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz + + INSTALL_BINDIR=/usr/bin/ + INSTALL_VPNSERVER_DIR=/usr/vpnserver/ +@@ -324,8 +325,8 @@ + + tmp/as/vpnserver.a: tmp/objs/vpnserver.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnserver.a +- ar r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o +- ranlib tmp/as/vpnserver.a ++ $(AR) r tmp/as/vpnserver.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnserver.o ++ $(RANLIB) tmp/as/vpnserver.a + + bin/vpnserver/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnserver/hamcore.se2 +@@ -339,8 +340,8 @@ + + tmp/as/vpnclient.a: tmp/objs/vpnclient.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnclient.a +- ar r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o +- ranlib tmp/as/vpnclient.a ++ $(AR) r tmp/as/vpnclient.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnclient.o ++ $(RANLIB) tmp/as/vpnclient.a + + bin/vpnclient/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnclient/hamcore.se2 +@@ -354,8 +355,8 @@ + + tmp/as/vpnbridge.a: tmp/objs/vpnbridge.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpnbridge.a +- ar r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o +- ranlib tmp/as/vpnbridge.a ++ $(AR) r tmp/as/vpnbridge.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpnbridge.o ++ $(RANLIB) tmp/as/vpnbridge.a + + bin/vpnbridge/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpnbridge/hamcore.se2 +@@ -369,8 +370,8 @@ + + tmp/as/vpncmd.a: tmp/objs/vpncmd.o $(HEADERS_MAYAQUA) $(HEADERS_CEDAR) $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) + rm -f tmp/as/vpncmd.a +- ar r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o +- ranlib tmp/as/vpncmd.a ++ $(AR) r tmp/as/vpncmd.a $(OBJECTS_MAYAQUA) $(OBJECTS_CEDAR) tmp/objs/vpncmd.o ++ $(RANLIB) tmp/as/vpncmd.a + + bin/vpncmd/hamcore.se2: src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + cp src/bin/BuiltHamcoreFiles/unix/hamcore.se2 bin/vpncmd/hamcore.se2 diff --git a/net-vpn/softether/softether-4.24_beta9651.ebuild b/net-vpn/softether/softether-4.24_beta9651.ebuild deleted file mode 100644 index b18844b..0000000 --- a/net-vpn/softether/softether-4.24_beta9651.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="Multi-protocol VPN software" -HOMEPAGE="http://www.softether.org/" -LICENSE="GPL-2" - -DATE="2017.10.23" -MY_P="v${PV/_beta/-}" -SRC_URI="http://www.softether-download.com/files/${PN}/${MY_P}-beta-${DATE}-tree/Source_Code/${PN}-src-${MY_P}-beta.tar.gz" -SLOT="0" -KEYWORDS="amd64 x86" - -S=${WORKDIR}/${MY_P} - -IUSE="bridge client cmd debug server" - -RDEPEND="dev-libs/openssl - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib" - -DOCS=( AUTHORS.TXT ChangeLog README ) - -REQUIRED_USE="|| ( bridge client cmd server )" - -src_prepare() { - # Prohibit to modify number of threads - epatch "${FILESDIR}"/softether-4.04-sandbox.patch - - epatch_user -} - -src_configure() { - use amd64 && echo -e "1\n2\n" | ./configure - use x86 && echo -e "1\n1\n" | ./configure -} - -src_compile() { - emake DEBUG="$(usex debug YES NO '' '')" -} - -src_install() { - # Define local variable, strip 'debug' USE flags - local MODULES=${IUSE//debug} - - # Define installation location - insinto /opt/softether - doins src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - - # Install binary in accordance to used USE flags - for module in ${MODULES}; do - if use $module ; then - dosym /opt/softether/hamcore.se2 /opt/softether/bin/vpn${module}/hamcore.se2 - insinto /opt/softether/bin/vpn${module} - doins bin/vpn${module}/vpn${module} - fperms 0755 /opt/softether/bin/vpn${module}/vpn${module} - if [ "$module" != "cmd" ] ; then - newinitd "${FILESDIR}"/${PN}-${module}.initd ${PN}-${module} - newconfd "${FILESDIR}"/${PN}-${module}.confd ${PN}-${module} - fi - fi - done -} diff --git a/net-vpn/softether/softether-4.28_beta9669.ebuild b/net-vpn/softether/softether-4.28_beta9669.ebuild deleted file mode 100644 index a147479..0000000 --- a/net-vpn/softether/softether-4.28_beta9669.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="Multi-protocol VPN software" -HOMEPAGE="http://www.softether.org/" -LICENSE="GPL-2" - -DATE="2018.09.11" -MY_P="v${PV/_beta/-}" -SRC_URI="http://www.softether-download.com/files/${PN}/${MY_P}-beta-${DATE}-tree/Source_Code/${PN}-src-${MY_P}-beta.tar.gz" -SLOT="0" -KEYWORDS="amd64 x86" - -S=${WORKDIR}/${MY_P} - -IUSE="bridge client cmd debug server" - -RDEPEND="dev-libs/openssl - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib" - -DOCS=( AUTHORS.TXT ChangeLog README ) - -REQUIRED_USE="|| ( bridge client cmd server )" - -src_prepare() { - # Prohibit to modify number of threads - epatch "${FILESDIR}"/softether-4.04-sandbox.patch - - epatch_user -} - -src_configure() { - use amd64 && echo -e "1\n2\n" | ./configure - use x86 && echo -e "1\n1\n" | ./configure -} - -src_compile() { - emake DEBUG="$(usex debug YES NO '' '')" -} - -src_install() { - # Define local variable, strip 'debug' USE flags - local MODULES=${IUSE//debug} - - # Define installation location - insinto /opt/softether - doins src/bin/BuiltHamcoreFiles/unix/hamcore.se2 - - # Install binary in accordance to used USE flags - for module in ${MODULES}; do - if use $module ; then - dosym /opt/softether/hamcore.se2 /opt/softether/bin/vpn${module}/hamcore.se2 - insinto /opt/softether/bin/vpn${module} - doins bin/vpn${module}/vpn${module} - fperms 0755 /opt/softether/bin/vpn${module}/vpn${module} - if [ "$module" != "cmd" ] ; then - newinitd "${FILESDIR}"/${PN}-${module}.initd ${PN}-${module} - newconfd "${FILESDIR}"/${PN}-${module}.confd ${PN}-${module} - fi - fi - done -} diff --git a/net-vpn/softether/softether-4.34.9745_beta.ebuild b/net-vpn/softether/softether-4.34.9745_beta.ebuild new file mode 100644 index 0000000..6086c93 --- /dev/null +++ b/net-vpn/softether/softether-4.34.9745_beta.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LEVEL="${PV#*_}" +VERSION="${PV%%_*}" +BUILD="${VERSION##*.}" +VERSION="${VERSION%.*}" +[ "$LEVEL" != "beta" ] && LEVEL="rtm" + +MY_P="SoftEtherVPN_Stable-${VERSION}-${BUILD}-${LEVEL}" + +inherit systemd toolchain-funcs + +DESCRIPTION="Multi-protocol VPN software" +HOMEPAGE="http://www.softether.org/" +SRC_URI="https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/archive/v${VERSION}-${BUILD}-${LEVEL}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="bridge client cmd debug libressl server" +REQUIRED_USE="|| ( bridge client cmd server )" + +RDEPEND="sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= )" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +DOCS=( AUTHORS.TXT ChangeLog README ) +# Prohibit to modify number of threads, respect FLAGS +PATCHES=( "${FILESDIR}"/softether-4.04-sandbox.patch + "${FILESDIR}"/softether-4.25-compile-flags.patch ) + +src_prepare() { + default + + sed -i '/opt\/vpn/s|/opt|/opt/softether|' systemd/*.service \ + || die "sed failed for systemd files" + + rm -f configure || die + if use amd64; then + cp src/makefiles/linux_64bit.mak Makefile \ + || die "copy Makefile for amd64 failed" + elif use x86; then + cp src/makefiles/linux_32bit.mak Makefile \ + || die "copy Makefile for x86 failed" + fi +} + +src_compile() { + tc-export CC AR RANLIB + emake DEBUG="$(usex debug YES NO '' '')" +} + +src_install() { + einstalldocs + + # Define local variable, strip 'debug' and 'libressl' USE flags + local MODULES + MODULES="${IUSE//debug}" + MODULES="${IUSE//libressl}" + + # Define installation location + insinto /opt/softether + doins src/bin/BuiltHamcoreFiles/unix/hamcore.se2 + + # Install binary in accordance to used USE flags + for module in ${MODULES}; do + if use "$module" ; then + dosym ../../hamcore.se2 /opt/softether/bin/vpn"$module"/hamcore.se2 + insinto /opt/softether/bin/vpn"$module" + doins bin/vpn"$module"/vpn"$module" + fperms 0755 /opt/softether/bin/vpn"$module"/vpn"$module" + if [ "$module" != "cmd" ] ; then + newinitd "${FILESDIR}"/"${PN}"-"$module".initd "${PN}"-"$module" + systemd_newunit "systemd/${PN}-vpn$module.service" "${PN}"-"$module".service + fi + fi + done +}