From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 28 Jan 2014 19:49:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/core-76-update' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=7ab6a8536cb653b8c096ac67b87eaa3ddf228e12;hp=-c

Merge remote-tracking branch 'stevee/core-76-update' into next
---

7ab6a8536cb653b8c096ac67b87eaa3ddf228e12
diff --combined config/rootfiles/core/76/update.sh
index a8f726a6b,0eca9e6f8..1f7bcfa57
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@@ -71,7 -71,7 +71,7 @@@ esa
  
  #
  #
 -KVER="3.10.27"
 +KVER="3.10.28"
  MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
  # Nur den letzten Parameter verwenden
  echo $MOUNT > /dev/null
@@@ -192,6 -192,10 +192,10 @@@ f
  
  ln -svf ../run /var/run
  
+ # Creating directories for new firewall.
+ mkdir -p /var/ipfire/firewall
+ mkdir -p /var/ipfire/fwhosts
+ 
  #
  #Extract files
  tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
@@@ -253,6 -257,22 +257,22 @@@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes
  /sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
  /sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
  
+ # Create config files for firewall and fix permissions.
+ touch /var/ipfire/firewall/config
+ touch /var/ipfire/firewall/input
+ touch /var/ipfire/firewall/outgoing
+ touch /var/ipfire/firewall/p2protocols
+ touch /var/ipfire/firewall/settings
+ touch /var/ipfire/fwhosts/customhosts
+ touch /var/ipfire/fwhosts/customnetworks
+ touch /var/ipfire/fwhosts/customgroups
+ touch /var/ipfire/fwhosts/customservices
+ touch /var/ipfire/fwhosts/customservicegrp
+ 
+ # Fix ownership.
+ chown -R nobody:nobody /var/ipfire/firewall
+ chown -R nobody:nobody /var/ipfire/fwhosts
+ 
  # Convert firewall configuration
  /usr/sbin/convert-xtaccess
  /usr/sbin/convert-outgoingfw
@@@ -351,9 -371,6 +371,9 @@@ if [ ! "$(grep "^flags.* pae " /proc/cp
  		echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
  		echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
  		echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
 +		echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
 +		echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
 +		echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
  	fi
  fi
  
@@@ -362,9 -379,6 +382,9 @@@ if [ -e "/opt/pakfire/db/installed/meta
  	echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
  	echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
  	echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-xen
 +	echo "Name: linux-xen" > /opt/pakfire/db/meta/meta-linux-xen
 +	echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-xen
 +	echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-xen
  	# Add xvc0 to /etc/securetty
  	echo "xvc0" >> /etc/securetty
  fi
@@@ -388,7 -402,6 +408,7 @@@ echo '/usr/bin/logger -p syslog.emerg -
  echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
  echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
  #
 +killall -KILL pak_update
  chmod +x /tmp/pak_update
  /tmp/pak_update &