Revision: 7149
http://sourceforge.net/p/ipcop/svn/7149
Author: dotzball
Date: 2013-11-20 12:56:45 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
Update squid to 3.3.10.
squid.conf needs some tweaking, there is a warning with current config.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/squid
ipcop/trunk/lfs/squid
ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1
ipcop/trunk/updates/2.1.1/information.xml
ipcop/trunk/updates/2.1.1/setup
Modified: ipcop/trunk/config/rootfiles/common/squid
===================================================================
--- ipcop/trunk/config/rootfiles/common/squid 2013-11-20 12:55:33 UTC (rev
7148)
+++ ipcop/trunk/config/rootfiles/common/squid 2013-11-20 12:56:45 UTC (rev
7149)
@@ -1,5 +1,3 @@
-# squid 3.1.12
-#
#etc/squid
#etc/squid/cachemgr.conf
#etc/squid/cachemgr.conf.default
@@ -12,64 +10,109 @@
etc/squid/squid.conf
#etc/squid/squid.conf.default
#etc/squid/squid.conf.documented
+#usr/bin/purge
#usr/bin/squidclient
#usr/lib/squid
+usr/lib/squid/basic_db_auth
+usr/lib/squid/basic_fake_auth
+usr/lib/squid/basic_getpwnam_auth
+usr/lib/squid/basic_ldap_auth
+usr/lib/squid/basic_msnt_auth
+usr/lib/squid/basic_msnt_multi_domain_auth
+usr/lib/squid/basic_ncsa_auth
+usr/lib/squid/basic_nis_auth
+usr/lib/squid/basic_pop3_auth
+usr/lib/squid/basic_radius_auth
+#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/helper-mux.pl
usr/lib/squid/icons
-usr/lib/squid/icons/anthony-binhex.gif
-usr/lib/squid/icons/anthony-bomb.gif
-usr/lib/squid/icons/anthony-box.gif
-usr/lib/squid/icons/anthony-box2.gif
-usr/lib/squid/icons/anthony-c.gif
-usr/lib/squid/icons/anthony-compressed.gif
-usr/lib/squid/icons/anthony-dir.gif
-usr/lib/squid/icons/anthony-dirup.gif
-usr/lib/squid/icons/anthony-dvi.gif
-usr/lib/squid/icons/anthony-f.gif
-usr/lib/squid/icons/anthony-image.gif
-usr/lib/squid/icons/anthony-image2.gif
-usr/lib/squid/icons/anthony-layout.gif
-usr/lib/squid/icons/anthony-link.gif
-usr/lib/squid/icons/anthony-movie.gif
-usr/lib/squid/icons/anthony-pdf.gif
-usr/lib/squid/icons/anthony-portal.gif
-usr/lib/squid/icons/anthony-ps.gif
-usr/lib/squid/icons/anthony-quill.gif
-usr/lib/squid/icons/anthony-script.gif
-usr/lib/squid/icons/anthony-sound.gif
-usr/lib/squid/icons/anthony-tar.gif
-usr/lib/squid/icons/anthony-tex.gif
-usr/lib/squid/icons/anthony-text.gif
-usr/lib/squid/icons/anthony-unknown.gif
-usr/lib/squid/icons/anthony-xbm.gif
-usr/lib/squid/icons/anthony-xpm.gif
+usr/lib/squid/icons/SN.png
+usr/lib/squid/icons/silk
+usr/lib/squid/icons/silk/application.png
+usr/lib/squid/icons/silk/arrow_up.png
+usr/lib/squid/icons/silk/bomb.png
+usr/lib/squid/icons/silk/box.png
+usr/lib/squid/icons/silk/bricks.png
+usr/lib/squid/icons/silk/bullet_red.png
+usr/lib/squid/icons/silk/cd.png
+usr/lib/squid/icons/silk/chart_line.png
+usr/lib/squid/icons/silk/compress.png
+usr/lib/squid/icons/silk/computer_link.png
+usr/lib/squid/icons/silk/css.png
+usr/lib/squid/icons/silk/cup.png
+usr/lib/squid/icons/silk/database.png
+usr/lib/squid/icons/silk/database_table.png
+usr/lib/squid/icons/silk/drive_disk.png
+usr/lib/squid/icons/silk/film.png
+usr/lib/squid/icons/silk/film_key.png
+usr/lib/squid/icons/silk/folder.png
+usr/lib/squid/icons/silk/folder_table.png
+usr/lib/squid/icons/silk/image.png
+usr/lib/squid/icons/silk/information.png
+usr/lib/squid/icons/silk/layers.png
+usr/lib/squid/icons/silk/layout.png
+usr/lib/squid/icons/silk/link.png
+usr/lib/squid/icons/silk/music.png
+usr/lib/squid/icons/silk/package.png
+usr/lib/squid/icons/silk/package_go.png
+usr/lib/squid/icons/silk/page_code.png
+usr/lib/squid/icons/silk/page_excel.png
+usr/lib/squid/icons/silk/page_green.png
+usr/lib/squid/icons/silk/page_white.png
+usr/lib/squid/icons/silk/page_white_acrobat.png
+usr/lib/squid/icons/silk/page_white_c.png
+usr/lib/squid/icons/silk/page_white_cplusplus.png
+usr/lib/squid/icons/silk/page_white_flash.png
+usr/lib/squid/icons/silk/page_white_magnify.png
+usr/lib/squid/icons/silk/page_white_picture.png
+usr/lib/squid/icons/silk/page_white_powerpoint.png
+usr/lib/squid/icons/silk/page_white_stack.png
+usr/lib/squid/icons/silk/page_white_text.png
+usr/lib/squid/icons/silk/page_white_word.png
+usr/lib/squid/icons/silk/page_white_zip.png
+usr/lib/squid/icons/silk/page_world.png
+usr/lib/squid/icons/silk/photo.png
+usr/lib/squid/icons/silk/picture.png
+usr/lib/squid/icons/silk/plugin.png
+usr/lib/squid/icons/silk/plugin_add.png
+usr/lib/squid/icons/silk/script.png
+usr/lib/squid/icons/silk/script_gear.png
+usr/lib/squid/icons/silk/script_palette.png
+usr/lib/squid/log_db_daemon
+usr/lib/squid/log_file_daemon
#usr/lib/squid/mib.txt
-usr/lib/squid/msnt_auth
-usr/lib/squid/ncsa_auth
-usr/lib/squid/negotiate_kerb_auth
-usr/lib/squid/negotiate_kerb_auth_test
+usr/lib/squid/negotiate_kerberos_auth
+usr/lib/squid/negotiate_kerberos_auth_test
+usr/lib/squid/negotiate_wrapper_auth
+usr/lib/squid/ntlm_fake_auth
usr/lib/squid/ntlm_smb_lm_auth
-#usr/lib/squid/smb_auth
-#usr/lib/squid/smb_auth.sh
-usr/lib/squid/squid_kerb_auth
-usr/lib/squid/squid_kerb_auth_test
-usr/lib/squid/squid_ldap_auth
-usr/lib/squid/squid_ldap_group
-usr/lib/squid/squid_radius_auth
usr/lib/squid/unlinkd
+usr/lib/squid/url_fake_rewrite
+usr/lib/squid/url_fake_rewrite.sh
usr/sbin/squid
#usr/share/man/man1/squidclient.1
+#usr/share/man/man8/basic_db_auth.8
+#usr/share/man/man8/basic_getpwnam_auth.8
+#usr/share/man/man8/basic_ldap_auth.8
+#usr/share/man/man8/basic_ncsa_auth.8
+#usr/share/man/man8/basic_radius_auth.8
#usr/share/man/man8/cachemgr.cgi.8
-#usr/share/man/man8/ncsa_auth.8
+#usr/share/man/man8/digest_file_auth.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/squid_ldap_auth.8
-#usr/share/man/man8/squid_ldap_group.8
-#usr/share/man/man8/squid_radius_auth.8
#usr/var
#usr/var/cache
+#usr/var/cache/squid
#usr/var/logs
#usr/var/run
+#usr/var/run/squid
var/log/cache
var/log/squid
var/log/squid/access.log
Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid 2013-11-20 12:55:33 UTC (rev 7148)
+++ ipcop/trunk/lfs/squid 2013-11-20 12:56:45 UTC (rev 7149)
@@ -33,21 +33,21 @@
include Config
PKG_NAME = squid
-VER = 3.1.23
+VER = 3.3.10
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = http://www.squid-cache.org/Versions/v3/3.1
+DL_FROM = http://www.squid-cache.org/Versions/v3/3.3
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 = "Jan 09 2013"
-TIMESTAMP = "03:35:00"
+DATESTAMP = "03 Nov 2013"
+TIMESTAMP = "12:31:00"
###############################################################################
# Top-level Rules
@@ -57,7 +57,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7
+$(DL_FILE)_MD5 = ff69d08818ee008f66666f79bb27b9ee
install : $(TARGET)
@@ -89,7 +89,7 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
# 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.c
+ -e 's|__TIME__|$(TIMESTAMP)|'
helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
# ac_cv_func_tempnam=yes fix a compilation failure.
# Unclear why we would be alone requiring this
cd $(DIR_APP) && ac_cv_func_tempnam=yes ./configure \
@@ -107,12 +107,11 @@
--enable-arp-acl \
--enable-http-violations \
--enable-ident-lookups \
- --enable-auth=basic,ntlm,negotiate \
--enable-ntlm-fail-open \
--enable-linux-netfilter \
-
--enable-basic-auth-helpers=NCSA,SMB,MSNT,LDAP,squid_radius_auth \
- --enable-ntlm-auth-helpers=smb_lm \
- --enable-negotiate-auth-helpers=squid_kerb_auth \
+ --enable-basic-auth=NCSA,SMB,MSNT,LDAP,squid_radius_auth \
+ --enable-ntlm-auth=smb_lm \
+ --enable-negotiate-auth=squid_kerb_auth \
--enable-external-acl-helpers=ldap_group \
--disable-wccp \
--disable-wccpv2
Modified: ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1
===================================================================
--- ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1 2013-11-20 12:55:33 UTC
(rev 7148)
+++ ipcop/trunk/updates/2.1.1/ROOTFILES.i486-2.1.1 2013-11-20 12:56:45 UTC
(rev 7149)
@@ -10,20 +10,88 @@
/lib/modules/3.4-1/extra/solos-pci.ko.gz
/lib/modules/3.4-1/kernel
##
-## squid-3.1.23
+## squid-3.3.10
+/etc/squid/errorpage.css
+/etc/squid/mime.conf
/etc/squid/msntauth.conf
+/usr/lib/squid/basic_db_auth
+/usr/lib/squid/basic_fake_auth
+/usr/lib/squid/basic_getpwnam_auth
+/usr/lib/squid/basic_ldap_auth
+/usr/lib/squid/basic_msnt_auth
+/usr/lib/squid/basic_msnt_multi_domain_auth
+/usr/lib/squid/basic_ncsa_auth
+/usr/lib/squid/basic_nis_auth
+/usr/lib/squid/basic_pop3_auth
+/usr/lib/squid/basic_radius_auth
+/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/msnt_auth
-/usr/lib/squid/ncsa_auth
-/usr/lib/squid/negotiate_kerb_auth
-/usr/lib/squid/negotiate_kerb_auth_test
+/usr/lib/squid/helper-mux.pl
+/usr/lib/squid/icons
+/usr/lib/squid/icons/SN.png
+/usr/lib/squid/icons/silk
+/usr/lib/squid/icons/silk/application.png
+/usr/lib/squid/icons/silk/arrow_up.png
+/usr/lib/squid/icons/silk/bomb.png
+/usr/lib/squid/icons/silk/box.png
+/usr/lib/squid/icons/silk/bricks.png
+/usr/lib/squid/icons/silk/bullet_red.png
+/usr/lib/squid/icons/silk/cd.png
+/usr/lib/squid/icons/silk/chart_line.png
+/usr/lib/squid/icons/silk/compress.png
+/usr/lib/squid/icons/silk/computer_link.png
+/usr/lib/squid/icons/silk/css.png
+/usr/lib/squid/icons/silk/cup.png
+/usr/lib/squid/icons/silk/database.png
+/usr/lib/squid/icons/silk/database_table.png
+/usr/lib/squid/icons/silk/drive_disk.png
+/usr/lib/squid/icons/silk/film.png
+/usr/lib/squid/icons/silk/film_key.png
+/usr/lib/squid/icons/silk/folder.png
+/usr/lib/squid/icons/silk/folder_table.png
+/usr/lib/squid/icons/silk/image.png
+/usr/lib/squid/icons/silk/information.png
+/usr/lib/squid/icons/silk/layers.png
+/usr/lib/squid/icons/silk/layout.png
+/usr/lib/squid/icons/silk/link.png
+/usr/lib/squid/icons/silk/music.png
+/usr/lib/squid/icons/silk/package.png
+/usr/lib/squid/icons/silk/package_go.png
+/usr/lib/squid/icons/silk/page_code.png
+/usr/lib/squid/icons/silk/page_excel.png
+/usr/lib/squid/icons/silk/page_green.png
+/usr/lib/squid/icons/silk/page_white.png
+/usr/lib/squid/icons/silk/page_white_acrobat.png
+/usr/lib/squid/icons/silk/page_white_c.png
+/usr/lib/squid/icons/silk/page_white_cplusplus.png
+/usr/lib/squid/icons/silk/page_white_flash.png
+/usr/lib/squid/icons/silk/page_white_magnify.png
+/usr/lib/squid/icons/silk/page_white_picture.png
+/usr/lib/squid/icons/silk/page_white_powerpoint.png
+/usr/lib/squid/icons/silk/page_white_stack.png
+/usr/lib/squid/icons/silk/page_white_text.png
+/usr/lib/squid/icons/silk/page_white_word.png
+/usr/lib/squid/icons/silk/page_white_zip.png
+/usr/lib/squid/icons/silk/page_world.png
+/usr/lib/squid/icons/silk/photo.png
+/usr/lib/squid/icons/silk/picture.png
+/usr/lib/squid/icons/silk/plugin.png
+/usr/lib/squid/icons/silk/plugin_add.png
+/usr/lib/squid/icons/silk/script.png
+/usr/lib/squid/icons/silk/script_gear.png
+/usr/lib/squid/icons/silk/script_palette.png
+/usr/lib/squid/log_db_daemon
+/usr/lib/squid/log_file_daemon
+/usr/lib/squid/negotiate_kerberos_auth
+/usr/lib/squid/negotiate_kerberos_auth_test
+/usr/lib/squid/negotiate_wrapper_auth
+/usr/lib/squid/ntlm_fake_auth
/usr/lib/squid/ntlm_smb_lm_auth
-/usr/lib/squid/squid_kerb_auth
-/usr/lib/squid/squid_kerb_auth_test
-/usr/lib/squid/squid_ldap_auth
-/usr/lib/squid/squid_ldap_group
-/usr/lib/squid/squid_radius_auth
/usr/lib/squid/unlinkd
+/usr/lib/squid/url_fake_rewrite
+/usr/lib/squid/url_fake_rewrite.sh
/usr/sbin/squid
##
## squidGuard modified
Modified: ipcop/trunk/updates/2.1.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.1/information.xml 2013-11-20 12:55:33 UTC (rev
7148)
+++ ipcop/trunk/updates/2.1.1/information.xml 2013-11-20 12:56:45 UTC (rev
7149)
@@ -4,7 +4,7 @@
<releasedate>2012-11-dd</releasedate>
<size>0</size>
<description>Add URL filter.<br />
- Upgrade kernel to 3.4.62, squid to 3.1.23, squid-langpack to
20121005,
+ Upgrade kernel to 3.4.62, squid to 3.3.10, squid-langpack to
20121005,
tzdata to 2013h.
<br />
<b>Mandatory reboot after upgrade.</b>
Modified: ipcop/trunk/updates/2.1.1/setup
===================================================================
--- ipcop/trunk/updates/2.1.1/setup 2013-11-20 12:55:33 UTC (rev 7148)
+++ ipcop/trunk/updates/2.1.1/setup 2013-11-20 12:56:45 UTC (rev 7149)
@@ -64,6 +64,46 @@
# Remove old libraries (version specific)
# /bin/rm -f .....
+# Remove old squid files
+/bin/rm -f /usr/lib/squid/icons/anthony-binhex.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-bomb.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-box.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-box2.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-c.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-compressed.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-dir.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-dirup.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-dvi.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-f.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-image.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-image2.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-layout.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-link.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-movie.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-pdf.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-portal.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-ps.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-quill.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-script.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-sound.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-tar.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-tex.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-text.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-unknown.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-xbm.gif
+/bin/rm -f /usr/lib/squid/icons/anthony-xpm.gif
+/bin/rm -f /usr/lib/squid/msnt_auth
+/bin/rm -f /usr/lib/squid/ncsa_auth
+/bin/rm -f /usr/lib/squid/negotiate_kerb_auth
+/bin/rm -f /usr/lib/squid/negotiate_kerb_auth_test
+/bin/rm -f /usr/lib/squid/squid_kerb_auth
+/bin/rm -f /usr/lib/squid/squid_kerb_auth_test
+/bin/rm -f /usr/lib/squid/squid_ldap_auth
+/bin/rm -f /usr/lib/squid/squid_ldap_group
+/bin/rm -f /usr/lib/squid/squid_radius_auth
+
+
+
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
