Revert "T3641: nftables: use upstream package"

This reverts commit cd9cd920cdabd7cd7c5bd0e6108fd1c0e78c3cb9.

2 files changed, 77 insertions, 0 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f1fac187..9aa71e96 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -471,6 +471,32 @@ RUN apt-get update && apt-get install -y \
       libtool \
       pkg-config
 
+# Packages needed for nftables
+RUN apt-get update && apt-get install -y \
+      asciidoc-base \
+      automake \
+      bison \
+      debhelper-compat \
+      dh-python \
+      docbook-xsl \
+      flex \
+      libgmp-dev \
+      libjansson-dev \
+      libmnl-dev \
+      libreadline-dev \
+      libtool \
+      libxtables-dev \
+      python3-all \
+      python3-setuptools \
+      xsltproc
+
+# Packages needed for libnetfilter-conntrack
+RUN apt-get update && apt-get install -y \
+      debhelper-compat \
+      libmnl-dev \
+      libnfnetlink-dev \
+      libtool
+
 # Packages needed for wide-dhcpv6
 RUN apt-get update && apt-get install -y \
       bison \
diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile
new file mode 100644
index 00000000..e5579813
--- /dev/null
+++ b/packages/netfilter/Jenkinsfile
@@ -0,0 +1,51 @@
+// Copyright (C) 2020-2021 VyOS maintainers and contributors
+//
+// This program is free software; you can redistribute it and/or modify
+// in order to easy exprort images built to "external" world
+// it under the terms of the GNU General Public License version 2 or later as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+@NonCPS
+
+// Using a version specifier library, use 'current' branch. The underscore (_)
+// is not a typo! You need this underscore if the line immediately after the
+// @Library annotation is not an import statement!
+@Library('vyos-build@current')_
+
+def pkgList = [
+    // libnftnl
+    ['name': 'pkg-libnftnl',
+     'scmCommit': 'debian/1.1.7-1',
+     'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnftnl.git',
+     'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'],
+
+    // nftables
+    ['name': 'pkg-nftables',
+     'scmCommit': 'debian/0.9.6-1',
+     'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-nftables.git',
+     'buildCmd': '''sudo dpkg -i ../libnftnl*.deb;
+                    sed -i "s/debhelper-compat.*/debhelper-compat (= 12),/" debian/control;
+                    dpkg-buildpackage -uc -us -tc -b'''],
+
+    // libnetfilter-conntrack
+    ['name': 'pkg-libnetfilter-conntrack',
+     'scmCommit': 'debian/1.0.8-1',
+     'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnetfilter-conntrack.git',
+     'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'],
+
+    // conntrack-tools
+    ['name': 'pkg-conntrack-tools',
+     'scmCommit': 'debian/1%1.4.6-1',
+     'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-conntrack-tools.git',
+     'buildCmd': '''sudo dpkg -i ../libnetfilter*.deb && dpkg-buildpackage -uc -us -tc -b'''],
+]
+
+// Start package build using library function from https://github.com/vyos/vyos-build
+buildPackage('Netfilter', pkgList, null, true)