network/gui-ufw: Updated for version 18.04.0 + new maintainer.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

7 files changed, 45 insertions, 112 deletions

diff --git a/network/gui-ufw/README b/network/gui-ufw/README
index c06502f5bb..86b61616fb 100644
--- a/network/gui-ufw/README
+++ b/network/gui-ufw/README
@@ -1,6 +1,12 @@
 gui-ufw (GUI for Uncomplicated Firewall)
 
-A very user-friendly way to manage ufw.
+A very user-friendly and uncomplicated way to manage ufw.
 
-Note: This uses an older release as it requires less dependencies and
-has the same functionality.
+
+This version requires that python-distutils-extra be built with python3
+support by passing PYTHON3=yes ./python-distutils-extra.SlackBuild when
+building.
+
+This version also requires webkit2gtk. If you would rather not have to
+build webkit2gtk, you can still use the 12.04.1 version of gui-ufw:
+https://slackbuilds.org/repository/14.1/network/gui-ufw/
diff --git a/network/gui-ufw/binfix.diff b/network/gui-ufw/binfix.diff
deleted file mode 100644
index d2208b5075..0000000000
--- a/network/gui-ufw/binfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- gui-ufw-12.04.1/bin/gufw	2012-01-12 11:43:02.000000000 -0700
-+++ gui-ufw-12.04.1-fix/bin/gufw	2016-01-12 18:50:01.738311270 -0700
-@@ -1,7 +1,7 @@
- #!/bin/bash
- LOCATIONS=(
--"/usr/lib/python2.7/site-packages/gufw/gufw.py"
--"/usr/lib/python2.6/site-packages/gufw/gufw.py"
-+"/usr/lib64/python2.7/site-packages/gufw/gufw.py"
-+"/usr/lib64/python2.6/site-packages/gufw/gufw.py"
- "/usr/lib/python2.7/dist-packages/gufw/gufw.py"
- "/usr/lib/python2.6/dist-packages/gufw/gufw.py"
- )
diff --git a/network/gui-ufw/doinst.sh b/network/gui-ufw/doinst.sh
new file mode 100644
index 0000000000..65c7e2eeb9
--- /dev/null
+++ b/network/gui-ufw/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/network/gui-ufw/gufw.desktop b/network/gui-ufw/gufw.desktop
deleted file mode 100644
index 65d0569c04..0000000000
--- a/network/gui-ufw/gufw.desktop
+++ /dev/null
@@ -1,72 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Firewall Configuration
-Name[zh_TW]=防火牆設定
-Name[vi]=Cấu hình tường lửa
-Name[uk]=Конфігурація брандмауера
-Name[tr]=Güvenlik Duvarı Yapılandırması
-Name[sv]=Brandväggskonfiguration
-Name[sr]=Подешавање мрежне баријере
-Name[sq]=Konfigurimi i Murit mbrojtës
-Name[sl]=Nastavitev požarnega zidu
-Name[sk]=Nastavenia firewall
-Name[ru]=Настройка межсетевого экрана
-Name[pt_BR]=Configuração do Firewall
-Name[pl]=Konfiguracja zapory sieciowej
-Name[nl]=Firewall-instellingen
-Name[nb]=Konfigurasjon av brannmur
-Name[lv]=Ugunsmūra konfigurācija
-Name[id]=Konfigurasi firewall
-Name[hu]=Tűzfalbeállítás
-Name[hrx]=Fajř-vannt-ʃtelluŋŋ
-Name[hr]=Postavke vatrozida
-Name[gl]=Configuración da devasa
-Name[fr]=Configuration du pare-feu
-Name[fi]=Palomuurin asetukset
-Name[es]=Configuración del cortafuegos
-Name[en_AU]=Firewall Configuration
-Name[el]=Ρύθμιση τείχους προστασίας
-Name[de]=Firewall-Konfiguration
-Name[cs]=Nastavení firewallu
-Name[bg]=Конфигуриране на защитна стена
-Name[ast]=Configuración del tornafueos
-Name[ar]=إعدادات الجدار الناري
-Comment=Allows you to configure ufw firewall
-Comment[zh_TW]=允許您設定 ufw 防火牆
-Comment[vi]=Cho phép bạn cấu hình tường lửa ufw
-Comment[uk]=Дозволяє налаштувати брандмауер uwf
-Comment[tr]=Ufw güvenlik duvarı uygulamasını yapılandırmanıza yardımcı olur
-Comment[sv]=Låter dig konfigurera ufw-brandväggen
-Comment[sr]=Омогућава вам да подесите уфв мрежну баријеру
-Comment[sq]=Ju lejon te configuroni murin mbrojtes
-Comment[sl]=Omogoča nastavitev požarnega zidu ufw
-Comment[sk]=Umožní vám nastaviť ufw firewall
-Comment[ru]=Графическая оболочка для настройки межсетевого экрана ufw
-Comment[pt_BR]=Permite você configurar o firewall ufw
-Comment[pl]=Pozwala skonfigurować zaporę ufw
-Comment[nl]=Hiermee kunt u de ufw-firewall instellen
-Comment[nb]=Lar deg konfigurere ufw-brannmuren
-Comment[lv]=Ļauj jums konfigurēt ufw ugunsmūri
-Comment[id]=Memudahkan anda untuk mengkonfigurasi firewall ufw
-Comment[hu]=Az ufw tűzfal beállítása
-Comment[hrx]=Losst’tyģģ’ən ufw fajř-vannt ʃtellë
-Comment[hr]=Omogućava vam konfiguraciju ufw vatrozida
-Comment[gl]=Permítelle configurar a súa devasa ufw
-Comment[fr]=Vous permet de configurer le pare-feu « ufw »
-Comment[fi]=Graafinen käyttöliittymä ufw-palomuurin hallintaan
-Comment[es]=Permite configurar el cortafuegos ufw
-Comment[en_AU]=Allows you to configure ufw firewall
-Comment[el]=Σας επιτρέπει να ρυθμίσετε το τείχος προστασίας ufw
-Comment[de]=Erlaubt Ihnen, die ufw-Firewall zu konfigurieren
-Comment[cs]=Umožňuje nastavení firewallu ufw
-Comment[bg]=Дава ви възможност за настройка на защитната стена ufw
-Comment[ast]=Permite configurar el tornafuéu ufw
-Comment[ar]=يسٌمح لك بإعداد الجدار الناري UFW
-Categories=GNOME;GTK;Settings;Security;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
-Exec=gufw
-Icon=gufw
-Terminal=false
-Type=Application
-X-GNOME-Settings-Panel=gufw
-X-Unity-Settings-Panel=gufw
-X-Ubuntu-Gettext-Domain=gufw
diff --git a/network/gui-ufw/gui-ufw.SlackBuild b/network/gui-ufw/gui-ufw.SlackBuild
index 73b25c41fe..8b80695069 100644
--- a/network/gui-ufw/gui-ufw.SlackBuild
+++ b/network/gui-ufw/gui-ufw.SlackBuild
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for gui-ufw
-#
-# Copyright 2016 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2018 Skaendo <skaendo at excite dot com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gui-ufw
-VERSION=${VERSION:-12.04.1}
+VERSION=${VERSION:-18.04.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +39,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +59,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/"$PRGNAM"_"$VERSION".orig.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,28 +68,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fixes paths in bin script
-patch -p1 < $CWD/binfix.diff
+# Point gufw-pkexec to the correct python3 location and version.
+sed -i "s|lib/python3.5|lib$LIBDIRSUFFIX/python3.6|g" bin/gufw-pkexec
+
+python3 setup.py install --root=$PKG
 
-python setup.py install --root=$PKG
+# Move the manpage to a sane directory.
+mv $PKG/usr/share/man $PKG/usr
 
-# Fix paths and cleanup
-mv $PKG/usr/share/man $PKG/usr/man
-install -D -m 0644 $PKG/usr/share/icons/hicolor/48x48/apps/gufw.png $PKG/usr/share/pixmaps/gufw.png
+# This dir only contains a README for gufw. The same exact README can be found in
+# /usr/doc/gui-ufw-$VERSION, so lets just ditch this one.
 rm -rf $PKG/usr/share/doc
 
-# Desktop file modded to be like newer releases of gufw
-install -D -m 0644 $CWD/gufw.desktop $PKG/usr/share/applications/gufw.desktop
+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
 
 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/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.GPL3 INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.GPL3 INSTALL README $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
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/gui-ufw/gui-ufw.info b/network/gui-ufw/gui-ufw.info
index 8e4fef4808..dc2b81993a 100644
--- a/network/gui-ufw/gui-ufw.info
+++ b/network/gui-ufw/gui-ufw.info
@@ -1,10 +1,10 @@
 PRGNAM="gui-ufw"
-VERSION="12.04.1"
-HOMEPAGE="http://gufw.org/"
-DOWNLOAD="http://archive.ubuntu.com/ubuntu/pool/universe/g/gui-ufw/gui-ufw_12.04.1.orig.tar.gz"
-MD5SUM="0f8e27ccac4957195eb74da4c4cb1b74"
+VERSION="18.04.0"
+HOMEPAGE="https://gufw.org/"
+DOWNLOAD="https://launchpad.net/gui-ufw/trunk/18.04/+download/gui-ufw-18.04.0.tar.gz"
+MD5SUM="da330d3cec44f8e9eaf2014e8c4bcb2a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-distutils-extra ufw"
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+REQUIRES="python-distutils-extra pygobject3-python3 ufw webkit2gtk"
+MAINTAINER="Skaendo"
+EMAIL="skaendo at excite dot com"
diff --git a/network/gui-ufw/slack-desc b/network/gui-ufw/slack-desc
index 8ef8a32881..467139f203 100644
--- a/network/gui-ufw/slack-desc
+++ b/network/gui-ufw/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 gui-ufw: gui-ufw (GUI for Uncomplicated Firewall)
 gui-ufw:
-gui-ufw: A very user-friendly way to manage ufw.
+gui-ufw: A very user-friendly and uncomplicated way to manage ufw.
 gui-ufw:
-gui-ufw: Homepage: http://gufw.org/
 gui-ufw:
 gui-ufw:
 gui-ufw:
 gui-ufw:
 gui-ufw:
+gui-ufw: Homepage: https://gufw.org/
 gui-ufw: