start core80.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Jun 2014 20:21:08 +0000 (22:21 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 14 Jun 2014 20:21:08 +0000 (22:21 +0200)
99 files changed:
config/rootfiles/core/80/exclude [moved from config/rootfiles/core/77/exclude with 100% similarity]
config/rootfiles/core/80/filelists/files [new file with mode: 0644]
config/rootfiles/core/80/meta [moved from config/rootfiles/core/77/meta with 100% similarity]
config/rootfiles/core/80/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/77/exclude [moved from config/rootfiles/core/79/exclude with 100% similarity]
config/rootfiles/oldcore/77/filelists/GeoIP [moved from config/rootfiles/core/77/filelists/GeoIP with 100% similarity]
config/rootfiles/oldcore/77/filelists/Net_SSLeay [moved from config/rootfiles/core/77/filelists/Net_SSLeay with 100% similarity]
config/rootfiles/oldcore/77/filelists/apache2 [moved from config/rootfiles/core/77/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/binutils [moved from config/rootfiles/core/77/filelists/armv5tel/binutils with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/dracut [moved from config/rootfiles/core/77/filelists/armv5tel/dracut with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/gcc [moved from config/rootfiles/core/77/filelists/armv5tel/gcc with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/glibc [moved from config/rootfiles/core/77/filelists/armv5tel/glibc with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/initscripts [moved from config/rootfiles/core/77/filelists/armv5tel/initscripts with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/77/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/77/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/77/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/lm_sensors [moved from config/rootfiles/core/77/filelists/armv5tel/lm_sensors with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/rpi-firmware [moved from config/rootfiles/core/77/filelists/armv5tel/rpi-firmware with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/u-boot [moved from config/rootfiles/core/77/filelists/armv5tel/u-boot with 100% similarity]
config/rootfiles/oldcore/77/filelists/armv5tel/util-linux [moved from config/rootfiles/core/77/filelists/armv5tel/util-linux with 100% similarity]
config/rootfiles/oldcore/77/filelists/beep [moved from config/rootfiles/core/77/filelists/beep with 100% similarity]
config/rootfiles/oldcore/77/filelists/bridge-utils [moved from config/rootfiles/core/77/filelists/bridge-utils with 100% similarity]
config/rootfiles/oldcore/77/filelists/coreutils [moved from config/rootfiles/core/77/filelists/coreutils with 100% similarity]
config/rootfiles/oldcore/77/filelists/cyrus-sasl [moved from config/rootfiles/core/77/filelists/cyrus-sasl with 100% similarity]
config/rootfiles/oldcore/77/filelists/dosfstools [moved from config/rootfiles/core/77/filelists/dosfstools with 100% similarity]
config/rootfiles/oldcore/77/filelists/dvb-firmwares [moved from config/rootfiles/core/77/filelists/dvb-firmwares with 100% similarity]
config/rootfiles/oldcore/77/filelists/e2fsprogs [moved from config/rootfiles/core/77/filelists/e2fsprogs with 100% similarity]
config/rootfiles/oldcore/77/filelists/files [moved from config/rootfiles/core/77/filelists/files with 100% similarity]
config/rootfiles/oldcore/77/filelists/fireinfo [moved from config/rootfiles/core/77/filelists/fireinfo with 100% similarity]
config/rootfiles/oldcore/77/filelists/firewall [moved from config/rootfiles/core/77/filelists/firewall with 100% similarity]
config/rootfiles/oldcore/77/filelists/hwdata [moved from config/rootfiles/core/77/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/binutils [moved from config/rootfiles/core/77/filelists/i586/binutils with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/dracut [moved from config/rootfiles/core/77/filelists/i586/dracut with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/gcc [moved from config/rootfiles/core/77/filelists/i586/gcc with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/glibc [moved from config/rootfiles/core/77/filelists/i586/glibc with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/grub [moved from config/rootfiles/core/77/filelists/i586/grub with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/initscripts [moved from config/rootfiles/core/77/filelists/i586/initscripts with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/linux [moved from config/rootfiles/core/77/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/lm_sensors [moved from config/rootfiles/core/77/filelists/i586/lm_sensors with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/strongswan-padlock [moved from config/rootfiles/core/77/filelists/i586/strongswan-padlock with 100% similarity]
config/rootfiles/oldcore/77/filelists/i586/util-linux [moved from config/rootfiles/core/77/filelists/i586/util-linux with 100% similarity]
config/rootfiles/oldcore/77/filelists/iptables [moved from config/rootfiles/core/77/filelists/iptables with 100% similarity]
config/rootfiles/oldcore/77/filelists/iw [moved from config/rootfiles/core/77/filelists/iw with 100% similarity]
config/rootfiles/oldcore/77/filelists/jquery [moved from config/rootfiles/core/77/filelists/jquery with 100% similarity]
config/rootfiles/oldcore/77/filelists/kmod [moved from config/rootfiles/core/77/filelists/kmod with 100% similarity]
config/rootfiles/oldcore/77/filelists/libnl [moved from config/rootfiles/core/77/filelists/libnl with 100% similarity]
config/rootfiles/oldcore/77/filelists/libusbx [moved from config/rootfiles/core/77/filelists/libusbx with 100% similarity]
config/rootfiles/oldcore/77/filelists/libxml2 [moved from config/rootfiles/core/77/filelists/libxml2 with 100% similarity]
config/rootfiles/oldcore/77/filelists/linux-firmware [moved from config/rootfiles/core/77/filelists/linux-firmware with 100% similarity]
config/rootfiles/oldcore/77/filelists/lzo [moved from config/rootfiles/core/77/filelists/lzo with 100% similarity]
config/rootfiles/oldcore/77/filelists/misc-progs [moved from config/rootfiles/core/77/filelists/misc-progs with 100% similarity]
config/rootfiles/oldcore/77/filelists/mysql-libs [moved from config/rootfiles/core/77/filelists/mysql-libs with 100% similarity]
config/rootfiles/oldcore/77/filelists/net-tools [moved from config/rootfiles/core/77/filelists/net-tools with 100% similarity]
config/rootfiles/oldcore/77/filelists/ntp [moved from config/rootfiles/core/77/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/77/filelists/openssh [moved from config/rootfiles/core/77/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/77/filelists/openssl [moved from config/rootfiles/core/77/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/77/filelists/openssl-compat [moved from config/rootfiles/core/77/filelists/openssl-compat with 100% similarity]
config/rootfiles/oldcore/77/filelists/openvpn [moved from config/rootfiles/core/77/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/77/filelists/pakfire [moved from config/rootfiles/core/77/filelists/pakfire with 100% similarity]
config/rootfiles/oldcore/77/filelists/paxctl [moved from config/rootfiles/core/77/filelists/paxctl with 100% similarity]
config/rootfiles/oldcore/77/filelists/php [moved from config/rootfiles/core/77/filelists/php with 100% similarity]
config/rootfiles/oldcore/77/filelists/rng-tools [moved from config/rootfiles/core/77/filelists/rng-tools with 100% similarity]
config/rootfiles/oldcore/77/filelists/setup [moved from config/rootfiles/core/77/filelists/setup with 100% similarity]
config/rootfiles/oldcore/77/filelists/strongswan [moved from config/rootfiles/core/77/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/77/filelists/tzdata [moved from config/rootfiles/core/77/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/77/filelists/udev [moved from config/rootfiles/core/77/filelists/udev with 100% similarity]
config/rootfiles/oldcore/77/filelists/usb_modeswitch [moved from config/rootfiles/core/77/filelists/usb_modeswitch with 100% similarity]
config/rootfiles/oldcore/77/filelists/usb_modeswitch_data [moved from config/rootfiles/core/77/filelists/usb_modeswitch_data with 100% similarity]
config/rootfiles/oldcore/77/filelists/usbutils [moved from config/rootfiles/core/77/filelists/usbutils with 100% similarity]
config/rootfiles/oldcore/77/filelists/vim [moved from config/rootfiles/core/77/filelists/vim with 100% similarity]
config/rootfiles/oldcore/77/filelists/wget [moved from config/rootfiles/core/77/filelists/wget with 100% similarity]
config/rootfiles/oldcore/77/filelists/wpa_supplicant [moved from config/rootfiles/core/77/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/77/filelists/xz [moved from config/rootfiles/core/77/filelists/xz with 100% similarity]
config/rootfiles/oldcore/77/meta [moved from config/rootfiles/core/79/meta with 100% similarity]
config/rootfiles/oldcore/77/update.sh [moved from config/rootfiles/core/77/update.sh with 100% similarity]
config/rootfiles/oldcore/79/exclude [new file with mode: 0644]
config/rootfiles/oldcore/79/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/79/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/79/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/79/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/79/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/79/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/79/filelists/daq [moved from config/rootfiles/core/79/filelists/daq with 100% similarity]
config/rootfiles/oldcore/79/filelists/files [moved from config/rootfiles/core/79/filelists/files with 100% similarity]
config/rootfiles/oldcore/79/filelists/hostname [moved from config/rootfiles/core/79/filelists/hostname with 100% similarity]
config/rootfiles/oldcore/79/filelists/i586/grub [moved from config/rootfiles/core/79/filelists/i586/grub with 100% similarity]
config/rootfiles/oldcore/79/filelists/i586/linux [moved from config/rootfiles/core/79/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/79/filelists/i586/syslinux [moved from config/rootfiles/core/79/filelists/i586/syslinux with 100% similarity]
config/rootfiles/oldcore/79/filelists/libpcap [moved from config/rootfiles/core/79/filelists/libpcap with 100% similarity]
config/rootfiles/oldcore/79/filelists/openssh [moved from config/rootfiles/core/79/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/79/filelists/openssl [moved from config/rootfiles/core/79/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/79/filelists/openvpn [moved from config/rootfiles/core/79/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/79/filelists/perl-Device-Modem [moved from config/rootfiles/core/79/filelists/perl-Device-Modem with 100% similarity]
config/rootfiles/oldcore/79/filelists/perl-Device-SerialPort [moved from config/rootfiles/core/79/filelists/perl-Device-SerialPort with 100% similarity]
config/rootfiles/oldcore/79/filelists/ppp [moved from config/rootfiles/core/79/filelists/ppp with 100% similarity]
config/rootfiles/oldcore/79/filelists/snort [moved from config/rootfiles/core/79/filelists/snort with 100% similarity]
config/rootfiles/oldcore/79/filelists/squid [moved from config/rootfiles/core/79/filelists/squid with 100% similarity]
config/rootfiles/oldcore/79/filelists/sudo [moved from config/rootfiles/core/79/filelists/sudo with 100% similarity]
config/rootfiles/oldcore/79/filelists/vnstat [moved from config/rootfiles/core/79/filelists/vnstat with 100% similarity]
config/rootfiles/oldcore/79/meta [new file with mode: 0644]
config/rootfiles/oldcore/79/update.sh [moved from config/rootfiles/core/79/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
new file mode 100644 (file)
index 0000000..f878cfe
--- /dev/null
@@ -0,0 +1,54 @@
+#!/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) 2014 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=80
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/79/exclude b/config/rootfiles/oldcore/79/exclude
new file mode 100644 (file)
index 0000000..18e9b4d
--- /dev/null
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/79/meta b/config/rootfiles/oldcore/79/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/make.sh b/make.sh
index 1c10f32..162128d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
-CORE="79"                                                      # Core Level (Filename)
+CORE="80"                                                      # Core Level (Filename)
 PAKFIRE_CORE="79"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan