Auto-symlink gcc44(-c++) (#970228) and mingw32-gcc(-c++) compilers.

- Fix bogus dates in %changelog.
- Run test suite during build.

.cvsignore

@@ -1 +0,0 @@
-ccache-2.4.tar.gz

.gitignore

@@ -0,0 +1 @@
+/ccache-2.4.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ccache
-# $Id: Makefile,v 1.2 2004/11/24 03:10:00 gafton Exp $
-NAME := ccache
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ccache.csh.in

@@ -1,16 +1,28 @@
-# Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
-# environment variable in their personal profile.
+# Use ccache by default.  Users who don't want that can setenv the
+# CCACHE_DISABLE environment variable in their personal profile.
 
 if ( "$path" !~ *@LIBDIR@/ccache* ) then
     set path = ( @LIBDIR@/ccache $path )
 endif
 
-# If @CACHEDIR@ is writable, use a shared cache there.  Users who don't
-# want that even if they have that write permission can set the CCACHE_DIR
-# and unset the CCACHE_UMASK environment variables in their personal profile.
+# If @CACHEDIR@ is writable, use a shared cache there, except for root.
+# Users who don't want that even if they have the write permission can setenv
+# the CCACHE_DIR environment variable to another location and possibly unsetenv
+# the CCACHE_UMASK environment variable in their personal profile.
 
-if ( ! $?CCACHE_DIR && -w @CACHEDIR@ && -d @CACHEDIR@ ) then
-    setenv CCACHE_DIR @CACHEDIR@
-    setenv CCACHE_UMASK 002
-    unsetenv CCACHE_HARDLINK
+if ( $?CCACHE_DIR ) then
+    if ( ! -w "$CCACHE_DIR" ) then
+        # Reset broken settings maybe inherited when switching users (#651023).
+        unsetenv CCACHE_DIR
+        unsetenv CCACHE_UMASK
+    endif
+else if ( $uid != 0 ) then
+    if ( -w @CACHEDIR@ && -d @CACHEDIR@ ) then
+        # Set up the shared cache.
+        setenv CCACHE_DIR @CACHEDIR@
+        setenv CCACHE_UMASK 002
+        unsetenv CCACHE_HARDLINK
+    endif
 endif
+
+setenv CCACHE_HASHDIR

ccache.sh.in

@@ -1,14 +1,29 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-pathmunge @LIBDIR@/ccache
+case ":${PATH:-}:" in
+    *:@LIBDIR@/ccache:*) ;;
+    *) PATH="@LIBDIR@/ccache${PATH:+:$PATH}" ;;
+esac
 
-# If @CACHEDIR@ is writable, use a shared cache there.  Users who don't
-# want that even if they have that write permission can set the CCACHE_DIR
-# and unset the CCACHE_UMASK environment variables in their personal profile.
+# If @CACHEDIR@ is writable, use a shared cache there, except for root.
+# Users who don't want that even if they have the write permission can set
+# the CCACHE_DIR environment variable to another location and possibly unset
+# the CCACHE_UMASK environment variables in their personal profile.
 
-if [ -z "$CCACHE_DIR" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
-    export CCACHE_DIR=@CACHEDIR@
-    export CCACHE_UMASK=002
-    unset CCACHE_HARDLINK
+if [ -n "${CCACHE_DIR:-}" ] ; then
+    if [ ! -w "$CCACHE_DIR" ] ; then
+        # Reset broken settings maybe inherited when switching users (#651023).
+        unset CCACHE_DIR
+        unset CCACHE_UMASK
+    fi
+elif [ "${EUID:-}" != 0 ] ; then
+    if [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+        # Set up the shared cache.
+        export CCACHE_DIR=@CACHEDIR@
+        export CCACHE_UMASK=002
+        unset CCACHE_HARDLINK
+    fi
 fi
+
+export CCACHE_HASHDIR=

ccache.spec

@@ -1,12 +1,12 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 gcc44 c++44 g++44 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++ i686-pc-mingw32-gcc i686-pc-mingw32-c++ i686-pc-mingw32-g++
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, gcc44, gcc44-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++, mingw32-gcc, mingw32-gcc-c++
 
 %define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
 Version:        2.4
-Release:        17%{?dist}
+Release:        21%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -23,10 +23,8 @@ Patch4:         http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
-# For pathmunge in profile.d/ccache.sh, #123621
-Requires:       setup >= 2.5.48
-Requires(triggerin): coreutils
-Requires(triggerpostun): coreutils
+# coreutils for triggerin, triggerpostun
+Requires: coreutils
 
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
@@ -68,6 +66,10 @@ done
 install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 
 
+%check
+make test
+
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -104,6 +106,22 @@ done
 
 
 %changelog
+* Tue Jun  4 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.4-21
+- Auto-symlink gcc44(-c++) (#970228) and mingw32-gcc(-c++) compilers.
+- Fix bogus dates in %%changelog.
+- Run test suite during build.
+
+* Sun Jan  8 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.4-20
+- Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil).
+- Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9.
+
+* Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 2.4-19
+- Reset non-working cache dir related env settings on user switch (#651023).
+- Make sh profile script "nounset" clean.
+
+* Fri Jun  4 2010 Ville Skyttä <ville.skytta@iki.fi> - 2.4-18
+- Don't use "pathmunge" in the profile.d sh script to work around #548960.
+
 * Sat Dec 19 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.4-17
 - Minor profile.d script performance improvements.
 - Fix hardcoded /var/cache/ccache in profile.d scripts.
@@ -163,7 +181,7 @@ done
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
+* Wed Apr  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
 - rebuilt
 
 * Sun Sep 26 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.4-0.fdr.1
@@ -198,7 +216,7 @@ done
 - Use %%{?_smp_mflags}.
 - Other cosmetic specfile tweaks.
 
-* Fri Mar 29 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.5
+* Sat Mar 29 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.5
 - Epoch: 0
 - Remove /usr/lib/ccache/sbin from PATH
 
@@ -249,5 +267,5 @@ done
 - Using ccache 2.2.1 sources
 - Changed release to redconcepts for consistency
 
-* Wed Oct 22 2002 Samir M. Nassar <rpm.redconcepts.net> 1.9-1.rcn
+* Tue Oct 22 2002 Samir M. Nassar <rpm.redconcepts.net> 1.9-1.rcn
 - Initial RedConcepts.NET (rcn) build for Red Hat Linux 8.0