From 61e480e7492a8b7ab3f5ec6db478ba7c88b27e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= Date: Mon, 31 Aug 2009 23:29:40 +0000 Subject: [PATCH] more patches updated for 3.1 --- squid-3.1.0.13-build.patch | 248 ++++++++++++++++++++++++++++++++++ squid-3.1.0.13-smb-path.patch | 37 +++++ squid.spec-3.1 | 8 +- 3 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 squid-3.1.0.13-build.patch create mode 100644 squid-3.1.0.13-smb-path.patch diff --git a/squid-3.1.0.13-build.patch b/squid-3.1.0.13-build.patch new file mode 100644 index 0000000..c25dbf4 --- /dev/null +++ b/squid-3.1.0.13-build.patch @@ -0,0 +1,248 @@ +diff -up squid-3.1.0.13/errors/Makefile.am.build squid-3.1.0.13/errors/Makefile.am +--- squid-3.1.0.13/errors/Makefile.am.build 2009-08-04 15:32:08.000000000 +0200 ++++ squid-3.1.0.13/errors/Makefile.am 2009-09-01 01:21:40.000000000 +0200 +@@ -3,7 +3,7 @@ + # $Id$ + # + +-errordir = $(datadir)/errors ++errordir = $(pkgdatadir)/errors + + ##dist-hook eveything + +diff -up squid-3.1.0.13/errors/Makefile.in.build squid-3.1.0.13/errors/Makefile.in +--- squid-3.1.0.13/errors/Makefile.in.build 2009-08-04 15:32:30.000000000 +0200 ++++ squid-3.1.0.13/errors/Makefile.in 2009-09-01 01:23:39.000000000 +0200 +@@ -221,7 +221,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-errordir = $(datadir)/errors ++errordir = $(pkgdatadir)/errors + DEFAULT_ERROR_DIR = $(errordir) + DEFAULT_STYLESHEET = $(sysconfdir)/errorpage.css + TRANSLATIONPO = `ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//` +diff -up squid-3.1.0.13/icons/Makefile.am.build squid-3.1.0.13/icons/Makefile.am +--- squid-3.1.0.13/icons/Makefile.am.build 2009-08-04 15:32:10.000000000 +0200 ++++ squid-3.1.0.13/icons/Makefile.am 2009-09-01 01:10:05.000000000 +0200 +@@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \ + anthony-xbm.gif \ + anthony-xpm.gif + +-icondir = $(datadir)/icons ++icondir = $(pkgdatadir)/icons + icon_DATA = $(ICONS) + EXTRA_DIST = $(ICONS) + DISTCLEANFILES = +diff -up squid-3.1.0.13/icons/Makefile.in.build squid-3.1.0.13/icons/Makefile.in +--- squid-3.1.0.13/icons/Makefile.in.build 2009-08-04 15:32:35.000000000 +0200 ++++ squid-3.1.0.13/icons/Makefile.in 2009-09-01 01:23:45.000000000 +0200 +@@ -258,7 +258,7 @@ ICONS = anthony-binhex.gif \ + anthony-xbm.gif \ + anthony-xpm.gif + +-icondir = $(datadir)/icons ++icondir = $(pkgdatadir)/icons + icon_DATA = $(ICONS) + EXTRA_DIST = $(ICONS) + DISTCLEANFILES = +diff -up squid-3.1.0.13/src/Makefile.am.build squid-3.1.0.13/src/Makefile.am +--- squid-3.1.0.13/src/Makefile.am.build 2009-08-04 15:32:13.000000000 +0200 ++++ squid-3.1.0.13/src/Makefile.am 2009-09-01 01:20:45.000000000 +0200 +@@ -639,7 +639,7 @@ sysconf_DATA = \ + squid.conf.documented \ + mime.conf.default + +-data_DATA = \ ++pkgdata_DATA = + mib.txt + + LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ +@@ -712,13 +712,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_ + DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log + DEFAULT_PID_FILE = @DEFAULT_PIDFILE@ + DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++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 | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_ICON_DIR = $(datadir)/icons +-DEFAULT_ERROR_DIR = $(datadir)/errors +-DEFAULT_MIB_PATH = $(datadir)/mib.txt ++DEFAULT_ICON_DIR = $(pkgdatadir)/icons ++DEFAULT_ERROR_DIR = $(pkgdatadir)/errors ++DEFAULT_MIB_PATH = $(pkgdatadir)/mib.txt + DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ + + # Make location configure settings available to the code +@@ -785,7 +785,7 @@ cf.data: cf.data.pre Makefile + repl_modules.cc: repl_modules.sh Makefile + $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc + +-install-data-local: install-sysconfDATA install-dataDATA ++install-data-local: install-sysconfDATA + @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ + else \ +diff -up squid-3.1.0.13/src/Makefile.in.build squid-3.1.0.13/src/Makefile.in +--- squid-3.1.0.13/src/Makefile.in.build 2009-08-04 15:32:36.000000000 +0200 ++++ squid-3.1.0.13/src/Makefile.in 2009-09-01 01:23:47.000000000 +0200 +@@ -130,7 +130,7 @@ am_libsquid_la_OBJECTS = comm.lo CommCal + SquidConfig.lo TextException.lo + libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS) + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ +- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" \ ++ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" \ + "$(DESTDIR)$(sysconfdir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + @USE_DNSSERVER_TRUE@am__EXEEXT_1 = dnsserver$(EXEEXT) +@@ -1317,9 +1317,9 @@ am__vpath_adj = case $$p in \ + *) f=$$p;; \ + esac; + am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-dataDATA_INSTALL = $(INSTALL_DATA) ++pkgdataDATA_INSTALL = $(INSTALL_DATA) + sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(data_DATA) $(sysconf_DATA) ++DATA = $(pkgdata_DATA) $(sysconf_DATA) + HEADERS = $(noinst_HEADERS) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +@@ -1850,9 +1850,7 @@ sysconf_DATA = \ + squid.conf.documented \ + mime.conf.default + +-data_DATA = \ +- mib.txt +- ++pkgdata_DATA = + LDADD = $(COMMON_LIBS) -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ + EXTRA_DIST = \ + cf_gen_defines \ +@@ -1920,13 +1918,13 @@ DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFI + DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log + DEFAULT_PID_FILE = @DEFAULT_PIDFILE@ + DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++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 | sed '$(transform);s/$$/$(EXEEXT)/'` +-DEFAULT_ICON_DIR = $(datadir)/icons +-DEFAULT_ERROR_DIR = $(datadir)/errors +-DEFAULT_MIB_PATH = $(datadir)/mib.txt ++DEFAULT_ICON_DIR = $(pkgdatadir)/icons ++DEFAULT_ERROR_DIR = $(pkgdatadir)/errors ++DEFAULT_MIB_PATH = $(pkgdatadir)/mib.txt + DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ + + # stock tools for unit tests - library independent versions of dlink_list +@@ -4023,22 +4021,22 @@ clean-libtool: + -rm -rf .libs _libs + -rm -rf DiskIO/DiskDaemon/.libs DiskIO/DiskDaemon/_libs + -rm -rf tests/.libs tests/_libs +-install-dataDATA: $(data_DATA) ++install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) +- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" +- @list='$(data_DATA)'; for p in $$list; do \ ++ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" ++ @list='$(pkgdata_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 " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ ++ $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done + +-uninstall-dataDATA: ++uninstall-pkgdataDATA: + @$(NORMAL_UNINSTALL) +- @list='$(data_DATA)'; for p in $$list; do \ ++ @list='$(pkgdata_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)$(pkgdatadir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ + done + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) +@@ -4313,7 +4311,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR + $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -4378,7 +4376,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-data-local install-dataDATA ++install-data-am: install-data-local install-pkgdataDATA + + install-dvi: install-dvi-recursive + +@@ -4415,9 +4413,9 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \ +- uninstall-libexecPROGRAMS uninstall-local \ +- uninstall-sbinPROGRAMS uninstall-sysconfDATA ++uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ ++ uninstall-local uninstall-pkgdataDATA uninstall-sbinPROGRAMS \ ++ uninstall-sysconfDATA + + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip +@@ -4430,19 +4428,19 @@ uninstall-am: uninstall-binPROGRAMS unin + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ +- install-data install-data-am install-data-local \ +- install-dataDATA install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-libexecPROGRAMS install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-libexecPROGRAMS install-man install-pdf install-pdf-am \ ++ install-pkgdataDATA install-ps install-ps-am \ + install-sbinPROGRAMS install-strip install-sysconfDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-binPROGRAMS uninstall-dataDATA \ +- uninstall-libexecPROGRAMS uninstall-local \ +- uninstall-sbinPROGRAMS uninstall-sysconfDATA ++ uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ ++ uninstall-local uninstall-pkgdataDATA uninstall-sbinPROGRAMS \ ++ uninstall-sysconfDATA + + + $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h +@@ -4450,6 +4448,7 @@ cf_gen.$(OBJEXT): cf_gen_defines.h + + DiskIO/DiskIOModules_gen.cc: Makefile + $(SHELL) $(srcdir)/DiskIO/modules.sh $(DISK_MODULES) > DiskIO/DiskIOModules_gen.cc ++ mib.txt + + snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h + +@@ -4508,7 +4507,7 @@ cf.data: cf.data.pre Makefile + repl_modules.cc: repl_modules.sh Makefile + $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc + +-install-data-local: install-sysconfDATA install-dataDATA ++install-data-local: install-sysconfDATA + @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ + else \ diff --git a/squid-3.1.0.13-smb-path.patch b/squid-3.1.0.13-smb-path.patch new file mode 100644 index 0000000..037146e --- /dev/null +++ b/squid-3.1.0.13-smb-path.patch @@ -0,0 +1,37 @@ +diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am +--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-08-04 15:32:09.000000000 +0200 ++++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.am 2009-09-01 01:26:27.000000000 +0200 +@@ -9,14 +9,14 @@ + include $(top_srcdir)/src/Common.am + + # SAMBAPREFIX must point to the directory where Samba has been installed. +-# By default, Samba is installed in /usr/local/samba. If you changed this ++# By default, Samba is installed in /usr. If you changed this + # by using the --prefix option when configuring Samba, you need to change + # SAMBAPREFIX accordingly. + + ## FIXME: autoconf should test for the samba path. + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX=/usr/local/samba ++SAMBAPREFIX=/usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +diff -up squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in +--- squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-08-04 15:32:31.000000000 +0200 ++++ squid-3.1.0.13/helpers/basic_auth/SMB/Makefile.in 2009-09-01 01:27:11.000000000 +0200 +@@ -266,11 +266,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi + -I$(top_builddir)/include @SQUID_CPPUNIT_INC@ -I$(srcdir) + + # SAMBAPREFIX must point to the directory where Samba has been installed. +-# By default, Samba is installed in /usr/local/samba. If you changed this ++# By default, Samba is installed in /usr. If you changed this + # by using the --prefix option when configuring Samba, you need to change + # SAMBAPREFIX accordingly. + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX = /usr/local/samba ++SAMBAPREFIX = /usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + libexec_SCRIPTS = $(SMB_AUTH_HELPER) + smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\" diff --git a/squid.spec-3.1 b/squid.spec-3.1 index 95352ae..a748bb9 100644 --- a/squid.spec-3.1 +++ b/squid.spec-3.1 @@ -10,7 +10,7 @@ # bit of dependencies there Name: squid -Version: 3.1.0.9 +Version: 3.1.0.13 Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 @@ -37,9 +37,9 @@ Source98: perl-requires-squid.sh # will break upstream ones. Patch201: squid-3.1.0.9-config.patch Patch202: squid-3.1.0.9-location.patch -Patch203: squid-3.0.STABLE1-build.patch +Patch203: squid-3.1.0.13-build.patch Patch204: squid-3.0.STABLE1-perlpath.patch -Patch205: squid-3.0.STABLE15-smb-path.patch +Patch205: squid-3.1.0.13-smb-path.patch Patch208: squid-3.0.STABLE7-from_manpg.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -82,6 +82,8 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned --localstatedir=/var \ --datadir=%{_datadir} \ --sysconfdir=/etc/squid \ + --with-logdir='$(localstatedir)/logs' \ + --with-pidfile='$(localstatedir)/run/squid.pid' \ --disable-dependency-tracking \ --enable-arp-acl \ --enable-auth="basic,digest,ntlm,negotiate" \