From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 20 Nov 2009 09:31:11 +0100
Subject: package updates and compile fixes
- update ctorrent, cups, gnutls and freeradius-server
- compile kerberos (heimdal,krb5) with com_err library from
e2fsprogs to allow both to be build without installing local
copys of libcom_err
- cleanup lynx package add zlib dependency
---
package/krb5/Config.in | 3 ++-
package/krb5/Makefile | 12 ++++++++----
package/krb5/patches/patch-src_util_profile_prof_int_h | 11 +++++++++++
3 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 package/krb5/patches/patch-src_util_profile_prof_int_h
(limited to 'package/krb5')
diff --git a/package/krb5/Config.in b/package/krb5/Config.in
index d4f8b6436..d44a2f4cc 100644
--- a/package/krb5/Config.in
+++ b/package/krb5/Config.in
@@ -2,13 +2,14 @@ config ADK_COMPILE_KRB5
prompt "kerberos5......................... MIT kerberos software"
bool
select ADK_PACKAGE_LIBNCURSES
+ select ADK_PACKAGE_LIBSS
+ select ADK_PACKAGE_LIBCOM_ERR
default n
config ADK_PACKAGE_KRB5_SERVER
prompt "krb5-server....................... MIT kerberos server"
tristate
depends on ADK_COMPILE_KRB5
- depends on !ADK_COMPILE_HEIMDAL
select ADK_PACKAGE_LIBPTHREAD
select ADK_PACKAGE_KRB5_LIBS
default n
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 7ffef2877..f1261ba64 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= net
-PKG_DEPENDS:= krb5-libs
+PKG_DEPENDS:= krb5-libs libncurses libss libcom_err
PKG_URL:= http://web.mit.edu/kerberos
PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/
@@ -24,8 +24,12 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+TCFLAGS+= -I${STAGING_DIR}/usr/include/et
CONFIGURE_STYLE:= gnu
-CONFIGURE_ARGS+= --disable-static --without-tcl
+CONFIGURE_ARGS+= --disable-static \
+ --with-system-ss \
+ --with-system-et \
+ --without-tcl
CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \
ac_cv_func_regcomp=yes \
ac_cv_printf_positional=yes \
@@ -56,7 +60,7 @@ post-install:
${INSTALL_DIR} ${IDIR_KRB5_LIBS}/etc
${INSTALL_DIR} ${IDIR_KRB5_LIBS}/usr/lib
${INSTALL_DATA} ./files/krb5.conf ${IDIR_KRB5_LIBS}/etc
- ${CP} ${WRKINST}/usr/lib/lib{com_err,gssapi_krb5,k5crypto,krb5,krb5support}.so* \
+ ${CP} ${WRKINST}/usr/lib/lib{gssapi_krb5,k5crypto,krb5,krb5support}.so* \
${IDIR_KRB5_LIBS}/usr/lib
echo '/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init' > ${IDIR_KRB5_LIBS}/etc/gssapi_mech.conf
diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
new file mode 100644
index 000000000..5be692f11
--- /dev/null
+++ b/package/krb5/patches/patch-src_util_profile_prof_int_h
@@ -0,0 +1,11 @@
+--- krb5-1.7.orig/src/util/profile/prof_int.h 2008-05-27 18:25:51.000000000 +0200
++++ krb5-1.7/src/util/profile/prof_int.h 2009-11-19 20:20:53.000000000 +0100
+@@ -12,7 +12,7 @@
+
+ #include "k5-thread.h"
+ #include "k5-platform.h"
+-#include "com_err.h"
++#include "et/com_err.h"
+ #include "profile.h"
+
+ typedef long prf_magic_t;
--
cgit v1.2.3