component/dbus component/firewalld: version up

component/dbus/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 [dbus]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.11.6.tar.gz
-md5sum = fdb03ad2f2861a171fe7d0caad3b415f 
+url = https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz
+md5sum = dfe8a71f412e0b53be26ed4fbfdc91c4
 location = @@LOCATION@@
 configure-options =
   --disable-static
@@ -21,14 +21,14 @@ make-targets = install && ${:location}/bin/dbus-uuidgen > ${:location}/var/lib/d
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${libexpat:location}/include
-  LDFLAGS=-L${libexpat:location}/lib
+  EXPAT_CFLAGS=-I${libexpat:location}/include
+  EXPAT_LIBS=-L${libexpat:location}/lib -lexpat
 
 [dbus-glib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.104.tar.gz
-md5sum = 5497d2070709cf796f1878c75a72a039
+url = https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
+md5sum = d7cebf1d69445cbd28b4983392145192
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/firewalld/buildout.cfg

@@ -10,22 +10,34 @@ extends =
   ../python-slip/buildout.cfg
   ../dbus/buildout.cfg
   ../flex/buildout.cfg
+  ../nftables/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
-url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz
-md5sum = b8f81b536ede502721f69300d374447b
+url = https://github.com/firewalld/firewalld/releases/download/v0.8.6/firewalld-0.8.6.tar.gz
+md5sum = a120286a2c2bc12ece24d719ef2879b5
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
+location = @@LOCATION@@
+sbin-dir = sbin-orig
 pre-configure =
   sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
   ./autogen.sh
+configure-options =
+  --sbindir=${:location}/${:sbin-dir}
+  --disable-docs
+  --with-iptables=${iptables:location}/sbin/iptables-legacy
+  --with-iptables-restore=${iptables:location}/sbin/iptables-legacy-restore
+  --with-ip6tables=${iptables:location}/sbin/ip6tables-legacy
+  --with-ip6tables-restore=${iptables:location}/sbin/ip6tables-legacy-restore
+  --with-ebtables=${iptables:location}/sbin/ebtables-legacy
+  --with-ebtables-restore=${iptables:location}/sbin/ebtables-legacy-restore
+  --with-ipset=/bin/false
 
 environment =
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   M4=${m4:location}/bin/m4
   ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
   FIREWALLD_DEVEL_ENV=${buildout:parts-directory}/${:_buildout_section_name_}/src
@@ -33,9 +45,9 @@ environment =
 
 [dbus-python]
 recipe = slapos.recipe.cmmi
-version = 1.2.4
+version = 1.2.16
 url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
-md5sum = 7372a588c83a7232b4e08159bfd48fe5 
+md5sum = 51a45c973d82bedff033a4b57d69d5d8
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
 environment =
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
@@ -83,8 +95,6 @@ environment =
   FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-#  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
-#  GLIB_LIBS=-L${glib:location}/lib -lgobject-2.0 -lgthread-2.0 -pthread -lrt -lglib-2.0
   GIO_LIBS=-L${glib:location}/lib -lgio-2.0
   GI_CFLAGS=-I${gobject-introspection:location}/include/gobject-introspection-1.0
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
@@ -101,17 +111,29 @@ md5sum = 893752ba2e93a1e96334dfee19f884ad
 recipe = plone.recipe.command
 python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
 command =
-  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/bin/firewall-cmd
-  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/sbin/firewalld
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-applet
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-cmd
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-config
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-offline-cmd
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/${firewalld:sbin-dir}/firewalld
+
+  sed -i 's#python2.7 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:location}/etc/firewalld/lockdown-whitelist.xml
+
   sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:location}/etc/firewalld/firewalld.conf
+
+  sed -i 's#/etc/firewalld#${firewalld:location}/etc/firewalld#'     ${firewalld:python-egg}/firewall/config/__init__.py
   sed -i 's#/usr/lib/firewalld#${firewalld:location}/lib/firewalld#' ${firewalld:python-egg}/firewall/config/__init__.py
   sed -i 's#/usr/share/#${firewalld:location}/share#'                ${firewalld:python-egg}/firewall/config/__init__.py
+
   sed -i "s#import sys#import sys, os\n\nos.environ['GI_TYPELIB_PATH'] = '${gobject-introspection:location}/lib/girepository-1.0/'#" ${:python}
   sed -i 's#<syslog/>#<!-- no syslog -->#' ${dbus:location}/etc/dbus-1/system.conf
   sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/share/dbus-1/system.conf
   cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:location}/etc/firewalld/zones/
-  cp -f ${firewalld:location}/etc/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
-  mkdir -p ${buildout:directory}/sbin
+  cp -f ${firewalld:location}/share/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
+  mkdir -p ${firewalld:location}/sbin
+  echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
+  chmod a+x ${firewalld:location}/sbin/firewalld
+
 update-command = ${:command}
 stop-on-error = true
 
@@ -127,3 +149,4 @@ extra-paths =
   ${dbus-python:python-egg}
   ${firewalld:python-egg}
   ${pygobject3:python-egg}
+  ${nftables:python-egg}

component/nftables/buildout.cfg

+[buildout]
+parts =
+  nftables
+
+extends =
+  ../defaults.cfg
+  ../gmp/buildout.cfg
+
+
+[libnml]
+recipe = slapos.recipe.cmmi
+url = http://www.netfilter.org/projects/libmnl/files/libmnl-1.0.4.tar.bz2
+md5sum = be9b4b5328c6da1bda565ac5dffadb2d
+
+[libnftnl]
+recipe = slapos.recipe.cmmi
+url = http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.1.9.tar.bz2
+md5sum = e03cefd53f4b076d959abe36de5c38f8
+environment =
+  PKG_CONFIG_PATH=${libnml:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[jansson]
+recipe = slapos.recipe.cmmi
+url = https://digip.org/jansson/releases/jansson-2.13.1.tar.gz
+md5sum = 570af45b8203e95876d71fecd56cee20
+
+[iptables]
+recipe = slapos.recipe.cmmi
+url = http://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2
+md5sum = 602ba7e937c72fbb7b1c2b71c3b0004b
+location = @@LOCATION@@
+environment =
+  PKG_CONFIG_PATH=${libnml:location}/lib/pkgconfig:${libnftnl:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${:location}/lib
+
+[nftables]
+recipe = slapos.recipe.cmmi
+url = http://www.netfilter.org/projects/nftables/files/nftables-0.9.8.tar.bz2
+md5sum = 77bf0bd43e65e92212fc73139a2e47fc
+python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
+environment =
+  PKG_CONFIG_PATH=${libnml:location}/lib/pkgconfig:${libnftnl:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS = -L${gmp:location}/lib -L${jansson:location}/lib
+  CFLAGS = -I${gmp:location}/include -I${jansson:location}/include
+configure-options =
+  --enable-python
+  --with-json
+  --without-cli
+

component/slapos/obs.cfg

@@ -183,3 +183,9 @@ configure-command =
     -Dusethreads
 environment +=
   DESTDIR=${buildout:destdir}
+
+[iptables]
+configure-options +=
+  --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
+environment +=
+  DESTDIR=${buildout:destdir}

stack/slapos.cfg

@@ -206,7 +206,7 @@ slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.46
-slapos.recipe.cmmi = 0.16
+slapos.recipe.cmmi = 0.17
 slapos.recipe.template = 4.5
 slapos.toolbox = 0.117
 stevedore = 1.21.0