Update:
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Mon, 7 Aug 2006 19:02:40 +0000 (19:02 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Mon, 7 Aug 2006 19:02:40 +0000 (19:02 +0000)
  * GnuPG aktualisiert.
Hinzugefügt:
  * Möglichkeit eine Quellen-ISO zu erstellen.
  * Patch für einen SiS-Chipsatz.
  * /home/nobody

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

doc/ChangeLog
lfs/Config
lfs/configroot
lfs/gnupg
lfs/linux
lfs/sources-iso [new file with mode: 0644]
make.sh
src/ROOTFILES.i386
src/patches/linux-sis-965l.patch [new file with mode: 0644]

index 50a7f8c..bd20296 100644 (file)
@@ -1,3 +1,11 @@
+------------------------------------------------------------------------
+r238 | ms | 2006-08-06 22:07:18 +0200 (So, 06 Aug 2006) | 5 lines
+
+Geändert:
+  * NEUER KERNEL 2.4.31 --> 2.4.32... EXPERIMENTAL!!!
+  * Fix für mldonkey...
+  * Bootsplash-Patch gefixt. Unsinnige Sache entfernt.
+
 ------------------------------------------------------------------------
 r237 | delaco | 2006-08-03 12:03:21 +0200 (Do, 03 Aug 2006) | 3 lines
 
index b53c96a..fe6149a 100644 (file)
@@ -130,6 +130,7 @@ define MD5
        # error mean file signature don't match the one in lfs script
        [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
        echo "$@ checksum OK"
+       echo "$@" >>$(DIR_INFO)/_build.packages-list.log
 endef
 
 define PAK
index 35c8a03..8c96282 100644 (file)
@@ -50,7 +50,7 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create all directories
-       for i in addon-lang alcatelusb auth backup backup/sets ca certs cnx_pci connscheduler crls ddns dhcp dhcpc dmzholes \
+       for i in addon-lang alcatelusb auth backup ca certs cnx_pci connscheduler crls ddns dhcp dhcpc dmzholes \
            eagle-usb eciadsl ethernet isdn key langs logging main mbmon modem net-traffic nfs optionsfw outgoing patches pakfire portfw \
            ppp private proxy/advanced qos/bin red remote snort time urlfilter/autoupdate urlfilter/bin vpn wakeonlan wireless xtaccess ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \
@@ -128,7 +128,6 @@ $(TARGET) :
        for i in backup/ header.pl general-functions.pl lang.pl addon-lang/ langs/ red/ ; do \
             chown -R root:root $(CONFIG_ROOT)/$$i; \
        done
-       chown nobody:nobody $(CONFIG_ROOT)/backup/sets
        chown root:nobody $(CONFIG_ROOT)/dhcpc
 
        @$(POSTBUILD)
index a9872d3..4fbe821 100644 (file)
--- a/lfs/gnupg
+++ b/lfs/gnupg
 # 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: gnupg,v 1.5.2.6 2005/07/27 23:12:41 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
 
 include Config
 
-VER        = 1.4.2
+VER        = 1.4.5
 
 THISAPP    = gnupg-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://ftp.linux.it/pub/mirrors/gnupg/gnupg
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 09825744d59db5ed87713c5a3487cd9d
+$(DL_FILE)_MD5 = 811525965b4c0987e6418a7729a6444d
 
 install : $(TARGET)
 
@@ -77,10 +71,10 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        rm -rf /home/nobody/.gnupg /root/.gnupg
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-mailto \
-           --disable-photo-viewers --disable-ldap
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-minimal --disable-nls \
+               --disable-dns-srv --disable-dns-pka --disable-dns-cert
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        gpg --import $(DIR_SRC)/config/cfgroot/ipcop.gpg
index b69e50e..012d8b9 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -115,6 +115,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC) && ln -sf linux-$(VER) linux
        cd $(DIR_APP) && sed -i -e 's/-Werror//' drivers/scsi/aic7xxx/Makefile
 
+       # add IDE SiS 965L support to SiS driver. Request sf#1517522
+       cd $(DIR_SRC) && patch -p0  < $(DIR_SRC)/src/patches/linux-sis-965l.patch
+
        # Openswan
        cd $(DIR_SRC) && rm -rf openswan-*
        cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-1.0.10.tar.gz
diff --git a/lfs/sources-iso b/lfs/sources-iso
new file mode 100644 (file)
index 0000000..76a7387
--- /dev/null
@@ -0,0 +1,59 @@
+###############################################################################
+# 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
+
+THISAPP    = sources-iso
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+install : $(DIR_INFO)/_build.packages-list.log
+       rm -rf /install/cdrom/*
+       for i in `cat $(DIR_INFO)/_build.packages-list.log`; do \
+               cp $(DIR_DL)/$$i /install/cdrom; \
+       done
+       
+       # make the sources CDROM iso
+       if [ "$(MACHINE)" == "i386" ]; then \
+               cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
+                       . > /install/images/$(SNAME)-sources-cd-$(VERSION).$(MACHINE).iso; \
+       elif [ "$(MACHINE)" == "alpha" ]; then \
+               cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
+                       . > /install/images/$(SNAME)-sources-cd-$(VERSION).$(MACHINE).iso; \
+       fi
+       rm -rf /install/cdrom/*
diff --git a/make.sh b/make.sh
index 90121ac..022e5fb 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -1134,6 +1134,17 @@ gettoolchain)
                echo "Toolchain is already downloaded. Exiting..."
        fi
        ;;
+sources-iso)
+       prepareenv
+       echo "`date -u '+%b %e %T'`: Build sources iso for $MACHINE" | tee -a $LOGFILE
+       chroot $LFS /tools/bin/env -i   HOME=/root \
+       TERM=$TERM PS1='\u:\w\$ ' \
+       PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+       VERSION=$VERSION NAME="$NAME" SNAME="$SNAME" MACHINE=$MACHINE \
+       /bin/bash -x -c "cd /usr/src/lfs && make -f sources-iso LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
+       mv $LFS/install/images/ipfire-* $BASEDIR >> $LOGFILE 2>&1
+       stdumount
+       ;;
 svn)
        case "$2" in
          update|up)
@@ -1296,7 +1307,7 @@ END
        ;;
 sync)
        echo -e "Syncing cache to ftp:"
-       rm -f doc/packages-to-remove-from-ftp
+#      rm -f doc/packages-to-remove-from-ftp
        ncftpls -u $IPFIRE_FTP_USER_INT -p $IPFIRE_FTP_PASS_INT ftp://$IPFIRE_FTP_URL_INT$IPFIRE_FTP_PATH_INT/ > ftplist
        for i in `ls -w1 cache/`; do
                grep $i ftplist
@@ -1309,12 +1320,12 @@ sync)
                        fi
                fi
        done
-       for i in `cat ftplist`; do
-               ls -w1 cache/ | grep $i
-               if [ "$?" -eq "1" ]; then
-                       echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
-               fi
-       done
+#      for i in `cat ftplist`; do
+#              ls -w1 cache/ | grep $i
+#              if [ "$?" -eq "1" ]; then
+#                      echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
+#              fi
+#      done
        rm -f ftplist
        ;;
 upload)
@@ -1484,6 +1495,9 @@ unattended)
        echo "### SAVING TIME"
        export IPFIRE_START_TIME=`date`
 
+       echo "### GETTING TOOLCHAIN"
+       $0 gettoolchain
+
        echo "### RUNNING SVN-UPDATE"
        $0 svn update
        if [ $? -ne 0 ]; then
@@ -1512,6 +1526,9 @@ unattended)
                exit 1
        fi
 
+       echo "### MAKING SOURCES-ISO"
+       $0 sources-iso
+
        echo "### UPLOADING ISO"
        $0 upload iso
        if [ $? -ne 0 ]; then
index 7320d07..2ece52d 100644 (file)
@@ -1323,7 +1323,7 @@ etc/securetty
 etc/sysctl.conf
 etc/syslog.conf
 #home
-#home/nobody
+home/nobody
 #lib
 mnt
 #opt
@@ -13005,7 +13005,7 @@ bin/ping
 #usr/bin/rlogin
 #usr/bin/rsh
 #usr/bin/talk
-#usr/bin/telnet
+usr/bin/telnet
 #usr/bin/tftp
 #usr/share/info/inetutils.info
 #usr/share/info/inetutils.info-1
@@ -22224,7 +22224,7 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/GD/GD.so
 #usr/share/man/man3/GD.3
 #usr/share/man/man3/GD::Polyline.3
 ##
-## gnupg-1.4.2
+## gnupg-1.4.5
 ##
 #root/.gnupg
 root/.gnupg/gpg.conf
diff --git a/src/patches/linux-sis-965l.patch b/src/patches/linux-sis-965l.patch
new file mode 100644 (file)
index 0000000..f9ccdd9
--- /dev/null
@@ -0,0 +1,13 @@
+--- linux/drivers/ide/pci/sis5513.c.old        2004-08-08 01:26:04.000000000 +0200
++++ linux/drivers/ide/pci/sis5513.c    2006-07-16 02:00:51.000000000 +0200
+@@ -789,6 +789,10 @@
+                               printk(KERN_INFO "SIS5513: SiS 962/963 MuTIOL IDE UDMA133 controller\n");
+                               chipset_family = ATA_133;
+                       }
++                      if (trueid == 0x180) { /* sis965L */
++                              printk(KERN_INFO "SIS5513: SiS 965L IDE UDMA133 controller\n");
++                              chipset_family = ATA_133;
++                      }
+       }
+       if (!chipset_family) { /* Belongs to pci-quirks */