network/fwbuilder: Updated for version 2.1.19

3 files changed, 22 insertions, 16 deletions

diff --git a/network/fwbuilder/doinst.sh b/network/fwbuilder/doinst.sh
index 22d4849bce4a9..301399ba37c77 100644
--- a/network/fwbuilder/doinst.sh
+++ b/network/fwbuilder/doinst.sh
@@ -1,5 +1,5 @@
 
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/network/fwbuilder/fwbuilder.SlackBuild b/network/fwbuilder/fwbuilder.SlackBuild
index 6991d19f956d9..722865282cdfe 100644
--- a/network/fwbuilder/fwbuilder.SlackBuild
+++ b/network/fwbuilder/fwbuilder.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fwbuilder
-VERSION=2.1.16
+VERSION=2.1.19
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -37,6 +37,8 @@ if [ "${ARCH}" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -48,30 +50,34 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --with-docdir=/usr/doc/$PRGNAM-$VERSION
+  --with-docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 make
 make install DDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 # Move incorrectly installed man pages; stupid configure overrides our settings
 mv $PKG/usr/share/man $PKG/usr/
 
 # Add icons
-install -Dpm 644 src/gui/icons/firewall_64.png \
+install -Dpm 0644 src/gui/icons/firewall_64.png \
   $PKG/usr/share/icons/hicolor/64x64/apps/fwbuilder.png
-install -Dpm 644 src/gui/icons/firewall_25.png \
+install -Dpm 0644 src/gui/icons/firewall_25.png \
   $PKG/usr/share/icons/hicolor/24x24/apps/fwbuilder.png
-install -Dpm 644 src/gui/icons/firewall_16.png \
+install -Dpm 0644 src/gui/icons/firewall_16.png \
   $PKG/usr/share/icons/hicolor/16x16/apps/fwbuilder.png
 
 # Make a menu entry and install it; use the new FDo stuff if it's here
@@ -81,7 +87,7 @@ if [ $? == 0 ]; then
     --dir $PKG/usr/share/applications   \
     $CWD/fwbuilder.desktop
 else
-  install -Dpm 644 $CWD/fwbuilder.desktop $PKG/usr/share/applications/fwbuilder.desktop
+  install -Dpm 0644 $CWD/fwbuilder.desktop $PKG/usr/share/applications/fwbuilder.desktop
 fi
 
 # Compress man pages
diff --git a/network/fwbuilder/fwbuilder.info b/network/fwbuilder/fwbuilder.info
index bc10404216153..82d423d0a2f6f 100644
--- a/network/fwbuilder/fwbuilder.info
+++ b/network/fwbuilder/fwbuilder.info
@@ -1,8 +1,8 @@
 PRGNAM="fwbuilder"
-VERSION="2.1.16"
+VERSION="2.1.19"
 HOMEPAGE="http://www.fwbuilder.org/"
-DOWNLOAD="http://downloads.sourceforge.net/fwbuilder/fwbuilder-2.1.16.tar.gz"
-MD5SUM="bb8b0c12f213dbfadb9fc43b53ed6785"
+DOWNLOAD="http://downloads.sourceforge.net/fwbuilder/fwbuilder-2.1.19.tar.gz"
+MD5SUM="285e6f364733b6aabead143db87b309b"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"