Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f6b489b3ec602b040ec43738c3df118857bb42f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f6b489b3ec602b040ec43738c3df118857bb42f)
  • Date: Wed, 6 Jan 2021 03:20:54 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/iptables/DEPENDS | 6 +++++-
net/iptables/HISTORY | 3 +++
net/libnftnl/DETAILS | 2 +-
net/libnftnl/HISTORY | 3 +++
net/nftables/DEPENDS | 7 +++++--
net/nftables/DETAILS | 2 +-
net/nftables/HISTORY | 6 +++++-
net/nftables/PRE_BUILD | 14 +++++++-------
8 files changed, 30 insertions(+), 13 deletions(-)

New commits:
commit 8f6b489b3ec602b040ec43738c3df118857bb42f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iptables: Add check for libnftnl >= 1.1.8

It fails to compile with 1.1.5.

commit b406f125ea03041cd2f2970f9cea9310f1d4cdfd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nftables 0.9.7

commit b214653e0e656ef059f2b20cd52f2f27bc5b71e1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libntfnl 1.1.8

commit 3410dcd9ca357363be05e0cd49015a68c79b4108
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

nftables: Make kernel check non-fatal

diff --git a/net/iptables/DEPENDS b/net/iptables/DEPENDS
index 832a490..b48bd0b 100755
--- a/net/iptables/DEPENDS
+++ b/net/iptables/DEPENDS
@@ -1,2 +1,6 @@
+. "$GRIMOIRE"/FUNCTIONS &&
depends libmnl &&
-optional_depends libnftnl '' '--disable-nftables' 'nftabels support'
+optional_depends libnftnl '' '--disable-nftables' 'nftabels support' &&
+if is_depends_enabled "$SPELL" libnftnl; then
+ vdepends <<< 'libnftnl >= 1.1.8'
+fi
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 5c61533..1b3309d 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,6 @@
+2021-01-06 Ismael Luceno <ismael AT iodev.co.uk>
+ * DEPENDS: added check for libnftnl >= 1.1.8
+
2020-10-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.8.6

diff --git a/net/libnftnl/DETAILS b/net/libnftnl/DETAILS
index d0a6a2b..5a37496 100755
--- a/net/libnftnl/DETAILS
+++ b/net/libnftnl/DETAILS
@@ -1,5 +1,5 @@
SPELL=libnftnl
- VERSION=1.1.5
+ VERSION=1.1.8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=https://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
diff --git a/net/libnftnl/HISTORY b/net/libnftnl/HISTORY
index f57d613..22e3cc8 100644
--- a/net/libnftnl/HISTORY
+++ b/net/libnftnl/HISTORY
@@ -1,3 +1,6 @@
+2021-01-06 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.8
+
2020-01-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.1.5

diff --git a/net/nftables/DEPENDS b/net/nftables/DEPENDS
index 4e3cb28..de7d596 100755
--- a/net/nftables/DEPENDS
+++ b/net/nftables/DEPENDS
@@ -1,2 +1,5 @@
-depends libmnl &&
-depends libnftnl
+. "$GRIMOIRE"/FUNCTIONS &&
+vdepends <<EOF
+ libmnl
+ libnftnl >= 1.1.8
+EOF
diff --git a/net/nftables/DETAILS b/net/nftables/DETAILS
index 008b79f..60873a4 100755
--- a/net/nftables/DETAILS
+++ b/net/nftables/DETAILS
@@ -1,5 +1,5 @@
SPELL=nftables
- VERSION=0.4
+ VERSION=0.9.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
diff --git a/net/nftables/HISTORY b/net/nftables/HISTORY
index c66f725..ad52ca8 100644
--- a/net/nftables/HISTORY
+++ b/net/nftables/HISTORY
@@ -1,3 +1,7 @@
+2021-01-06 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: made kernel check non-fatal
+ * DEPENDS: added version check for libnftnl
+ * DETAILS: updated spell to 0.9.7
+
2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
* Created
-
diff --git a/net/nftables/PRE_BUILD b/net/nftables/PRE_BUILD
index da7fbce..5a7c930 100755
--- a/net/nftables/PRE_BUILD
+++ b/net/nftables/PRE_BUILD
@@ -1,8 +1,8 @@
-if [[ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "y" &&
- "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "m" ]]; then
- message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
- "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}" &&
- return 1
-fi &&
-
+case "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" in
+ y|m) ;;
+ *)
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}"
+ ;;
+esac &&
default_pre_build



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f6b489b3ec602b040ec43738c3df118857bb42f), Ismael Luceno, 01/05/2021

Archive powered by MHonArc 2.6.24.

Top of Page