projects / dnsmasq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2561f9f)
Build Debian binaries with NFTset support.
authorSimon Kelley <simon@thekelleys.org.uk>
Mon, 27 Sep 2021 22:14:36 +0000 (23:14 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Mon, 27 Sep 2021 22:16:18 +0000 (23:16 +0100)
debian/changelog patch | blob | history
debian/control patch | blob | history
debian/readme patch | blob | history
debian/rules patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index a080f25..53e10cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dnsmasq (2.87-1) unstable; urgency=low
 
    * New upstream.
+   * Include new NFTset support in the build.          
 
  -- Simon Kelley <simon@thekelleys.org.uk>  Wed, 08 Sep 2021 23:11:25 +0000
 
diff --git a/debian/control b/debian/control
index 0407eb3..563393a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Build-depends: gettext, libnetfilter-conntrack-dev [linux-any],
                libidn2-dev, libdbus-1-dev (>=0.61), libgmp-dev, 
                nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any],
               liblua5.2-dev, dh-runit, debhelper-compat (= 10),
-               pkg-config
+               pkg-config, libnftables-dev
 Maintainer: Simon Kelley <simon@thekelleys.org.uk>
 Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html
 Vcs-Git: http://thekelleys.org.uk/git/dnsmasq.git
diff --git a/debian/readme b/debian/readme
index 768662e..6120ff7 100644 (file)
--- a/debian/readme
+++ b/debian/readme
@@ -60,6 +60,7 @@ Notes on configuring dnsmasq as packaged for Debian.
       nodbus      : omit DBus support.
       noconntrack : omit connection tracking support. 
       noipset     : omit IPset support.
+      nonftset    : omit nftset support.
       nortc       : compile alternate mode suitable for systems without an RTC.
       noi18n      : omit translations and internationalisation support.
       noidn       : omit international domain name support, must be
diff --git a/debian/rules b/debian/rules
index 70d4ea8..2354ea9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,10 @@ ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS)))
        DEB_COPTS += -DHAVE_LIBIDN2
 endif
 
+ifeq (,$(filter nonftset, $(DEB_BUILD_OPTIONS)))
+       DEB_COPTS += -DHAVE_NFTSET
+endif
+
 ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_HOST_ARCH_OS),linux)
      DEB_COPTS += -DHAVE_CONNTRACK
Dnsmasq DNS proxy and DHCP server.