From dc7e6bfbb1cfeda0894b4dc63a866701825edc01 Mon Sep 17 00:00:00 2001 From: judas_iscariote Date: Wed, 22 Feb 2006 22:44:30 +0000 Subject: [PATCH] git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3516 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-Website/News.htm | 28 ++++++++++++++----- Shorewall-Website/Shorewall_sfindex_frame.htm | 2 +- Shorewall-Website/download.htm | 12 ++++---- Shorewall/init.archlinux.sh | 0 Shorewall/init.sh | 0 tools/build/makeshorewall | 8 ++++-- 6 files changed, 33 insertions(+), 17 deletions(-) mode change 100644 => 100755 Shorewall/init.archlinux.sh mode change 100644 => 100755 Shorewall/init.sh diff --git a/Shorewall-Website/News.htm b/Shorewall-Website/News.htm index e4d6cacd0..d863dbf05 100644 --- a/Shorewall-Website/News.htm +++ b/Shorewall-Website/News.htm @@ -1,12 +1,12 @@ - + + + Shorewall News - - +

Shorewall News and Announcements
@@ -24,11 +24,25 @@ Documentation License”.

- + + + +2006-02-22 Shorewall moved to Subversion
+ +
 Effectively today, Shorewall source code repository was migrated to Subversion SCM.
+
+Please read https://sourceforge.net/svn/?group_id=22587 
+for more information.
+
+ + + + + + 2006-02-10 Shorewall 3.0.5
 - - + 
Problems corrected in Shorewall 3.0.5
 
 1)  Previously, if /etc/shorewall/ipsets existed, it was run when Shorewall starts
diff --git a/Shorewall-Website/Shorewall_sfindex_frame.htm b/Shorewall-Website/Shorewall_sfindex_frame.htm
index 53f1867f0..aa852d84f 100644
--- a/Shorewall-Website/Shorewall_sfindex_frame.htm
+++ b/Shorewall-Website/Shorewall_sfindex_frame.htm
@@ -21,7 +21,7 @@ Announcements
   
  • Documentation
    • 
   
  • Mirrors
    • 
   
  • CVS Repository
    • 
+ target="_blank">SVN Repository
   
  • Other Links
    • 
 
 
      
diff --git a/Shorewall-Website/download.htm b/Shorewall-Website/download.htm
index 764af5d34..9c9d007f4 100644
--- a/Shorewall-Website/download.htm
+++ b/Shorewall-Website/download.htm
@@ -30,7 +30,7 @@ Documentation License”.
      
 
      Package Information
      
 Finding Updates that Correct Known Problems
      
 Download Sites
      
-CVS
      
+SVN
      
 
      
 
      
 
      Package Information
      
@@ -373,16 +373,16 @@ the integrity of the files using our public key 
   
 
-
      CVS
      
-
      The CVS Repository at Sourceforge is used as a
+
      SVN
      
+
      The SVN Repository at Sourceforge is used as a
 safe-store for Shorewall releases.
      
   
      
-You should download and use the latest CVS version only at your own
+You should download and use the latest SVN version only at your own
 risk -- If you are looking for bug fixes for the current release, see above.
      
   
      
-The following CVS projects are currently active:
      
+The following SVN projects are currently active:
      
   
        
     
      1. Shorewall
        
       
        
diff --git a/Shorewall/init.archlinux.sh b/Shorewall/init.archlinux.sh
old mode 100644
new mode 100755
diff --git a/Shorewall/init.sh b/Shorewall/init.sh
old mode 100644
new mode 100755
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 32ca72a2a..e2db475fa 100644
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -229,13 +229,13 @@ case $VERSION in
 	LRPPROJ=Lrp2
 	;;
     2.4.*)
-        CVSTAG=SHOREWALL-2_4
-	DOCTAG=SHOREWALL_2_4
+    CVSTAG="branches/SHOREWALL-2_4/Shorewall"
+	DOCTAG="branches/SHOREWALL_2_4/Shorewall-docs2"
 	XMLPROJ=Shorewall-docs2
 	BUILDLRP=
 	;;
     *ex)
-        CVSTAG=EXPERIMENTAL
+    CVSTAG=EXPERIMENTAL
 	DOCTAG=HEAD
 	XMLPROJ=Shorewall-docs2
 	BUILDLRP=
@@ -305,6 +305,8 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 
     do_or_die "cvs -z3 export -r $CVSTAG -d $SHOREWALLDIR Shorewall >> $LOGFILE 2>&1"
 
+	do_or_die "svn export --non-interactive https://svn.sourceforge.net/svnroot/shorewall/$CVSTAG  $SHOREWALLDIR >> $LOGFILE 2>&1"
+
     fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1     || fatal_error "install.sh has wrong version"
     fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "uninstall.sh has wrong version"
     fgrep VERSION=$VERSION $SHOREWALLDIR/fallback.sh > /dev/null 2>&1    || fatal_error "fallback.sh has wrong version"