[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
rpms/squid/devel squid-2.6.STABLE1-fd-config-updated.patch, NONE, 1.1 squid-2.6.STABLE2-build.patch, NONE, 1.1 sources, 1.20, 1.21 squid.spec, 1.68, 1.69 squid-2.6.STABLE1-20060725.patch, 1.1, NONE squid-2.6.STABLE1-build.patch, 1.1, NONE squid-2.6.STABLE1-fd-config.patch, 1.1, NONE

From: fedora-cvs-commits redhat com
To: fedora-cvs-commits redhat com
Subject: rpms/squid/devel squid-2.6.STABLE1-fd-config-updated.patch, NONE, 1.1 squid-2.6.STABLE2-build.patch, NONE, 1.1 sources, 1.20, 1.21 squid.spec, 1.68, 1.69 squid-2.6.STABLE1-20060725.patch, 1.1, NONE squid-2.6.STABLE1-build.patch, 1.1, NONE squid-2.6.STABLE1-fd-config.patch, 1.1, NONE
Date: Mon, 31 Jul 2006 04:01:11 -0400
Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1775

Modified Files:
	sources squid.spec 
Added Files:
	squid-2.6.STABLE1-fd-config-updated.patch 
	squid-2.6.STABLE2-build.patch 
Removed Files:
	squid-2.6.STABLE1-20060725.patch squid-2.6.STABLE1-build.patch 
	squid-2.6.STABLE1-fd-config.patch 
Log Message:
the latest stable upstream, reworked fd config patch

squid-2.6.STABLE1-fd-config-updated.patch:
 configure               |   28 ++++++++++++++++++++++++++++
 configure.in            |   10 ++++++++++
 include/autoconf.h.in   |    3 +++
 src/cf.data.pre         |   19 +++++++++++++++++++
 src/comm_epoll.c        |   15 +++++++++++++++
 src/comm_poll.c         |   26 ++++++++++++++++++++++----
 src/comm_select.c       |   26 ++++++++++++++++++++++++--
 src/comm_select_win32.c |   26 ++++++++++++++++++++++++--
 src/main.c              |   11 ++++++++---
 src/squid.h             |    4 ++++
 src/stat.c              |    2 +-
 src/structs.h           |    3 +++
 src/tools.c             |   15 +++++++++++++++
 13 files changed, 176 insertions(+), 12 deletions(-)

--- NEW FILE squid-2.6.STABLE1-fd-config-updated.patch ---
--- squid-2.6.STABLE1/configure.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/configure	2006-07-26 09:58:41.000000000 +0200
@@ -2970,6 +2970,34 @@
   AMDEP_FALSE=
 fi
 
+if false; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+# Check whether --enable-fd-config or --disable-fd-config was given.
+if test "${enable_fd_config+set}" = set; then
+  enableval="$enable_fd_config"
+   if test "$enableval" = "yes" ; then
+    echo "File descriptor config enabled"
+    cat >> confdefs.h <<\EOF
+#define FD_CONFIG 1
+EOF
+
+    
+
+if true; then
+  USE_FD_CONFIG_TRUE=
+  USE_FD_CONFIG_FALSE='#'
+else
+  USE_FD_CONFIG_TRUE='#'
+  USE_FD_CONFIG_FALSE=
+fi
+  fi
+
+fi
 
 
 
--- squid-2.6.STABLE1/include/autoconf.h.in.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/include/autoconf.h.in	2006-07-26 09:58:41.000000000 +0200
@@ -36,6 +36,9 @@
 /* Traffic management via "delay pools". */
 #undef DELAY_POOLS
 
+/* Filedesc managment */
+#undef FD_CONFIG
+
 /* Enable following X-Forwarded-For headers */
 #undef FOLLOW_X_FORWARDED_FOR
 
--- squid-2.6.STABLE1/configure.in.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/configure.in	2006-07-26 09:58:41.000000000 +0200
@@ -501,6 +501,16 @@
   fi
 ])
 
+AM_CONDITIONAL(USE_FD_CONFIG, false)
+AC_ARG_ENABLE(fd-config,
+[  --enable-fd-config    Enable filedesc config to configure maximal number of used filedescriptors],
+[ if test "$enableval" = "yes" ; then
+    echo "Filedesc config enabled"
+    AC_DEFINE(FD_CONFIG)
+    AM_CONDITIONAL(USE_FD_CONFIG, true)
+  fi
+])
+
 dnl This is a developer only option. Developers know how to set defines
 dnl
 dnl AC_ARG_ENABLE(mem-gen-trace,
--- squid-2.6.STABLE1/src/cf.data.pre.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/cf.data.pre	2006-07-26 10:05:54.000000000 +0200
@@ -5027,4 +5027,23 @@
 	or response to be rejected.
 DOC_END
 
+NAME: max_filedesc
+IFDEF: FD_CONFIG
+TYPE: int
+DEFAULT: 1024
+LOC: Config.max_filedesc
+DOC_START
+	The maximum number of open file descriptors.
+        
+	WARNING: Changes of this value isn't respected by reconfigure 
+	command. This value should be changed only if there isn't 
+	any active squid process.
+
+	NOTE: This option is only supported by system with poll()
+	or epoll(). You can set this value by --with-maxfd during 
+	compilation on system whith uses select().
+	
+	The maximum value for max_filedesc is set by --with-maxfd during
+	compilation.
+DOC_END
 EOF
--- squid-2.6.STABLE1/src/comm_poll.c.fd	2006-06-25 17:53:14.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_poll.c	2006-07-26 09:58:41.000000000 +0200
@@ -152,13 +152,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
@@ -286,9 +304,9 @@
 int
 comm_select(int msec)
 {
-    struct pollfd pfds[SQUID_MAXFD];
+    struct pollfd pfds[Squid_MaxFD];
 #if DELAY_POOLS
-    char slowfds[SQUID_MAXFD];
+    char slowfds[Squid_MaxFD];
 #endif
     int fd;
     unsigned int i;
--- squid-2.6.STABLE1/src/comm_epoll.c.fd	2006-06-27 15:09:43.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_epoll.c	2006-07-26 09:58:41.000000000 +0200
@@ -86,6 +86,21 @@
     safe_free(epoll_state);
 }
 
+#if DELAY_POOLS
+
+/* dummy functions... */
+void
+comm_slow_fd_init(int fd_num)
+{
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+}
+
+#endif
+
 void
 commSetEvents(int fd, int need_read, int need_write)
 {
--- squid-2.6.STABLE1/src/main.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/main.c	2006-07-26 09:58:41.000000000 +0200
@@ -601,6 +601,9 @@
 #if DELAY_POOLS
 	delayPoolsInit();
 #endif
+#if DELAY_POOLS
+	comm_slow_fd_init(Squid_MaxFD);
+#endif
 	fwdInit();
     }
 #if USE_WCCP
@@ -664,8 +667,6 @@
 #endif
 
     debug_log = stderr;
-    if (FD_SETSIZE < Squid_MaxFD)
-	Squid_MaxFD = FD_SETSIZE;
 
 #ifdef _SQUID_WIN32_
     if ((WIN32_init_err = WIN32_Subsystem_Init(&argc, &argv)))
@@ -748,6 +749,8 @@
     /* Make sure the OS allows core dumps if enabled in squid.conf */
     enableCoredumps();
 
+    setMaxFD();
+
 #if TEST_ACCESS
     comm_init();
     comm_select_init();
@@ -781,7 +784,6 @@
     }
     if (!opt_no_daemon)
 	watch_child(argv);
-    setMaxFD();
 
     /* init comm module */
     comm_init();
@@ -1086,6 +1088,9 @@
 #endif
     releaseServerSockets();
     commCloseAllSockets();
+#if DELAY_POOLS
+    comm_slow_fd_destroy();
+#endif
     authenticateShutdown();
 #if USE_UNLINKD
     unlinkdClose();
--- squid-2.6.STABLE1/src/structs.h.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/structs.h	2006-07-26 09:58:41.000000000 +0200
@@ -805,6 +805,9 @@
 #endif
     time_t refresh_stale_window;
     int umask;
+#if FD_CONFIG
+    int max_filedesc;
+#endif
 };
 
 struct _SquidConfig2 {
--- squid-2.6.STABLE1/src/tools.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/tools.c	2006-07-26 09:58:41.000000000 +0200
@@ -757,6 +757,21 @@
 void
 setMaxFD(void)
 {
+
+/* Set up number of used filedescriptors from config file */
+/* Override the default settings Squid_MaxFD = FD_SETSIZE */
+#if FD_CONFIG
+    Squid_MaxFD = Config.max_filedesc;
+
+    /* don't exceed limit which was set during compilation */
+    if(SQUID_MAXFD < Squid_MaxFD)
+	Squid_MaxFD = SQUID_MAXFD;
+#else
+    /* don't exceed FD_SETSIZE */
+    if(FD_SETSIZE < Squid_MaxFD)
+	Squid_MaxFD = FD_SETSIZE;
+#endif
+
 #if HAVE_SETRLIMIT
     /* try to use as many file descriptors as possible */
     /* System V uses RLIMIT_NOFILE and BSD uses RLIMIT_OFILE */
--- squid-2.6.STABLE1/src/comm_select_win32.c.fd	2006-06-11 19:06:25.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_select_win32.c	2006-07-26 09:58:41.000000000 +0200
@@ -34,6 +34,10 @@
 
 #include "squid.h"
 
+#if FD_CONFIG
+#error "Filedescriptor configuration isn't supported by this module!"
+#endif
+
 static int MAX_POLL_TIME = 1000;	/* see also comm_quick_poll_required() */
 
 /* STATIC */
@@ -144,13 +148,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
--- squid-2.6.STABLE1/src/comm_select.c.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/comm_select.c	2006-07-26 09:58:41.000000000 +0200
@@ -38,6 +38,10 @@
 #include <sys/select.h>
 #endif
 
+#if FD_CONFIG
+#error "Filedescriptor configuration isn't supported by this module!"
+#endif
+
 static int MAX_POLL_TIME = 1000;	/* see also comm_quick_poll_required() */
 
 #ifndef        howmany
@@ -157,13 +161,31 @@
 }
 
 #if DELAY_POOLS
+
+static int *slowfdarr = NULL;
+static int slowfdmax;
 static int slowfdcnt = 0;
-static int slowfdarr[SQUID_MAXFD];
+
+void
+comm_slow_fd_init(int fd_num)
+{
+    slowfdarr = xmalloc(sizeof(slowfdarr[0])*fd_num);
+    slowfdmax = fd_num;
+    slowfdcnt = 0;
+}
+
+void
+comm_slow_fd_destroy(void)
+{
+    xfree(slowfdarr);
+    slowfdarr = NULL;
+    slowfdmax = slowfdcnt = 0;
+}
 
 static void
 commAddSlowFd(int fd)
 {
-    assert(slowfdcnt < SQUID_MAXFD);
+    assert(slowfdcnt < slowfdmax);
     slowfdarr[slowfdcnt++] = fd;
 }
 
--- squid-2.6.STABLE1/src/squid.h.fd	2006-06-08 14:53:20.000000000 +0200
+++ squid-2.6.STABLE1/src/squid.h	2006-07-26 09:58:41.000000000 +0200
@@ -409,6 +409,10 @@
 #include "cache_snmp.h"
 #endif
 
+#if !USE_POLL && !USE_EPOLL
+#undef FD_CONFIG
+#endif
+
 #include "hash.h"
 #include "rfc1035.h"
 
--- squid-2.6.STABLE1/src/stat.c.fd	2006-07-26 09:58:41.000000000 +0200
+++ squid-2.6.STABLE1/src/stat.c	2006-07-26 09:58:41.000000000 +0200
@@ -1031,7 +1031,7 @@
     statHistEnumInit(&C->comm_icp_incoming, INCOMING_ICP_MAX);
     statHistEnumInit(&C->comm_dns_incoming, INCOMING_DNS_MAX);
     statHistEnumInit(&C->comm_http_incoming, INCOMING_HTTP_MAX);
-    statHistIntInit(&C->select_fds_hist, 256);	/* was SQUID_MAXFD, but it is way too much. It is OK to crop this statistics */
+    statHistIntInit(&C->select_fds_hist, 256);	/* was Squid_MaxFD, but it is way too much. It is OK to crop this statistics */
 }
 
 /* add special cases here as they arrive */

squid-2.6.STABLE2-build.patch:
 errors/Makefile.in |   20 ++++++++++----------
 icons/Makefile.in  |    2 +-
 src/Makefile.in    |   22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

--- NEW FILE squid-2.6.STABLE2-build.patch ---
--- squid-2.6.STABLE2/errors/Makefile.in.build	2006-06-12 08:09:43.000000000 +0200
+++ squid-2.6.STABLE2/errors/Makefile.in	2006-07-31 09:38:42.000000000 +0200
@@ -221,8 +221,8 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-errordir = $(datadir)/errors
-DEFAULT_ERROR_DIR = $(errordir)
+errordir = $(pkgdatadir)/errors
+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
 INSTALL_LANGUAGES = @ERR_LANGUAGES@
 LANGUAGES = \
 		Azerbaijani \
@@ -413,17 +413,17 @@
 
 install-data-local:
 	@for l in $(INSTALL_LANGUAGES); do \
-		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
+		$(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
 		for f in $(srcdir)/$$l/ERR_*; do \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
 		done \
 	done
 
 uninstall-local:
 	@for l in $(INSTALL_LANGUAGES); do \
 		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	        	rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
 		done \
 	done
 
@@ -436,13 +436,13 @@
 #
 addlang: all
 	- if test -d $(srcdir)/$(ADDLANG); then \
-	if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
+	if test -d $(errordir)/$(DESTLANG); then \
 	cd $(srcdir)/$(ADDLANG)/ ; \
 	for f in ERR_*; do \
-		if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
+		if test -f $(errordir)/$(DESTLANG)/$$f ; then \
 			echo "appending $(ADDLANG)/$$f"; \
-			echo "<HR>" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
-			cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
+			echo "<HR>" >> $(errordir)/$(DESTLANG)/$$f ; \
+			cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
 		fi; \
 	done; \
 	fi \
--- squid-2.6.STABLE2/icons/Makefile.in.build	2006-06-12 08:10:08.000000000 +0200
+++ squid-2.6.STABLE2/icons/Makefile.in	2006-07-31 09:38:42.000000000 +0200
@@ -258,7 +258,7 @@
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = 
--- squid-2.6.STABLE2/src/Makefile.in.build	2006-07-30 10:56:18.000000000 +0200
+++ squid-2.6.STABLE2/src/Makefile.in	2006-07-31 09:47:33.000000000 +0200
@@ -586,18 +586,18 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
 DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
 DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
+DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_ICON_DIR = $(datadir)/icons
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(pkgdatadir)/icons
+DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
 DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
 
 # Don't automatically uninstall config files
@@ -842,20 +842,20 @@
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+	test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/squid"
 	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 
 uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	18 Jul 2006 12:00:11 -0000	1.20
+++ sources	31 Jul 2006 08:01:04 -0000	1.21
@@ -1 +1 @@
-d6bb23a67b0475cca11d4af8d574d054  squid-2.6.STABLE1.tar.bz2
+838492f95de0964e31e633bfa07a0682  squid-2.6.STABLE2.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- squid.spec	25 Jul 2006 08:42:36 -0000	1.68
+++ squid.spec	31 Jul 2006 08:01:04 -0000	1.69
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.6.STABLE1
-Release: 3%{?dist}
+Version: 2.6.STABLE2
+Release: 1%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -20,7 +20,6 @@
 
 # Upstream patches
 # the latest upstream CVS snapshot
-Patch100: squid-2.6.STABLE1-20060725.patch
 
 # External patches
 
@@ -29,10 +28,10 @@
 # will break upstream ones.
 Patch201: squid-2.5.STABLE11-config.patch
 Patch202: squid-2.5.STABLE4-location.patch
-Patch203: squid-2.6.STABLE1-build.patch
+Patch203: squid-2.6.STABLE2-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE12-smb-path.patch
-Patch206: squid-2.6.STABLE1-fd-config.patch
+Patch206: squid-2.6.STABLE1-fd-config-updated.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -55,8 +54,6 @@
 %prep
 %setup -q
 
-%patch100 -p1
-
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -101,6 +98,7 @@
    --enable-follow-x-forwarded-for \
    --enable-wccpv2 \
    --enable-fd-config \
+   --with-maxfd=16384 \
 
 
 
@@ -324,6 +322,10 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Jul 31 2006 Martin Stransky <stransky redhat com> - 7:2.6.STABLE2-1
+- the latest stable upstream
+- reworked fd config patch
+
 * Wed Jul 25 2006 Martin Stransky <stransky redhat com> - 7:2.6.STABLE1-3
 - the latest CVS upstream snapshot
 


--- squid-2.6.STABLE1-20060725.patch DELETED ---


--- squid-2.6.STABLE1-build.patch DELETED ---


--- squid-2.6.STABLE1-fd-config.patch DELETED ---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]