rpms/krb5/devel krb5-trunk-doublelog.patch, NONE, 1.1 krb5.spec, 1.158, 1.159 krb5-1.6.2-doublelog.patch, 1.1, NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/krb5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11970

Modified Files:
	krb5.spec 
Added Files:
	krb5-trunk-doublelog.patch 
Removed Files:
	krb5-1.6.2-doublelog.patch 
Log Message:
- add patch to suppress double-processing of /etc/krb5.conf when we build
  with --sysconfdir=/etc, thereby suppressing double-logging (#231147)


krb5-trunk-doublelog.patch:

--- NEW FILE krb5-trunk-doublelog.patch ---
Don't double-log (actually, don't process /etc/krb5.conf twice) just
because we built with --sysconfdir=/etc.  RT#3277

Index: src/include/Makefile.in
===================================================================
--- src/include/Makefile.in	(revision 20235)
+++ src/include/Makefile.in	(working copy)
@@ -67,7 +67,9 @@
 		  -e "s+ at SBINDIR+$(SBINDIR)+" \
 		  -e "s+ at MODULEDIR+$(MODULE_DIR)+" \
 	-e 's+ at LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
-	-e 's+ at SYSCONFDIR+$(SYSCONFDIR)+' 
+	-e 's+ at SYSCONFDIR+$(SYSCONFDIR)+' \
+	-e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
+	-e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+'
 
 OSCONFSRC = $(srcdir)/osconf.hin
 


Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- krb5.spec	25 Feb 2008 19:58:51 -0000	1.158
+++ krb5.spec	25 Feb 2008 20:53:41 -0000	1.159
@@ -81,7 +81,7 @@
 Patch52: krb5-1.6-ldap-man.patch
 Patch53: krb5-1.6-nodeplibs.patch
 Patch55: krb5-1.6.1-empty.patch
-Patch56: krb5-1.6.2-doublelog.patch
+Patch56: krb5-trunk-doublelog.patch
 Patch57: krb5-1.6.2-login_chdir.patch
 Patch58: krb5-1.6.2-key_exp.patch
 Patch59: krb5-trunk-kpasswd_tcp.patch
@@ -227,6 +227,10 @@
 
 %changelog
 * Mon Feb 25 2008 Nalin Dahyabhai <nalin at redhat.com>
+- add patch to suppress double-processing of /etc/krb5.conf when we build
+  with --sysconfdir=/etc, thereby suppressing double-logging (#231147)
+
+* Mon Feb 25 2008 Nalin Dahyabhai <nalin at redhat.com>
 - remove a patch, to fix problems with interfaces which are "up" but which
   have no address assigned, which conflicted with a different fix for the same
   problem in 1.5 (#200979)
@@ -1308,7 +1312,7 @@
 %patch52 -p0 -b .ldap_man
 %patch53 -p1 -b .nodeplibs
 #%patch55 -p1 -b .empty
-#%patch56 -p1 -b .doublelog
+%patch56 -p0 -b .doublelog
 #%patch57 -p1 -b .login_chdir
 %patch58 -p1 -b .key_exp
 %patch59 -p0 -b .kpasswd_tcp


--- krb5-1.6.2-doublelog.patch DELETED ---