summaryrefslogtreecommitdiff
path: root/package/heimdal
diff options
context:
space:
mode:
Diffstat (limited to 'package/heimdal')
-rw-r--r--package/heimdal/Config.in2
-rw-r--r--package/heimdal/Makefile44
-rw-r--r--package/heimdal/patches/patch-configure11
3 files changed, 31 insertions, 26 deletions
diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
index de86f9d27..edb4ea30d 100644
--- a/package/heimdal/Config.in
+++ b/package/heimdal/Config.in
@@ -1,7 +1,6 @@
config ADK_COMPILE_HEIMDAL
prompt "heimdal........................... Heimdal kerberos software"
bool
- depends on !ADK_COMPILE_KRB5
default n
config ADK_COMPILE_HEIMDAL_WITH_PKINIT
@@ -14,6 +13,7 @@ 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
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index d7926542b..5be7b5776 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
PKG_DESCR:= Kerberos 5 server
PKG_SECTION:= net
-PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses
+PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses libcom_err
PKG_URL:= http://www.h5l.org
PKG_SITES:= http://www.h5l.org/dist/src/
@@ -36,6 +36,7 @@ $(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION
CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \
--disable-otp \
--disable-ndbm-db \
+ --libdir=/usr/lib/heimdal \
--libexecdir=/usr/sbin \
--sysconfdir=/etc/heimdal
@@ -65,6 +66,7 @@ else
CONFIGURE_OPTS+= --disable-pk-init
endif
+TCFLAGS+= -I${STAGING_DIR}/usr/include/et
TCFLAGS+= -pthread
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= ${CONFIGURE_OPTS}
@@ -80,20 +82,15 @@ pre-configure:
${MAKE} -C ${WRKBUILD}/lib/roken
${MAKE} -C ${WRKBUILD}/lib/vers
${MAKE} -C ${WRKBUILD}/lib/editline
- ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et
${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile
${MAKE} -C ${WRKBUILD}/lib/sl slc
- ${INSTALL_BIN} ${WRKBUILD}/lib/com_err/compile_et \
- ${STAGING_TOOLS}/bin
${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile \
${STAGING_TOOLS}/bin
${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc \
${STAGING_TOOLS}/bin
- ${MAKE} -C ${WRKBUILD}/lib/com_err clean
${MAKE} -C ${WRKBUILD} clean
post-install:
- -rm $(STAGING_DIR)/usr/lib/libcom_err*
ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/openldap/schema
${INSTALL_DATA} ${WRKBUILD}/lib/hdb/hdb.schema \
@@ -101,10 +98,10 @@ ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
endif
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
- ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
+ ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal
@@ -115,22 +112,21 @@ endif
${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/
${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/
# heimdal libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
- ${CP} ${WRKINST}/usr/lib/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
endif
- ${CP} ${WRKINST}/usr/lib/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libcom_err.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib/heimdal
# heimdal client libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+ ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib/heimdal
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure
index d92f7cdbc..53601d6db 100644
--- a/package/heimdal/patches/patch-configure
+++ b/package/heimdal/patches/patch-configure
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- heimdal-1.2.1.orig/configure 2008-07-28 14:05:20.000000000 +0200
-+++ heimdal-1.2.1/configure 2009-01-04 18:24:14.421500455 +0100
++++ heimdal-1.2.1/configure 2009-11-19 21:01:07.000000000 +0100
@@ -47096,9 +47096,6 @@ end
EOF
if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
@@ -11,3 +11,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
if test "$cross_compiling" = yes; then
krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes
else
+@@ -47183,7 +47180,7 @@ rm -fr conftest*
+ fi
+
+ if test "${krb_cv_compile_et_cross}" = yes ; then
+- krb_cv_com_err="cross"
++ krb_cv_com_err="yes"
+ elif test "${krb_cv_compile_et}" = "yes"; then
+ krb_cv_save_LIBS="${LIBS}"
+ LIBS="${LIBS} -lcom_err"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 13:07:25 +0000