Das IPSec-Modul laesst sich nun laden.

Einige Bugs der Alpha 2 behoben.

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 1fe86d103d54e277a14505af93251c94d61385db..3ab189bf1875fc04b0dfb5ad8233ecb11b809f6f 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,6 +49,7 @@ var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings
 #var/ipfire/fwlogs/portsettings
 var/ipfire/general-functions.pl
+var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/isdn
 #var/ipfire/isdn/settings

diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid
index 39295045a5f9656fd3824ac27bdfa366694bf1a9..8f2cc6641f4f25774d3a158811804c474053ffcf 100644 (file)
--- a/config/rootfiles/common/squid
+++ b/config/rootfiles/common/squid
@@ -14,6 +14,69 @@ etc/squid/squid.conf
 #usr/lib/squid/cachemgr.cgi
 usr/lib/squid/diskd-daemon
 #usr/lib/squid/errors
+#usr/lib/squid/errors.ipfire
+#usr/lib/squid/errors.ipfire/English
+usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD
+usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL
+usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED
+usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED
+usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE
+usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ
+usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP
+usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL
+usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP
+usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY
+usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR
+usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT
+usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN
+usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE
+usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG
+usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ
+usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE
+usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR
+usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors.ipfire/German
+usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED
+usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD
+usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL
+usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL
+usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED
+usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED
+usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE
+usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN
+usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND
+usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED
+usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR
+usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED
+usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE
+usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ
+usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP
+usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL
+usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP
+usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY
+usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS
+usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR
+usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT
+usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN
+usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE
+usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG
+usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ
+usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE
+usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR
+usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT
 #usr/lib/squid/errors/Azerbaijani
 #usr/lib/squid/errors/Azerbaijani/ERR_ACCESS_DENIED
 #usr/lib/squid/errors/Azerbaijani/ERR_CACHE_ACCESS_DENIED

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 0aa891311ce338109afcb6fead8945d7d72438c6..9ed06bcfd8923af98369814225d7fa7acef35e22 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.0b ==
+== List of softwares used to build IPFire Version: 2.0a3 ==
 * 3c5x9setup-1.00
 * Archive-Tar-1.29
 * Archive-Zip-1.16

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index ba3fe095849810b8cc8782d42f8f127fb36a6045..55a84f92690de265cc3e6173ca97f8141d22bba2 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -289,7 +289,7 @@ sub writeipsecfiles {
                $localside = $lvpnsettings{'VPN_IP'};
        }
 
-       print CONF "conn $lconfighash{$key}[1] #$lconfighash{$key}[26]\n";
+       print CONF "conn $lconfighash{$key}[1]\n";
        print CONF "\tleft=$localside\n";
        print CONF "\tleftnexthop=%defaultroute\n" if ($lconfighash{$key}[26] eq 'RED' && $lvpnsettings{'VPN_IP'} ne '%defaultroute');
        print CONF "\tleftsubnet=$lconfighash{$key}[8]\n";

diff --git a/lfs/configroot b/lfs/configroot
index 5937c6ec6e2d51535ec6535be1dd4cf3972cc240..e5d33e7d102f17f3e090077cb663385b20c64b5c 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -79,7 +79,7 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/general-functions.pl       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/lang.pl                    $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/countries.pl                       $(CONFIG_ROOT)/
-  cp $(DIR_SRC)/config/cfgroot/graphs.pl                       $(CONFIG_ROOT)/
+       cp $(DIR_SRC)/config/cfgroot/graphs.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/advoptions-list            $(CONFIG_ROOT)/dhcp/advoptions-list
        cp $(DIR_SRC)/config/cfgroot/backup-exclude             $(CONFIG_ROOT)/backup/exclude.system
        cp $(DIR_SRC)/config/cfgroot/backup-include             $(CONFIG_ROOT)/backup/include.system

diff --git a/lfs/linux b/lfs/linux
index ad4677e86e2b3bb78d0dfb24728bf73b69511e23..ccebcf2d5ed471ecc9b48a06c39e6b630af10874 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -183,9 +183,6 @@ ifeq "$(SMP)" "1"
        ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-       mkdir -p /usr/src/openswan-2.5.13/modobj26/null
-       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
-       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
 else
        cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-ipfire/' Makefile
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
@@ -196,9 +193,6 @@ else
        ln -sf System.map-$(VER)-ipfire /boot/System.map-ipfire
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
        cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
-       mkdir -p /usr/src/openswan-2.5.13/modobj26/null
-       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
-       cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) minstall
 endif
 
        # remove symlinked pcmcia directory

diff --git a/lfs/squid b/lfs/squid
index c2b7d4a832fde0c4f4fda56786a8aa22b0389788..4a9d8543097f4ed5e6732b11a51a778ee1e8bc4e 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -107,6 +107,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(DIR_SRC)/config/updxlrator/download /var/ipfire/updatexlrator/bin/download
        -mkdir -p /usr/lib/squid/errors.ipfire
        cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/
+       -find /usr/lib/squid/errors.ipfire/ -name .svn -exec rm -rf {} \;
        chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
                /var/ipfire/updatexlrator/bin/download
 

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

diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 63e042a91121a1ecf785e09cb1e2a2acc6e66ac5..299264728aec9bc2913edb38c4eba4b3a8f1a26c 100644 (file)
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -292,7 +292,7 @@ int main(int argc, char *argv[]) {
                        int fd;
                        /* Get pluto pid */
                        if ((fd = open("/var/run/pluto.pid", O_RDONLY)) != -1) {
-                               safe_system("/etc/rc.d/ipsec stop 2> /dev/null >/dev/null");
+                               safe_system("/etc/rc.d/init.d/ipsec stop 2> /dev/null >/dev/null");
                                close(fd);
                        }
                        exit(0);
@@ -441,7 +441,7 @@ int main(int argc, char *argv[]) {
        if ((argc == 2) && strcmp(argv[1], "S") == 0) {
                load_modules();
                safe_system("/usr/sbin/ipsec tncfg --clear >/dev/null");
-               safe_system("/etc/rc.d/ipsec restart >/dev/null");
+               safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
                add_alias_interfaces(configtype, redtype, if_red, (enable_red+enable_green+enable_orange+enable_blue) >>1 );
                safe_system("/usr/local/bin/vpn-watch --start");
                exit(0);