Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 35 insertions, 66 deletions

diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
deleted file mode 100644
index edb4ea30d..000000000
--- a/package/heimdal/Config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-config ADK_COMPILE_HEIMDAL
-	prompt "heimdal........................... Heimdal kerberos software"
-	bool
-	default n
-
-config ADK_COMPILE_HEIMDAL_WITH_PKINIT
-	prompt "Enable PK-INIT"
-	bool
-	depends on ADK_COMPILE_HEIMDAL
-	default n
-
-config ADK_PACKAGE_HEIMDAL_SERVER
-	prompt "heimdal-server.................... heimdal kerberos server"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBCOM_ERR
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_HEIMDAL_LIBS
-	select ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
-	default n
-	help
-	  http://www.h5l.org
-
-choice
-prompt "Database backend"
-depends on ADK_PACKAGE_HEIMDAL_SERVER
-default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-	bool "Berkeley DB backend"
-	select ADK_PACKAGE_LIBDB
-	help
-	  Use Oracle Berkeley DB as kerberos database backend.
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
-	bool "LDAP backend"
-	select ADK_PACKAGE_LIBOPENLDAP
-	help
-	  Use OpenLDAP as kerberos database backend.
-	  (Useful for SSO setup)
-
-endchoice
-
-config ADK_PACKAGE_HEIMDAL_LIBS
-	prompt "heimdal-libs...................... heimdal kerberos libraries"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  http://www.h5l.org
-
-config ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
-	prompt "heimdal-client-libs............... heimdal kerberos client libraries"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  http://www.h5l.org
diff --git a/package/heimdal/Config.in.backend b/package/heimdal/Config.in.backend
new file mode 100644
index 000000000..f606c15c2
--- /dev/null
+++ b/package/heimdal/Config.in.backend
@@ -0,0 +1,23 @@
+choice
+prompt "Database backend"
+depends on ADK_PACKAGE_HEIMDAL_SERVER
+default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+       bool "Berkeley DB backend"
+       select ADK_PACKAGE_LIBDB
+       help
+         Use Oracle Berkeley DB as kerberos database backend.
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
+       bool "LDAP backend"
+       select ADK_PACKAGE_LIBOPENLDAP
+       select ADK_PACKAGE_LIBNCURSES
+       select ADK_PACKAGE_LIBCOM_ERR
+       select ADK_COMPILE_HEIMDAL
+       help
+         Use OpenLDAP as kerberos database backend.
+         (Useful for SSO setup)
+
+endchoice
+
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index d534aca8c..f9228dae1 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,14 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		heimdal-libs heimdal-client-libs libncurses libcom_err
+PKG_DEPENDS:=		heimdal-libs heimdal-client-libs libncurses libcom-err
+PKG_BUILDDEP+=		openssl ncurses e2fsprogs
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
+PKG_BUILDDEP+=		libdb
+endif
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
+PKG_BUILDDEP+=		openldap
+endif
 PKG_URL:=		http://www.h5l.org
 PKG_SITES:=		http://www.h5l.org/dist/src/
 
@@ -19,6 +26,9 @@ PKG_SECTION_1:=		libs
 PKG_DESCR_2:=		Kerberos 5 client libraries
 PKG_SECTION_2:=		libs
 
+PKG_FLAVOURS:=		PKINIT
+PKGFD_PKINIT:=		Enable PK-INIT
+
 include $(TOPDIR)/mk/package.mk
 
 ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
@@ -55,7 +65,7 @@ else
 CONFIGURE_ARGS+=        --without-openldap
 endif
 
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y)
 CONFIGURE_OPTS+=	--enable-pk-init
 else
 CONFIGURE_OPTS+=	--disable-pk-init