Added some custom patches for openswan

tagged rc2
fixed red and cleanfs by arne

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1002 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/openswan b/lfs/openswan
index a9c6f0987f4c5f1606880b4c6d7d2d3496bd04c2..fe30515dad9c386a8a8e5355cdce4eacfaa611f2 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -90,6 +90,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        
        cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-startklips-1.patch
        cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-realsetup-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
+       cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
+       cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
        
        #@rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 6124ea77e15b4c8eb001b20657a2cd909070ed7a..6fd173006fe7c51206dae725b75109805c906df2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0rc2t"                                                              # Version number
+VERSION="2.0rc2"                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level

diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/cleanfs
index c102d02ea3a973789b2d6b0bba073e38c778d64f..855e63e7b0f47526a50401be98aaa9994877b50f 100644 (file)
--- a/src/initscripts/init.d/cleanfs
+++ b/src/initscripts/init.d/cleanfs
@@ -79,12 +79,9 @@ case "${1}" in
                        -delete || failed=1
 
                boot_mesg -n " /var/ipfire/dhcp" ${NORMAL}
-               cd /var/ipfire/dhcpc/ && 
-               find . -name *.pid -exec rm -f {} \; || failed=1
-               cd /var/ipfire/dhcpc/ && 
-               find . -name *.cache -exec rm -f {} \; || failed=1
-               cd /var/ipfire/dhcpc/ && 
-               find . -name *.info -exec rm -f {} \; || failed=1
+               cd /var/ipfire/dhcpc/ && find . -name "*.pid" -exec rm -f {} \; || failed=1
+               cd /var/ipfire/dhcpc/ && find . -name "*.cache" -exec rm -f {} \; || failed=1
+               cd /var/ipfire/dhcpc/ && find . -name "*.info" -exec rm -f {} \; || failed=1
 
                boot_mesg -n " /var/ipfire/red" ${NORMAL}
                cd /var/ipfire/red/ && find . -name active -exec rm -f {} \; || failed=1

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 62fd77956486314fdd55fb4d9ff1b8b479fa3a72..1ed52ddf3242a2e72be03523bc75f0c589e82365 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -109,8 +109,8 @@ case "${1}" in
                        iptables -A REDINPUT -p tcp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT
                        iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i ${DEVICE} -j ACCEPT
                        
-                       if [ -n "${DHCP_HOSTNAME}" ]; then
-                               DHCP_START+="-h ${DHCP_HOSTNAME} "
+                       if [ -n "${RED_DHCP_HOSTNAME}" ]; then
+                               DHCP_START+="-h ${RED_DHCP_HOSTNAME} "
                fi
                
                /sbin/dhcpcd ${DEVICE} ${DHCP_START} >/dev/null 2>&1
@@ -124,8 +124,8 @@ case "${1}" in
                                boot_mesg_flush
                                boot_mesg "           IP Address:      $IPADDR"
                                boot_mesg_flush
-                               if [ -n "${DHCP_HOSTNAME}" ]; then
-                                       boot_mesg "           Hostname:        $DHCP_HOSTNAME"
+                               if [ -n "${RED_DHCP_HOSTNAME}" ]; then
+                                       boot_mesg "           Hostname:        $RED_DHCP_HOSTNAME"
                                        boot_mesg_flush
                                fi
                                boot_mesg "           Subnet Mask:     $NETMASK"

diff --git a/src/patches/openswan-2.4.9-clear-1.patch b/src/patches/openswan-2.4.9-clear-1.patch
new file mode 100644 (file)
index 0000000..3ccefb2
--- /dev/null
+++ b/src/patches/openswan-2.4.9-clear-1.patch
@@ -0,0 +1,19 @@
+--- /etc/ipsec.d/policies/clear        2007-10-14 00:56:14.000000000 +0200
++++ /etc/ipsec.d/policies/clear        2007-10-27 00:14:46.000000000 +0200
+@@ -14,16 +14,3 @@
+ #       This file holds the information on root name servers needed to
+ #       last update:    Jan 29, 2004
+ #       related version of root zone:   2004012900
+-198.41.0.4/32
+-192.228.79.201/32
+-192.33.4.12/32
+-128.8.10.90/32
+-192.203.230.10/32
+-192.5.5.241/32
+-192.112.36.4/32
+-128.63.2.53/32
+-192.36.148.17/32
+-192.58.128.30/32
+-193.0.14.129/32
+-198.32.64.12/32
+-202.12.27.33/32

diff --git a/src/patches/openswan-2.4.9-updown-1.patch b/src/patches/openswan-2.4.9-updown-1.patch
new file mode 100644 (file)
index 0000000..6782ec9
--- /dev/null
+++ b/src/patches/openswan-2.4.9-updown-1.patch
@@ -0,0 +1,30 @@
+--- /usr/lib/ipsec/_updown     2007-10-14 00:56:15.000000000 +0200
++++ /usr/lib/ipsec/_updown     2007-10-27 00:00:26.000000000 +0200
+@@ -376,8 +376,8 @@
+               # opportunistic encryption work around
+               # need to provide route that eclipses default, without 
+               # replacing it.
+-              it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
+-                      ip route $1 128.0.0.0/1 $parms2 $parms3"
++              #it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
++      #               ip route $1 128.0.0.0/1 $parms2 $parms3"
+               ;;
+       *)      it="ip route $1 $parms $parms2 $parms3"
+               ;;
+@@ -401,13 +401,13 @@
+ prepare-host:*|prepare-client:*)
+       # delete possibly-existing route (preliminary to adding a route)
+       case "$PLUTO_PEER_CLIENT" in
+-      "0.0.0.0/0")
++  "0.0.0.0/0")
+               # need to provide route that eclipses default, without 
+               # replacing it.
+               parms1="0.0.0.0/1"
+               parms2="128.0.0.0/1"
+-              it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
+-              oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
++      #       it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
++      #       oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
+               ;;
+       *)
+               parms="$PLUTO_PEER_CLIENT $IPROUTEARGS"

diff --git a/src/patches/openswan-2.4.9-updown_x509-1.patch b/src/patches/openswan-2.4.9-updown_x509-1.patch
new file mode 100644 (file)
index 0000000..9109ab7
--- /dev/null
+++ b/src/patches/openswan-2.4.9-updown_x509-1.patch
@@ -0,0 +1,24 @@
+--- /usr/lib/ipsec/_updown_x509        2007-10-14 00:56:15.000000000 +0200
++++ /usr/lib/ipsec/_updown_x509        2007-10-27 00:00:26.000000000 +0200
+@@ -359,8 +359,8 @@
+               # opportunistic encryption work around
+               # need to provide route that eclipses default, without 
+               # replacing it.
+-              it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
+-                      ip route $1 128.0.0.0/1 $parms2 $parms3"
++              #it="ip route $1 0.0.0.0/1 $parms2 $parms3 &&
++              #       ip route $1 128.0.0.0/1 $parms2 $parms3"
+               ;;
+       *)      it="ip route $1 $parms $parms2 $parms3"
+               ;;
+@@ -389,8 +389,8 @@
+               # replacing it.
+               parms1="0.0.0.0/1"
+               parms2="128.0.0.0/1"
+-              it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
+-              oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
++              #it="ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1"
++              #oops="`ip route delete $parms1 $IPROUTEARGS 2>&1 ; ip route delete $parms2 $IPROUTEARGS 2>&1`"
+               ;;
+       *)
+               parms="$PLUTO_PEER_CLIENT $IPROUTEARGS"