Revision: 7497
http://sourceforge.net/p/ipcop/svn/7497
Author: owes
Date: 2014-04-24 13:07:27 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Update squid to 3.4.4
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/squid
ipcop/trunk/lfs/squid
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
ipcop/trunk/updates/2.1.5/information.xml
ipcop/trunk/updates/2.1.5/setup
Modified: ipcop/trunk/config/rootfiles/common/squid
===================================================================
--- ipcop/trunk/config/rootfiles/common/squid 2014-04-22 16:41:58 UTC (rev
7496)
+++ ipcop/trunk/config/rootfiles/common/squid 2014-04-24 13:07:27 UTC (rev
7497)
@@ -20,10 +20,10 @@
#usr/lib/squid/basic_smb_auth
#usr/lib/squid/basic_smb_auth.sh
#usr/lib/squid/cachemgr.cgi
-usr/lib/squid/digest_edirectory_auth
usr/lib/squid/digest_file_auth
usr/lib/squid/digest_ldap_auth
usr/lib/squid/diskd
+usr/lib/squid/ext_ldap_group_acl
usr/lib/squid/helper-mux.pl
usr/lib/squid/icons
usr/lib/squid/icons/SN.png
@@ -84,6 +84,7 @@
usr/lib/squid/negotiate_kerberos_auth
usr/lib/squid/negotiate_kerberos_auth_test
usr/lib/squid/ntlm_smb_lm_auth
+#usr/lib/squid/storeid_file_rewrite
usr/lib/squid/unlinkd
#usr/lib/squid/url_fake_rewrite
#usr/lib/squid/url_fake_rewrite.sh
@@ -94,9 +95,11 @@
#usr/share/man/man8/basic_radius_auth.8
#usr/share/man/man8/cachemgr.cgi.8
#usr/share/man/man8/digest_file_auth.8
+#usr/share/man/man8/ext_ldap_group_acl.8
#usr/share/man/man8/log_db_daemon.8
#usr/share/man/man8/negotiate_kerberos_auth.8
#usr/share/man/man8/squid.8
+#usr/share/man/man8/storeid_file_rewrite.8
#usr/var
#usr/var/cache
#usr/var/cache/squid
Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid 2014-04-22 16:41:58 UTC (rev 7496)
+++ ipcop/trunk/lfs/squid 2014-04-24 13:07:27 UTC (rev 7497)
@@ -33,21 +33,21 @@
include Config
PKG_NAME = squid
-VER = 3.3.12
+VER = 3.4.4
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.xz
-DL_FROM = http://www.squid-cache.org/Versions/v3/3.3
+DL_FROM = http://www.squid-cache.org/Versions/v3/3.4
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
ERRMSG_DIR = /usr/lib/squid/errors
# Used to include same timestamp for all
# This is the release date
-DATESTAMP = "08 Mar 2014"
-TIMESTAMP = "22:24:00"
+DATESTAMP = "09 Mar 2014"
+TIMESTAMP = "11:05:00"
###############################################################################
# Top-level Rules
@@ -57,7 +57,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 04b4c6efaa9b8d93d09538ac2f467b38
+$(DL_FILE)_MD5 = dc2bcb967fc6b15bbbc6b961010c0c00
install : $(TARGET)
@@ -87,6 +87,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_more-disable-ipv6.patch
# Use release date instead of __DATE__ and __TIME__ so everyone that
compile has same md5
cd $(DIR_APP) && sed -i -e 's|__DATE__|$(DATESTAMP)|' \
-e 's|__TIME__|$(TIMESTAMP)|'
helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
@@ -94,6 +95,7 @@
# Unclear why we would be alone requiring this
cd $(DIR_APP) && ac_cv_func_tempnam=yes ./configure \
--prefix=/usr \
+ --disable-arch-native \
--sysconfdir=/etc/squid \
--datadir=/usr/lib/squid \
--libexecdir=/usr/lib/squid \
@@ -113,7 +115,8 @@
--enable-auth-basic=NCSA,SMB,MSNT,LDAP,RADIUS \
--enable-auth-ntlm=smb_lm \
--enable-auth-negotiate=kerberos \
- --enable-external-acl-helpers=ldap_group \
+ --enable-external-acl-helpers=LDAP_group \
+ --disable-ipv6 \
--disable-wccp \
--disable-wccpv2
cd $(DIR_APP) && make -j $(PARALLELISM)
Modified: ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-22 16:41:58 UTC
(rev 7496)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-24 13:07:27 UTC
(rev 7497)
@@ -188,6 +188,22 @@
/usr/lib/libsqlite3.so.0
/usr/lib/libsqlite3.so.0.8.6
##
+## squid-3.4.4
+/usr/lib/squid/basic_ldap_auth
+/usr/lib/squid/basic_msnt_auth
+/usr/lib/squid/basic_ncsa_auth
+/usr/lib/squid/basic_radius_auth
+/usr/lib/squid/digest_file_auth
+/usr/lib/squid/digest_ldap_auth
+/usr/lib/squid/diskd
+/usr/lib/squid/log_file_daemon
+/usr/lib/squid/negotiate_kerberos_auth
+/usr/lib/squid/negotiate_kerberos_auth_test
+/usr/lib/squid/ntlm_smb_lm_auth
+/usr/lib/squid/unlinkd
+/usr/sbin/squid
+/usr/lib/squid/ext_ldap_group_acl
+##
## squidGuard-1.5-beta (patched)
/usr/bin/squidGuard
##
Modified: ipcop/trunk/updates/2.1.5/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.5/information.xml 2014-04-22 16:41:58 UTC (rev
7496)
+++ ipcop/trunk/updates/2.1.5/information.xml 2014-04-24 13:07:27 UTC (rev
7497)
@@ -9,7 +9,7 @@
Upgrade apache to 2.2.27, conntrack-tools to 1.4.2, dhcpcd to 6.3.2,
dnsmasq to 2.69, iproute2 to 3.14.0,
e1000e network driver to 3.0.4.1, igb network driver to 5.2.5, linux
kernel to 3.4.87,
openswan to 2.6.41, openvpn to 2.3.3, ppp to 2.4.6, pptp to 1.8.0,
rrdtool to 1.4.8,
- sqlite to 3.8.4.3, usb-modeswitch to 2.1.1, usb-modeswitch-data to
20140327.
+ sqlite to 3.8.4.3, squid to 3.4.4, usb-modeswitch to 2.1.1,
usb-modeswitch-data to 20140327.
<br />
Upgrade Perl modules DBD-SQLite to 1.42, DBI to 1.631, IO-Socket-SSL
to 1.981, NetAddr-IP to 4.073.
<br />
Modified: ipcop/trunk/updates/2.1.5/setup
===================================================================
--- ipcop/trunk/updates/2.1.5/setup 2014-04-22 16:41:58 UTC (rev 7496)
+++ ipcop/trunk/updates/2.1.5/setup 2014-04-24 13:07:27 UTC (rev 7497)
@@ -127,6 +127,9 @@
/usr/local/bin/openvpnctrl --restart
fi
+# restart squid (helper checks whether squid is enabled)
+/usr/local/bin/restartsquid
+
#####
#
# End of version specific handling. Continue with universal stuff.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
