rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to latest upstream

Browse Source
This commit is contained in:
Henrik Nordström 2008-10-19 21:41:32 +00:00
parent a3a8a5ebba
commit e5d8a54a7b
7 changed files with 129 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
squid-3.0.STABLE6.tar.bz2 squid-3.0.STABLE9.tar.bz2

2
sources
View File

@ -1 +1 @@
fa0fc5a3ce226099975b34c1cd2a3f95 squid-3.0.STABLE7.tar.bz2 4009abfbf33d86f40db3ec4280716a0e squid-3.0.STABLE9.tar.bz2

144
squid-3.0.STABLE1-build.patch
View File

@ -1,64 +1,28 @@
diff -up squid-3.0.STABLE7/errors/Makefile.am.build squid-3.0.STABLE7/errors/Makefile.am diff -up squid-3.0.STABLE9/icons/Makefile.am.build squid-3.0.STABLE9/icons/Makefile.am
--- squid-3.0.STABLE7/errors/Makefile.am.build 2008-06-22 05:35:47.000000000 +0200 --- squid-3.0.STABLE9/icons/Makefile.am.build 2008-09-09 18:06:41.000000000 +0200
+++ squid-3.0.STABLE7/errors/Makefile.am 2008-10-06 11:31:55.000000000 +0200 +++ squid-3.0.STABLE9/icons/Makefile.am 2008-10-19 23:36:13.000000000 +0200
@@ -3,7 +3,7 @@ @@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \
# $Id: Makefile.am,v 1.14.2.1 2008/02/27 10:55:13 amosjeffries Exp $
#
-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 \
anthony-xbm.gif \ anthony-xbm.gif \
anthony-xpm.gif anthony-xpm.gif
-icondir = $(datadir)/icons -icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons +icondir = $(pkgdatadir)/icons
icon_DATA = $(ICON1) $(ICON2) icon_DATA = $(ICONS)
EXTRA_DIST = $(ICON1) $(ICON2) icons.shar EXTRA_DIST = $(ICONS)
DISTCLEANFILES = DISTCLEANFILES =
diff -up squid-3.0.STABLE7/icons/Makefile.in.build squid-3.0.STABLE7/icons/Makefile.in diff -up squid-3.0.STABLE9/icons/Makefile.in.build squid-3.0.STABLE9/icons/Makefile.in
--- squid-3.0.STABLE7/icons/Makefile.in.build 2008-06-22 05:35:50.000000000 +0200 --- squid-3.0.STABLE9/icons/Makefile.in.build 2008-09-09 18:06:41.000000000 +0200
+++ squid-3.0.STABLE7/icons/Makefile.in 2008-10-06 13:01:58.000000000 +0200 +++ squid-3.0.STABLE9/icons/Makefile.in 2008-10-19 23:36:13.000000000 +0200
@@ -306,7 +306,7 @@ ICON2 = anthony-bomb.gif \ @@ -308,7 +308,7 @@ ICONS = anthony-binhex.gif \
anthony-xbm.gif \ anthony-xbm.gif \
anthony-xpm.gif anthony-xpm.gif
-icondir = $(datadir)/icons -icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons +icondir = $(pkgdatadir)/icons
icon_DATA = $(ICON1) $(ICON2) icon_DATA = $(ICONS)
EXTRA_DIST = $(ICON1) $(ICON2) icons.shar EXTRA_DIST = $(ICONS)
DISTCLEANFILES = DISTCLEANFILES =
@@ -322,9 +322,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ @@ -324,9 +324,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
@ -70,10 +34,10 @@ diff -up squid-3.0.STABLE7/icons/Makefile.in.build squid-3.0.STABLE7/icons/Makef
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.am diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile.am
--- squid-3.0.STABLE7/src/Makefile.am.build 2008-06-22 05:35:52.000000000 +0200 --- squid-3.0.STABLE9/src/Makefile.am.build 2008-09-09 18:06:43.000000000 +0200
+++ squid-3.0.STABLE7/src/Makefile.am 2008-10-06 13:01:31.000000000 +0200 +++ squid-3.0.STABLE9/src/Makefile.am 2008-10-19 23:36:13.000000000 +0200
@@ -925,9 +925,7 @@ BUILT_SOURCES = \ @@ -929,9 +929,7 @@ BUILT_SOURCES = \
sysconf_DATA = \ sysconf_DATA = \
squid.conf.default \ squid.conf.default \
@ -84,7 +48,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.
mib.txt mib.txt
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ 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_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@ -109,7 +73,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" 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 repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@ -118,7 +82,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
else \ 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)"; \ echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi fi
@ -131,7 +95,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local: uninstall-local:
@@ -1082,6 +1086,10 @@ uninstall-local: @@ -1086,6 +1090,10 @@ uninstall-local:
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi fi
@ -142,9 +106,9 @@ diff -up squid-3.0.STABLE7/src/Makefile.am.build squid-3.0.STABLE7/src/Makefile.
# Don't automatically uninstall config files # Don't automatically uninstall config files
# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ # @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 diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile.in
--- squid-3.0.STABLE7/src/Makefile.in.build 2008-06-22 05:35:52.000000000 +0200 --- squid-3.0.STABLE9/src/Makefile.in.build 2008-09-09 18:06:43.000000000 +0200
+++ squid-3.0.STABLE7/src/Makefile.in 2008-10-06 13:02:02.000000000 +0200 +++ squid-3.0.STABLE9/src/Makefile.in 2008-10-19 23:36:13.000000000 +0200
@@ -140,8 +140,7 @@ libsquid_la_LIBADD = @@ -140,8 +140,7 @@ libsquid_la_LIBADD =
am_libsquid_la_OBJECTS = comm.lo IPInterception.lo am_libsquid_la_OBJECTS = comm.lo IPInterception.lo
libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS) libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
@ -155,7 +119,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@ENABLE_PINGER_TRUE@am__EXEEXT_1 = pinger$(EXEEXT) @ENABLE_PINGER_TRUE@am__EXEEXT_1 = pinger$(EXEEXT)
@USE_DNSSERVER_TRUE@am__EXEEXT_2 = dnsserver$(EXEEXT) @USE_DNSSERVER_TRUE@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;; \ *) f=$$p;; \
esac; esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
@ -166,7 +130,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
HEADERS = $(noinst_HEADERS) HEADERS = $(noinst_HEADERS)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
@@ -2552,9 +2550,7 @@ BUILT_SOURCES = \ @@ -2573,9 +2571,7 @@ BUILT_SOURCES = \
sysconf_DATA = \ sysconf_DATA = \
squid.conf.default \ squid.conf.default \
@ -177,7 +141,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
mib.txt mib.txt
LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ 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_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@ -202,7 +166,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
# Don't automatically uninstall config files # 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;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
@ -214,7 +178,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
@@ -4988,23 +4984,6 @@ clean-libtool: @@ -5023,23 +5019,6 @@ clean-libtool:
distclean-libtool: distclean-libtool:
-rm -f libtool -rm -f libtool
uninstall-info-am: uninstall-info-am:
@ -238,7 +202,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
install-sysconfDATA: $(sysconf_DATA) install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" 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) $(HEADERS)
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
@ -247,7 +211,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: $(BUILT_SOURCES) install: $(BUILT_SOURCES)
@@ -5366,7 +5345,7 @@ info: info-recursive @@ -5401,7 +5380,7 @@ info: info-recursive
info-am: info-am:
@ -256,7 +220,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
install-sbinPROGRAMS install-sysconfDATA install-sbinPROGRAMS install-sysconfDATA
@@ -5395,8 +5374,8 @@ ps: ps-recursive @@ -5430,8 +5409,8 @@ ps: ps-recursive
ps-am: ps-am:
@ -267,7 +231,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
uninstall-sbinPROGRAMS uninstall-sysconfDATA uninstall-sbinPROGRAMS uninstall-sysconfDATA
uninstall-info: uninstall-info-recursive 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 \ distclean-libtool distclean-recursive distclean-tags distdir \
dvi dvi-am html html-am info info-am install install-am \ dvi dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \ install-binPROGRAMS install-data install-data-am \
@ -293,7 +257,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
uninstall-libexecPROGRAMS uninstall-local \ uninstall-libexecPROGRAMS uninstall-local \
uninstall-sbinPROGRAMS uninstall-sysconfDATA 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 repl_modules.cc: repl_modules.sh Makefile
$(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc
@ -302,7 +266,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
else \ 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)"; \ echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
fi fi
@ -315,7 +279,7 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
uninstall-local: uninstall-local:
@@ -5499,6 +5483,10 @@ uninstall-local: @@ -5534,6 +5518,10 @@ uninstall-local:
echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
fi fi
@ -326,3 +290,39 @@ diff -up squid-3.0.STABLE7/src/Makefile.in.build squid-3.0.STABLE7/src/Makefile.
# Tell versions [3.59,3.63) of GNU make to not export all variables. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .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: Makefile.am,v 1.14.2.1 2008/02/27 10:55:13 amosjeffries Exp $
#
-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 \

37
squid-3.0.STABLE1-config.patch
View File

@ -1,7 +1,7 @@
diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.pre diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
--- squid-3.0.STABLE1/src/cf.data.pre.config 2007-11-16 00:33:05.000000000 +0100 --- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200
+++ squid-3.0.STABLE1/src/cf.data.pre 2008-01-23 12:11:12.000000000 +0100 +++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200
@@ -673,6 +673,7 @@ http_access deny CONNECT !SSL_ports @@ -703,6 +703,7 @@ http_access deny CONNECT !SSL_ports
http_access allow localnet http_access allow localnet
# And finally deny all other access to this proxy # And finally deny all other access to this proxy
@ -9,7 +9,7 @@ diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.
http_access deny all http_access deny all
NOCOMMENT_END NOCOMMENT_END
DOC_END DOC_END
@@ -2080,7 +2081,7 @@ DOC_END @@ -2135,7 +2136,7 @@ DOC_END
NAME: logfile_rotate NAME: logfile_rotate
TYPE: int TYPE: int
@ -18,7 +18,7 @@ diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.
LOC: Config.Log.rotateNumber LOC: Config.Log.rotateNumber
DOC_START DOC_START
Specifies the number of logfile rotations to make when you 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 purposes, so -k rotate uses another signal. It is best to get
in the habit of using 'squid -k rotate' instead of 'kill -USR1 in the habit of using 'squid -k rotate' instead of 'kill -USR1
<pid>'. <pid>'.
@ -26,7 +26,7 @@ diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.
DOC_END DOC_END
NAME: emulate_httpd_log NAME: emulate_httpd_log
@@ -3198,11 +3200,11 @@ COMMENT_END @@ -3254,11 +3256,11 @@ COMMENT_END
NAME: cache_mgr NAME: cache_mgr
TYPE: string TYPE: string
@ -40,13 +40,13 @@ diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.
DOC_END DOC_END
NAME: mail_from NAME: mail_from
@@ -4354,15 +4357,23 @@ TYPE: string @@ -4422,9 +4424,16 @@ TYPE: string
LOC: Config.errorDirectory LOC: Config.errorDirectory
DEFAULT: @DEFAULT_ERROR_DIR@ DEFAULT: @DEFAULT_ERROR_DIR@
DOC_START DOC_START
- If you wish to create your own versions of the default - If you wish to create your own versions of the default files, to
- (English) error files, either to customize them to suit your - customize them to suit your company copy the template files to
- language or company copy the template English files to another - another directory and point this tag at them.
+ Directory where the error files are read from. + Directory where the error files are read from.
+ /usr/lib/squid/errors contains sets of error files + /usr/lib/squid/errors contains sets of error files
+ in different languages. The default error directory + in different languages. The default error directory
@ -55,15 +55,8 @@ diff -up squid-3.0.STABLE1/src/cf.data.pre.config squid-3.0.STABLE1/src/cf.data.
+ +
+ If you wish to create your own versions of the error files, + If you wish to create your own versions of the error files,
+ either to customize them to suit your language or company, + either to customize them to suit your language or company,
+ copy the template English files to another + copy the template English files to another directory and
directory and point this tag at them. + point this tag at them.
The squid developers are interested in making squid available in Current Language updates can be downloaded from:
a wide variety of languages. If you are making translations for a http://www.squid-cache.org/Versions/langpack/
langauge that Squid does not currently provide please consider
contributing your translation back to the project.
+
+error_directory @DEFAULT_ERROR_DIR@
DOC_END
NAME: err_html_text

52
squid-3.0.STABLE2-fix_warnings.patch
View File

@ -1,52 +0,0 @@
diff -up squid-3.0.STABLE2/lib/util.c.fix_warnings squid-3.0.STABLE2/lib/util.c
--- squid-3.0.STABLE2/lib/util.c.fix_warnings 2007-12-06 03:37:15.000000000 +0100
+++ squid-3.0.STABLE2/lib/util.c 2008-04-03 13:00:40.000000000 +0200
@@ -931,8 +931,8 @@ xint64toa(int64_t num)
void
default_failure_notify(const char *message)
{
- write(2, message, strlen(message));
- write(2, "\n", 1);
+ if (write(2, message, strlen(message))) {}
+ if (write(2, "\n", 1)) {}
abort();
}
diff -up squid-3.0.STABLE2/src/tools.cc.fix_warnings squid-3.0.STABLE2/src/tools.cc
--- squid-3.0.STABLE2/src/tools.cc.fix_warnings 2008-04-03 13:05:11.000000000 +0200
+++ squid-3.0.STABLE2/src/tools.cc 2008-04-03 13:07:49.000000000 +0200
@@ -152,7 +152,7 @@ mail_warranty(void)
snprintf(command, 256, "%s %s < %s", Config.EmailProgram, Config.adminEmail, filename);
- system(command); /* XXX should avoid system(3) */
+ if (system(command)) {} /* XXX should avoid system(3) */
unlink(filename);
}
diff -up squid-3.0.STABLE2/src/comm.cc.fix_warnings squid-3.0.STABLE2/src/comm.cc
--- squid-3.0.STABLE2/src/comm.cc.fix_warnings 2008-02-27 11:45:50.000000000 +0100
+++ squid-3.0.STABLE2/src/comm.cc 2008-04-03 13:00:40.000000000 +0200
@@ -2220,7 +2220,7 @@ comm_accept(int fd, IOACB *handler, void
void CommIO::Initialise() {
/* Initialize done pipe signal */
int DonePipe[2];
- pipe(DonePipe);
+ if (pipe(DonePipe)) {}
DoneFD = DonePipe[1];
DoneReadFD = DonePipe[0];
fd_open(DoneReadFD, FD_PIPE, "async-io completetion event: main");
diff -up squid-3.0.STABLE2/src/StoreIOBuffer.h.fix_warnings squid-3.0.STABLE2/src/StoreIOBuffer.h
--- squid-3.0.STABLE2/src/StoreIOBuffer.h.fix_warnings 2007-08-13 19:20:51.000000000 +0200
+++ squid-3.0.STABLE2/src/StoreIOBuffer.h 2008-04-03 13:00:40.000000000 +0200
@@ -68,8 +68,8 @@ public:
void dump() const
{
- fwrite(data, length, 1, stderr);
- fwrite("\n", 1, 1, stderr);
+ if (fwrite(data, length, 1, stderr)) {}
+ if (fwrite("\n", 1, 1, stderr)) {}
}
struct

54
squid-3.0.STABLE5-configure_netfilter.patch
View File

@ -1,7 +1,7 @@
diff -up squid-3.0.STABLE7/configure.configure_netfilter squid-3.0.STABLE7/configure diff -up squid-3.0.STABLE9/configure.configure_netfilter squid-3.0.STABLE9/configure
--- squid-3.0.STABLE7/configure.configure_netfilter 2008-06-22 05:35:54.000000000 +0200 --- squid-3.0.STABLE9/configure.configure_netfilter 2008-09-09 18:06:45.000000000 +0200
+++ squid-3.0.STABLE7/configure 2008-10-08 22:03:53.000000000 +0200 +++ squid-3.0.STABLE9/configure 2008-10-19 23:29:03.000000000 +0200
@@ -24545,6 +24545,7 @@ cat >>conftest.$ac_ext <<_ACEOF @@ -24934,6 +24934,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#if HAVE_NETINET_IN_H #if HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
@ -9,20 +9,23 @@ diff -up squid-3.0.STABLE7/configure.configure_netfilter squid-3.0.STABLE7/confi
#include <$ac_header> #include <$ac_header>
diff -up squid-3.0.STABLE7/configure.in.configure_netfilter squid-3.0.STABLE7/configure.in diff -up squid-3.0.STABLE9/src/IPInterception.cc.configure_netfilter squid-3.0.STABLE9/src/IPInterception.cc
--- squid-3.0.STABLE7/configure.in.configure_netfilter 2008-06-22 05:35:54.000000000 +0200 --- squid-3.0.STABLE9/src/IPInterception.cc.configure_netfilter 2008-09-09 18:06:43.000000000 +0200
+++ squid-3.0.STABLE7/configure.in 2008-10-08 22:03:53.000000000 +0200 +++ squid-3.0.STABLE9/src/IPInterception.cc 2008-10-19 23:30:43.000000000 +0200
@@ -1943,6 +1943,7 @@ SQUID_DEFAULT_INCLUDES @@ -85,7 +85,9 @@
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif #endif
+#include <linux/types.h>
)
dnl *BSD dont include the depenencies for all their net/ and netinet/ files #if LINUX_NETFILTER
diff -up squid-3.0.STABLE7/src/forward.cc.configure_netfilter squid-3.0.STABLE7/src/forward.cc -#include <linux/types.h>
--- squid-3.0.STABLE7/src/forward.cc.configure_netfilter 2008-06-22 05:35:53.000000000 +0200 +#if HAVE_NETINET_IN_H
+++ squid-3.0.STABLE7/src/forward.cc 2008-10-08 22:03:53.000000000 +0200 +# include <netinet/in.h>
+#endif
#include <linux/netfilter_ipv4.h>
#endif
diff -up squid-3.0.STABLE9/src/forward.cc.configure_netfilter squid-3.0.STABLE9/src/forward.cc
--- squid-3.0.STABLE9/src/forward.cc.configure_netfilter 2008-09-09 18:06:44.000000000 +0200
+++ squid-3.0.STABLE9/src/forward.cc 2008-10-19 23:29:03.000000000 +0200
@@ -50,6 +50,10 @@ @@ -50,6 +50,10 @@
#include "Store.h" #include "Store.h"
@ -34,17 +37,14 @@ diff -up squid-3.0.STABLE7/src/forward.cc.configure_netfilter squid-3.0.STABLE7/
#include <linux/netfilter_ipv4/ip_tproxy.h> #include <linux/netfilter_ipv4/ip_tproxy.h>
#endif #endif
diff -up squid-3.0.STABLE7/src/IPInterception.cc.configure_netfilter squid-3.0.STABLE7/src/IPInterception.cc diff -up squid-3.0.STABLE9/configure.in.configure_netfilter squid-3.0.STABLE9/configure.in
--- squid-3.0.STABLE7/src/IPInterception.cc.configure_netfilter 2008-06-22 05:35:52.000000000 +0200 --- squid-3.0.STABLE9/configure.in.configure_netfilter 2008-09-09 18:06:45.000000000 +0200
+++ squid-3.0.STABLE7/src/IPInterception.cc 2008-10-08 22:03:53.000000000 +0200 +++ squid-3.0.STABLE9/configure.in 2008-10-19 23:29:03.000000000 +0200
@@ -85,6 +85,10 @@ @@ -1955,6 +1955,7 @@ SQUID_DEFAULT_INCLUDES
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif #endif
#if LINUX_NETFILTER
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#include <linux/types.h> +#include <linux/types.h>
#include <linux/netfilter_ipv4.h> )
#endif
dnl *BSD dont include the depenencies for all their net/ and netinet/ files

9
squid.spec
View File

@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99} ## % define __find_requires %{SOURCE99}
Name: squid Name: squid
Version: 3.0.STABLE7 Version: 3.0.STABLE9
Release: 4%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
License: GPLv2+ License: GPLv2+
@ -31,7 +31,6 @@ Patch202: squid-3.0.STABLE1-location.patch
Patch203: squid-3.0.STABLE1-build.patch Patch203: squid-3.0.STABLE1-build.patch
Patch204: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.0.STABLE1-smb-path.patch Patch205: squid-3.0.STABLE1-smb-path.patch
Patch206: squid-3.0.STABLE2-fix_warnings.patch
Patch207: squid-3.0.STABLE5-configure_netfilter.patch Patch207: squid-3.0.STABLE5-configure_netfilter.patch
Patch208: squid-3.0.STABLE7-from_manpg.patch Patch208: squid-3.0.STABLE7-from_manpg.patch
@ -64,7 +63,6 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch203 -p1 -b .build %patch203 -p1 -b .build
%patch204 -p1 -b .perlpath %patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path %patch205 -p1 -b .smb-path
%patch206 -p1 -b .fix_warnings
%patch207 -p1 -b .configure_netfilter %patch207 -p1 -b .configure_netfilter
%patch208 -p1 -b .from_manpg %patch208 -p1 -b .from_manpg
@ -339,6 +337,9 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog %changelog
* Sun Oct 19 2008 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE9-1
- update to latest upstream
* Thu Oct 09 2008 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE7-4 * Thu Oct 09 2008 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.0.STABLE7-4
- change logrotate to move instead of copytruncate - change logrotate to move instead of copytruncate