diff options
Diffstat (limited to 'net-firewall/nftlb')
-rw-r--r-- | net-firewall/nftlb/Manifest | 10 | ||||
-rw-r--r-- | net-firewall/nftlb/files/nftlb-0.6-musl.patch | 72 | ||||
-rw-r--r-- | net-firewall/nftlb/files/nftlb-0.6-tests.patch | 47 | ||||
-rw-r--r-- | net-firewall/nftlb/nftlb-1.0.4.ebuild (renamed from net-firewall/nftlb/nftlb-1.0.ebuild) | 0 | ||||
-rw-r--r-- | net-firewall/nftlb/nftlb-1.0.6.ebuild (renamed from net-firewall/nftlb/nftlb-0.6.ebuild) | 17 |
5 files changed, 15 insertions, 131 deletions
diff --git a/net-firewall/nftlb/Manifest b/net-firewall/nftlb/Manifest index 197abc435bb8..e0b2b835ec74 100644 --- a/net-firewall/nftlb/Manifest +++ b/net-firewall/nftlb/Manifest @@ -1,9 +1,7 @@ -AUX nftlb-0.6-musl.patch 1887 BLAKE2B fdf12a0f3113e1fff17096195150e387ec44342d67b80d63fff525e8b28222599276bb607b7f21b44953dbeb0f00861b6477b01af24bc990be046b45a169ced5 SHA512 48781ce88c94b7d184764d9b2fb70410310215fe165fa89965293633bc039044e5d34eb10fe382f9d394f36e5960a91efb12c9e7fde24c057ae6ece0f3d75bb9 -AUX nftlb-0.6-tests.patch 1037 BLAKE2B 1b26671d49035bb57bfd5f730d40d756017234413f427a94367d571a47a4959f09389d55b95e46e0512003e0eb3022470feadeee00632d64cf6cfa94097e89b4 SHA512 9c57db285efb5a5e12d1099e4f44de17e70eb137e7fa05f9c678cadf43c7eecaab76fdb7a7815e2a22ccb9fb1d3e5c524496a9a87ff10cb64f4ff50c281889ce AUX nftlb-1.0-musl.patch 1899 BLAKE2B 6c2c51ba355473754ac1aa59e423b367c9eba8c0aef6cc0756533f08e22aa423e397a2216449b25360d625d62ef64173701e0cec40be6bb342094ad81a2ca463 SHA512 e73efbaffa03c9bf762b9335561ae3f905434cd15351e843063c8aeac5cd80db6bbb3916fe0eca04a7699c3bebfb8910e52a2f1f07b068ee1c9951d645bf3e28 AUX nftlb-1.0-tests.patch 1025 BLAKE2B 1c1a3b363d5896799dbc9c789684bcb407cafeee6b7d7d061f28142a718a77b9a7fc11a59ff40f178047d37a8452c66cab904661d36874efc343677ec4a043a4 SHA512 a013fd84528620e61b93b11218edb5fbf4096d0367d802f697048f544751a0a4c9d64ecfa5198b28d8dc732b195db7d7ed5028423aa26c855f116d11665f096b -DIST nftlb-0.6.tar.gz 121216 BLAKE2B 98b69c35070eb733a218ac1b1aaa7816de1e4f149c8447fee298b4cf50c57610c816fb178d4115e1e7af5cea0f5b20df36eb5b79655e0d7c69ff30e363985104 SHA512 95b879cfc187fe94cc6876f4af3fe77795c1e0228850cfb38b95206685d9065076b6905d365da7ec5f92773cf8f72f6e441d9140d9b10b02eaf9b6c862c31006 -DIST nftlb-1.0.tar.gz 195057 BLAKE2B b8237b7ba6f6f61dde726d53b63f2488bf38646984b252317ba0f47727ae91e5f4d58c32c0f0d609b134124efd29fdce2b9c10a981a3892220dac78c84946f48 SHA512 f93db34e4372d8f16e99650f3ade62908ce65722fadd521c6d698ab81b24502f6d82e1945b06b166876ebeb39e1907c97a40776ddf985b035b883e93f62e8766 -EBUILD nftlb-0.6.ebuild 1021 BLAKE2B 28e978c5eaa237691d102184761476ef31fab9a0c986825ae87df87599121774c2d1a95963695b52ce7a130d48c9fbf096339b166b3d57998a4a4e95d6414f25 SHA512 fb3e447387fb311569e56075b04e4a6352ee38eb9a5d8d9b2a2690404cb47cf5ff477002d2a715c047728bc203f9fe08af202e40eb5948809fb292a099d20000 -EBUILD nftlb-1.0.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d +DIST nftlb-1.0.4.tar.gz 199236 BLAKE2B 457fc617af75513330b7c6730a3ee67061d5df4d1faf74a0d57ffaa7ef003e882136a9e0300fe61f1f0235ef752a5d695cfdf9a5e1cecf9b57553d4c9151bfd6 SHA512 89b0dba85029236f55289818c7b7ec6fe6e2e1f33003fc7fb9fa3ae763b96395827ba9d8134aa4ac80f8be0da6e17be132e9293b46c9264d9c49062e4db6688a +DIST nftlb-1.0.6.tar.gz 201767 BLAKE2B d81607ad88c88f3cf97124bf2db6ad8b210fe8f60d72661094dfbbbfc66c4b911985944f08b5483ceec420850b18cb0fe3a8fd6fa7fb76fa4da456870367cecd SHA512 63fa1e9b5fbd18e5c852adb2415dcd6e24bad899fe647641ea6e8dbca4b7c2808c939bdf5f7700a586304f3126088bb74a0fce79c72e8bc92df1e7a9c111feca +EBUILD nftlb-1.0.4.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d +EBUILD nftlb-1.0.6.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611 diff --git a/net-firewall/nftlb/files/nftlb-0.6-musl.patch b/net-firewall/nftlb/files/nftlb-0.6-musl.patch deleted file mode 100644 index 99990726f05e..000000000000 --- a/net-firewall/nftlb/files/nftlb-0.6-musl.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 4e7b0a9..2396857 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,6 +2,7 @@ AC_INIT([nftlb], [0.6], [netfilter-devel@vger.kernel.org]) - - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) -+AC_CONFIG_HEADERS([config.h]) - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects - tar-pax no-dist-gzip dist-bzip2 1.6]) - -@@ -25,5 +26,7 @@ AC_CHECK_HEADER([ev.h], [EVENTINC="-include ev.h"], - [EVENTINC="-include libev/ev.h"], - [AC_MSG_ERROR([ev.h not found])])]) - -+AC_CHECK_HEADERS([execinfo.h]) -+ - AC_CONFIG_FILES([Makefile src/Makefile]) - AC_OUTPUT -diff --git a/src/main.c b/src/main.c -index b6b5ec4..b2a080f 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -18,6 +18,7 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -+#include "config.h" - - #include <stdio.h> - #include <stdlib.h> -@@ -26,7 +27,10 @@ - #include <syslog.h> - #include <errno.h> - #include <unistd.h> -+ -+#ifdef HAVE_EXECINFO_H - #include <execinfo.h> -+#endif /* HAVE_EXECINFO_H */ - - #include "config.h" - #include "objects.h" -@@ -85,6 +89,7 @@ static void nftlb_sighandler(int signo) - exit(EXIT_SUCCESS); - } - -+#ifdef HAVE_EXECINFO_H - static void nftlb_trace() { - void *buffer[255]; - char **str; -@@ -106,6 +111,7 @@ static void nftlb_trace() { - - exit(EXIT_FAILURE); - } -+#endif /* HAVE_EXECINFO_H */ - - int main(int argc, char *argv[]) - { -@@ -157,8 +163,12 @@ int main(int argc, char *argv[]) - - if (signal(SIGINT, nftlb_sighandler) == SIG_ERR || - signal(SIGTERM, nftlb_sighandler) == SIG_ERR || -+#ifdef HAVE_EXECINFO_H - signal(SIGPIPE, SIG_IGN) == SIG_ERR || - signal(SIGSEGV, nftlb_trace) == SIG_ERR) { -+#else -+ signal(SIGPIPE, SIG_IGN) == SIG_ERR) { -+#endif /* HAVE_EXECINFO_H */ - fprintf(stderr, "Error assigning signals\n"); - syslog(LOG_ERR, "Error assigning signals"); - return EXIT_FAILURE; diff --git a/net-firewall/nftlb/files/nftlb-0.6-tests.patch b/net-firewall/nftlb/files/nftlb-0.6-tests.patch deleted file mode 100644 index 05baa7ee03a3..000000000000 --- a/net-firewall/nftlb/files/nftlb-0.6-tests.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/tests/exec_tests.sh b/tests/exec_tests.sh -index d96eaa3..b7f812d 100755 ---- a/tests/exec_tests.sh -+++ b/tests/exec_tests.sh -@@ -33,6 +33,8 @@ fi - - echo "-- Executing configuration tests" - -+retval=0 -+ - for test in `ls -d ${TESTS}`; do - if [[ ! ${test} =~ ^..._ ]]; then - continue; -@@ -55,14 +57,16 @@ for test in `ls -d ${TESTS}`; do - - if [ $statusexec -ne 0 ]; then - echo -e "\e[31mNFT EXEC ERROR\e[0m" -+ retval=1 - continue; - fi - - #~ nftfile=`echo ${file} | awk -F'.' '{ print $1 }'` -- $NFTBIN list ruleset > ${reportfile} -+ $NFTBIN list ruleset > ${reportfile} || retval=1 - - if [ ! -f ${outputfile} ]; then - echo "Dump file doesn't exist" -+ retval=1 - continue; - fi - -@@ -74,6 +78,7 @@ for test in `ls -d ${TESTS}`; do - rm -f ${reportfile} - else - echo -e "\e[31mNFT DUMP ERROR\e[0m" -+ retval=1 - fi - done - -@@ -83,4 +88,7 @@ fi - - if [ "`grep 'nft command error' /var/log/syslog`" != "" ]; then - echo -e "\e[33m* command errors found, please check syslog\e[0m" -+ retval=1 - fi -+ -+exit ${retval} diff --git a/net-firewall/nftlb/nftlb-1.0.ebuild b/net-firewall/nftlb/nftlb-1.0.4.ebuild index f1e9170bcbc4..f1e9170bcbc4 100644 --- a/net-firewall/nftlb/nftlb-1.0.ebuild +++ b/net-firewall/nftlb/nftlb-1.0.4.ebuild diff --git a/net-firewall/nftlb/nftlb-0.6.ebuild b/net-firewall/nftlb/nftlb-1.0.6.ebuild index 99822681780a..f1e9170bcbc4 100644 --- a/net-firewall/nftlb/nftlb-0.6.ebuild +++ b/net-firewall/nftlb/nftlb-1.0.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info autotools @@ -24,13 +24,18 @@ RDEPEND="${DEPEND}" RESTRICT="test" PATCHES=( - "${FILESDIR}/nftlb-0.6-tests.patch" - "${FILESDIR}/nftlb-0.6-musl.patch" + "${FILESDIR}/nftlb-1.0-tests.patch" + "${FILESDIR}/nftlb-1.0-musl.patch" ) pkg_setup() { - local CONFIG_CHECK="~NF_TABLES ~NFT_NUMGEN - ~NFT_HASH ~NF_NAT ~IP_NF_NAT" + local CONFIG_CHECK=" + ~NF_TABLES + ~NFT_NUMGEN + ~NFT_HASH + ~NF_NAT + ~IP_NF_NAT + " linux-info_pkg_setup |