diff options
Diffstat (limited to 'network')
| -rw-r--r-- | network/firewalld/doinst.sh | 7 | ||||
| -rw-r--r-- | network/firewalld/firewalld.SlackBuild | 53 | ||||
| -rw-r--r-- | network/firewalld/firewalld.info | 8 | ||||
| -rw-r--r-- | network/firewalld/init.patch | 5 |
4 files changed, 34 insertions, 39 deletions
diff --git a/network/firewalld/doinst.sh b/network/firewalld/doinst.sh index 592ffcdaef976..799720f36c5dc 100644 --- a/network/firewalld/doinst.sh +++ b/network/firewalld/doinst.sh @@ -22,12 +22,13 @@ preserve_perms() { config $NEW } -config etc/dbus-1/system.d/FirewallD.conf.new +config etc/default/firewalld.new config etc/firewall/applet.conf.new config etc/firewalld/firewalld.conf.new -config etc/default/firewalld.new +config etc/firewalld/lockdown-whitelist.xml.new +config etc/logrotate.d/firewalld.new + preserve_perms etc/rc.d/rc.firewalld.new -preserve_perms etc/rc.d/init.d/firewalld.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild index b244425797df4..9a9a651ed544a 100644 --- a/network/firewalld/firewalld.SlackBuild +++ b/network/firewalld/firewalld.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for firewalld -# Copyright 2017 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2017,2021 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,18 +21,10 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# ChangeLog -# -# Thu Mar 19 12:19:48 UTC 2020 -# -# * Added patch to change the source file from /etc/sysconfig to /etc/default -# in the provided /etc/init.d/firewalld file. -# PRGNAM=firewalld -VERSION=${VERSION:-0.5.1} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.9.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -81,8 +73,7 @@ find -L . \ # /etc/sysconfig to source arguments. patch -p1 < $CWD/init.patch -./autogen.sh - +PYTHON="/usr/bin/python3" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -100,17 +91,8 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -mv $PKG/etc/dbus-1/system.d/FirewallD.conf $PKG/etc/dbus-1/system.d/FirewallD.conf.new -mv $PKG/etc/firewall/applet.conf $PKG/etc/firewall/applet.conf.new -mv $PKG/etc/firewalld/firewalld.conf $PKG/etc/firewalld/firewalld.conf.new -mv $PKG/etc/sysconfig/firewalld $PKG/etc/sysconfig/firewalld.new -mv $PKG/etc/sysconfig $PKG/etc/default - -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.firewalld > $PKG/etc/rc.d/rc.firewalld.new - -# We don't need systemd here. -rm -rf $PKG/usr/lib/systemd +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la 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 @@ -118,18 +100,29 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mkdir -p $PKG/lib +mv $PKG/etc/modprobe.d $PKG/lib + +mv $PKG/etc/sysconfig $PKG/etc/default +mv $PKG/etc/default/firewalld $PKG/etc/default/firewalld.new + +mv $PKG/etc/firewall/applet.conf $PKG/etc/firewall/applet.conf.new + +mv $PKG/etc/firewalld/firewalld.conf $PKG/etc/firewalld/firewalld.conf.new +mv $PKG/etc/firewalld/lockdown-whitelist.xml $PKG/etc/firewalld/lockdown-whitelist.xml.new + +mv $PKG/etc/logrotate.d/firewalld $PKG/etc/logrotate.d/firewalld.new + +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 TODO doc/html \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README doc/html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/firewalld/firewalld.info b/network/firewalld/firewalld.info index 3b3e69f3044ad..9d8f3de71d477 100644 --- a/network/firewalld/firewalld.info +++ b/network/firewalld/firewalld.info @@ -1,8 +1,8 @@ PRGNAM="firewalld" -VERSION="0.5.1" -HOMEPAGE="https://github.com/t-woerner/firewalld/" -DOWNLOAD="https://github.com/t-woerner/firewalld/archive/v0.5.1.tar.gz#/firewalld-0.5.1.tar.gz" -MD5SUM="38de1fad38d5635f04f8eb44bc2e25b1" +VERSION="0.9.3" +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_x86_64="" MD5SUM_x86_64="" REQUIRES="python-slip decorator" diff --git a/network/firewalld/init.patch b/network/firewalld/init.patch index 675dee356fc55..0d03f9c45e95a 100644 --- a/network/firewalld/init.patch +++ b/network/firewalld/init.patch @@ -1,5 +1,6 @@ ---- firewalld-0.5.1/config/firewalld.init 2020-03-19 08:05:08.660103937 -0400 -+++ firewalld-0.5.1-new/config/firewalld.init 2020-03-19 08:10:25.695336773 -0400 +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 @@ prog="firewalld" #config="/etc/firewalld/firewalld.conf" |