From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core127, updated. 903052ddea715c66d15b18c9be4631bea8ab4bd5
Date: Wed, 23 Jan 2019 20:16:50 +0000 [thread overview]
Message-ID: <20190123201650.CF1C684FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4268 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, core127 has been updated
via 903052ddea715c66d15b18c9be4631bea8ab4bd5 (commit)
via 480e3014429820c687ceeb17a3ad0b46d2b6f2ed (commit)
from f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (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 903052ddea715c66d15b18c9be4631bea8ab4bd5
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Jan 21 21:40:50 2019 +0100
use HTTPS for downloading GeoIP database files
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 480e3014429820c687ceeb17a3ad0b46d2b6f2ed
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jan 23 04:10:23 2019 +0000
xtables-addons: Fix generating GeoIP database
Perl seems to have a very funny feature where you cannot rely on
how it formats IP addresses into a binary string.
This seems to be 16 bytes long for IPv4 addresses when we (and the kernel)
only expect 4.
This patch changes this so that the last 12 bytes are just being dropped.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/xtables-addons | 2 ++
.../xtables-addons-3.2-fix-database-generation.patch | 18 ++++++++++++++++++
src/scripts/xt_geoip_update | 4 ++--
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 src/patches/xtables-addons-3.2-fix-database-generation.patch
Difference in files:
diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 260820955..4cf220c4e 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch
+
# Only build the specified modules.
cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
$(DIR_APP)/mconfig
diff --git a/src/patches/xtables-addons-3.2-fix-database-generation.patch b/src/patches/xtables-addons-3.2-fix-database-generation.patch
new file mode 100644
index 000000000..5574e200d
--- /dev/null
+++ b/src/patches/xtables-addons-3.2-fix-database-generation.patch
@@ -0,0 +1,18 @@
+diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
+index 3b15875..7bc42f3 100755
+--- a/geoip/xt_geoip_build
++++ b/geoip/xt_geoip_build
+@@ -259,7 +259,12 @@ sub writeCountry
+ my ($start, $end) = split('-', $range);
+ $start = inet_pton($family, $start);
+ $end = inet_pton($family, $end);
+- print $fh $start, $end;
++
++ if ($family == AF_INET) {
++ print $fh substr($start, 0, 4), substr($end, 0, 4);
++ } else {
++ print $fh $start, $end;
++ }
+ }
+ close $fh;
+ }
diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index b45c5b343..93884dcf5 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -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=https://geolite.maxmind.com/download/geoip/database
DL_FILE=GeoLite2-Country-CSV.zip
eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)
@@ -40,7 +40,7 @@ function download() {
# Proxy settings.
# Check if a proxy should be used.
if [[ $UPSTREAM_PROXY ]]; then
- PROXYSETTINGS="-e http_proxy=http://"
+ PROXYSETTINGS="-e https_proxy=http://"
# Check if authentication against the proxy is configured.
if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-23 20:16 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=20190123201650.CF1C684FDD4@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