[arch-commits] Commit in squid/repos/extra-i686 (14 files)
Eric Bélanger
eric at archlinux.org
Sun Aug 21 04:55:27 UTC 2011
Date: Sunday, August 21, 2011 @ 00:55:26
Author: eric
Revision: 135983
archrelease: copy trunk to extra-i686
Added:
squid/repos/extra-i686/PKGBUILD
(from rev 135982, squid/trunk/PKGBUILD)
squid/repos/extra-i686/squid
(from rev 135982, squid/trunk/squid)
squid/repos/extra-i686/squid-3.1.11-unused.patch
(from rev 135982, squid/trunk/squid-3.1.11-unused.patch)
squid/repos/extra-i686/squid.conf.d
(from rev 135982, squid/trunk/squid.conf.d)
squid/repos/extra-i686/squid.cron
(from rev 135982, squid/trunk/squid.cron)
squid/repos/extra-i686/squid.install
(from rev 135982, squid/trunk/squid.install)
squid/repos/extra-i686/squid.pam
(from rev 135982, squid/trunk/squid.pam)
Deleted:
squid/repos/extra-i686/PKGBUILD
squid/repos/extra-i686/squid
squid/repos/extra-i686/squid-3.1.11-unused.patch
squid/repos/extra-i686/squid.conf.d
squid/repos/extra-i686/squid.cron
squid/repos/extra-i686/squid.install
squid/repos/extra-i686/squid.pam
---------------------------+
PKGBUILD | 135 +++++-----
squid | 104 +++----
squid-3.1.11-unused.patch | 592 ++++++++++++++++++++++----------------------
squid.conf.d | 8
squid.cron | 8
squid.install | 52 +--
squid.pam | 8
7 files changed, 455 insertions(+), 452 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-21 04:54:25 UTC (rev 135982)
+++ PKGBUILD 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.14
-pkgrel=1
-pkgdesc="A full-featured Web proxy cache server."
-arch=(i686 x86_64)
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl')
-makedepends=('libcap>=2.16')
-license=('GPL')
-backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
-install=squid.install
-source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
- squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
-md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' 'd213b0cc1db72b749bb8c88716fdab39'
- '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777'
- '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # gcc 4.6 doesn't support -fhuge-objects.
- sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
- # fix compile errors with gcc 4.6
- # http://bugs.squid-cache.org/show_bug.cgi?id=3178
- #patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch
-
- # fix cache_dir, cache_dir size, and effective group.
- sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
- sed '/^#cache_dir/ s/100/256/
- /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
- ./configure --prefix=/usr --datadir=/usr/share/squid \
- --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
- --localstatedir=/var --with-logdir=/var/log/squid \
- --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \
- --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \
- --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
- --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
- --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
- --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \
- --enable-linux-netfilter --enable-ident-lookups \
- --enable-useragent-log --enable-cache-digests --enable-referer-log \
- --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \
- --with-filedescriptors=4096 --with-large-files --enable-arp-acl \
- --with-default-user=proxy \
- --enable-async-io --enable-truncate
-#some versions have build problems with both async and truncate enabled:
-# --enable-async-io
-
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid
- install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid
- install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid
- install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid
-}
-# vim: ts=2 sw=2 et ft=sh
Copied: squid/repos/extra-i686/PKGBUILD (from rev 135982, squid/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=squid
+pkgver=3.1.14
+pkgrel=2
+pkgdesc="A full-featured Web proxy cache server."
+arch=(i686 x86_64)
+url="http://www.squid-cache.org"
+depends=('openssl' 'pam' 'cron' 'perl' 'libtool')
+makedepends=('libcap>=2.16')
+license=('GPL')
+backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
+install=squid.install
+source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2
+ squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch)
+md5sums=('8f82a451b04c3bf3c29202c548d2f2dd'
+ 'd213b0cc1db72b749bb8c88716fdab39'
+ '2383772ef94efddc7b920628bc7ac5b0'
+ '270977cdd9b47ef44c0c427ab9034777'
+ '5e17df989e2a74e869790c066f61225b'
+ '8e59089e4a8556fc18df51979f1cfbff')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # gcc 4.6 doesn't support -fhuge-objects.
+ sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
+ # fix compile errors with gcc 4.6
+ # http://bugs.squid-cache.org/show_bug.cgi?id=3178
+ #patch -Np1 -i "${srcdir}"/squid-3.1.11-unused.patch
+
+ # fix cache_dir, cache_dir size, and effective group.
+ sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
+ sed '/^#cache_dir/ s/100/256/
+ /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
+
+ ./configure --prefix=/usr --datadir=/usr/share/squid \
+ --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
+ --localstatedir=/var --with-logdir=/var/log/squid \
+ --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \
+ --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \
+ --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
+ --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
+ --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
+ --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \
+ --enable-linux-netfilter --enable-ident-lookups \
+ --enable-useragent-log --enable-cache-digests --enable-referer-log \
+ --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \
+ --with-filedescriptors=4096 --with-large-files --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io --enable-truncate
+#some versions have build problems with both async and truncate enabled:
+# --enable-async-io
+
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid
+ install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid
+ install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid
+ install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid
+}
+# vim: ts=2 sw=2 et ft=sh
Deleted: squid
===================================================================
--- squid 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SQUID_ARGS=
-[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/squid`
-case "$1" in
-
- start)
- if [ ! -f /var/cache/squid/swap.state ]; then
- stat_busy "Creating squid's swap directories"
- /usr/sbin/squid -z
- fi
- stat_busy "Starting squid"
- [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon squid
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping squid"
- [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- # wait for squid to shutdown so we can safely do a restart
- while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do
- stat_append "."
- sleep 3
- done
- rm_daemon squid
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 5
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Copied: squid/repos/extra-i686/squid (from rev 135982, squid/trunk/squid)
===================================================================
--- squid (rev 0)
+++ squid 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# source application-specific settings
+SQUID_ARGS=
+[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/squid`
+case "$1" in
+
+ start)
+ if [ ! -f /var/cache/squid/swap.state ]; then
+ stat_busy "Creating squid's swap directories"
+ /usr/sbin/squid -z
+ fi
+ stat_busy "Starting squid"
+ [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon squid
+ stat_done
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping squid"
+ [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ # wait for squid to shutdown so we can safely do a restart
+ while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do
+ stat_append "."
+ sleep 3
+ done
+ rm_daemon squid
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 5
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Deleted: squid-3.1.11-unused.patch
===================================================================
--- squid-3.1.11-unused.patch 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid-3.1.11-unused.patch 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,296 +0,0 @@
-diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c
---- squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused 2011-02-10 10:04:50.422205003 +0100
-+++ squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-02-10 10:05:48.020204424 +0100
-@@ -219,7 +219,6 @@ main(int argc, char **argv)
- int use_extension_dn = 0;
- int strip_nt_domain = 0;
- int strip_kerberos_realm = 0;
-- int err = 0;
-
- setbuf(stdout, NULL);
-
-@@ -602,7 +601,6 @@ error:
- tryagain = 1;
- }
- }
-- err = 0;
- }
- if (ld)
- ldap_unbind(ld);
-diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
---- squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused 2011-02-10 09:57:56.170205002 +0100
-+++ squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-02-10 09:58:39.039205002 +0100
-@@ -141,7 +141,6 @@ ntlmMakeChallenge(struct ntlm_challenge
- {
- static unsigned hash;
- int r;
-- char *d;
- int i;
-
- debug("ntlmMakeChallenge: flg %08x\n", flags);
-@@ -158,7 +157,6 @@ ntlmMakeChallenge(struct ntlm_challenge
- chal->flags = flags;
- chal->unknown[6] = htole16(0x003a);
-
-- d = (char *) chal + 48;
- i = 0;
-
- if (authenticate_ntlm_domain != NULL)
-diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/src/auth/negotiate/auth_negotiate.cc
---- squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused 2011-02-10 07:57:04.293205769 +0100
-+++ squid-3.1.11/src/auth/negotiate/auth_negotiate.cc 2011-02-10 07:58:22.643205463 +0100
-@@ -544,7 +544,6 @@ AuthNegotiateUserRequest::module_start(R
- {
- authenticateStateData *r = NULL;
- static char buf[MAX_AUTHTOKEN_LEN];
-- negotiate_user_t *negotiate_user;
- AuthUser *auth_user = user();
-
- assert(data);
-@@ -552,8 +551,6 @@ AuthNegotiateUserRequest::module_start(R
- assert(auth_user);
- assert(auth_user->auth_type == AUTH_NEGOTIATE);
-
-- negotiate_user = dynamic_cast<negotiate_user_t *>(user());
--
- debugs(29, 8, "AuthNegotiateUserRequest::module_start: auth state is '" << auth_state << "'");
-
- if (negotiateConfig.authenticate == NULL) {
-@@ -655,12 +652,10 @@ AuthNegotiateUserRequest::authenticate(H
-
- /** \todo rename this!! */
- AuthUser *local_auth_user;
-- negotiate_user_t *negotiate_user;
-
- local_auth_user = user();
- assert(local_auth_user);
- assert(local_auth_user->auth_type == AUTH_NEGOTIATE);
-- negotiate_user = dynamic_cast<negotiate_user_t *>(local_auth_user);
- assert (this);
-
- /** Check that we are in the client side, where we can generate
-diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/ntlm/auth_ntlm.cc
---- squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused 2011-02-10 08:07:21.181205066 +0100
-+++ squid-3.1.11/src/auth/ntlm/auth_ntlm.cc 2011-02-10 08:08:52.188204812 +0100
-@@ -460,7 +460,6 @@ AuthNTLMUserRequest::module_start(RH * h
- {
- authenticateStateData *r = NULL;
- static char buf[8192];
-- ntlm_user_t *ntlm_user;
- AuthUser *auth_user = user();
-
- assert(data);
-@@ -468,8 +467,6 @@ AuthNTLMUserRequest::module_start(RH * h
- assert(auth_user);
- assert(auth_user->auth_type == AUTH_NTLM);
-
-- ntlm_user = dynamic_cast<ntlm_user_t *>(user());
--
- debugs(29, 8, "AuthNTLMUserRequest::module_start: auth state is '" << auth_state << "'");
-
- if (ntlmConfig.authenticate == NULL) {
-@@ -572,12 +569,10 @@ AuthNTLMUserRequest::authenticate(HttpRe
-
- /* TODO: rename this!! */
- AuthUser *local_auth_user;
-- ntlm_user_t *ntlm_user;
-
- local_auth_user = user();
- assert(local_auth_user);
- assert(local_auth_user->auth_type == AUTH_NTLM);
-- ntlm_user = dynamic_cast<ntlm_user_t *>(local_auth_user);
- assert (this);
-
- /* Check that we are in the client side, where we can generate
-diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc
---- squid-3.1.11/src/auth/User.cc.unused 2011-02-10 08:14:08.623207125 +0100
-+++ squid-3.1.11/src/auth/User.cc 2011-02-10 08:14:52.305205340 +0100
-@@ -158,13 +158,11 @@ AuthUser::CachedACLsReset()
- */
- AuthUserHashPointer *usernamehash;
- AuthUser *auth_user;
-- char const *username = NULL;
- debugs(29, 3, "AuthUser::CachedACLsReset: Flushing the ACL caches for all users.");
- hash_first(proxy_auth_username_cache);
-
- while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) {
- auth_user = usernamehash->user();
-- username = auth_user->username();
- /* free cached acl results */
- aclCacheMatchFlush(&auth_user->proxy_match_cache);
-
-diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_side_reply.cc
---- squid-3.1.11/src/client_side_reply.cc.unused 2011-02-10 08:28:52.861205280 +0100
-+++ squid-3.1.11/src/client_side_reply.cc 2011-02-10 08:37:22.530205334 +0100
-@@ -1056,14 +1056,6 @@ clientReplyContext::storeNotOKTransferDo
- /* haven't found end of headers yet */
- return 0;
-
-- int sending = SENDING_BODY;
--
-- if (curReply->sline.status == HTTP_NO_CONTENT ||
-- curReply->sline.status == HTTP_NOT_MODIFIED ||
-- curReply->sline.status < HTTP_OK ||
-- http->request->method == METHOD_HEAD)
-- sending = SENDING_HDRSONLY;
--
- /*
- * Figure out how much data we are supposed to send.
- * If we are sending a body and we don't have a content-length,
-@@ -2028,13 +2020,10 @@ clientReplyContext::sendMoreData (StoreI
-
- char *buf = next()->readBuffer.data;
-
-- char *body_buf = buf;
--
- if (buf != result.data) {
- /* we've got to copy some data */
- assert(result.length <= next()->readBuffer.length);
- xmemcpy(buf, result.data, result.length);
-- body_buf = buf;
- }
-
- #if USE_ZPH_QOS
-diff -up squid-3.1.11/src/comm.cc.unused squid-3.1.11/src/comm.cc
---- squid-3.1.11/src/comm.cc.unused 2011-02-10 08:20:37.942204904 +0100
-+++ squid-3.1.11/src/comm.cc 2011-02-10 08:21:43.940205003 +0100
-@@ -706,7 +706,6 @@ comm_openex(int sock_type,
- {
- int new_socket;
- fde *F = NULL;
-- int tos = 0;
- struct addrinfo *AI = NULL;
-
- PROF_start(comm_open);
-@@ -756,11 +755,6 @@ comm_openex(int sock_type,
-
- debugs(50, 3, "comm_openex: Opened socket FD " << new_socket << " : family=" << AI->ai_family << ", type=" << AI->ai_socktype << ", protocol=" << AI->ai_protocol );
-
-- /* set TOS if needed */
-- if (TOS && comm_set_tos(new_socket, TOS) ) {
-- tos = TOS;
-- }
--
- if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() )
- comm_set_v6only(new_socket, 1);
-
-diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc
---- squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused 2011-02-10 09:42:07.029205002 +0100
-+++ squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-02-10 09:42:37.171205594 +0100
-@@ -123,7 +123,6 @@ AIODiskIOStrategy::callback()
- void *cbdata;
- int callback_valid;
- void *buf;
-- int filedescriptor;
- async_queue_entry_t *aqe;
- async_queue_entry_type_t type;
-
-@@ -148,7 +147,6 @@ AIODiskIOStrategy::callback()
- /* Get the callback parameters */
- freefunc = aqe->aq_e_free;
- buf = aqe->aq_e_buf;
-- filedescriptor = aqe->aq_e_fd;
- type = aqe->aq_e_type;
- callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata);
- AIODiskFile * theFile = NULL;
-diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.cc
---- squid-3.1.11/src/dns_internal.cc.unused 2011-02-10 09:15:50.096204636 +0100
-+++ squid-3.1.11/src/dns_internal.cc 2011-02-10 09:16:39.951205440 +0100
-@@ -1360,8 +1360,6 @@ idnsInit(void)
- CBDATA_INIT_TYPE(idns_query);
-
- if (DnsSocketA < 0 && DnsSocketB < 0) {
-- int port;
--
- IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
-
- if (!Config.Addrs.udp_outgoing.IsNoAddr())
-@@ -1397,12 +1395,10 @@ idnsInit(void)
- * statement. Doing so messes up the internal Debug::level
- */
- if (DnsSocketB >= 0) {
-- port = comm_local_port(DnsSocketB);
- debugs(78, 1, "DNS Socket created at " << addrB << ", FD " << DnsSocketB);
- commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
- }
- if (DnsSocketA >= 0) {
-- port = comm_local_port(DnsSocketA);
- debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << DnsSocketA);
- commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
- }
-diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
---- squid-3.1.11/src/errorpage.cc.unused 2011-02-10 08:42:44.965205002 +0100
-+++ squid-3.1.11/src/errorpage.cc 2011-02-10 08:43:50.597205002 +0100
-@@ -515,7 +515,6 @@ int
- ErrorState::Dump(MemBuf * mb)
- {
- MemBuf str;
-- const char *p = NULL; /* takes priority over mb if set */
- char ntoabuf[MAX_IPSTRLEN];
-
- str.reset();
-@@ -570,10 +569,6 @@ ErrorState::Dump(MemBuf * mb)
- packerToMemInit(&pck, &str);
- request->header.packInto(&pck);
- packerClean(&pck);
-- } else if (request_hdrs) {
-- p = request_hdrs;
-- } else {
-- p = "[none]";
- }
-
- str.Printf("\r\n");
-diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc
---- squid-3.1.11/src/fqdncache.cc.unused 2011-02-10 09:29:50.426205631 +0100
-+++ squid-3.1.11/src/fqdncache.cc 2011-02-10 09:30:57.407204865 +0100
-@@ -497,10 +497,8 @@ fqdncacheHandleReply(void *data, char *r
- fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error_message)
- #endif
- {
-- int n;
- fqdncache_entry *f;
- static_cast<generic_cbdata *>(data)->unwrap(&f);
-- n = ++FqdncacheStats.replies;
- const int age = f->age();
- statHistCount(&statCounter.dns.svc_time, age);
- #if USE_DNSSERVERS
-diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
---- squid-3.1.11/src/ftp.cc.unused 2011-02-10 09:22:52.118205001 +0100
-+++ squid-3.1.11/src/ftp.cc 2011-02-10 09:23:56.324205001 +0100
-@@ -2453,7 +2453,6 @@ ftpReadEPSV(FtpStateData* ftpState)
- {
- int code = ftpState->ctrl.replycode;
- char h1, h2, h3, h4;
-- int n;
- u_short port;
- IpAddress ipa_remote;
- int fd = ftpState->data.fd;
-@@ -2521,7 +2520,7 @@ ftpReadEPSV(FtpStateData* ftpState)
-
- buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(");
-
-- n = sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
-+ sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
-
- if (h1 != h2 || h1 != h3 || h1 != h4) {
- debugs(9, DBG_IMPORTANT, "Invalid EPSV reply from " <<
-diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc
---- squid-3.1.11/src/neighbors.cc.unused 2011-02-10 09:36:24.432205185 +0100
-+++ squid-3.1.11/src/neighbors.cc 2011-02-10 09:36:51.359204616 +0100
-@@ -827,7 +827,6 @@ neighborsDigestSelect(HttpRequest * requ
- peer *best_p = NULL;
- #if USE_CACHE_DIGESTS
-
-- const cache_key *key;
- int best_rtt = 0;
- int choice_count = 0;
- int ichoice_count = 0;
-@@ -838,8 +837,6 @@ neighborsDigestSelect(HttpRequest * requ
- if (!request->flags.hierarchical)
- return NULL;
-
-- key = storeKeyPublicByRequest(request);
--
- for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) {
- lookup_t lookup;
-
Copied: squid/repos/extra-i686/squid-3.1.11-unused.patch (from rev 135982, squid/trunk/squid-3.1.11-unused.patch)
===================================================================
--- squid-3.1.11-unused.patch (rev 0)
+++ squid-3.1.11-unused.patch 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,296 @@
+diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c
+--- squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused 2011-02-10 10:04:50.422205003 +0100
++++ squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-02-10 10:05:48.020204424 +0100
+@@ -219,7 +219,6 @@ main(int argc, char **argv)
+ int use_extension_dn = 0;
+ int strip_nt_domain = 0;
+ int strip_kerberos_realm = 0;
+- int err = 0;
+
+ setbuf(stdout, NULL);
+
+@@ -602,7 +601,6 @@ error:
+ tryagain = 1;
+ }
+ }
+- err = 0;
+ }
+ if (ld)
+ ldap_unbind(ld);
+diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
+--- squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused 2011-02-10 09:57:56.170205002 +0100
++++ squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-02-10 09:58:39.039205002 +0100
+@@ -141,7 +141,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+ {
+ static unsigned hash;
+ int r;
+- char *d;
+ int i;
+
+ debug("ntlmMakeChallenge: flg %08x\n", flags);
+@@ -158,7 +157,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+ chal->flags = flags;
+ chal->unknown[6] = htole16(0x003a);
+
+- d = (char *) chal + 48;
+ i = 0;
+
+ if (authenticate_ntlm_domain != NULL)
+diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/src/auth/negotiate/auth_negotiate.cc
+--- squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused 2011-02-10 07:57:04.293205769 +0100
++++ squid-3.1.11/src/auth/negotiate/auth_negotiate.cc 2011-02-10 07:58:22.643205463 +0100
+@@ -544,7 +544,6 @@ AuthNegotiateUserRequest::module_start(R
+ {
+ authenticateStateData *r = NULL;
+ static char buf[MAX_AUTHTOKEN_LEN];
+- negotiate_user_t *negotiate_user;
+ AuthUser *auth_user = user();
+
+ assert(data);
+@@ -552,8 +551,6 @@ AuthNegotiateUserRequest::module_start(R
+ assert(auth_user);
+ assert(auth_user->auth_type == AUTH_NEGOTIATE);
+
+- negotiate_user = dynamic_cast<negotiate_user_t *>(user());
+-
+ debugs(29, 8, "AuthNegotiateUserRequest::module_start: auth state is '" << auth_state << "'");
+
+ if (negotiateConfig.authenticate == NULL) {
+@@ -655,12 +652,10 @@ AuthNegotiateUserRequest::authenticate(H
+
+ /** \todo rename this!! */
+ AuthUser *local_auth_user;
+- negotiate_user_t *negotiate_user;
+
+ local_auth_user = user();
+ assert(local_auth_user);
+ assert(local_auth_user->auth_type == AUTH_NEGOTIATE);
+- negotiate_user = dynamic_cast<negotiate_user_t *>(local_auth_user);
+ assert (this);
+
+ /** Check that we are in the client side, where we can generate
+diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/ntlm/auth_ntlm.cc
+--- squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused 2011-02-10 08:07:21.181205066 +0100
++++ squid-3.1.11/src/auth/ntlm/auth_ntlm.cc 2011-02-10 08:08:52.188204812 +0100
+@@ -460,7 +460,6 @@ AuthNTLMUserRequest::module_start(RH * h
+ {
+ authenticateStateData *r = NULL;
+ static char buf[8192];
+- ntlm_user_t *ntlm_user;
+ AuthUser *auth_user = user();
+
+ assert(data);
+@@ -468,8 +467,6 @@ AuthNTLMUserRequest::module_start(RH * h
+ assert(auth_user);
+ assert(auth_user->auth_type == AUTH_NTLM);
+
+- ntlm_user = dynamic_cast<ntlm_user_t *>(user());
+-
+ debugs(29, 8, "AuthNTLMUserRequest::module_start: auth state is '" << auth_state << "'");
+
+ if (ntlmConfig.authenticate == NULL) {
+@@ -572,12 +569,10 @@ AuthNTLMUserRequest::authenticate(HttpRe
+
+ /* TODO: rename this!! */
+ AuthUser *local_auth_user;
+- ntlm_user_t *ntlm_user;
+
+ local_auth_user = user();
+ assert(local_auth_user);
+ assert(local_auth_user->auth_type == AUTH_NTLM);
+- ntlm_user = dynamic_cast<ntlm_user_t *>(local_auth_user);
+ assert (this);
+
+ /* Check that we are in the client side, where we can generate
+diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc
+--- squid-3.1.11/src/auth/User.cc.unused 2011-02-10 08:14:08.623207125 +0100
++++ squid-3.1.11/src/auth/User.cc 2011-02-10 08:14:52.305205340 +0100
+@@ -158,13 +158,11 @@ AuthUser::CachedACLsReset()
+ */
+ AuthUserHashPointer *usernamehash;
+ AuthUser *auth_user;
+- char const *username = NULL;
+ debugs(29, 3, "AuthUser::CachedACLsReset: Flushing the ACL caches for all users.");
+ hash_first(proxy_auth_username_cache);
+
+ while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) {
+ auth_user = usernamehash->user();
+- username = auth_user->username();
+ /* free cached acl results */
+ aclCacheMatchFlush(&auth_user->proxy_match_cache);
+
+diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_side_reply.cc
+--- squid-3.1.11/src/client_side_reply.cc.unused 2011-02-10 08:28:52.861205280 +0100
++++ squid-3.1.11/src/client_side_reply.cc 2011-02-10 08:37:22.530205334 +0100
+@@ -1056,14 +1056,6 @@ clientReplyContext::storeNotOKTransferDo
+ /* haven't found end of headers yet */
+ return 0;
+
+- int sending = SENDING_BODY;
+-
+- if (curReply->sline.status == HTTP_NO_CONTENT ||
+- curReply->sline.status == HTTP_NOT_MODIFIED ||
+- curReply->sline.status < HTTP_OK ||
+- http->request->method == METHOD_HEAD)
+- sending = SENDING_HDRSONLY;
+-
+ /*
+ * Figure out how much data we are supposed to send.
+ * If we are sending a body and we don't have a content-length,
+@@ -2028,13 +2020,10 @@ clientReplyContext::sendMoreData (StoreI
+
+ char *buf = next()->readBuffer.data;
+
+- char *body_buf = buf;
+-
+ if (buf != result.data) {
+ /* we've got to copy some data */
+ assert(result.length <= next()->readBuffer.length);
+ xmemcpy(buf, result.data, result.length);
+- body_buf = buf;
+ }
+
+ #if USE_ZPH_QOS
+diff -up squid-3.1.11/src/comm.cc.unused squid-3.1.11/src/comm.cc
+--- squid-3.1.11/src/comm.cc.unused 2011-02-10 08:20:37.942204904 +0100
++++ squid-3.1.11/src/comm.cc 2011-02-10 08:21:43.940205003 +0100
+@@ -706,7 +706,6 @@ comm_openex(int sock_type,
+ {
+ int new_socket;
+ fde *F = NULL;
+- int tos = 0;
+ struct addrinfo *AI = NULL;
+
+ PROF_start(comm_open);
+@@ -756,11 +755,6 @@ comm_openex(int sock_type,
+
+ debugs(50, 3, "comm_openex: Opened socket FD " << new_socket << " : family=" << AI->ai_family << ", type=" << AI->ai_socktype << ", protocol=" << AI->ai_protocol );
+
+- /* set TOS if needed */
+- if (TOS && comm_set_tos(new_socket, TOS) ) {
+- tos = TOS;
+- }
+-
+ if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() )
+ comm_set_v6only(new_socket, 1);
+
+diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc
+--- squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused 2011-02-10 09:42:07.029205002 +0100
++++ squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-02-10 09:42:37.171205594 +0100
+@@ -123,7 +123,6 @@ AIODiskIOStrategy::callback()
+ void *cbdata;
+ int callback_valid;
+ void *buf;
+- int filedescriptor;
+ async_queue_entry_t *aqe;
+ async_queue_entry_type_t type;
+
+@@ -148,7 +147,6 @@ AIODiskIOStrategy::callback()
+ /* Get the callback parameters */
+ freefunc = aqe->aq_e_free;
+ buf = aqe->aq_e_buf;
+- filedescriptor = aqe->aq_e_fd;
+ type = aqe->aq_e_type;
+ callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata);
+ AIODiskFile * theFile = NULL;
+diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.cc
+--- squid-3.1.11/src/dns_internal.cc.unused 2011-02-10 09:15:50.096204636 +0100
++++ squid-3.1.11/src/dns_internal.cc 2011-02-10 09:16:39.951205440 +0100
+@@ -1360,8 +1360,6 @@ idnsInit(void)
+ CBDATA_INIT_TYPE(idns_query);
+
+ if (DnsSocketA < 0 && DnsSocketB < 0) {
+- int port;
+-
+ IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
+
+ if (!Config.Addrs.udp_outgoing.IsNoAddr())
+@@ -1397,12 +1395,10 @@ idnsInit(void)
+ * statement. Doing so messes up the internal Debug::level
+ */
+ if (DnsSocketB >= 0) {
+- port = comm_local_port(DnsSocketB);
+ debugs(78, 1, "DNS Socket created at " << addrB << ", FD " << DnsSocketB);
+ commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
+ }
+ if (DnsSocketA >= 0) {
+- port = comm_local_port(DnsSocketA);
+ debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << DnsSocketA);
+ commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
+ }
+diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
+--- squid-3.1.11/src/errorpage.cc.unused 2011-02-10 08:42:44.965205002 +0100
++++ squid-3.1.11/src/errorpage.cc 2011-02-10 08:43:50.597205002 +0100
+@@ -515,7 +515,6 @@ int
+ ErrorState::Dump(MemBuf * mb)
+ {
+ MemBuf str;
+- const char *p = NULL; /* takes priority over mb if set */
+ char ntoabuf[MAX_IPSTRLEN];
+
+ str.reset();
+@@ -570,10 +569,6 @@ ErrorState::Dump(MemBuf * mb)
+ packerToMemInit(&pck, &str);
+ request->header.packInto(&pck);
+ packerClean(&pck);
+- } else if (request_hdrs) {
+- p = request_hdrs;
+- } else {
+- p = "[none]";
+ }
+
+ str.Printf("\r\n");
+diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc
+--- squid-3.1.11/src/fqdncache.cc.unused 2011-02-10 09:29:50.426205631 +0100
++++ squid-3.1.11/src/fqdncache.cc 2011-02-10 09:30:57.407204865 +0100
+@@ -497,10 +497,8 @@ fqdncacheHandleReply(void *data, char *r
+ fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error_message)
+ #endif
+ {
+- int n;
+ fqdncache_entry *f;
+ static_cast<generic_cbdata *>(data)->unwrap(&f);
+- n = ++FqdncacheStats.replies;
+ const int age = f->age();
+ statHistCount(&statCounter.dns.svc_time, age);
+ #if USE_DNSSERVERS
+diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
+--- squid-3.1.11/src/ftp.cc.unused 2011-02-10 09:22:52.118205001 +0100
++++ squid-3.1.11/src/ftp.cc 2011-02-10 09:23:56.324205001 +0100
+@@ -2453,7 +2453,6 @@ ftpReadEPSV(FtpStateData* ftpState)
+ {
+ int code = ftpState->ctrl.replycode;
+ char h1, h2, h3, h4;
+- int n;
+ u_short port;
+ IpAddress ipa_remote;
+ int fd = ftpState->data.fd;
+@@ -2521,7 +2520,7 @@ ftpReadEPSV(FtpStateData* ftpState)
+
+ buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(");
+
+- n = sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
++ sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4);
+
+ if (h1 != h2 || h1 != h3 || h1 != h4) {
+ debugs(9, DBG_IMPORTANT, "Invalid EPSV reply from " <<
+diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc
+--- squid-3.1.11/src/neighbors.cc.unused 2011-02-10 09:36:24.432205185 +0100
++++ squid-3.1.11/src/neighbors.cc 2011-02-10 09:36:51.359204616 +0100
+@@ -827,7 +827,6 @@ neighborsDigestSelect(HttpRequest * requ
+ peer *best_p = NULL;
+ #if USE_CACHE_DIGESTS
+
+- const cache_key *key;
+ int best_rtt = 0;
+ int choice_count = 0;
+ int ichoice_count = 0;
+@@ -838,8 +837,6 @@ neighborsDigestSelect(HttpRequest * requ
+ if (!request->flags.hierarchical)
+ return NULL;
+
+- key = storeKeyPublicByRequest(request);
+-
+ for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) {
+ lookup_t lookup;
+
Deleted: squid.conf.d
===================================================================
--- squid.conf.d 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid.conf.d 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
Copied: squid/repos/extra-i686/squid.conf.d (from rev 135982, squid/trunk/squid.conf.d)
===================================================================
--- squid.conf.d (rev 0)
+++ squid.conf.d 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to squid
+#
+SQUID_ARGS="-sYC"
Deleted: squid.cron
===================================================================
--- squid.cron 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid.cron 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-PID=`pidof -o %PPID /usr/sbin/squid`
-[ -n "$PID" ] && /usr/sbin/squid -k rotate
Copied: squid/repos/extra-i686/squid.cron (from rev 135982, squid/trunk/squid.cron)
===================================================================
--- squid.cron (rev 0)
+++ squid.cron 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+PID=`pidof -o %PPID /usr/sbin/squid`
+[ -n "$PID" ] && /usr/sbin/squid -k rotate
Deleted: squid.install
===================================================================
--- squid.install 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid.install 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,26 +0,0 @@
-post_install() {
- if [ -z "$(grep ^proxy: /etc/group)" ]; then
- usr/sbin/groupadd -g 15 proxy &>/dev/null
- fi
-
- id proxy &>/dev/null || \
- usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
- chown proxy.proxy var/{cache,log}/squid
-
- cat << EOF
-Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-EOF
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/userdel proxy &> /dev/null
- if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
- usr/sbin/groupdel proxy &>/dev/null
- fi
-}
-
Copied: squid/repos/extra-i686/squid.install (from rev 135982, squid/trunk/squid.install)
===================================================================
--- squid.install (rev 0)
+++ squid.install 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,26 @@
+post_install() {
+ if [ -z "$(grep ^proxy: /etc/group)" ]; then
+ usr/sbin/groupadd -g 15 proxy &>/dev/null
+ fi
+
+ id proxy &>/dev/null || \
+ usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
+
+ chown proxy.proxy var/{cache,log}/squid
+
+ cat << EOF
+Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
+EOF
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/userdel proxy &> /dev/null
+ if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
+ usr/sbin/groupdel proxy &>/dev/null
+ fi
+}
+
Deleted: squid.pam
===================================================================
--- squid.pam 2011-08-21 04:54:25 UTC (rev 135982)
+++ squid.pam 2011-08-21 04:55:26 UTC (rev 135983)
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth required pam_unix.so
-account required pam_unix.so
Copied: squid/repos/extra-i686/squid.pam (from rev 135982, squid/trunk/squid.pam)
===================================================================
--- squid.pam (rev 0)
+++ squid.pam 2011-08-21 04:55:26 UTC (rev 135983)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
More information about the arch-commits
mailing list