From a6db4f2d64634c1b76b4ae8c2bfa0e1cf21617a2 Mon Sep 17 00:00:00 2001
From: "W. Michael Petullo" <mike@flyn.org>
Date: Sat, 16 Oct 2010 06:14:27 +0000
Subject: [PATCH] Return 001-krb5kdc-dir-to-etc.patch; move database from /var
 to /etc for persistence

SVN-Revision: 23471
---
 net/krb5/Makefile                             |  1 +
 net/krb5/patches/001-krb5kdc-dir-to-etc.patch | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 net/krb5/patches/001-krb5kdc-dir-to-etc.patch

diff --git a/net/krb5/Makefile b/net/krb5/Makefile
index fee15ce48..ac1856695 100644
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -53,6 +53,7 @@ define Build/Prepare
 	# containing source code.
 	tar xf "$(DL_DIR)/$(PKG_SOURCE)" -C "$(BUILD_DIR)"
 	tar xzf "$(BUILD_DIR)/krb5-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)"
+	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/001-krb5kdc-dir-to-etc.patch"
 endef
 
 CONFIGURE_PATH = ./src
diff --git a/net/krb5/patches/001-krb5kdc-dir-to-etc.patch b/net/krb5/patches/001-krb5kdc-dir-to-etc.patch
new file mode 100644
index 000000000..a01712503
--- /dev/null
+++ b/net/krb5/patches/001-krb5kdc-dir-to-etc.patch
@@ -0,0 +1,51 @@
+diff -u --recursive krb5-1.8-vanilla/src/include/osconf.hin krb5-1.8/src/include/osconf.hin
+--- krb5-1.8-vanilla/src/include/osconf.hin	2010-04-01 16:28:29.408661301 -0500
++++ krb5-1.8/src/include/osconf.hin	2010-04-01 16:30:52.235467788 -0500
+@@ -61,14 +61,14 @@
+ #define DEFAULT_LNAME_FILENAME  "@PREFIX/lib/krb5.aname"
+ #endif /* _WINDOWS  */
+ 
+-#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
+-#define DEFAULT_KEYFILE_STUB    "@LOCALSTATEDIR/krb5kdc/.k5."
+-#define KRB5_DEFAULT_ADMIN_ACL  "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
++#define DEFAULT_KDB_FILE        "/etc/krb5kdc/principal"
++#define DEFAULT_KEYFILE_STUB    "/etc/krb5kdc/.k5."
++#define KRB5_DEFAULT_ADMIN_ACL  "/etc/krb5kdc/krb5_adm.acl"
+ /* Used by old admin server */
+-#define DEFAULT_ADMIN_ACL       "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
++#define DEFAULT_ADMIN_ACL       "/etc/krb5kdc/kadm_old.acl"
+ 
+ /* Location of KDC profile */
+-#define DEFAULT_KDC_PROFILE     "@LOCALSTATEDIR/krb5kdc/kdc.conf"
++#define DEFAULT_KDC_PROFILE     "/etc/krb5kdc/kdc.conf"
+ #define KDC_PROFILE_ENV         "KRB5_KDC_PROFILE"
+ 
+ #if TARGET_OS_MAC
+@@ -97,8 +97,8 @@
+ /*
+  * Defaults for the KADM5 admin system.
+  */
+-#define DEFAULT_KADM5_KEYTAB    "@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
+-#define DEFAULT_KADM5_ACL_FILE  "@LOCALSTATEDIR/krb5kdc/kadm5.acl"
++#define DEFAULT_KADM5_KEYTAB    "/etc/krb5kdc/kadm5.keytab"
++#define DEFAULT_KADM5_ACL_FILE  "/etc/krb5kdc/kadm5.acl"
+ #define DEFAULT_KADM5_PORT      749 /* assigned by IANA */
+ 
+ #define KRB5_DEFAULT_SUPPORTED_ENCTYPES                 \
+@@ -123,13 +123,13 @@
+  * krb5 slave support follows
+  */
+ 
+-#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
+-#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
++#define KPROP_DEFAULT_FILE "/etc/krb5kdc/slave_datatrans"
++#define KPROPD_DEFAULT_FILE "/etc/krb5kdc/from_master"
+ #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
+ #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
+ #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
+ #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
+-#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
++#define KPROPD_ACL_FILE "/etc/krb5kdc/kpropd.acl"
+ 
+ /*
+  * GSS mechglue
-- 
2.30.2