* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de4f303186927ad1a7a8ff1ec221583d0f8ca047
@ 2018-12-11 20:05 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2018-12-11 20:05 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 22390 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 de4f303186927ad1a7a8ff1ec221583d0f8ca047 (commit)
via 707846392ee8108d15095d7bc5ee1f43a967053f (commit)
via 5df66de303e799537e73c590ead94950f24f38ca (commit)
via 8b02a92fe73e16538940aa030e4bcb389cce7f67 (commit)
via 66f7b646cd6bf3a1f34d2ad998caad90f3c6c4fc (commit)
via 7e17de5f863a96d2f4e67fd27daeade3b1b1d471 (commit)
from adde1ca8ce1588997936f5b22687525a2e6637b2 (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 de4f303186927ad1a7a8ff1ec221583d0f8ca047
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 11 19:46:10 2018 +0000
core127: Ship updated unbound
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 707846392ee8108d15095d7bc5ee1f43a967053f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Dec 8 18:13:23 2018 +0100
unbound: Update to 1.8.2
For details see:
https://nlnetlabs.nl/projects/unbound/download/
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5df66de303e799537e73c590ead94950f24f38ca
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Dec 8 18:21:19 2018 +0100
clamav: Update to 0.101.0
For details see:
https://blog.clamav.net/
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b02a92fe73e16538940aa030e4bcb389cce7f67
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 11 19:41:31 2018 +0000
core127: Ship updated fireinfo
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 66f7b646cd6bf3a1f34d2ad998caad90f3c6c4fc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 11 19:41:09 2018 +0000
Start Core Update 127
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7e17de5f863a96d2f4e67fd27daeade3b1b1d471
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 11 19:38:21 2018 +0000
fireinfo: Add authentication for upstream proxies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/unbound | 2 +-
config/rootfiles/core/{126 => 127}/exclude | 0
.../{oldcore/113 => core/127}/filelists/files | 3 +-
.../{oldcore/44 => core/127}/filelists/fireinfo | 0
.../{oldcore/106 => core/127}/filelists/unbound | 0
.../rootfiles/{oldcore/112 => core/127}/update.sh | 15 ++----
config/rootfiles/{core => oldcore}/126/exclude | 0
.../{core => oldcore}/126/filelists/aarch64/linux | 0
.../126/filelists/aarch64/linux-initrd | 0
.../126/filelists/armv5tel/linux-initrd-kirkwood | 0
.../126/filelists/armv5tel/linux-initrd-multi | 0
.../126/filelists/armv5tel/linux-kirkwood | 0
.../126/filelists/armv5tel/linux-multi | 0
.../rootfiles/{core => oldcore}/126/filelists/bind | 0
.../{core => oldcore}/126/filelists/files | 0
.../{core => oldcore}/126/filelists/i586/linux | 0
.../126/filelists/i586/linux-initrd | 0
.../{core => oldcore}/126/filelists/libconfig | 0
.../{core => oldcore}/126/filelists/openssl | 0
.../{core => oldcore}/126/filelists/openssl-compat | 0
.../{core => oldcore}/126/filelists/x86_64/linux | 0
.../126/filelists/x86_64/linux-initrd | 0
config/rootfiles/{core => oldcore}/126/update.sh | 0
config/rootfiles/packages/clamav | 14 +++--
lfs/clamav | 6 +--
lfs/fireinfo | 1 +
lfs/unbound | 4 +-
lfs/wget | 4 +-
make.sh | 2 +-
...upport-upstream-proxy-with-authentication.patch | 61 ++++++++++++++++++++++
30 files changed, 83 insertions(+), 29 deletions(-)
copy config/rootfiles/core/{126 => 127}/exclude (100%)
copy config/rootfiles/{oldcore/113 => core/127}/filelists/files (51%)
copy config/rootfiles/{oldcore/44 => core/127}/filelists/fireinfo (100%)
copy config/rootfiles/{oldcore/106 => core/127}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/112 => core/127}/update.sh (91%)
rename config/rootfiles/{core => oldcore}/126/exclude (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/aarch64/linux (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/aarch64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/armv5tel/linux-initrd-kirkwood (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/armv5tel/linux-initrd-multi (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/armv5tel/linux-kirkwood (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/armv5tel/linux-multi (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/i586/linux (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/i586/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/libconfig (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/openssl-compat (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/x86_64/linux (100%)
rename config/rootfiles/{core => oldcore}/126/filelists/x86_64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/126/update.sh (100%)
create mode 100644 src/patches/fireinfo-support-upstream-proxy-with-authentication.patch
Difference in files:
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index 2232c6889..e02860487 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.0.1
+usr/lib/libunbound.so.8.0.2
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor
diff --git a/config/rootfiles/core/126/exclude b/config/rootfiles/core/127/exclude
similarity index 100%
rename from config/rootfiles/core/126/exclude
rename to config/rootfiles/core/127/exclude
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
new file mode 100644
index 000000000..ce4e51768
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/files
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/127/filelists/fireinfo b/config/rootfiles/core/127/filelists/fireinfo
new file mode 120000
index 000000000..c46115521
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/127/filelists/unbound b/config/rootfiles/core/127/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh
new file mode 100644
index 000000000..0c928e89a
--- /dev/null
+++ b/config/rootfiles/core/127/update.sh
@@ -0,0 +1,62 @@
+#!/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=127
+
+# 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 files
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound restart
+
+# 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/126/exclude b/config/rootfiles/oldcore/126/exclude
new file mode 100644
index 000000000..b22159878
--- /dev/null
+++ b/config/rootfiles/oldcore/126/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/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/126/filelists/aarch64/linux b/config/rootfiles/oldcore/126/filelists/aarch64/linux
similarity index 100%
rename from config/rootfiles/core/126/filelists/aarch64/linux
rename to config/rootfiles/oldcore/126/filelists/aarch64/linux
diff --git a/config/rootfiles/core/126/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/126/filelists/aarch64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/126/filelists/aarch64/linux-initrd
rename to config/rootfiles/oldcore/126/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/126/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/126/filelists/armv5tel/linux-initrd-kirkwood
similarity index 100%
rename from config/rootfiles/core/126/filelists/armv5tel/linux-initrd-kirkwood
rename to config/rootfiles/oldcore/126/filelists/armv5tel/linux-initrd-kirkwood
diff --git a/config/rootfiles/core/126/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/126/filelists/armv5tel/linux-initrd-multi
similarity index 100%
rename from config/rootfiles/core/126/filelists/armv5tel/linux-initrd-multi
rename to config/rootfiles/oldcore/126/filelists/armv5tel/linux-initrd-multi
diff --git a/config/rootfiles/core/126/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/126/filelists/armv5tel/linux-kirkwood
similarity index 100%
rename from config/rootfiles/core/126/filelists/armv5tel/linux-kirkwood
rename to config/rootfiles/oldcore/126/filelists/armv5tel/linux-kirkwood
diff --git a/config/rootfiles/core/126/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/126/filelists/armv5tel/linux-multi
similarity index 100%
rename from config/rootfiles/core/126/filelists/armv5tel/linux-multi
rename to config/rootfiles/oldcore/126/filelists/armv5tel/linux-multi
diff --git a/config/rootfiles/core/126/filelists/bind b/config/rootfiles/oldcore/126/filelists/bind
similarity index 100%
rename from config/rootfiles/core/126/filelists/bind
rename to config/rootfiles/oldcore/126/filelists/bind
diff --git a/config/rootfiles/core/126/filelists/files b/config/rootfiles/oldcore/126/filelists/files
similarity index 100%
rename from config/rootfiles/core/126/filelists/files
rename to config/rootfiles/oldcore/126/filelists/files
diff --git a/config/rootfiles/core/126/filelists/i586/linux b/config/rootfiles/oldcore/126/filelists/i586/linux
similarity index 100%
rename from config/rootfiles/core/126/filelists/i586/linux
rename to config/rootfiles/oldcore/126/filelists/i586/linux
diff --git a/config/rootfiles/core/126/filelists/i586/linux-initrd b/config/rootfiles/oldcore/126/filelists/i586/linux-initrd
similarity index 100%
rename from config/rootfiles/core/126/filelists/i586/linux-initrd
rename to config/rootfiles/oldcore/126/filelists/i586/linux-initrd
diff --git a/config/rootfiles/core/126/filelists/libconfig b/config/rootfiles/oldcore/126/filelists/libconfig
similarity index 100%
rename from config/rootfiles/core/126/filelists/libconfig
rename to config/rootfiles/oldcore/126/filelists/libconfig
diff --git a/config/rootfiles/core/126/filelists/openssl b/config/rootfiles/oldcore/126/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/126/filelists/openssl
rename to config/rootfiles/oldcore/126/filelists/openssl
diff --git a/config/rootfiles/core/126/filelists/openssl-compat b/config/rootfiles/oldcore/126/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/126/filelists/openssl-compat
rename to config/rootfiles/oldcore/126/filelists/openssl-compat
diff --git a/config/rootfiles/core/126/filelists/x86_64/linux b/config/rootfiles/oldcore/126/filelists/x86_64/linux
similarity index 100%
rename from config/rootfiles/core/126/filelists/x86_64/linux
rename to config/rootfiles/oldcore/126/filelists/x86_64/linux
diff --git a/config/rootfiles/core/126/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/126/filelists/x86_64/linux-initrd
similarity index 100%
rename from config/rootfiles/core/126/filelists/x86_64/linux-initrd
rename to config/rootfiles/oldcore/126/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/core/126/update.sh b/config/rootfiles/oldcore/126/update.sh
similarity index 100%
rename from config/rootfiles/core/126/update.sh
rename to config/rootfiles/oldcore/126/update.sh
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 2be31d5db..3f35f9b17 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -11,23 +11,21 @@ usr/bin/sigtool
#usr/include/clamav.h
#usr/lib/libclamav.la
usr/lib/libclamav.so
-usr/lib/libclamav.so.7
-usr/lib/libclamav.so.7.1.1
-#usr/lib/libclammspack.a
+usr/lib/libclamav.so.9
+usr/lib/libclamav.so.9.0.0
#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
-usr/lib/libclamunrar.so.7.1.1
+usr/lib/libclamunrar.so.9
+usr/lib/libclamunrar.so.9.0.0
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
-usr/lib/libclamunrar_iface.so.7
-usr/lib/libclamunrar_iface.so.7.1.1
+usr/lib/libclamunrar_iface.so.9
+usr/lib/libclamunrar_iface.so.9.0.0
#usr/lib/pkgconfig/libclamav.pc
-#usr/lib/pkgconfig/libclammspack.pc
usr/sbin/clamd
#usr/share/man/man1/clambc.1
#usr/share/man/man1/clamconf.1
diff --git a/lfs/clamav b/lfs/clamav
index 420ee82b3..20ff9ddf3 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.100.2
+VER = 0.101.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 = 41
+PAK_VER = 42
DEPS = ""
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 253dd79dd57da759567e42543a569c5c
+$(DL_FILE)_MD5 = 47c36d13ac814b9e29ed6f5fc1691373
install : $(TARGET)
diff --git a/lfs/fireinfo b/lfs/fireinfo
index df736e0f3..2e6d1e94c 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Don-t-crash-when-proc-cpuinfo-doesn-t-have-any-infor.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Ignore-any-systems-with-ID-Default-string.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-support-upstream-proxy-with-authentication.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr
diff --git a/lfs/unbound b/lfs/unbound
index 8dfcfa3a0..3c876b79a 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
include Config
-VER = 1.8.1
+VER = 1.8.2
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 00ce66e357fd2f969acf69008aa82a40
+$(DL_FILE)_MD5 = 3b2f1024df47ccc59a8100c3b40c6dc1
install : $(TARGET)
diff --git a/lfs/wget b/lfs/wget
index 39f59ba80..5ccb0029f 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -24,7 +24,7 @@
include Config
-VER = 1.19.5
+VER = 1.20
THISAPP = wget-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2db6f03d655041f82eb64b8c8a1fa7da
+$(DL_FILE)_MD5 = 9f1515d083b769e9ff7642ce6016518e
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 83dd9b121..fd626a999 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.21" # Version number
-CORE="126" # Core Level (Filename)
+CORE="127" # Core Level (Filename)
PAKFIRE_CORE="126" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
diff --git a/src/patches/fireinfo-support-upstream-proxy-with-authentication.patch b/src/patches/fireinfo-support-upstream-proxy-with-authentication.patch
new file mode 100644
index 000000000..1e5a98655
--- /dev/null
+++ b/src/patches/fireinfo-support-upstream-proxy-with-authentication.patch
@@ -0,0 +1,61 @@
+From 74c5e2adc61548900e256c3e58a0a63f5b3c2a4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter.mueller(a)link38.eu>
+Date: Tue, 4 Dec 2018 18:13:15 +0100
+Subject: [PATCH] fireinfo: support upstream proxy with authentication
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fireinfo could not send its profile to https://fireinfo.ipfire.org/
+if the machine is behind an upstream proxy which requires username
+and password. This is fixed by tweaking urllib2's opening handler.
+
+To apply this on existing installations, the fireinfo package
+needs to be shipped during an update.
+
+The third version of this patch fixes bogus indention, assembles
+proxy authentication string more readable and preserves HTTP
+proxy handler.
+
+Fixes #11905
+
+Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
+Cc: Michael Tremer <michael.tremer(a)ipfire.org>
+Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
+---
+ src/sendprofile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 src/sendprofile
+
+diff --git a/src/sendprofile b/src/sendprofile
+old mode 100644
+new mode 100755
+index b836567..3ce68b9
+--- a/src/sendprofile
++++ b/src/sendprofile
+@@ -73,10 +73,20 @@ def send_profile(profile):
+ request.add_header("User-Agent", "fireinfo/%s" % fireinfo.__version__)
+
+ # Set upstream proxy if we have one.
+- # XXX this cannot handle authentication
+ proxy = get_upstream_proxy()
++
+ if proxy["host"]:
+- request.set_proxy(proxy["host"], "http")
++ # handling upstream proxies with authentication is more tricky...
++ if proxy["user"] and proxy["pass"]:
++ prx_auth_string = "http://%s:%s@%s/" % (proxy["user"], proxy["pass"], proxy["host"])
++
++ proxy_handler = urllib2.ProxyHandler({'http': prx_auth_string, 'https': prx_auth_string})
++ auth = urllib2.HTTPBasicAuthHandler()
++ opener = urllib2.build_opener(proxy_handler, auth, urllib2.HTTPHandler)
++ urllib2.install_opener(opener)
++ else:
++ request.set_proxy(proxy["host"], "http")
++ request.set_proxy(proxy["host"], "https")
+
+ try:
+ urllib2.urlopen(request, timeout=60)
+--
+2.6.3
+
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-12-11 20:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11 20:05 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de4f303186927ad1a7a8ff1ec221583d0f8ca047 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox