From: Peter Wagner <​tripolar@gmx.at>
Date: Sat, 8 Mar 2014 13:29:08 +0000 (+0000)
Subject: [packages] openssh: update to 6.5p1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af8aa8c18708036b5ccff7b30ad55528a430e3fe;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] openssh: update to 6.5p1

Signed-off-by: Peter Wagner <tripolar@gmx.at>


SVN-Revision: 39843
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 7bccef616b..ae6809ecde 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
-PKG_VERSION:=6.4p1
-PKG_RELEASE:=5
+PKG_VERSION:=6.5p1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
 		ftp://ftp.de.openbsd.org/pub/unix/OpenBSD/OpenSSH/portable/
-PKG_MD5SUM:=a62b88b884df0b09b8a8c5789ac9e51b
+PKG_MD5SUM:=a084e7272b8cbd25afe0f5dce4802fef
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -26,20 +26,20 @@ PKG_BUILD_DEPENDS:=libopenssl
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openssh/Default
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp
-  TITLE:=OpenSSH
-  MAINTAINER:=Peter Wagner <tripolar@gmx.at>
-  URL:=http://www.openssh.com/
-  SUBMENU:=SSH
-  VARIANT:=without-pam
+	SECTION:=net
+	CATEGORY:=Network
+	DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp
+	TITLE:=OpenSSH
+	MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+	URL:=http://www.openssh.com/
+	SUBMENU:=SSH
+	VARIANT:=without-pam
 endef
 
 define Package/openssh-moduli
-  $(call Package/openssh/Default)
-  DEPENDS+= +openssh-keygen
-  TITLE+= moduli file
+	$(call Package/openssh/Default)
+	DEPENDS+= +openssh-keygen
+	TITLE+= moduli file
 endef
 
 define Package/openssh-moduli/description
@@ -47,8 +47,8 @@ OpenSSH server moduli file.
 endef
 
 define Package/openssh-client
-  $(call Package/openssh/Default)
-  TITLE+= client
+	$(call Package/openssh/Default)
+	TITLE+= client
 endef
 
 define Package/openssh-client/description
@@ -60,9 +60,9 @@ define Package/openssh-client/conffiles
 endef
 
 define Package/openssh-client-utils
-  $(call Package/openssh/Default)
-  DEPENDS+= +openssh-client +openssh-keygen
-  TITLE+= client utilities
+	$(call Package/openssh/Default)
+	DEPENDS+= +openssh-client +openssh-keygen
+	TITLE+= client utilities
 endef
 
 define Package/openssh-client-utils/description
@@ -70,8 +70,8 @@ OpenSSH client utilities.
 endef
 
 define Package/openssh-keygen
-  $(call Package/openssh/Default)
-  TITLE+= keygen
+	$(call Package/openssh/Default)
+	TITLE+= keygen
 endef
 
 define Package/openssh-keygen/description
@@ -79,9 +79,9 @@ OpenSSH keygen.
 endef
 
 define Package/openssh-server
-  $(call Package/openssh/Default)
-  DEPENDS+= +openssh-keygen
-  TITLE+= server
+	$(call Package/openssh/Default)
+	DEPENDS+= +openssh-keygen
+	TITLE+= server
 endef
 
 define Package/openssh-server/description
@@ -93,10 +93,10 @@ define Package/openssh-server/conffiles
 endef
 
 define Package/openssh-server-pam
-  $(call Package/openssh/Default)
-  DEPENDS+= +libpthread +openssh-keygen +libpam
-  TITLE+= server (with PAM support)
-  VARIANT:=with-pam
+	$(call Package/openssh/Default)
+	DEPENDS+= +libpthread +openssh-keygen +libpam
+	TITLE+= server (with PAM support)
+	VARIANT:=with-pam
 endef
 
 define Package/openssh-server-pam/description
@@ -110,8 +110,8 @@ define Package/openssh-server-pam/conffiles
 endef
 
 define Package/openssh-sftp-client
-  $(call Package/openssh/Default)
-  TITLE+= SFTP client
+	$(call Package/openssh/Default)
+	TITLE+= SFTP client
 endef
 
 define Package/openssh-sftp-client/description
@@ -119,8 +119,8 @@ OpenSSH SFTP client.
 endef
 
 define Package/openssh-sftp-server
-  $(call Package/openssh/Default)
-  TITLE+= SFTP server
+	$(call Package/openssh/Default)
+	TITLE+= SFTP server
 endef
 
 define Package/openssh-sftp-server/description
@@ -184,7 +184,7 @@ endef
 define Package/openssh-client/preinst
 #!/bin/sh
 if [ -L $${IPKG_INSTROOT}/usr/bin/ssh ] && [ -L $${IPKG_INSTROOT}/usr/bin/scp ]; then
-  rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
+	rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
 fi
 exit 0
 endef
@@ -193,8 +193,8 @@ define Package/openssh-client/postrm
 #!/bin/sh
 rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
 if [ -x $${IPKG_INSTROOT}/usr/sbin/dropbear ] ; then
-  ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/ssh;
-  ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp;
+	ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/ssh;
+	ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp;
 fi
 exit 0
 endef
diff --git a/net/openssh/patches/100-no_cast_fix.patch b/net/openssh/patches/100-no_cast_fix.patch
index ad0a3170c0..751e5896fe 100644
--- a/net/openssh/patches/100-no_cast_fix.patch
+++ b/net/openssh/patches/100-no_cast_fix.patch
@@ -1,6 +1,6 @@
 --- a/cipher.c
 +++ b/cipher.c
-@@ -76,8 +76,10 @@ static const struct Cipher ciphers[] = {
+@@ -80,8 +80,10 @@ static const struct Cipher ciphers[] = {
  	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
  	{ "blowfish-cbc",
  			SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
diff --git a/net/openssh/patches/140-pam_uclibc_pthreads_fix.patch b/net/openssh/patches/140-pam_uclibc_pthreads_fix.patch
index c0c5a4b4a2..1319b524a5 100644
--- a/net/openssh/patches/140-pam_uclibc_pthreads_fix.patch
+++ b/net/openssh/patches/140-pam_uclibc_pthreads_fix.patch
@@ -44,7 +44,7 @@
  {
  	int status;
  
-@@ -508,7 +508,7 @@ sshpam_thread(void *ctxtp)
+@@ -510,7 +510,7 @@ sshpam_thread(void *ctxtp)
  	/* XXX - can't do much about an error here */
  	ssh_msg_send(ctxt->pam_csock, sshpam_err, &buffer);
  	buffer_free(&buffer);
@@ -53,7 +53,7 @@
  
   auth_fail:
  	buffer_put_cstring(&buffer,
-@@ -519,7 +519,7 @@ sshpam_thread(void *ctxtp)
+@@ -521,7 +521,7 @@ sshpam_thread(void *ctxtp)
  	else
  		ssh_msg_send(ctxt->pam_csock, PAM_AUTH_ERR, &buffer);
  	buffer_free(&buffer);
@@ -62,7 +62,7 @@
  
  	return (NULL); /* Avoid warning for non-pthread case */
  }
-@@ -531,8 +531,8 @@ sshpam_thread_cleanup(void)
+@@ -533,8 +533,8 @@ sshpam_thread_cleanup(void)
  
  	debug3("PAM: %s entering", __func__);
  	if (ctxt != NULL && ctxt->pam_thread != 0) {
@@ -73,7 +73,7 @@
  		close(ctxt->pam_psock);
  		close(ctxt->pam_csock);
  		memset(ctxt, 0, sizeof(*ctxt));
-@@ -696,7 +696,7 @@ sshpam_init_ctx(Authctxt *authctxt)
+@@ -698,7 +698,7 @@ sshpam_init_ctx(Authctxt *authctxt)
  	}
  	ctxt->pam_psock = socks[0];
  	ctxt->pam_csock = socks[1];
diff --git a/net/openssh/patches/200-dscp-qos.patch b/net/openssh/patches/200-dscp-qos.patch
index 85cef53dd4..827a6689dc 100644
--- a/net/openssh/patches/200-dscp-qos.patch
+++ b/net/openssh/patches/200-dscp-qos.patch
@@ -9,7 +9,7 @@
 +#IPQoS AF21 AF11
 --- a/sshd_config
 +++ b/sshd_config
-@@ -120,6 +120,9 @@ UsePrivilegeSeparation sandbox		# Defaul
+@@ -122,6 +122,9 @@ UsePrivilegeSeparation sandbox		# Defaul
  # no default banner path
  #Banner none