* [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc
@ 2014-09-12 3:49 Maarten ter Huurne
2014-09-12 7:35 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: Maarten ter Huurne @ 2014-09-12 3:49 UTC (permalink / raw)
To: buildroot
The configure script finds the "howmany" macro, but some of the sources
using it do not include the required <sys/param.h> header.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
---
.../openssh/openssh-02-fix-howmany-include.patch | 66 ++++++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 package/openssh/openssh-02-fix-howmany-include.patch
diff --git a/package/openssh/openssh-02-fix-howmany-include.patch b/package/openssh/openssh-02-fix-howmany-include.patch
new file mode 100644
index 0000000..21675bf
--- /dev/null
+++ b/package/openssh/openssh-02-fix-howmany-include.patch
@@ -0,0 +1,66 @@
+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
+@@ -19,6 +19,7 @@
+ #include "includes.h"
+ #if !defined(HAVE_POLL)
+
++#include <sys/param.h>
+ #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
+@@ -44,6 +44,7 @@
+
+ #include "includes.h"
+
++#include <sys/param.h>
+ #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 @@
+ #include "includes.h"
+
+ #include "openbsd-compat/sys-queue.h"
++#include <sys/param.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
+@@ -17,6 +17,7 @@
+
+ #include "includes.h"
+
++#include <sys/param.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
--
1.8.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc
2014-09-12 3:49 [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc Maarten ter Huurne
@ 2014-09-12 7:35 ` Thomas Petazzoni
2014-09-12 14:24 ` Maarten ter Huurne
2014-09-12 17:17 ` Maarten ter Huurne
0 siblings, 2 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2014-09-12 7:35 UTC (permalink / raw)
To: buildroot
Dear Maarten ter Huurne,
On Fri, 12 Sep 2014 05:49:42 +0200, Maarten ter Huurne wrote:
> The configure script finds the "howmany" macro, but some of the sources
> using it do not include the required <sys/param.h> header.
>
> Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
> ---
> .../openssh/openssh-02-fix-howmany-include.patch | 66 ++++++++++++++++++++++
> 1 file changed, 66 insertions(+)
> create mode 100644 package/openssh/openssh-02-fix-howmany-include.patch
Thanks. Missing description and SoB line in the patch. Also, could you
submit the patch upstream to OpenSSH ?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc
2014-09-12 7:35 ` Thomas Petazzoni
@ 2014-09-12 14:24 ` Maarten ter Huurne
2014-09-12 17:17 ` Maarten ter Huurne
1 sibling, 0 replies; 5+ messages in thread
From: Maarten ter Huurne @ 2014-09-12 14:24 UTC (permalink / raw)
To: buildroot
On Friday 12 September 2014 09:35:59 Thomas Petazzoni wrote:
> Dear Maarten ter Huurne,
>
> On Fri, 12 Sep 2014 05:49:42 +0200, Maarten ter Huurne wrote:
> > The configure script finds the "howmany" macro, but some of the sources
> > using it do not include the required <sys/param.h> header.
> >
> > Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
> > ---
> >
> > .../openssh/openssh-02-fix-howmany-include.patch | 66
> > ++++++++++++++++++++++ 1 file changed, 66 insertions(+)
> > create mode 100644 package/openssh/openssh-02-fix-howmany-include.patch
>
> Thanks. Missing description and SoB line in the patch.
I'll add those and resubmit.
> Also, could you submit the patch upstream to OpenSSH ?
Already done :)
https://bugzilla.mindrot.org/show_bug.cgi?id=2274
Bye,
Maarten
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc
2014-09-12 7:35 ` Thomas Petazzoni
2014-09-12 14:24 ` Maarten ter Huurne
@ 2014-09-12 17:17 ` Maarten ter Huurne
2014-09-13 20:23 ` Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Maarten ter Huurne @ 2014-09-12 17:17 UTC (permalink / raw)
To: buildroot
The configure script finds the "howmany" macro, but some of the sources
using it do not include the required <sys/param.h> header.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
---
.../openssh/openssh-02-fix-howmany-include.patch | 76 ++++++++++++++++++++++
1 file changed, 76 insertions(+)
create mode 100644 package/openssh/openssh-02-fix-howmany-include.patch
diff --git a/package/openssh/openssh-02-fix-howmany-include.patch b/package/openssh/openssh-02-fix-howmany-include.patch
new file mode 100644
index 0000000..d1aab84
--- /dev/null
+++ b/package/openssh/openssh-02-fix-howmany-include.patch
@@ -0,0 +1,76 @@
+Add #include <sys/param.h> in source files using "howmany"
+
+When compiling with musl libc, the configure script finds the presence
+of the "howmany" macro, which musl defines in <sys/param.h>. However,
+only some of the sources using "howmany" actually include that header.
+
+https://bugzilla.mindrot.org/show_bug.cgi?id=2274
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+
+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
+@@ -19,6 +19,7 @@
+ #include "includes.h"
+ #if !defined(HAVE_POLL)
+
++#include <sys/param.h>
+ #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
+@@ -44,6 +44,7 @@
+
+ #include "includes.h"
+
++#include <sys/param.h>
+ #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 @@
+ #include "includes.h"
+
+ #include "openbsd-compat/sys-queue.h"
++#include <sys/param.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
+@@ -17,6 +17,7 @@
+
+ #include "includes.h"
+
++#include <sys/param.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
--
1.8.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc
2014-09-12 17:17 ` Maarten ter Huurne
@ 2014-09-13 20:23 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2014-09-13 20:23 UTC (permalink / raw)
To: buildroot
>>>>> "Maarten" == Maarten ter Huurne <maarten@treewalker.org> writes:
> The configure script finds the "howmany" macro, but some of the sources
> using it do not include the required <sys/param.h> header.
> Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-13 20:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-12 3:49 [Buildroot] [PATCH] openssh: Add patch to fix compilation with musl libc Maarten ter Huurne
2014-09-12 7:35 ` Thomas Petazzoni
2014-09-12 14:24 ` Maarten ter Huurne
2014-09-12 17:17 ` Maarten ter Huurne
2014-09-13 20:23 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.