From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 63de1e482a176380bde444cd50ff4285137ba960
Date: Mon, 27 Feb 2017 15:15:40 +0000 [thread overview]
Message-ID: <20170227151541.82BA21081BA6@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 27826 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 63de1e482a176380bde444cd50ff4285137ba960 (commit)
from e8607830b0ef884e180df5ea908c2e48547e16bd (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 63de1e482a176380bde444cd50ff4285137ba960
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Feb 27 15:00:46 2017 +0000
Start Core Update 110
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{109 => 110}/exclude | 0
config/rootfiles/core/{109 => 110}/filelists/bind | 0
config/rootfiles/{oldcore/66 => core/110}/filelists/cairo | 0
config/rootfiles/core/110/filelists/files | 8 ++++++++
.../rootfiles/{oldcore/66 => core/110}/filelists/fontconfig | 0
config/rootfiles/core/110/filelists/freetype | 1 +
config/rootfiles/core/110/filelists/gnutls | 1 +
config/rootfiles/core/110/filelists/lcms2 | 1 +
config/rootfiles/{oldcore/99 => core/110}/filelists/openssh | 0
config/rootfiles/{oldcore/66 => core/110}/filelists/pixman | 0
config/rootfiles/core/110/filelists/poppler | 1 +
config/rootfiles/core/110/filelists/qpdf | 1 +
config/rootfiles/core/{109 => 110}/filelists/squid | 0
config/rootfiles/core/{109 => 110}/filelists/unbound | 0
config/rootfiles/{oldcore/89 => core/110}/filelists/wget | 0
config/rootfiles/core/{109 => 110}/meta | 0
config/rootfiles/core/{109 => 110}/update.sh | 13 +++----------
config/rootfiles/{core => oldcore}/109/exclude | 0
config/rootfiles/{core => oldcore}/109/filelists/GeoIP | 0
config/rootfiles/oldcore/{94 => 109}/filelists/bind | 0
config/rootfiles/{core => oldcore}/109/filelists/files | 0
config/rootfiles/{core => oldcore}/109/filelists/libpcap | 0
config/rootfiles/{core => oldcore}/109/filelists/libpng | 0
config/rootfiles/{core => oldcore}/109/filelists/openssl | 0
config/rootfiles/{core => oldcore}/109/filelists/snort | 0
config/rootfiles/oldcore/{94 => 109}/filelists/squid | 0
config/rootfiles/{core => oldcore}/109/filelists/sysklogd | 0
config/rootfiles/oldcore/{106 => 109}/filelists/unbound | 0
config/rootfiles/oldcore/{99 => 109}/meta | 0
config/rootfiles/{core => oldcore}/109/update.sh | 0
make.sh | 2 +-
31 files changed, 17 insertions(+), 11 deletions(-)
copy config/rootfiles/core/{109 => 110}/exclude (100%)
rename config/rootfiles/core/{109 => 110}/filelists/bind (100%)
copy config/rootfiles/{oldcore/66 => core/110}/filelists/cairo (100%)
create mode 100644 config/rootfiles/core/110/filelists/files
copy config/rootfiles/{oldcore/66 => core/110}/filelists/fontconfig (100%)
create mode 120000 config/rootfiles/core/110/filelists/freetype
create mode 120000 config/rootfiles/core/110/filelists/gnutls
create mode 120000 config/rootfiles/core/110/filelists/lcms2
copy config/rootfiles/{oldcore/99 => core/110}/filelists/openssh (100%)
copy config/rootfiles/{oldcore/66 => core/110}/filelists/pixman (100%)
create mode 120000 config/rootfiles/core/110/filelists/poppler
create mode 120000 config/rootfiles/core/110/filelists/qpdf
rename config/rootfiles/core/{109 => 110}/filelists/squid (100%)
rename config/rootfiles/core/{109 => 110}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/89 => core/110}/filelists/wget (100%)
rename config/rootfiles/core/{109 => 110}/meta (100%)
copy config/rootfiles/core/{109 => 110}/update.sh (91%)
rename config/rootfiles/{core => oldcore}/109/exclude (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/GeoIP (100%)
copy config/rootfiles/oldcore/{94 => 109}/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/libpcap (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/libpng (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/snort (100%)
copy config/rootfiles/oldcore/{94 => 109}/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/109/filelists/sysklogd (100%)
copy config/rootfiles/oldcore/{106 => 109}/filelists/unbound (100%)
copy config/rootfiles/oldcore/{99 => 109}/meta (100%)
rename config/rootfiles/{core => oldcore}/109/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/109/exclude b/config/rootfiles/core/109/exclude
deleted file mode 100644
index d6fd053..0000000
--- a/config/rootfiles/core/109/exclude
+++ /dev/null
@@ -1,30 +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/log/dhcpcd.log
-var/log/messages
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/109/filelists/GeoIP b/config/rootfiles/core/109/filelists/GeoIP
deleted file mode 120000
index 6850203..0000000
--- a/config/rootfiles/core/109/filelists/GeoIP
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/GeoIP
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/bind b/config/rootfiles/core/109/filelists/bind
deleted file mode 120000
index 48a0eba..0000000
--- a/config/rootfiles/core/109/filelists/bind
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files
deleted file mode 100644
index 0d5de8f..0000000
--- a/config/rootfiles/core/109/filelists/files
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/system-release
-etc/issue
-lib/udev/rules.d/60-net.rules
-lib/udev/network-hotplug-bridges
-lib/udev/network-hotplug-rename
-usr/local/bin/backupiso
-usr/local/bin/syslogdctrl
-var/ipfire/general-functions.pl
-var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/109/filelists/libpcap b/config/rootfiles/core/109/filelists/libpcap
deleted file mode 120000
index c7f9f52..0000000
--- a/config/rootfiles/core/109/filelists/libpcap
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/libpng b/config/rootfiles/core/109/filelists/libpng
deleted file mode 120000
index 8ef96e2..0000000
--- a/config/rootfiles/core/109/filelists/libpng
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libpng
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/openssl b/config/rootfiles/core/109/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/109/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/snort b/config/rootfiles/core/109/filelists/snort
deleted file mode 120000
index 9406ce0..0000000
--- a/config/rootfiles/core/109/filelists/snort
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/squid b/config/rootfiles/core/109/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/109/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/sysklogd b/config/rootfiles/core/109/filelists/sysklogd
deleted file mode 120000
index e166ef2..0000000
--- a/config/rootfiles/core/109/filelists/sysklogd
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/sysklogd
\ No newline at end of file
diff --git a/config/rootfiles/core/109/filelists/unbound b/config/rootfiles/core/109/filelists/unbound
deleted file mode 120000
index 66adf09..0000000
--- a/config/rootfiles/core/109/filelists/unbound
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/109/meta b/config/rootfiles/core/109/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/109/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/109/update.sh b/config/rootfiles/core/109/update.sh
deleted file mode 100644
index 4604b4f..0000000
--- a/config/rootfiles/core/109/update.sh
+++ /dev/null
@@ -1,74 +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) 2017 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
-
-# Restart sysklogd
-/etc/init.d/sysklogd restart
-
-# Start services
-/etc/init.d/unbound start
-/etc/init.d/squid start
-/etc/init.d/snort start
-
-# Remove old MACVTAP script
-rm -vf /lib/udev/network-hotplug-macvtap
-
-# 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/110/exclude b/config/rootfiles/core/110/exclude
new file mode 100644
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/core/110/exclude
@@ -0,0 +1,30 @@
+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/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/110/filelists/bind b/config/rootfiles/core/110/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/cairo b/config/rootfiles/core/110/filelists/cairo
new file mode 120000
index 0000000..bf48d25
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/cairo
@@ -0,0 +1 @@
+../../../common/cairo
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files
new file mode 100644
index 0000000..670b9ae
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/files
@@ -0,0 +1,8 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/libssp.so.0
+usr/lib/libssp.so.0.0.0
+usr/local/bin/xt_geoip_update
+var/ipfire/langs
diff --git a/config/rootfiles/core/110/filelists/fontconfig b/config/rootfiles/core/110/filelists/fontconfig
new file mode 120000
index 0000000..6daeffd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/fontconfig
@@ -0,0 +1 @@
+../../../common/fontconfig
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/freetype b/config/rootfiles/core/110/filelists/freetype
new file mode 120000
index 0000000..79ec5c4
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/freetype
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/gnutls b/config/rootfiles/core/110/filelists/gnutls
new file mode 120000
index 0000000..8dbe60b
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/lcms2 b/config/rootfiles/core/110/filelists/lcms2
new file mode 120000
index 0000000..f72a394
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/lcms2
@@ -0,0 +1 @@
+../../../common/lcms2
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/openssh b/config/rootfiles/core/110/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/pixman b/config/rootfiles/core/110/filelists/pixman
new file mode 120000
index 0000000..fdb6346
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/pixman
@@ -0,0 +1 @@
+../../../common/pixman
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/poppler b/config/rootfiles/core/110/filelists/poppler
new file mode 120000
index 0000000..39aa6c2
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/qpdf b/config/rootfiles/core/110/filelists/qpdf
new file mode 120000
index 0000000..2d6c43d
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/qpdf
@@ -0,0 +1 @@
+../../../common/qpdf
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/squid b/config/rootfiles/core/110/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/unbound b/config/rootfiles/core/110/filelists/unbound
new file mode 120000
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/110/filelists/wget b/config/rootfiles/core/110/filelists/wget
new file mode 120000
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/110/meta b/config/rootfiles/core/110/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/110/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
new file mode 100644
index 0000000..84e0ddf
--- /dev/null
+++ b/config/rootfiles/core/110/update.sh
@@ -0,0 +1,67 @@
+#!/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) 2017 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=110
+
+# 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/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/sshd 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/oldcore/109/exclude b/config/rootfiles/oldcore/109/exclude
new file mode 100644
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/109/exclude
@@ -0,0 +1,30 @@
+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/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/109/filelists/GeoIP b/config/rootfiles/oldcore/109/filelists/GeoIP
new file mode 120000
index 0000000..6850203
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/GeoIP
@@ -0,0 +1 @@
+../../../common/GeoIP
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/bind b/config/rootfiles/oldcore/109/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/files b/config/rootfiles/oldcore/109/filelists/files
new file mode 100644
index 0000000..0d5de8f
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/files
@@ -0,0 +1,9 @@
+etc/system-release
+etc/issue
+lib/udev/rules.d/60-net.rules
+lib/udev/network-hotplug-bridges
+lib/udev/network-hotplug-rename
+usr/local/bin/backupiso
+usr/local/bin/syslogdctrl
+var/ipfire/general-functions.pl
+var/ipfire/network-functions.pl
diff --git a/config/rootfiles/oldcore/109/filelists/libpcap b/config/rootfiles/oldcore/109/filelists/libpcap
new file mode 120000
index 0000000..c7f9f52
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/libpcap
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/libpng b/config/rootfiles/oldcore/109/filelists/libpng
new file mode 120000
index 0000000..8ef96e2
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/libpng
@@ -0,0 +1 @@
+../../../common/libpng
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/openssl b/config/rootfiles/oldcore/109/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/snort b/config/rootfiles/oldcore/109/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/squid b/config/rootfiles/oldcore/109/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/sysklogd b/config/rootfiles/oldcore/109/filelists/sysklogd
new file mode 120000
index 0000000..e166ef2
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/sysklogd
@@ -0,0 +1 @@
+../../../common/sysklogd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/filelists/unbound b/config/rootfiles/oldcore/109/filelists/unbound
new file mode 120000
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/109/meta b/config/rootfiles/oldcore/109/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/109/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/109/update.sh b/config/rootfiles/oldcore/109/update.sh
new file mode 100644
index 0000000..4604b4f
--- /dev/null
+++ b/config/rootfiles/oldcore/109/update.sh
@@ -0,0 +1,74 @@
+#!/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) 2017 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
+
+# Restart sysklogd
+/etc/init.d/sysklogd restart
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/squid start
+/etc/init.d/snort start
+
+# Remove old MACVTAP script
+rm -vf /lib/udev/network-hotplug-macvtap
+
+# 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 c5e8dc3..f5e792a 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="109" # Core Level (Filename)
+CORE="110" # Core Level (Filename)
PAKFIRE_CORE="109" # 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:[~2017-02-27 15:15 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=20170227151541.82BA21081BA6@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