From 19826e313317ba3881dfe689f3abd73fcd4f6d63 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Wed, 9 Nov 2011 15:07:52 -0500 Subject: [PATCH] update for 1.10 --- krb5-1.10-doublelog.patch | 14 ++++++++++++++ krb5-1.7-doublelog.patch | 17 ----------------- 2 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 krb5-1.10-doublelog.patch delete mode 100644 krb5-1.7-doublelog.patch diff --git a/krb5-1.10-doublelog.patch b/krb5-1.10-doublelog.patch new file mode 100644 index 0000000..c20075c --- /dev/null +++ b/krb5-1.10-doublelog.patch @@ -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 diff --git a/krb5-1.7-doublelog.patch b/krb5-1.7-doublelog.patch deleted file mode 100644 index 7bd8604..0000000 --- a/krb5-1.7-doublelog.patch +++ /dev/null @@ -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 -