From b3f78cf0dcfa8f8b5812e3bc5b1906bbe7805858 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 15 Aug 2014 14:43:47 -0400 Subject: Update for 1.12.2 --- krb5-master-move-otp-sockets.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/krb5-master-move-otp-sockets.patch b/krb5-master-move-otp-sockets.patch index 4f7bdac..350a818 100644 --- a/krb5-master-move-otp-sockets.patch +++ b/krb5-master-move-otp-sockets.patch @@ -1,4 +1,4 @@ -Adjusted to apply after the local doublelog patch. +Adjusted to apply to 1.12.2. commit 1e4bdcfed2c7bda94d5c135cc32a5993ca032501 Author: Nathaniel McCallum @@ -103,8 +103,9 @@ diff --git a/src/configure.in b/src/configure.in index 2145d54..c2eaf78 100644 --- a/src/configure.in +++ b/src/configure.in -@@ -1,5 +1,11 @@ - K5_AC_INIT([aclocal.m4]) +@@ -9,6 +9,12 @@ + fi + AC_SUBST(SYSCONFCONF) +# If $runstatedir isn't set by autoconf (<2.70), set it manually. +if test x"$runstatedir" == x; then @@ -153,8 +154,8 @@ index e13042a..f83ff4e 100644 -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ + -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \ -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)+' \ + -e 's+@SYSCONFCONF+$(SYSCONFCONF)+' diff --git a/src/include/osconf.hin b/src/include/osconf.hin index 90ab86d..871503a 100644 --- a/src/include/osconf.hin -- cgit