* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 38183e52dd438dbe0bb204d4601e902fb6cf0af5
@ 2016-10-27 19:11 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-10-27 19:11 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 51426 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 38183e52dd438dbe0bb204d4601e902fb6cf0af5 (commit)
from 5e818d6afbfafec7ee11a30eb3ef36240d5ccde6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 38183e52dd438dbe0bb204d4601e902fb6cf0af5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 27 21:06:16 2016 +0200
start core107 updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{106 => 107}/exclude | 1 +
.../{oldcore/95 => core/107}/filelists/armv5tel/linux-kirkwood | 0
.../{oldcore/95 => core/107}/filelists/armv5tel/linux-multi | 0
.../{oldcore/95 => core/107}/filelists/armv5tel/linux-rpi | 0
config/rootfiles/core/107/filelists/files | 5 +++++
config/rootfiles/{oldcore/94 => core/107}/filelists/hdparm | 0
config/rootfiles/{oldcore/95 => core/107}/filelists/i586/linux | 0
config/rootfiles/{oldcore/90 => core/107}/filelists/libjpeg | 0
config/rootfiles/core/107/filelists/libjpeg-compat | 1 +
config/rootfiles/core/{106 => 107}/filelists/squid | 0
config/rootfiles/{oldcore/95 => core/107}/filelists/x86_64/linux | 0
config/rootfiles/core/{106 => 107}/meta | 0
config/rootfiles/{oldcore/104 => core/107}/update.sh | 7 +------
config/rootfiles/{core => oldcore}/106/exclude | 0
config/rootfiles/{core => oldcore}/106/filelists/attr | 0
config/rootfiles/{core => oldcore}/106/filelists/diffutils | 0
config/rootfiles/{core => oldcore}/106/filelists/ed | 0
config/rootfiles/{core => oldcore}/106/filelists/expat | 0
config/rootfiles/{core => oldcore}/106/filelists/file | 0
config/rootfiles/{core => oldcore}/106/filelists/files | 0
config/rootfiles/{core => oldcore}/106/filelists/flex | 0
config/rootfiles/{core => oldcore}/106/filelists/gawk | 0
config/rootfiles/{core => oldcore}/106/filelists/gettext | 0
config/rootfiles/{core => oldcore}/106/filelists/gnupg | 0
config/rootfiles/{core => oldcore}/106/filelists/i586/openssl-sse2 | 0
.../{core => oldcore}/106/filelists/i586/strongswan-padlock | 0
config/rootfiles/{core => oldcore}/106/filelists/iproute2 | 0
config/rootfiles/{core => oldcore}/106/filelists/ipset | 0
config/rootfiles/{core => oldcore}/106/filelists/libgpg-error | 0
config/rootfiles/{core => oldcore}/106/filelists/libidn | 0
config/rootfiles/{core => oldcore}/106/filelists/libmnl | 0
.../{core => oldcore}/106/filelists/libnetfilter_conntrack | 0
config/rootfiles/{core => oldcore}/106/filelists/misc-progs | 0
config/rootfiles/{core => oldcore}/106/filelists/mt7601u-firmware | 0
config/rootfiles/{core => oldcore}/106/filelists/openssl | 0
config/rootfiles/{core => oldcore}/106/filelists/python-daemon | 0
config/rootfiles/{core => oldcore}/106/filelists/python-docutils | 0
config/rootfiles/{core => oldcore}/106/filelists/python-inotify | 0
config/rootfiles/{core => oldcore}/106/filelists/python-ipaddress | 0
config/rootfiles/{core => oldcore}/106/filelists/smartmontools | 0
config/rootfiles/oldcore/{94 => 106}/filelists/squid | 0
config/rootfiles/{core => oldcore}/106/filelists/strongswan | 0
config/rootfiles/{core => oldcore}/106/filelists/unbound | 0
config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch | 0
.../rootfiles/{core => oldcore}/106/filelists/usb_modeswitch_data | 0
config/rootfiles/oldcore/{99 => 106}/meta | 0
config/rootfiles/{core => oldcore}/106/update.sh | 0
make.sh | 2 +-
48 files changed, 9 insertions(+), 7 deletions(-)
copy config/rootfiles/core/{106 => 107}/exclude (95%)
copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-kirkwood (100%)
copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/95 => core/107}/filelists/armv5tel/linux-rpi (100%)
create mode 100644 config/rootfiles/core/107/filelists/files
copy config/rootfiles/{oldcore/94 => core/107}/filelists/hdparm (100%)
copy config/rootfiles/{oldcore/95 => core/107}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/90 => core/107}/filelists/libjpeg (100%)
create mode 120000 config/rootfiles/core/107/filelists/libjpeg-compat
rename config/rootfiles/core/{106 => 107}/filelists/squid (100%)
copy config/rootfiles/{oldcore/95 => core/107}/filelists/x86_64/linux (100%)
rename config/rootfiles/core/{106 => 107}/meta (100%)
copy config/rootfiles/{oldcore/104 => core/107}/update.sh (98%)
rename config/rootfiles/{core => oldcore}/106/exclude (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/attr (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/diffutils (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/ed (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/expat (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/file (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/flex (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/gawk (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/gettext (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/gnupg (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/i586/openssl-sse2 (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/i586/strongswan-padlock (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/iproute2 (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/ipset (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/libgpg-error (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/libidn (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/libmnl (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/libnetfilter_conntrack (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/misc-progs (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/mt7601u-firmware (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/python-daemon (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/python-docutils (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/python-inotify (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/python-ipaddress (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/smartmontools (100%)
copy config/rootfiles/oldcore/{94 => 106}/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/unbound (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch (100%)
rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch_data (100%)
copy config/rootfiles/oldcore/{99 => 106}/meta (100%)
rename config/rootfiles/{core => oldcore}/106/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/106/exclude b/config/rootfiles/core/106/exclude
deleted file mode 100644
index 7ddeae0..0000000
--- a/config/rootfiles/core/106/exclude
+++ /dev/null
@@ -1,28 +0,0 @@
-boot/config.txt
-boot/grub/grub.cfg
-boot/grub/grubenv
-etc/alternatives
-etc/collectd.custom
-etc/default/grub
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-etc/snort/snort.conf
-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/dma
-var/ipfire/time
-var/ipfire/ovpn
-var/lib/alternatives
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/106/filelists/attr b/config/rootfiles/core/106/filelists/attr
deleted file mode 120000
index c808017..0000000
--- a/config/rootfiles/core/106/filelists/attr
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/attr
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/core/106/filelists/diffutils
deleted file mode 120000
index a5c02f3..0000000
--- a/config/rootfiles/core/106/filelists/diffutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/diffutils
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/core/106/filelists/ed
deleted file mode 120000
index 0ed331c..0000000
--- a/config/rootfiles/core/106/filelists/ed
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ed
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/core/106/filelists/expat
deleted file mode 120000
index e1923cf..0000000
--- a/config/rootfiles/core/106/filelists/expat
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/expat
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/core/106/filelists/file
deleted file mode 120000
index 0c60e43..0000000
--- a/config/rootfiles/core/106/filelists/file
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/file
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
deleted file mode 100644
index a67d30a..0000000
--- a/config/rootfiles/core/106/filelists/files
+++ /dev/null
@@ -1,25 +0,0 @@
-etc/system-release
-etc/issue
-etc/login.defs
-etc/rc.d/init.d/dhcp
-etc/rc.d/init.d/localnet
-etc/rc.d/init.d/network
-etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
-etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
-etc/rc.d/init.d/ntp
-etc/rc.d/init.d/setclock
-etc/rc.d/init.d/unbound
-etc/rc.d/rc0.d/K79unbound
-etc/rc.d/rc3.d/S11unbound
-etc/rc.d/rc6.d/K79unbound
-srv/web/ipfire/cgi-bin/dns.cgi
-srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/hosts.cgi
-srv/web/ipfire/cgi-bin/index.cgi
-srv/web/ipfire/cgi-bin/iptables.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-srv/web/ipfire/cgi-bin/pakfire.cgi
-srv/web/ipfire/cgi-bin/pppsetup.cgi
-srv/web/ipfire/cgi-bin/services.cgi
-var/ipfire/backup/include
diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/core/106/filelists/flex
deleted file mode 120000
index feb0390..0000000
--- a/config/rootfiles/core/106/filelists/flex
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/flex
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/core/106/filelists/gawk
deleted file mode 120000
index a3bbe32..0000000
--- a/config/rootfiles/core/106/filelists/gawk
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/gawk
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/core/106/filelists/gettext
deleted file mode 120000
index b6c6c6f..0000000
--- a/config/rootfiles/core/106/filelists/gettext
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/gettext
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/core/106/filelists/gnupg
deleted file mode 120000
index a1a1564..0000000
--- a/config/rootfiles/core/106/filelists/gnupg
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/gnupg
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/core/106/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713..0000000
--- a/config/rootfiles/core/106/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/core/106/filelists/i586/strongswan-padlock
deleted file mode 120000
index 2412824..0000000
--- a/config/rootfiles/core/106/filelists/i586/strongswan-padlock
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/core/106/filelists/iproute2
deleted file mode 120000
index 05f0f71..0000000
--- a/config/rootfiles/core/106/filelists/iproute2
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/core/106/filelists/ipset
deleted file mode 120000
index 2b43691..0000000
--- a/config/rootfiles/core/106/filelists/ipset
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ipset
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/core/106/filelists/libgpg-error
deleted file mode 120000
index cad4313..0000000
--- a/config/rootfiles/core/106/filelists/libgpg-error
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libgpg-error
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/libidn b/config/rootfiles/core/106/filelists/libidn
deleted file mode 120000
index 7e35489..0000000
--- a/config/rootfiles/core/106/filelists/libidn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libidn
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/core/106/filelists/libmnl
deleted file mode 120000
index f671c41..0000000
--- a/config/rootfiles/core/106/filelists/libmnl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libmnl
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/core/106/filelists/libnetfilter_conntrack
deleted file mode 120000
index 6ef5cc4..0000000
--- a/config/rootfiles/core/106/filelists/libnetfilter_conntrack
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libnetfilter_conntrack
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/core/106/filelists/misc-progs
deleted file mode 120000
index 7223cad..0000000
--- a/config/rootfiles/core/106/filelists/misc-progs
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/mt7601u-firmware b/config/rootfiles/core/106/filelists/mt7601u-firmware
deleted file mode 120000
index 300ac04..0000000
--- a/config/rootfiles/core/106/filelists/mt7601u-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/mt7601u-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/core/106/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/106/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/core/106/filelists/python-daemon
deleted file mode 120000
index 8e510bb..0000000
--- a/config/rootfiles/core/106/filelists/python-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/python-daemon
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/core/106/filelists/python-docutils
deleted file mode 120000
index 5ae1ada..0000000
--- a/config/rootfiles/core/106/filelists/python-docutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/python-docutils
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/core/106/filelists/python-inotify
deleted file mode 120000
index 6f572c3..0000000
--- a/config/rootfiles/core/106/filelists/python-inotify
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/python-inotify
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/core/106/filelists/python-ipaddress
deleted file mode 120000
index 0702482..0000000
--- a/config/rootfiles/core/106/filelists/python-ipaddress
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/python-ipaddress
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/core/106/filelists/smartmontools
deleted file mode 120000
index fb66daf..0000000
--- a/config/rootfiles/core/106/filelists/smartmontools
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/smartmontools
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/106/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/106/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/core/106/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/106/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/core/106/filelists/unbound
deleted file mode 120000
index 66adf09..0000000
--- a/config/rootfiles/core/106/filelists/unbound
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/core/106/filelists/usb_modeswitch
deleted file mode 120000
index acbab6f..0000000
--- a/config/rootfiles/core/106/filelists/usb_modeswitch
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/core/106/filelists/usb_modeswitch_data
deleted file mode 120000
index 4cbce46..0000000
--- a/config/rootfiles/core/106/filelists/usb_modeswitch_data
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/core/106/meta b/config/rootfiles/core/106/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/106/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh
deleted file mode 100644
index c3609af..0000000
--- a/config/rootfiles/core/106/update.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/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) 2016 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-core=106
-
-function exit_with_error() {
- # Set last succesfull installed core.
- echo $(($core-1)) > /opt/pakfire/db/core/mine
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: $1"
- exit $2
-}
-
-# Remove old core updates from pakfire cache to save space...
-for (( i=1; i<=$core; i++ )); do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-
-# Stop services
-/etc/init.d/squid stop
-/etc/init.d/ipsec stop
-/etc/init.d/dnsmasq stop
-
-# Extract files
-extract_files
-
-# Delete dnsmasq
-rm -vf \
- /etc/rc.d/init.d/dnsmasq \
- /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \
- /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \
- /usr/sbin/dnsmasq
-
-# delete unbound link after network start
-rm -vf /etc/rc.d/rc3.d/S21unbound
-
-# Delete old net-traffic stuff
-rm -vrf \
- /etc/rc.d/helper/writeipac.pl \
- /etc/rc.d/init.d/networking/red.up/40-ipac \
- /var/ipfire/net-traffic \
- /var/log/net-traffic.log*
-
-# update linker config
-ldconfig
-
-grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
-
-# Update DNS trust anchor
-%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem
-EOF
-
-# Update Language cache
-/usr/local/bin/update-lang-cache
-
-# Start services
-/etc/init.d/unbound start
-/etc/init.d/squid start
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
- /etc/init.d/ipsec start
-fi
-
-# Restart DHCP server to import leases into unbound
-/etc/init.d/dhcp restart
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-# Finish
-/etc/init.d/fireinfo start
-sendprofile
-
-# Update grub config to display new core version
-if [ -e /boot/grub/grub.cfg ]; then
- grub-mkconfig -o /boot/grub/grub.cfg
-fi
-sync
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/107/exclude b/config/rootfiles/core/107/exclude
new file mode 100644
index 0000000..1d8d74e
--- /dev/null
+++ b/config/rootfiles/core/107/exclude
@@ -0,0 +1,29 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+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/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/lib/unbound/root.key
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 0000000..7217107
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-multi b/config/rootfiles/core/107/filelists/armv5tel/linux-multi
new file mode 120000
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-rpi b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/files b/config/rootfiles/core/107/filelists/files
new file mode 100644
index 0000000..b03a86e
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/traffic.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/107/filelists/hdparm b/config/rootfiles/core/107/filelists/hdparm
new file mode 120000
index 0000000..b644751
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/hdparm
@@ -0,0 +1 @@
+../../../common/hdparm
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/i586/linux b/config/rootfiles/core/107/filelists/i586/linux
new file mode 120000
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/libjpeg b/config/rootfiles/core/107/filelists/libjpeg
new file mode 120000
index 0000000..3b1a782
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/libjpeg
@@ -0,0 +1 @@
+../../../common/libjpeg
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/libjpeg-compat b/config/rootfiles/core/107/filelists/libjpeg-compat
new file mode 120000
index 0000000..e6ff86d
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/libjpeg-compat
@@ -0,0 +1 @@
+../../../common/libjpeg-compat
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/squid b/config/rootfiles/core/107/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/107/filelists/x86_64/linux b/config/rootfiles/core/107/filelists/x86_64/linux
new file mode 120000
index 0000000..0615b5b
--- /dev/null
+++ b/config/rootfiles/core/107/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/107/meta b/config/rootfiles/core/107/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/107/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/107/update.sh b/config/rootfiles/core/107/update.sh
new file mode 100644
index 0000000..b8987b0
--- /dev/null
+++ b/config/rootfiles/core/107/update.sh
@@ -0,0 +1,249 @@
+#!/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) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+function find_device() {
+ local mountpoint="${1}"
+
+ local root
+ local dev mp fs flags rest
+ while read -r dev mp fs flags rest; do
+ # Skip unwanted entries
+ [ "${dev}" = "rootfs" ] && continue
+
+ if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
+ root="$(basename "${dev}")"
+ break
+ fi
+ done < /proc/mounts
+
+ # Get the actual device from the partition that holds /
+ while [ -n "${root}" ]; do
+ if [ -e "/sys/block/${root}" ]; then
+ echo "${root}"
+ return 0
+ fi
+
+ # Remove last character
+ root="${root::-1}"
+ done
+
+ return 1
+}
+
+
+core=107
+
+function exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire* )
+ # Ok.
+ ;;
+ * )
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+
+#
+#
+KVER="xxxKVERxxx"
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+echo
+echo Update Kernel to $KVER ...
+#
+# Remove old kernel, configs, initrd, modules, dtb's ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+case "$(uname -m)" in
+ armv*)
+ # Backup uEnv.txt if exist
+ if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+ fi
+
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ mkdir -pv /boot/dtb-$KVER-ipfire-multi
+ touch /boot/uImage-ipfire-kirkwood
+ touch /boot/zImage-ipfire-multi
+ touch /boot/uIinit-ipfire-kirkwood
+ touch /boot/uIinit-ipfire-multi
+ ;;
+esac
+
+# Stop services
+/etc/init.d/collectd stop
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
+# Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
+
+# Remove some old files
+
+# update linker config
+ldconfig
+
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $BOOTSPACE -lt 1000 ]; then
+ case $(uname -r) in
+ *-ipfire-kirkwood )
+ # Special handling for old kirkwood images.
+ # (install only kirkwood kernel)
+ rm -rf /boot/*
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+ --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+ ;;
+ * )
+ /etc/init.d/apache start
+ exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
+ ;;
+ esac
+fi
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/collectd start
+/etc/init.d/apache start
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+# Delete old QoS enabled indicator
+rm -f /var/ipfire/qos/enable
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ else
+ 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
+ fi
+ fi
+ ;;
+esac
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+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 &
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/106/exclude b/config/rootfiles/oldcore/106/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/106/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+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/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/106/filelists/attr b/config/rootfiles/oldcore/106/filelists/attr
new file mode 120000
index 0000000..c808017
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/attr
@@ -0,0 +1 @@
+../../../common/attr
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/diffutils b/config/rootfiles/oldcore/106/filelists/diffutils
new file mode 120000
index 0000000..a5c02f3
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/diffutils
@@ -0,0 +1 @@
+../../../common/diffutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/ed b/config/rootfiles/oldcore/106/filelists/ed
new file mode 120000
index 0000000..0ed331c
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/ed
@@ -0,0 +1 @@
+../../../common/ed
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/expat b/config/rootfiles/oldcore/106/filelists/expat
new file mode 120000
index 0000000..e1923cf
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/expat
@@ -0,0 +1 @@
+../../../common/expat
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/file b/config/rootfiles/oldcore/106/filelists/file
new file mode 120000
index 0000000..0c60e43
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/file
@@ -0,0 +1 @@
+../../../common/file
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/files b/config/rootfiles/oldcore/106/filelists/files
new file mode 100644
index 0000000..a67d30a
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/files
@@ -0,0 +1,25 @@
+etc/system-release
+etc/issue
+etc/login.defs
+etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/localnet
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
+etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
+etc/rc.d/init.d/ntp
+etc/rc.d/init.d/setclock
+etc/rc.d/init.d/unbound
+etc/rc.d/rc0.d/K79unbound
+etc/rc.d/rc3.d/S11unbound
+etc/rc.d/rc6.d/K79unbound
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/dnsforward.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/hosts.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/iptables.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+var/ipfire/backup/include
diff --git a/config/rootfiles/oldcore/106/filelists/flex b/config/rootfiles/oldcore/106/filelists/flex
new file mode 120000
index 0000000..feb0390
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/flex
@@ -0,0 +1 @@
+../../../common/flex
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/gawk b/config/rootfiles/oldcore/106/filelists/gawk
new file mode 120000
index 0000000..a3bbe32
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/gawk
@@ -0,0 +1 @@
+../../../common/gawk
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/gettext b/config/rootfiles/oldcore/106/filelists/gettext
new file mode 120000
index 0000000..b6c6c6f
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/gnupg b/config/rootfiles/oldcore/106/filelists/gnupg
new file mode 120000
index 0000000..a1a1564
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/iproute2 b/config/rootfiles/oldcore/106/filelists/iproute2
new file mode 120000
index 0000000..05f0f71
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/ipset b/config/rootfiles/oldcore/106/filelists/ipset
new file mode 120000
index 0000000..2b43691
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/ipset
@@ -0,0 +1 @@
+../../../common/ipset
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/libgpg-error b/config/rootfiles/oldcore/106/filelists/libgpg-error
new file mode 120000
index 0000000..cad4313
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/libgpg-error
@@ -0,0 +1 @@
+../../../common/libgpg-error
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/libidn b/config/rootfiles/oldcore/106/filelists/libidn
new file mode 120000
index 0000000..7e35489
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/libidn
@@ -0,0 +1 @@
+../../../common/libidn
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/libmnl b/config/rootfiles/oldcore/106/filelists/libmnl
new file mode 120000
index 0000000..f671c41
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/libmnl
@@ -0,0 +1 @@
+../../../common/libmnl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack b/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack
new file mode 120000
index 0000000..6ef5cc4
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack
@@ -0,0 +1 @@
+../../../common/libnetfilter_conntrack
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/misc-progs b/config/rootfiles/oldcore/106/filelists/misc-progs
new file mode 120000
index 0000000..7223cad
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/mt7601u-firmware b/config/rootfiles/oldcore/106/filelists/mt7601u-firmware
new file mode 120000
index 0000000..300ac04
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/mt7601u-firmware
@@ -0,0 +1 @@
+../../../common/mt7601u-firmware
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/openssl b/config/rootfiles/oldcore/106/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/python-daemon b/config/rootfiles/oldcore/106/filelists/python-daemon
new file mode 120000
index 0000000..8e510bb
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/python-daemon
@@ -0,0 +1 @@
+../../../common/python-daemon
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/python-docutils b/config/rootfiles/oldcore/106/filelists/python-docutils
new file mode 120000
index 0000000..5ae1ada
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/python-docutils
@@ -0,0 +1 @@
+../../../common/python-docutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/python-inotify b/config/rootfiles/oldcore/106/filelists/python-inotify
new file mode 120000
index 0000000..6f572c3
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/python-inotify
@@ -0,0 +1 @@
+../../../common/python-inotify
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/python-ipaddress b/config/rootfiles/oldcore/106/filelists/python-ipaddress
new file mode 120000
index 0000000..0702482
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/python-ipaddress
@@ -0,0 +1 @@
+../../../common/python-ipaddress
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/smartmontools b/config/rootfiles/oldcore/106/filelists/smartmontools
new file mode 120000
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/squid b/config/rootfiles/oldcore/106/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/strongswan b/config/rootfiles/oldcore/106/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/unbound b/config/rootfiles/oldcore/106/filelists/unbound
new file mode 120000
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/usb_modeswitch b/config/rootfiles/oldcore/106/filelists/usb_modeswitch
new file mode 120000
index 0000000..acbab6f
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/usb_modeswitch
@@ -0,0 +1 @@
+../../../common/usb_modeswitch
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data
new file mode 120000
index 0000000..4cbce46
--- /dev/null
+++ b/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data
@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/106/meta b/config/rootfiles/oldcore/106/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/106/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/106/update.sh b/config/rootfiles/oldcore/106/update.sh
new file mode 100644
index 0000000..c3609af
--- /dev/null
+++ b/config/rootfiles/oldcore/106/update.sh
@@ -0,0 +1,104 @@
+#!/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) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=106
+
+function exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+# Stop services
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/dnsmasq stop
+
+# Extract files
+extract_files
+
+# Delete dnsmasq
+rm -vf \
+ /etc/rc.d/init.d/dnsmasq \
+ /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \
+ /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \
+ /usr/sbin/dnsmasq
+
+# delete unbound link after network start
+rm -vf /etc/rc.d/rc3.d/S21unbound
+
+# Delete old net-traffic stuff
+rm -vrf \
+ /etc/rc.d/helper/writeipac.pl \
+ /etc/rc.d/init.d/networking/red.up/40-ipac \
+ /var/ipfire/net-traffic \
+ /var/log/net-traffic.log*
+
+# update linker config
+ldconfig
+
+grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Update DNS trust anchor
+%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem
+EOF
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/squid start
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+ /etc/init.d/ipsec start
+fi
+
+# Restart DHCP server to import leases into unbound
+/etc/init.d/dhcp restart
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index e30c075..d2e32ab 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="106" # Core Level (Filename)
+CORE="107" # Core Level (Filename)
PAKFIRE_CORE="106" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-10-27 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-27 19:11 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 38183e52dd438dbe0bb204d4601e902fb6cf0af5 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox