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 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5 (commit) via e6fd1f2d3876aae2c37051fce718f68712fdee4a (commit) via 77d989a66726dfe8282d00eec25f1cca80aca118 (commit) via 6c2720cac6c4d807e7608d10d15349854714a8e0 (commit) via 6ce32b1d84a539bae4503fbfe0cb043edb919265 (commit) via 51f69a46533e2ed7a9c29de23b9ec791d27cc80b (commit) via 2e45b1125bc54f5376b57905541cd1309364579a (commit) via 44285d92a297f27310b3bf4de3d5c0af15a82462 (commit) via e072f094e6fcb20a718caaef91ba9766258e2377 (commit) via 6118218c192bdd0a957e787114190bfc9c440da0 (commit) via b6c0145236385bcef7b3fa016f2884f64a2bc9f0 (commit) via 6bff907d71e6e4c72d94ffd8657141d54575369e (commit) from 0953c087cf94eedb85fcdf312433493800185c64 (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 1bddfa5abf7a970bb6a1df90271bc6e2c67154a5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 16 09:34:24 2016 +0100
core104: Ship updated pakfire functions.sh
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e6fd1f2d3876aae2c37051fce718f68712fdee4a Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Fri Jun 10 10:13:41 2016 +0200
Fix in pakfire functions.sh
The if statement in line 89 and 99 are useless with the -e conditional expression because it returns true if the path ist a regular file or a directory. So "/etc/init.d/ " returns true and "/etc/init.d/avahi" return also true, but the statement should return only true if we have a regular file. So -f if the right conditional expression, and we only try to execute the init script if the path "/etc/init.d/${1}" points to a regular file.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 77d989a66726dfe8282d00eec25f1cca80aca118 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Fri Jun 10 10:57:13 2016 +0200
Change the default libvirt remote user to libvirt-remote
It is possible to communicate per ssh via a socket with libvirt. It is not a good idea to do this as root, so the remote user is now libvirt-remote. Only this user or users in the group libvirt-remote can communicate with the socket. The user libvirt-remote is created without a password. The users have to set a password for this user after installation.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6c2720cac6c4d807e7608d10d15349854714a8e0 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 16 09:28:34 2016 +0100
core104: Add ntp update
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6ce32b1d84a539bae4503fbfe0cb043edb919265 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jun 14 12:44:48 2016 +0200
ntp: Update to 4.2.8p8
It addresses 1 high- and 4 low--severity security issues, 4 bugfixes, and contains other improvements over 4.2.8p7.
For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 51f69a46533e2ed7a9c29de23b9ec791d27cc80b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun May 1 12:29:02 2016 +0200
ntp: Update to 4.2.8p7
It addresses 11 low- and medium-severity security issues, 16 bugfixes, and contains other improvements over 4.2.8p6.
For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2e45b1125bc54f5376b57905541cd1309364579a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Feb 6 23:37:50 2016 +0100
ntp: Update to 4.2.8p6
"...addresses 9 low- and medium-severity security issues, 10 bugfixes, and contains other improvements over 4.2.8p5."
For a complete list, see: http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 44285d92a297f27310b3bf4de3d5c0af15a82462 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 16 09:26:55 2016 +0100
core104: Add wget update
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e072f094e6fcb20a718caaef91ba9766258e2377 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jun 14 12:33:00 2016 +0200
wget: Update to 1.18
Excerpt from annoncement:
"This version fixes a security vulnerability (CVE-2016-4971) present in all old versions of wget. The vulnerability was discovered by Dawid Golunski which were reported to us by Beyond Security's SecuriTeam.
On a server redirect from HTTP to a FTP resource, wget would trust the HTTP server and uses the name in the redirected URL as the destination filename. This behaviour was changed and now it works similarly as a redirect from HTTP to another HTTP resource so the original name is used as the destination file. To keep the previous behaviour the user must provide --trust-server-names."
Best, Mat-backfromholidays-thias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6118218c192bdd0a957e787114190bfc9c440da0 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Mon Feb 8 14:10:57 2016 +0100
wget: Update to 1.17.1
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b6c0145236385bcef7b3fa016f2884f64a2bc9f0 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 16 09:24:22 2016 +0100
Start Core Update 104
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/{103 => 104}/exclude | 0 .../{oldcore/88 => core/104}/filelists/files | 1 + .../{oldcore/96 => core/104}/filelists/ntp | 0 .../{oldcore/89 => core/104}/filelists/wget | 0 config/rootfiles/core/{103 => 104}/meta | 0 config/rootfiles/core/{103 => 104}/update.sh | 10 +---- config/rootfiles/oldcore/{102 => 103}/exclude | 0 .../{core => oldcore}/103/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/103/filelists/curl | 0 .../{core => oldcore}/103/filelists/diffutils | 0 .../{core => oldcore}/103/filelists/dnsmasq | 0 .../{core => oldcore}/103/filelists/files | 0 .../{core => oldcore}/103/filelists/findutils | 0 .../rootfiles/{core => oldcore}/103/filelists/gawk | 0 .../{core => oldcore}/103/filelists/gettext | 0 .../rootfiles/{core => oldcore}/103/filelists/grep | 0 .../rootfiles/{core => oldcore}/103/filelists/less | 0 .../{core => oldcore}/103/filelists/ncurses | 0 .../{core => oldcore}/103/filelists/ncurses-compat | 0 .../{core => oldcore}/103/filelists/procps | 0 .../{core => oldcore}/103/filelists/sdparm | 0 .../{core => oldcore}/103/filelists/squid | 0 .../{core => oldcore}/103/filelists/tzdata | 0 .../{core => oldcore}/103/filelists/wpa_supplicant | 0 config/rootfiles/oldcore/{99 => 103}/meta | 0 config/rootfiles/{core => oldcore}/103/update.sh | 5 +++ lfs/libvirt | 3 +- lfs/ntp | 4 +- lfs/wget | 6 +-- make.sh | 2 +- src/pakfire/lib/functions.sh | 4 +- src/paks/libvirt/install.sh | 6 +++ ...hange-options-in-libvirtd.conf-for-IPFire.patch | 43 ++++++++++++++++++++++ 33 files changed, 67 insertions(+), 17 deletions(-) rename config/rootfiles/core/{103 => 104}/exclude (100%) copy config/rootfiles/{oldcore/88 => core/104}/filelists/files (50%) copy config/rootfiles/{oldcore/96 => core/104}/filelists/ntp (100%) copy config/rootfiles/{oldcore/89 => core/104}/filelists/wget (100%) rename config/rootfiles/core/{103 => 104}/meta (100%) copy config/rootfiles/core/{103 => 104}/update.sh (94%) copy config/rootfiles/oldcore/{102 => 103}/exclude (100%) rename config/rootfiles/{core => oldcore}/103/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/103/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/103/filelists/files (100%) rename config/rootfiles/{core => oldcore}/103/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/103/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/103/filelists/less (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses-compat (100%) rename config/rootfiles/{core => oldcore}/103/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/103/filelists/sdparm (100%) rename config/rootfiles/{core => oldcore}/103/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/103/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/103/filelists/wpa_supplicant (100%) copy config/rootfiles/oldcore/{99 => 103}/meta (100%) rename config/rootfiles/{core => oldcore}/103/update.sh (94%) create mode 100644 src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
Difference in files: diff --git a/config/rootfiles/core/103/exclude b/config/rootfiles/core/103/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/103/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/103/filelists/coreutils b/config/rootfiles/core/103/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/103/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/curl b/config/rootfiles/core/103/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/103/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/diffutils b/config/rootfiles/core/103/filelists/diffutils deleted file mode 120000 index a5c02f3..0000000 --- a/config/rootfiles/core/103/filelists/diffutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/dnsmasq b/config/rootfiles/core/103/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/103/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/files b/config/rootfiles/core/103/filelists/files deleted file mode 100644 index 2294a5e..0000000 --- a/config/rootfiles/core/103/filelists/files +++ /dev/null @@ -1,9 +0,0 @@ -etc/system-release -etc/issue -lib/udev/network-hotplug-macvtap -lib/udev/network-hotplug-rename -lib/udev/rules.d/60-net.rules -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -usr/sbin/setup -var/ipfire/general-functions.pl -var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/core/103/filelists/findutils b/config/rootfiles/core/103/filelists/findutils deleted file mode 120000 index 545280a..0000000 --- a/config/rootfiles/core/103/filelists/findutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/gawk b/config/rootfiles/core/103/filelists/gawk deleted file mode 120000 index a3bbe32..0000000 --- a/config/rootfiles/core/103/filelists/gawk +++ /dev/null @@ -1 +0,0 @@ -../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/gettext b/config/rootfiles/core/103/filelists/gettext deleted file mode 120000 index b6c6c6f..0000000 --- a/config/rootfiles/core/103/filelists/gettext +++ /dev/null @@ -1 +0,0 @@ -../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/grep b/config/rootfiles/core/103/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/103/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/less b/config/rootfiles/core/103/filelists/less deleted file mode 120000 index 65c0e07..0000000 --- a/config/rootfiles/core/103/filelists/less +++ /dev/null @@ -1 +0,0 @@ -../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/ncurses b/config/rootfiles/core/103/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/103/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/ncurses-compat b/config/rootfiles/core/103/filelists/ncurses-compat deleted file mode 120000 index 5ecff53..0000000 --- a/config/rootfiles/core/103/filelists/ncurses-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses-compat \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/procps b/config/rootfiles/core/103/filelists/procps deleted file mode 120000 index e17e8ed..0000000 --- a/config/rootfiles/core/103/filelists/procps +++ /dev/null @@ -1 +0,0 @@ -../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/sdparm b/config/rootfiles/core/103/filelists/sdparm deleted file mode 120000 index 86d9c24..0000000 --- a/config/rootfiles/core/103/filelists/sdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/squid b/config/rootfiles/core/103/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/103/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/tzdata b/config/rootfiles/core/103/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/103/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/103/filelists/wpa_supplicant b/config/rootfiles/core/103/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/103/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/103/meta b/config/rootfiles/core/103/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/103/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh deleted file mode 100644 index 65a85a2..0000000 --- a/config/rootfiles/core/103/update.sh +++ /dev/null @@ -1,77 +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@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -core=103 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# 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 - -# Remove checkfstab -rm -f /etc/rc.d/init.d/checkfstab -rm -f /etc/rc.d/rcsysinit.d/S19checkfstab - -# Extract files -extract_files - -# update linker config -ldconfig - -# Update Language cache -#/usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/dnsmasq restart - -sync -# 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/104/exclude b/config/rootfiles/core/104/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/104/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/104/filelists/files b/config/rootfiles/core/104/filelists/files new file mode 100644 index 0000000..2fbdb5d --- /dev/null +++ b/config/rootfiles/core/104/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +opt/pakfire/lib/functions.sh diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/core/104/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/104/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh new file mode 100644 index 0000000..a229864 --- /dev/null +++ b/config/rootfiles/core/104/update.sh @@ -0,0 +1,71 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=104 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +touch /var/run/need_reboot +sync + +# 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/103/exclude b/config/rootfiles/oldcore/103/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/103/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/103/filelists/coreutils b/config/rootfiles/oldcore/103/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/curl b/config/rootfiles/oldcore/103/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/diffutils b/config/rootfiles/oldcore/103/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/dnsmasq b/config/rootfiles/oldcore/103/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/files b/config/rootfiles/oldcore/103/filelists/files new file mode 100644 index 0000000..2294a5e --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/files @@ -0,0 +1,9 @@ +etc/system-release +etc/issue +lib/udev/network-hotplug-macvtap +lib/udev/network-hotplug-rename +lib/udev/rules.d/60-net.rules +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +usr/sbin/setup +var/ipfire/general-functions.pl +var/ipfire/menu.d/30-network.menu diff --git a/config/rootfiles/oldcore/103/filelists/findutils b/config/rootfiles/oldcore/103/filelists/findutils new file mode 120000 index 0000000..545280a --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/gawk b/config/rootfiles/oldcore/103/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/gettext b/config/rootfiles/oldcore/103/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/grep b/config/rootfiles/oldcore/103/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/less b/config/rootfiles/oldcore/103/filelists/less new file mode 120000 index 0000000..65c0e07 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/ncurses b/config/rootfiles/oldcore/103/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/ncurses-compat b/config/rootfiles/oldcore/103/filelists/ncurses-compat new file mode 120000 index 0000000..5ecff53 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/ncurses-compat @@ -0,0 +1 @@ +../../../common/ncurses-compat \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/procps b/config/rootfiles/oldcore/103/filelists/procps new file mode 120000 index 0000000..e17e8ed --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/procps @@ -0,0 +1 @@ +../../../common/procps \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/sdparm b/config/rootfiles/oldcore/103/filelists/sdparm new file mode 120000 index 0000000..86d9c24 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/squid b/config/rootfiles/oldcore/103/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/tzdata b/config/rootfiles/oldcore/103/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/filelists/wpa_supplicant b/config/rootfiles/oldcore/103/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/103/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/103/meta b/config/rootfiles/oldcore/103/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/103/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/103/update.sh b/config/rootfiles/oldcore/103/update.sh new file mode 100644 index 0000000..3f45eaa --- /dev/null +++ b/config/rootfiles/oldcore/103/update.sh @@ -0,0 +1,82 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=103 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + +# Remove checkfstab +rm -f /etc/rc.d/init.d/checkfstab +rm -f /etc/rc.d/rcsysinit.d/S19checkfstab + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Remove potentially broken squid cache index (will be recreated after the next start) +rm -f /var/log/cache/swap.state + +# Start services +/etc/init.d/dnsmasq restart +/etc/init.d/squid start + +sync +# 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/lfs/libvirt b/lfs/libvirt index b18364b..3c7413f 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = libvirt -PAK_VER = 1 +PAK_VER = 2
DEPS = "libpciaccess libyajl ncat qemu"
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \ --with-openssl --without-sasl \ --without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \ diff --git a/lfs/ntp b/lfs/ntp index 3393f90..536a4a8 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -24,7 +24,7 @@
include Config
-VER = 4.2.8p5 +VER = 4.2.8p8
THISAPP = ntp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8 +$(DL_FILE)_MD5 = 4a8636260435b230636f053ffd070e34
install : $(TARGET)
diff --git a/lfs/wget b/lfs/wget index eef2a25..c22a978 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.16 +VER = 1.18
THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fe102975ab3a6c049777883f1bb9ad07 +$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec
install : $(TARGET)
diff --git a/make.sh b/make.sh index 1945a55..3d5b4a3 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="103" # Core Level (Filename) +CORE="104" # Core Level (Filename) PAKFIRE_CORE="103" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 3f7dbff..3751697 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -86,7 +86,7 @@ start_service() { esac done
- if [ -e "/etc/init.d/${1}" ]; then + if [ -f "/etc/init.d/${1}" ]; then if [ -n "${BACKGROUND}" ]; then (sleep ${DELAY} && /etc/init.d/${1} start) & else @@ -96,7 +96,7 @@ start_service() { }
stop_service() { - if [ -e "/etc/init.d/${1}" ]; then + if [ -f "/etc/init.d/${1}" ]; then /etc/init.d/${1} stop fi } diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh index 2832197..2009b0e 100644 --- a/src/paks/libvirt/install.sh +++ b/src/paks/libvirt/install.sh @@ -22,6 +22,12 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh + +# creates a new user and group called libvirt-remote if they not exist +getent group libvirt-remote >/dev/null || groupadd libvirt-remote +getent passwd libvirt-remote >/dev/null || \ +useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote" + extract_files start_service --delay 300 --background ${NAME} ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch new file mode 100644 index 0000000..ed685e8 --- /dev/null +++ b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch @@ -0,0 +1,43 @@ +From 69d6e8ce6c636f78d1db0eebe7fb1cc02ae4fb9a Mon Sep 17 00:00:00 2001 +From: Jonatan Schlag jonatan.schlag@ipfire.org +Date: Mon, 6 Jun 2016 19:40:50 +0200 +Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire + +Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org +--- + daemon/libvirtd.conf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf +index ac06cdd..1a41914 100644 +--- a/daemon/libvirtd.conf ++++ b/daemon/libvirtd.conf +@@ -87,14 +87,14 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-#unix_sock_group = "libvirt" ++unix_sock_group = "libvirt-remote" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only + # + # Default allows any user. If setting group ownership, you may want to + # restrict this too. +-#unix_sock_ro_perms = "0777" ++unix_sock_ro_perms = "0770" + + # Set the UNIX socket permissions for the R/W socket. This is used + # for full management of VMs +@@ -104,7 +104,7 @@ + # + # If not using PolicyKit and setting group ownership for access + # control, then you may want to relax this too. +-#unix_sock_rw_perms = "0770" ++unix_sock_rw_perms = "0770" + + # Set the UNIX socket permissions for the admin interface socket. + # +-- +2.1.4 +
hooks/post-receive -- IPFire 2.x development tree