Merge branch 'next'

config/rootfiles/common/openvpn

@@ -1,5 +1,6 @@
-#usr/man/man8/openvpn.8
 usr/sbin/openvpn
+#usr/share/doc/openvpn
+#usr/share/man/man8/openvpn.8
 var/ipfire/ovpn
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig

config/rootfiles/common/smartmontools

@@ -2,23 +2,24 @@
 #usr/etc/rc.d/init.d
 #usr/etc/rc.d/init.d/smartd
 #usr/etc/smartd.conf
+usr/sbin/smartctl
+#usr/sbin/smartd
+#usr/share/doc/smartmontools-5.39
+#usr/share/doc/smartmontools-5.39/AUTHORS
+#usr/share/doc/smartmontools-5.39/CHANGELOG
+#usr/share/doc/smartmontools-5.39/COPYING
+#usr/share/doc/smartmontools-5.39/INSTALL
+#usr/share/doc/smartmontools-5.39/NEWS
+#usr/share/doc/smartmontools-5.39/README
+#usr/share/doc/smartmontools-5.39/TODO
+#usr/share/doc/smartmontools-5.39/WARNINGS
+#usr/share/doc/smartmontools-5.39/examplescripts
+#usr/share/doc/smartmontools-5.39/examplescripts/Example1
+#usr/share/doc/smartmontools-5.39/examplescripts/Example2
+#usr/share/doc/smartmontools-5.39/examplescripts/Example3
+#usr/share/doc/smartmontools-5.39/examplescripts/Example4
+#usr/share/doc/smartmontools-5.39/examplescripts/README
+#usr/share/doc/smartmontools-5.39/smartd.conf
 #usr/man/man5/smartd.conf.5
 #usr/man/man8/smartctl.8
 #usr/man/man8/smartd.8
-usr/sbin/smartctl
-#usr/sbin/smartd
-#usr/share/doc/smartmontools-5.36
-#usr/share/doc/smartmontools-5.36/AUTHORS
-#usr/share/doc/smartmontools-5.36/CHANGELOG
-#usr/share/doc/smartmontools-5.36/COPYING
-#usr/share/doc/smartmontools-5.36/INSTALL
-#usr/share/doc/smartmontools-5.36/NEWS
-#usr/share/doc/smartmontools-5.36/README
-#usr/share/doc/smartmontools-5.36/TODO
-#usr/share/doc/smartmontools-5.36/WARNINGS
-#usr/share/doc/smartmontools-5.36/examplescripts
-#usr/share/doc/smartmontools-5.36/examplescripts/Example1
-#usr/share/doc/smartmontools-5.36/examplescripts/Example2
-#usr/share/doc/smartmontools-5.36/examplescripts/Example3
-#usr/share/doc/smartmontools-5.36/examplescripts/README
-#usr/share/doc/smartmontools-5.36/smartd.conf

config/rootfiles/core/31/filelists/files

@@ -0,0 +1,2 @@
+etc/system-release
+boot/grub/grub.conf

config/rootfiles/core/31/filelists/openvpn

@@ -0,0 +1,2 @@
+usr/sbin/openvpn
+srv/web/ipfire/cgi-bin/ovpnmain.cgi

config/rootfiles/core/31/filelists/smart

@@ -0,0 +1,3 @@
+usr/sbin/smartctl
+etc/rc.d/init.d/smartenabler
+usr/local/bin/smartctrl

config/rootfiles/core/31/update.sh

@@ -0,0 +1,134 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2009 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+#
+KVER="2.6.27.31"
+ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
+MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
+# Nur den letzten Parameter verwenden
+echo $MOUNT > /dev/null
+MOUNT=$_
+#
+# check if we the backup file already exist
+if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+       /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
+fi
+echo First we made a backup of all files that was inside of the
+echo update archive. This may take a while ...
+# Add some files that are not in the package to backup
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
+#
+tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
+echo
+echo Update Kernel to $KVER ...
+# Remove old kernel, configs, initrd, modules ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /lib/modules/
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+	--no-overwrite-dir
+#
+# Modify grub.conf
+#
+echo
+echo Update grub configuration ...
+sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
+sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
+sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
+
+if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
+	echo "grub use default console ..."
+else
+	echo "grub use serial console ..."
+	sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
+	sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
+	sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
+	sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
+fi
+#
+# Made emergency - initramdisk
+#
+echo
+echo Create new Initramdisks ...
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
+cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+#
+# Made initramdisk
+#
+if [ "${ROOT:0:7}" == "/dev/sd" ]; then
+    # Remove ide hook if root is on sda
+    sed -i "s| ide | |g" /etc/mkinitcpio.conf
+else
+if [ "${ROOT:0:7}" == "/dev/hd" ]; then
+    # Remove pata & sata hook if root is on hda
+    sed -i "s| pata | |g" /etc/mkinitcpio.conf
+    sed -i "s| sata | |g" /etc/mkinitcpio.conf
+fi
+fi
+mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
+#
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
+#
+# Rebuild Language
+#
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#
+# Add "script-security 3 system" to openvpn config
+#
+if [ ! -s "/var/ipfire/ovpn/server.conf" ]; then
+	grep -q "script-security" /var/ipfire/ovpn/server.conf \
+	|| echo "script-security 3 system" >> /var/ipfire/ovpn/server.conf
+fi
+#
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
+# This core-update need a reboot
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-31 " *** Please reboot... *** "

config/rootfiles/oldcore/28/filelists/linux

@@ -0,0 +1 @@
+../../../common/linux

config/rootfiles/oldcore/28/filelists/linux-firmware

@@ -0,0 +1 @@
+../../../common/linux-firmware

config/rootfiles/oldcore/30/meta

@@ -0,0 +1 @@
+DEPS=""