From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8858180db5715072aefa784809538aa96be90466
Date: Fri, 27 Apr 2018 11:05:54 +0100 [thread overview]
Message-ID: <20180427100555.728DD1081DF2@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 19009 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 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
reply other threads:[~2018-04-27 10:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180427100555.728DD1081DF2@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox