update for 1.10
This commit is contained in:
parent
440e28a51c
commit
19826e3133
14
krb5-1.10-doublelog.patch
Normal file
14
krb5-1.10-doublelog.patch
Normal file
@ -0,0 +1,14 @@
|
||||
Don't double-log (actually, don't process /etc/krb5.conf twice) just
|
||||
because we built with --sysconfdir=/etc. RT#3277
|
||||
|
||||
--- krb5/src/include/Makefile.in
|
||||
+++ krb5/src/include/Makefile.in
|
||||
@@ -67,6 +67,8 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(
|
||||
-e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
|
||||
-e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
|
||||
-e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
|
||||
+ -e 's+:/etc/krb5.conf:/etc/krb5.conf"+:/etc/krb5.conf"+' \
|
||||
+ -e 's+"/etc/krb5.conf:/etc/krb5.conf"+"/etc/krb5.conf"+' \
|
||||
-e 's+@DYNOBJEXT+$(DYNOBJEXT)+'
|
||||
|
||||
OSCONFSRC = $(srcdir)/osconf.hin
|
@ -1,17 +0,0 @@
|
||||
Don't double-log (actually, don't process /etc/krb5.conf twice) just
|
||||
because we built with --sysconfdir=/etc. RT#3277
|
||||
|
||||
diff -up krb5-1.7/src/include/Makefile.in krb5-1.7/src/include/Makefile.in
|
||||
--- krb5-1.7/src/include/Makefile.in 2009-04-15 16:06:35.000000000 -0400
|
||||
+++ krb5-1.7/src/include/Makefile.in 2009-06-04 14:35:12.000000000 -0400
|
||||
@@ -67,7 +67,9 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(
|
||||
-e "s+@MODULEDIR+$(MODULE_DIR)+" \
|
||||
-e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
|
||||
-e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
|
||||
- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+'
|
||||
+ -e 's+@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
|
||||
|
Loading…
Reference in New Issue
Block a user