From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 13 Jan 2010 20:36:55 +0000 (+0000)
Subject: [packages] krb5: move persistent database to /etc (#6475)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=0dfbf33e6e5ff09e4c5ef661a6e7c454dc9d9c8a;hp=757a63adec7180088b40b616be4983e2314bebba

[packages] krb5: move persistent database to /etc (#6475)


SVN-Revision: 19124
---

diff --git a/net/krb5/Makefile b/net/krb5/Makefile
index abdae6150e..d17e1d7444 100644
--- a/net/krb5/Makefile
+++ b/net/krb5/Makefile
@@ -59,6 +59,7 @@ define Build/Prepare
 	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-uclibc-symbol-collision-fix.patch"
+	patch -p1 -d "$(PKG_BUILD_DIR)" < "$(PATCH_DIR)/002-krb5kdc-dir-to-etc.patch"
 endef
 
 CONFIGURE_PATH = ./src
diff --git a/net/krb5/files/krb5kdc b/net/krb5/files/krb5kdc
index 2143363b11..5962683168 100644
--- a/net/krb5/files/krb5kdc
+++ b/net/krb5/files/krb5kdc
@@ -5,9 +5,9 @@ START=60
 
 start() {
 	mkdir -p /var/tmp
-	mkdir -p /var/krb5kdc
+	mkdir -p /etc/krb5kdc
 	
-	[ -f /var/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s
+	[ -f /etc/krb5kdc/principal ] || ( echo; echo ) | kdb5_util create -s
 	
 	/usr/sbin/krb5kdc
 }
diff --git a/net/krb5/patches/002-krb5kdc-dir-to-etc.patch b/net/krb5/patches/002-krb5kdc-dir-to-etc.patch
new file mode 100644
index 0000000000..17f4504fcd
--- /dev/null
+++ b/net/krb5/patches/002-krb5kdc-dir-to-etc.patch
@@ -0,0 +1,51 @@
+diff -u --recursive krb5-1.7-vanilla/src/include/osconf.hin krb5-1.7/src/include/osconf.hin
+--- krb5-1.7-vanilla/src/include/osconf.hin	2010-01-08 21:37:20.940046728 -0500
++++ krb5-1.7/src/include/osconf.hin	2010-01-08 21:38:54.152350440 -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