Start Core Update 116

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-10-23 16:24:10 +01:00
parent a809d7fa68
commit cd8a7fc1eb
19 changed files with 97 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
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/log/dhcpcd.log
var/log/messages
var/state/dhcp/dhcpd.leases
var/updatecache

View File

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

View File

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

View File

@@ -0,0 +1,31 @@
etc/system-release
etc/issue
etc/httpd/conf/vhosts.d/captive.conf
etc/httpd/conf/vhosts.d/ipfire-interface.conf
etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/rc.d/init.d/apache
etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/captive/index.cgi
srv/web/ipfire/cgi-bin/captive/logo.cgi
srv/web/ipfire/cgi-bin/captive/redirect.cgi
srv/web/ipfire/cgi-bin/captive.cgi
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/captive
usr/bin/captive-cleanup
usr/local/bin/backupiso
usr/local/bin/captivectrl
usr/local/bin/wirelessctrl
var/ipfire/backup/include
var/ipfire/captive
var/ipfire/extrahd/bin/extrahd.pl
var/ipfire/general-functions.pl
var/ipfire/lang.pl
var/ipfire/langs
var/ipfire/menu.d/30-network.menu
var/ipfire/modem-lib.pl
var/ipfire/network-functions.pl
var/ipfire/ovpn/openssl/ovpn.cnf
var/log/httpd/captive

View File

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

View File

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

View File

@@ -0,0 +1 @@
../../../common/perl-Font-TTF

View File

@@ -0,0 +1 @@
../../../common/perl-IO-String

View File

@@ -0,0 +1 @@
../../../common/perl-PDF-API2

View File

@@ -0,0 +1 @@
../../../common/ubuntu-font-family

View File

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

View File

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

View File

@@ -0,0 +1,95 @@
#!/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) 2017 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
core=115
# 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
openvpnctrl -k
openvpnctrl -kn2n
/etc/rc.d/init.d/apache stop
# Extract files
extract_files
# Remove files
rm -vf \
/usr/local/bin/httpscert \
/srv/web/ipfire/html/dial.cgi
# update linker config
ldconfig
# Update Language cache
/usr/local/bin/update-lang-cache
# Start services
/etc/rc.d/init.d/apache2 start
openvpnctrl -s
openvpnctrl -sn2n
grep -q "captivectrl" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
# Cleanup captive clients
%hourly * /usr/bin/captive-cleanup
# Reload captive firewall rules
%nightly * 23-1 /usr/local/bin/captivectrl >/dev/null
EOF
fcrontab -z
# Load captive portal configuration
/etc/rc.d/init.d/firewall restart
# Regenerate IPsec configuration
sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/init.d/ipsec restart
fi
# Let pakfire forget the perl-PDF-API2 package
rm -fv /opt/pakfire/db/rootfiles/perl-PDF-API2
rm -fv /opt/pakfire/db/*/meta-perl-PDF-API2
# 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