Bump auf Alpha3

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

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0974360c1f7d2c55a1341a62b6d23e64b0cf5fff..2b3c69e14ce3512d14617ff6c02876a65bce6b75 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -8,6 +9,7 @@ WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: advproxy LDAP auth
@@ -149,6 +151,7 @@ WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hdd temperature in
 WARNING: translation string unused: hint
+WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hours2
@@ -249,6 +252,20 @@ WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn_fastio
+WARNING: translation string unused: ovpn_fragment
+WARNING: translation string unused: ovpn_mssfix
+WARNING: translation string unused: ovpn_mtudisc
+WARNING: translation string unused: ovpn_processprio
+WARNING: translation string unused: ovpn_processprioD
+WARNING: translation string unused: ovpn_processprioED
+WARNING: translation string unused: ovpn_processprioEH
+WARNING: translation string unused: ovpn_processprioEN
+WARNING: translation string unused: ovpn_processprioH
+WARNING: translation string unused: ovpn_processprioLN
+WARNING: translation string unused: ovpn_processprioN
+WARNING: translation string unused: ovpn_processprioVD
+WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
@@ -261,6 +278,7 @@ WARNING: translation string unused: pots
 WARNING: translation string unused: profiles
 WARNING: translation string unused: proxy no proxy extend
 WARNING: translation string unused: proxy no proxy local
+WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: read sectors
 WARNING: translation string unused: reboot schedule
@@ -274,6 +292,7 @@ WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
+WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
 WARNING: translation string unused: sectors read from disk per second
@@ -281,6 +300,7 @@ WARNING: translation string unused: sectors written to disk per second
 WARNING: translation string unused: select media
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
+WARNING: translation string unused: server reserved
 WARNING: translation string unused: shaping list options
 WARNING: translation string unused: shared memory
 WARNING: translation string unused: shutdown control
@@ -296,6 +316,7 @@ WARNING: translation string unused: ssnetwork status
 WARNING: translation string unused: sspasswords
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: subnet
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: swap usage per
 WARNING: translation string unused: system cpu

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3371a94d8dc7e45b31a999953798782416f26992..beda3c42fd5bd181d19875651e105d374c56fe71 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -8,6 +9,7 @@ WARNING: translation string unused: Remote VPN IP
 WARNING: translation string unused: Resolv
 WARNING: translation string unused: Verbose
 WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: advproxy LDAP auth
@@ -159,6 +161,7 @@ WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hdd temperature in
 WARNING: translation string unused: hint
+WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
 WARNING: translation string unused: hours2
@@ -260,6 +263,20 @@ WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn_fastio
+WARNING: translation string unused: ovpn_fragment
+WARNING: translation string unused: ovpn_mssfix
+WARNING: translation string unused: ovpn_mtudisc
+WARNING: translation string unused: ovpn_processprio
+WARNING: translation string unused: ovpn_processprioD
+WARNING: translation string unused: ovpn_processprioED
+WARNING: translation string unused: ovpn_processprioEH
+WARNING: translation string unused: ovpn_processprioEN
+WARNING: translation string unused: ovpn_processprioH
+WARNING: translation string unused: ovpn_processprioLN
+WARNING: translation string unused: ovpn_processprioN
+WARNING: translation string unused: ovpn_processprioVD
+WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
 WARNING: translation string unused: package failed to install
@@ -269,6 +286,7 @@ WARNING: translation string unused: polfile
 WARNING: translation string unused: portscans
 WARNING: translation string unused: pots
 WARNING: translation string unused: profiles
+WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: read sectors
@@ -281,11 +299,13 @@ WARNING: translation string unused: requested data
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root user password
+WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: save error
 WARNING: translation string unused: sectors read from disk per second
 WARNING: translation string unused: sectors written to disk per second
 WARNING: translation string unused: send email notification
 WARNING: translation string unused: send test mail
+WARNING: translation string unused: server reserved
 WARNING: translation string unused: shaping add options
 WARNING: translation string unused: shaping list options
 WARNING: translation string unused: shared memory
@@ -302,6 +322,7 @@ WARNING: translation string unused: ssnetwork status
 WARNING: translation string unused: sspasswords
 WARNING: translation string unused: sssystem status
 WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: subnet
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: swap usage per
 WARNING: translation string unused: system cpu

diff --git a/lfs/fcpci b/lfs/fcpci
deleted file mode 100644 (file)
index bc27f27..0000000
--- a/lfs/fcpci
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall.                                    #
-#                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = suse93-3.11-07
-
-THISAPP    = fcpci-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/fritz
-ifeq "$(SMP)" ""
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 3ee301b5d0e8df9e4b915af58b725556
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/fritz-dsl-gcc-4-fix.patch
-ifeq "$(SMP)" ""
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
-           -e 's/`uname -r`/$(KVER)-ipfire/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire/' Makefile
-else
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -m)/$(MACHINE)/' \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
-           -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-           -e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-           -e '\+^CCFLAGS+a\ \
-                 -include \$$(KRNLINCL)/linux/modversions.h' \
-           -e '/^DEFINES/a\ \
-                 -DMODVERSIONS \\' src/Makefile
-       cd $(DIR_APP) && sed -i \
-           -e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' Makefile
-endif
-       cd $(DIR_APP) && CC="$(KGCC)" make
-       cd $(DIR_APP) && CC="$(KGCC)" make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 95bf7dc6b419c8a651c01db809fba5bffa3260c7..2c5769a0b3f42b74875641857735a3e12c5ede3e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -333,7 +333,6 @@ buildipfire() {
   ipfiremake fcdslsl           SMP=1
   ipfiremake fcdslusb          SMP=1
   ipfiremake fcdslslusb        SMP=1
-  ipfiremake fcpci                     SMP=1
 #  ipfiremake promise-sata-300-tx      SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake fuse                              SMP=1
@@ -345,7 +344,6 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-  ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse

diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index bda07b6751d720bf7658987c70a564060c882c2f..22bca6de3f8fcc44a2ecdf222d27d0fbb9f9806b 100644 (file)
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -2,7 +2,7 @@
 
 package Conf;
 
-$version = "2.0alpha2";
+$version = "2.0alpha3";
 
 $mainserver = "pakfire.ipfire.org";