diff options
-rw-r--r-- | network/firewalld/firewalld.SlackBuild | 8 | ||||
-rw-r--r-- | network/firewalld/firewalld.info | 6 | ||||
-rw-r--r-- | network/firewalld/init.patch | 2 | ||||
-rw-r--r-- | network/firewalld/rc.FireWallD | 56 |
4 files changed, 10 insertions, 62 deletions
diff --git a/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild index 7d5787c708974..ea3dde2fa3836 100644 --- a/network/firewalld/firewalld.SlackBuild +++ b/network/firewalld/firewalld.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=firewalld -VERSION=${VERSION:-0.9.3} +VERSION=${VERSION:-1.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,7 @@ patch -p1 < $CWD/init.patch PYTHON="/usr/bin/python3" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +./autogen.sh ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -104,6 +105,9 @@ make install DESTDIR=$PKG # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# We don't need systemd here. +rm -rf $PKG/usr/lib/systemd + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -127,7 +131,7 @@ rm -rf $PKG/etc/rc.d/init.d cat $CWD/rc.firewalld > $PKG/etc/rc.d/rc.firewalld.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README doc/html $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md doc/html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/firewalld/firewalld.info b/network/firewalld/firewalld.info index 9d8f3de71d477..ab19575730e98 100644 --- a/network/firewalld/firewalld.info +++ b/network/firewalld/firewalld.info @@ -1,8 +1,8 @@ PRGNAM="firewalld" -VERSION="0.9.3" +VERSION="1.3.0" HOMEPAGE="https://github.com/firewalld/firewalld/" -DOWNLOAD="https://github.com/firewalld/firewalld/releases/download/v0.9.3/firewalld-0.9.3.tar.gz" -MD5SUM="2eb0577b6e96376c2a7ed4c07eb82434" +DOWNLOAD="https://github.com/firewalld/firewalld/archive/refs/tags/v1.3.0.tar.gz#/firewalld-1.3.0.tar.gz" +MD5SUM="bf75948ab628a86e1ab61ebfb8913bc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-slip decorator" diff --git a/network/firewalld/init.patch b/network/firewalld/init.patch index 0d03f9c45e95a..a775133fabb0b 100644 --- a/network/firewalld/init.patch +++ b/network/firewalld/init.patch @@ -1,4 +1,3 @@ -diff -Nur firewalld-0.8.6.orig/config/firewalld.init firewalld-0.8.6/config/firewalld.init --- firewalld-0.8.6.orig/config/firewalld.init 2020-12-15 12:57:05.000000000 -0600 +++ firewalld-0.8.6/config/firewalld.init 2021-05-02 20:44:35.229976749 -0500 @@ -29,7 +29,7 @@ @@ -10,3 +9,4 @@ diff -Nur firewalld-0.8.6.orig/config/firewalld.init firewalld-0.8.6/config/fire lockfile=/var/lock/subsys/$prog + diff --git a/network/firewalld/rc.FireWallD b/network/firewalld/rc.FireWallD deleted file mode 100644 index aa0d91b3dcbf4..0000000000000 --- a/network/firewalld/rc.FireWallD +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Start/stop/restart firewalld. - -# Start firewalld: -firewalld_start() { - [ -r /etc/default/firewalld ] && source /etc/default/firewalld - echo -n "Starting FireWallD daemon: /usr/sbin/firewalld " - /usr/sbin/firewalld $FIREWALLD_ARGS - echo -} - -# Stop firewalld: -firewalld_stop() { - echo -n "Stopping FireWallD daemon..." - if [ -r /var/run/firewalld.pid ]; then - kill -HUP $(cat /var/run/firewalld.pid) - rm -f /var/run/firewalld.pid - else - killall -HUP -q firewalld - fi - echo -} - -# Restart firewalld: -firewalld_restart() { - firewalld_stop - sleep 1 - firewalld_start -} - -# Check if firewalld is running -firewalld_status() { - if [ -e /var/run/firewalld.pid ]; then - echo "firewalld is running as pid $(cat /var/run/firewalld.pid)." - else - echo "firewalld is stopped." - exit 1 - fi -} - -case "$1" in -'start') - firewalld_start - ;; -'stop') - firewalld_stop - ;; -'restart') - firewalld_restart - ;; -'status') - firewalld_status - ;; -*) - echo "usage $0 start|stop|restart|status" -esac |