Wed Jan 23 14:07:55 UTC 2008

Author: mnagy

Update of /cvs/extras/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13543

Modified Files:
	.cvsignore sources squid.init squid.spec 
Added Files:
	squid-3.0.STABLE1-build.patch squid-3.0.STABLE1-config.patch 
	squid-3.0.STABLE1-location.patch 
	squid-3.0.STABLE1-perlpath.patch 
	squid-3.0.STABLE1-smb-path.patch 
Removed Files:
	squid-2.5.STABLE12-smb-path.patch 
	squid-2.5.STABLE4-location.patch 
	squid-2.5.STABLE4-perlpath.patch 
	squid-2.6.STABLE16-config.patch squid-2.6.STABLE16-fd.patch 
	squid-2.6.STABLE2-build.patch 
	squid-2.6.STABLE5-fd-config.patch 
Log Message:
* Wed Jan 23 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE1-1
- upgrade to latest upstream 3.0.STABLE1


squid-3.0.STABLE1-build.patch:

--- NEW FILE squid-3.0.STABLE1-build.patch ---
diff -up squid-3.0.STABLE1/src/Makefile.in.build squid-3.0.STABLE1/src/Makefile.in
--- squid-3.0.STABLE1/src/Makefile.in.build	2007-12-05 02:11:21.000000000 +0100
+++ squid-3.0.STABLE1/src/Makefile.in	2008-01-23 12:07:50.000000000 +0100
@@ -2610,18 +2610,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 = $(sysconfigdir)/mib.txt
 DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
 
 # Don't automatically uninstall config files
@@ -4986,20 +4986,20 @@ distclean-libtool:
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+	test -z "$(sysconfdir)/squid" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)/squid"
 	@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"; \
+	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$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"; \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
diff -up squid-3.0.STABLE1/errors/Makefile.in.build squid-3.0.STABLE1/errors/Makefile.in
--- squid-3.0.STABLE1/errors/Makefile.in.build	2007-12-05 02:10:48.000000000 +0100
+++ squid-3.0.STABLE1/errors/Makefile.in	2008-01-23 12:07:50.000000000 +0100
@@ -269,8 +269,8 @@ sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-errordir = $(datadir)/errors
-DEFAULT_ERROR_DIR = $(errordir)
+errordir = $(pkgdatadir)/errors
+DEFAULT_ERROR_DIR = $(sysconfdir)/errors
 INSTALL_LANGUAGES = @ERR_LANGUAGES@
 LANGUAGES = \
 		Armenian \
@@ -472,17 +472,17 @@ uninstall-am: uninstall-info-am uninstal
 
 install-data-local: 
 	@for l in $(INSTALL_LANGUAGES); do \
-		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
+		$(mkinstalldirs) $(DESTDIR)$(errordir)/$$l && \
 		for f in $(srcdir)/$$l/ERR_*; do \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(errordir)/$$l; \
 		done \
 	done
 
 uninstall-local:
 	@for l in $(INSTALL_LANGUAGES); do \
 		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	        	rm -f $(DESTDIR)$(errordir)/$$l/`basename $$f`; \
 		done \
 	done
 
@@ -495,13 +495,13 @@ uninstall-local:
 #
 addlang: all
 	- at if test -d $(srcdir)/$(ADDLANG); then \
-	if test -d $(DEFAULT_ERROR_DIR)/$(DESTLANG); then \
+	if test -d $(errordir)/$(DESTLANG); then \
 	cd $(srcdir)/$(ADDLANG)/ ; \
 	for f in ERR_*; do \
-		if test -f $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; then \
+		if test -f $(errordir)/$(DESTLANG)/$$f ; then \
 			echo "appending $(ADDLANG)/$$f"; \
-			echo "<HR>" >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f ; \
-			cat $$f >> $(DEFAULT_ERROR_DIR)/$(DESTLANG)/$$f; \
+			echo "<HR>" >> $(errordir)/$(DESTLANG)/$$f ; \
+			cat $$f >> $(errordir)/$(DESTLANG)/$$f; \
 		fi; \
 	done; \
 	fi \
diff -up squid-3.0.STABLE1/icons/Makefile.in.build squid-3.0.STABLE1/icons/Makefile.in
--- squid-3.0.STABLE1/icons/Makefile.in.build	2007-12-05 02:11:15.000000000 +0100
+++ squid-3.0.STABLE1/icons/Makefile.in	2008-01-23 12:07:50.000000000 +0100
@@ -306,7 +306,7 @@ ICON2 = anthony-bomb.gif \
 		anthony-xbm.gif \
 		anthony-xpm.gif
 
-icondir = $(datadir)/icons
+icondir = $(pkgdatadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = 

squid-3.0.STABLE1-config.patch:

--- NEW FILE squid-3.0.STABLE1-config.patch ---
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
 http_access allow localnet
 
 # And finally deny all other access to this proxy
+http_access allow localhost
 http_access deny all
 NOCOMMENT_END
 DOC_END
@@ -2080,7 +2081,7 @@ DOC_END
 
 NAME: logfile_rotate
 TYPE: int
-DEFAULT: 10
+DEFAULT: 0 
 LOC: Config.Log.rotateNumber
 DOC_START
 	Specifies the number of logfile rotations to make when you
@@ -2096,6 +2097,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>'.
+logfile_rotate 0
 DOC_END
 
 NAME: emulate_httpd_log
@@ -3198,11 +3200,11 @@ COMMENT_END
 
 NAME: cache_mgr
 TYPE: string
-DEFAULT: webmaster
+DEFAULT: root 
 LOC: Config.adminEmail
 DOC_START
 	Email-address of local cache manager who will receive
-	mail if the cache dies.  The default is "webmaster."
+	mail if the cache dies.  The default is "root."
 DOC_END
 
 NAME: mail_from
@@ -3242,7 +3244,7 @@ DOC_END
 
 NAME: cache_effective_group
 TYPE: string
-DEFAULT: none
+DEFAULT: squid 
 LOC: Config.effectiveGroup
 DOC_START
 	Squid sets the GID to the effective user's default group ID
@@ -3260,6 +3262,7 @@ DOC_START
 	This option is not recommended by the Squid Team.
 	Our preference is for administrators to configure a secure
 	user account for squid with UID/GID matching system policies.
+cache_effective_group squid
 DOC_END
 
 NAME: httpd_suppress_version_string
@@ -4354,15 +4357,23 @@ 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
 
 NAME: err_html_text

squid-3.0.STABLE1-location.patch:

--- NEW FILE squid-3.0.STABLE1-location.patch ---
diff -up squid-3.0.STABLE1/QUICKSTART.location squid-3.0.STABLE1/QUICKSTART
--- squid-3.0.STABLE1/QUICKSTART.location	2003-07-18 13:10:32.000000000 +0200
+++ squid-3.0.STABLE1/QUICKSTART	2008-01-23 12:07:50.000000000 +0100
@@ -12,10 +12,9 @@ After you retrieved, compiled and instal
 INSTALL in the same directory), you have to configure the squid.conf
 file. This is the list of the values you *need* to change, because no
 sensible defaults could be defined. Do not touch the other variables
-for now.  We assume you have installed Squid in the default location:
-/usr/local/squid
+for now.
 
-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
+Uncomment and edit the following lines in /etc/squid/squid.conf:
 
 ==============================================================================
 
@@ -26,7 +25,7 @@ cache_peer, never_direct/always_direct
     always ask permission before adding a parent cache. See also the
     never_direct/always_direct directives.
 
-cache_dir /usr/local/squid/var/cache 100 16 256
+cache_dir /var/spool/squid 100 16 256
 
     Add here (first number, here 100) the amount of hard disk space 
     (in megabytes) to devote to caching.
@@ -69,8 +68,8 @@ visible_hostname
 After editing squid.conf to your liking, run Squid from the command
 line TWICE:
 
-    % /usr/local/squid/sbin/squid -z
-    % /usr/local/squid/sbin/squid 
+    % /usr/sbin/squid -z
+    % /usr/sbin/squid 
 
 Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
 everything is all right.

squid-3.0.STABLE1-perlpath.patch:

--- NEW FILE squid-3.0.STABLE1-perlpath.patch ---
diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl
--- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath	1996-12-06 18:54:31.000000000 +0100
+++ squid-3.0.STABLE1/contrib/url-normalizer.pl	2008-01-23 12:07:50.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -Tw
+#!/usr/bin/perl -Tw
 
 # From:    Markus Gyger <mgyger at itr.ch>
 #

squid-3.0.STABLE1-smb-path.patch:

--- NEW FILE squid-3.0.STABLE1-smb-path.patch ---
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)\"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	5 Dec 2007 08:15:05 -0000	1.29
+++ .cvsignore	23 Jan 2008 14:07:15 -0000	1.30
@@ -1 +1 @@
-squid-2.6.STABLE17.tar.bz2
+squid-3.0.STABLE1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	5 Dec 2007 08:15:05 -0000	1.31
+++ sources	23 Jan 2008 14:07:15 -0000	1.32
@@ -1 +1 @@
-e6face0dff4ea054d3ba94236eb56ea1  squid-2.6.STABLE17.tar.bz2
+ec7458b00a68341854d91e7f6ece56ba  squid-3.0.STABLE1.tar.bz2


Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- squid.init	24 Jul 2007 14:32:02 -0000	1.9
+++ squid.init	23 Jan 2008 14:07:15 -0000	1.10
@@ -36,7 +36,7 @@
 # determine the name of the squid binary
 [ -f /usr/sbin/squid ] && SQUID=squid
 
-if [ $1 == 'status' ]; then
+if [ "$1" == "status" ]; then
 	[ -z "$SQUID" ] && exit 4
 else 
 	[ -z "$SQUID" ] && exit 1


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- squid.spec	5 Dec 2007 08:15:05 -0000	1.91
+++ squid.spec	23 Jan 2008 14:07:15 -0000	1.92
@@ -2,15 +2,15 @@
 %define __perl_requires %{SOURCE98}
 ## % define __find_requires %{SOURCE99}
 
-Summary:  The Squid proxy caching server
 Name:     squid
-Version:  2.6.STABLE17
+Version:  3.0.STABLE1
 Release:  1%{?dist}
+Summary:  The Squid proxy caching server
 Epoch:    7
-License:  GPL
+License:  GPLv2
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
-Source:   http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2
+Source:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
 Source1:  FAQ.sgml
 Source2:  squid.init
 Source3:  squid.logrotate
@@ -26,20 +26,19 @@
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-2.6.STABLE16-config.patch
-Patch202: squid-2.5.STABLE4-location.patch
-Patch203: squid-2.6.STABLE2-build.patch
-Patch204: squid-2.5.STABLE4-perlpath.patch
-Patch205: squid-2.5.STABLE12-smb-path.patch
-#Patch206: squid-2.6.STABLE5-fd-config.patch
-Patch206: squid-2.6.STABLE16-fd.patch
+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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
-Requires(post): chkconfig
-BuildPrereq: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service /sbin/chkconfig
+Requires(postun): /sbin/service
+BuildRequires: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
 Obsoletes: squid-novm
 
 %description
@@ -61,11 +60,10 @@
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
-%patch205 -p1 -b .smb
-%patch206 -p1 -b .fd
+%patch205 -p1 -b .smb-path
 
 %build
- export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
+export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 %configure \
    --exec_prefix=/usr \
    --bindir=%{_sbindir} \
@@ -73,40 +71,44 @@
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
-   --enable-epoll \
-   --enable-snmp \
-   --enable-removal-policies="heap,lru" \
-   --enable-storeio="aufs,coss,diskd,null,ufs" \
-   --enable-ssl \
-   --with-openssl=/usr/kerberos \
-   --enable-delay-pools \
-   --enable-linux-netfilter \
-   --with-pthreads \
-   --enable-ntlm-auth-helpers="SMB,fakeauth" \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
-   --enable-auth="basic,digest,ntlm" \
-   --enable-digest-auth-helpers="password" \
-   --with-winbind-auth-challenge \
-   --enable-useragent-log \
-   --enable-referer-log \
    --disable-dependency-tracking \
-   --enable-cachemgr-hostname=localhost \
-   --enable-underscores \
+   --enable-arp-acl \
+   --enable-auth="basic,digest,ntlm" \
    --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
    --enable-cache-digests \
+   --enable-cachemgr-hostname=localhost \
+   --enable-delay-pools \
+   --enable-digest-auth-helpers="password" \
+   --enable-epoll \
+   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
+   --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
-   --enable-follow-x-forwarded-for \
+   --enable-linux-netfilter \
+   --enable-ntlm-auth-helpers="SMB,fakeauth" \
+   --enable-referer-log \
+   --enable-removal-policies="heap,lru" \
+   --enable-snmp \
+   --enable-ssl \
+   --enable-storeio="aufs,coss,diskd,null,ufs" \
+   --enable-useragent-log \
    --enable-wccpv2 \
-   --enable-fd-config \
-   --with-maxfd=16384 \
-   --enable-arp-acl \
-
+   --with-aio \
+   --with-default-user="squid" \
+   --with-dl \
+   --with-openssl=/usr/kerberos \
+   --with-pthreads \
 
+# following options are no longer supported
+#   --with-winbind-auth-challenge \
+#   --enable-follow-x-forwarded-for \
+#   --enable-fd-config \
+#   --with-maxfd=16384 \
+#   --enable-underscores \
 
-export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
+export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
 
 mkdir faq
@@ -114,16 +116,13 @@
 cd faq
 sgml2html FAQ.sgml
 
-#cd ..
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
-	sysconfdir=$RPM_BUILD_ROOT/etc/squid \
-	localstatedir=$RPM_BUILD_ROOT/var \
-	bindir=$RPM_BUILD_ROOT/%{_sbindir} \
-	libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
-
+        sysconfdir=$RPM_BUILD_ROOT/etc/squid \
+        localstatedir=$RPM_BUILD_ROOT/var \
+        bindir=$RPM_BUILD_ROOT/%{_sbindir} \
+        libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 echo "
 #
 # This is /etc/httpd/conf.d/squid.conf
@@ -140,8 +139,8 @@
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-ln -s %{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
-ln -s %{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
+ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
+ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
@@ -155,6 +154,9 @@
 install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
 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
+iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
+mv -f ChangeLog.tmp ChangeLog
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
@@ -165,17 +167,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc faq/* README ChangeLog QUICKSTART doc/*
+%doc faq/*\.html README ChangeLog QUICKSTART
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
 %attr(755,root,root) %dir /etc/squid
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
-%attr(644,root,root) /etc/pam.d/squid
 %attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
 %attr(4750,root,squid) %{_libdir}/squid/pam_auth
-%attr(755,root,root) %{_sbindir}/cossdump
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
@@ -184,16 +184,18 @@
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
 %config(noreplace) /etc/squid/mib.txt
+# These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config(noreplace) /etc/pam.d/squid
+%config(noreplace) /etc/logrotate.d/squid
 
 %config(noreplace) /etc/squid/errors
 %dir %{_datadir}/squid
-%config(noreplace) %{_datadir}/squid/errors
-%config(noreplace) /etc/squid/icons
+%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/logrotate.d/squid
 %{_datadir}/squid/icons
 %{_sbindir}/squid
 %{_sbindir}/squidclient
@@ -210,11 +212,11 @@
 fi
 
 for i in /var/log/squid /var/spool/squid ; do
-	if [ -d $i ] ; then
-		for adir in `find $i -maxdepth 0 \! -user squid`; do
-			chown -R squid:squid $adir
-		done
-	fi
+        if [ -d $i ] ; then
+                for adir in `find $i -maxdepth 0 \! -user squid`; do
+                        chown -R squid:squid $adir
+                done
+        fi
 done
 
 exit 0
@@ -313,14 +315,14 @@
 
 %preun
 if [ $1 = 0 ] ; then
-	service squid stop >/dev/null 2>&1
-	rm -f /var/log/squid/*
-	/sbin/chkconfig --del squid
+        service squid stop >/dev/null 2>&1
+        rm -f /var/log/squid/*
+        /sbin/chkconfig --del squid
 fi
 
 %postun
 if [ "$1" -ge "1" ] ; then
-	service squid condrestart >/dev/null 2>&1
+        service squid condrestart >/dev/null 2>&1
 fi
 
 %triggerin -- samba-common
@@ -328,6 +330,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jan 23 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE1-1
+- upgrade to latest upstream 3.0.STABLE1
+
 * Tue Dec 04 2007 Martin Bacovsky <mbacovsk at redhat.com> - 2.6.STABLE17-1
 - upgrade to latest upstream 2.6.STABLE17
 


--- squid-2.5.STABLE12-smb-path.patch DELETED ---


--- squid-2.5.STABLE4-location.patch DELETED ---


--- squid-2.5.STABLE4-perlpath.patch DELETED ---


--- squid-2.6.STABLE16-config.patch DELETED ---


--- squid-2.6.STABLE16-fd.patch DELETED ---


--- squid-2.6.STABLE2-build.patch DELETED ---


--- squid-2.6.STABLE5-fd-config.patch DELETED ---


