update libressl/openssl. allow to compile openssh with libressl

package/libressl/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libressl
-PKG_VERSION:=		2.0.5
+PKG_VERSION:=		2.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		77b5385251e6edabc4cd74ffccc7e418
+PKG_MD5SUM:=		946c5e3073581a8872b29d332f1e80c5
 PKG_DESCR:=		ssl library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.libressl.org

package/openssh/Makefile

@@ -5,12 +5,12 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
 PKG_VERSION:=		6.7p1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		3246aa79317b1d23cae783a3bf8275d6
 PKG_DESCR:=		secure shell implementation
 PKG_SECTION:=		net/security
-PKG_BUILDDEP:=		zlib openssl
-PKG_DEPENDS:=		zlib libopenssl libpthread
+PKG_BUILDDEP:=		zlib
+PKG_DEPENDS:=		zlib libpthread
 PKG_URL:=		http://www.openssh.com/
 PKG_SITES:=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
 
@@ -30,11 +30,18 @@ PKGSN_OPENSSH_SFTP_CLIENT:=	openssh
 PKGSD_OPENSSH_SFTP_SERVER:=	sftp server
 PKGSN_OPENSSH_SFTP_SERVER:=	openssh
 
-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
+PKG_FLAVOURS_OPENSSH:=	WITH_KRB5
+PKGFD_WITH_KRB5:=	enable kerberos 5 support
+PKGFS_WITH_KRB5:=	libkrb5 libcom-err
+PKGFB_WITH_KRB5:=	krb5
+
+PKG_CHOICES_OPENSSH:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	with libressl
+PKGCS_WITH_LIBRESSL:=	libressl
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCD_WITH_OPENSSL:=	with openssl
+PKGCS_WITH_OPENSSL:=	libopenssl
+PKGCB_WITH_OPENSSL:=	openssl
 
 include ${ADK_TOPDIR}/mk/package.mk
 

package/openssl/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl
-PKG_VERSION:=		1.0.1i
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c8dc151a671b9b92ff3e4c118b174972
+PKG_VERSION:=		1.0.1j
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f7175c9cd3c39bb1907ac8bba9df8ed3
 PKG_DESCR:=		secure socket layer libraries
 PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		zlib
@@ -62,7 +62,7 @@ endif
 
 post-extract:
 	-mkdir -p $(STAGING_TARGET_DIR)/usr/include/crypto
-	cp ./files/cryptodev.h $(STAGING_TARGET_DIR)/usr/include/crypto/
+	$(CP) ./files/cryptodev.h $(STAGING_TARGET_DIR)/usr/include/crypto/
 
 do-configure:
 	(cd $(WRKBUILD); \