network/ufw: New maintainer + script update.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 17 insertions, 22 deletions

diff --git a/network/ufw/README b/network/ufw/README
index a961024e11..4202149da4 100644
--- a/network/ufw/README
+++ b/network/ufw/README
@@ -5,8 +5,8 @@ its command interface, but provides an easy way to add or remove simple rules.
 
 To run ufw at boot you can add the following code to rc.local file:
 
-if [ -x /etc/init.d/ufw ]; then
-/etc/init.d/ufw start
+if [ -x /lib/ufw/ufw-init ]; then
+/lib/ufw/ufw-init start
 fi
 
 Rules can be added with ports, services or application names. To specify an 
diff --git a/network/ufw/ufw-0.33-conntrack.patch.gz b/network/ufw/ufw-0.33-conntrack.patch.gz
deleted file mode 100644
index 36b67b2ac2..0000000000
--- a/network/ufw/ufw-0.33-conntrack.patch.gz
+++ /dev/null
diff --git a/network/ufw/ufw.SlackBuild b/network/ufw/ufw.SlackBuild
index 90d82681d6..e56edc6620 100644
--- a/network/ufw/ufw.SlackBuild
+++ b/network/ufw/ufw.SlackBuild
@@ -20,6 +20,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -28,31 +29,25 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-zcat $CWD/ufw-0.33-conntrack.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ufw.conf.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/ufw.conf.patch.gz | patch -p1 --verbose
 
-python ./setup.py install --root=$PKG
+python setup.py install --root=$PKG
 
-mv $PKG/usr/share/man $PKG/usr/man
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+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
 
-mkdir -p $PKG/etc/init.d
+mv $PKG/usr/share/man $PKG/usr/man
 
-ln -s /lib/ufw/ufw-init $PKG/etc/init.d/ufw
+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 \
-  AUTHORS ChangeLog* COPYING README* TODO doc/*.example \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog* COPYING README* TODO doc/*.example $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/ufw/ufw.info b/network/ufw/ufw.info
index 98266963d8..8fedbc37ab 100644
--- a/network/ufw/ufw.info
+++ b/network/ufw/ufw.info
@@ -6,5 +6,5 @@ MD5SUM="3747b453d76709e5a99da209fc0bb5f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ricardson Williams"
-EMAIL="ricardsonwilliams@gmail.com"
+MAINTAINER="rodolfo gouveia"
+EMAIL="rgouveia@cosmico.net"