Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv24521

Added Files:
        squid-unified.info squid-unified.patch 
Log Message:
to 10.7 (and new upstream)

--- NEW FILE: squid-unified.info ---
Info4: <<
Package: squid-unified
Version: 3.1.14
Revision: 1
Epoch: 1
Description: Proxy caching server
License: GPL
Maintainer: Benjamin Reed <[email protected]>

Depends: daemonic
BuildDepends: <<
        fink (>= 0.29.7-1),
        openssl100-dev
<<
Replaces: <<
        squid (<< %v-%r),
        squid-ssl (<< %v-%r)
<<

Source: http://www.squid-cache.org/Versions/v3/3.1/squid-%v.tar.bz2
Source-MD5: 8f82a451b04c3bf3c29202c548d2f2dd
PatchFile: squid-unified.patch
PatchFile-MD5: 1a782a775681ea4f36a387bf4be0c682

SetCPPFLAGS: -I%p/include
SetLDFLAGS: -L%p/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetLIBS: true
UseMaxBuildJobs: true
ConfigureParams: <<
--disable-dependency-tracking \
--disable-shared \
--enable-static \
\
--enable-async-io \
--enable-auth \
--enable-basic-auth-helpers \
--enable-disk-io \
--enable-carp \
--enable-delay-pools \
--enable-digest-auth-helpers \
--enable-external-acl-helpers \
--enable-htcp \
--enable-icap-client \
--enable-icmp \
--enable-ipfw-transparent \
--enable-kqueue \
--enable-negotiate-auth-helpers \
--enable-ntlm-auth-helpers \
--enable-referer-log \
--enable-removal-policies \
--enable-snmp \
--enable-ssl \
--enable-useragent-log \
--enable-x-accelerator-vary \
\
--disable-poll \
--disable-arp-acl \
\
--with-aio \
--with-large-files \
--with-openssl=%p/lib/openssl \
--with-pthreads \
\
--mandir=%p/share/man \
--libexecdir=%p/sbin
<<
CompileScript: <<
        #!/bin/sh -ex
#       darwin_vers=`uname -r | cut -d. -f1`
#       if [ "$darwin_vers" = 11 ]; then
#               export CC=gcc-4.2
#               export CXX=g++-4.2
#       fi

        perl -pi -e "s,newLength < 0 \|\| ,," src/String.cci
        perl -pi -e "s,class AuthUserHashPointer,struct AuthUserHashPointer," 
src/auth/Gadgets.h
        perl -pi -e "s,class AuthUserHashPointer,struct AuthUserHashPointer," 
src/auth/User.h
        perl -pi -e "s,s->s = host,(s->s = host)," src/cache_cf.cc
#       perl -pi -e "s,if (crlfBeg > 0),// if (crlfBeg > 0)," 
src/ChunkedCodingParser.cc
#       perl -pi -e "s|; //theTrailer.append|// ; //theTrailer.append|" 
src/ChunkedCodingParser.cc

        export lt_cv_sys_max_cmd_len=65536
        ./configure %c
        make DEFAULT_SWAP_DIR=%p/var/cache/squid 
DEFAULT_LOG_PREFIX=%p/var/log/squid DEFAULT_MIB_PATH=%p/share/doc/%n 
DEFAULT_PID_FILE=%p/var/run/squid.pid
<<

InstallScript: <<
make -j1 install DESTDIR=%d DEFAULT_SWAP_DIR=%p/var/cache/squid 
DEFAULT_LOG_PREFIX=%p/var/log/squid DEFAULT_MIB_PATH=%p/share/doc/%n 
DEFAULT_PID_FILE=%p/var/run/squid.pid
install -d -m 755 -o nobody %i/var/cache/squid
install -d -m 755 -o nobody %i/var/log/squid
install -d -m 755 %i/share/doc/%n
mv %i/share/mib.txt %i/share/doc/%n/mib.txt
install -d -m 755 %i/etc
cp src/squid.conf.default %i/etc/squid.conf
cp src/mime.conf.default %i/etc/mime.conf
cp tools/cachemgr.conf %i/etc/cachemgr.conf
<<
DocFiles: CO* CREDITS ChangeLog QUICKSTART README* RELEASENOTES* SPONSORS
SplitOff: <<
        Package: squid
        Depends: <<
                %N (= %e:%v-%r),
                fink-obsolete-packages
        <<
        Description: OBSOLETE use package 'squid-unified' instead
        DocFiles: CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog INSTALL 
QUICKSTART README RELEASENOTES.html SPONSORS
<<
SplitOff2: <<
        Package: squid-ssl
        Depends: <<
                %N (= %e:%v-%r),
                fink-obsolete-packages
        <<
        Description: OBSOLETE use package 'squid-unified' instead
        DocFiles: CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog INSTALL 
QUICKSTART README RELEASENOTES.html SPONSORS
<<

PostInstScript: <<
if [ ! -d %p/var/cache/squid/00 ]; then
        chown -R nobody "%p/var/cache/squid" "%p/var/log/squid"
        %p/sbin/squid -z || :
fi
<<
PreRmScript: <<
# clean up the old one
daemonic remove squid >/dev/null 2>&1 || :

if [ $1 != "upgrade" ]; then
        # remove the daemonic entry if we're uninstalling
        daemonic remove squid-unified
fi
<<
ConfFiles: <<
        %p/etc/cachemgr.conf
        %p/etc/mime.conf
        %p/etc/squid.conf
<<
DaemonicFile: <<
<service>
<description>Squid proxy cache</description>
<message>Squid proxy cache</message>

<daemon name="squid">
<executable checkexit="true">%p/sbin/squid</executable>
<configfile>%p/etc/squid.conf</configfile>
<pidfile>%p/var/run/squid.pid</pidfile>
</daemon>

</service>
<<

Homepage: http://www.squid-cache.org/
DescDetail: <<
Squid is a high-performance proxy caching server for Web clients,
supporting FTP, gopher, and HTTP data objects. Unlike traditional
caching software, Squid handles all requests in a single,
non-blocking, I/O-driven process. Squid keeps meta data and especially
hot objects cached in RAM, caches DNS lookups, supports non-blocking
DNS lookups, and implements negative caching of failed requests.
<<
DescPackaging: <<
The only changes made to the default configuration is to enable local
access to the squid proxy (ie, connections from localhost).  By
default, squid is configured to listen on port 3128 for proxy
connections.  To change this, add or change the http_port line to the
port you want squid to listen on.
<<
<<


--- NEW FILE: squid-unified.patch ---
diff -Naur squid-3.1.14.orig/errors/Makefile.in squid-3.1.14/errors/Makefile.in
--- squid-3.1.14.orig/errors/Makefile.in        2011-07-24 15:11:59.000000000 
-0700
+++ squid-3.1.14/errors/Makefile.in     2011-07-24 17:23:45.000000000 -0700
@@ -474,7 +474,7 @@
 
 install-dvi-am:
 
-install-exec-am: install-exec-local
+install-exec-am:
 
 install-html: install-html-am
 
@@ -590,7 +590,7 @@
        done; \
        $(INSTALL_DATA) $(srcdir)/TRANSLATORS 
$(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \
        $(INSTALL_DATA) $(srcdir)/COPYRIGHT 
$(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \
-       $(INSTALL_DATA) $(srcdir)/errorpage.css 
$(DESTDIR)$(DEFAULT_STYLESHEET).default; \
+#      $(INSTALL_DATA) $(srcdir)/errorpage.css 
$(DESTDIR)$(DEFAULT_STYLESHEET).default; \
        $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" 
"$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
 
 uninstall-local:
diff -Naur squid-3.1.14.orig/helpers/basic_auth/MSNT/Makefile.in 
squid-3.1.14/helpers/basic_auth/MSNT/Makefile.in
--- squid-3.1.14.orig/helpers/basic_auth/MSNT/Makefile.in       2011-07-24 
15:11:59.000000000 -0700
+++ squid-3.1.14/helpers/basic_auth/MSNT/Makefile.in    2011-07-24 
17:23:45.000000000 -0700
@@ -718,13 +718,13 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am:
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
+install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
diff -Naur squid-3.1.14.orig/src/ChunkedCodingParser.cc 
squid-3.1.14/src/ChunkedCodingParser.cc
--- squid-3.1.14.orig/src/ChunkedCodingParser.cc        2011-07-24 
15:11:59.000000000 -0700
+++ squid-3.1.14/src/ChunkedCodingParser.cc     2011-07-24 17:31:57.000000000 
-0700
@@ -143,9 +143,9 @@
     size_t crlfEnd = 0;
 
     if (findCrlf(crlfBeg, crlfEnd)) {
-        if (crlfBeg > 0)
-
-            ; //theTrailer.append(theIn->content(), crlfEnd);
+//        if (crlfBeg > 0)
+//
+//            ; //theTrailer.append(theIn->content(), crlfEnd);
 
         theIn->consume(crlfEnd);
 
diff -Naur squid-3.1.14.orig/src/Makefile.in squid-3.1.14/src/Makefile.in
--- squid-3.1.14.orig/src/Makefile.in   2011-07-24 15:11:59.000000000 -0700
+++ squid-3.1.14/src/Makefile.in        2011-07-24 17:23:45.000000000 -0700
@@ -4722,14 +4722,14 @@
 
 info-am:
 
-install-data-am: install-data-local install-dataDATA
+install-data-am: install-dataDATA
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
-       install-sbinPROGRAMS install-sysconfDATA
+       install-sbinPROGRAMS
 
 install-html: install-html-recursive
 
diff -Naur squid-3.1.14.orig/src/base/TidyPointer.h 
squid-3.1.14/src/base/TidyPointer.h
--- squid-3.1.14.orig/src/base/TidyPointer.h    2011-07-24 15:11:59.000000000 
-0700
+++ squid-3.1.14/src/base/TidyPointer.h 2011-07-24 17:23:45.000000000 -0700
@@ -5,6 +5,10 @@
 #ifndef SQUID_BASE_TIDYPOINTER_H
 #define SQUID_BASE_TIDYPOINTER_H
 
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
+
 /**
  * A pointer that deletes the object it points to when the pointer's owner or
  * context is gone. Similar to std::auto_ptr but without confusing assignment
diff -Naur squid-3.1.14.orig/src/event.cc squid-3.1.14/src/event.cc
--- squid-3.1.14.orig/src/event.cc      2011-07-24 15:11:59.000000000 -0700
+++ squid-3.1.14/src/event.cc   2011-07-24 17:37:52.000000000 -0700
@@ -238,7 +238,7 @@
 EventScheduler::checkEvents(int timeout)
 {
 
-    struct ev_entry *event = NULL;
+    class ev_entry *event = NULL;
 
     if (NULL == tasks)
         return checkDelay();
@@ -291,7 +291,7 @@
 EventScheduler::dump(StoreEntry * sentry)
 {
 
-    struct ev_entry *e = tasks;
+    class ev_entry *e = tasks;
 
     if (last_event_ran)
         storeAppendPrintf(sentry, "Last event to run: %s\n\n", last_event_ran);
@@ -314,7 +314,7 @@
 EventScheduler::find(EVH * func, void * arg)
 {
 
-    struct ev_entry *event;
+    class ev_entry *event;
 
     for (event = tasks; event != NULL; event = event->next) {
         if (event->func == func && event->arg == arg)
@@ -337,9 +337,9 @@
     // must fire in the submission order. We cannot use current_dtime for them
     // because it may decrease if system clock is adjusted backwards.
     const double timestamp = when > 0.0 ? current_dtime + when : 0;
-    struct ev_entry *event = new ev_entry(name, func, arg, timestamp, weight, 
cbdata);
+    class ev_entry *event = new ev_entry(name, func, arg, timestamp, weight, 
cbdata);
 
-    struct ev_entry **E;
+    class ev_entry **E;
     debugs(41, 7, HERE << "schedule: Adding '" << name << "', in " << when << 
" seconds");
     /* Insert after the last event with the same or earlier time */
 
diff -Naur squid-3.1.14.orig/src/gopher.cc squid-3.1.14/src/gopher.cc
--- squid-3.1.14.orig/src/gopher.cc     2011-07-24 15:11:59.000000000 -0700
+++ squid-3.1.14/src/gopher.cc  2011-07-24 17:42:20.000000000 -0700
@@ -822,7 +822,7 @@
         IOStats.Gopher.read_hist[bin]++;
     }
 
-    if (flag != COMM_OK || len < 0) {
+    if (flag != COMM_OK) {
         debugs(50, 1, "gopherReadReply: error reading: " << xstrerror());
 
         if (ignoreErrno(errno)) {
diff -Naur squid-3.1.14.orig/src/ssl/gadgets.cc squid-3.1.14/src/ssl/gadgets.cc
--- squid-3.1.14.orig/src/ssl/gadgets.cc        2011-07-24 15:11:59.000000000 
-0700
+++ squid-3.1.14/src/ssl/gadgets.cc     2011-07-24 17:23:45.000000000 -0700
@@ -2,7 +2,7 @@
  * $Id$
  */
 
-#include "config.h"
+#include "include/config.h"
 #include "ssl/gadgets.h"
 
 /**
diff -Naur squid-3.1.14.orig/src/wccp2.cc squid-3.1.14/src/wccp2.cc
--- squid-3.1.14.orig/src/wccp2.cc      2011-07-24 15:11:59.000000000 -0700
+++ squid-3.1.14/src/wccp2.cc   2011-07-24 17:49:15.000000000 -0700
@@ -301,7 +301,7 @@
     uint32_t received_id;
 };
 
-static struct wccp2_router_id_element_t wccp2_router_id_element;
+// static struct wccp2_router_id_element_t wccp2_router_id_element;
 
 /** \interface WCCpv2_Protocol
  * Sect 5.6.9 Capabilities Info Component
@@ -834,7 +834,7 @@
         wccp2_cache_view_header.cache_view_type = htons(WCCP2_WC_VIEW_INFO);
 
         wccp2_cache_view_header.cache_view_length = 
htons(sizeof(wccp2_cache_view_header) - 4 +
-                sizeof(wccp2_cache_view_info) + (wccp2_numrouters * 
sizeof(wccp2_router_id_element)));
+                sizeof(wccp2_cache_view_info) + (wccp2_numrouters * 
sizeof(wccp2_router_id_element_t)));
 
         wccp2_cache_view_header.cache_view_version = htonl(1);
 
diff -Naur squid-3.1.14.orig/tools/Makefile.in squid-3.1.14/tools/Makefile.in
--- squid-3.1.14.orig/tools/Makefile.in 2011-07-24 15:11:59.000000000 -0700
+++ squid-3.1.14/tools/Makefile.in      2011-07-24 17:23:45.000000000 -0700
@@ -1008,7 +1008,7 @@
 
 info-am:
 
-install-data-am: install-data-local install-man
+install-data-am: install-man
 
 install-dvi: install-dvi-recursive
 


------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to