From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30
Date: Sat, 19 Jan 2019 18:51:58 +0000 [thread overview]
Message-ID: <20190119185159.09AD684FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9527 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, master has been updated
via f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (commit)
via 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 (commit)
via 271bac39a0b2999c843a5ec580438230d5398c74 (commit)
via 4cba04ce288de78f8382fd88cd5538bb4e435724 (commit)
via 3d476ab017763b44deff9206c97b7cfb548ffa7e (commit)
via a58c5ca1f240132605ec86a9db58ae2e0e24d783 (commit)
via a6c298b540787fa0feffbe5191855a54f6c8a178 (commit)
via 99549950fa26674ec1807aeee0904f35cb930cd8 (commit)
via ad62fda0addbd10573a30ce7a0ab6921b761f670 (commit)
via 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 (commit)
from 06ac824331726523e90607f472b822a9b50d156b (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 f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 17:24:47 2019 +0100
core127: run xt_geoip_update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2092280a3a0cd749fc2869ae29ce8a25d7c1a055
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 17:20:51 2019 +0100
core127: ovpn ca index.txt is also missing on some installations
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 271bac39a0b2999c843a5ec580438230d5398c74
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 15:16:43 2019 +0100
xt_geoip_updte: fix download url
the maxmind server delivers an old version if there are
two slashes before the database filename.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4cba04ce288de78f8382fd88cd5538bb4e435724
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 12:08:07 2019 +0100
core127: fix typo
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3d476ab017763b44deff9206c97b7cfb548ffa7e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 10:02:17 2019 +0100
core127: add ovpn ca changes to update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a58c5ca1f240132605ec86a9db58ae2e0e24d783
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 10:01:40 2019 +0100
core127: add xt_geoip_update to update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a6c298b540787fa0feffbe5191855a54f6c8a178
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 19 10:00:54 2019 +0100
core127: add bind to update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 99549950fa26674ec1807aeee0904f35cb930cd8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 13:53:39 2019 +0100
core127: set reboot needed flag
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ad62fda0addbd10573a30ce7a0ab6921b761f670
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 13:53:06 2019 +0100
core127: add general-functions.pl to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 07:52:17 2019 +0100
core127: fix updater for aarch64 and armv5tel
if a arch specific filelist has the same name as the common the common filelist was ignored
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/127/filelists/aarch64/files | 9 ---------
.../filelists/{armv5tel/files => aarch64/files-aarch64} | 0
.../core/127/filelists/armv5tel/{files => files-armvtel} | 0
.../rootfiles/{oldcore/100 => core/127}/filelists/bind | 0
config/rootfiles/core/127/filelists/files | 2 ++
config/rootfiles/core/127/update.sh | 16 +++++++++++++++-
src/scripts/xt_geoip_update | 4 ++--
7 files changed, 19 insertions(+), 12 deletions(-)
delete mode 100644 config/rootfiles/core/127/filelists/aarch64/files
copy config/rootfiles/core/127/filelists/{armv5tel/files => aarch64/files-aarch64} (100%)
rename config/rootfiles/core/127/filelists/armv5tel/{files => files-armvtel} (100%)
copy config/rootfiles/{oldcore/100 => core/127}/filelists/bind (100%)
Difference in files:
diff --git a/config/rootfiles/core/127/filelists/aarch64/files b/config/rootfiles/core/127/filelists/aarch64/files
deleted file mode 100644
index d76f3915c..000000000
--- a/config/rootfiles/core/127/filelists/aarch64/files
+++ /dev/null
@@ -1,9 +0,0 @@
-boot/boot.cmd
-boot/boot.scr
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-var/ipfire/langs
-etc/rc.d/init.d/aws
-etc/rc.d/init.d/unbound
-srv/web/ipfire/cgi-bin/dnsforward.cgi
diff --git a/config/rootfiles/core/127/filelists/armv5tel/files b/config/rootfiles/core/127/filelists/aarch64/files-aarch64
similarity index 100%
rename from config/rootfiles/core/127/filelists/armv5tel/files
rename to config/rootfiles/core/127/filelists/aarch64/files-aarch64
diff --git a/config/rootfiles/core/127/filelists/armv5tel/files-armvtel b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/127/filelists/bind b/config/rootfiles/core/127/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index 4b001af63..e28d42006 100644
--- a/config/rootfiles/core/127/filelists/files
+++ b/config/rootfiles/core/127/filelists/files
@@ -16,5 +16,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/lib/firewall/firewall-lib.pl
+usr/local/bin/xt_geoip_update
var/ipfire/backup/include
+var/ipfire/general-functions.pl
var/ipfire/geoip-functions.pl
diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh
index 4fe045ec9..e276e7e68 100644
--- a/config/rootfiles/core/127/update.sh
+++ b/config/rootfiles/core/127/update.sh
@@ -17,7 +17,7 @@
# 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>. #
+# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -48,6 +48,14 @@ ldconfig
# Regenerate squid configuration file
sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
+# If not exist create ovpn ca index.txt(.attr) and fix rights
+touch /var/ipfire/ovpn/ca/index.txt.attr
+chmod 644 /var/ipfire/ovpn/ca/index.txt.attr
+chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr
+touch /var/ipfire/ovpn/ca/index.txt
+chmod 644 /var/ipfire/ovpn/ca/index.txt
+chown nobody:nobody /var/ipfire/ovpn/ca/index.txt
+
# Start services
/etc/init.d/unbound restart
/etc/init.d/squid start
@@ -58,6 +66,12 @@ sysctl -p
# Re-run depmod
depmod -a
+# Update xt_geoip
+/usr/local/bin/xt_geoip_update
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
# Finish
/etc/init.d/fireinfo start
sendprofile
diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 73484c7a0..b45c5b343 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2014 IPFire Development Team <info(a)ipfire.org> #
+# Copyright (C) 2019 IPFire Development Team <info(a)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 #
@@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin
DEST_PATH=/usr/share/xt_geoip
DB_PATH=/var/lib/GeoIP
-DL_URL=http://geolite.maxmind.com/download/geoip/database/
+DL_URL=http://geolite.maxmind.com/download/geoip/database
DL_FILE=GeoLite2-Country-CSV.zip
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-19 18:51 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=20190119185159.09AD684FDD4@people01.i.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