main/heimdal: use shared krb5-conf package + misc cleanups

- let heimdal-libs depend on krb5-conf
- rename init.d script in git repo to .initd and add them to $source
  (for consistency)

4 files changed, 22 insertions, 15 deletions

diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index aa1b53a642..767ee41789 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,12 +2,12 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.5.2
-pkgrel=6
+pkgrel=7
 pkgdesc="An implementation of Kerberos 5"
 arch="all"
 url="http://www.h5l.org/"
 license="BSD"
-depends=
+depends="krb5-conf"
 depends_dev="openssl-dev e2fsprogs-dev db-dev"
 makedepends="$depends_dev autoconf automake bash gawk libtool
 	ncurses-dev perl readline-dev sqlite-dev texinfo"
@@ -16,6 +16,10 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs
 	$pkgname-ftp $pkgname-telnet $pkgname-su $pkgname-rsh $pkgname-rcp
 	$pkgname-pagsh $pkgname-kf"
 source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz
+	heimdal-kadmind.initd
+	heimdal-kdc.initd
+	heimdal-kpasswdd.initd
+
 	003_all_heimdal-rxapps.patch
 	005_all_heimdal-suid_fix.patch
 	014_all_heimdal-path.patch
@@ -42,10 +46,6 @@ prepare() {
 	# name clash with ruserpass in netdb.h
 	sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1
 
-#	sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
-#	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
-#	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5 || return 1
-
 	sh ./autogen.sh || return 1
 }
 
@@ -82,15 +82,12 @@ package() {
 
 	rm "$pkgdir"/usr/lib/*.la
 
-	install -m644 -D krb5.conf ${pkgdir}/etc/krb5.conf || return 1
-	install -m755 -D ../../heimdal-kadmind.init ${pkgdir}/etc/init.d/heimdal-kadmind
-	install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc
-	install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd
-
-	# Remove editline, we use libreadline
-	#rm ${pkgdir}/usr/lib/libeditline.* || return 1
-	#rm ${pkgdir}/usr/include/editline.h || return 1
-	#rm ${pkgdir}/usr/share/man/man3/editline.* || return 1
+	install -m755 -D "$srcdir"/heimdal-kadmind.initd \
+		"$pkgdir"/etc/init.d/heimdal-kadmind || return 1
+	install -m755 -D "$srcdir"/heimdal-kdc.initd \
+		"$pkgdir"/etc/init.d/heimdal-kdc || return 1
+	install -m755 -D "$srcdir"/heimdal-kpasswdd.initd \
+		"$pkgdir"/etc/init.d/heimdal-kpasswdd || return 1
 
 	# Rename daemons and their manpages
 	for i in telnetd ftpd rshd; do
@@ -139,6 +136,7 @@ package() {
 libs() {
 	pkgdesc="Heimdal libraries"
 	replaces="heimdal"
+	depends="krb5-conf"
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ || return 1
 	mv "$pkgdir"/usr/bin/string2key \
@@ -192,6 +190,9 @@ kf() {
 }
 
 md5sums="bb23d9dbdafd395d816f7abc598481a1  heimdal-1.5.2.tar.gz
+43aa0e59d7c25aca2d362e1b980a90ee  heimdal-kadmind.initd
+2be6ab7b49a076e078f34913d65bcaad  heimdal-kdc.initd
+f4811d443f68fe11946a031ada8ce125  heimdal-kpasswdd.initd
 2feec3924ee5230b54175b4d4000c872  003_all_heimdal-rxapps.patch
 45aeb207f360f9f4e9e0fabc8bfeecbc  005_all_heimdal-suid_fix.patch
 8208ae8c0b6ff5ab4f64af1693e9e396  014_all_heimdal-path.patch
@@ -201,6 +202,9 @@ a14b9001271c3b794b083c25936ebe21  heimdal_missing_symbols.patch
 dbe4106d1ca938587c948ee34121c020  heimdal-1.5-use-perl-Getopt_Std.patch
 53201e2a953c47a7437ce0222c4fb80d  heimdal_texinfo-5.patch"
 sha256sums="22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec  heimdal-1.5.2.tar.gz
+0fb8800c421a0a129c9c23c74498a9fbaaaf89d5730b186795ce325d8fcfc294  heimdal-kadmind.initd
+ad51a116ec8a7d3cab7632335e76f99732b8115d929584c5fce6f0ed5b010d64  heimdal-kdc.initd
+2fa5e47a6a9cbaafa5689f1771b5aa68fd614114e7d6cc6724f003ce58cbccff  heimdal-kpasswdd.initd
 b9b3204bc533c5865eb12174004bd0b1bf70397c603bd51c0e4ba6b2e9b0591d  003_all_heimdal-rxapps.patch
 c83c04822f5178556b4c3b0973f56c9ede328378bc2bbbbf5e180d6798a38754  005_all_heimdal-suid_fix.patch
 e9b5ca5bab430500b25ff5191d3bb2fd85133c5b4649c21cbc51f6c7d9151e5e  014_all_heimdal-path.patch
@@ -210,6 +214,9 @@ e9b5ca5bab430500b25ff5191d3bb2fd85133c5b4649c21cbc51f6c7d9151e5e  014_all_heimda
 1a3d06b306fb30e5ce947d612901b2b246d2b6af3e7234c6b10c13f29c376349  heimdal-1.5-use-perl-Getopt_Std.patch
 fb77b0c0dd4e5b55e65f16e2ddac99ece9bd20f505e2cef9c4d795224b6e0d86  heimdal_texinfo-5.patch"
 sha512sums="a04abb6f6ad3b1d6c366d9c4e6d92f5c2ca00ae0261c7acbfb1a5782d1bab4b3c498c4fa4b114867cb7e09291cee663cf4fd5c25afca8deb425a8e5112308957  heimdal-1.5.2.tar.gz
+ce48a30fea02c630e94a25214fa792d107a66f4703c81fa924467f67e909d830732e92b3433b049bd4683591276b3e13e6637b8c217577fa1964fb152342539e  heimdal-kadmind.initd
+aecad5b194522d032ff56b65d878548d0f6502757f5e802f7f8616bc7686a540079f812f652b0c219c7514a04cec9e7dcaadecaa1666a325fa2f10d6f95f34bf  heimdal-kdc.initd
+784c1d8d08742509b1a074d623abd8f0e2d2a862ea1b76afd34e381d60b6510e0bc97d7d53c42e670657e29187809b1f19e4562fbd4dc8abc1a738b79f94bd65  heimdal-kpasswdd.initd
 cf5c785f33a7ee81f47c0a3b457deab0b65d0ccfb6eff51fd61ecc61706f515910351ed820eaba90715d4ce6ceb139cebe44bc4c0afd87dc4cdf927815090ffa  003_all_heimdal-rxapps.patch
 fc0b28aa34e1df1dd2d43628f460120311bbf242e00e7a978f8663fb9168e62e97a990f1ff045c3c2c440ac4db3eea9a0c9325dd69eaf5dd053a114923868c86  005_all_heimdal-suid_fix.patch
 45180ac9968491ddc1ea271a00befdf917dc48648ee38b192a849e4e878fd2845fc5ed8b8b7f09071de12661e17e570f67ad1b099e8e133422f6948270a36191  014_all_heimdal-path.patch
diff --git a/main/heimdal/heimdal-kadmind.init b/main/heimdal/heimdal-kadmind.initd
index b58ac994df..b58ac994df 100755
--- a/main/heimdal/heimdal-kadmind.init
+++ b/main/heimdal/heimdal-kadmind.initd
diff --git a/main/heimdal/heimdal-kdc.init b/main/heimdal/heimdal-kdc.initd
index 753a101c30..753a101c30 100755
--- a/main/heimdal/heimdal-kdc.init
+++ b/main/heimdal/heimdal-kdc.initd
diff --git a/main/heimdal/heimdal-kpasswdd.init b/main/heimdal/heimdal-kpasswdd.initd
index 517cb86210..517cb86210 100755
--- a/main/heimdal/heimdal-kpasswdd.init
+++ b/main/heimdal/heimdal-kpasswdd.initd