Hinzugefügt:

  * OpenVPN
  * LZO

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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f90bf623f283cb0b16709de0bcaf36b845aa4f15..93e465b2352ca2a0bcd93b2715e84973860012ce 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -101,6 +101,7 @@
   * linux-atm-2.4.1
   * logrotate-3.7
   * logwatch-6.1.2
+  * lzo-2.02
   * m4-1.4
   * make-3.80
   * make_devices-1.2
@@ -127,6 +128,7 @@
   * openssh-3.9p1
   * openssl-0.9.7i
   * openswan-1.0.10
+  * openvpn-2.0.6
   * pam_mysql-0.7RC1
   * patch-2.5.4
   * pciutils-2.1.11

diff --git a/lfs/glib b/lfs/glib
index 199036c74b26df61a475b9288e907168804ee603..4a2158e61ba397005b07cf35e470ff6334c1aeb2 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
@@ -81,7 +81,7 @@ $(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 --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/lzo b/lfs/lzo
new file mode 100644 (file)
index 0000000..c1e88d5
--- /dev/null
+++ b/lfs/lzo
@@ -0,0 +1,85 @@
+###############################################################################
+# 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>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.02
+
+THISAPP    = lzo-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = ftp://ftp.uni-koeln.de/util/arc
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6760e5819f4238328709bf93bf10071c
+
+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) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/openvpn b/lfs/openvpn
new file mode 100644 (file)
index 0000000..3d839a8
--- /dev/null
+++ b/lfs/openvpn
@@ -0,0 +1,88 @@
+###############################################################################
+# 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>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.0.6
+
+THISAPP    = openvpn-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://openvpn.net/release
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8d2f95fa825e58363a676b25d4815aa7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+#dist: 
+#      make-packages.sh postfix $(THISAPP)
+
+###############################################################################
+# 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) && ./configure --enable-pthread
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 834c942d86062b4ca650bcd5c28914976f35b481..96845bdee07837459cc5ac1469f5f401dd816596 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -667,6 +667,8 @@ buildipcop() {
   ipcopmake openh323
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
+  ipcopmake lzo
+  ipcopmake openvpn
 
 }
 
@@ -927,20 +929,19 @@ dist)
        fi
        ;;
 newpak)
-       # create structure for $VERSION update
-       echo -e "What is the name of the new package?"
-       read $NAME
-       if [ ! -f "lfs/$NAME" ]; then
-               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$NAME"
-               mkdir -p src/paks/$NAME
-               cd src/paks/$NAME
+       # create structure for a new package
+       echo -e "Name of the new package: $2"
+       if [ ! -f "lfs/$2" ]; then
+               echo "`date -u '+%b %e %T'`: Creating directory src/paks/$2"
+               mkdir -p src/paks/$2
+               cd src/paks/$2
                echo "`date -u '+%b %e %T'`: Creating files"
-               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$NAME
+               cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
+
                touch ROOTFILES
                touch CONFFILES
                touch {,un}install.sh
-
-## install.sh
+       ## install.sh
                echo '#!/bin/bash' > install.sh
                echo '#' >> install.sh
                echo '#################################################################' >> install.sh
@@ -951,9 +952,8 @@ newpak)
                echo '#' >> install.sh
                echo '# Extract the files' >> install.sh
                echo 'tar xfz files.tgz -C /' >> install.sh
-               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$NAME' >> install.sh
-
-## uninstall.sh
+               echo 'cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2' >> install.sh
+       ## uninstall.sh
                echo '#!/bin/bash' > uninstall.sh
                echo '#################################################################' >> uninstall.sh
                echo '#                                                               #' >> uninstall.sh
@@ -963,12 +963,20 @@ newpak)
                echo '#' >> uninstall.sh
                echo '# Delete the files' >> uninstall.sh
                echo '## Befehl fehlt noch' >> uninstall.sh
-               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$NAME' >> uninstall.sh
-
+               echo 'rm -f /opt/pakfire/installed/ROOTFILES.$2' >> uninstall.sh
                echo "`date -u '+%b %e %T'`: Adding files to SVN"
-               cd - && svn add src/paks/$NAME
+               cd - && svn add lfs/$2 && svn add src/paks/$2
+
+               echo -n "Do you want to remove the folders? [y/n]"
+               read REM
+               if  [ "$REM" == "y" ]; then
+                       echo "Removing the folders..."
+                       svn del src/paks/$2 --force
+               else
+                       echo "Folders are kept."
+               fi
        else
-               echo "$NAME already exists"
+               echo "$2 already exists"
        fi
        exit 0
        ;;
@@ -1083,8 +1091,12 @@ gettoolchain)
                fi
        fi
        ;;
+update)
+       echo "Load the latest source-files:"
+       svn update
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newupdate|prefetch|rootfiles|shell|toolchain}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|dist|gettoolchain|newpak|prefetch|rootfiles|shell|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;