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, master has been updated via b447d23666fa4ffc5a063cc1712ae750caed4e0d (commit) via b71c52dd6fea7f873677c3c9d0df4dc8d526afed (commit) via 1d0a260a8b804e43037a2c0aa3ef9bae1ddca656 (commit) via 4f2aca6d2b1bd49b1fc090af657726f2ce011086 (commit) via d58c41f1ef6aa5bc0178f4351ddc110dc6159b2d (commit) via aa29e9e46c30e8af9984dec30dc5e821af8f0168 (commit) from 5cd3a05bf0653726834489c87b80064584e6073b (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 b447d23666fa4ffc5a063cc1712ae750caed4e0d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 30 13:01:49 2013 +0100
close core75.
commit b71c52dd6fea7f873677c3c9d0df4dc8d526afed Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 30 13:00:13 2013 +0100
Move Core Updates 70-74 to oldcore directory.
commit 1d0a260a8b804e43037a2c0aa3ef9bae1ddca656 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 29 21:13:55 2013 +0100
openvpn: Move verify script out of configuration directory.
commit 4f2aca6d2b1bd49b1fc090af657726f2ce011086 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 29 20:41:25 2013 +0100
Create core update 75.
commit d58c41f1ef6aa5bc0178f4351ddc110dc6159b2d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 28 17:06:38 2013 +0100
pakfire: Prevent an infinite loop with empty server list.
commit aa29e9e46c30e8af9984dec30dc5e821af8f0168 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 25 15:12:34 2013 +0100
openvpn: Fix verify script.
Former versions of openvpn called the script where the arguments in the certificate's common name where separated by /. Now, those are separated by ", " (comma, space).
-----------------------------------------------------------------------
Summary of changes: config/ovpn/verify | 4 +-- config/rootfiles/common/openvpn | 2 +- config/rootfiles/core/{70 => 75}/exclude | 0 config/rootfiles/core/75/filelists/files | 6 ++++ config/rootfiles/core/{70 => 75}/meta | 0 config/rootfiles/core/{72 => 75}/update.sh | 33 ++++++++-------------- config/rootfiles/{core/71 => oldcore/70}/exclude | 0 .../70/filelists/armv5tel/linux-kirkwood | 0 .../70/filelists/armv5tel/linux-omap | 0 .../70/filelists/armv5tel/linux-rpi | 0 .../rootfiles/{core => oldcore}/70/filelists/crda | 0 .../rootfiles/{core => oldcore}/70/filelists/files | 0 .../{core => oldcore}/70/filelists/i586/grub.conf | 0 .../{core => oldcore}/70/filelists/i586/linux | 0 config/rootfiles/{core => oldcore}/70/filelists/iw | 0 .../{core => oldcore}/70/filelists/libjpeg | 0 .../{core => oldcore}/70/filelists/wireless-regdb | 0 config/rootfiles/{core/71 => oldcore/70}/meta | 0 config/rootfiles/{core => oldcore}/70/update.sh | 0 config/rootfiles/{core/73 => oldcore/71}/exclude | 0 .../rootfiles/{core => oldcore}/71/filelists/GeoIP | 0 .../rootfiles/{core => oldcore}/71/filelists/curl | 0 .../rootfiles/{core => oldcore}/71/filelists/files | 0 .../{core => oldcore}/71/filelists/hwdata | 0 .../{core => oldcore}/71/filelists/jwhois | 0 .../{core => oldcore}/71/filelists/oinkmaster | 0 .../rootfiles/{core => oldcore}/71/filelists/snort | 0 .../rootfiles/{core => oldcore}/71/filelists/squid | 0 .../{core => oldcore}/71/filelists/usb_modeswitch | 0 .../71/filelists/usb_modeswitch_data | 0 config/rootfiles/{core/72 => oldcore/71}/meta | 0 config/rootfiles/{core => oldcore}/71/update.sh | 0 config/rootfiles/{core => oldcore}/72/exclude | 0 .../rootfiles/{core => oldcore}/72/filelists/daq | 0 .../rootfiles/{core => oldcore}/72/filelists/files | 0 .../72/filelists/i586/strongswan-padlock | 0 .../rootfiles/{core => oldcore}/72/filelists/snort | 0 .../rootfiles/{core => oldcore}/72/filelists/squid | 0 .../{core => oldcore}/72/filelists/strongswan | 0 config/rootfiles/{core/73 => oldcore/72}/meta | 0 config/rootfiles/{core => oldcore}/72/update.sh | 0 config/rootfiles/{core/74 => oldcore/73}/exclude | 0 .../rootfiles/{core => oldcore}/73/filelists/GeoIP | 0 .../{core => oldcore}/73/filelists/HTML-Template | 0 .../73/filelists/armv5tel/ath-modul | 0 .../rootfiles/{core => oldcore}/73/filelists/files | 0 .../{core => oldcore}/73/filelists/hwdata | 0 .../{core => oldcore}/73/filelists/i586/ath-modul | 0 .../{core => oldcore}/73/filelists/openssh | 0 .../rootfiles/{core => oldcore}/73/filelists/php | 0 .../rootfiles/{core => oldcore}/73/filelists/squid | 0 config/rootfiles/{core/74 => oldcore/73}/meta | 0 config/rootfiles/{core => oldcore}/73/update.sh | 0 config/rootfiles/{core/70 => oldcore/74}/exclude | 0 .../rootfiles/{core => oldcore}/74/filelists/files | 0 .../74/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/74/filelists/openvpn | 0 .../rootfiles/{core => oldcore}/74/filelists/squid | 0 .../{core => oldcore}/74/filelists/strongswan | 0 config/rootfiles/{core/70 => oldcore/74}/meta | 0 config/rootfiles/{core => oldcore}/74/update.sh | 0 html/cgi-bin/ovpnmain.cgi | 2 +- lfs/openvpn | 3 +- make.sh | 4 +-- src/pakfire/lib/functions.pl | 7 ++++- 65 files changed, 32 insertions(+), 29 deletions(-) copy config/rootfiles/core/{70 => 75}/exclude (100%) create mode 100644 config/rootfiles/core/75/filelists/files copy config/rootfiles/core/{70 => 75}/meta (100%) copy config/rootfiles/core/{72 => 75}/update.sh (85%) rename config/rootfiles/{core/71 => oldcore/70}/exclude (100%) rename config/rootfiles/{core => oldcore}/70/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/70/filelists/armv5tel/linux-omap (100%) rename config/rootfiles/{core => oldcore}/70/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/70/filelists/crda (100%) rename config/rootfiles/{core => oldcore}/70/filelists/files (100%) rename config/rootfiles/{core => oldcore}/70/filelists/i586/grub.conf (100%) rename config/rootfiles/{core => oldcore}/70/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/70/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/70/filelists/libjpeg (100%) rename config/rootfiles/{core => oldcore}/70/filelists/wireless-regdb (100%) rename config/rootfiles/{core/71 => oldcore/70}/meta (100%) rename config/rootfiles/{core => oldcore}/70/update.sh (100%) rename config/rootfiles/{core/73 => oldcore/71}/exclude (100%) rename config/rootfiles/{core => oldcore}/71/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/71/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/71/filelists/files (100%) rename config/rootfiles/{core => oldcore}/71/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/71/filelists/jwhois (100%) rename config/rootfiles/{core => oldcore}/71/filelists/oinkmaster (100%) rename config/rootfiles/{core => oldcore}/71/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/71/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/71/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/71/filelists/usb_modeswitch_data (100%) rename config/rootfiles/{core/72 => oldcore/71}/meta (100%) rename config/rootfiles/{core => oldcore}/71/update.sh (100%) rename config/rootfiles/{core => oldcore}/72/exclude (100%) rename config/rootfiles/{core => oldcore}/72/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/72/filelists/files (100%) rename config/rootfiles/{core => oldcore}/72/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/72/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/72/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/72/filelists/strongswan (100%) rename config/rootfiles/{core/73 => oldcore/72}/meta (100%) rename config/rootfiles/{core => oldcore}/72/update.sh (100%) rename config/rootfiles/{core/74 => oldcore/73}/exclude (100%) rename config/rootfiles/{core => oldcore}/73/filelists/GeoIP (100%) rename config/rootfiles/{core => oldcore}/73/filelists/HTML-Template (100%) rename config/rootfiles/{core => oldcore}/73/filelists/armv5tel/ath-modul (100%) rename config/rootfiles/{core => oldcore}/73/filelists/files (100%) rename config/rootfiles/{core => oldcore}/73/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/73/filelists/i586/ath-modul (100%) rename config/rootfiles/{core => oldcore}/73/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/73/filelists/php (100%) rename config/rootfiles/{core => oldcore}/73/filelists/squid (100%) rename config/rootfiles/{core/74 => oldcore/73}/meta (100%) rename config/rootfiles/{core => oldcore}/73/update.sh (100%) rename config/rootfiles/{core/70 => oldcore/74}/exclude (100%) rename config/rootfiles/{core => oldcore}/74/filelists/files (100%) rename config/rootfiles/{core => oldcore}/74/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/74/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/74/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/74/filelists/strongswan (100%) rename config/rootfiles/{core/70 => oldcore/74}/meta (100%) rename config/rootfiles/{core => oldcore}/74/update.sh (100%)
Difference in files: diff --git a/config/ovpn/verify b/config/ovpn/verify index 44ed110..1a1fcb5 100644 --- a/config/ovpn/verify +++ b/config/ovpn/verify @@ -30,8 +30,8 @@ my $CN = $ARGV[1]; exit 0 unless ($DEPTH eq "0");
# Strip the CN from the X509 identifier. -$CN =~ //CN=(.*)$/i; -$CN = $1; +$CN =~ /(/|,\ )CN=(.*)$/i; +$CN = $2;
my %confighash = (); if (-f "${General::swroot}/ovpn/ovpnconfig"){ diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index ae6d6ee..d1b836a 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -5,6 +5,7 @@ usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so #usr/lib/openvpn/plugins/openvpn-plugin-down-root.la usr/lib/openvpn/plugins/openvpn-plugin-down-root.so +usr/lib/openvpn/verify usr/sbin/openvpn #usr/share/doc/openvpn #usr/share/doc/openvpn/COPYING @@ -31,4 +32,3 @@ var/ipfire/ovpn/ovpn-leases.db var/ipfire/ovpn/ovpnconfig var/ipfire/ovpn/scripts var/ipfire/ovpn/settings -var/ipfire/ovpn/verify diff --git a/config/rootfiles/core/70/exclude b/config/rootfiles/core/70/exclude deleted file mode 100644 index 321a931..0000000 --- a/config/rootfiles/core/70/exclude +++ /dev/null @@ -1,17 +0,0 @@ -srv/web/ipfire/html/proxy.pac -boot/config.txt -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/70/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-omap b/config/rootfiles/core/70/filelists/armv5tel/linux-omap deleted file mode 120000 index 50bf786..0000000 --- a/config/rootfiles/core/70/filelists/armv5tel/linux-omap +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/armv5tel/linux-rpi b/config/rootfiles/core/70/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/70/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/crda b/config/rootfiles/core/70/filelists/crda deleted file mode 120000 index d68c46e..0000000 --- a/config/rootfiles/core/70/filelists/crda +++ /dev/null @@ -1 +0,0 @@ -../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files deleted file mode 100644 index 1809e77..0000000 --- a/config/rootfiles/core/70/filelists/files +++ /dev/null @@ -1,52 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -etc/rc.d/init.d/network-vlans -etc/rc.d/init.d/squid -usr/local/bin/openvpnctrl -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -usr/lib/squid/errors/tr/ERR_ACCESS_DENIED -usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED -usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE -usr/lib/squid/errors/tr/ERR_AGENT_WPAD -usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED -usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED -usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD -usr/lib/squid/errors/tr/ERR_CONNECT_FAIL -usr/lib/squid/errors/tr/ERR_DIR_LISTING -usr/lib/squid/errors/tr/ERR_DNS_FAIL -usr/lib/squid/errors/tr/ERR_ESI -usr/lib/squid/errors/tr/ERR_FORWARDING_DENIED -usr/lib/squid/errors/tr/ERR_FTP_DISABLED -usr/lib/squid/errors/tr/ERR_FTP_FAILURE -usr/lib/squid/errors/tr/ERR_FTP_FORBIDDEN -usr/lib/squid/errors/tr/ERR_FTP_NOT_FOUND -usr/lib/squid/errors/tr/ERR_FTP_PUT_CREATED -usr/lib/squid/errors/tr/ERR_FTP_PUT_ERROR -usr/lib/squid/errors/tr/ERR_FTP_PUT_MODIFIED -usr/lib/squid/errors/tr/ERR_FTP_UNAVAILABLE -usr/lib/squid/errors/tr/ERR_GATEWAY_FAILURE -usr/lib/squid/errors/tr/ERR_ICAP_FAILURE -usr/lib/squid/errors/tr/ERR_INVALID_REQ -usr/lib/squid/errors/tr/ERR_INVALID_RESP -usr/lib/squid/errors/tr/ERR_INVALID_URL -usr/lib/squid/errors/tr/ERR_LIFETIME_EXP -usr/lib/squid/errors/tr/ERR_NO_RELAY -usr/lib/squid/errors/tr/ERR_ONLY_IF_CACHED_MISS -usr/lib/squid/errors/tr/ERR_PRECONDITION_FAILED -usr/lib/squid/errors/tr/ERR_READ_ERROR -usr/lib/squid/errors/tr/ERR_READ_TIMEOUT -usr/lib/squid/errors/tr/ERR_SECURE_CONNECT_FAIL -usr/lib/squid/errors/tr/ERR_SHUTTING_DOWN -usr/lib/squid/errors/tr/ERR_SOCKET_FAILURE -usr/lib/squid/errors/tr/ERR_TOO_BIG -usr/lib/squid/errors/tr/ERR_UNSUP_HTTPVERSION -usr/lib/squid/errors/tr/ERR_UNSUP_REQ -usr/lib/squid/errors/tr/ERR_URN_RESOLVE -usr/lib/squid/errors/tr/ERR_WRITE_ERROR -usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/tr/error-details.txt -usr/local/bin/setddns.pl -var/ipfire/general-functions.pl -var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/70/filelists/i586/grub.conf b/config/rootfiles/core/70/filelists/i586/grub.conf deleted file mode 100644 index b120cc5..0000000 --- a/config/rootfiles/core/70/filelists/i586/grub.conf +++ /dev/null @@ -1 +0,0 @@ -boot/grub/grub.conf diff --git a/config/rootfiles/core/70/filelists/i586/linux b/config/rootfiles/core/70/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/70/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/iw b/config/rootfiles/core/70/filelists/iw deleted file mode 120000 index 7c58a20..0000000 --- a/config/rootfiles/core/70/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/libjpeg b/config/rootfiles/core/70/filelists/libjpeg deleted file mode 120000 index 3b1a782..0000000 --- a/config/rootfiles/core/70/filelists/libjpeg +++ /dev/null @@ -1 +0,0 @@ -../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/70/filelists/wireless-regdb b/config/rootfiles/core/70/filelists/wireless-regdb deleted file mode 120000 index c9205b3..0000000 --- a/config/rootfiles/core/70/filelists/wireless-regdb +++ /dev/null @@ -1 +0,0 @@ -../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/core/70/meta b/config/rootfiles/core/70/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/70/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/70/update.sh b/config/rootfiles/core/70/update.sh deleted file mode 100644 index 4076f06..0000000 --- a/config/rootfiles/core/70/update.sh +++ /dev/null @@ -1,274 +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) 2013 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -core=70 -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-versatile ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. versatile support is dropped." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; - *-ipfire-xen ) - BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` - if [ $BOOTSIZE -lt 28000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough space on boot." - exit 2 - fi - ;; - *-ipfire* ) - # Ok. - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update. No IPFire Kernel." - # Report no error to pakfire. So it does not try to install it again. - exit 0 - ;; -esac - - -# -# -KVER="3.2.48" -MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_$KVER-old.tar.xz -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 -add_to_backup lib/modules -add_to_backup boot -add_to_backup etc/sysconfig/lm_sensors -add_to_backup etc/sysconfig/rc.local - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 70000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: ERROR cannot update because not enough free space on root." - exit 2 -fi - -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 /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules - -case $(uname -m) in - i?86 ) - # - # Backup grub.conf - # - cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - ;; -esac - -# -# Remove meta's of packages that are now common... -# -rm -rf /opt/pakfire/db/*/meta-freefont - -# -#Stop services - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# 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/* - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." - /etc/init.d/apache start - exit 4 - ;; - esac -fi - - -# -#Start services - -case $(uname -m) in - i?86 ) - # - # Modify grub.conf - # - echo - echo Update grub configuration ... - ROOT=`mount | grep " / " | cut -d" " -f1` - - if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - fi - - if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf - else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf - fi - 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,115200n8 panic=10 |g" /boot/grub/grub.conf - fi - - # - # ReInstall grub - # - echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map - grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} - ;; -esac -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/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 8000 -o $ROOTSPACE -lt 70000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - rm -f /boot/grub/grub-backup-*-pae_install.conf - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 3.2.46" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 29" >> /opt/pakfire/db/installed/meta-linux-pae - fi -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - rm -f /boot/grub/grub-backup-*-xen.conf - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 26" >> /opt/pakfire/db/installed/meta-linux-xen -fi - -# -# 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.cfg"' >> /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 -# -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 -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/71/exclude b/config/rootfiles/core/71/exclude deleted file mode 100644 index 321a931..0000000 --- a/config/rootfiles/core/71/exclude +++ /dev/null @@ -1,17 +0,0 @@ -srv/web/ipfire/html/proxy.pac -boot/config.txt -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/71/filelists/GeoIP b/config/rootfiles/core/71/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/71/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/71/filelists/curl b/config/rootfiles/core/71/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/71/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files deleted file mode 100644 index c7df219..0000000 --- a/config/rootfiles/core/71/filelists/files +++ /dev/null @@ -1,25 +0,0 @@ -etc/system-release -etc/issue -var/ipfire/general-functions.pl -var/ipfire/header.pl -var/ipfire/menu.d/10-system.menu -var/ipfire/menu.d/30-network.menu -etc/rc.d/init.d/dnsmasq -etc/rc.d/init.d/wlanclient -etc/rc.d/init.d/networking/functions.network -etc/rc.d/init.d/networking/wpa_supplicant.exe -etc/rc.d/init.d/networking/red -etc/rc.d/rc0.d/K82wlanclient -etc/rc.d/rc3.d/S19wlanclient -etc/rc.d/rc6.d/K82wlanclient -usr/local/bin/dnsmasqctrl -usr/local/bin/wirelessclient -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/wirelessclient.cgi -var/ipfire/dnsforward/config -var/ipfire/general-functions.pl -var/ipfire/langs -var/ipfire/backup/include diff --git a/config/rootfiles/core/71/filelists/hwdata b/config/rootfiles/core/71/filelists/hwdata deleted file mode 100644 index 5a9672f..0000000 --- a/config/rootfiles/core/71/filelists/hwdata +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/71/filelists/jwhois b/config/rootfiles/core/71/filelists/jwhois deleted file mode 120000 index b984a7f..0000000 --- a/config/rootfiles/core/71/filelists/jwhois +++ /dev/null @@ -1 +0,0 @@ -../../../common/jwhois \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/oinkmaster b/config/rootfiles/core/71/filelists/oinkmaster deleted file mode 120000 index 75029e6..0000000 --- a/config/rootfiles/core/71/filelists/oinkmaster +++ /dev/null @@ -1 +0,0 @@ -../../../common/oinkmaster \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/snort b/config/rootfiles/core/71/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/71/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/squid b/config/rootfiles/core/71/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/71/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch b/config/rootfiles/core/71/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/71/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/71/filelists/usb_modeswitch_data b/config/rootfiles/core/71/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/71/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/71/meta b/config/rootfiles/core/71/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/71/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh deleted file mode 100644 index e45ccd8..0000000 --- a/config/rootfiles/core/71/update.sh +++ /dev/null @@ -1,80 +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) 2013 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=71 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Backup snort.conf -cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup - -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -# -#Remove old usb-modeswitch file -rm /usr/share/usb_modeswitch/0e8d:0002 - -# -#Extract files -extract_files - -# -#Create wireless config file... -touch /var/ipfire/ethernet/wireless -chown nobody:nobody /var/ipfire/ethernet/wireless - -# -# Import active rules to new snort.conf -grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf - -# -#Start services -/etc/init.d/squid start -/etc/init.d/snort start - -# -#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/core/72/exclude b/config/rootfiles/core/72/exclude deleted file mode 100644 index e8ae55d..0000000 --- a/config/rootfiles/core/72/exclude +++ /dev/null @@ -1,17 +0,0 @@ -srv/web/ipfire/html/proxy.pac -boot/config.txt -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases -etc/snort/snort.conf diff --git a/config/rootfiles/core/72/filelists/daq b/config/rootfiles/core/72/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/72/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files deleted file mode 100644 index e8f90a1..0000000 --- a/config/rootfiles/core/72/filelists/files +++ /dev/null @@ -1,11 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -usr/local/bin/openvpnctrl -usr/local/bin/setddns.pl -var/ipfire/langs -var/ipfire/ovpn/verify diff --git a/config/rootfiles/core/72/filelists/i586/strongswan-padlock b/config/rootfiles/core/72/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/72/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/72/filelists/snort b/config/rootfiles/core/72/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/72/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/squid b/config/rootfiles/core/72/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/72/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/72/filelists/strongswan b/config/rootfiles/core/72/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/72/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/72/meta b/config/rootfiles/core/72/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/72/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/72/update.sh b/config/rootfiles/core/72/update.sh deleted file mode 100644 index c3dc20a..0000000 --- a/config/rootfiles/core/72/update.sh +++ /dev/null @@ -1,69 +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) 2013 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=72 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services -/etc/init.d/ipsec stop -/etc/init.d/snort stop -/etc/init.d/squid stop - -# -#Extract files -extract_files - - -# -#Start services -/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 - - -# -#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/core/73/exclude b/config/rootfiles/core/73/exclude deleted file mode 100644 index 321a931..0000000 --- a/config/rootfiles/core/73/exclude +++ /dev/null @@ -1,17 +0,0 @@ -srv/web/ipfire/html/proxy.pac -boot/config.txt -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/73/filelists/GeoIP b/config/rootfiles/core/73/filelists/GeoIP deleted file mode 100644 index 0258236..0000000 --- a/config/rootfiles/core/73/filelists/GeoIP +++ /dev/null @@ -1 +0,0 @@ -usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/73/filelists/HTML-Template b/config/rootfiles/core/73/filelists/HTML-Template deleted file mode 120000 index f17c1da..0000000 --- a/config/rootfiles/core/73/filelists/HTML-Template +++ /dev/null @@ -1 +0,0 @@ -../../../common/HTML-Template \ No newline at end of file diff --git a/config/rootfiles/core/73/filelists/armv5tel/ath-modul b/config/rootfiles/core/73/filelists/armv5tel/ath-modul deleted file mode 100644 index 63bcd75..0000000 --- a/config/rootfiles/core/73/filelists/armv5tel/ath-modul +++ /dev/null @@ -1,3 +0,0 @@ -lib/modules/3.2.48-ipfire-omap/kernel/drivers/net/wireless/ath/ath.ko -lib/modules/3.2.48-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath.ko -lib/modules/3.2.48-ipfire-rpi/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files deleted file mode 100644 index 8ddb964..0000000 --- a/config/rootfiles/core/73/filelists/files +++ /dev/null @@ -1,15 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/dnsmasq -etc/rc.d/init.d/squid -srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat -srv/web/ipfire/cgi-bin/netinternal.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/wirelessclient.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/redirect.cgi -srv/web/ipfire/html/redirect-templates/ -var/ipfire/header.pl -var/ipfire/langs -var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/core/73/filelists/hwdata b/config/rootfiles/core/73/filelists/hwdata deleted file mode 100644 index 5a9672f..0000000 --- a/config/rootfiles/core/73/filelists/hwdata +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/73/filelists/i586/ath-modul b/config/rootfiles/core/73/filelists/i586/ath-modul deleted file mode 100644 index 6656dae..0000000 --- a/config/rootfiles/core/73/filelists/i586/ath-modul +++ /dev/null @@ -1,3 +0,0 @@ -lib/modules/2.6.32.61-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko -lib/modules/3.2.48-ipfire/kernel/drivers/net/wireless/ath/ath.ko -lib/modules/3.2.48-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/73/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php deleted file mode 120000 index 1ae48d7..0000000 --- a/config/rootfiles/core/73/filelists/php +++ /dev/null @@ -1 +0,0 @@ -../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/73/filelists/squid b/config/rootfiles/core/73/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/73/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/73/meta b/config/rootfiles/core/73/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/73/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh deleted file mode 100644 index a9fed1b..0000000 --- a/config/rootfiles/core/73/update.sh +++ /dev/null @@ -1,81 +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) 2013 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=73 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - - -# -#Stop services -/etc/init.d/squid stop - - -# -#Extract files -extract_files - -if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then - ( - eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) - - TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))" - echo "TRANSPARENT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings - ) -fi - -# Regenerate squid configuration files. -/srv/web/ipfire/cgi-bin/proxy.cgi - -# -#Start services -/etc/init.d/squid start - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Remove invalid fetchmail symlinks when postfix is installed. -if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then - rm -f /etc/rc.d/rc*.d/*fetchmail -fi - -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/core/74/exclude b/config/rootfiles/core/74/exclude deleted file mode 100644 index 321a931..0000000 --- a/config/rootfiles/core/74/exclude +++ /dev/null @@ -1,17 +0,0 @@ -srv/web/ipfire/html/proxy.pac -boot/config.txt -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/log/cache -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/74/filelists/files b/config/rootfiles/core/74/filelists/files deleted file mode 100644 index 52d0178..0000000 --- a/config/rootfiles/core/74/filelists/files +++ /dev/null @@ -1,7 +0,0 @@ -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -usr/local/bin/httpscert -var/ipfire/header.pl -var/ipfire/langs diff --git a/config/rootfiles/core/74/filelists/i586/strongswan-padlock b/config/rootfiles/core/74/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/74/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/74/filelists/openvpn b/config/rootfiles/core/74/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/74/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/squid b/config/rootfiles/core/74/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/74/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/strongswan b/config/rootfiles/core/74/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/74/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/core/74/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/74/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/74/update.sh b/config/rootfiles/core/74/update.sh deleted file mode 100644 index ca26b51..0000000 --- a/config/rootfiles/core/74/update.sh +++ /dev/null @@ -1,84 +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) 2013 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=74 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - - -# -#Stop services -/etc/init.d/ipsec stop -/etc/init.d/squid stop - - -# -#Extract files -extract_files - -if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then - ( - eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) - - if [ "${TRANSPARENT_PORT}" = "81" ]; then - TRANSPARENT_PORT="$(( ${TRANSPARENT_PORT} + 1 ))" - sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \ - -i /var/ipfire/proxy/advanced/settings - fi - ) -fi - -# Regenerate squid configuration files. -/srv/web/ipfire/cgi-bin/proxy.cgi -chown nobody:nobody /var/ipfire/proxy/squid.conf - -# -#Start services -/etc/init.d/squid start - -if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then - /etc/init.d/ipsec start -fi - -# -#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/core/75/exclude b/config/rootfiles/core/75/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/75/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files new file mode 100644 index 0000000..647eb26 --- /dev/null +++ b/config/rootfiles/core/75/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.pl +usr/lib/openvpn/verify +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/core/75/meta b/config/rootfiles/core/75/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/75/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh new file mode 100644 index 0000000..3fd00fe --- /dev/null +++ b/config/rootfiles/core/75/update.sh @@ -0,0 +1,60 @@ +#!/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) 2013 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=75 +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 + +# Replace path to verify script. +if [ -r "/var/ipfire/ovpn/server.conf" ]; then + sed -e "s@^tls-verify.*@tls-verify /usr/lib/openvpn/verify@g" \ + -i /var/ipfire/ovpn/server.conf +fi + +# 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/70/exclude b/config/rootfiles/oldcore/70/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/oldcore/70/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/oldcore/70/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/armv5tel/linux-omap b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-omap new file mode 120000 index 0000000..50bf786 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-omap @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/crda b/config/rootfiles/oldcore/70/filelists/crda new file mode 120000 index 0000000..d68c46e --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/crda @@ -0,0 +1 @@ +../../../common/crda \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/files b/config/rootfiles/oldcore/70/filelists/files new file mode 100644 index 0000000..1809e77 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/files @@ -0,0 +1,52 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/network-vlans +etc/rc.d/init.d/squid +usr/local/bin/openvpnctrl +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +usr/lib/squid/errors/tr/ERR_ACCESS_DENIED +usr/lib/squid/errors/tr/ERR_ACL_TIME_QUOTA_EXCEEDED +usr/lib/squid/errors/tr/ERR_AGENT_CONFIGURE +usr/lib/squid/errors/tr/ERR_AGENT_WPAD +usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD +usr/lib/squid/errors/tr/ERR_CONNECT_FAIL +usr/lib/squid/errors/tr/ERR_DIR_LISTING +usr/lib/squid/errors/tr/ERR_DNS_FAIL +usr/lib/squid/errors/tr/ERR_ESI +usr/lib/squid/errors/tr/ERR_FORWARDING_DENIED +usr/lib/squid/errors/tr/ERR_FTP_DISABLED +usr/lib/squid/errors/tr/ERR_FTP_FAILURE +usr/lib/squid/errors/tr/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/tr/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/tr/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/tr/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/tr/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/tr/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/tr/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/tr/ERR_ICAP_FAILURE +usr/lib/squid/errors/tr/ERR_INVALID_REQ +usr/lib/squid/errors/tr/ERR_INVALID_RESP +usr/lib/squid/errors/tr/ERR_INVALID_URL +usr/lib/squid/errors/tr/ERR_LIFETIME_EXP +usr/lib/squid/errors/tr/ERR_NO_RELAY +usr/lib/squid/errors/tr/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/tr/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/tr/ERR_READ_ERROR +usr/lib/squid/errors/tr/ERR_READ_TIMEOUT +usr/lib/squid/errors/tr/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/tr/ERR_SHUTTING_DOWN +usr/lib/squid/errors/tr/ERR_SOCKET_FAILURE +usr/lib/squid/errors/tr/ERR_TOO_BIG +usr/lib/squid/errors/tr/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/tr/ERR_UNSUP_REQ +usr/lib/squid/errors/tr/ERR_URN_RESOLVE +usr/lib/squid/errors/tr/ERR_WRITE_ERROR +usr/lib/squid/errors/tr/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/tr/error-details.txt +usr/local/bin/setddns.pl +var/ipfire/general-functions.pl +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/oldcore/70/filelists/i586/grub.conf b/config/rootfiles/oldcore/70/filelists/i586/grub.conf new file mode 100644 index 0000000..b120cc5 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/i586/grub.conf @@ -0,0 +1 @@ +boot/grub/grub.conf diff --git a/config/rootfiles/oldcore/70/filelists/i586/linux b/config/rootfiles/oldcore/70/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/iw b/config/rootfiles/oldcore/70/filelists/iw new file mode 120000 index 0000000..7c58a20 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/libjpeg b/config/rootfiles/oldcore/70/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/filelists/wireless-regdb b/config/rootfiles/oldcore/70/filelists/wireless-regdb new file mode 120000 index 0000000..c9205b3 --- /dev/null +++ b/config/rootfiles/oldcore/70/filelists/wireless-regdb @@ -0,0 +1 @@ +../../../common/wireless-regdb \ No newline at end of file diff --git a/config/rootfiles/oldcore/70/meta b/config/rootfiles/oldcore/70/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/70/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/70/update.sh b/config/rootfiles/oldcore/70/update.sh new file mode 100644 index 0000000..4076f06 --- /dev/null +++ b/config/rootfiles/oldcore/70/update.sh @@ -0,0 +1,274 @@ +#!/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) 2013 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +core=70 +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-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update. No IPFire Kernel." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; +esac + + +# +# +KVER="3.2.48" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz \ + /var/ipfire/backup/core-upgrade${core}_$KVER-old.tar.xz +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 +add_to_backup lib/modules +add_to_backup boot +add_to_backup etc/sysconfig/lm_sensors +add_to_backup etc/sysconfig/rc.local + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade${core}_$KVER.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 70000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: ERROR cannot update because not enough free space on root." + exit 2 +fi + +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 /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules + +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-freefont + +# +#Stop services + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# 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/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + + +# +#Start services + +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + 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,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/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 8000 -o $ROOTSPACE -lt 70000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + rm -f /boot/grub/grub-backup-*-pae_install.conf + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 3.2.46" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 29" >> /opt/pakfire/db/installed/meta-linux-pae + fi +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + rm -f /boot/grub/grub-backup-*-xen.conf + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 26" >> /opt/pakfire/db/installed/meta-linux-xen +fi + +# +# 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.cfg"' >> /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 +# +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 +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/71/exclude b/config/rootfiles/oldcore/71/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/oldcore/71/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/oldcore/71/filelists/GeoIP b/config/rootfiles/oldcore/71/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/71/filelists/curl b/config/rootfiles/oldcore/71/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/files b/config/rootfiles/oldcore/71/filelists/files new file mode 100644 index 0000000..c7df219 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/files @@ -0,0 +1,25 @@ +etc/system-release +etc/issue +var/ipfire/general-functions.pl +var/ipfire/header.pl +var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/30-network.menu +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/wlanclient +etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/networking/wpa_supplicant.exe +etc/rc.d/init.d/networking/red +etc/rc.d/rc0.d/K82wlanclient +etc/rc.d/rc3.d/S19wlanclient +etc/rc.d/rc6.d/K82wlanclient +usr/local/bin/dnsmasqctrl +usr/local/bin/wirelessclient +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +var/ipfire/dnsforward/config +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/backup/include diff --git a/config/rootfiles/oldcore/71/filelists/hwdata b/config/rootfiles/oldcore/71/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/oldcore/71/filelists/jwhois b/config/rootfiles/oldcore/71/filelists/jwhois new file mode 120000 index 0000000..b984a7f --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/jwhois @@ -0,0 +1 @@ +../../../common/jwhois \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/oinkmaster b/config/rootfiles/oldcore/71/filelists/oinkmaster new file mode 120000 index 0000000..75029e6 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/oinkmaster @@ -0,0 +1 @@ +../../../common/oinkmaster \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/snort b/config/rootfiles/oldcore/71/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/squid b/config/rootfiles/oldcore/71/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/usb_modeswitch b/config/rootfiles/oldcore/71/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/71/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/oldcore/71/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/oldcore/71/meta b/config/rootfiles/oldcore/71/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/71/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/71/update.sh b/config/rootfiles/oldcore/71/update.sh new file mode 100644 index 0000000..e45ccd8 --- /dev/null +++ b/config/rootfiles/oldcore/71/update.sh @@ -0,0 +1,80 @@ +#!/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) 2013 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=71 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Backup snort.conf +cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +# +#Remove old usb-modeswitch file +rm /usr/share/usb_modeswitch/0e8d:0002 + +# +#Extract files +extract_files + +# +#Create wireless config file... +touch /var/ipfire/ethernet/wireless +chown nobody:nobody /var/ipfire/ethernet/wireless + +# +# Import active rules to new snort.conf +grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf + +# +#Start services +/etc/init.d/squid start +/etc/init.d/snort start + +# +#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/72/exclude b/config/rootfiles/oldcore/72/exclude new file mode 100644 index 0000000..e8ae55d --- /dev/null +++ b/config/rootfiles/oldcore/72/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases +etc/snort/snort.conf diff --git a/config/rootfiles/oldcore/72/filelists/daq b/config/rootfiles/oldcore/72/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/72/filelists/files b/config/rootfiles/oldcore/72/filelists/files new file mode 100644 index 0000000..e8f90a1 --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/files @@ -0,0 +1,11 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/local/bin/openvpnctrl +usr/local/bin/setddns.pl +var/ipfire/langs +var/ipfire/ovpn/verify diff --git a/config/rootfiles/oldcore/72/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/72/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/72/filelists/snort b/config/rootfiles/oldcore/72/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/72/filelists/squid b/config/rootfiles/oldcore/72/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/72/filelists/strongswan b/config/rootfiles/oldcore/72/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/72/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/72/meta b/config/rootfiles/oldcore/72/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/72/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/72/update.sh b/config/rootfiles/oldcore/72/update.sh new file mode 100644 index 0000000..c3dc20a --- /dev/null +++ b/config/rootfiles/oldcore/72/update.sh @@ -0,0 +1,69 @@ +#!/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) 2013 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=72 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services +/etc/init.d/ipsec stop +/etc/init.d/snort stop +/etc/init.d/squid stop + +# +#Extract files +extract_files + + +# +#Start services +/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 + + +# +#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/73/exclude b/config/rootfiles/oldcore/73/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/oldcore/73/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/oldcore/73/filelists/GeoIP b/config/rootfiles/oldcore/73/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/oldcore/73/filelists/HTML-Template b/config/rootfiles/oldcore/73/filelists/HTML-Template new file mode 120000 index 0000000..f17c1da --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/HTML-Template @@ -0,0 +1 @@ +../../../common/HTML-Template \ No newline at end of file diff --git a/config/rootfiles/oldcore/73/filelists/armv5tel/ath-modul b/config/rootfiles/oldcore/73/filelists/armv5tel/ath-modul new file mode 100644 index 0000000..63bcd75 --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/armv5tel/ath-modul @@ -0,0 +1,3 @@ +lib/modules/3.2.48-ipfire-omap/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-rpi/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/oldcore/73/filelists/files b/config/rootfiles/oldcore/73/filelists/files new file mode 100644 index 0000000..8ddb964 --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/files @@ -0,0 +1,15 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/squid +srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat +srv/web/ipfire/cgi-bin/netinternal.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/redirect.cgi +srv/web/ipfire/html/redirect-templates/ +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/oldcore/73/filelists/hwdata b/config/rootfiles/oldcore/73/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/oldcore/73/filelists/i586/ath-modul b/config/rootfiles/oldcore/73/filelists/i586/ath-modul new file mode 100644 index 0000000..6656dae --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/i586/ath-modul @@ -0,0 +1,3 @@ +lib/modules/2.6.32.61-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/oldcore/73/filelists/openssh b/config/rootfiles/oldcore/73/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/73/filelists/php b/config/rootfiles/oldcore/73/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/oldcore/73/filelists/squid b/config/rootfiles/oldcore/73/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/73/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/73/meta b/config/rootfiles/oldcore/73/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/73/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh new file mode 100644 index 0000000..a9fed1b --- /dev/null +++ b/config/rootfiles/oldcore/73/update.sh @@ -0,0 +1,81 @@ +#!/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) 2013 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=73 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# +#Stop services +/etc/init.d/squid stop + + +# +#Extract files +extract_files + +if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then + ( + eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) + + TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))" + echo "TRANSPARENT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings + ) +fi + +# Regenerate squid configuration files. +/srv/web/ipfire/cgi-bin/proxy.cgi + +# +#Start services +/etc/init.d/squid start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Remove invalid fetchmail symlinks when postfix is installed. +if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then + rm -f /etc/rc.d/rc*.d/*fetchmail +fi + +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/74/exclude b/config/rootfiles/oldcore/74/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/oldcore/74/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/oldcore/74/filelists/files b/config/rootfiles/oldcore/74/filelists/files new file mode 100644 index 0000000..52d0178 --- /dev/null +++ b/config/rootfiles/oldcore/74/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +usr/local/bin/httpscert +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/oldcore/74/filelists/openvpn b/config/rootfiles/oldcore/74/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/74/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/74/filelists/squid b/config/rootfiles/oldcore/74/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/74/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/74/filelists/strongswan b/config/rootfiles/oldcore/74/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/74/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/74/meta b/config/rootfiles/oldcore/74/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/74/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/74/update.sh b/config/rootfiles/oldcore/74/update.sh new file mode 100644 index 0000000..ca26b51 --- /dev/null +++ b/config/rootfiles/oldcore/74/update.sh @@ -0,0 +1,84 @@ +#!/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) 2013 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=74 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# +#Stop services +/etc/init.d/ipsec stop +/etc/init.d/squid stop + + +# +#Extract files +extract_files + +if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then + ( + eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) + + if [ "${TRANSPARENT_PORT}" = "81" ]; then + TRANSPARENT_PORT="$(( ${TRANSPARENT_PORT} + 1 ))" + sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \ + -i /var/ipfire/proxy/advanced/settings + fi + ) +fi + +# Regenerate squid configuration files. +/srv/web/ipfire/cgi-bin/proxy.cgi +chown nobody:nobody /var/ipfire/proxy/squid.conf + +# +#Start services +/etc/init.d/squid start + +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# +#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/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 73e610b..2f3ac4d 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -425,7 +425,7 @@ sub writeserverconf { if ($sovpnsettings{DHCP_WINS} ne '') { print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n"; } - print CONF "tls-verify /var/ipfire/ovpn/verify\n"; + print CONF "tls-verify /usr/lib/openvpn/verify\n"; print CONF "crl-verify /var/ipfire/ovpn/crls/cacrl.pem\n"; print CONF "user nobody\n"; print CONF "group nobody\n"; diff --git a/lfs/openvpn b/lfs/openvpn index 87daf07..727d374 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -93,8 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown -R root:root /var/ipfire/ovpn/scripts chown -R nobody:nobody /var/ipfire/ovpn chown root.nobody /var/log/ovpnserver.log - chmod 755 /var/ipfire/ovpn/verify chmod 660 /var/log/ovpnserver.log chmod 700 /var/ipfire/ovpn/certs + mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify + chmod 755 /usr/lib/openvpn/verify @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 37fa1c8..0e20908 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="74" # Core Level (Filename) -PAKFIRE_CORE="74" # Core Level (PAKFIRE) +CORE="75" # Core Level (Filename) +PAKFIRE_CORE="75" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 133b495..d14e031 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -305,7 +305,12 @@ sub selectmirror { } } logger("MIRROR INFO: $scount servers found in list"); - + + if ($scount eq 0) { + logger("MIRROR INFO: Could not find any servers. Falling back to main server $Conf::mainserver"); + return ("HTTP", $Conf::mainserver, "/$Conf::version"); + } + ### Choose a random server and test if it is online # If the check fails try a new server. # This will never give up.
hooks/post-receive -- IPFire 2.x development tree