diff options
Diffstat (limited to 'package/openssh')
| -rw-r--r-- | package/openssh/Makefile | 25 | ||||
| -rw-r--r-- | package/openssh/patches/patch-ssh-keyscan_c | 10 | ||||
| -rw-r--r-- | package/openssh/patches/patch-ssh-pkcs11-helper_c | 10 |
3 files changed, 21 insertions, 24 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 8bfa488e1..a4841e9c4 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 8.5p1 +PKG_VERSION:= 10.2p1 PKG_RELEASE:= 1 -PKG_HASH:= f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25 +PKG_HASH:= ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security -PKG_BUILDDEP:= zlib libressl -PKG_DEPENDS:= zlib libressl +PKG_BUILDDEP:= zlib +PKG_BUILDDEP_GLIBC:= libxcrypt +PKG_DEPENDS:= zlib PKG_NEEDS:= threads PKG_URL:= http://www.openssh.com/ PKG_SITES:= http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ @@ -36,6 +37,15 @@ PKGFD_WITH_KRB5:= enable kerberos 5 support PKGFS_WITH_KRB5:= libkrb5 libcom-err PKGFB_WITH_KRB5:= krb5 +PKG_CHOICES_OPENSSH:= WITH_OPENSSL WITH_LIBRESSL +PKGCD_WITH_OPENSSL:= with openssl +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_LIBRESSL:= with libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl + + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSSH,openssh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -62,12 +72,14 @@ CONFIGURE_ARGS+= --without-pie endif CONFIGURE_ENV+= LD='${TARGET_CC}' \ + LDFLAGS='$(TARGET_LDFLAGS) -latomic' \ ac_cv_func_setlogin=no \ ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \ ac_cv_lib_nsl_yp_match=no CONFIGURE_ARGS+= --disable-strip \ --disable-etc-default-login \ --disable-lastlog \ + --without-hardening \ --with-sandbox=no \ --disable-utmp \ --disable-utmpx \ @@ -90,11 +102,16 @@ openssh-server-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec ${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh ${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \ ${IDIR_OPENSSH_SERVER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/sbin/sshd \ ${IDIR_OPENSSH_SERVER}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-session \ + ${IDIR_OPENSSH_SERVER}/usr/libexec + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-auth \ + ${IDIR_OPENSSH_SERVER}/usr/libexec # ssh pubkey test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \ mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \ diff --git a/package/openssh/patches/patch-ssh-keyscan_c b/package/openssh/patches/patch-ssh-keyscan_c deleted file mode 100644 index 3a02711db..000000000 --- a/package/openssh/patches/patch-ssh-keyscan_c +++ /dev/null @@ -1,10 +0,0 @@ ---- openssh-6.2p1.orig/ssh-keyscan.c 2012-04-22 03:24:21.000000000 +0200 -+++ openssh-6.2p1/ssh-keyscan.c 2013-08-20 18:04:48.698115807 +0200 -@@ -11,6 +11,7 @@ - - #include "openbsd-compat/sys-queue.h" - #include <sys/resource.h> -+#include <sys/param.h> - #ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - #endif diff --git a/package/openssh/patches/patch-ssh-pkcs11-helper_c b/package/openssh/patches/patch-ssh-pkcs11-helper_c deleted file mode 100644 index 9a26694f7..000000000 --- a/package/openssh/patches/patch-ssh-pkcs11-helper_c +++ /dev/null @@ -1,10 +0,0 @@ ---- openssh-6.2p1.orig/ssh-pkcs11-helper.c 2012-07-02 14:15:39.000000000 +0200 -+++ openssh-6.2p1/ssh-pkcs11-helper.c 2013-08-20 18:05:07.349881322 +0200 -@@ -18,6 +18,7 @@ - #include "includes.h" - - #include <sys/types.h> -+#include <sys/param.h> - #ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - #endif |