[Ipcop-svn] SF.net SVN: ipcop:[7382] ipcop/trunk

Sat, 29 Mar 2014 00:09:07 -0700 

Revision: 7382
          http://sourceforge.net/p/ipcop/svn/7382
Author:   owes
Date:     2014-03-29 07:08:34 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
Update squid to 3.3.12

Modified Paths:
--------------
    ipcop/trunk/lfs/squid
    ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
    ipcop/trunk/updates/2.1.3/information.xml
    ipcop/trunk/updates/2.1.3/setup

Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid       2014-03-29 07:04:06 UTC (rev 7381)
+++ ipcop/trunk/lfs/squid       2014-03-29 07:08:34 UTC (rev 7382)
@@ -33,12 +33,12 @@
 include Config
 
 PKG_NAME   = squid
-VER        = 3.3.11
+VER        = 3.3.12
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
 THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = http://www.squid-cache.org/Versions/v3/3.3
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -46,8 +46,8 @@
 
 # Used to include same timestamp for all
 # This is the release date
-DATESTAMP = "30 Nov 2013"
-TIMESTAMP = "15:12:00"
+DATESTAMP = "08 Mar 2014"
+TIMESTAMP = "22:24:00"
 
 ###############################################################################
 # Top-level Rules
@@ -57,7 +57,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = abf2b0fe128f73f5dc157e7e917949e0
+$(DL_FILE)_MD5 = 04b4c6efaa9b8d93d09538ac2f467b38
 
 install : $(TARGET)
 
@@ -86,7 +86,7 @@
 
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(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.cc

Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3      2014-03-29 07:04:06 UTC 
(rev 7381)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3      2014-03-29 07:08:34 UTC 
(rev 7382)
@@ -449,6 +449,10 @@
 /usr/lib/libsqlite3.so.0
 /usr/lib/libsqlite3.so.0.8.6
 ##
+## squid-3.3.12
+/usr/lib/squid/ntlm_smb_lm_auth
+/usr/sbin/squid
+##
 ## squid-langpack-20140220
 /usr/lib/squid/errors
 /usr/lib/squid/errors.ipcop

Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml   2014-03-29 07:04:06 UTC (rev 
7381)
+++ ipcop/trunk/updates/2.1.3/information.xml   2014-03-29 07:08:34 UTC (rev 
7382)
@@ -6,13 +6,14 @@
         <isoimages>no</isoimages>
         <description>Language updates.&lt;br /&gt;
         Add harfbuzz.&lt;br /&gt;
-        Upgrade apcid to 2.0.22, Archive-Zip to 1.37, bash to 4.3, bind to 
9.9.5, cairo to 1.12.16, coreutils to 8.22,
-        db to 6.0.30, e2fsprogs to 1.42.9,  ethtool to 3.13,
-        fcron to 3.1.2, freetype to 2.5.3, glib to 2.40.0, gnupg to 1.4.16,
-        iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to 
3.2.24, libpng to 1.6.10, logrotate to 3.8.7,
+        Upgrade apcid to 2.0.22, Archive-Zip to 1.37, bash to 4.3, bind to 
9.9.5,
+        cairo to 1.12.16, coreutils to 8.22, db to 6.0.30, e2fsprogs to 
1.42.9,  ethtool to 3.13,
+        fcron to 3.1.2, freetype to 2.5.3, glib to 2.40.0, gnupg to 1.4.16, 
iproute2 to 3.12.0,
+        libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to 3.2.24, libpng to 
1.6.10, logrotate to 3.8.7,
         Net-DNS to 0.74, Net-SSLeay to 1.58, openldap to 2.4.39, openssh to 
6.6p1, openssl to 1.0.1f,
-        pango to 1.36.3, pcre to 8.34, procps to 3.3.9, psmisc to 22.21, 
readline to 6.3, sqlite to 3.8.4.2, 
-        squid-langpack to 20140220, tzdata to 2014b, ulogd to 2.0.3, 
util-linux to 2.24.1.</description>
+        pango to 1.36.3, pcre to 8.34, procps to 3.3.9, psmisc to 22.21, 
readline to 6.3,
+        sqlite to 3.8.4.2, squid to 3.3.12, squid-langpack to 20140220,
+        tzdata to 2014b, ulogd to 2.0.3, util-linux to 2.24.1.</description>
         <previousversion>2.1.2</previousversion>
         <installdate>INSTALLDATE</installdate>
         <latest />

Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup     2014-03-29 07:04:06 UTC (rev 7381)
+++ ipcop/trunk/updates/2.1.3/setup     2014-03-29 07:08:34 UTC (rev 7382)
@@ -176,6 +176,9 @@
 # Use new sshd
 /usr/local/bin/restartssh
 
+# restart squid (helper checks whether squid is enabled)
+/usr/local/bin/restartsquid
+
 # Patch fcrontab for new fcron
 /bin/sed -i -e 's|^!mailto.*|#!mailto()|g' /var/spool/cron/root.orig
 # Patch frontab for renamed makegraphs

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to