IPFire-SCM April 2018

ipfire-scm@lists.ipfire.org

1 participants
29 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 36d9e459c0e259d6348438ea3594b6b2213d34b8
by git＠ipfire.org 30 Apr '18

30 Apr '18

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 36d9e459c0e259d6348438ea3594b6b2213d34b8 (commit) from 8858180db5715072aefa784809538aa96be90466 (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 36d9e459c0e259d6348438ea3594b6b2213d34b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 30 11:26:10 2018 +0100 core121: Add filelist Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/102/filelists => core/121/fileslists}/files | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/102/filelists => core/121/fileslists}/files (100%) Difference in files: diff --git a/config/rootfiles/core/121/fileslists/files b/config/rootfiles/core/121/fileslists/files new file mode 100644 index 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/121/fileslists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.19-core120, created. 39f4488a62cc97a1a60573e57eb8a14a7743f5e3
by git＠ipfire.org 27 Apr '18

27 Apr '18

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 tag, v2.19-core120 has been created at 39f4488a62cc97a1a60573e57eb8a14a7743f5e3 (commit) - Log ----------------------------------------------------------------- commit 39f4488a62cc97a1a60573e57eb8a14a7743f5e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 14:25:55 2018 +0100 core120: Regenerate IPsec configuration Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8858180db5715072aefa784809538aa96be90466
by git＠ipfire.org 27 Apr '18

27 Apr '18

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 8858180db5715072aefa784809538aa96be90466 (commit) via 2a20456f7df329f543800af35e8b19ef41d68663 (commit) via 40a930bda59180d3d88affd8bec028ebb375c05d (commit) from 86fd1947660833f8bff55d7a83259ab749ed60e1 (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 8858180db5715072aefa784809538aa96be90466 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Thu Apr 26 21:44:56 2018 +0200 remove forgotten Nagios files, if any When we decided to drop Nagios, some files were not removed on the installations. Since the package does not exist anymore, "pakfire remove nagios" does not work so we need to clean them up manually in case they exist. The third version of this patch makes sure Apache is restarted afterwards, and includes some forgotten files [sic] as well as it is now applying for Core Update 121. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2a20456f7df329f543800af35e8b19ef41d68663 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Thu Apr 26 17:06:51 2018 +0200 Start Core Update 121 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 40a930bda59180d3d88affd8bec028ebb375c05d Author: Peter Müller <peter.mueller(a)link38.eu> Date: Thu Apr 26 17:31:46 2018 +0200 BUG:11312 Fix renaming GeoIP groups When renaming a GeoIP Group, the corresponding names in firewallrules (if any) are not changed accordingly. Now when changing a GeoIP Group the firewallrules are renamed correctly. Slightly improved first version of this patch (contained a blank line with trailing whitespace). No functionality changed, patch has been confirmed as working correctly. Fixes: #11312 Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{120 => 121}/exclude | 0 config/rootfiles/core/{120 => 121}/meta | 0 .../rootfiles/{oldcore/113 => core/121}/update.sh | 28 ++++++++++++++-------- config/rootfiles/{core => oldcore}/120/exclude | 0 .../{core => oldcore}/120/filelists/Net_SSLeay | 0 .../{core => oldcore}/120/filelists/apache2 | 0 .../rootfiles/{core => oldcore}/120/filelists/apr | 0 .../{core => oldcore}/120/filelists/aprutil | 0 .../rootfiles/{core => oldcore}/120/filelists/bind | 0 .../rootfiles/{core => oldcore}/120/filelists/curl | 0 .../{core => oldcore}/120/filelists/cyrus-sasl | 0 .../rootfiles/{core => oldcore}/120/filelists/dma | 0 .../{core => oldcore}/120/filelists/files | 0 .../{core => oldcore}/120/filelists/gnupg | 0 .../120/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/120/filelists/libevent2 | 0 .../{core => oldcore}/120/filelists/logrotate | 0 .../rootfiles/{core => oldcore}/120/filelists/ntp | 0 .../{core => oldcore}/120/filelists/openssh | 0 .../{core => oldcore}/120/filelists/openssl | 0 .../{core => oldcore}/120/filelists/openssl-compat | 0 .../{core => oldcore}/120/filelists/openvpn | 0 .../{core => oldcore}/120/filelists/python-typing | 0 .../{core => oldcore}/120/filelists/snort | 0 .../{core => oldcore}/120/filelists/strongswan | 0 .../{core => oldcore}/120/filelists/unbound | 0 .../{core => oldcore}/120/filelists/vnstat | 0 .../rootfiles/{core => oldcore}/120/filelists/wget | 0 .../{core => oldcore}/120/filelists/wpa_supplicant | 0 config/rootfiles/{core => oldcore}/120/update.sh | 0 html/cgi-bin/fwhosts.cgi | 8 ++++++- make.sh | 4 ++-- 32 files changed, 27 insertions(+), 13 deletions(-) copy config/rootfiles/core/{120 => 121}/exclude (100%) rename config/rootfiles/core/{120 => 121}/meta (100%) copy config/rootfiles/{oldcore/113 => core/121}/update.sh (83%) rename config/rootfiles/{core => oldcore}/120/exclude (100%) rename config/rootfiles/{core => oldcore}/120/filelists/Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/120/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/120/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/120/filelists/aprutil (100%) rename config/rootfiles/{core => oldcore}/120/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/120/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/120/filelists/cyrus-sasl (100%) rename config/rootfiles/{core => oldcore}/120/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/120/filelists/files (100%) rename config/rootfiles/{core => oldcore}/120/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/120/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/120/filelists/libevent2 (100%) rename config/rootfiles/{core => oldcore}/120/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/120/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/120/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/120/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/120/filelists/openssl-compat (100%) rename config/rootfiles/{core => oldcore}/120/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/120/filelists/python-typing (100%) rename config/rootfiles/{core => oldcore}/120/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/120/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/120/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/120/filelists/vnstat (100%) rename config/rootfiles/{core => oldcore}/120/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/120/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/120/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/120/exclude b/config/rootfiles/core/121/exclude similarity index 100% rename from config/rootfiles/core/120/exclude rename to config/rootfiles/core/121/exclude diff --git a/config/rootfiles/core/120/meta b/config/rootfiles/core/121/meta similarity index 100% rename from config/rootfiles/core/120/meta rename to config/rootfiles/core/121/meta diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh new file mode 100644 index 000000000..87d5f6ebd --- /dev/null +++ b/config/rootfiles/core/121/update.sh @@ -0,0 +1,77 @@ +#!/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) 2018 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=121 + +# 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 + +# Remove Nagios files, if any... +rm -rvf \ + /etc/rc.d/init.d/nagios \ + /usr/bin/nagios \ + /etc/rc.d/rc6.d/K33nagios \ + /etc/rc.d/rc3.d/off/S67nagios \ + /etc/rc.d/rc0.d/K33nagios \ + /etc/httpd/conf/conf.d/nagios.conf \ + /etc/nagios/nagios.cfg \ + /usr/bin/p1.pl \ + /usr/bin/nagiostats \ + /usr/share/nagios/ \ + /var/nagios/ + +# Start services +/etc/init.d/apache restart + +# This update needs 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/120/exclude b/config/rootfiles/oldcore/120/exclude new file mode 100644 index 000000000..d6fd053b6 --- /dev/null +++ b/config/rootfiles/oldcore/120/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/120/filelists/Net_SSLeay b/config/rootfiles/oldcore/120/filelists/Net_SSLeay similarity index 100% rename from config/rootfiles/core/120/filelists/Net_SSLeay rename to config/rootfiles/oldcore/120/filelists/Net_SSLeay diff --git a/config/rootfiles/core/120/filelists/apache2 b/config/rootfiles/oldcore/120/filelists/apache2 similarity index 100% rename from config/rootfiles/core/120/filelists/apache2 rename to config/rootfiles/oldcore/120/filelists/apache2 diff --git a/config/rootfiles/core/120/filelists/apr b/config/rootfiles/oldcore/120/filelists/apr similarity index 100% rename from config/rootfiles/core/120/filelists/apr rename to config/rootfiles/oldcore/120/filelists/apr diff --git a/config/rootfiles/core/120/filelists/aprutil b/config/rootfiles/oldcore/120/filelists/aprutil similarity index 100% rename from config/rootfiles/core/120/filelists/aprutil rename to config/rootfiles/oldcore/120/filelists/aprutil diff --git a/config/rootfiles/core/120/filelists/bind b/config/rootfiles/oldcore/120/filelists/bind similarity index 100% rename from config/rootfiles/core/120/filelists/bind rename to config/rootfiles/oldcore/120/filelists/bind diff --git a/config/rootfiles/core/120/filelists/curl b/config/rootfiles/oldcore/120/filelists/curl similarity index 100% rename from config/rootfiles/core/120/filelists/curl rename to config/rootfiles/oldcore/120/filelists/curl diff --git a/config/rootfiles/core/120/filelists/cyrus-sasl b/config/rootfiles/oldcore/120/filelists/cyrus-sasl similarity index 100% rename from config/rootfiles/core/120/filelists/cyrus-sasl rename to config/rootfiles/oldcore/120/filelists/cyrus-sasl diff --git a/config/rootfiles/core/120/filelists/dma b/config/rootfiles/oldcore/120/filelists/dma similarity index 100% rename from config/rootfiles/core/120/filelists/dma rename to config/rootfiles/oldcore/120/filelists/dma diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/oldcore/120/filelists/files similarity index 100% rename from config/rootfiles/core/120/filelists/files rename to config/rootfiles/oldcore/120/filelists/files diff --git a/config/rootfiles/core/120/filelists/gnupg b/config/rootfiles/oldcore/120/filelists/gnupg similarity index 100% rename from config/rootfiles/core/120/filelists/gnupg rename to config/rootfiles/oldcore/120/filelists/gnupg diff --git a/config/rootfiles/core/120/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/120/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/120/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/120/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/120/filelists/libevent2 b/config/rootfiles/oldcore/120/filelists/libevent2 similarity index 100% rename from config/rootfiles/core/120/filelists/libevent2 rename to config/rootfiles/oldcore/120/filelists/libevent2 diff --git a/config/rootfiles/core/120/filelists/logrotate b/config/rootfiles/oldcore/120/filelists/logrotate similarity index 100% rename from config/rootfiles/core/120/filelists/logrotate rename to config/rootfiles/oldcore/120/filelists/logrotate diff --git a/config/rootfiles/core/120/filelists/ntp b/config/rootfiles/oldcore/120/filelists/ntp similarity index 100% rename from config/rootfiles/core/120/filelists/ntp rename to config/rootfiles/oldcore/120/filelists/ntp diff --git a/config/rootfiles/core/120/filelists/openssh b/config/rootfiles/oldcore/120/filelists/openssh similarity index 100% rename from config/rootfiles/core/120/filelists/openssh rename to config/rootfiles/oldcore/120/filelists/openssh diff --git a/config/rootfiles/core/120/filelists/openssl b/config/rootfiles/oldcore/120/filelists/openssl similarity index 100% rename from config/rootfiles/core/120/filelists/openssl rename to config/rootfiles/oldcore/120/filelists/openssl diff --git a/config/rootfiles/core/120/filelists/openssl-compat b/config/rootfiles/oldcore/120/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/120/filelists/openssl-compat rename to config/rootfiles/oldcore/120/filelists/openssl-compat diff --git a/config/rootfiles/core/120/filelists/openvpn b/config/rootfiles/oldcore/120/filelists/openvpn similarity index 100% rename from config/rootfiles/core/120/filelists/openvpn rename to config/rootfiles/oldcore/120/filelists/openvpn diff --git a/config/rootfiles/core/120/filelists/python-typing b/config/rootfiles/oldcore/120/filelists/python-typing similarity index 100% rename from config/rootfiles/core/120/filelists/python-typing rename to config/rootfiles/oldcore/120/filelists/python-typing diff --git a/config/rootfiles/core/120/filelists/snort b/config/rootfiles/oldcore/120/filelists/snort similarity index 100% rename from config/rootfiles/core/120/filelists/snort rename to config/rootfiles/oldcore/120/filelists/snort diff --git a/config/rootfiles/core/120/filelists/strongswan b/config/rootfiles/oldcore/120/filelists/strongswan similarity index 100% rename from config/rootfiles/core/120/filelists/strongswan rename to config/rootfiles/oldcore/120/filelists/strongswan diff --git a/config/rootfiles/core/120/filelists/unbound b/config/rootfiles/oldcore/120/filelists/unbound similarity index 100% rename from config/rootfiles/core/120/filelists/unbound rename to config/rootfiles/oldcore/120/filelists/unbound diff --git a/config/rootfiles/core/120/filelists/vnstat b/config/rootfiles/oldcore/120/filelists/vnstat similarity index 100% rename from config/rootfiles/core/120/filelists/vnstat rename to config/rootfiles/oldcore/120/filelists/vnstat diff --git a/config/rootfiles/core/120/filelists/wget b/config/rootfiles/oldcore/120/filelists/wget similarity index 100% rename from config/rootfiles/core/120/filelists/wget rename to config/rootfiles/oldcore/120/filelists/wget diff --git a/config/rootfiles/core/120/filelists/wpa_supplicant b/config/rootfiles/oldcore/120/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/120/filelists/wpa_supplicant rename to config/rootfiles/oldcore/120/filelists/wpa_supplicant diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/oldcore/120/update.sh similarity index 100% rename from config/rootfiles/core/120/update.sh rename to config/rootfiles/oldcore/120/update.sh diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index a2ade8a20..10217425d 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1278,7 +1278,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname') } &General::writehasharray("$configgeoipgrp", \%customgeoipgrp ); #change name in FW Rules - &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6); + &changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip"); } } &addgeoipgrp; @@ -3052,6 +3052,12 @@ sub changenameinfw my $old=shift; my $new=shift; my $fld=shift; + my $type=shift; + + if ($type eq 'geoip'){ + $old="group:$old"; + $new="group:$new"; + } &General::readhasharray("$fwconfigfwd", \%fwfwd); &General::readhasharray("$fwconfiginp", \%fwinp); &General::readhasharray("$fwconfigout", \%fwout); diff --git a/make.sh b/make.sh index 1f8738665..85f101bf0 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="120" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +CORE="121" # Core Level (Filename) +PAKFIRE_CORE="121" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 39f4488a62cc97a1a60573e57eb8a14a7743f5e3
by git＠ipfire.org 24 Apr '18

24 Apr '18

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, core120 has been updated via 39f4488a62cc97a1a60573e57eb8a14a7743f5e3 (commit) via ef623d3e68fdf97d2f96a5b9d1c22de771e05d49 (commit) from 196b9090f96064d5772e01b875106397a9c898da (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 39f4488a62cc97a1a60573e57eb8a14a7743f5e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 14:25:55 2018 +0100 core120: Regenerate IPsec configuration Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ef623d3e68fdf97d2f96a5b9d1c22de771e05d49 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 19 15:36:37 2018 +0100 Revert "IPsec: Try to restart always-on tunnels immediately" This reverts commit a261cb06c6cdd3ba14ad0163c8c9e714ae94fc5b. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/120/update.sh | 6 ++++++ html/cgi-bin/vpnmain.cgi | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index 1ba9df96f..c465d315b 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -83,6 +83,12 @@ done /etc/init.d/apache restart /etc/init.d/unbound restart +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec restart +fi + # Remove deprecated SSH configuration option sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index a52b4d64d..378acb326 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -436,12 +436,6 @@ sub writeipsecfiles { if ($start_action eq 'route' && $inactivity_timeout > 0) { print CONF "\tinactivity=$inactivity_timeout\n"; } - - # Restart the connection immediately when it has gone down - # unexpectedly - if ($start_action eq 'start') { - print CONF "\tcloseaction=restart\n"; - } } # Fragmentation hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 196b9090f96064d5772e01b875106397a9c898da
by git＠ipfire.org 24 Apr '18

24 Apr '18

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, core120 has been updated via 196b9090f96064d5772e01b875106397a9c898da (commit) from 3509cd985fd5a92de5eb3e3b1bc153fcea2d3d31 (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 196b9090f96064d5772e01b875106397a9c898da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 12:34:53 2018 +0100 dma: Apply compile fix dma segfaulted when built without string.h. Fixes: #11701 Submitted upstream: https://github.com/corecode/dma/pull/58 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/dma | 1 + src/patches/dma-0.11-compile-fixes.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/patches/dma-0.11-compile-fixes.patch Difference in files: diff --git a/lfs/dma b/lfs/dma index 507967158..085c9c2ee 100644 --- a/lfs/dma +++ b/lfs/dma @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) touch /var/ipfire/dma/mail.conf cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.11-compile-fixes.patch cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile cd $(DIR_APP) && make diff --git a/src/patches/dma-0.11-compile-fixes.patch b/src/patches/dma-0.11-compile-fixes.patch new file mode 100644 index 000000000..a6e5165c9 --- /dev/null +++ b/src/patches/dma-0.11-compile-fixes.patch @@ -0,0 +1,29 @@ +From 60cf6f03a4b13ec0e491a282ab5233a1619a7a66 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Tue, 24 Apr 2018 12:30:13 +0100 +Subject: [PATCH] net.c: Include string.h + +Various functions that have been used come from string.h. GCC compiled +dma without this header, but unfortunately the binary segfaulted at random +times. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net.c b/net.c +index a1cc3e3bfd79..221dda131a23 100644 +--- a/net.c ++++ b/net.c +@@ -53,6 +53,7 @@ + #include <netdb.h> + #include <setjmp.h> + #include <signal.h> ++#include <string.h> + #include <syslog.h> + #include <unistd.h> + +-- +2.14.3 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 86fd1947660833f8bff55d7a83259ab749ed60e1
by git＠ipfire.org 24 Apr '18

24 Apr '18

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 86fd1947660833f8bff55d7a83259ab749ed60e1 (commit) from df7f30a146377d57edfd5442cebad2bff34cbfd4 (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 86fd1947660833f8bff55d7a83259ab749ed60e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 12:34:53 2018 +0100 dma: Apply compile fix dma segfaulted when built without string.h. Fixes: #11701 Submitted upstream: https://github.com/corecode/dma/pull/58 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/dma | 1 + src/patches/dma-0.11-compile-fixes.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/patches/dma-0.11-compile-fixes.patch Difference in files: diff --git a/lfs/dma b/lfs/dma index 507967158..085c9c2ee 100644 --- a/lfs/dma +++ b/lfs/dma @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) touch /var/ipfire/dma/mail.conf cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.11-compile-fixes.patch cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile cd $(DIR_APP) && make diff --git a/src/patches/dma-0.11-compile-fixes.patch b/src/patches/dma-0.11-compile-fixes.patch new file mode 100644 index 000000000..a6e5165c9 --- /dev/null +++ b/src/patches/dma-0.11-compile-fixes.patch @@ -0,0 +1,29 @@ +From 60cf6f03a4b13ec0e491a282ab5233a1619a7a66 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Tue, 24 Apr 2018 12:30:13 +0100 +Subject: [PATCH] net.c: Include string.h + +Various functions that have been used come from string.h. GCC compiled +dma without this header, but unfortunately the binary segfaulted at random +times. + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net.c b/net.c +index a1cc3e3bfd79..221dda131a23 100644 +--- a/net.c ++++ b/net.c +@@ -53,6 +53,7 @@ + #include <netdb.h> + #include <setjmp.h> + #include <signal.h> ++#include <string.h> + #include <syslog.h> + #include <unistd.h> + +-- +2.14.3 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. df7f30a146377d57edfd5442cebad2bff34cbfd4
by git＠ipfire.org 24 Apr '18

24 Apr '18

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 df7f30a146377d57edfd5442cebad2bff34cbfd4 (commit) from f4a91e23d9a4e03ebe7e4c5592fd407145d55875 (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 df7f30a146377d57edfd5442cebad2bff34cbfd4 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Apr 23 16:17:00 2018 +0200 improve error message if make.sh is executed by non-root user Fixes #11706. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index 510fb2cc8..1f8738665 100755 --- a/make.sh +++ b/make.sh @@ -416,7 +416,7 @@ prepareenv() { # Checking if running as root user if [ $(id -u) -ne 0 ]; then - exiterror "Not building as root" + exiterror "root privileges required for building" fi # Checking for necessary temporary space hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f4a91e23d9a4e03ebe7e4c5592fd407145d55875
by git＠ipfire.org 24 Apr '18

24 Apr '18

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 f4a91e23d9a4e03ebe7e4c5592fd407145d55875 (commit) from a3452c90307aa6fd2b8543c17c15638c2ffda15e (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 f4a91e23d9a4e03ebe7e4c5592fd407145d55875 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 11:04:34 2018 +0100 Drop noip updater This package is unused since we introduced ddns. Dropped. Fixes: #11708 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 1 - config/rootfiles/common/noip_updater | 1 - lfs/configroot | 2 +- lfs/noip_updater | 76 ------------------------------------ make.sh | 1 - 5 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 config/rootfiles/common/noip_updater delete mode 100644 lfs/noip_updater Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 58424ed2b..73b7bc01f 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -27,7 +27,6 @@ var/ipfire/crls var/ipfire/ddns #var/ipfire/ddns/config #var/ipfire/ddns/ipcache -#var/ipfire/ddns/noipsettings #var/ipfire/ddns/settings var/ipfire/dhcp #var/ipfire/dhcp/advoptions diff --git a/config/rootfiles/common/noip_updater b/config/rootfiles/common/noip_updater deleted file mode 100644 index bedb9a74f..000000000 --- a/config/rootfiles/common/noip_updater +++ /dev/null @@ -1 +0,0 @@ -usr/bin/noip diff --git a/lfs/configroot b/lfs/configroot index ad02996cf..426b3a58d 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -62,7 +62,7 @@ $(TARGET) : # Touch empty files for i in auth/users backup/include.user backup/exclude.user \ - captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ + captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt ddns/config ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \ diff --git a/lfs/noip_updater b/lfs/noip_updater deleted file mode 100644 index dcb86d757..000000000 --- a/lfs/noip_updater +++ /dev/null @@ -1,76 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = v1.6 - -THISAPP = noip_updater_$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = http://www.no-ip.com/client/linux -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 6503e2e7d8ea35c304744a318b400a09 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && gcc $(CFLAGS) -Dlinux noip.c -o noip - cd $(DIR_APP) && install -m 0755 noip /usr/bin - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index c03e464b5..510fb2cc8 100755 --- a/make.sh +++ b/make.sh @@ -1254,7 +1254,6 @@ buildipfire() { lfsmake2 python-ipaddress lfsmake2 glib lfsmake2 GeoIP - lfsmake2 noip_updater lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a3452c90307aa6fd2b8543c17c15638c2ffda15e
by git＠ipfire.org 24 Apr '18

24 Apr '18

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 a3452c90307aa6fd2b8543c17c15638c2ffda15e (commit) via 637eee2607c015947778523be13cce1c1ed938c6 (commit) from f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5 (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 a3452c90307aa6fd2b8543c17c15638c2ffda15e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 24 10:47:16 2018 +0100 ipsec: Open ports in outgoing direction When the firewall policy is blocked, no outgoing IPsec connections can be established. That is slightly counter-intuitive since we open ports in the incoming direction automatically. Fixes: #11704 Reported-by: Oliver Fuhrer <oliver.fuhrer(a)bluewin.ch> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 637eee2607c015947778523be13cce1c1ed938c6 Author: Ersan Yildirim <ersan73(a)gmail.com> Date: Tue Apr 24 10:46:52 2018 +0100 Fix mistakes in Turkish translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: langs/tr/cgi-bin/tr.pl | 2 +- src/misc-progs/ipsecctrl.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) Difference in files: diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 6eb3a7e03..53f0afc7a 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1762,7 +1762,7 @@ 'off' => 'kapalı', 'ok' => 'TAMAM', 'older' => 'Eski', -'on' => 'üstünde', +'on' => 'açık', 'one hour' => 'Bir Saat', 'one month' => 'Bir Ay', 'one week' => 'Bir Hafta', diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 204753640..9afc409ca 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -63,6 +63,10 @@ void open_physical (char *interface, int nat_traversal_port) { safe_system(str); sprintf(str, "/sbin/iptables --wait -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface); safe_system(str); + sprintf(str, "/sbin/iptables --wait -D IPSECOUTPUT -p udp -o %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface); + safe_system(str); + sprintf(str, "/sbin/iptables --wait -A IPSECOUTPUT -p udp -o %s --dport 500 -j ACCEPT", interface); + safe_system(str); if (! nat_traversal_port) return; @@ -71,6 +75,10 @@ void open_physical (char *interface, int nat_traversal_port) { safe_system(str); sprintf(str, "/sbin/iptables --wait -A IPSECINPUT -p udp -i %s --dport %i -j ACCEPT", interface, nat_traversal_port); safe_system(str); + sprintf(str, "/sbin/iptables --wait -D IPSECOUTPUT -p udp -o %s --dport %i -j ACCEPT >/dev/null 2>&1", interface, nat_traversal_port); + safe_system(str); + sprintf(str, "/sbin/iptables --wait -A IPSECOUTPUT -p udp -o %s --dport %i -j ACCEPT", interface, nat_traversal_port); + safe_system(str); } void ipsec_norules() { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5
by git＠ipfire.org 23 Apr '18

23 Apr '18

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 f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5 (commit) via a83b738215156e95dab1551a7838c508de256a1f (commit) from 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6 (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 f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Apr 22 13:38:11 2018 +0200 clamav 0.100.0: Add missing update for rootfile This is missing in https://patchwork.ipfire.org/patch/1722/ Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a83b738215156e95dab1551a7838c508de256a1f Author: Peter Müller <peter.mueller(a)link38.eu> Date: Sat Apr 21 18:44:45 2018 +0200 update ClamAV to 0.100.0 Update ClamAV to 0.100.0, which brings some new features and bugfixes (release notes are available here: https://blog.clamav.net/2018/04/clamav-01000-has-been-released.html). Since the internal LLVM code is now deprecated and disabled by default, patching clamav/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp does not seem to be necessary anymore. Further, the --disable-zlib-vcheck option has been removed since it produces warnings during compilation. Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 8 ++++++-- lfs/clamav | 8 +++----- src/patches/clamav/llvm-glibc.patch | 12 ------------ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 src/patches/clamav/llvm-glibc.patch Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index d7636e983..ec5e09c84 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -4,7 +4,6 @@ usr/bin/clamconf usr/bin/clamdscan usr/bin/clamdtop usr/bin/clamscan -usr/bin/clamsubmit usr/bin/freshclam usr/bin/sigtool #usr/include/clamav.h @@ -12,6 +11,11 @@ usr/bin/sigtool usr/lib/libclamav.so usr/lib/libclamav.so.7 usr/lib/libclamav.so.7.1.1 +#usr/lib/libclammspack.a +#usr/lib/libclammspack.la +usr/lib/libclammspack.so +usr/lib/libclammspack.so.0 +usr/lib/libclammspack.so.0.1.0 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.7 @@ -21,6 +25,7 @@ usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.7 usr/lib/libclamunrar_iface.so.7.1.1 #usr/lib/pkgconfig/libclamav.pc +#usr/lib/pkgconfig/libclammspack.pc usr/sbin/clamd usr/share/clamav #usr/share/man/man1/clambc.1 @@ -28,7 +33,6 @@ usr/share/clamav #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 #usr/share/man/man1/clamscan.1 -#usr/share/man/man1/clamsubmit.1 #usr/share/man/man1/freshclam.1 #usr/share/man/man1/sigtool.1 #usr/share/man/man5/clamav-milter.conf.5 diff --git a/lfs/clamav b/lfs/clamav index 748c2c371..7623801fb 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.99.4 +VER = 0.100.0 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 37 +PAK_VER = 38 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b9359b90086948b3c4eb97c84cf4b400 +$(DL_FILE)_MD5 = 93e8efb489c2afdfca73703b76c24e01 install : $(TARGET) @@ -81,10 +81,8 @@ $(subst %,%_MD5,$(objects)) : $(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/clamav/llvm-glibc.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ - --disable-zlib-vcheck \ --sysconfdir=/var/ipfire/clamav \ $(CONFIGURE_FLAGS) cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/clamav/llvm-glibc.patch b/src/patches/clamav/llvm-glibc.patch deleted file mode 100644 index 78845fcfc..000000000 --- a/src/patches/clamav/llvm-glibc.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -=================================================================== ---- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -+++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -@@ -55,6 +55,7 @@ static void runAtExitHandlers() { - #include <sys/stat.h> - #endif - #include <fcntl.h> -+#include <unistd.h> - /* stat functions are redirecting to __xstat with a version number. On x86-64 - * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' - * available as an exported symbol, so we have to add it explicitly. hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2018