From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5a9039f1322e6354d48f13a92b84c68201a37a4e
Date: Wed, 17 Feb 2016 13:46:31 +0000 [thread overview]
Message-ID: <20160217134632.9424F1081BC7@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 8739 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 5a9039f1322e6354d48f13a92b84c68201a37a4e (commit)
from bb330e25e98f445493f63631c461bec1d7eb211b (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 5a9039f1322e6354d48f13a92b84c68201a37a4e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 17 13:52:51 2016 +0100
core98: new update with glibc security fixes.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{97 => 98}/exclude | 0
.../94 => core/98}/filelists/armv5tel/glibc | 0
.../{oldcore/88 => core/98}/filelists/files | 0
.../{oldcore/94 => core/98}/filelists/i586/glibc | 0
config/rootfiles/core/98/filelists/x86_64/glibc | 1 +
config/rootfiles/{oldcore/95 => core/98}/meta | 0
config/rootfiles/core/{97 => 98}/update.sh | 30 +++++++++++++++++++---
make.sh | 6 ++---
8 files changed, 31 insertions(+), 6 deletions(-)
copy config/rootfiles/core/{97 => 98}/exclude (100%)
copy config/rootfiles/{oldcore/94 => core/98}/filelists/armv5tel/glibc (100%)
copy config/rootfiles/{oldcore/88 => core/98}/filelists/files (100%)
copy config/rootfiles/{oldcore/94 => core/98}/filelists/i586/glibc (100%)
create mode 120000 config/rootfiles/core/98/filelists/x86_64/glibc
copy config/rootfiles/{oldcore/95 => core/98}/meta (100%)
copy config/rootfiles/core/{97 => 98}/update.sh (74%)
Difference in files:
diff --git a/config/rootfiles/core/98/exclude b/config/rootfiles/core/98/exclude
new file mode 100644
index 0000000..d87f175
--- /dev/null
+++ b/config/rootfiles/core/98/exclude
@@ -0,0 +1,25 @@
+boot/config.txt
+etc/alternatives
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/98/filelists/armv5tel/glibc b/config/rootfiles/core/98/filelists/armv5tel/glibc
new file mode 120000
index 0000000..4c70d72
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/files b/config/rootfiles/core/98/filelists/files
new file mode 100644
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/98/filelists/i586/glibc b/config/rootfiles/core/98/filelists/i586/glibc
new file mode 120000
index 0000000..943021f
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/98/filelists/x86_64/glibc b/config/rootfiles/core/98/filelists/x86_64/glibc
new file mode 120000
index 0000000..1119099
--- /dev/null
+++ b/config/rootfiles/core/98/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/98/meta b/config/rootfiles/core/98/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/98/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/98/update.sh b/config/rootfiles/core/98/update.sh
new file mode 100644
index 0000000..ec9c1aa
--- /dev/null
+++ b/config/rootfiles/core/98/update.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=98
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Bugfixes for core96 updater bugs...
+if [ -e /boot/grub/grub.conf ]; then
+ # legacy grub config on xen or citrix conflicts with grub2 config
+ rm /boot/grub/grub.cfg
+fi
+
+if [ -e /boot/grub/grub.cfg ]; then
+ # test if serial console is enabled
+ grep "^7:2345" /etc/inittab > /dev/null
+ if [ "${?}" == "0" ]; then
+ # Fix grub config for serial console
+ sed -i /etc/default/grub \
+ -e "s|\"panic=10\"|\"panic=10 console=ttyS0,115200n8\"|g"
+ sed -i /etc/default/grub \
+ -e "s|^GRUB_TERMINAL=.*||g"
+ sed -i /etc/default/grub \
+ -e "s|^GRUB_SERIAL_COMMAND=.*||g"
+ echo "GRUB_TERMINAL=\"serial\"" >> /etc/default/grub
+ echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub
+ fi
+fi
+
+
+# Update Language cache
+# /usr/local/bin/update-lang-cache
+
+# restart init after glibc update
+telinit u
+
+# Start services
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/make.sh b/make.sh
index ed071c8..9f119bf 100755
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org>. #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.17" # Version number
-CORE="97" # Core Level (Filename)
-PAKFIRE_CORE="97" # Core Level (PAKFIRE)
+CORE="98" # Core Level (Filename)
+PAKFIRE_CORE="98" # 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
reply other threads:[~2016-02-17 13:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160217134632.9424F1081BC7@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox