* [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a0e747dafc027d57976c799e23c17f5825a9739a
@ 2014-08-06 22:59 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-08-06 22:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9703 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via a0e747dafc027d57976c799e23c17f5825a9739a (commit)
via 5ecf77e7305d72db7c1e6d617d0317b161f25267 (commit)
from b0507bff11ae99438291e35d1d36096b1cf9c008 (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 a0e747dafc027d57976c799e23c17f5825a9739a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Aug 7 00:58:21 2014 +0200
core81: add changes to core81 updater.
commit 5ecf77e7305d72db7c1e6d617d0317b161f25267
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Aug 7 00:57:23 2014 +0200
openssl: update to 1.0.1i.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{80 => 81}/exclude | 0
config/rootfiles/core/{80 => 81}/filelists/ddns | 0
config/rootfiles/{oldcore/63 => core/81}/filelists/files | 4 ++--
config/rootfiles/core/{80 => 81}/filelists/lzo | 0
config/rootfiles/{oldcore/36 => core/81}/filelists/openssh | 0
config/rootfiles/{oldcore/28 => core/81}/filelists/openssl | 0
config/rootfiles/core/{80 => 81}/meta | 0
config/rootfiles/core/{80 => 81}/update.sh | 0
lfs/openssl | 4 ++--
make.sh | 4 ++--
10 files changed, 6 insertions(+), 6 deletions(-)
copy config/rootfiles/core/{80 => 81}/exclude (100%)
copy config/rootfiles/core/{80 => 81}/filelists/ddns (100%)
copy config/rootfiles/{oldcore/63 => core/81}/filelists/files (50%)
copy config/rootfiles/core/{80 => 81}/filelists/lzo (100%)
copy config/rootfiles/{oldcore/36 => core/81}/filelists/openssh (100%)
copy config/rootfiles/{oldcore/28 => core/81}/filelists/openssl (100%)
copy config/rootfiles/core/{80 => 81}/meta (100%)
copy config/rootfiles/core/{80 => 81}/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/81/exclude b/config/rootfiles/core/81/exclude
new file mode 100644
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/core/81/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/81/filelists/ddns b/config/rootfiles/core/81/filelists/ddns
new file mode 120000
index 0000000..7395164
--- /dev/null
+++ b/config/rootfiles/core/81/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/81/filelists/files b/config/rootfiles/core/81/filelists/files
new file mode 100644
index 0000000..4b0ae1e
--- /dev/null
+++ b/config/rootfiles/core/81/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/config/rootfiles/core/81/filelists/lzo b/config/rootfiles/core/81/filelists/lzo
new file mode 120000
index 0000000..8e11e78
--- /dev/null
+++ b/config/rootfiles/core/81/filelists/lzo
@@ -0,0 +1 @@
+../../../common/lzo
\ No newline at end of file
diff --git a/config/rootfiles/core/81/filelists/openssh b/config/rootfiles/core/81/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/81/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/81/filelists/openssl b/config/rootfiles/core/81/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/81/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/81/meta b/config/rootfiles/core/81/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/81/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh
new file mode 100644
index 0000000..67244c6
--- /dev/null
+++ b/config/rootfiles/core/81/update.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=80
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/ipsec stop
+
+# Remove old strongswan files
+rm -f \
+ /etc/strongswan.d/charon/unity.conf \
+ /usr/lib/ipsec/plugins/libstrongswan-unity.so \
+ /usr/share/strongswan/templates/config/plugins/unity.conf
+
+rm -f /usr/local/bin/setddns.pl
+
+# Extract files
+extract_files
+
+# Start services
+/etc/init.d/dnsmasq restart
+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"
+
+# Uninstall the libgpg-error package.
+rm -f \
+ /opt/pakfire/db/installed/meta-libgpg-error \
+ /opt/pakfire/db/rootfiles/libgpg-error
+
+# Fix broken proxy configuration permissions
+chown -R nobody.nobody \
+ /var/ipfire/proxy/advanced \
+ /var/ipfire/proxy/acl-1.4 \
+ /var/ipfire/proxy/enable \
+ /var/ipfire/proxy/settings \
+ /var/ipfire/proxy/squid.conf \
+ /var/ipfire/proxy/transparent
+
+# Regenerate squid configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
+
+# Generate ddns configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
+
+# Update crontab
+sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
+
+grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Update dynamic DNS records every five minutes.
+# Force an update once a month
+*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
+3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
+EOF
+
+fcrontab -z &>/dev/null
+
+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/lfs/openssl b/lfs/openssl
index 12cea68..0f0b823 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.1h
+VER = 1.0.1i
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf
+$(DL_FILE)_MD5 = c8dc151a671b9b92ff3e4c118b174972
install : $(TARGET)
diff --git a/make.sh b/make.sh
index b50a07b..bfb9365 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
-CORE="80" # Core Level (Filename)
-PAKFIRE_CORE="80" # Core Level (PAKFIRE)
+CORE="81" # Core Level (Filename)
+PAKFIRE_CORE="81" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-08-06 22:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-06 22:59 [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a0e747dafc027d57976c799e23c17f5825a9739a git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox