fix musl compile

8 files changed, 58 insertions, 5 deletions

diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index f7def86ad..b489a8434 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
 endif
 ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
 CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_TARGET_DIR}/usr"
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
 endif
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
@@ -57,10 +58,12 @@ endif
 
 CONFIGURE_ENV+=		LD='${TARGET_CC}' \
 			ac_cv_func_setlogin=no \
+			ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \
 			ac_cv_lib_nsl_yp_match=no
 CONFIGURE_ARGS+=	--disable-strip \
 			--disable-etc-default-login \
 			--disable-lastlog \
+			--with-sandbox=no \
 			--disable-utmp \
 			--disable-utmpx \
 			--disable-wtmp \
diff --git a/package/openssh/patches/patch-channels_c b/package/openssh/patches/patch-channels_c
new file mode 100644
index 000000000..11b870703
--- /dev/null
+++ b/package/openssh/patches/patch-channels_c
@@ -0,0 +1,10 @@
+--- openssh-6.2p1.orig/channels.c	2012-12-02 23:50:55.000000000 +0100
++++ openssh-6.2p1/channels.c	2013-08-20 18:00:56.929029538 +0200
+@@ -42,6 +42,7 @@
+ #include "includes.h"
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c
index 88f5d11d9..e7169b576 100644
--- a/package/openssh/patches/patch-cipher_c
+++ b/package/openssh/patches/patch-cipher_c
@@ -1,7 +1,7 @@
 diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
 --- openssh-6.2p1.orig/cipher.c	2013-02-12 01:00:35.000000000 +0100
-+++ openssh-6.2p1/cipher.c	2013-04-29 15:10:49.000000000 +0200
-@@ -69,23 +69,33 @@
++++ openssh-6.2p1/cipher.c	2013-08-20 08:56:48.923159083 +0200
+@@ -69,23 +69,33 @@ struct Cipher {
  	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
  	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
  	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c
index c06cbe38a..df8eac301 100644
--- a/package/openssh/patches/patch-mac_c
+++ b/package/openssh/patches/patch-mac_c
@@ -1,7 +1,7 @@
 diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
 --- openssh-6.2p1.orig/mac.c	2012-12-12 01:00:37.000000000 +0100
-+++ openssh-6.2p1/mac.c	2013-04-29 15:14:29.000000000 +0200
-@@ -68,8 +68,10 @@
++++ openssh-6.2p1/mac.c	2013-08-20 08:56:49.123256567 +0200
+@@ -68,8 +68,10 @@ struct {
  #endif
  	{ "hmac-md5",				SSH_EVP, EVP_md5, 0, 0, 0, 0 },
  	{ "hmac-md5-96",			SSH_EVP, EVP_md5, 96, 0, 0, 0 },
@@ -12,7 +12,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
  	{ "umac-64@openssh.com",		SSH_UMAC, NULL, 0, 128, 64, 0 },
  	{ "umac-128@openssh.com",		SSH_UMAC128, NULL, 0, 128, 128, 0 },
  
-@@ -82,7 +84,9 @@
+@@ -82,7 +84,9 @@ struct {
  #endif
  	{ "hmac-md5-etm@openssh.com",		SSH_EVP, EVP_md5, 0, 0, 0, 1 },
  	{ "hmac-md5-96-etm@openssh.com",	SSH_EVP, EVP_md5, 96, 0, 0, 1 },
diff --git a/package/openssh/patches/patch-ssh-keyscan_c b/package/openssh/patches/patch-ssh-keyscan_c
new file mode 100644
index 000000000..3a02711db
--- /dev/null
+++ b/package/openssh/patches/patch-ssh-keyscan_c
@@ -0,0 +1,10 @@
+--- openssh-6.2p1.orig/ssh-keyscan.c	2012-04-22 03:24:21.000000000 +0200
++++ openssh-6.2p1/ssh-keyscan.c	2013-08-20 18:04:48.698115807 +0200
+@@ -11,6 +11,7 @@
+  
+ #include "openbsd-compat/sys-queue.h"
+ #include <sys/resource.h>
++#include <sys/param.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ #endif
diff --git a/package/openssh/patches/patch-ssh-pkcs11-helper_c b/package/openssh/patches/patch-ssh-pkcs11-helper_c
new file mode 100644
index 000000000..9a26694f7
--- /dev/null
+++ b/package/openssh/patches/patch-ssh-pkcs11-helper_c
@@ -0,0 +1,10 @@
+--- openssh-6.2p1.orig/ssh-pkcs11-helper.c	2012-07-02 14:15:39.000000000 +0200
++++ openssh-6.2p1/ssh-pkcs11-helper.c	2013-08-20 18:05:07.349881322 +0200
+@@ -18,6 +18,7 @@
+ #include "includes.h"
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ #endif
diff --git a/package/openssh/patches/patch-sshconnect_c b/package/openssh/patches/patch-sshconnect_c
new file mode 100644
index 000000000..45dc91b34
--- /dev/null
+++ b/package/openssh/patches/patch-sshconnect_c
@@ -0,0 +1,10 @@
+--- openssh-6.2p1.orig/sshconnect.c	2012-09-17 05:25:44.000000000 +0200
++++ openssh-6.2p1/sshconnect.c	2013-08-20 18:00:38.757257988 +0200
+@@ -16,6 +16,7 @@
+ #include "includes.h"
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
diff --git a/package/openssh/patches/patch-sshd_c b/package/openssh/patches/patch-sshd_c
new file mode 100644
index 000000000..a684f3e7b
--- /dev/null
+++ b/package/openssh/patches/patch-sshd_c
@@ -0,0 +1,10 @@
+--- openssh-6.2p1.orig/sshd.c	2013-02-12 01:04:48.000000000 +0100
++++ openssh-6.2p1/sshd.c	2013-08-20 17:40:31.488435414 +0200
+@@ -46,6 +46,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#include <sys/param.h>
+ #include <sys/socket.h>
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>