diff options
Diffstat (limited to 'net-vpn/openvpn')
-rw-r--r-- | net-vpn/openvpn/Manifest | 14 | ||||
-rw-r--r-- | net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch | 63 | ||||
-rw-r--r-- | net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch | 49 | ||||
-rw-r--r-- | net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch | 65 | ||||
-rw-r--r-- | net-vpn/openvpn/files/openvpn-external-cmocka.patch | 62 | ||||
-rw-r--r-- | net-vpn/openvpn/openvpn-2.4.6-r1.ebuild | 156 | ||||
-rw-r--r-- | net-vpn/openvpn/openvpn-2.4.6.ebuild | 156 | ||||
-rw-r--r-- | net-vpn/openvpn/openvpn-2.4.7-r1.ebuild | 157 | ||||
-rw-r--r-- | net-vpn/openvpn/openvpn-2.4.8.ebuild | 145 | ||||
-rw-r--r-- | net-vpn/openvpn/openvpn-2.4.9.ebuild | 38 |
10 files changed, 26 insertions, 879 deletions
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest index 5a7b3a18f636..650a20f1ffd0 100644 --- a/net-vpn/openvpn/Manifest +++ b/net-vpn/openvpn/Manifest @@ -1,20 +1,8 @@ AUX down.sh 943 BLAKE2B 9853748aebd819c46cec0229971375d28922abe91ff6442a572090f300cd901ccd80c04fc3df30a1251492a55e593a4783f7f5a4b380053f27bb387f5417444b SHA512 5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997 AUX openvpn-2.1.conf 892 BLAKE2B d0ce49ecc6275c9677e56de5d13afcc69169666441cb6d8eb958642786f0ee7ff6acb1830af0001fd1945b666daf5af1d9be211032817fc345e33242e1d86885 SHA512 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37 AUX openvpn-2.1.init 4187 BLAKE2B 9ab133bda1db2d94afbf1e35840515452029319c38bb796af90b117dcfcd8552da2ea236399c2708a4862de753a8f92cdff80a69cfdcc5d53e206f9f3ffc48d8 SHA512 2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611 -AUX openvpn-2.4.5-libressl-macro-fix.patch 2096 BLAKE2B d3d277c8bd800827ceabc01431c2ff22e78a89921ff2460460e9acdfbfb7466188456557031de2b0bf2c00703a573c05ba1fcbff96da4b5def596c82717ac81a SHA512 77026186911e852e8434b19662026fa5503a389ecc1a7a8fb3a395beeb2397bc75426ca310e7728ac24ec540b59e00fd623324e262276007c772f9a1cda16863 -AUX openvpn-2.4.7-libressl.patch 1929 BLAKE2B 175375bd8f233a0315ee99fb3ff6ca84f77cd850fabe8cf3f53033f56f99e0ce5ee9de4f4970011909a91e940c2665cc65004f5dce987c9545390b698b580676 SHA512 8fab84df8e268e1ec88bff3443e8e35c5228dfabff71b75f64ba29f6ff09523b36a1c8af9c9cbf20bff9d241d5de3136a1278b3f76675c28238d4c3a12ff535c -AUX openvpn-2.5-external-cmocka.patch 2279 BLAKE2B a20cb45170590c332813fa6a0c539b8972ed329fec4ddb644996d5caa32f821dc4be75a9bc525917562e47588f8135b0def65aed9e747609b836d06a9f6ea666 SHA512 5f6d01b7051511e37a8822a0a514cfbdea3118cf52a86bec3addc2de713640842e972346ce598147e354353dd9483ecdbb13efc211e9b74c58598d6c11038f1e -AUX openvpn-external-cmocka.patch 2083 BLAKE2B 4e9f0a2ca509a4c37d2efe061ed7a027ba7e069041d193a237d214c493b839fc36e87898aad160eb8198845306b7910f4d9da0e87671b9310425786fbe676bf4 SHA512 6c34518f626992031735f6433861fafd44e3cf35e95668cf5945aee7b341a049e3b6a73dd9937a0f287e4a750a2415532ae49aac11011767e0c7a3355f8ff6ca 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 -DIST openvpn-2.4.7.tar.gz 998094 BLAKE2B 90f91d74279a547b49704cd14d9ac3dde26c522cd77eb851ea603addb1b220eda9be4de6cf5d74fe7717f34b3ff5fc802ca977a1402c5ed75616139d449fceb0 SHA512 ba9bc08c02fad85ba05c27488b0bfcb3540ba9c625c42334e24cb1d5e253b91c518c02641d755e03b8747ae8c2ebd340c55d51f7aedbbf2550ee4e4b79823c9c -DIST openvpn-2.4.8.tar.gz 997417 BLAKE2B 1c56d25c125039b9f0723d8f498c9cc7233c9da940d961a430c82a3c41448c0c4fc64255adad59513d4e39b8e778cf58ced965e1501793c47bc73d211c339e4e SHA512 6a5f6f6a5cccc5011019e64ed452ad395942b751589893bd6fd3159b20577d734f2fe35d2f51f30303adee3a21e67da6d25369ea4421288ba7c2e09445e2c001 DIST openvpn-2.4.9.tar.gz 1000602 BLAKE2B 4a10ec76d1a816f9184dd33e4384623e011a1af40ea38ad56cc06f70ab2c911b6fd92cf8ffcd2ec3ab4179fef87feb187fc9df61c5bea92b1c69ee4113093866 SHA512 7683dfb93592968459f080a07ea750992b7444708cdb1a5aafc0118ab8528fc488f2b9fbd7d042e57ad1811303208875237ae9decf0bb4977c45cd30da53751b -EBUILD openvpn-2.4.6-r1.ebuild 4497 BLAKE2B 5ca911e21c950e34cb3b5f69a175690c443b6179c0b00afe0a6579c8fa4537b96153134ddfd14776076e324b2cc4be11a94e0ff56da42745f2673aa39431788c SHA512 f0500f9e54769d8bfed7a4e1bf657e7dfb5cad5600ce7de7165eadaf79e528f232595da55cd40fae6304ebd1eaf86a3484e3faa59963ded673d5caf41d0b2260 -EBUILD openvpn-2.4.6.ebuild 4491 BLAKE2B 120448a1525ed205a2ddfb1a0841cb4167cfd6ac7a3db2cdd6ff9d100028090d54c835908062ce6f08da0ff7fe6fce5a9ced21a5d1ba93cdc9f7fe397e651ed8 SHA512 88b5c883e041823672da5c4cd54594054832c4610f793eeb601e0b655b9a1eda0858aa11fe20ec5d5eb3ad2c50b97348ace5965360b79441fe8fbce96d491b58 -EBUILD openvpn-2.4.7-r1.ebuild 4538 BLAKE2B b0b02615e4c1f478078422dacda49f8d5832aa3d201097d245037245c00cd178062b125dd73d386d6a72b357a9ae2d46325d2e72292cf5c1986f22ebd5727b73 SHA512 0e311676afff67fe3da4d5b7a7df15e67af40b9100349b4aca3da9a427f0e414eda39056bd725abeea5504c905db3c80ec9533021cfb8765bb73afe7032a24ce -EBUILD openvpn-2.4.8.ebuild 4013 BLAKE2B 6ce18ef028e85459815792bf315524a1ac71790829d86d6822e5273d93abb35a54813689298573a53a7bc9afdb57ded9002930e637531f86ff63372e3c48838a SHA512 f0c13bd66ac9976a894fabef51b496643ed351c8ca2dd8cb0a98c769918b8458a20cb7bce6909f1472a03dbc7eecfae6e60def81eaf51e8818bf337dabbdfa37 -EBUILD openvpn-2.4.9.ebuild 4008 BLAKE2B 0c0eb93b706fd2eaf22989240f0105f82648b67eb1914cc1e97a5eb407f79650771e8611c678796c8058e16f5f2fab8bb5e7cd71dff7283495afc16bf667a8ab SHA512 83043fca1cf8cfa04dfbef0dabf6f5945d0ee2602931fab1a02209e826e17342e4484438e7b09fb377e1bda4c5c380579bf41513b70a7d0c78b475b586bf6328 +EBUILD openvpn-2.4.9.ebuild 4163 BLAKE2B 74c7a130da53fcfe4aad644534c87dc2f00a1321e55a91d671f20b6afe0d1676135663991f4110d44ae0feea3433a4841d0c5d251f81fc32decefd3b5288f32f SHA512 5382fdc7fe0e8f27311ea4cccba195969666acafc43979ce79268912d628d03d8f09ba5f912db75873d009e6bb869448b88efe452a80ed338c6f7972db8bda55 EBUILD openvpn-9999.ebuild 4148 BLAKE2B d2942eb2659d5cc1cef40143b6cd84e4e869031cc23ac419865db1286c7bf3ec7c66433ed2c3149d654206f74b3db14b3cea17a5d90332e9bfa5cbb6b172fdf5 SHA512 0807ceb96db862c33e42c7b2eb1224cfdb01d32e09048250bb69a05244af9835e805a9a87fb47d8a0a2422c12088ab515389b180d93286093f2089eab2709c8d MISC metadata.xml 998 BLAKE2B 800c147b67d26d0ae3856c3aebfd7bec9326aaa67ffcb16b57e00ad722b8154bcd4cd6daef741ebb0f12032ef986e0b3b5a4cf99014df1fbd54699a98ed13a0c SHA512 d7e07e98986611dc410a3ab1b0bf2bb3925fcc9f3388c9649ce7a01baa2fa076d7766b4e1b9749048aa1d1850cb9053e8822ce7a1870002805c176c6a60e6db8 diff --git a/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch b/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch deleted file mode 100644 index 13b976009524..000000000000 --- a/net-vpn/openvpn/files/openvpn-2.4.5-libressl-macro-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 626b4dd..2a8e87f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -948,6 +948,18 @@ if test "${with_crypto_library}" = "openssl"; then - EC_GROUP_order_bits - ] - ) -+ AC_CHECK_DECLS( -+ [ -+ SSL_CTX_get_min_proto_version, -+ SSL_CTX_get_max_proto_version, -+ SSL_CTX_set_min_proto_version, -+ SSL_CTX_set_max_proto_version, -+ ], -+ , -+ , -+ [[#include <openssl/ssl.h>]] -+ -+ ) - - CFLAGS="${saved_CFLAGS}" - LIBS="${saved_LIBS}" -diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h -index d375fab..340d452 100644 ---- a/src/openvpn/openssl_compat.h -+++ b/src/openvpn/openssl_compat.h -@@ -661,7 +661,7 @@ EC_GROUP_order_bits(const EC_GROUP *group) - #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT RSA_F_RSA_EAY_PRIVATE_ENCRYPT - #endif - --#ifndef SSL_CTX_get_min_proto_version -+#if !HAVE_DECL_SSL_CTX_GET_MIN_PROTO_VERSION - /** Return the min SSL protocol version currently enabled in the context. - * If no valid version >= TLS1.0 is found, return 0. */ - static inline int -@@ -684,7 +684,7 @@ SSL_CTX_get_min_proto_version(SSL_CTX *ctx) - } - #endif /* SSL_CTX_get_min_proto_version */ - --#ifndef SSL_CTX_get_max_proto_version -+#if !HAVE_DECL_SSL_CTX_GET_MAX_PROTO_VERSION - /** Return the max SSL protocol version currently enabled in the context. - * If no valid version >= TLS1.0 is found, return 0. */ - static inline int -@@ -707,7 +707,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx) - } - #endif /* SSL_CTX_get_max_proto_version */ - --#ifndef SSL_CTX_set_min_proto_version -+#if !HAVE_DECL_SSL_CTX_SET_MIN_PROTO_VERSION - /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) -@@ -736,7 +736,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min) - } - #endif /* SSL_CTX_set_min_proto_version */ - --#ifndef SSL_CTX_set_max_proto_version -+#if !HAVE_DECL_SSL_CTX_SET_MAX_PROTO_VERSION - /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */ - static inline int - SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max) diff --git a/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch b/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch deleted file mode 100644 index 210189cd4d4d..000000000000 --- a/net-vpn/openvpn/files/openvpn-2.4.7-libressl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4faf695e3c42a81131c2aae96c4a60228aa237a5 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <stefan.strogin@gmail.com> -Date: Sat, 23 Feb 2019 20:13:41 +0200 -Subject: [PATCH] Fix compilation with LibreSSL - -TLS 1.3 is not ready yet in LibreSSL. -Also SSL_get1_supported_ciphers() has been just added into master (not yet -released). - -Upstream-Status: Submitted [https://github.com/OpenVPN/openvpn/pull/123] -Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com> ---- - src/openvpn/ssl_openssl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c -index a78dae99..6a8fcef3 100644 ---- a/src/openvpn/ssl_openssl.c -+++ b/src/openvpn/ssl_openssl.c -@@ -459,7 +459,7 @@ tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers) - return; - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || defined(LIBRESSL_VERSION_NUMBER) - crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. " - "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.", - ciphers); -@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const char *cipher_list, - crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); - } - --#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)) - if (tls13) - { - SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION); -@@ -1867,7 +1867,7 @@ show_available_tls_ciphers_list(const char *cipher_list, - crypto_msg(M_FATAL, "Cannot create SSL object"); - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) - STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); - #else - STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl); --- -2.20.1 - diff --git a/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch b/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch deleted file mode 100644 index d339dcd558b1..000000000000 --- a/net-vpn/openvpn/files/openvpn-2.5-external-cmocka.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1e6891b1..c801789c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1312,6 +1312,21 @@ if test "${enable_async_push}" = "yes"; then - ) - fi - -+AC_ARG_ENABLE( -+ [tests], -+ AS_HELP_STRING([--enable-tests], [enable unit tests @<:@default=no@:>@]) -+) -+ -+if test "${enable_tests}" = "yes"; then -+ PKG_CHECK_MODULES([CMOCKA], [cmocka]) -+ TEST_CFLAGS="${CMOCKA_CFLAGS}" -+ TEST_LDFLAGS="${CMOCKA_LIBS}" -+ AC_SUBST([TEST_CFLAGS]) -+ AC_SUBST([TEST_LDFLAGS]) -+fi -+AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"]) -+AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) -+ - CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" - AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) - -@@ -1360,27 +1375,6 @@ AC_SUBST([VENDOR_SRC_ROOT]) - AC_SUBST([VENDOR_BUILD_ROOT]) - AC_SUBST([VENDOR_DIST_ROOT]) - --TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" --TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" -- --AC_SUBST([TEST_LDFLAGS]) --AC_SUBST([TEST_CFLAGS]) -- --# Check if cmake is available and cmocka git submodule is initialized, --# needed for unit testing --AC_CHECK_PROGS([CMAKE], [cmake]) --if test -n "${CMAKE}"; then -- if test -f "${srcdir}/vendor/cmocka/CMakeLists.txt"; then -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [true]) -- else -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) -- AC_MSG_RESULT([!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed.]) -- fi --else -- AC_MSG_RESULT([!! WARNING !! CMake is NOT available. Unit testing cannot be performed.]) -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) --fi -- - - AC_CONFIG_FILES([ - version.sh -diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am -index 31d37b89..4b7fb41d 100644 ---- a/tests/unit_tests/Makefile.am -+++ b/tests/unit_tests/Makefile.am -@@ -1,5 +1,5 @@ - AUTOMAKE_OPTIONS = foreign - --if CMOCKA_INITIALIZED -+if ENABLE_TESTS - SUBDIRS = example_test openvpn plugins - endif diff --git a/net-vpn/openvpn/files/openvpn-external-cmocka.patch b/net-vpn/openvpn/files/openvpn-external-cmocka.patch deleted file mode 100644 index eecc5076b4e8..000000000000 --- a/net-vpn/openvpn/files/openvpn-external-cmocka.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f4073d0..9afcc90 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1211,6 +1211,21 @@ if test "${enable_async_push}" = "yes"; then - ) - fi - -+AC_ARG_ENABLE( -+ [tests], -+ AS_HELP_STRING([--enable-tests], [enable unit tests @<:@default=no@:>@]) -+) -+ -+if test "${enable_tests}" = "yes"; then -+ PKG_CHECK_MODULES([CMOCKA], [cmocka]) -+ TEST_CFLAGS="${CMOCKA_CFLAGS}" -+ TEST_LDFLAGS="${CMOCKA_LIBS}" -+ AC_SUBST([TEST_CFLAGS]) -+ AC_SUBST([TEST_LDFLAGS]) -+fi -+AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"]) -+AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) -+ - CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" - AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) - -@@ -1257,28 +1272,6 @@ AC_SUBST([VENDOR_SRC_ROOT]) - AC_SUBST([VENDOR_BUILD_ROOT]) - AC_SUBST([VENDOR_DIST_ROOT]) - --TEST_LDFLAGS="-lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib" --TEST_CFLAGS="-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include" -- --AC_SUBST([TEST_LDFLAGS]) --AC_SUBST([TEST_CFLAGS]) -- --# Check if cmake is available and cmocka git submodule is initialized, --# needed for unit testing --AC_CHECK_PROGS([CMAKE], [cmake]) --if test -n "${CMAKE}"; then -- if test -f "${srcdir}/vendor/cmocka/CMakeLists.txt"; then -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [true]) -- else -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) -- AC_MSG_RESULT([!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed.]) -- fi --else -- AC_MSG_RESULT([!! WARNING !! CMake is NOT available. Unit testing cannot be performed.]) -- AM_CONDITIONAL([CMOCKA_INITIALIZED], [false]) --fi -- -- - AC_CONFIG_FILES([ - version.sh - Makefile -diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am -index 31d37b8..4b7fb41 100644 ---- a/tests/unit_tests/Makefile.am -+++ b/tests/unit_tests/Makefile.am -@@ -3 +3 @@ AUTOMAKE_OPTIONS = foreign --if CMOCKA_INITIALIZED -+if ENABLE_TESTS diff --git a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild deleted file mode 100644 index 3c4d220281f4..000000000000 --- a/net-vpn/openvpn/openvpn-2.4.6-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" - -IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" - -RESTRICT="!test? ( test )" -REQUIRED_USE="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? ( sys-libs/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() { - SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ - TMPFILES_DIR="/usr/lib/tmpfiles.d" \ - IFCONFIG=/bin/ifconfig \ - ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(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-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild deleted file mode 100644 index eb359996e004..000000000000 --- a/net-vpn/openvpn/openvpn-2.4.6.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2020 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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" - -IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" - -RESTRICT="!test? ( test )" -REQUIRED_USE="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? ( sys-libs/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() { - SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ - TMPFILES_DIR="/usr/lib/tmpfiles.d" \ - IFCONFIG=/bin/ifconfig \ - ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(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-2.4.7-r1.ebuild b/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild deleted file mode 100644 index 845ec4ad7b0f..000000000000 --- a/net-vpn/openvpn/openvpn-2.4.7-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2020 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://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" - -IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" - -RESTRICT="!test? ( test )" -REQUIRED_USE="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? ( sys-libs/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" - "${FILESDIR}/${P}-libressl.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() { - SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ - TMPFILES_DIR="/usr/lib/tmpfiles.d" \ - IFCONFIG=/bin/ifconfig \ - ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(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-2.4.8.ebuild b/net-vpn/openvpn/openvpn-2.4.8.ebuild deleted file mode 100644 index 0310e511f604..000000000000 --- a/net-vpn/openvpn/openvpn-2.4.8.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd linux-info - -DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" -SRC_URI="https://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://openvpn.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" - -IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" -IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" - -RESTRICT="!test? ( test )" -REQUIRED_USE="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? ( sys-libs/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} - acct-group/openvpn - acct-user/openvpn - selinux? ( sec-policy/selinux-openvpn ) -" - -CONFIG_CHECK="~TUN" - -pkg_setup() { - linux-info_pkg_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ - TMPFILES_DIR="/usr/lib/tmpfiles.d" \ - IFCONFIG=/bin/ifconfig \ - ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(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 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 - docinto /usr/share/doc/${PF}/examples - dodoc -r sample contrib - fi -} - -pkg_postinst() { - 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-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild index 684a4871fe82..9e3998296da6 100644 --- a/net-vpn/openvpn/openvpn-2.4.9.ebuild +++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://openvpn.net/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" @@ -61,22 +61,34 @@ src_prepare() { } src_configure() { + local myeconfargs=( + $(use_enable inotify async-push) + $(use_enable ssl crypto) + ) + if use ssl; then + myeconfargs+=( + $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) + ) + if use libressl || ! use mbedtls; then + myeconfargs+=( + $(use_enable pkcs11) + ) + fi + fi + myeconfargs+=( + $(use_enable lz4) + $(use_enable lzo) + $(use_enable plugins) + $(use_enable iproute2) + $(use_enable pam plugin-auth-pam) + $(use_enable down-root plugin-down-root) + $(use_enable systemd) + ) SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IFCONFIG=/bin/ifconfig \ ROUTE=/bin/route \ - econf \ - $(use_enable inotify async-push) \ - $(use_enable ssl crypto) \ - $(use_with ssl crypto-library $(usex mbedtls mbedtls openssl)) \ - $(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 systemd) + econf "${myeconfargs[@]}" } src_test() { |