From a0316e72b4ac08b65a9df19babe8b97633a96438 Mon Sep 17 00:00:00 2001 From: Henrik Nordström Date: May 23 2009 11:52:39 +0000 Subject: Bug #453304 - Squid requires restart after Network Manager connection setup --- diff --git a/squid-3.0.STABLE1-build.patch b/squid-3.0.STABLE1-build.patch index 577f7cf..da7d8df 100644 --- a/squid-3.0.STABLE1-build.patch +++ b/squid-3.0.STABLE1-build.patch @@ -1,6 +1,30 @@ -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 +diff -up squid-3.0.STABLE15/errors/Makefile.am.build squid-3.0.STABLE15/errors/Makefile.am +--- squid-3.0.STABLE15/errors/Makefile.am.build 2009-05-06 13:11:29.000000000 +0200 ++++ squid-3.0.STABLE15/errors/Makefile.am 2009-05-10 10:38:44.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.STABLE15/errors/Makefile.in.build squid-3.0.STABLE15/errors/Makefile.in +--- squid-3.0.STABLE15/errors/Makefile.in.build 2009-05-06 13:11:29.000000000 +0200 ++++ squid-3.0.STABLE15/errors/Makefile.in 2009-05-10 10:45:09.000000000 +0200 +@@ -218,7 +218,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) + INSTALL_LANGUAGES = templates @ERR_LANGUAGES@ + LANGUAGES = \ +diff -up squid-3.0.STABLE15/icons/Makefile.am.build squid-3.0.STABLE15/icons/Makefile.am +--- squid-3.0.STABLE15/icons/Makefile.am.build 2009-05-06 13:11:36.000000000 +0200 ++++ squid-3.0.STABLE15/icons/Makefile.am 2009-05-10 10:38:44.000000000 +0200 @@ -29,7 +29,7 @@ ICONS = anthony-binhex.gif \ anthony-xbm.gif \ anthony-xpm.gif @@ -10,10 +34,10 @@ diff -up squid-3.0.STABLE9/icons/Makefile.am.build squid-3.0.STABLE9/icons/Makef icon_DATA = $(ICONS) EXTRA_DIST = $(ICONS) DISTCLEANFILES = -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 \ +diff -up squid-3.0.STABLE15/icons/Makefile.in.build squid-3.0.STABLE15/icons/Makefile.in +--- squid-3.0.STABLE15/icons/Makefile.in.build 2009-05-06 13:11:36.000000000 +0200 ++++ squid-3.0.STABLE15/icons/Makefile.in 2009-05-10 10:45:13.000000000 +0200 +@@ -255,7 +255,7 @@ ICONS = anthony-binhex.gif \ anthony-xbm.gif \ anthony-xpm.gif @@ -22,22 +46,10 @@ diff -up squid-3.0.STABLE9/icons/Makefile.in.build squid-3.0.STABLE9/icons/Makef icon_DATA = $(ICONS) EXTRA_DIST = $(ICONS) DISTCLEANFILES = -@@ -324,9 +324,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign icons/Makefile -+ $(AUTOMAKE) --gnu icons/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -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 = \ +diff -up squid-3.0.STABLE15/src/Makefile.am.build squid-3.0.STABLE15/src/Makefile.am +--- squid-3.0.STABLE15/src/Makefile.am.build 2009-05-06 13:11:40.000000000 +0200 ++++ squid-3.0.STABLE15/src/Makefile.am 2009-05-10 10:38:44.000000000 +0200 +@@ -928,9 +928,7 @@ BUILT_SOURCES = \ sysconf_DATA = \ squid.conf.default \ @@ -48,7 +60,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile. mib.txt LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ -@@ -992,18 +990,18 @@ DEFAULT_PREFIX = $(prefix) +@@ -991,18 +989,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)/'` @@ -73,7 +85,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile. DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -@@ -1066,7 +1064,7 @@ cf.data: cf.data.pre Makefile +@@ -1065,7 +1063,7 @@ cf.data: cf.data.pre Makefile repl_modules.cc: repl_modules.sh Makefile $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc @@ -82,7 +94,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile. @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ else \ -@@ -1079,6 +1077,12 @@ install-data-local: install-sysconfDATA +@@ -1078,6 +1076,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 @@ -95,7 +107,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile. $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) uninstall-local: -@@ -1086,6 +1090,10 @@ uninstall-local: +@@ -1085,6 +1089,10 @@ uninstall-local: echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ fi @@ -106,10 +118,10 @@ diff -up squid-3.0.STABLE9/src/Makefile.am.build squid-3.0.STABLE9/src/Makefile. # Don't automatically uninstall config files # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ -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 = +diff -up squid-3.0.STABLE15/src/Makefile.in.build squid-3.0.STABLE15/src/Makefile.in +--- squid-3.0.STABLE15/src/Makefile.in.build 2009-05-06 13:11:40.000000000 +0200 ++++ squid-3.0.STABLE15/src/Makefile.in 2009-05-10 10:45:15.000000000 +0200 +@@ -136,8 +136,7 @@ libsquid_la_LIBADD = am_libsquid_la_OBJECTS = comm.lo IPInterception.lo libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ @@ -119,7 +131,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @ENABLE_PINGER_TRUE@am__EXEEXT_1 = pinger$(EXEEXT) @USE_DNSSERVER_TRUE@am__EXEEXT_2 = dnsserver$(EXEEXT) -@@ -1529,9 +1528,8 @@ am__vpath_adj = case $$p in \ +@@ -1576,9 +1575,8 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; @@ -128,9 +140,9 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. -DATA = $(data_DATA) $(sysconf_DATA) +DATA = $(sysconf_DATA) HEADERS = $(noinst_HEADERS) - ETAGS = etags - CTAGS = ctags -@@ -2573,9 +2571,7 @@ BUILT_SOURCES = \ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +@@ -2572,9 +2570,7 @@ BUILT_SOURCES = \ sysconf_DATA = \ squid.conf.default \ @@ -141,7 +153,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. mib.txt LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@ -@@ -2633,18 +2629,18 @@ DEFAULT_PREFIX = $(prefix) +@@ -2632,18 +2628,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)/'` @@ -166,25 +178,13 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ # Don't automatically uninstall config files -@@ -3965,9 +3961,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign src/Makefile -+ $(AUTOMAKE) --gnu src/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -5023,23 +5019,6 @@ clean-libtool: - distclean-libtool: - -rm -f libtool - uninstall-info-am: +@@ -5020,23 +5016,6 @@ clean-libtool: + -rm -rf .libs _libs + -rm -rf DiskIO/DiskDaemon/.libs DiskIO/DiskDaemon/_libs + -rm -rf tests/.libs tests/_libs -install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" +- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)" - @list='$(data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -201,63 +201,66 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. - done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" -@@ -5314,7 +5293,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRAR + test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +@@ -5310,7 +5289,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)$(sysconfdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -5401,7 +5380,7 @@ info: info-recursive +@@ -5397,7 +5376,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dataDATA +install-data-am: install-data-local - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ - install-sbinPROGRAMS install-sysconfDATA -@@ -5430,8 +5409,8 @@ ps: ps-recursive + install-dvi: install-dvi-recursive + +@@ -5434,9 +5413,8 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \ -- uninstall-info-am uninstall-libexecPROGRAMS uninstall-local \ -+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ -+ uninstall-libexecPROGRAMS uninstall-local \ - uninstall-sbinPROGRAMS uninstall-sysconfDATA +- uninstall-libexecPROGRAMS uninstall-local \ +- uninstall-sbinPROGRAMS uninstall-sysconfDATA ++uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ ++ uninstall-local uninstall-sbinPROGRAMS uninstall-sysconfDATA - 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 \ -- install-data-local install-dataDATA install-exec \ -- install-exec-am install-info install-info-am \ -- install-libexecPROGRAMS install-man install-sbinPROGRAMS \ -- install-strip install-sysconfDATA installcheck installcheck-am \ -- installdirs installdirs-am maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ -- tags tags-recursive uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ -+ install-data-local install-exec install-exec-am install-info \ -+ install-info-am install-libexecPROGRAMS install-man \ -+ install-sbinPROGRAMS install-strip install-sysconfDATA \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-info-am \ + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip +@@ -5449,17 +5427,16 @@ 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-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 \ ++ 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-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-libexecPROGRAMS uninstall-local \ uninstall-sbinPROGRAMS uninstall-sysconfDATA -@@ -5514,7 +5492,7 @@ cf.data: cf.data.pre Makefile +@@ -5519,7 +5496,7 @@ cf.data: cf.data.pre Makefile repl_modules.cc: repl_modules.sh Makefile $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc @@ -266,7 +269,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ else \ -@@ -5527,6 +5505,12 @@ install-data-local: install-sysconfDATA +@@ -5532,6 +5509,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 @@ -279,7 +282,7 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) uninstall-local: -@@ -5534,6 +5518,10 @@ uninstall-local: +@@ -5539,6 +5522,10 @@ uninstall-local: echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ fi @@ -290,39 +293,3 @@ diff -up squid-3.0.STABLE9/src/Makefile.in.build squid-3.0.STABLE9/src/Makefile. # 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: 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 \ diff --git a/squid-3.0.STABLE1-smb-path.patch b/squid-3.0.STABLE1-smb-path.patch deleted file mode 100644 index c1e85f5..0000000 --- a/squid-3.0.STABLE1-smb-path.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am ---- squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am.smb-path 2003-01-23 01:35:40.000000000 +0100 -+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.am 2008-01-23 12:17:22.000000000 +0100 -@@ -7,14 +7,14 @@ - # - - # 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.0.STABLE1/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.in ---- squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.in.smb-path 2007-12-05 02:10:56.000000000 +0100 -+++ squid-3.0.STABLE1/helpers/basic_auth/SMB/Makefile.in 2008-01-23 12:17:22.000000000 +0100 -@@ -23,7 +23,7 @@ - # - - # 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. - -@@ -306,7 +306,7 @@ subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - 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-3.0.STABLE15-smb-path.patch b/squid-3.0.STABLE15-smb-path.patch new file mode 100644 index 0000000..db7071f --- /dev/null +++ b/squid-3.0.STABLE15-smb-path.patch @@ -0,0 +1,41 @@ +diff -up squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am +--- squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am.smb-path 2009-05-06 13:11:32.000000000 +0200 ++++ squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.am 2009-05-23 13:23:34.000000000 +0200 +@@ -7,14 +7,14 @@ + # + + # 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.0.STABLE15/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in +--- squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in.smb-path 2009-05-06 13:11:32.000000000 +0200 ++++ squid-3.0.STABLE15/helpers/basic_auth/SMB/Makefile.in 2009-05-23 13:24:39.000000000 +0200 +@@ -23,7 +23,7 @@ + # + + # 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. + +@@ -259,7 +259,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + 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.nm b/squid.nm new file mode 100755 index 0000000..7deee94 --- /dev/null +++ b/squid.nm @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$2" = "up" ]; then + /sbin/service squid reload || : +fi diff --git a/squid.spec b/squid.spec index eaaeae9..ea6eab2 100644 --- a/squid.spec +++ b/squid.spec @@ -4,7 +4,7 @@ Name: squid Version: 3.0.STABLE15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 License: GPLv2+ @@ -16,6 +16,7 @@ Source2: squid.init Source3: squid.logrotate Source4: squid.sysconfig Source5: squid.pam +Source6: squid.nm Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh @@ -31,7 +32,7 @@ Patch201: squid-3.0.STABLE1-config.patch Patch202: squid-3.0.STABLE1-location.patch Patch203: squid-3.0.STABLE1-build.patch Patch204: squid-3.0.STABLE1-perlpath.patch -Patch205: squid-3.0.STABLE1-smb-path.patch +Patch205: squid-3.0.STABLE15-smb-path.patch Patch208: squid-3.0.STABLE7-from_manpg.patch Patch209: squid-3.0.STABLE13-gcc44.patch @@ -154,11 +155,13 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/sysconfig mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/ +mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/20-squid mkdir -p $RPM_BUILD_ROOT/var/log/squid mkdir -p $RPM_BUILD_ROOT/var/spool/squid chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl @@ -204,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %{_datadir}/squid/errors %attr(-,root,root) /etc/squid/icons %attr(755,root,root) /etc/rc.d/init.d/squid +%attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid %{_datadir}/squid/icons %{_sbindir}/squid %{_sbindir}/squidclient @@ -338,6 +342,9 @@ fi chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Sat May 23 2009 Henrik Nordstrom - 3.0.STABLE15-2 +- Bug #453304 - Squid requires restart after Network Manager connection setup + * Sat May 09 2009 Henrik Nordstrom 3.0.STABLE15-1 - Upgrade to 3.0.STABLE15