Hinzugefügt:

* Midnight Commander 4.6.1 (GLIB/PKG-CONFIG)
Geändert:
  * OpenLDAP
  * PWLib - Compilier-Optionen
  * make-packages - Funktionen erweitert


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

doc/packages-list.txt

@@ -65,6 +65,7 @@
   * gd-2.0.20
   * gdbm-1.8.3
   * gettext-0.14.1
+  * glib-2.9.6
   * glibc-2.3.3-lfs-5.1
   * gmp-4.1.2
   * gnupg-1.4.2
@@ -106,6 +107,7 @@
   * man-1.5p
   * man-pages-2.17
   * mbr-1.1.8
+  * mc-4.6.1
   * mingetty-1.06
   * misc-progs
   * mktemp-1.5
@@ -131,6 +133,7 @@
   * pcmcia-cs-3.2.8
   * pcre-4.5
   * perl-5.8.5
+  * pkg-config-0.20
   * popt-1.7
   * postfix-2.2.9
   * ppp-2.4.2

lfs/glib

@@ -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.9.6
+
+THISAPP    = glib-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = ftp://ftp.gtk.org/pub/gtk/v2.9
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2ba1146e767454e14ac0788187c35892
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+#dist: 
+#	make-packages.sh glib $(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 jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

lfs/mc

@@ -0,0 +1,93 @@
+###############################################################################
+# 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        = 4.6.1
+
+THISAPP    = mc-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://www.ibiblio.org/pub/Linux/utils/file/managers/mc
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 18b20db6e40480a53bac2870c56fc3c4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	make-packages.sh mc $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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 --with-screen=mcslang --without-x --disable-nls # This has to be enabled when samba is in the SVN: --with-samba
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	mv /usr/bin/mc /usr/bin/mcc
+	echo -e "#!/bin/bash" > /usr/bin/mc
+	echo -e "# Start MC in color-mode" >> /usr/bin/mc
+	echo -e "/usr/bin/mcc -c" >> /usr/bin/mc
+	chmod 755 /usr/bin/mc
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

lfs/openldap

@@ -75,7 +75,21 @@ $(subst %,%_MD5,$(objects)) :
 $(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 --libexecdir=/usr/sbin --sysconfdir=/etc --localstatedir=/srv/ldap --disable-debug --enable-dynamic --enable-crypt --enable-modules --enable-ldap --enable-ldbm --enable-dyngroup --enable-dynlist --enable-ppolicy --enable-valsort --disable-nls
+	cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/etc --localstatedir=/srv/ldap \
+				--disable-debug \
+				--enable-dynamic \
+				--enable-crypt \
+				--enable-modules \
+				--enable-ldap \
+				--enable-ldbm \
+				--enable-dyngroup \
+				--enable-dynlist \
+				--enable-ppolicy \
+				--enable-valsort \
+				--disable-nls \
+				--enable-perl \
+				--enable-shell \
+				--with-cyrus-sasl
 	cd $(DIR_APP) && make depend
 	cd $(DIR_APP) && make
 #	cd $(DIR_APP) && make test

lfs/pkg-config

@@ -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        = 0.20
+
+THISAPP    = pkg-config-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://pkgconfig.freedesktop.org/releases
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = fb42402593e4198bc252ab248dd4158b
+
+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 --prefix=/usr
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

lfs/pwlib

@@ -80,6 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	mv /usr/include/ldap.h /
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make opt && make install
+	cd $(DIR_APP) && make both && make install
 	mv /ldap.h /usr/include
 	@$(POSTBUILD)

make.sh

@@ -2,35 +2,30 @@
 #
 ############################################################################
 #                                                                          #
-# This file is part of the IPCop Firewall.                                 #
+# This file is part of the IPFire Firewall.                                #
 #                                                                          #
-# IPCop is free software; you can redistribute it and/or modify            #
+# IPFire 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,                 #
+# IPFire 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                     #
+# along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2001 Mark Wormgoor <mark@wormgoor.com>.                    #
+# Copyright (C) 2006 IPFire-Team <entwickler@ipfire.org>.                  #
-#                                                                          #
-# (c) 2001 Eric S. Johansson <esj@harvee.billerica.ma.us> Check for Bash   #
-# (c) 2002 Thorsten Fischer <frosch@cs.tu-berlin.de> MD5Sum checking       #
 #                                                                          #
 ############################################################################
-#
-# $Id: make.sh,v 1.129.2.145 2006/02/01 07:04:09 gespinasse Exp $
 #
 
-  NAME="IPFire"				# Software name
+  NAME="IPFire"			# Software name
   SNAME="ipfire"			# Short name
-  VERSION="1.4"				# Version number
+  VERSION="1.4"			# Version number
 # PREVIOUSTAG=IPCOP_v1_4_10_FINAL
   SLOGAN="We secure your network"	# Software slogan
   CONFIG_ROOT=/var/ipfire		# Configuration rootdir
@@ -652,6 +647,8 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
+  ipcopmake pkg-config
+  ipcopmake glib
   ipcopmake wget
   ipcopmake berkeley-DB
   ipcopmake xampp
@@ -661,13 +658,15 @@ buildipcop() {
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
+#  ipcopmake samba
+  ipcopmake mc
   ipcopmake postfix
   ipcopmake stund
   ipcopmake lpd
   ipcopmake pwlib
   ipcopmake openh323
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
-  ipcopmake hddtemp
+#  ipcopmake hddtemp
 
 }
 
@@ -759,7 +758,7 @@ buildpackages() {
   
   # Build IPFire packages
   ipfiredist postfix
-
+  ipfiredist mc
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -927,30 +926,50 @@ dist)
 		fi
 	fi
 	;;
-newupdate)
+newpak)
 	# create structure for $VERSION update
-	if [ ! -f "updates/$VERSION" ]; then
+	echo -e "What is the name of the new package?"
-		mkdir -p updates/$VERSION
+	read $NAME
-		cd updates/$VERSION
+	if [ ! -f "lfs/$NAME" ]; then
-		touch information
+		echo "`date -u '+%b %e %T'`: Creating directory src/paks/$NAME"
-		echo 'etc/issue' > ROOTFILES.alpha-$VERSION
+		mkdir -p src/paks/$NAME
-		echo 'etc/issue' > ROOTFILES.i386-$VERSION
+		cd src/paks/$NAME
-		echo 'patch.tar.gz' > .cvsignore
+		echo "`date -u '+%b %e %T'`: Creating files"
-		sed -e "s+^UPGRADEVERSION.*$+UPGRADEVERSION=$VERSION+" $BASEDIR/src/scripts/updatesetup > setup
+		cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$NAME
-		chmod 755 setup
+		touch ROOTFILES
-		cd ..
+		touch CONFFILES
-		echo "Adding directory $VERSION to cvs"
+		touch {,un}install.sh
-		cvs add $VERSION
+
-		echo "Adding files to cvs"
+## install.sh
-		cvs add $VERSION/ROOTFILES.alpha-$VERSION \
+		echo '#!/bin/bash' > install.sh
-			$VERSION/ROOTFILES.i386-$VERSION \
+		echo '#' >> install.sh
-			$VERSION/information \
+		echo '#################################################################' >> install.sh
-			$VERSION/setup \
+		echo '#                                                               #' >> install.sh
-			$VERSION/.cvsignore
+		echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> install.sh
+		echo '#                                                               #' >> install.sh
+		echo '#################################################################' >> install.sh
+		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 '#!/bin/bash' > uninstall.sh
+		echo '#################################################################' >> uninstall.sh
+		echo '#                                                               #' >> uninstall.sh
+		echo '# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #' >> uninstall.sh
+		echo '#                                                               #' >> uninstall.sh
+		echo '#################################################################' >> uninstall.sh
+		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 "`date -u '+%b %e %T'`: Adding files to SVN"
+		cd - && svn add src/paks/$NAME
 	else
-		echo "update/$VERSION already exist"
+		echo "$NAME already exists"
 	fi
-	cd -
 	exit 0
 	;;
 prefetch)

src/paks/mc/ROOTFILES

@@ -0,0 +1,158 @@
+usr/bin/mc
+usr/bin/mcc
+usr/bin/mcedit
+usr/bin/mcmfmt
+usr/bin/mcview
+usr/lib/mc
+usr/lib/mc/cons.saver
+#usr/share/locale/az/LC_MESSAGES/mc.mo
+#usr/share/locale/be/LC_MESSAGES/mc.mo
+#usr/share/locale/bg/LC_MESSAGES/mc.mo
+#usr/share/locale/ca/LC_MESSAGES/mc.mo
+#usr/share/locale/cs/LC_MESSAGES/mc.mo
+#usr/share/locale/da/LC_MESSAGES/mc.mo
+#usr/share/locale/de/LC_MESSAGES/mc.mo
+#usr/share/locale/el/LC_MESSAGES/mc.mo
+#usr/share/locale/es/LC_MESSAGES/mc.mo
+#usr/share/locale/eu/LC_MESSAGES/mc.mo
+#usr/share/locale/fi/LC_MESSAGES/mc.mo
+#usr/share/locale/fr/LC_MESSAGES/mc.mo
+#usr/share/locale/hu/LC_MESSAGES/mc.mo
+#usr/share/locale/it/LC_MESSAGES/mc.mo
+#usr/share/locale/ja/LC_MESSAGES/mc.mo
+#usr/share/locale/ko/LC_MESSAGES/mc.mo
+#usr/share/locale/lt/LC_MESSAGES/mc.mo
+#usr/share/locale/lv/LC_MESSAGES/mc.mo
+#usr/share/locale/mn/LC_MESSAGES/mc.mo
+#usr/share/locale/nl/LC_MESSAGES/mc.mo
+#usr/share/locale/no/LC_MESSAGES/mc.mo
+#usr/share/locale/pl/LC_MESSAGES/mc.mo
+#usr/share/locale/pt/LC_MESSAGES/mc.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/mc.mo
+#usr/share/locale/ro/LC_MESSAGES/mc.mo
+#usr/share/locale/ru/LC_MESSAGES/mc.mo
+#usr/share/locale/sk/LC_MESSAGES/mc.mo
+#usr/share/locale/sl/LC_MESSAGES/mc.mo
+#usr/share/locale/sr/LC_MESSAGES/mc.mo
+#usr/share/locale/sv/LC_MESSAGES/mc.mo
+#usr/share/locale/ta/LC_MESSAGES/mc.mo
+#usr/share/locale/tr/LC_MESSAGES/mc.mo
+#usr/share/locale/uk/LC_MESSAGES/mc.mo
+#usr/share/locale/wa/LC_MESSAGES/mc.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/mc.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/mc.mo
+#usr/share/man/es/man1/mc.1
+#usr/share/man/hu/man1/mc.1
+#usr/share/man/it/man1/mc.1
+#usr/share/man/man1/mc.1
+#usr/share/man/man1/mcedit.1
+#usr/share/man/man1/mcview.1
+#usr/share/man/pl/man1/mc.1
+#usr/share/man/ru/man1
+#usr/share/man/ru/man1/mc.1
+#usr/share/man/sr
+#usr/share/man/sr/man1
+#usr/share/man/sr/man1/mc.1
+#usr/share/man/sr/man8
+usr/share/mc
+#usr/share/mc/bin
+#usr/share/mc/bin/mc-wrapper.csh
+#usr/share/mc/bin/mc-wrapper.sh
+#usr/share/mc/bin/mc.csh
+#usr/share/mc/bin/mc.sh
+#usr/share/mc/cedit.menu
+#usr/share/mc/edit.indent.rc
+#usr/share/mc/edit.spell.rc
+#usr/share/mc/extfs
+#usr/share/mc/extfs/README
+#usr/share/mc/extfs/a
+#usr/share/mc/extfs/apt
+#usr/share/mc/extfs/audio
+#usr/share/mc/extfs/bpp
+#usr/share/mc/extfs/deb
+#usr/share/mc/extfs/deba
+#usr/share/mc/extfs/debd
+#usr/share/mc/extfs/dpkg
+#usr/share/mc/extfs/extfs.ini
+#usr/share/mc/extfs/hp48
+#usr/share/mc/extfs/iso9660
+#usr/share/mc/extfs/lslR
+#usr/share/mc/extfs/mailfs
+#usr/share/mc/extfs/patchfs
+#usr/share/mc/extfs/rpm
+#usr/share/mc/extfs/rpms
+#usr/share/mc/extfs/sfs.ini
+#usr/share/mc/extfs/trpm
+#usr/share/mc/extfs/uar
+#usr/share/mc/extfs/uarj
+#usr/share/mc/extfs/uha
+#usr/share/mc/extfs/ulha
+#usr/share/mc/extfs/urar
+#usr/share/mc/extfs/uzip
+#usr/share/mc/extfs/uzoo
+#usr/share/mc/mc.ext
+#usr/share/mc/mc.hint
+#usr/share/mc/mc.hint.cs
+#usr/share/mc/mc.hint.es
+#usr/share/mc/mc.hint.hu
+#usr/share/mc/mc.hint.it
+#usr/share/mc/mc.hint.nl
+#usr/share/mc/mc.hint.pl
+#usr/share/mc/mc.hint.ru
+#usr/share/mc/mc.hint.sr
+#usr/share/mc/mc.hint.uk
+#usr/share/mc/mc.hint.zh
+#usr/share/mc/mc.hlp
+#usr/share/mc/mc.hlp.es
+#usr/share/mc/mc.hlp.hu
+#usr/share/mc/mc.hlp.it
+#usr/share/mc/mc.hlp.pl
+#usr/share/mc/mc.hlp.ru
+#usr/share/mc/mc.hlp.sr
+#usr/share/mc/mc.lib
+#usr/share/mc/mc.menu
+#usr/share/mc/mc.menu.sr
+#usr/share/mc/syntax
+#usr/share/mc/syntax/Syntax
+#usr/share/mc/syntax/ada95.syntax
+#usr/share/mc/syntax/aspx.syntax
+#usr/share/mc/syntax/assembler.syntax
+#usr/share/mc/syntax/c.syntax
+#usr/share/mc/syntax/changelog.syntax
+#usr/share/mc/syntax/cs.syntax
+#usr/share/mc/syntax/diff.syntax
+#usr/share/mc/syntax/dos.syntax
+#usr/share/mc/syntax/eiffel.syntax
+#usr/share/mc/syntax/fortran.syntax
+#usr/share/mc/syntax/html.syntax
+#usr/share/mc/syntax/idl.syntax
+#usr/share/mc/syntax/java.syntax
+#usr/share/mc/syntax/js.syntax
+#usr/share/mc/syntax/latex.syntax
+#usr/share/mc/syntax/lisp.syntax
+#usr/share/mc/syntax/lsm.syntax
+#usr/share/mc/syntax/lua.syntax
+#usr/share/mc/syntax/m4.syntax
+#usr/share/mc/syntax/mail.syntax
+#usr/share/mc/syntax/makefile.syntax
+#usr/share/mc/syntax/ml.syntax
+#usr/share/mc/syntax/nroff.syntax
+#usr/share/mc/syntax/octave.syntax
+#usr/share/mc/syntax/pascal.syntax
+#usr/share/mc/syntax/perl.syntax
+#usr/share/mc/syntax/php.syntax
+#usr/share/mc/syntax/po.syntax
+#usr/share/mc/syntax/povray.syntax
+#usr/share/mc/syntax/python.syntax
+#usr/share/mc/syntax/ruby.syntax
+#usr/share/mc/syntax/sh.syntax
+#usr/share/mc/syntax/slang.syntax
+#usr/share/mc/syntax/smalltalk.syntax
+#usr/share/mc/syntax/spec.syntax
+#usr/share/mc/syntax/sql.syntax
+#usr/share/mc/syntax/swig.syntax
+#usr/share/mc/syntax/syntax.syntax
+#usr/share/mc/syntax/tcl.syntax
+#usr/share/mc/syntax/texinfo.syntax
+#usr/share/mc/syntax/unknown.syntax
+#usr/share/mc/syntax/xml.syntax

src/paks/mc/install.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+tar xfz files.tgz -C /
+

src/scripts/make-packages.sh

@@ -3,7 +3,7 @@
 ##							      ##
 ## Make packages					      ##
 ##  							      ##
-## (c) www.ipfire.org - GPL				      ##
+## (c) www.ipfire.org - GPL	v2			      ##
 ## 							      ##
 ########################################################
 echo "`date -u '+%b %e %T'`: Packing $1" | tee -a $LOGFILE
@@ -13,13 +13,16 @@ cd / && mkdir -p /paks/$1
 #
 cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh
-tar cfz /paks/$1/files.tgz --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
+
-tar cfz /paks/$1/conf.tgz  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+tar cvfz /paks/$1/files.tgz --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
-cd /paks/$1 && tar cfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh && cd ..
+
+tar cvfz /paks/$1/conf.tgz  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh && cd ..
+
 md5sum $2.tar.gz >> $2.tar.gz.md5
 
 ## Clean up!
 #
-rm -rf /paks/$1
+rm -rf /paks
 
 exit 0

src/scripts/setreservedports

@@ -1,45 +1,45 @@
-#!/bin/sh
+#!/bin/sh
-#
+#
-# $Id: setreservedports,v 1.1.2.3 2005/09/07 21:38:50 eoberlander Exp $
+# $Id: setreservedports,v 1.1.2.3 2005/09/07 21:38:50 eoberlander Exp $
-# Change https server port only at this time,
+# Change https server port only at this time,
-# it will be integrate in web interface later
+# it will be integrate in web interface later
-# suggested port for https interface could be 5445
+# suggested port for https interface could be 5445
-
+
-SSH=222
+SSH=222
-
+
-if [ $# -lt 1 ]; then
+if [ $# -lt 1 ]; then
-	echo "Give an https port number, recommended value is non-assigned port 5445"
+	echo "Give an https port number, recommended value is non-assigned port 5445"
-else
+else
-	if [ "$1" -lt "445" -o "$1" -gt "65535" ]; then
+	if [ "$1" -lt "444" -o "$1" -gt "65535" ]; then
-		echo "support only a port value from 445 to 65535"
+		echo "support only a port value from 445 to 65535"
-		echo "recommended value is non-assigned port 5445"
+		echo "recommended value is non-assigned port 5445"
-	else
+	else
-		HTTPS=$1
+		HTTPS=$1
-		/bin/sed -i -e "s+# TCP 67,68,81.*$+# TCP 67,68,81,$SSH,$HTTPS+" \
+		/bin/sed -i -e "s+# TCP 67,68,81.*$+# TCP 67,68,81,$SSH,$HTTPS+" \
-		-e "s+my @tcp_reserved = (81.*$+my @tcp_reserved = (81,$SSH,$HTTPS);+" \
+		-e "s+my @tcp_reserved = (81.*$+my @tcp_reserved = (81,$SSH,$HTTPS);+" \
-		/home/httpd/cgi-bin/portfw.cgi
+		/home/httpd/cgi-bin/portfw.cgi
-		
+		
-		# only the second Listen only has {3,5} digits if the first is 81
+		# only the second Listen only has {3,5} digits if the first is 81
-		/bin/sed -i -e "+s+Listen [0-9]\{3,5\}$+Listen $HTTPS+" \
+		/bin/sed -i -e "+s+Listen [0-9]\{3,5\}$+Listen $HTTPS+" \
-		-e "s+<VirtualHost _default_.*$+<VirtualHost _default_:$HTTPS>+" \
+		-e "s+<VirtualHost _default_.*$+<VirtualHost _default_:$HTTPS>+" \
-		/etc/httpd/conf/httpd.conf
+		/etc/httpd/conf/httpd.conf
-		
+		
-		/bin/sed -i -e "s+:[0-9]\{3,5\}/\$ENV{'PATH_INFO'}+:$HTTPS/\$ENV{'PATH_INFO'}+" \
+		/bin/sed -i -e "s+:[0-9]\{3,5\}/\$ENV{'PATH_INFO'}+:$HTTPS/\$ENV{'PATH_INFO'}+" \
-		/var/ipcop/header.pl
+		/var/ipcop/header.pl
-		
+		
-		/bin/sed -i -e "s+acl IPFire_https port.*$+acl IPCop_https port $HTTPS+" \
+		/bin/sed -i -e "s+acl IPFire_https port.*$+acl IPCop_https port $HTTPS+" \
-		/var/ipcop/proxy/acl
+		/var/ipcop/proxy/acl
-		/bin/chown nobody:nobody /var/ipcop/proxy/acl
+		/bin/chown nobody:nobody /var/ipcop/proxy/acl
-		
+		
-		/bin/sed -i -e "s+acl IPFire_https port.*$+acl IPCop_https port $HTTPS+" \
+		/bin/sed -i -e "s+acl IPFire_https port.*$+acl IPCop_https port $HTTPS+" \
-		/var/ipcop/proxy/squid.conf
+		/var/ipcop/proxy/squid.conf
-		/bin/chown nobody:nobody /var/ipcop/proxy/squid.conf
+		/bin/chown nobody:nobody /var/ipcop/proxy/squid.conf
-		
+		
-		# restart everything impacted
+		# restart everything impacted
-		/bin/killall httpd
+		/bin/killall httpd
-		sleep 2
+		sleep 2
-		/usr/sbin/httpd
+		/usr/sbin/httpd
-		/usr/local/bin/restartsquid
+		/usr/local/bin/restartsquid
-		/usr/bin/logger -s -p local0.info "$0 :https port shift to $HTTPS"
+		/usr/bin/logger -s -p local0.info "$0 :https port shift to $HTTPS"
-	fi
+	fi
-fi
+fi