aboutsummaryrefslogtreecommitdiff
path: root/package/openssh/0002-fix-howmany-include.patch
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2015-03-18 07:42:34 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-18 14:38:49 +0100
commit7ff67b5d413f49431773c06deb05fa5efad9c1be (patch)
tree17e7ce40cf8f860e3b7012491f30be902d6e41e1 /package/openssh/0002-fix-howmany-include.patch
parentc392dd2151c9ea94a13d7f3dc6de83d3d32cd1bd (diff)
downloadbuildroot-7ff67b5d413f49431773c06deb05fa5efad9c1be.tar.gz
buildroot-7ff67b5d413f49431773c06deb05fa5efad9c1be.tar.bz2
openssh: bump to version 6.8p1
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/openssh/0002-fix-howmany-include.patch')
-rw-r--r--package/openssh/0002-fix-howmany-include.patch59
1 files changed, 21 insertions, 38 deletions
diff --git a/package/openssh/0002-fix-howmany-include.patch b/package/openssh/0002-fix-howmany-include.patch
index 21675bf4a0..7a2a8e3202 100644
--- a/package/openssh/0002-fix-howmany-include.patch
+++ b/package/openssh/0002-fix-howmany-include.patch
@@ -1,17 +1,11 @@
-diff -ru openssh-6.6p1.org/channels.c openssh-6.6p1/channels.c
---- openssh-6.6p1.org/channels.c 2014-02-27 00:18:33.000000000 +0100
-+++ openssh-6.6p1/channels.c 2014-09-12 05:33:43.791424676 +0200
-@@ -41,6 +41,7 @@
-
- #include "includes.h"
-
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/un.h>
-diff -ru openssh-6.6p1.org/openbsd-compat/bsd-poll.c openssh-6.6p1/openbsd-compat/bsd-poll.c
---- openssh-6.6p1.org/openbsd-compat/bsd-poll.c 2014-02-06 00:44:13.000000000 +0100
-+++ openssh-6.6p1/openbsd-compat/bsd-poll.c 2014-09-12 05:39:35.580947451 +0200
+Update patch from 2fea21799223d41605556858a95b55e69e9960ca to openssh
+version 6.8p1
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura openssh-6.8p1.orig/openbsd-compat/bsd-poll.c openssh-6.8p1/openbsd-compat/bsd-poll.c
+--- openssh-6.8p1.orig/openbsd-compat/bsd-poll.c 2015-03-18 07:11:46.184620677 -0300
++++ openssh-6.8p1/openbsd-compat/bsd-poll.c 2015-03-18 07:12:29.120094555 -0300
@@ -19,6 +19,7 @@
#include "includes.h"
#if !defined(HAVE_POLL)
@@ -20,20 +14,9 @@ diff -ru openssh-6.6p1.org/openbsd-compat/bsd-poll.c openssh-6.6p1/openbsd-compa
#include <sys/types.h>
#include <sys/time.h>
#ifdef HAVE_SYS_SELECT_H
-diff -ru openssh-6.6p1.org/sshconnect.c openssh-6.6p1/sshconnect.c
---- openssh-6.6p1.org/sshconnect.c 2014-02-06 23:24:34.000000000 +0100
-+++ openssh-6.6p1/sshconnect.c 2014-09-12 05:39:57.372236592 +0200
-@@ -15,6 +15,7 @@
-
- #include "includes.h"
-
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-diff -ru openssh-6.6p1.org/sshd.c openssh-6.6p1/sshd.c
---- openssh-6.6p1.org/sshd.c 2014-02-27 00:20:08.000000000 +0100
-+++ openssh-6.6p1/sshd.c 2014-09-12 05:42:20.233576519 +0200
+diff -Nura openssh-6.8p1.orig/sshd.c openssh-6.8p1/sshd.c
+--- openssh-6.8p1.orig/sshd.c 2015-03-18 07:11:46.187620780 -0300
++++ openssh-6.8p1/sshd.c 2015-03-18 07:13:11.889562735 -0300
@@ -44,6 +44,7 @@
#include "includes.h"
@@ -42,20 +25,20 @@ diff -ru openssh-6.6p1.org/sshd.c openssh-6.6p1/sshd.c
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-diff -ru openssh-6.6p1.org/ssh-keyscan.c openssh-6.6p1/ssh-keyscan.c
---- openssh-6.6p1.org/ssh-keyscan.c 2013-12-07 01:24:02.000000000 +0100
-+++ openssh-6.6p1/ssh-keyscan.c 2014-09-12 05:41:03.102092462 +0200
-@@ -10,6 +10,7 @@
+diff -Nura openssh-6.8p1.orig/ssh-keyscan.c openssh-6.8p1/ssh-keyscan.c
+--- openssh-6.8p1.orig/ssh-keyscan.c 2015-03-18 07:11:46.180620539 -0300
++++ openssh-6.8p1/ssh-keyscan.c 2015-03-18 07:13:32.092256248 -0300
+@@ -9,6 +9,7 @@
+
#include "includes.h"
- #include "openbsd-compat/sys-queue.h"
+#include <sys/param.h>
+ #include <sys/types.h>
+ #include "openbsd-compat/sys-queue.h"
#include <sys/resource.h>
- #ifdef HAVE_SYS_TIME_H
- # include <sys/time.h>
-diff -ru openssh-6.6p1.org/ssh-pkcs11-helper.c openssh-6.6p1/ssh-pkcs11-helper.c
---- openssh-6.6p1.org/ssh-pkcs11-helper.c 2013-12-05 00:23:21.000000000 +0100
-+++ openssh-6.6p1/ssh-pkcs11-helper.c 2014-09-12 05:40:20.488482522 +0200
+diff -Nura openssh-6.8p1.orig/ssh-pkcs11-helper.c openssh-6.8p1/ssh-pkcs11-helper.c
+--- openssh-6.8p1.orig/ssh-pkcs11-helper.c 2015-03-18 07:11:46.182620608 -0300
++++ openssh-6.8p1/ssh-pkcs11-helper.c 2015-03-18 07:13:43.620651993 -0300
@@ -17,6 +17,7 @@
#include "includes.h"