rpms / squid

Clone
Source Code
GIT

Files

f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f21 f22 f23 f24 f25 f26 f27 f28 f29 f30 f31 f32 f33 f34 f35 f36 f37 f38 f39 f40 f7 f8 f9 main rawhide stream-4 stream-4.0
  1.   f10
  2.   squid-3.0.STABLE1-build.patch
Blob Blame History Raw 
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
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS)
 DISTCLEANFILES = 
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
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICONS)
 EXTRA_DIST = $(ICONS)
 DISTCLEANFILES = 
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 \
-	mime.conf.default
-
-data_DATA = \
+	mime.conf.default \
 	mib.txt
 
 LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
@@ -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)/'`
-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 | 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@
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
@@ -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
 
-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 \
@@ -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
+	@if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
+	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIB_PATH)" ; \
+	else \
+	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH); \
+	fi
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local:
@@ -1085,6 +1089,10 @@ uninstall-local:
 		echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
 		$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
 	fi
+	@if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
+		echo "rm -f $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
+		$(RM) -f $(DESTDIR)$(DEFAULT_MIB_PATH); \
+	fi
 
 # Don't automatically uninstall config files
 #	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
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)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" \
-	"$(DESTDIR)$(sysconfdir)"
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sysconfdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 @ENABLE_PINGER_TRUE@am__EXEEXT_1 = pinger$(EXEEXT)
 @USE_DNSSERVER_TRUE@am__EXEEXT_2 = dnsserver$(EXEEXT)
@@ -1576,9 +1575,8 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dataDATA_INSTALL = $(INSTALL_DATA)
 sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(data_DATA) $(sysconf_DATA)
+DATA = $(sysconf_DATA)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -2572,9 +2570,7 @@ BUILT_SOURCES = \
 
 sysconf_DATA = \
 	squid.conf.default \
-	mime.conf.default
-
-data_DATA = \
+	mime.conf.default \
 	mib.txt
 
 LDADD = libsquid.la libauth.la -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ @MINGW_LIBS@
@@ -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)/'`
-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 | 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
@@ -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)"
-	@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"; \
-	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"; \
-	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
 	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"; \
 	done
 install: $(BUILT_SOURCES)
@@ -5397,7 +5376,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-dataDATA
+install-data-am: install-data-local
 
 install-dvi: install-dvi-recursive
 
@@ -5434,9 +5413,8 @@ 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-sbinPROGRAMS uninstall-sysconfDATA
 
 .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
 
@@ -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
 
-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 \
@@ -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
+	@if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
+	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIB_PATH)" ; \
+	else \
+	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_MIB_PATH); \
+	fi
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local:
@@ -5539,6 +5522,10 @@ uninstall-local:
 		echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
 		$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
 	fi
+	@if test -f $(DESTDIR)$(DEFAULT_MIB_PATH) ; then \
+		echo "rm -f $(DESTDIR)$(DEFAULT_MIB_PATH)"; \
+		$(RM) -f $(DESTDIR)$(DEFAULT_MIB_PATH); \
+	fi
 # 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:
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.