Add 7zip package

diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip
new file mode 100644 (file)
index 0000000..ff0eea8
--- /dev/null
+++ b/config/rootfiles/packages/7zip
@@ -0,0 +1,63 @@
+usr/local/bin/7z
+usr/local/lib/p7zip
+#usr/local/lib/p7zip/7z
+#usr/local/lib/p7zip/7z.so
+#usr/local/lib/p7zip/Codecs
+#usr/local/lib/p7zip/Codecs/Rar29.so
+#usr/local/man/man1/7z.1
+#usr/local/man/man1/7za.1
+#usr/local/man/man1/7zr.1
+#usr/local/share/doc/p7zip
+#usr/local/share/doc/p7zip/ChangeLog
+#usr/local/share/doc/p7zip/DOCS
+#usr/local/share/doc/p7zip/DOCS/7zC.txt
+#usr/local/share/doc/p7zip/DOCS/7zFormat.txt
+#usr/local/share/doc/p7zip/DOCS/License.txt
+#usr/local/share/doc/p7zip/DOCS/MANUAL
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm
+#usr/local/share/doc/p7zip/DOCS/Methods.txt
+#usr/local/share/doc/p7zip/DOCS/copying.txt
+#usr/local/share/doc/p7zip/DOCS/history.txt
+#usr/local/share/doc/p7zip/DOCS/lzma.txt
+#usr/local/share/doc/p7zip/DOCS/readme.txt
+#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt
+#usr/local/share/doc/p7zip/README

diff --git a/lfs/7zip b/lfs/7zip
new file mode 100644 (file)
index 0000000..358db93
--- /dev/null
+++ b/lfs/7zip
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# 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
+
+VER        = 4.58
+
+THISAPP    = p7zip_$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = 7zip
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 315b184102c17c4956f53218d973222d
+
+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)
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && make 7z $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 31a1e13c0cea5254fc61405c04d4c4877dfe8628..9c42c6d36adc05bf3ae975d8f5b20e542b62756f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-beta4"
+VERSION="2.3-test"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -349,6 +349,7 @@ buildipfire() {
   ipfiremake v4l-dvb                   KVER=2.6.25.17
   ipfiremake madwifi                   KVER=2.6.25.17
   ipfiremake alsa              KMOD=1  KVER=2.6.25.17
+#  ipfiremake openswan         KMOD=1  KVER=2.6.25.17
   ipfiremake linux
   ipfiremake atl2
   ipfiremake r8168
@@ -596,6 +597,7 @@ buildipfire() {
   ipfiremake apcupsd
   ipfiremake iperf
   ipfiremake netcat
+  ipfiremake 7zip
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild