Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

config/rootfiles/oldcore/42/exclude

@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf

config/rootfiles/packages/ipfireseeder

@@ -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

html/cgi-bin/proxy.cgi

@@ -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 '')

lfs/compat-wireless

@@ -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)
 

lfs/ipfireseeder

@@ -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)
 

lfs/openssl

@@ -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)
 

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

src/install+setup/install/downloadsource.sh

@@ -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

src/install+setup/install/main.c

@@ -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");

src/paks/linux-pae/install.sh

@@ -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
 #