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 c75f5126071dec23b877875feb8beb2c6c59de46 (commit) via 7c0fce586f18ab3df70de1138f85b5bfc72e1a6e (commit) via fd4f39f210c9555a0708af20e316f3d773d6b99b (commit) via 725e3869f4bd93dfc3d6a9d0fc24e61e638a451a (commit) from 32e754c1b2572ff4d4312c83d0fc72bd791a11af (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 c75f5126071dec23b877875feb8beb2c6c59de46 Merge: 7c0fce5 32e754c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 5 16:43:42 2011 +0200
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
commit 7c0fce586f18ab3df70de1138f85b5bfc72e1a6e Merge: 6dd8a47 fd4f39f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 5 16:43:15 2011 +0200
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/52/filelists/files | 1 + config/rootfiles/core/{50 => 52}/filelists/squid | 0 html/cgi-bin/proxy.cgi | 1 + lfs/squid | 4 ++-- 4 files changed, 4 insertions(+), 2 deletions(-) copy config/rootfiles/core/{50 => 52}/filelists/squid (100%)
Difference in files: diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index 331514d..a0f0ef5 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -4,3 +4,4 @@ etc/rc.d/init.d/console usr/local/sbin/setup usr/local/bin/setddns.pl srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/52/filelists/squid b/config/rootfiles/core/52/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/52/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index a0aa1ac..6d0fe54 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3147,6 +3147,7 @@ END
if ($proxysettings{'AUTH_METHOD'} eq 'ldap') { + print FILE "auth_param basic utf8 on\n"; print FILE "auth_param basic program $authdir/squid_ldap_auth -b "$proxysettings{'LDAP_BASEDN'}""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D "$proxysettings{'LDAP_BINDDN_USER'}""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } diff --git a/lfs/squid b/lfs/squid index f85b5e9..a29109f 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 3.1.14 +VER = 3.1.15
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8f82a451b04c3bf3c29202c548d2f2dd +$(DL_FILE)_MD5 = 73d47363ddccc400bc0fb2f814c63a92
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree