From 45bf2abc94df0dc4e5e1af41e90137a3cd653e7d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Jun 2014 16:24:07 +0200 Subject: get rid of heimdal, no updates in a year, no time to care for two krb5 implementations --- package/openssh/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'package/openssh/Makefile') diff --git a/package/openssh/Makefile b/package/openssh/Makefile index dcd14056b..1eef11a96 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -30,14 +30,11 @@ PKGSN_OPENSSH_SFTP_CLIENT:= openssh PKGSD_OPENSSH_SFTP_SERVER:= sftp server PKGSN_OPENSSH_SFTP_SERVER:= openssh -PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5 WITH_HEIMDAL +PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5 PKGCD_NOKRB:= no Kerberos support PKGCD_WITH_KRB5:= with MIT Kerberos PKGCS_WITH_KRB5:= libkrb5 libcom-err PKGCB_WITH_KRB5:= krb5 -PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos -PKGCS_WITH_HEIMDAL:= libheimdal libcom-err -PKGCB_WITH_HEIMDAL:= heimdal include ${ADK_TOPDIR}/mk/package.mk @@ -51,10 +48,6 @@ $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif -ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y) -CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" -TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal -endif ifeq ($(ADK_TARGET_USE_SSP),y) CONFIGURE_ARGS+= --with-stackprotect -- cgit v1.2.3