Create Core Update 74.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Dec 2013 19:41:25 +0000 (20:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Dec 2013 19:41:25 +0000 (20:41 +0100)
Will automatically increase the transparent proxy port
if it is set to 81.

config/rootfiles/core/74/exclude [new file with mode: 0644]
config/rootfiles/core/74/filelists/files [new file with mode: 0644]
config/rootfiles/core/74/meta [new file with mode: 0644]
config/rootfiles/core/74/update.sh [new file with mode: 0644]
make.sh

diff --git a/config/rootfiles/core/74/exclude b/config/rootfiles/core/74/exclude
new file mode 100644 (file)
index 0000000..321a931
--- /dev/null
@@ -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/74/filelists/files b/config/rootfiles/core/74/filelists/files
new file mode 100644 (file)
index 0000000..8dcb077
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+var/ipfire/header.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/core/74/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/74/update.sh b/config/rootfiles/core/74/update.sh
new file mode 100644 (file)
index 0000000..50cf903
--- /dev/null
@@ -0,0 +1,78 @@
+#!/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/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
+                       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
+
+#
+#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
\ No newline at end of file
diff --git a/make.sh b/make.sh
index ef98d6fa315066bdd9f15fb6f6b34059dd22e400..c90e89d4a8bb184dfea0cf95d65ff4b95388e36a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="73"                                                      # Core Level (Filename)
+CORE="74"                                                      # Core Level (Filename)
 PAKFIRE_CORE="73"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan