Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openssh: update to 7.5p1, remove unneeded patches

Browse source 
Signed-off-by: Peter Wagner <tripolar@gmx.at>
This commit is contained in:
Peter Wagner 2017-03-21 23:30:54 +01:00
parent 4ac050406c
commit 9be7653a3a
4 changed files with 7 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/openssh/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=7.4p1 PKG_VERSION:=7.5p1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
https://anorien.csc.warwick.ac.uk/pub/OpenBSD/OpenSSH/portable/ \ https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ \
https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ https://anorien.csc.warwick.ac.uk/pub/OpenBSD/OpenSSH/portable/
PKG_MD5SUM:=b2db2a83caf66a208bb78d6d287cdaa3 PKG_HASH:=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
PKG_LICENSE:=BSD ISC PKG_LICENSE:=BSD ISC
PKG_LICENSE_FILES:=LICENCE PKG_LICENSE_FILES:=LICENCE

4
net/openssh/patches/200-dscp-qos.patch → net/openssh/patches/100-dscp-qos.patch
View file

@ -1,6 +1,6 @@
--- a/ssh_config --- a/ssh_config
+++ b/ssh_config +++ b/ssh_config
@@ -46,3 +46,6 @@ @@ -48,3 +48,6 @@
# VisualHostKey no # VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com # ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h # RekeyLimit 1G 1h
@ -9,7 +9,7 @@
+#IPQoS AF21 AF11 +#IPQoS AF21 AF11
--- a/sshd_config --- a/sshd_config
+++ b/sshd_config +++ b/sshd_config
@@ -122,6 +122,9 @@ UsePrivilegeSeparation sandbox # Defaul @@ -107,6 +107,9 @@ AuthorizedKeysFile .ssh/authorized_keys
# no default banner path # no default banner path
#Banner none #Banner none

12
net/openssh/patches/130-implicit_memset_decl_fix.patch
View file

@ -1,12 +0,0 @@
--- a/includes.h
+++ b/includes.h
@@ -60,6 +60,9 @@
/*
*-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively
*/
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif

84
net/openssh/patches/140-pam_uclibc_pthreads_fix.patch
View file

@ -1,84 +0,0 @@
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -159,7 +159,7 @@ sshpam_sigchld_handler(int sig)
}
if (WIFSIGNALED(sshpam_thread_status) &&
WTERMSIG(sshpam_thread_status) == SIGTERM)
- return; /* terminated by pthread_cancel */
+ return; /* terminated by pthread2_cancel */
if (!WIFEXITED(sshpam_thread_status))
sigdie("PAM: authentication thread exited unexpectedly");
if (WEXITSTATUS(sshpam_thread_status) != 0)
@@ -168,14 +168,14 @@ sshpam_sigchld_handler(int sig)
/* ARGSUSED */
static void
-pthread_exit(void *value)
+pthread2_exit(void *value)
{
_exit(0);
}
/* ARGSUSED */
static int
-pthread_create(sp_pthread_t *thread, const void *attr,
+pthread2_create(sp_pthread_t *thread, const void *attr,
void *(*thread_start)(void *), void *arg)
{
pid_t pid;
@@ -201,7 +201,7 @@ pthread_create(sp_pthread_t *thread, con
}
static int
-pthread_cancel(sp_pthread_t thread)
+pthread2_cancel(sp_pthread_t thread)
{
signal(SIGCHLD, sshpam_oldsig);
return (kill(thread, SIGTERM));
@@ -209,7 +209,7 @@ pthread_cancel(sp_pthread_t thread)
/* ARGSUSED */
static int
-pthread_join(sp_pthread_t thread, void **value)
+pthread2_join(sp_pthread_t thread, void **value)
{
int status;
@@ -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);
- pthread_exit(NULL);
+ pthread2_exit(NULL);
auth_fail:
buffer_put_cstring(&buffer,
@@ -521,7 +521,7 @@ sshpam_thread(void *ctxtp)
else
ssh_msg_send(ctxt->pam_csock, PAM_AUTH_ERR, &buffer);
buffer_free(&buffer);
- pthread_exit(NULL);
+ pthread2_exit(NULL);
return (NULL); /* Avoid warning for non-pthread case */
}
@@ -533,8 +533,8 @@ sshpam_thread_cleanup(void)
debug3("PAM: %s entering", __func__);
if (ctxt != NULL && ctxt->pam_thread != 0) {
- pthread_cancel(ctxt->pam_thread);
- pthread_join(ctxt->pam_thread, NULL);
+ pthread2_cancel(ctxt->pam_thread);
+ pthread2_join(ctxt->pam_thread, NULL);
close(ctxt->pam_psock);
close(ctxt->pam_csock);
memset(ctxt, 0, sizeof(*ctxt));
@@ -698,7 +698,7 @@ sshpam_init_ctx(Authctxt *authctxt)
}
ctxt->pam_psock = socks[0];
ctxt->pam_csock = socks[1];
- if (pthread_create(&ctxt->pam_thread, NULL, sshpam_thread, ctxt) == -1) {
+ if (pthread2_create(&ctxt->pam_thread, NULL, sshpam_thread, ctxt) == -1) {
error("PAM: failed to start authentication thread: %s",
strerror(errno));
close(socks[0]);