From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ba5691854b06976fe130c832ce2f0ea3742ad30
Date: Thu, 22 Dec 2016 19:41:24 +0000 [thread overview]
Message-ID: <20161222194124.8E8871078E80@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 20534 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, next has been updated
via 7ba5691854b06976fe130c832ce2f0ea3742ad30 (commit)
from dcc3b47f0070880bdfa3919a5246187e8cdbb307 (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 7ba5691854b06976fe130c832ce2f0ea3742ad30
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 22 20:38:44 2016 +0100
start core109 updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{108 => 109}/exclude | 0
.../rootfiles/{oldcore/105 => core/109}/filelists/files | 1 +
.../rootfiles/{oldcore/95 => core/109}/filelists/snort | 0
config/rootfiles/core/{108 => 109}/filelists/squid | 0
.../{oldcore/106 => core/109}/filelists/unbound | 0
config/rootfiles/core/{108 => 109}/meta | 0
config/rootfiles/core/{108 => 109}/update.sh | 16 ++++++----------
config/rootfiles/oldcore/{106 => 108}/exclude | 0
config/rootfiles/{core => oldcore}/108/filelists/ddns | 0
config/rootfiles/{core => oldcore}/108/filelists/files | 0
.../108/filelists/i586/strongswan-padlock | 0
config/rootfiles/{core => oldcore}/108/filelists/ntp | 0
config/rootfiles/oldcore/{94 => 108}/filelists/squid | 0
.../rootfiles/{core => oldcore}/108/filelists/strongswan | 0
config/rootfiles/oldcore/{99 => 108}/meta | 0
config/rootfiles/{core => oldcore}/108/update.sh | 0
make.sh | 2 +-
17 files changed, 8 insertions(+), 11 deletions(-)
rename config/rootfiles/core/{108 => 109}/exclude (100%)
copy config/rootfiles/{oldcore/105 => core/109}/filelists/files (52%)
copy config/rootfiles/{oldcore/95 => core/109}/filelists/snort (100%)
rename config/rootfiles/core/{108 => 109}/filelists/squid (100%)
copy config/rootfiles/{oldcore/106 => core/109}/filelists/unbound (100%)
rename config/rootfiles/core/{108 => 109}/meta (100%)
copy config/rootfiles/core/{108 => 109}/update.sh (90%)
copy config/rootfiles/oldcore/{106 => 108}/exclude (100%)
rename config/rootfiles/{core => oldcore}/108/filelists/ddns (100%)
rename config/rootfiles/{core => oldcore}/108/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/108/filelists/i586/strongswan-padlock (100%)
rename config/rootfiles/{core => oldcore}/108/filelists/ntp (100%)
copy config/rootfiles/oldcore/{94 => 108}/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/108/filelists/strongswan (100%)
copy config/rootfiles/oldcore/{99 => 108}/meta (100%)
rename config/rootfiles/{core => oldcore}/108/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/108/exclude b/config/rootfiles/core/108/exclude
deleted file mode 100644
index 7ddeae0..0000000
--- a/config/rootfiles/core/108/exclude
+++ /dev/null
@@ -1,28 +0,0 @@
-boot/config.txt
-boot/grub/grub.cfg
-boot/grub/grubenv
-etc/alternatives
-etc/collectd.custom
-etc/default/grub
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-etc/snort/snort.conf
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-etc/sudoers
-etc/sysconfig/firewall.local
-etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
-srv/web/ipfire/html/proxy.pac
-var/ipfire/dma
-var/ipfire/time
-var/ipfire/ovpn
-var/lib/alternatives
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/108/filelists/ddns b/config/rootfiles/core/108/filelists/ddns
deleted file mode 120000
index 7395164..0000000
--- a/config/rootfiles/core/108/filelists/ddns
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/108/filelists/files b/config/rootfiles/core/108/filelists/files
deleted file mode 100644
index 6cce4ea..0000000
--- a/config/rootfiles/core/108/filelists/files
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/system-release
-etc/issue
-etc/rc.d/init.d/unbound
-etc/syslog.conf
-etc/unbound/unbound.conf
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/config.dat
diff --git a/config/rootfiles/core/108/filelists/i586/strongswan-padlock b/config/rootfiles/core/108/filelists/i586/strongswan-padlock
deleted file mode 120000
index 2412824..0000000
--- a/config/rootfiles/core/108/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/108/filelists/ntp b/config/rootfiles/core/108/filelists/ntp
deleted file mode 120000
index 7542d86..0000000
--- a/config/rootfiles/core/108/filelists/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/108/filelists/squid b/config/rootfiles/core/108/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/108/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/108/filelists/strongswan b/config/rootfiles/core/108/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/108/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/108/meta b/config/rootfiles/core/108/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/108/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/108/update.sh b/config/rootfiles/core/108/update.sh
deleted file mode 100644
index 7a4bcd3..0000000
--- a/config/rootfiles/core/108/update.sh
+++ /dev/null
@@ -1,73 +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) 2016 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-core=108
-
-# Remove old core updates from pakfire cache to save space...
-for (( i=1; i<=$core; i++ )); do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-# Stop services
-/etc/init.d/ipsec stop
-/etc/init.d/squid stop
-
-# Extract files
-extract_files
-
-# update linker config
-ldconfig
-
-# Update Language cache
-#/usr/local/bin/update-lang-cache
-
-# Reload unbound upstream name servers
-/etc/init.d/unbound update-forwarders
-
-# Start services
-/etc/init.d/sysklogd restart
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
- /etc/init.d/ipsec start
-fi
-/etc/init.d/ntp restart
-/etc/init.d/squid start
-
-# 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/config/rootfiles/core/109/exclude b/config/rootfiles/core/109/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/core/109/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files
new file mode 100644
index 0000000..ca49b1b
--- /dev/null
+++ b/config/rootfiles/core/109/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+usr/local/bin/syslogdctrl
diff --git a/config/rootfiles/core/109/filelists/snort b/config/rootfiles/core/109/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/core/109/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/squid b/config/rootfiles/core/109/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/109/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/unbound b/config/rootfiles/core/109/filelists/unbound
new file mode 120000
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/core/109/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/109/meta b/config/rootfiles/core/109/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/109/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/109/update.sh b/config/rootfiles/core/109/update.sh
new file mode 100644
index 0000000..c601654
--- /dev/null
+++ b/config/rootfiles/core/109/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) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=109
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/squid stop
+/etc/init.d/snort stop
+/etc/init.d/unbound stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/squid start
+/etc/init.d/snort start
+
+
+# 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/config/rootfiles/oldcore/108/exclude b/config/rootfiles/oldcore/108/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/108/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/108/filelists/ddns b/config/rootfiles/oldcore/108/filelists/ddns
new file mode 120000
index 0000000..7395164
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/108/filelists/files b/config/rootfiles/oldcore/108/filelists/files
new file mode 100644
index 0000000..6cce4ea
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/unbound
+etc/syslog.conf
+etc/unbound/unbound.conf
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/config.dat
diff --git a/config/rootfiles/oldcore/108/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/108/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/108/filelists/ntp b/config/rootfiles/oldcore/108/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/108/filelists/squid b/config/rootfiles/oldcore/108/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/108/filelists/strongswan b/config/rootfiles/oldcore/108/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/108/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/108/meta b/config/rootfiles/oldcore/108/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/108/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/108/update.sh b/config/rootfiles/oldcore/108/update.sh
new file mode 100644
index 0000000..7a4bcd3
--- /dev/null
+++ b/config/rootfiles/oldcore/108/update.sh
@@ -0,0 +1,73 @@
+#!/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
+
+core=108
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/ipsec stop
+/etc/init.d/squid stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+# Reload unbound upstream name servers
+/etc/init.d/unbound update-forwarders
+
+# Start services
+/etc/init.d/sysklogd restart
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+ /etc/init.d/ipsec start
+fi
+/etc/init.d/ntp restart
+/etc/init.d/squid start
+
+# 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 390c719..a2ff7f0 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="108" # Core Level (Filename)
+CORE="109" # Core Level (Filename)
PAKFIRE_CORE="108" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2016-12-22 19:41 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=20161222194124.8E8871078E80@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