rpms/squid/F-9 .cvsignore, 1.33, 1.34 sources, 1.35, 1.36 squid-3.0.STABLE1-build.patch, 1.2, 1.3 squid-3.0.STABLE1-config.patch, 1.2, 1.3 squid.logrotate, 1.1, 1.2 squid.spec, 1.100, 1.101
Henrik Nordström
hno at fedoraproject.org
Fri Oct 24 20:33:22 UTC 2008
Author: hno
Update of /cvs/pkgs/rpms/squid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23873
Modified Files:
.cvsignore sources squid-3.0.STABLE1-build.patch
squid-3.0.STABLE1-config.patch squid.logrotate squid.spec
Log Message:
3.0.STABLE10-1
- upgrade to latest upstream
- change logrotate to move instead of copytruncate
- disable coss support, not officially supported in 3.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 2 Jul 2008 09:23:20 -0000 1.33
+++ .cvsignore 24 Oct 2008 20:32:51 -0000 1.34
@@ -1,2 +1 @@
-squid-3.0.STABLE6.tar.bz2
-squid-3.0.STABLE7.tar.bz2
+squid-3.0.STABLE10.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 2 Jul 2008 09:23:20 -0000 1.35
+++ sources 24 Oct 2008 20:32:51 -0000 1.36
@@ -1 +1 @@
-fa0fc5a3ce226099975b34c1cd2a3f95 squid-3.0.STABLE7.tar.bz2
+cfd37717230220a9f47177594e235f18 squid-3.0.STABLE10.tar.bz2
squid-3.0.STABLE1-build.patch:
Index: squid-3.0.STABLE1-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid-3.0.STABLE1-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squid-3.0.STABLE1-build.patch 7 Oct 2008 09:36:14 -0000 1.2
+++ squid-3.0.STABLE1-build.patch 24 Oct 2008 20:32:52 -0000 1.3
@@ -1,64 +1,28 @@
-diff -up squid-3.0.STABLE7/errors/Makefile.am.build squid-3.0.STABLE7/errors/Makefile.am
---- squid-3.0.STABLE7/errors/Makefile.am.build 2008-06-22 05:35:47.000000000 +0200
-+++ squid-3.0.STABLE7/errors/Makefile.am 2008-10-06 11:31:55.000000000 +0200
-@@ -3,7 +3,7 @@
- # $Id$
- #
-
--errordir = $(datadir)/errors
-+errordir = $(pkgdatadir)/errors
-
-
- ##dist-hook eveything
-diff -up squid-3.0.STABLE7/errors/Makefile.in.build squid-3.0.STABLE7/errors/Makefile.in
---- squid-3.0.STABLE7/errors/Makefile.in.build 2008-06-22 05:35:47.000000000 +0200
-+++ squid-3.0.STABLE7/errors/Makefile.in 2008-10-06 13:01:47.000000000 +0200
-@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--errordir = $(datadir)/errors
-+errordir = $(pkgdatadir)/errors
- DEFAULT_ERROR_DIR = $(errordir)
- INSTALL_LANGUAGES = @ERR_LANGUAGES@
- LANGUAGES = \
-@@ -320,9 +320,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign errors/Makefile'; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu errors/Makefile'; \
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --foreign errors/Makefile
-+ $(AUTOMAKE) --gnu errors/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-diff -up squid-3.0.STABLE7/icons/Makefile.am.build squid-3.0.STABLE7/icons/Makefile.am
---- squid-3.0.STABLE7/icons/Makefile.am.build 2008-06-22 05:35:49.000000000 +0200
-+++ squid-3.0.STABLE7/icons/Makefile.am 2008-10-06 11:31:55.000000000 +0200
-@@ -29,7 +29,7 @@ ICON2 = anthony-bomb.gif \
+diff -up squid-3.0.STABLE9/icons/Makefile.am.build squid-3.0.STABLE9/icons/Makefile.am
+--- squid-3.0.STABLE9/icons/Makefile.am.build 2008-09-09 18:06:41.000000000 +0200
++++ squid-3.0.STABLE9/icons/Makefile.am 2008-10-19 23:36:13.000000000 +0200
+@@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \
anthony-xbm.gif \
anthony-xpm.gif
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
- icon_DATA = $(ICON1) $(ICON2)
- EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ icon_DATA = $(ICONS)
+ EXTRA_DIST = $(ICONS)
DISTCLEANFILES =
-diff -up squid-3.0.STABLE7/icons/Makefile.in.build squid-3.0.STABLE7/icons/Makefile.in
---- squid-3.0.STABLE7/icons/Makefile.in.build 2008-06-22 05:35:50.000000000 +0200
-+++ squid-3.0.STABLE7/icons/Makefile.in 2008-10-06 13:01:58.000000000 +0200
-@@ -306,7 +306,7 @@ ICON2 = anthony-bomb.gif \
+diff -up squid-3.0.STABLE9/icons/Makefile.in.build squid-3.0.STABLE9/icons/Makefile.in
+--- squid-3.0.STABLE9/icons/Makefile.in.build 2008-09-09 18:06:41.000000000 +0200
++++ squid-3.0.STABLE9/icons/Makefile.in 2008-10-19 23:36:13.000000000 +0200
+@@ -308,7 +308,7 @@ ICONS = anthony-binhex.gif \
anthony-xbm.gif \
anthony-xpm.gif
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
- icon_DATA = $(ICON1) $(ICON2)
- EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ icon_DATA = $(ICONS)
+ EXTRA_DIST = $(ICONS)
DISTCLEANFILES =
-@@ -322,9 +322,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -324,9 +324,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
exit 1;; \
esac; \
done; \
@@ -70,10 +34,10 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.am
---- squid-3.0.STABLE7/src/Makefile.am.build 2008-06-22 05:35:52.000000000 +0200
-+++ squid-3.0.STABLE7/src/Makefile.am 2008-10-06 13:01:31.000000000 +0200
-@@ -925,9 +925,7 @@ BUILT_SOURCES = \
+diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile.am
+--- squid-3.0.STABLE9/src/Makefile.am.build 2008-09-09 18:06:43.000000000 +0200
++++ squid-3.0.STABLE9/src/Makefile.am 2008-10-19 23:36:13.000000000 +0200
+@@ -929,9 +929,7 @@ BUILT_SOURCES = \
sysconf_DATA = \
squid.conf.default \
@@ -84,7 +48,7 @@
mib.txt
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
-@@ -988,18 +986,18 @@ DEFAULT_PREFIX = $(prefix)
+@@ -992,18 +990,18 @@ DEFAULT_PREFIX = $(prefix)
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -109,7 +73,7 @@
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
-@@ -1062,7 +1060,7 @@ cf.data: cf.data.pre Makefile
+@@ -1066,7 +1064,7 @@ cf.data: cf.data.pre Makefile
repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@@ -118,7 +82,7 @@
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
else \
-@@ -1075,6 +1073,12 @@ install-data-local: install-sysconfDATA
+@@ -1079,6 +1077,12 @@ install-data-local: install-sysconfDATA
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi
@@ -131,7 +95,7 @@
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local:
-@@ -1082,6 +1086,10 @@ uninstall-local:
+@@ -1086,6 +1090,10 @@ uninstall-local:
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi
@@ -142,9 +106,9 @@
# Don't automatically uninstall config files
# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
-diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.in
---- squid-3.0.STABLE7/src/Makefile.in.build 2008-06-22 05:35:52.000000000 +0200
-+++ squid-3.0.STABLE7/src/Makefile.in 2008-10-06 13:02:02.000000000 +0200
+diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile.in
+--- squid-3.0.STABLE9/src/Makefile.in.build 2008-09-09 18:06:43.000000000 +0200
++++ squid-3.0.STABLE9/src/Makefile.in 2008-10-19 23:36:13.000000000 +0200
@@ -140,8 +140,7 @@ libsquid_la_LIBADD =
am_libsquid_la_OBJECTS = comm.lo IPInterception.lo
libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
@@ -155,7 +119,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@ENABLE_PINGER_TRUE at am__EXEEXT_1 = pinger$(EXEEXT)
@USE_DNSSERVER_TRUE at am__EXEEXT_2 = dnsserver$(EXEEXT)
-@@ -1514,9 +1513,8 @@ am__vpath_adj = case $$p in \
+@@ -1529,9 +1528,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@@ -166,7 +130,7 @@
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
-@@ -2552,9 +2550,7 @@ BUILT_SOURCES = \
+@@ -2573,9 +2571,7 @@ BUILT_SOURCES = \
sysconf_DATA = \
squid.conf.default \
@@ -177,7 +141,7 @@
mib.txt
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
-@@ -2612,18 +2608,18 @@ DEFAULT_PREFIX = $(prefix)
+@@ -2633,18 +2629,18 @@ DEFAULT_PREFIX = $(prefix)
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -202,7 +166,7 @@
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
# Don't automatically uninstall config files
-@@ -3932,9 +3928,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+@@ -3965,9 +3961,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
exit 1;; \
esac; \
done; \
@@ -214,7 +178,7 @@
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
-@@ -4988,23 +4984,6 @@ clean-libtool:
+@@ -5023,23 +5019,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
@@ -238,7 +202,7 @@
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-@@ -5279,7 +5258,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
+@@ -5314,7 +5293,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR
$(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -247,7 +211,7 @@
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -5366,7 +5345,7 @@ info: info-recursive
+@@ -5401,7 +5380,7 @@ info: info-recursive
info-am:
@@ -256,7 +220,7 @@
install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
install-sbinPROGRAMS install-sysconfDATA
-@@ -5395,8 +5374,8 @@ ps: ps-recursive
+@@ -5430,8 +5409,8 @@ ps: ps-recursive
ps-am:
@@ -267,7 +231,7 @@
uninstall-sbinPROGRAMS uninstall-sysconfDATA
uninstall-info: uninstall-info-recursive
-@@ -5410,16 +5389,15 @@ uninstall-info: uninstall-info-recursive
+@@ -5445,16 +5424,15 @@ uninstall-info: uninstall-info-recursive
distclean-libtool distclean-recursive distclean-tags distdir \
dvi dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \
@@ -293,7 +257,7 @@
uninstall-libexecPROGRAMS uninstall-local \
uninstall-sbinPROGRAMS uninstall-sysconfDATA
-@@ -5479,7 +5457,7 @@ cf.data: cf.data.pre Makefile
+@@ -5514,7 +5492,7 @@ cf.data: cf.data.pre Makefile
repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@@ -302,7 +266,7 @@
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
else \
-@@ -5492,6 +5470,12 @@ install-data-local: install-sysconfDATA
+@@ -5527,6 +5505,12 @@ install-data-local: install-sysconfDATA
echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi
@@ -315,7 +279,7 @@
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local:
-@@ -5499,6 +5483,10 @@ uninstall-local:
+@@ -5534,6 +5518,10 @@ uninstall-local:
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi
@@ -326,3 +290,39 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+diff -up squid-3.0.STABLE9/errors/Makefile.am.build squid-3.0.STABLE9/errors/Makefile.am
+--- squid-3.0.STABLE9/errors/Makefile.am.build 2008-09-09 18:06:39.000000000 +0200
++++ squid-3.0.STABLE9/errors/Makefile.am 2008-10-19 23:36:13.000000000 +0200
+@@ -3,7 +3,7 @@
+ # $Id$
+ #
+
+-errordir = $(datadir)/errors
++errordir = $(pkgdatadir)/errors
+
+
+ ##dist-hook eveything
+diff -up squid-3.0.STABLE9/errors/Makefile.in.build squid-3.0.STABLE9/errors/Makefile.in
+--- squid-3.0.STABLE9/errors/Makefile.in.build 2008-09-09 18:06:39.000000000 +0200
++++ squid-3.0.STABLE9/errors/Makefile.in 2008-10-19 23:36:13.000000000 +0200
+@@ -271,7 +271,7 @@ sharedstatedir = @sharedstatedir@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-errordir = $(datadir)/errors
++errordir = $(pkgdatadir)/errors
+ DEFAULT_ERROR_DIR = $(errordir)
+ INSTALL_LANGUAGES = templates @ERR_LANGUAGES@
+ LANGUAGES = \
+@@ -322,9 +322,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign errors/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu errors/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign errors/Makefile
++ $(AUTOMAKE) --gnu errors/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
squid-3.0.STABLE1-config.patch:
Index: squid-3.0.STABLE1-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid-3.0.STABLE1-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squid-3.0.STABLE1-config.patch 26 Feb 2008 08:41:19 -0000 1.2
+++ squid-3.0.STABLE1-config.patch 24 Oct 2008 20:32:52 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.pre
---- squid-3.0.STABLE1/src/cf.data.pre.config 2007-11-16 00:33:05.000000000 +0100
-+++ squid-3.0.STABLE1/src/cf.data.pre 2008-01-23 12:11:12.000000000 +0100
-@@ -673,6 +673,7 @@ http_access deny CONNECT !SSL_ports
+diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
+--- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200
++++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200
+@@ -703,6 +703,7 @@ http_access deny CONNECT !SSL_ports
http_access allow localnet
# And finally deny all other access to this proxy
@@ -9,7 +9,7 @@
http_access deny all
NOCOMMENT_END
DOC_END
-@@ -2080,7 +2081,7 @@ DOC_END
+@@ -2135,7 +2136,7 @@ DOC_END
NAME: logfile_rotate
TYPE: int
@@ -18,7 +18,7 @@
LOC: Config.Log.rotateNumber
DOC_START
Specifies the number of logfile rotations to make when you
-@@ -2096,6 +2097,7 @@ DOC_START
+@@ -2151,6 +2152,7 @@ DOC_START
purposes, so -k rotate uses another signal. It is best to get
in the habit of using 'squid -k rotate' instead of 'kill -USR1
<pid>'.
@@ -26,7 +26,7 @@
DOC_END
NAME: emulate_httpd_log
-@@ -3198,11 +3200,11 @@ COMMENT_END
+@@ -3254,11 +3256,11 @@ COMMENT_END
NAME: cache_mgr
TYPE: string
@@ -40,30 +40,23 @@
DOC_END
NAME: mail_from
-@@ -4354,15 +4357,23 @@ TYPE: string
+@@ -4422,9 +4424,16 @@ TYPE: string
LOC: Config.errorDirectory
DEFAULT: @DEFAULT_ERROR_DIR@
DOC_START
-- If you wish to create your own versions of the default
-- (English) error files, either to customize them to suit your
-- language or company copy the template English files to another
-+ Directory where the error files are read from.
-+ /usr/lib/squid/errors contains sets of error files
-+ in different languages. The default error directory
-+ is /etc/squid/errors, which is a link to one of these
-+ error sets.
-+
-+ If you wish to create your own versions of the error files,
-+ either to customize them to suit your language or company,
-+ copy the template English files to another
- directory and point this tag at them.
-
- The squid developers are interested in making squid available in
- a wide variety of languages. If you are making translations for a
- langauge that Squid does not currently provide please consider
- contributing your translation back to the project.
-+
-+error_directory @DEFAULT_ERROR_DIR@
- DOC_END
+- If you wish to create your own versions of the default files, to
+- customize them to suit your company copy the template files to
+- another directory and point this tag at them.
++ Directory where the error files are read from.
++ /usr/lib/squid/errors contains sets of error files
++ in different languages. The default error directory
++ is /etc/squid/errors, which is a link to one of these
++ error sets.
++
++ If you wish to create your own versions of the error files,
++ either to customize them to suit your language or company,
++ copy the template English files to another directory and
++ point this tag at them.
- NAME: err_html_text
+ Current Language updates can be downloaded from:
+ http://www.squid-cache.org/Versions/langpack/
Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid.logrotate 9 Sep 2004 12:36:11 -0000 1.1
+++ squid.logrotate 24 Oct 2008 20:32:52 -0000 1.2
@@ -1,31 +1,14 @@
-/var/log/squid/access.log {
+/var/log/squid/access.log /var/log/squid/store.log /var/log/squid/cache.log {
weekly
rotate 5
- copytruncate
compress
notifempty
missingok
-}
-/var/log/squid/cache.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
-}
-
-/var/log/squid/store.log {
- weekly
- rotate 5
- copytruncate
- compress
- notifempty
- missingok
-# This script asks squid to rotate its logs on its own.
-# Restarting squid is a long process and it is not worth
-# doing it just to rotate logs
+ sharedscripts
postrotate
+ # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
/usr/sbin/squid -k rotate
+ # Wait a little to allow Squid to catch up before the logs is compressed
+ sleep 1
endscript
}
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-9/squid.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- squid.spec 7 Oct 2008 09:36:14 -0000 1.100
+++ squid.spec 24 Oct 2008 20:32:52 -0000 1.101
@@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99}
Name: squid
-Version: 3.0.STABLE7
-Release: 2%{?dist}
+Version: 3.0.STABLE10
+Release: 1%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2+
@@ -31,8 +31,6 @@
Patch203: squid-3.0.STABLE1-build.patch
Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.0.STABLE1-smb-path.patch
-Patch206: squid-3.0.STABLE2-fix_warnings.patch
-Patch207: squid-3.0.STABLE2-configure_netfilter.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0
@@ -63,8 +61,6 @@
%patch203 -p1 -b .build
%patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path
-%patch206 -p1 -b .fix_warnings
-%patch207 -p1 -b .config_netfilter
%build
export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -96,7 +92,7 @@
--enable-removal-policies="heap,lru" \
--enable-snmp \
--enable-ssl \
- --enable-storeio="aufs,coss,diskd,null,ufs" \
+ --enable-storeio="aufs,diskd,null,ufs" \
--enable-useragent-log \
--enable-wccpv2 \
--with-aio \
@@ -336,6 +332,11 @@
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
+* Fri Oct 24 2008 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE10-1
+- upgrade to latest upstream
+- change logrotate to move instead of copytruncate
+- disable coss support, not officially supported in 3.0
+
* Fri Oct 03 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
- Resolves: #463129 - optional config file
- Resolves: #458593 - noisy init script
More information about the scm-commits
mailing list