Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Dec 2010 14:32:19 +0000 (15:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Dec 2010 14:32:19 +0000 (15:32 +0100)
38 files changed:
config/rootfiles/core/44/exclude [moved from config/rootfiles/core/43/exclude with 100% similarity]
config/rootfiles/core/44/filelists/acl [moved from config/rootfiles/core/43/filelists/acl with 100% similarity]
config/rootfiles/core/44/filelists/apache2 [moved from config/rootfiles/core/43/filelists/apache2 with 100% similarity]
config/rootfiles/core/44/filelists/attr [moved from config/rootfiles/core/43/filelists/attr with 100% similarity]
config/rootfiles/core/44/filelists/cpio [moved from config/rootfiles/core/43/filelists/cpio with 100% similarity]
config/rootfiles/core/44/filelists/dhcpcd [moved from config/rootfiles/core/43/filelists/dhcpcd with 100% similarity]
config/rootfiles/core/44/filelists/dnsmasq [moved from config/rootfiles/core/43/filelists/dnsmasq with 100% similarity]
config/rootfiles/core/44/filelists/dracut [moved from config/rootfiles/core/43/filelists/dracut with 100% similarity]
config/rootfiles/core/44/filelists/files [moved from config/rootfiles/core/43/filelists/files with 100% similarity]
config/rootfiles/core/44/filelists/findutils [moved from config/rootfiles/core/43/filelists/findutils with 100% similarity]
config/rootfiles/core/44/filelists/fireinfo [moved from config/rootfiles/core/43/filelists/fireinfo with 100% similarity]
config/rootfiles/core/44/filelists/grub [moved from config/rootfiles/core/43/filelists/grub with 100% similarity]
config/rootfiles/core/44/filelists/iw [moved from config/rootfiles/core/43/filelists/iw with 100% similarity]
config/rootfiles/core/44/filelists/libcap [moved from config/rootfiles/core/43/filelists/libcap with 100% similarity]
config/rootfiles/core/44/filelists/linux [moved from config/rootfiles/core/43/filelists/linux with 100% similarity]
config/rootfiles/core/44/filelists/linux-firmware [moved from config/rootfiles/core/43/filelists/linux-firmware with 100% similarity]
config/rootfiles/core/44/filelists/python [moved from config/rootfiles/core/43/filelists/python with 100% similarity]
config/rootfiles/core/44/filelists/smartmontools [moved from config/rootfiles/core/43/filelists/smartmontools with 100% similarity]
config/rootfiles/core/44/filelists/squid [moved from config/rootfiles/core/43/filelists/squid with 100% similarity]
config/rootfiles/core/44/filelists/strongswan [moved from config/rootfiles/core/43/filelists/strongswan with 100% similarity]
config/rootfiles/core/44/filelists/tcl [moved from config/rootfiles/core/43/filelists/tcl with 100% similarity]
config/rootfiles/core/44/filelists/udev [moved from config/rootfiles/core/43/filelists/udev with 100% similarity]
config/rootfiles/core/44/filelists/usb_modeswitch [moved from config/rootfiles/core/43/filelists/usb_modeswitch with 100% similarity]
config/rootfiles/core/44/filelists/usb_modeswitch_data [moved from config/rootfiles/core/43/filelists/usb_modeswitch_data with 100% similarity]
config/rootfiles/core/44/filelists/wireless [moved from config/rootfiles/core/43/filelists/wireless with 100% similarity]
config/rootfiles/core/44/filelists/wpa_supplicant [moved from config/rootfiles/core/43/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/core/44/meta [moved from config/rootfiles/core/43/meta with 100% similarity]
config/rootfiles/core/44/update.sh [moved from config/rootfiles/core/43/update.sh with 100% similarity]
config/rootfiles/oldcore/42/exclude
config/rootfiles/packages/ipfireseeder
html/cgi-bin/proxy.cgi
lfs/compat-wireless
lfs/ipfireseeder
lfs/openssl
make.sh
src/install+setup/install/downloadsource.sh
src/install+setup/install/main.c
src/paks/linux-pae/install.sh

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..01b7a7f2ae19f30fe926138af409e181b810dcc4 100644 (file)
@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
index e1c32b7554d16e5c2899dff7adf139ca7675b702..e31f42c581835f516e3480b3863bb61b11bb9bb6 100644 (file)
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core42.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent
 #var/log/seeder
 var/log/seeder/info
index 55d7ec9e82aead0b8bd2ac3ac0242385fb2eb3f4..a387d3e75f8b7042dc4c6bd195608995b7802557 100644 (file)
@@ -3888,7 +3888,11 @@ END
                        if (!-z $extgrp) { print FILE "reply_body_max_size 0 deny for_extended_users\n"; }
                }
        }
-#FIX ME        print FILE "reply_body_max_size $replybodymaxsize deny all\n\n";
+       
+       if ( $replybodymaxsize != '0' )
+       {
+               print FILE "reply_body_max_size $replybodymaxsize deny all\n\n";
+       }
 
        print FILE "visible_hostname";
        if ($proxysettings{'VISIBLE_HOSTNAME'} eq '')
index 79d8dfed9cb0410bbee64481e9e0d36fd56d2b93..44a2dccef15923f3d544035951d78ddc501c0bdd 100644 (file)
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.36-5-spn
+VER        = 2.6.35-1
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 095d00646a44100ba979e8f13746ed86
+$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505
 
 install : $(TARGET)
 
index ab0b7e2ad15ba1abcbe1fc839685129d9edc0e53..37ba3d1e6a1902b2158d4e3a68b8fd53f7f31e74 100644 (file)
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2009  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        #
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.7.i586-full-core42.iso.torrent
+DL_FILE    = ipfire-2.7.i586-full-core43.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 17
+PAK_VER    = 18
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7355dd415df3a3f28dc9223f79b5e053
+$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3
 
 install : $(TARGET)
 
index 34833ef1918f99fac820cfafedf511d6a9c8e5e2..dc65ef5bc1960449cca36e0507ae6bf9f5d53271 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.9.8p
+VER        = 0.9.8q
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7f24047f70364c9eabc94899e356ce39
+$(DL_FILE)_MD5 = 80e67291bec9230f03eefb5cfe858998
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 4d49eaaf3ab6016d460e0abc4325a6c0414937df..979215cfd88c90e2125f8c3de3f19cfe6192a54d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.8test"                                              # Version number
-CORE="43"                                                      # Core Level (Filename)
-PAKFIRE_CORE="42"                                              # Core Level (PAKFIRE)
+CORE="44"                                                      # Core Level (Filename)
+PAKFIRE_CORE="43"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
index 8db2dc67472f24c20dc94687a9d1743e857071c0..8471df312fb9b8157b8c83c5bc6b5ab8808375a1 100644 (file)
@@ -41,15 +41,19 @@ sleep 15
 echo
 echo "Download with wget..."
 wget $IPFireISO -O /tmp/download.iso -t3 -U IPFire_NetInstall/2.x
+wget $IPFireISO.md5 -O /tmp/download.iso.md5 -t3 -U IPFire_NetInstall/2.x
 echo
 echo "Checking download..."
-mount /tmp/download.iso -o loop /cdrom 2> /dev/null
-if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
-       echo -n "null" > /tmp/source_device
-       echo "Found tarball in /tmp/download.iso"
-       exit 0
-else
-       echo "Found no tarballs in /tmp/download.iso - SKIP"
+md5_file=`md5sum /tmp/download.iso | cut -d" " -f1`
+md5_down=`cat /tmp/download.iso.md5 | cut -d" " -f1`
+if [ "$md5_file" == "$md5_down" ]; then
+       mount /tmp/download.iso -o loop /cdrom 2> /dev/null
+       if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
+               echo -n "null" > /tmp/source_device
+               echo "Found tarball in /tmp/download.iso"
+               exit 0
+       fi
+       umount /cdrom 2> /dev/null
 fi
-umount /cdrom 2> /dev/null
+echo "Error - SKIP"
 exit 10
index ca2d5bd619b2b7d68da0ea2b7b17d27957992186..5b408a728a4008776ffdffabe5db07881513a75f 100644 (file)
@@ -70,6 +70,7 @@ int main(int argc, char *argv[])
        char *yesnoharddisk[3]; //      char *yesnoharddisk = { "NO", "YES", NULL };
                
        int unattended = 0;
+       int serialconsole = 0;
        struct keyvalue *unattendedkv = initkeyvalues();
        int hardyn = 0;
        char restore_file[STRING_SIZE] = "";
@@ -110,6 +111,10 @@ int main(int argc, char *argv[])
                    unattended = 1;
                    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
                }               
+               // check if we have to patch for serial console
+               if (strstr (line, "console=ttyS0") != NULL) {
+                   serialconsole = 1;
+               }
        }
 
        // Read gpl ...
@@ -511,7 +516,25 @@ int main(int argc, char *argv[])
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
-       
+
+       /* Serial console ? */
+       if (serialconsole) {
+               /* grub */
+               replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
+               replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
+               replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
+               replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
+
+               /*inittab*/
+               replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
+               replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:");
+               replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:");
+               replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:");
+               replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:");
+               replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:");
+               replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
+       }
+
        /* Copy restore file from cdrom */
        if (unattended && (strlen(restore_file) > 0)) {
                fprintf(flog, "unattended: Copy restore file\n");
index 5ca9693fd5a339b028d3c5cfb780e189c23c86eb..e9417ae3d0b541650cbe5bea3097a523ff785e51 100644 (file)
@@ -43,6 +43,14 @@ ENTRY=`grep "savedefault" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $ENTRY > /dev/null
 let ENTRY=$_+1
+
+#Check if the system use serial console...
+if [ "$(grep "^serial" /boot/grub/grub.conf)" == "" ]; then
+       console=""
+else
+       console=" console=ttyS0,38400n8"
+fi
+
 #
 # backup grub.conf
 #
@@ -52,7 +60,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
 #
 echo "" >> /boot/grub/grub.conf
 echo "title IPFire (PAE-Kernel)" >> /boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo "  kernel /vmlinuz-$KVER-ipfire-pae root=$ROOT panic=10$console $MOUNT" >> /boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-pae.img" >> /boot/grub/grub.conf
 echo "  savedefault $ENTRY" >> /boot/grub/grub.conf
 #