diff options
| -rw-r--r-- | network/gui-ufw/gufw-open.diff | 10 | ||||
| -rw-r--r-- | network/gui-ufw/gui-ufw.SlackBuild | 23 | ||||
| -rw-r--r-- | network/gui-ufw/gui-ufw.info | 8 | ||||
| -rw-r--r-- | network/gui-ufw/path-fix.diff | 16 | ||||
| -rw-r--r-- | network/gui-ufw/ubuntu-fixes.diff | 26 |
5 files changed, 33 insertions, 50 deletions
diff --git a/network/gui-ufw/gufw-open.diff b/network/gui-ufw/gufw-open.diff deleted file mode 100644 index e972d8b921..0000000000 --- a/network/gui-ufw/gufw-open.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- a/bin/gufw -+++ b/bin/gufw -@@ -1,3 +1,6 @@ - #!/bin/bash -+if [ $(loginctl show-session $(loginctl|grep $(whoami) |awk '{print $1}') -p Type) = "Type=wayland" ]; then -+ xhost +si:localuser:root -+fi - c_user=$(whoami) - pkexec gufw-pkexec $c_user - diff --git a/network/gui-ufw/gui-ufw.SlackBuild b/network/gui-ufw/gui-ufw.SlackBuild index 907e67fdf1..bfd5f5e06a 100644 --- a/network/gui-ufw/gui-ufw.SlackBuild +++ b/network/gui-ufw/gui-ufw.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gui-ufw -# Copyright 2022-23 Jay Lanagan (j@lngn.net), Detroit, MI, USA +# Copyright 2022-2025 Jay Lanagan (j@lngn.net), Detroit, MI, USA # Previous script by Skaendo w/ bkw patches, this replaces it. # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gui-ufw -VERSION=${VERSION:-24.04.0} +VERSION=${VERSION:-26.04.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,22 +47,6 @@ fi TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi set -e @@ -80,8 +64,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # path & opening app fixes from ubuntu -patch -p1 < $CWD/gufw-open.diff -patch -p1 < $CWD/path-fix.diff +patch -p1 < $CWD/ubuntu-fixes.diff python3 setup.py install --prefix=/usr --root=$PKG diff --git a/network/gui-ufw/gui-ufw.info b/network/gui-ufw/gui-ufw.info index 4a03d79c95..9728df7b28 100644 --- a/network/gui-ufw/gui-ufw.info +++ b/network/gui-ufw/gui-ufw.info @@ -1,10 +1,10 @@ PRGNAM="gui-ufw" -VERSION="24.04.0" +VERSION="26.04.0" HOMEPAGE="https://github.com/costales/gufw" -DOWNLOAD="https://github.com/costales/gufw/releases/download/24.04/gui-ufw-24.04.0.tar.gz" -MD5SUM="15cb73e5aac0c5e0d3d8107883de6570" +DOWNLOAD="https://github.com/costales/gufw/releases/download/26.04/gui-ufw-26.04.0.tar.gz" +MD5SUM="486d5298f9962cfeedeed3e21f8578c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-distutils-extra webkit2gtk ufw" +REQUIRES="python-distutils-extra webkit2gtk4.1 ufw" MAINTAINER="Jay Lanagan" EMAIL="j@lngn.net" diff --git a/network/gui-ufw/path-fix.diff b/network/gui-ufw/path-fix.diff deleted file mode 100644 index 2ebfdb0c21..0000000000 --- a/network/gui-ufw/path-fix.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- a/bin/gufw-pkexec -+++ b/bin/gufw-pkexec -@@ -1,2 +1,11 @@ - #!/bin/bash --python3 /usr/share/gufw/gufw/gufw.py $1 -+LOCATIONS=`ls -ld /usr/lib*/python*/site-packages/gufw/gufw.py | awk '{print $9}'` # from source -+LOCATIONS=( "${LOCATIONS[@]}" "/usr/share/gufw/gufw/gufw.py" ) # deb package -+ -+for ((i = 0; i < ${#LOCATIONS[@]}; i++)) -+do -+ if [[ -e "${LOCATIONS[${i}]}" ]]; then -+ python3 ${LOCATIONS[${i}]} $1 -+ fi -+done -+ - diff --git a/network/gui-ufw/ubuntu-fixes.diff b/network/gui-ufw/ubuntu-fixes.diff new file mode 100644 index 0000000000..1b987d3b0a --- /dev/null +++ b/network/gui-ufw/ubuntu-fixes.diff @@ -0,0 +1,26 @@ +diff -ur a/bin/gufw b/bin/gufw +--- a/bin/gufw 2025-06-07 03:35:14.000000000 -0400 ++++ b/bin/gufw 2025-06-17 05:45:44.018989441 -0400 +@@ -1,3 +1,6 @@ + #!/bin/bash ++if [ $(loginctl show-session $(loginctl|grep $(whoami) |awk '{print $1}') -p Type) = "Type=wayland" ]; then ++ xhost +si:localuser:root ++fi + c_user=$(whoami) + pkexec "$(which gufw-pkexec)" $c_user +diff -ur a/bin/gufw-pkexec b/bin/gufw-pkexec +--- a/bin/gufw-pkexec 2025-06-07 03:35:14.000000000 -0400 ++++ b/bin/gufw-pkexec 2025-06-17 05:45:55.930667352 -0400 +@@ -1,2 +1,11 @@ + #!/bin/bash +-python3 /usr/share/gufw/gufw/gufw.py $1 ++LOCATIONS=`ls -ld /usr/lib*/python*/site-packages/gufw/gufw.py | awk '{print $9}'` # from source ++LOCATIONS=( "${LOCATIONS[@]}" "/usr/share/gufw/gufw/gufw.py" ) # deb package ++ ++for ((i = 0; i < ${#LOCATIONS[@]}; i++)) ++do ++ if [[ -e "${LOCATIONS[${i}]}" ]]; then ++ python3 ${LOCATIONS[${i}]} $1 ++ fi ++done ++ |