bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] openssh: update to 6.5p1

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


git-svn-id: svn://svn.openwrt.org/openwrt/packages@39843 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
tripolar 2014-03-08 13:29:08 +00:00
parent 30a944610f
commit b10a2bc55a
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
net/openssh/Makefile
View File

@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=6.4p1 PKG_VERSION:=6.5p1
PKG_RELEASE:=5 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \ ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \
ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \ ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ \
ftp://ftp.de.openbsd.org/pub/unix/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) 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 include $(INCLUDE_DIR)/package.mk
define Package/openssh/Default define Package/openssh/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp DEPENDS:=+libopenssl +zlib +SSP_SUPPORT:libssp
TITLE:=OpenSSH TITLE:=OpenSSH
MAINTAINER:=Peter Wagner <tripolar@gmx.at> MAINTAINER:=Peter Wagner <tripolar@gmx.at>
URL:=http://www.openssh.com/ URL:=http://www.openssh.com/
SUBMENU:=SSH SUBMENU:=SSH
VARIANT:=without-pam VARIANT:=without-pam
endef endef
define Package/openssh-moduli define Package/openssh-moduli
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +openssh-keygen DEPENDS+= +openssh-keygen
TITLE+= moduli file TITLE+= moduli file
endef endef
define Package/openssh-moduli/description define Package/openssh-moduli/description
@ -47,8 +47,8 @@ OpenSSH server moduli file.
endef endef
define Package/openssh-client define Package/openssh-client
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= client TITLE+= client
endef endef
define Package/openssh-client/description define Package/openssh-client/description
@ -60,9 +60,9 @@ define Package/openssh-client/conffiles
endef endef
define Package/openssh-client-utils define Package/openssh-client-utils
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +openssh-client +openssh-keygen DEPENDS+= +openssh-client +openssh-keygen
TITLE+= client utilities TITLE+= client utilities
endef endef
define Package/openssh-client-utils/description define Package/openssh-client-utils/description
@ -70,8 +70,8 @@ OpenSSH client utilities.
endef endef
define Package/openssh-keygen define Package/openssh-keygen
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= keygen TITLE+= keygen
endef endef
define Package/openssh-keygen/description define Package/openssh-keygen/description
@ -79,9 +79,9 @@ OpenSSH keygen.
endef endef
define Package/openssh-server define Package/openssh-server
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +openssh-keygen DEPENDS+= +openssh-keygen
TITLE+= server TITLE+= server
endef endef
define Package/openssh-server/description define Package/openssh-server/description
@ -93,10 +93,10 @@ define Package/openssh-server/conffiles
endef endef
define Package/openssh-server-pam define Package/openssh-server-pam
$(call Package/openssh/Default) $(call Package/openssh/Default)
DEPENDS+= +libpthread +openssh-keygen +libpam DEPENDS+= +libpthread +openssh-keygen +libpam
TITLE+= server (with PAM support) TITLE+= server (with PAM support)
VARIANT:=with-pam VARIANT:=with-pam
endef endef
define Package/openssh-server-pam/description define Package/openssh-server-pam/description
@ -110,8 +110,8 @@ define Package/openssh-server-pam/conffiles
endef endef
define Package/openssh-sftp-client define Package/openssh-sftp-client
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= SFTP client TITLE+= SFTP client
endef endef
define Package/openssh-sftp-client/description define Package/openssh-sftp-client/description
@ -119,8 +119,8 @@ OpenSSH SFTP client.
endef endef
define Package/openssh-sftp-server define Package/openssh-sftp-server
$(call Package/openssh/Default) $(call Package/openssh/Default)
TITLE+= SFTP server TITLE+= SFTP server
endef endef
define Package/openssh-sftp-server/description define Package/openssh-sftp-server/description
@ -184,7 +184,7 @@ endef
define Package/openssh-client/preinst define Package/openssh-client/preinst
#!/bin/sh #!/bin/sh
if [ -L $${IPKG_INSTROOT}/usr/bin/ssh ] && [ -L $${IPKG_INSTROOT}/usr/bin/scp ]; then 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 fi
exit 0 exit 0
endef endef
@ -193,8 +193,8 @@ define Package/openssh-client/postrm
#!/bin/sh #!/bin/sh
rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp; rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp;
if [ -x $${IPKG_INSTROOT}/usr/sbin/dropbear ] ; then 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/ssh;
ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp; ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp;
fi fi
exit 0 exit 0
endef endef

2
net/openssh/patches/100-no_cast_fix.patch
View File

@ -1,6 +1,6 @@
--- a/cipher.c --- a/cipher.c
+++ b/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 }, { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
{ "blowfish-cbc", { "blowfish-cbc",
SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc }, SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },

8
net/openssh/patches/140-pam_uclibc_pthreads_fix.patch
View File

@ -44,7 +44,7 @@
{ {
int status; 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 */ /* XXX - can't do much about an error here */
ssh_msg_send(ctxt->pam_csock, sshpam_err, &buffer); ssh_msg_send(ctxt->pam_csock, sshpam_err, &buffer);
buffer_free(&buffer); buffer_free(&buffer);
@ -53,7 +53,7 @@
auth_fail: auth_fail:
buffer_put_cstring(&buffer, buffer_put_cstring(&buffer,
@@ -519,7 +519,7 @@ sshpam_thread(void *ctxtp) @@ -521,7 +521,7 @@ sshpam_thread(void *ctxtp)
else else
ssh_msg_send(ctxt->pam_csock, PAM_AUTH_ERR, &buffer); ssh_msg_send(ctxt->pam_csock, PAM_AUTH_ERR, &buffer);
buffer_free(&buffer); buffer_free(&buffer);
@ -62,7 +62,7 @@
return (NULL); /* Avoid warning for non-pthread case */ 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__); debug3("PAM: %s entering", __func__);
if (ctxt != NULL && ctxt->pam_thread != 0) { if (ctxt != NULL && ctxt->pam_thread != 0) {
@ -73,7 +73,7 @@
close(ctxt->pam_psock); close(ctxt->pam_psock);
close(ctxt->pam_csock); close(ctxt->pam_csock);
memset(ctxt, 0, sizeof(*ctxt)); 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_psock = socks[0];
ctxt->pam_csock = socks[1]; ctxt->pam_csock = socks[1];

2
net/openssh/patches/200-dscp-qos.patch
View File

@ -9,7 +9,7 @@
+#IPQoS AF21 AF11 +#IPQoS AF21 AF11
--- a/sshd_config --- a/sshd_config
+++ b/sshd_config +++ b/sshd_config
@@ -120,6 +120,9 @@ UsePrivilegeSeparation sandbox # Defaul @@ -122,6 +122,9 @@ UsePrivilegeSeparation sandbox # Defaul
# no default banner path # no default banner path
#Banner none #Banner none