[SSSD] [PATCH] RPM: Switch the default ccache location

Jakub Hrozek jhrozek at redhat.com
Mon Aug 27 13:06:16 UTC 2012


On Mon, Aug 27, 2012 at 11:25:50AM +0200, Jakub Hrozek wrote:
> On Mon, Aug 27, 2012 at 11:10:09AM +0200, Ondrej Kos wrote:
> > On 08/24/2012 04:57 PM, Jakub Hrozek wrote:
> > >The change of the ccache itself is a one-liner.
> > >
> > >The patch also adds an RPM patch that changes the default ccache
> > >location in the man pages we generate in the RPM. I think the upstream
> > >default should still stay set to FILE: for the sake of RHEL and other
> > >distributions.
> > >
> > >If maintaining the patch proves difficult, we can always revive
> > >https://fedorahosted.org/sssd/ticket/1378
> > >
> > >
> > >
> > >_______________________________________________
> > >sssd-devel mailing list
> > >sssd-devel at lists.fedorahosted.org
> > >https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
> > >
> > ACK
> > 
> 
> Self-nack, when I was about to push the patch I realized that the patch
> must be only applied conditionally as well.
> 
> Sorry, Ondrej, I'll resend a fixed version.

New patch is attached.
-------------- next part --------------
>From 82515d9f40480fce848b831a0e7657fcb3888a9b Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Fri, 24 Aug 2012 14:55:31 +0200
Subject: [PATCH] RPM: Switch the default ccache location

https://fedorahosted.org/sssd/ticket/1500
---
 Makefile.am                                      |  1 +
 contrib/sssd-1.9-man-change-default-ccache.patch | 21 +++++++++++++++++++++
 contrib/sssd.spec.in                             |  8 +++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 contrib/sssd-1.9-man-change-default-ccache.patch

diff --git a/Makefile.am b/Makefile.am
index 571ea55ca8e427eb8955b3f70199561c29b64f33..ecd180a9dd428f538339b0ae4682f157c0aff142 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1736,6 +1736,7 @@ rpmroot:
 rpmbrprep: dist-gzip rpmroot
 	cp $(builddir)/contrib/sssd.spec $(RPMBUILD)/SPECS
 	cp $(distdir).tar.gz $(RPMBUILD)/SOURCES
+	cp $(srcdir)/contrib/*.patch $(RPMBUILD)/SOURCES
 
 rpms: rpmbrprep
 	cd $(RPMBUILD); \
diff --git a/contrib/sssd-1.9-man-change-default-ccache.patch b/contrib/sssd-1.9-man-change-default-ccache.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9e7f8cb3f02d72e3b3408d0e4556e5c038b4ec97
--- /dev/null
+++ b/contrib/sssd-1.9-man-change-default-ccache.patch
@@ -0,0 +1,21 @@
+diff -up sssd-1.8.97/src/man/sssd-krb5.5.xml.ccachepath sssd-1.8.97/src/man/sssd-krb5.5.xml
+--- sssd-1.8.97/src/man/sssd-krb5.5.xml.ccachepath	2012-08-24 12:14:27.459225839 +0200
++++ sssd-1.8.97/src/man/sssd-krb5.5.xml	2012-08-24 12:14:43.845079652 +0200
+@@ -148,7 +148,7 @@
+                             </citerefentry> for details) is created.
+                         </para>
+                         <para>
+-                            Default: /tmp
++                            Default: /run/user/%U
+                         </para>
+                     </listitem>
+                 </varlistentry>
+@@ -208,7 +208,7 @@
+                             used to create a unique filename in a safe way.
+                         </para>
+                         <para>
+-                            Default: FILE:%d/krb5cc_%U_XXXXXX
++                            Default: DIR:%d/krb5cc
+                         </para>
+                     </listitem>
+                 </varlistentry>
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 873c737af4bdef16ce78dcf3a9d9a943346c3550..d2c88daa11b71581d62d85e03769c31ac75a39b6 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -19,7 +19,7 @@
 %endif
 
 %if (0%{?fedora} >= 17)
-    %global with_ccache --with-default-ccache-dir='/run/user/%U' --with-default-ccname-template="DIR:%d/ccdir"
+    %global with_ccache --with-default-ccache-dir='/run/user/%U' --with-default-ccname-template="DIR:%d/krb5cc"
 %endif
 
 %global enable_experimental 1
@@ -42,6 +42,9 @@ Source0: %{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Patches ###
+%if (0%{?fedora} >= 17)
+Patch0001:  sssd-1.9-man-change-default-ccache.patch
+%endif
 
 ### Dependencies ###
 
@@ -221,6 +224,9 @@ A utility library to allow communication between SUDO and SSSD
 
 %prep
 %setup -q
+%if (0%{?fedora} >= 17)
+%patch0001 -p1
+%endif
 
 %build
 
-- 
1.7.11.4



More information about the sssd-devel mailing list