]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Package Core Update 112
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Jul 2017 11:44:48 +0000 (12:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 1 Jul 2017 11:44:48 +0000 (12:44 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
35 files changed:
config/rootfiles/core/112/exclude [new file with mode: 0644]
config/rootfiles/core/112/filelists/armv5tel/binutils [new symlink]
config/rootfiles/core/112/filelists/armv5tel/gcc [new symlink]
config/rootfiles/core/112/filelists/armv5tel/glibc [new symlink]
config/rootfiles/core/112/filelists/autoconf [new symlink]
config/rootfiles/core/112/filelists/bc [new symlink]
config/rootfiles/core/112/filelists/boost [new symlink]
config/rootfiles/core/112/filelists/cmake [new symlink]
config/rootfiles/core/112/filelists/files [new file with mode: 0644]
config/rootfiles/core/112/filelists/flex [new symlink]
config/rootfiles/core/112/filelists/fuse [new symlink]
config/rootfiles/core/112/filelists/gawk [new symlink]
config/rootfiles/core/112/filelists/gnutls [new symlink]
config/rootfiles/core/112/filelists/i586/binutils [new symlink]
config/rootfiles/core/112/filelists/i586/gcc [new symlink]
config/rootfiles/core/112/filelists/i586/glibc [new symlink]
config/rootfiles/core/112/filelists/i586/python [new symlink]
config/rootfiles/core/112/filelists/kbd [new symlink]
config/rootfiles/core/112/filelists/libarchive [new symlink]
config/rootfiles/core/112/filelists/libgcrypt [new symlink]
config/rootfiles/core/112/filelists/libgpg-error [new symlink]
config/rootfiles/core/112/filelists/libxml2 [new symlink]
config/rootfiles/core/112/filelists/ncurses [new symlink]
config/rootfiles/core/112/filelists/reiserfsprogs [new symlink]
config/rootfiles/core/112/filelists/sudo [new symlink]
config/rootfiles/core/112/filelists/tzdata [new symlink]
config/rootfiles/core/112/filelists/unbound [new symlink]
config/rootfiles/core/112/filelists/web-user-interface [new symlink]
config/rootfiles/core/112/filelists/x86_64/binutils [new symlink]
config/rootfiles/core/112/filelists/x86_64/gcc [new symlink]
config/rootfiles/core/112/filelists/x86_64/glibc [new symlink]
config/rootfiles/core/112/filelists/x86_64/python [new symlink]
config/rootfiles/core/112/meta [new file with mode: 0644]
config/rootfiles/core/112/update.sh [new file with mode: 0644]
make.sh

diff --git a/config/rootfiles/core/112/exclude b/config/rootfiles/core/112/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
@@ -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/112/filelists/armv5tel/binutils b/config/rootfiles/core/112/filelists/armv5tel/binutils
new file mode 120000 (symlink)
index 0000000..ac971f9
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/armv5tel/gcc b/config/rootfiles/core/112/filelists/armv5tel/gcc
new file mode 120000 (symlink)
index 0000000..84f7b93
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/armv5tel/glibc b/config/rootfiles/core/112/filelists/armv5tel/glibc
new file mode 120000 (symlink)
index 0000000..4c70d72
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/autoconf b/config/rootfiles/core/112/filelists/autoconf
new file mode 120000 (symlink)
index 0000000..aa39ce6
--- /dev/null
@@ -0,0 +1 @@
+../../../common/autoconf
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/bc b/config/rootfiles/core/112/filelists/bc
new file mode 120000 (symlink)
index 0000000..a729f5d
--- /dev/null
@@ -0,0 +1 @@
+../../../common/bc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/boost b/config/rootfiles/core/112/filelists/boost
new file mode 120000 (symlink)
index 0000000..05246f0
--- /dev/null
@@ -0,0 +1 @@
+../../../common/boost
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/cmake b/config/rootfiles/core/112/filelists/cmake
new file mode 120000 (symlink)
index 0000000..491d25f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/cmake
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/files b/config/rootfiles/core/112/filelists/files
new file mode 100644 (file)
index 0000000..9337d4a
--- /dev/null
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+var/ipfire/langs
+var/ipfire/general-functions.pl
diff --git a/config/rootfiles/core/112/filelists/flex b/config/rootfiles/core/112/filelists/flex
new file mode 120000 (symlink)
index 0000000..feb0390
--- /dev/null
@@ -0,0 +1 @@
+../../../common/flex
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/fuse b/config/rootfiles/core/112/filelists/fuse
new file mode 120000 (symlink)
index 0000000..570edaa
--- /dev/null
@@ -0,0 +1 @@
+../../../common/fuse
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/gawk b/config/rootfiles/core/112/filelists/gawk
new file mode 120000 (symlink)
index 0000000..a3bbe32
--- /dev/null
@@ -0,0 +1 @@
+../../../common/gawk
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/gnutls b/config/rootfiles/core/112/filelists/gnutls
new file mode 120000 (symlink)
index 0000000..8dbe60b
--- /dev/null
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/i586/binutils b/config/rootfiles/core/112/filelists/i586/binutils
new file mode 120000 (symlink)
index 0000000..78695d7
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/i586/gcc b/config/rootfiles/core/112/filelists/i586/gcc
new file mode 120000 (symlink)
index 0000000..ba328e3
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/i586/glibc b/config/rootfiles/core/112/filelists/i586/glibc
new file mode 120000 (symlink)
index 0000000..943021f
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/i586/python b/config/rootfiles/core/112/filelists/i586/python
new file mode 120000 (symlink)
index 0000000..a2b842b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/python
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/kbd b/config/rootfiles/core/112/filelists/kbd
new file mode 120000 (symlink)
index 0000000..9b85839
--- /dev/null
@@ -0,0 +1 @@
+../../../common/kbd
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/libarchive b/config/rootfiles/core/112/filelists/libarchive
new file mode 120000 (symlink)
index 0000000..551f1f7
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/libgcrypt b/config/rootfiles/core/112/filelists/libgcrypt
new file mode 120000 (symlink)
index 0000000..2df12a2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/libgpg-error b/config/rootfiles/core/112/filelists/libgpg-error
new file mode 120000 (symlink)
index 0000000..cad4313
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgpg-error
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/libxml2 b/config/rootfiles/core/112/filelists/libxml2
new file mode 120000 (symlink)
index 0000000..242e69f
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/ncurses b/config/rootfiles/core/112/filelists/ncurses
new file mode 120000 (symlink)
index 0000000..512faef
--- /dev/null
@@ -0,0 +1 @@
+../../../common/ncurses
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/reiserfsprogs b/config/rootfiles/core/112/filelists/reiserfsprogs
new file mode 120000 (symlink)
index 0000000..008c3e8
--- /dev/null
@@ -0,0 +1 @@
+../../../common/reiserfsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/sudo b/config/rootfiles/core/112/filelists/sudo
new file mode 120000 (symlink)
index 0000000..0d3c45e
--- /dev/null
@@ -0,0 +1 @@
+../../../common/sudo
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/tzdata b/config/rootfiles/core/112/filelists/tzdata
new file mode 120000 (symlink)
index 0000000..5a6e325
--- /dev/null
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/unbound b/config/rootfiles/core/112/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/web-user-interface b/config/rootfiles/core/112/filelists/web-user-interface
new file mode 120000 (symlink)
index 0000000..70c74b4
--- /dev/null
@@ -0,0 +1 @@
+../../../common/web-user-interface
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/x86_64/binutils b/config/rootfiles/core/112/filelists/x86_64/binutils
new file mode 120000 (symlink)
index 0000000..7d0fda5
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/x86_64/gcc b/config/rootfiles/core/112/filelists/x86_64/gcc
new file mode 120000 (symlink)
index 0000000..d1616d3
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/x86_64/glibc b/config/rootfiles/core/112/filelists/x86_64/glibc
new file mode 120000 (symlink)
index 0000000..1119099
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/112/filelists/x86_64/python b/config/rootfiles/core/112/filelists/x86_64/python
new file mode 120000 (symlink)
index 0000000..a593187
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/python
\ No newline at end of file
diff --git a/config/rootfiles/core/112/meta b/config/rootfiles/core/112/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/112/update.sh b/config/rootfiles/core/112/update.sh
new file mode 100644 (file)
index 0000000..4aef38b
--- /dev/null
@@ -0,0 +1,64 @@
+#!/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@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=112
+
+# 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/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
+
+# 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 c7b1f41ad251127cf0530f4d719106826d2d7ef7..a3fb4027a96c3c5249c6381811b3604c29860454 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="111"                                                     # Core Level (Filename)
+CORE="112"                                                     # Core Level (Filename)
 PAKFIRE_CORE="111"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan