main/squark: cherry-pick upstream commits (fixes musl build)

1 files changed, 52 insertions, 0 deletions

diff --git a/main/squark/0002-all-fix-includes-for-strict-compliance.patch b/main/squark/0002-all-fix-includes-for-strict-compliance.patch
new file mode 100644
index 0000000000..c57c78b3cf
--- /dev/null
+++ b/main/squark/0002-all-fix-includes-for-strict-compliance.patch
@@ -0,0 +1,52 @@
+From 7efc2ebeda4414bf3c633a6cf86b49c033973f52 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 19 Dec 2013 22:20:39 +0200
+Subject: [PATCH 2/2] all: fix #includes for strict compliance
+
+---
+ src/authdb.c | 3 ++-
+ src/blob.c   | 2 +-
+ src/blob.h   | 1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/authdb.c b/src/authdb.c
+index a0c0478..b9d38c8 100644
+--- a/src/authdb.c
++++ b/src/authdb.c
+@@ -1,7 +1,8 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <malloc.h>
++#include <stdlib.h>
++#include <stdio.h>
+ #include <sched.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+diff --git a/src/blob.c b/src/blob.c
+index a6ccc62..c526d9b 100644
+--- a/src/blob.c
++++ b/src/blob.c
+@@ -1,6 +1,6 @@
+ #include <time.h>
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+ 
+diff --git a/src/blob.h b/src/blob.h
+index 971ce61..6a8e51c 100644
+--- a/src/blob.h
++++ b/src/blob.h
+@@ -2,6 +2,7 @@
+ #define BLOB_H
+ 
+ #include <string.h>
++#include <time.h>
+ 
+ struct in_addr;
+ 
+-- 
+1.8.5.1
+