Added StrongSwan for testing purposes.

GMP is needed by StongSwan.

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

diff --git a/lfs/gmp b/lfs/gmp
index 5d723e54ee3d724281512fc991aedeadff007e06..0bf04eb404cfa75837c074a4789ff26d48773cf7 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -24,13 +24,14 @@
 
 include Config
 
-VER        = 4.2
+PKG_NAME   = gmp
+VER        = 4.2.1
 
-THISAPP    = gmp-$(VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -38,31 +39,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 objects = $(DL_FILE)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = aa4a4534e8870ab8ba3c093239057cca
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+install: $(TARGET)
 
 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
 ###############################################################################
@@ -70,8 +53,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-cxx --enable-mpbsd --build=$(BUILDTARGET) --disable-nls
-       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-cxx --enable-mpbsd ABI=32
+       cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/strongswan b/lfs/strongswan
new file mode 100644 (file)
index 0000000..977dc2f
--- /dev/null
+++ b/lfs/strongswan
@@ -0,0 +1,62 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME   = strongswan
+VER        = 4.1.10
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+install: $(TARGET)
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr \
+                                                                               --sysconfdir=/etc
+                                                                               ### XXX UID/GID
+       cd $(DIR_APP) && make -j $(PARALLELISM)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index c85736becd01321def7e3d6740106b1bcbef9e22..278d22fe467a43dc5fdd34e7295bd8f4933c23b0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -196,7 +196,7 @@ ipfire_build() {
        ipfire_make pam                                                                                                                                                 PASS=1
        ipfire_make shadow
        ipfire_make pam                                                                                                                                                 PASS=2
-       
+       ipfire_make gmp
        #ipfire_make libidn             ### Do we need this?
        ipfire_make pcre
        ipfire_make popt
@@ -225,6 +225,10 @@ ipfire_build() {
        ipfire_make htop
        ipfire_make beep
        
+       ### Building vpn stuff
+       #
+       ipfire_make strongswan
+       
        ### Building filesystem stuff
        #
        ipfire_make reiserfsprogs
@@ -269,7 +273,6 @@ ipfire_build() {
        ### Tools that maybe not needed
        #       
        #ipfire_make expat
-       #ipfire_make gmp
        #ipfire_make gd
        #ipfire_make libcap
        #ipfire_make mtools
@@ -473,26 +476,14 @@ build)
                fi
        fi
        
-       if [ ! -e $BASEDIR/log_${MACHINE}/03_ipfire/stage3-LFS ]; then
-               beautify build_stage "Building base"
-               base_build
-       else
-               beautify message DONE "Stage base      already built"
-       fi
+       beautify build_stage "Building base"
+       base_build
 
-       if [ ! -e $BASEDIR/log_${MACHINE}/04_misc/stage4-LFS ]; then
-               beautify build_stage "Building $NAME"
-               ipfire_build
-       else
-               beautify message DONE "Stage ipfire    already built"
-       fi
+       beautify build_stage "Building $NAME"
+       ipfire_build
 
-       if [ ! -e $BASEDIR/log_${MACHINE}/05_installer/stage5-LFS ]; then
-               beautify build_stage "Building miscellaneous"
-               misc_build
-       else
-               beautify message DONE "Stage misc      already built"
-       fi
+       beautify build_stage "Building miscellaneous"
+       misc_build
 
        beautify build_stage "Building installer"
        installer_build

diff --git a/src/rootfiles/core/gmp b/src/rootfiles/core/gmp
new file mode 100644 (file)
index 0000000..504ffd8
--- /dev/null
+++ b/src/rootfiles/core/gmp
@@ -0,0 +1,21 @@
+#usr/include/gmp.h
+#usr/include/gmpxx.h
+#usr/include/mp.h
+#usr/lib/libgmp.a
+#usr/lib/libgmp.la
+usr/lib/libgmp.so
+usr/lib/libgmp.so.3
+usr/lib/libgmp.so.3.4.1
+#usr/lib/libgmpxx.a
+#usr/lib/libgmpxx.la
+usr/lib/libgmpxx.so
+usr/lib/libgmpxx.so.3
+usr/lib/libgmpxx.so.3.1.1
+#usr/lib/libmp.a
+#usr/lib/libmp.la
+usr/lib/libmp.so
+usr/lib/libmp.so.3
+usr/lib/libmp.so.3.1.10
+#usr/share/info/gmp.info
+#usr/share/info/gmp.info-1
+#usr/share/info/gmp.info-2

diff --git a/src/rootfiles/core/stage2 b/src/rootfiles/core/stage2
index 22ff6ad2c64ba59eeeede772b40c3474936eca73..b7bd14a9ae0ea22af92fafa3e34ac55ea67984a5 100644 (file)
--- a/src/rootfiles/core/stage2
+++ b/src/rootfiles/core/stage2
@@ -1,20 +1,121 @@
+bin/cat
+bin/echo
+bin/grep
+bin/pwd
+bin/stty
+boot
+etc/bashrc
+etc/certparams
+etc/fstab
+etc/group
+etc/hddtemp.db
+etc/host.conf
+etc/inittab
+etc/inputrc
+etc/issue
+etc/ld.so.conf
+etc/logrotate.conf
+etc/mime.types
+etc/modules.conf
+etc/mtab
+etc/nsswitch.conf
+#etc/opt
+etc/passwd
+etc/profile
 etc/profile.d
 etc/profile.d/dircolors.sh
 etc/profile.d/extrapaths.sh
 etc/profile.d/i18n.sh
 etc/profile.d/readline.sh
 etc/profile.d/umask.sh
+etc/resolv.conf
+etc/securetty
+etc/sysctl.conf
+etc/syslog.conf
+home
 home/nobody
+lib
+media
+media/cdrom
+media/floppy
+mnt
+opt
+root
+sbin
+srv
+usr/bin
+usr/bin/perl
+#usr/doc
+#usr/include
+#usr/info
+usr/lib
+#usr/lib/libgcc_s.so
+#usr/lib/libgcc_s.so.1
+#usr/lib/libstdc##.so
+#usr/lib/libstdc##.so.6
+usr/local/bin
 usr/local/bin/connscheduler
-usr/local/bin/dialctrl.pl
-usr/local/bin/hddshutdown
 usr/local/bin/httpscert
-usr/local/bin/makegraphs
-usr/local/bin/qosd
 usr/local/bin/readhash
 usr/local/bin/run-parts
 usr/local/bin/scanhd
 usr/local/bin/setddns.pl
-usr/local/bin/settime
-usr/local/bin/timecheck
 usr/local/bin/vpn-watch
+#usr/local/doc
+#usr/local/include
+#usr/local/info
+#usr/local/lib
+#usr/local/man
+usr/local/sbin
+#usr/local/share
+#usr/local/share/doc
+#usr/local/share/info
+#usr/local/share/locale
+#usr/local/share/man
+#usr/local/share/man/man1
+#usr/local/share/man/man2
+#usr/local/share/man/man3
+#usr/local/share/man/man4
+#usr/local/share/man/man5
+#usr/local/share/man/man6
+#usr/local/share/man/man7
+#usr/local/share/man/man8
+#usr/local/share/misc
+#usr/local/share/terminfo
+#usr/local/share/zoneinfo
+#usr/local/src
+#usr/man
+usr/sbin
+usr/share
+#usr/share/doc
+#usr/share/info
+usr/share/locale
+#usr/share/man
+#usr/share/man/man1
+#usr/share/man/man2
+#usr/share/man/man3
+#usr/share/man/man4
+#usr/share/man/man5
+#usr/share/man/man6
+#usr/share/man/man7
+#usr/share/man/man8
+#usr/share/misc
+usr/share/terminfo
+usr/share/zoneinfo
+var
+var/cache
+var/lib
+var/lib/locate
+var/lib/misc
+var/local
+var/lock
+var/log
+var/log/btmp
+var/log/lastlog
+var/log/wtmp
+var/mail
+var/opt
+var/run
+var/run/utmp
+var/spool
+var/tmp

diff --git a/src/rootfiles/core/strongswan b/src/rootfiles/core/strongswan
new file mode 100644 (file)
index 0000000..344d831
--- /dev/null
+++ b/src/rootfiles/core/strongswan
@@ -0,0 +1,73 @@
+etc/ipsec.conf
+etc/ipsec.d
+etc/ipsec.d/aacerts
+etc/ipsec.d/acerts
+etc/ipsec.d/cacerts
+etc/ipsec.d/certs
+etc/ipsec.d/crls
+etc/ipsec.d/ocspcerts
+etc/ipsec.d/private
+etc/ipsec.d/reqs
+#usr/lib/libstrongswan.a
+#usr/lib/libstrongswan.la
+usr/lib/libstrongswan.so
+usr/lib/libstrongswan.so.0
+usr/lib/libstrongswan.so.0.0.0
+usr/libexec
+usr/libexec/ipsec
+usr/libexec/ipsec/_copyright
+usr/libexec/ipsec/_pluto_adns
+usr/libexec/ipsec/_updown
+usr/libexec/ipsec/_updown_espmark
+usr/libexec/ipsec/charon
+usr/libexec/ipsec/openac
+usr/libexec/ipsec/plugins
+usr/libexec/ipsec/plugins/backends
+#usr/libexec/ipsec/plugins/backends/libcharon-local.a
+#usr/libexec/ipsec/plugins/backends/libcharon-local.la
+usr/libexec/ipsec/plugins/backends/libcharon-local.so
+usr/libexec/ipsec/plugins/backends/libcharon-local.so.0
+usr/libexec/ipsec/plugins/backends/libcharon-local.so.0.0.0
+usr/libexec/ipsec/plugins/eap
+usr/libexec/ipsec/plugins/interfaces
+#usr/libexec/ipsec/plugins/interfaces/libcharon-stroke.a
+#usr/libexec/ipsec/plugins/interfaces/libcharon-stroke.la
+usr/libexec/ipsec/plugins/interfaces/libcharon-stroke.so
+usr/libexec/ipsec/plugins/interfaces/libcharon-stroke.so.0
+usr/libexec/ipsec/plugins/interfaces/libcharon-stroke.so.0.0.0
+usr/libexec/ipsec/pluto
+usr/libexec/ipsec/scepclient
+usr/libexec/ipsec/starter
+usr/libexec/ipsec/stroke
+usr/libexec/ipsec/whack
+usr/sbin/ipsec
+#usr/share/man/man3/anyaddr.3
+#usr/share/man/man3/atoaddr.3
+#usr/share/man/man3/atoasr.3
+#usr/share/man/man3/atosa.3
+#usr/share/man/man3/atoul.3
+#usr/share/man/man3/goodmask.3
+#usr/share/man/man3/initaddr.3
+#usr/share/man/man3/initsubnet.3
+#usr/share/man/man3/keyblobtoid.3
+#usr/share/man/man3/optionsfrom.3
+#usr/share/man/man3/portof.3
+#usr/share/man/man3/prng.3
+#usr/share/man/man3/rangetosubnet.3
+#usr/share/man/man3/sameaddr.3
+#usr/share/man/man3/subnetof.3
+#usr/share/man/man3/ttoaddr.3
+#usr/share/man/man3/ttodata.3
+#usr/share/man/man3/ttosa.3
+#usr/share/man/man3/ttoul.3
+#usr/share/man/man3/version.3
+#usr/share/man/man5/ipsec.conf.5
+#usr/share/man/man5/ipsec.secrets.5
+#usr/share/man/man8/_copyright.8
+#usr/share/man/man8/_updown.8
+#usr/share/man/man8/_updown_espmark.8
+#usr/share/man/man8/ipsec.8
+#usr/share/man/man8/openac.8
+#usr/share/man/man8/pluto.8
+#usr/share/man/man8/scepclient.8
+#usr/share/man/man8/starter.8

diff --git a/tools/make-include b/tools/make-include
index 56ba2913edef8cb7817240d0db60fc12fa77f6cd..58de92f5bb9f09ec39204f93d1aaf3b17a926f63 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -949,7 +949,7 @@ sleep 15
 
 update_langs() {
                echo -ne "Checking the translations for missing or obsolete strings..."
-               chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh}
+               chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl}
                $BASEDIR/tools/sort_strings.pl en
                $BASEDIR/tools/sort_strings.pl de
                $BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en