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

config/rootfiles/common/stage2

@@ -4,8 +4,6 @@ bin/grep
 bin/pwd
 bin/stty
 #boot
-dev/null
-dev/console
 etc/bashrc
 etc/certparams
 etc/e2fsck.conf
@@ -54,8 +52,6 @@ mnt
 root/ipfire
 #sbin
 #srv
-#sys
-tmp
 #usr/bin/perl
 #usr/include
 #usr/lib
@@ -69,9 +65,10 @@ usr/local/bin/httpscert
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash
-usr/local/bin/run-parts
-usr/local/bin/scanhd
 usr/local/bin/rebuild-initrd
+usr/local/bin/run-parts
+#usr/local/bin/sanedloop
+usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
@@ -79,12 +76,9 @@ usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
-#usr/local/share
 #usr/local/share/doc
 #usr/local/share/info
 #usr/local/share/locale
-#usr/local/share/man
-#usr/local/share/man/man1
 #usr/local/share/man/man2
 #usr/local/share/man/man3
 #usr/local/share/man/man4
@@ -99,6 +93,8 @@ usr/local/bin/vpn-watch
 #usr/sbin
 #usr/share
 #usr/share/doc
+#usr/share/doc/licenses
+usr/share/doc/licenses/GPLv3
 #usr/share/info
 #usr/share/locale
 #usr/share/man
@@ -126,6 +122,7 @@ var/log/btmp
 var/log/calamaris
 var/log/counter
 var/log/lastlog
+#var/log/net-traffic.log
 var/log/wtmp
 var/mail
 #var/opt
@@ -133,6 +130,6 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
-#usr/local/bin/asterisk
-#usr/local/bin/sanedloop
-#var/log/net-traffic.log
+dev/null
+dev/console
+tmp

config/rootfiles/core/44/filelists/files

@@ -5,14 +5,21 @@ etc/rc.d/init.d/firewall
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/networking/dhcpcd.exe
 srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/images/urlfilter/copy.gif
 var/ipfire/general-functions.pl
 var/ipfire/extrahd/bin/extrahd.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/fr.pl
+var/ipfire/langs/es.pl
 usr/local/bin/timectrl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd
 usr/local/sbin/setup
 usr/bin/ldd
+usr/share/doc/licenses/GPLv3

config/rootfiles/core/44/update.sh

@@ -201,3 +201,4 @@ rm -rf /etc/sysconfig/lm_sensors
 /usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg"
 /usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!"
 /usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** "
+touch /var/run/need_reboot

config/rootfiles/oldcore/42/exclude

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

config/rootfiles/packages/clamav

@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.4
+usr/lib/libclamav.so.6.1.7
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.4
+usr/lib/libclamunrar.so.6.1.7
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.4
+usr/lib/libclamunrar_iface.so.6.1.7
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

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/index.cgi

@@ -39,6 +39,7 @@ my $warnmessage = '';
 my $refresh = "";
 my $ipaddr='';
 
+
 &Header::showhttpheaders();
 
 $cgiparams{'ACTION'} = '';
@@ -57,6 +58,14 @@ my %mainsettings = ();
 
 my $connstate = &Header::connectionstatus();
 
+# check if reboot is necessary
+my $reboot = 0;
+if (`find /var/run/need_reboot 2>/dev/null`) {
+	$reboot = 1;	
+}
+
+
+
 if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
 	$refresh = "<meta http-equiv='refresh' content='300;'>";
 } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
@@ -128,8 +137,13 @@ my $dialButtonDisabled = "disabled='disabled'";
 
 &Header::openpage($Lang::tr{'main page'}, 1, $refresh);
 &Header::openbigbox('', 'center');
-&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
 
+# licence agreement
+if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
+	system('touch /var/ipfire/main/gpl_accepted')
+}
+if (`find /var/ipfire/main/gpl_accepted 2>/dev/null`) {
+&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
 
 
 if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) {
@@ -428,6 +442,7 @@ foreach my $file (@files) {
 	}
 }
 
+
 if ($warnmessage) {
 	print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
@@ -437,8 +452,10 @@ END
 ;
 &Pakfire::dblist("upgrade", "notice");
 print <<END;
-
 END
+if ($reboot == 1) {
+	print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
+}
 } else {
 	my $message='';
 	if ($death) {
@@ -462,5 +479,37 @@ END
 } 
 
 &Header::closebox();
+}
+
+else {
+&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
+print <<END;
+	$Lang::tr{'gpl please read carefully the general public license and accept it below'}.
+	<br /><br />
+END
+;	
+if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
+	print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
+	print `cat /usr/share/doc/licenses/GPLv3`;
+	print '</textarea>';
+}
+else {
+	print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
+}
+print <<END;
+	<p>
+		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+			<input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
+			<br/ >
+			<input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+		</form>
+	</p>
+	<a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
+
+END
+
+&Header::closebox();
+}
+
 &Header::closebigbox();
 &Header::closepage();

html/cgi-bin/pakfire.cgi

@@ -57,6 +57,12 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
+# check if reboot is necessary
+my $reboot = 0;
+if (`find /var/run/need_reboot 2>/dev/null`) {
+	$reboot = 1;	
+}
+
 if ($pakfiresettings{'ACTION'} eq 'install'){
 	$pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
 	if ("$pakfiresettings{'FORCE'}" eq "on") {
@@ -229,13 +235,19 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
 
 print <<END;
 	<table width='95%' cellpadding='5' >
+END
+if ($reboot == 1) {
+	print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>";
+	print "<tr><td colspan='2'>&nbsp;</font></td></tr>"
+}
+print <<END;
 		<tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b>
 				<td width="50%">
 		<tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr />
-					$Lang::tr{'pakfire last update'} $core_update_age ago<br />
-					$Lang::tr{'pakfire last serverlist update'} $server_update_age ago<br />
-					$Lang::tr{'pakfire last core list update'} $corelist_update_age ago<br />
-					$Lang::tr{'pakfire last package update'} $packages_update_age ago
+					$Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br />
+					$Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br />
+					$Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br />
+					$Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'}
 					<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='ACTION' value='update' />
 						<input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />

html/cgi-bin/samba.cgi

@@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
 $sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7';
+$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.9';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
 $sambasettings{'OSLEVEL'} = '33';

langs/de/cgi-bin/de.pl

@@ -831,6 +831,10 @@
 'genkey' => 'PSK erzeugen',
 'genre' => 'Genre',
 'global settings' => 'Globale Einstellungen',
+'gpl license agreement' => 'Lizenz Vereinbarung',
+'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen',
+'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptiere',
+'gpl unofficial translation of the general public license v3' => 'Inoffizielle Übersetzung der General Public License v3',
 'graph' => 'Diagramm',
 'graph per' => 'pro',
 'green' => 'GRÜN',
@@ -1170,6 +1174,7 @@
 'name must only contain characters' => 'Name darf nur Buchstaben enthalten.',
 'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang',
 'nat-traversal' => 'Nat Traversal:',
+'needreboot' => 'Ein Update benötigt einen Neustart',
 'net' => 'Netz',
 'net address' => 'Netzadresse',
 'net config' => 'Netzwerk-Konfiguration',
@@ -1320,6 +1325,7 @@
 'package failed to install' => 'Programmpaket konnte nicht installiert werden.',
 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
+'pakfire ago' => 'her.',
 'pakfire available addons' => 'Verfügbare Addons:',
 'pakfire configuration' => 'Pakfire Konfiguration',
 'pakfire core update auto' => 'Core und Addon Updates automatisch installieren:',

langs/en/cgi-bin/en.pl

@@ -857,6 +857,10 @@
 'genkey' => 'Generate PSK',
 'genre' => 'Genre',
 'global settings' => 'Global settings',
+'gpl license agreement' => 'License Agreement',
+'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
+'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below',
+'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3',
 'graph' => 'Graph',
 'graph per' => 'per',
 'green' => 'Green',
@@ -1197,6 +1201,7 @@
 'name must only contain characters' => 'Name must only contain characters.',
 'name too long' => 'User\'s full name or system hostname is too long',
 'nat-traversal' => 'Nat Traversal:',
+'needreboot' => 'An update requires a restart',
 'net' => 'Net',
 'net address' => 'net address',
 'net config' => 'Network configuration',
@@ -1348,6 +1353,7 @@
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => 'Do you want to install all packages?',
+'pakfire ago' => 'ago.',
 'pakfire available addons' => 'Available Addons:',
 'pakfire configuration' => 'Pakfire Configuration',
 'pakfire core update auto' => 'Install core and addon updates automatically:',

langs/es/cgi-bin/es.pl

@@ -855,6 +855,10 @@
 'genkey' => 'Generar PSK',
 'genre' => 'Género',
 'global settings' => 'Configuraciones globales',
+'gpl license agreement' => 'License Agreement',
+'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
+'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below',
+'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3',
 'graph' => 'Gráfico',
 'graph per' => 'por',
 'green' => 'Green',
@@ -1195,6 +1199,7 @@
 'name must only contain characters' => 'El nombre solo puede contener caracteres',
 'name too long' => 'Nombre de usuario o de host es demasiado largo',
 'nat-traversal' => 'NAT Transversal:',
+'needreboot' => 'An update requires a restart',
 'net' => 'Red',
 'net address' => 'dirección de red',
 'net config' => 'Configuración de red',
@@ -1335,6 +1340,7 @@
 'package failed to install' => 'Falló la instalación del paquete',
 'pagerefresh' => 'La página se está actualiszando, por favor espere.',
 'pakfire accept all' => '¿Desea instalar todos los paquetes?',
+'pakfire ago' => '',
 'pakfire available addons' => 'Addons disponibles:',
 'pakfire configuration' => 'Configuración de Pakfire',
 'pakfire core update auto' => 'Instalar actualizaciones de Core y de addons automáticamente',

langs/fr/cgi-bin/fr.pl

@@ -856,6 +856,10 @@
 'genkey' => 'Générer PSK',
 'genre' => 'Genre',
 'global settings' => 'Configuration générale',
+'gpl license agreement' => 'License Agreement',
+'gpl i accept these terms and conditions' => 'J\'accepte les termes et les conditions',
+'gpl please read carefully the general public license and accept it below' => 'Merci de lire attentivement la Licence et de l\'accepter',
+'gpl unofficial translation of the general public license v3' => 'Traduction non officielle de la Licence v3',
 'graph' => 'Graphique',
 'graph per' => 'pour',
 'green' => 'VERT',
@@ -1196,6 +1200,7 @@
 'name must only contain characters' => 'Le nom ne doit contenir que des caractères.',
 'name too long' => 'Le nom d\'utilisateur ou du système hôte est trop long',
 'nat-traversal' => 'Nat Traversal :',
+'needreboot' => 'Une mise à jour nécessite un redémarrage',
 'net' => 'Réseau',
 'net address' => 'adresse net',
 'net config' => 'Configuration réseau',
@@ -1345,6 +1350,7 @@
 'package failed to install' => 'L\'installation du paquet a échoué.',
 'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.',
 'pakfire accept all' => 'Voulez-vous installer tout les paquets?',
+'pakfire ago' => '',
 'pakfire available addons' => 'Addons disponibles :',
 'pakfire configuration' => 'Configuration Pakfire',
 'pakfire core update auto' => 'Installer les mises à jours du noyau et des addons automatiquement :',

lfs/clamav

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.96.2
+VER        = 0.96.5
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a2c2555d86868f91a01d0e2c2403bbec
+$(DL_FILE)_MD5 = 202e51d47298779e5babacc443102c6a
 
 install : $(TARGET)
 

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/fireinfo

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5
+VER        = 0.6
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2eb12d3c4aeda93ee184a85b1e8b6a96
+$(DL_FILE)_MD5 = cc977df8dbe149be184c27105c879116
 
 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)
 

lfs/stage2

@@ -108,4 +108,8 @@ $(TARGET) :
 	# A small hack to include /root to the iso but not all of it's files.
 	touch /root/ipfire
 
+	# License agreement
+	-mkdir -pv /usr/share/doc/licenses/
+	cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
+
 	@$(POSTBUILD)

lfs/v4l-dvb

@@ -84,7 +84,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
+	# Remove backported warning...
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/v4l-dvb_remove_backport_warning.patch
+		cd $(DIR_APP) && make release VER=$(KVER)-$(VERSUFIX)
 	cd $(DIR_APP) && make $(MAKETUNING) all
 	cd $(DIR_APP) && make install
 	ln -sf $(DIR_APP)/ /usr/src/v4l-dvb

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/main.c

@@ -523,7 +523,7 @@ int main(int argc, char *argv[])
 		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,38400 panic=10 ");
+		replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
 
 		/*inittab*/
 		replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
@@ -535,6 +535,9 @@ int main(int argc, char *argv[])
 		replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
 	}
 
+	/* Set marker that the user has already accepted the gpl */
+	mysystem("/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
+
 	/* Copy restore file from cdrom */
 	if (unattended && (strlen(restore_file) > 0)) {
 		fprintf(flog, "unattended: Copy restore file\n");

src/pakfire/pakfire.conf

@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # 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        #
@@ -21,7 +21,7 @@
 
 package Conf;
 
-$version = "2.7";
+$version = "2.9";
 
 $mainserver = "pakfire.ipfire.org";
 

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
 #

src/patches/v4l-dvb_remove_backport_warning.patch

@@ -0,0 +1,12 @@
+diff -Naur v4l-dvb-abd3aac6644e.org/v4l/compat.h v4l-dvb-abd3aac6644e/v4l/compat.h
+--- v4l-dvb-abd3aac6644e.org/v4l/compat.h	2010-07-02 05:38:54.000000000 +0200
++++ v4l-dvb-abd3aac6644e/v4l/compat.h	2010-12-04 12:19:09.531056981 +0100
+@@ -14,8 +14,6 @@
+ #define INIT_DELAYED_WORK(a,b,c)	INIT_WORK(a,b,c)
+ #endif
+ 
+-#define EXPERIMENTAL_TREE
+-
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
+ #define usb_buffer_alloc(dev, size, mem_flags, dma) usb_alloc_coherent(dev, size, mem_flags, dma)
+ #define usb_buffer_free(dev, size, addr, dma) usb_free_coherent(dev, size, addr, dma)