[arch-commits] CVS update of extra/network/firestarter (3 files)

[Jan de Groot]

    Date: Monday, April 23, 2007 @ 12:28:21
  Author: jgc
    Path: /home/cvs-extra/extra/network/firestarter

Modified: PKGBUILD (1.15 -> 1.16) firestarter.install (1.9 -> 1.10)
          firestarter.rc.d (1.1 -> 1.2)

upgpkg: firestarter 1.0.3-6
Fix syntax error in install scriptlet, migrate configs


---------------------+
 PKGBUILD            |    8 ++++----
 firestarter.install |   10 +++++++++-
 firestarter.rc.d    |    6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)


Index: extra/network/firestarter/PKGBUILD
diff -u extra/network/firestarter/PKGBUILD:1.15 extra/network/firestarter/PKGBUILD:1.16
--- extra/network/firestarter/PKGBUILD:1.15	Sun Apr 22 14:03:39 2007
+++ extra/network/firestarter/PKGBUILD	Mon Apr 23 12:28:21 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.15 2007/04/22 18:03:39 jgc Exp $
+# $Id: PKGBUILD,v 1.16 2007/04/23 16:28:21 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 # kernel_log_path.patch by Darwin Bautista
@@ -6,8 +6,8 @@
 
 pkgname=firestarter
 pkgver=1.0.3
-pkgrel=5
-arch=(i686)
+pkgrel=6
+arch=(i686 x86_64)
 license=('GPL')
 pkgdesc="A frontend for the ip-tables netfilter, a kernel based firewall."
 url="http://www.fs-security.com/"
@@ -16,7 +16,7 @@
 source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         firestarter.rc.d
         firestarter-1.0.3-kernel_log_path.patch)
-md5sums=('f46860a9e16dac4b693bd05f16370b03' '0204ef8b0a27092aa4605296f960a187' \
+md5sums=('f46860a9e16dac4b693bd05f16370b03' 'a2d2a7c06ea4f680754e7109a45d78f0' \
          '9d6e37da8eb0d2f78ffc51f0f81b266e')
 
 build() {
Index: extra/network/firestarter/firestarter.install
diff -u extra/network/firestarter/firestarter.install:1.9 extra/network/firestarter/firestarter.install:1.10
--- extra/network/firestarter/firestarter.install:1.9	Sun Apr 22 14:03:39 2007
+++ extra/network/firestarter/firestarter.install	Mon Apr 23 12:28:21 2007
@@ -21,12 +21,20 @@
   echo "installing gnome schemas ..."
   GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
       usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/firestarter.schemas > /dev/null
-  done
   echo "update desktop mime database..."
   update-desktop-database -q
 }
 
 pre_upgrade() {
+  if [ -d opt/gnome/etc/firestarter ]; then
+    mv opt/gnome/etc/firestarter/* etc/firestarter/
+    rmdir opt/gnome/etc/firestarter
+    for file in etc/firestarter/*; do
+      if [ -f "${file}" ]; then
+        sed -e 's|/opt/gnome/bin|/usr/bin|g' -e 's|/opt/gnome||g' -i "${file}"
+      fi
+    done
+  fi
   pre_remove
 }
 
Index: extra/network/firestarter/firestarter.rc.d
diff -u extra/network/firestarter/firestarter.rc.d:1.1 extra/network/firestarter/firestarter.rc.d:1.2
--- extra/network/firestarter/firestarter.rc.d:1.1	Sat Dec  4 13:36:12 2004
+++ extra/network/firestarter/firestarter.rc.d	Mon Apr 23 12:28:21 2007
@@ -3,16 +3,16 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-FS_CONTROL="/opt/gnome/etc/firestarter/firestarter.sh"
+FS_CONTROL="/etc/firestarter/firestarter.sh"
 
 if ! [ -f $FS_CONTROL ] ; then
   echo "Please run firestarter executable first manually as root to configure it initially"
   echo "You'll have to do that as root in a root console from in an X env"
 fi
 
-[ -x /opt/gnome/bin/firestarter ] || exit 0
+[ -x /usr/bin/firestarter ] || exit 0
 [ -x $FS_CONTROL ] || exit 0
-[ -s /opt/gnome/etc/firestarter/configuration ] || exit 0
+[ -s /etc/firestarter/configuration ] || exit 0
 case "$1" in
   start)
     stat_busy "Starting Firestarter firewall"