[SM-Commit] PERFORCE change 79953 by Juuso Alasuutari for review

Perforce Review Daemon p4review at smee.org
Mon May 29 18:15:01 EDT 2006


Change 79953 by juuso_alasuutari at juuso_alasuutari-kamayuq on 2006/05/29 23:11:06

	Version bump to 3.0.7, spell polishing - integrate to test.

Affected files ...

... //sgl/grimoires/test/net/shorewall/DETAILS#9 integrate
... //sgl/grimoires/test/net/shorewall/HISTORY#11 integrate
... //sgl/grimoires/test/net/shorewall/INSTALL#2 integrate
... //sgl/grimoires/test/net/shorewall/init.d/shorewall#2 integrate

Differences ...

==== //sgl/grimoires/test/net/shorewall/DETAILS#9 (xtext) ====

@@ -1,13 +1,21 @@
            SPELL=shorewall
-         VERSION=3.0.3
+         VERSION=3.0.7
+         MAINVER=${VERSION:0:3}
+         RELEASE=$SPELL-$VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SPELL-$VERSION.tar.bz2.asc
-   SOURCE_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE
-   SOURCE_URL[1]=http://www.shorewall.net/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE
-   SOURCE_URL[2]=http://shorewall.infohiiway.com/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE
-  SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=http://www.shorewall.net/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE2
-  SOURCE2_URL[2]=http://shorewall.infohiiway.com/pub/$SPELL/3.0/$SPELL-$VERSION/$SOURCE2
+   SOURCE_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
+   SOURCE_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
+   SOURCE_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
+   SOURCE_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
+   SOURCE_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
+   SOURCE_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE
+  SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
+  SOURCE2_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
+  SOURCE2_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
+  SOURCE2_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
+  SOURCE2_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
+  SOURCE2_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE2
   SOURCE2_IGNORE=signature
       SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -15,9 +23,8 @@
          ENTERED=20020513
          UPDATED=20050717
       LICENSE[0]=GPL
-       BUILD_API=2
         KEYWORDS="firewall net"
-           SHORT="Iptable based firewall"
+           SHORT="Iptables based firewall"
 cat << EOF
 Shorewall is an [2]iptables based firewall that can be used on a dedicated firewall system, a multi-function gateway/router/server or on a standalone Linux system.
 EOF

==== //sgl/grimoires/test/net/shorewall/HISTORY#11 (text) ====

@@ -1,3 +1,14 @@
+2006-05-29 Juuso Alasuutari <iuso at sourcemage.org>
+	* DETAILS: Updated to 3.0.7. Removed BUILD_API=2. Edited SHORT 
+	  description.
+	* DETAILS: Added variables MAINVER and RELEASE to make urls more 
+	  flexible, and edited urls. Added urls shorewall.de, 
+	  www1.shorewall.net, shorewall.viisage.com, 
+	  and www.shorewall.com.ar. Removed download url 
+	  shorewall.infohiiway.com (didn't have 3.0.7). 
+	* INSTALL: Remove symlink pointing at nonexistent init script.
+	* init.d/shorewall: Bashified conditionals.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 

==== //sgl/grimoires/test/net/shorewall/INSTALL#2 (xtext) ====

@@ -1,3 +1,3 @@
-./install.sh               &&
-rm  /etc/init.d/shorewall
-
+./install.sh                   &&
+rm  /etc/init.d/shorewall      &&
+rm  /usr/share/shorewall/init

==== //sgl/grimoires/test/net/shorewall/init.d/shorewall#2 (text) ====

@@ -10,17 +10,17 @@
 start()
 {
   # Shorewall needs /var/log/messages to exist
-  if  [  !  -f  /var/log/messages  ]
+  if  [[  !  -f  /var/log/messages  ]]
   then
     touch  /var/log/messages
   fi  &&
   # Create shorewall log file if it doesn't exist
-  if  [  !  -f  $SHOREWALL_LOG  ]
+  if  [[  !  -f  $SHOREWALL_LOG  ]]
   then
     touch  $SHOREWALL_LOG
   fi  &&
   # Shorewall needs subsys
-  if  [  !  -d  /var/lock/subsys/  ]
+  if  [[  !  -d  /var/lock/subsys/  ]]
   then
     mkdir  -p  /var/lock/subsys/
   fi  &&



More information about the SM-Commit mailing list