Hello community,

here is the log from the commit of package squid3 for openSUSE:Factory
checked in at Wed May 4 11:47:32 CEST 2011.



--------
--- squid3/squid3.changes       2011-04-21 18:08:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/squid3/squid3.changes  2011-05-03 
19:58:47.000000000 +0200
@@ -1,0 +2,19 @@
+Tue May  3 17:57:56 UTC 2011 - ch...@computersalat.de
+
+- rework initscript
+  o rename source to squid.init
+  o ShouldStart winbind
+  o setup cache_dir only if defined in squid.conf
+    otherwise squid won't start, cause cache_dir is not set by default
+  o new vars to squid.sysconfig
+    default_opts '-sYD' -> '-sY' (-D obsolete)
+- remove author from spec
+- updated unused patch (idoen...@novell.com)
+
+-------------------------------------------------------------------
+Fri Apr 29 11:10:06 UTC 2011 - idoen...@novell.com
+
+- Add squid-3.1.11-unused.patch: remove write only variables to 
+  fix compilation with gcc 4.6 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  rc.squid

New:
----
  squid-3.1.11-unused.patch
  squid.init

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ squid3.spec ++++++
--- /var/tmp/diff_new_pack.5JV8or/_old  2011-05-04 11:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.5JV8or/_new  2011-05-04 11:43:31.000000000 +0200
@@ -22,7 +22,7 @@
 Name:           squid3
 Summary:        Squid Version 3 WWW Proxy Server
 Version:        3.1.12
-Release:        5
+Release:        7
 License:        GPLv2+
 Group:          Productivity/Networking/Web/Proxy
 AutoReqProv:    on
@@ -30,14 +30,14 @@
 Source0:        
http://www.squid-cache.org/Versions/v3/3.0/squid-%{version}.tar.bz2
 #%define       squid_ldapauth_version 1.3
 #Source1:      squid_ldapauth-%{squid_ldapauth_version}.tar.bz2
-Source2:        rc.squid
-Source3:        RELEASENOTES.html
+Source2:        RELEASENOTES.html
+Source3:        squid.init
+Source4:        squid.sysconfig
 Source5:        pam.squid
 Source6:        unsquid.pl
 Source7:        squid.logrotate
 Source9:        squid.permissions
-Source10:       squid.sysconfig
-Source11:       README.kerberos
+Source10:       README.kerberos
 #
 # the following patches are downloaded directly from the webserver
 # don't change the names for easier identification
@@ -55,6 +55,9 @@
 Patch102:       squid-3.1.12-no-sslv2.patch
 # make build compare happy - remove build dates
 Patch103:       squid-3.1.12-nobuilddates.patch
+# PATCH-FIX-UPSTREAM squid-3.1.11-unused.patch idoen...@suse.de -- Remove 
write-only variables to fix gcc 4.6 compilation
+Patch104:       squid-3.1.11-unused.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq
 PreReq:         permissions
@@ -95,16 +98,9 @@
 
 Most user-facing changes are reflected in squid.conf.
 
-
-
-Authors:
---------
-    Duane Wessels <wess...@ircache.net>
-    Henrik Nordstrom <h...@squid-cache.org>
-
 %prep
 %setup -q -n squid-%{version}
-%{__cp} %{S:11} .
+%{__cp} %{S:10} .
 # upstream patches after RELEASE
 #%patch0 -p0
 ##### other patches
@@ -116,6 +112,7 @@
 chmod a-x CREDITS
 %patch102
 %patch103
+%patch104 -p1
 
 %build
 %if 0%{suse_version} > 1010
@@ -198,8 +195,8 @@
 %install
 /usr/sbin/useradd -r -o -g nogroup -u 31 -s /bin/false -c "WWW-proxy squid" \
        -d /var/cache/squid squid 2> /dev/null || :
-mkdir -p %{buildroot}/var/{cache,log}/squid
-mkdir -p %{buildroot}/usr/sbin
+install -d %{buildroot}/var/{cache,log}/squid
+install -d %{buildroot}/usr/sbin
 make install DESTDIR=%{buildroot} SAMBAPREFIX=/usr
 mv %{buildroot}{/etc/squid/,/usr/share/squid/}mime.conf.default
 ln -s /etc/squid/mime.conf %{buildroot}/usr/share/squid # backward compatible
@@ -210,10 +207,10 @@
 install -d %{buildroot}%{_mandir}/man8/
 #chown squid:root -R %{buildroot}/var/{cache,log}/squid
 chmod 750 %{buildroot}/var/{cache,log}/squid
-install -D %{S:2} %{buildroot}/etc/init.d/squid
+install -D %{S:3} %{buildroot}/etc/init.d/squid
 ln -sf /etc/init.d/squid %{buildroot}/usr/sbin/rcsquid
-mkdir -p %{buildroot}/%{_mandir}/man8/
-install -m 644 doc/squid.8 %{buildroot}/%{_mandir}/man8/
+install -D -m644 %{S:4} %{buildroot}/var/adm/fillup-templates/sysconfig.squid
+install -D -m 644 doc/squid.8 %{buildroot}/%{_mandir}/man8/
 install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 
%{buildroot}/%{_mandir}/man8/
 install -m 644 helpers/basic_auth/LDAP/squid_ldap_auth.8 
%{buildroot}/%{_mandir}/man8/
 install -m 644 helpers/basic_auth/PAM/pam_auth.8 %{buildroot}/%{_mandir}/man8/
@@ -240,8 +237,7 @@
   fi
 done
 ln -sf /usr/share/squid/errors/de %{buildroot}%{squidconfdir}/errors
-install -d -m 755 %{buildroot}/var/adm/fillup-templates
-install -m 644 %{S:10} %{buildroot}/var/adm/fillup-templates/sysconfig.squid
+
 # remove unpackaged files
 rm -f %{buildroot}/usr/man/man8/*.8
 

++++++ squid-3.1.11-unused.patch ++++++
diff -ur squid-3.1.12/helpers/external_acl/ldap_group/squid_ldap_group.c 
squid-3.1.12-fixed/helpers/external_acl/ldap_group/squid_ldap_group.c
--- squid-3.1.12/helpers/external_acl/ldap_group/squid_ldap_group.c     
2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/helpers/external_acl/ldap_group/squid_ldap_group.c       
2011-05-03 15:47:49.120934481 +0200
@@ -219,7 +219,6 @@
     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 @@
                 tryagain = 1;
             }
         }
-        err = 0;
     }
     if (ld)
         ldap_unbind(ld);
diff -ur squid-3.1.12/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 
squid-3.1.12-fixed/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
--- squid-3.1.12/helpers/ntlm_auth/fakeauth/fakeauth_auth.c     2011-04-04 
03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/helpers/ntlm_auth/fakeauth/fakeauth_auth.c       
2011-05-03 15:47:49.121934482 +0200
@@ -141,7 +141,6 @@
 {
     static unsigned hash;
     int r;
-    char *d;
     int i;
 
     debug("ntlmMakeChallenge: flg %08x\n", flags);
@@ -158,7 +157,6 @@
     chal->flags = flags;
     chal->unknown[6] = htole16(0x003a);
 
-    d = (char *) chal + 48;
     i = 0;
 
     if (authenticate_ntlm_domain != NULL)
diff -ur squid-3.1.12/src/auth/negotiate/auth_negotiate.cc 
squid-3.1.12-fixed/src/auth/negotiate/auth_negotiate.cc
--- squid-3.1.12/src/auth/negotiate/auth_negotiate.cc   2011-04-04 
03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/auth/negotiate/auth_negotiate.cc     2011-05-03 
15:47:49.121934482 +0200
@@ -544,7 +544,6 @@
 {
     authenticateStateData *r = NULL;
     static char buf[MAX_AUTHTOKEN_LEN];
-    negotiate_user_t *negotiate_user;
     AuthUser *auth_user = user();
 
     assert(data);
@@ -552,8 +551,6 @@
     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 @@
 
     /** \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 -ur squid-3.1.12/src/auth/ntlm/auth_ntlm.cc 
squid-3.1.12-fixed/src/auth/ntlm/auth_ntlm.cc
--- squid-3.1.12/src/auth/ntlm/auth_ntlm.cc     2011-04-04 03:24:06.000000000 
+0200
+++ squid-3.1.12-fixed/src/auth/ntlm/auth_ntlm.cc       2011-05-03 
15:47:49.121934482 +0200
@@ -460,7 +460,6 @@
 {
     authenticateStateData *r = NULL;
     static char buf[8192];
-    ntlm_user_t *ntlm_user;
     AuthUser *auth_user = user();
 
     assert(data);
@@ -468,8 +467,6 @@
     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 @@
 
     /* 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 -ur squid-3.1.12/src/auth/User.cc squid-3.1.12-fixed/src/auth/User.cc
--- squid-3.1.12/src/auth/User.cc       2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/auth/User.cc 2011-05-03 15:47:49.122934483 +0200
@@ -158,13 +158,11 @@
      */
     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 -ur squid-3.1.12/src/client_side_reply.cc 
squid-3.1.12-fixed/src/client_side_reply.cc
--- squid-3.1.12/src/client_side_reply.cc       2011-04-04 03:24:06.000000000 
+0200
+++ squid-3.1.12-fixed/src/client_side_reply.cc 2011-05-03 15:47:49.122934483 
+0200
@@ -1056,14 +1056,6 @@
         /* 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,
@@ -2029,13 +2021,10 @@
 
     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
Only in squid-3.1.12-fixed/src: client_side_reply.cc.orig
diff -ur squid-3.1.12/src/comm.cc squid-3.1.12-fixed/src/comm.cc
--- squid-3.1.12/src/comm.cc    2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/comm.cc      2011-05-03 15:48:48.638934477 +0200
@@ -759,6 +759,7 @@
     /* set TOS if needed */
     if (TOS && comm_set_tos(new_socket, TOS) ) {
         tos = TOS;
+        (void)tos;
     }
 
     if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() )
diff -ur squid-3.1.12/src/DiskIO/AIO/AIODiskIOStrategy.cc 
squid-3.1.12-fixed/src/DiskIO/AIO/AIODiskIOStrategy.cc
--- squid-3.1.12/src/DiskIO/AIO/AIODiskIOStrategy.cc    2011-04-04 
03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/DiskIO/AIO/AIODiskIOStrategy.cc      2011-05-03 
15:47:49.123934483 +0200
@@ -123,7 +123,6 @@
     void *cbdata;
     int callback_valid;
     void *buf;
-    int filedescriptor;
     async_queue_entry_t *aqe;
     async_queue_entry_type_t type;
 
@@ -148,7 +147,6 @@
                 /* 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 -ur squid-3.1.12/src/dns_internal.cc squid-3.1.12-fixed/src/dns_internal.cc
--- squid-3.1.12/src/dns_internal.cc    2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/dns_internal.cc      2011-05-03 15:49:31.198934469 
+0200
@@ -1376,8 +1376,6 @@
     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())
@@ -1413,12 +1411,12 @@
          * statement. Doing so messes up the internal Debug::level
          */
         if (DnsSocketB >= 0) {
-            port = comm_local_port(DnsSocketB);
+            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);
+            comm_local_port(DnsSocketA);
             debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << 
DnsSocketA);
             commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
         }
diff -ur squid-3.1.12/src/errorpage.cc squid-3.1.12-fixed/src/errorpage.cc
--- squid-3.1.12/src/errorpage.cc       2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/errorpage.cc 2011-05-03 15:47:49.123934483 +0200
@@ -515,7 +515,6 @@
 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 @@
         packerToMemInit(&pck, &str);
         request->header.packInto(&pck);
         packerClean(&pck);
-    } else if (request_hdrs) {
-        p = request_hdrs;
-    } else {
-        p = "[none]";
     }
 
     str.Printf("\r\n");
diff -ur squid-3.1.12/src/fqdncache.cc squid-3.1.12-fixed/src/fqdncache.cc
--- squid-3.1.12/src/fqdncache.cc       2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/fqdncache.cc 2011-05-03 15:49:55.533934460 +0200
@@ -497,10 +497,9 @@
 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;
+    ++FqdncacheStats.replies;
     const int age = f->age();
     statHistCount(&statCounter.dns.svc_time, age);
 #if USE_DNSSERVERS
diff -ur squid-3.1.12/src/ftp.cc squid-3.1.12-fixed/src/ftp.cc
--- squid-3.1.12/src/ftp.cc     2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/ftp.cc       2011-05-03 15:47:49.124934483 +0200
@@ -2453,7 +2453,6 @@
 {
     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 @@
 
     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 -ur squid-3.1.12/src/neighbors.cc squid-3.1.12-fixed/src/neighbors.cc
--- squid-3.1.12/src/neighbors.cc       2011-04-04 03:24:06.000000000 +0200
+++ squid-3.1.12-fixed/src/neighbors.cc 2011-05-03 15:51:08.221934455 +0200
@@ -832,7 +832,6 @@
     peer *best_p = NULL;
 #if USE_CACHE_DIGESTS
 
-    const cache_key *key;
     int best_rtt = 0;
     int choice_count = 0;
     int ichoice_count = 0;
@@ -843,7 +842,7 @@
     if (!request->flags.hierarchical)
         return NULL;
 
-    key = storeKeyPublicByRequest(request);
+    storeKeyPublicByRequest(request);
 
     for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) {
         lookup_t lookup;
++++++ squid.init ++++++
#!/bin/sh
# Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
# Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
# Copyright (c) 2002 SuSE Linux AG
#
# Author: Frank Bodammer, Peter Poeml, Klaus Singvogel <feedb...@suse.de>
#
# /etc/init.d/squid
#   and its symbolic link
# /(usr/)sbin/rcsquid
#
### BEGIN INIT INFO
# Provides:           squid
# Required-Start:     $local_fs $remote_fs $network $time
# Should-Start:       apache $named winbind 
# Required-Stop:      $local_fs $remote_fs $network $time
# Should-Stop:        apache $named winbind
# Default-Start:      3 5
# Default-Stop:       0 1 2 6
# Short-Description:  Squid web cache
# Description:        Start the Squid web cache, providing
#                     HTTP, FTP and other proxy services
### END INIT INFO
#
# Note on runlevels:
# 0 - halt/poweroff                     6 - reboot
# 1 - single user                       2 - multiuser without network exported
# 3 - multiuser w/ network (text mode)  5 - multiuser w/ network and X11 (xdm)


# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
SQUID_BIN=/usr/sbin/squid
test -x $SQUID_BIN || { echo "$SQUID_BIN not installed";
        if [ "$1" = "stop" ]; then exit 0;
        else exit 5; fi; }

# Check for existence of needed config file and read it
SQUID_SYSCONFIG=/etc/sysconfig/squid
test -r $SQUID_SYSCONFIG || { echo "$SQUID_SYSCONFIG not existing";
        if [ "$1" = "stop" ]; then exit 0;
        else exit 6; fi; }

# Read config
. $SQUID_SYSCONFIG

SQUID_PID=/var/run/squid.pid
SQUID_CONF=/etc/squid/squid.conf
SQUID_S_T=${SQUID_SHUTDOWN_TIMEOUT:="60"}
SQUID_OPTS=${SQUID_START_OPTIONS:="-sY"}
SQUID_ULIMIT=${SQUID_DEFAULT_ULIMT:="4096"}

# determine which one is the cache_swap directory
SQUID_CACHE_DIR=$(perl -n -e \
 '/^cache_dir\s+\S+\s+(.*)\s+\d+\s+\d+\s+\d+/ && print "$1"' $SQUID_CONF)

ulimit -n "$SQUID_ULIMIT"

#IN: $SQUID_CACHE_DIR
setup_squid_cache_dir(){
  for adir in "$1" ; do
    if [ ! -d $adir/00 ]; then # create missing cache directories
      umask 027             # prevent users reading any cache data
      echo -n " ($adir)"
      $SQUID_BIN -z -F > /dev/null 2>&1
    fi
    if [ ! -d $adir/00 ]; then
      echo " - failed while creating cache_dir ! "
      rc_failed
      rc_status -v
      rc_exit
    fi
  done
  sleep 2
}

# Shell functions sourced from /etc/rc.status:
#      rc_check         check and set local and overall rc status
#      rc_status        check and set local and overall rc status
#      rc_status -v     be verbose in local rc status and clear it afterwards
#      rc_status -v -r  ditto and clear both the local and overall rc status
#      rc_status -s     display "skipped" and exit with status 3
#      rc_status -u     display "unused" and exit with status 3
#      rc_failed        set local and overall rc status to failed
#      rc_failed <num>  set local and overall rc status to <num>
#      rc_reset         clear both the local and overall rc status
#      rc_exit          exit appropriate to overall rc status
#      rc_active        checks whether a service is activated by symlinks
. /etc/rc.status

# Reset status of this service
rc_reset


case "$1" in
    start)
        echo -n "Starting WWW-proxy squid "
        if /sbin/checkproc $SQUID_BIN ; then
          echo -n "- Warning: squid already running ! "
          rc_failed
        else
          [ -e $SQUID_PID ] && echo -n "- Warning: $SQUID_PID exists ! "
          if [ -n "$SQUID_CACHE_DIR" -a -d "$SQUID_CACHE_DIR" ]; then
            setup_squid_cache_dir "$SQUID_CACHE_DIR"
          fi
        fi
        startproc -l /var/log/squid/rcsquid.log $SQUID_BIN "$SQUID_OPTS"

        # Remember status and be verbose
        rc_status -v
        ;;
    stop)
        echo -n "Shutting down WWW-proxy squid "
        if /sbin/checkproc $SQUID_BIN ; then
          $SQUID_BIN -k shutdown
          sleep 2
          if [ -e $SQUID_PID ] ; then 
            echo -n "- wait a minute or two... "
            i="$SQUID_S_T"
            while [ -e $SQUID_PID ] && [ $i -gt 0 ] ; do
              sleep 2
              i=$[$i-1]
              echo -n "."
              [ $i -eq 41 ] && echo
            done
          fi
          if /sbin/checkproc $SQUID_BIN ; then
            killproc -TERM $SQUID_BIN
            echo -n " Warning: squid killed !"
          fi
        else
          echo -n "- Warning: squid not running ! "
          rc_failed 7
        fi

        # Remember status and be verbose
        rc_status -v
        ;;
    try-restart)
        $0 status >/dev/null && $0 restart

        # Remember status and be quiet
        rc_status
        ;;
    restart)
        $0 stop
        $0 start

        # Remember status and be quiet
        rc_status
        ;;
    force-reload)
        $0 reload

        # Remember status and be quiet
        rc_status
        ;;
    reload)
        echo -n "Reloading WWW-proxy squid "
        if /sbin/checkproc $SQUID_BIN ; then
          $SQUID_BIN -k rotate
          sleep 2
          $SQUID_BIN -k reconfigure
          rc_status
        else
          echo -n "- Warning: squid not running ! "
          rc_failed 7
        fi

        # Remember status and be verbose
        rc_status -v
        ;;
    status)
        echo -n "Checking for WWW-proxy squid "
        ## Check status with checkproc(8), if process is running
        ## checkproc will return with exit status 0.

        # Return value is slightly different for the status command:
        # 0 - service up and running
        # 1 - service dead, but /var/run/  pid  file exists
        # 2 - service dead, but /var/lock/ lock file exists
        # 3 - service not running (unused)
        # 4 - service status unknown :-(
        # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)

        # NOTE: checkproc returns LSB compliant status values.
        /sbin/checkproc $SQUID_BIN

        # Remember status and be verbose
        rc_status -v
        ;;
    probe)
        test $SQUID_CONF -nt $SQUID_PID && echo reload
        ;;
    *)
        echo "Usage: $0 
{start|stop|status|try-restart|restart|force-reload|reload|probe}"
        exit 1
        ;;
esac
rc_exit

++++++ squid.sysconfig ++++++
--- /var/tmp/diff_new_pack.5JV8or/_old  2011-05-04 11:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.5JV8or/_new  2011-05-04 11:43:31.000000000 +0200
@@ -7,3 +7,17 @@
 # kill squid after this timeout in double-seconds with SIGTERM
 #
 SQUID_SHUTDOWN_TIMEOUT="60"
+
+## Type:        text
+## Default:     "-sY"
+#
+# squid daemon start options
+#
+SQUID_START_OPTIONS="-sY"
+
+## Type:        integer(1:)
+## Default:     "4096"
+#
+# default ulimit to set
+#
+SQUID_DEFAULT_ULIMT="4096"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to