From c4af99e94fed5847c7a39b7c5c22578f2715229c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 18 Dec 2013 08:45:09 +0000
Subject: main/rsyslog: fix musl build

---
 main/rsyslog/APKBUILD               | 29 +++++++++++++++++++++++-----
 main/rsyslog/musl-fix-headers.patch | 38 +++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 main/rsyslog/musl-fix-headers.patch

(limited to 'main/rsyslog')

diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 5610a31fe3..c8d0b73bfb 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: cbanta@gmail.com
 pkgname=rsyslog
 pkgver=6.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Enhanced multi-threaded syslogd with database support and more."
 url="http://www.rsyslog.com/"
 arch="all"
@@ -11,6 +11,7 @@ makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev
 	libnet-dev libgcrypt-dev libee-dev libestr-dev"
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp"
 source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
+	musl-fix-headers.patch
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -22,6 +23,15 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	update_config_sub || return 1
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
 	export LDFLAGS="-lestr"
 	./configure \
 		--build=$CBUILD \
@@ -45,10 +55,6 @@ prepare() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		|| return 1
-}
-
-build() {
-	cd "$_builddir"
 	make || return 1
 }
 
@@ -88,7 +94,20 @@ snmp() {
 }
 
 md5sums="7de0124ec7d67ce2bfda0009ab1263ee  rsyslog-6.4.2.tar.gz
+a151d938f3cbdc216100ea1751e4df10  musl-fix-headers.patch
 6b63d774eb718bc1ab91f3fb5471ade3  rsyslog.initd
 0a0aef98f677364e6178c34274df7723  rsyslog.confd
 bc43debc9ffdf66bc1409025fd3d1176  rsyslog.logrotate
 65fbf5a7a81a53a70974e3085e96cb41  rsyslog.conf"
+sha256sums="ca92434c87f7390a5ea7ce6aea94c6cb05474bf778ec5d8ebc0b9a50f321749c  rsyslog-6.4.2.tar.gz
+290aaa384b063b0ac09f4d06ef394dec2606030b87b23bd75625f0bf20106692  musl-fix-headers.patch
+dfe1c50766df7bf862507f8f0819e01f78c3054e57e8c4db1f16b3874a04094c  rsyslog.initd
+c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56  rsyslog.confd
+f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5  rsyslog.logrotate
+559a8221d2ef9376a77e08de05206f3d2214a81fa88649f5bca2a1207f8918c5  rsyslog.conf"
+sha512sums="7d6d16fd7334f814040878debdca7815bfa00fb8e996052b04dfbe379681dfcbb2213dc779f9407b8fb861b07a829fb0cf3bd9ec697b7affd38e338ca2ab93b8  rsyslog-6.4.2.tar.gz
+a38b7b575f55614e8aae4408d22ad39371174f58ffd1f870510d07cdc3a2c2577a25934746e376c6919e1f2ccfed00f7ea01ab862aa656e7b4c945af7553e3e3  musl-fix-headers.patch
+e35f07e9ce499b874bcc441cb3fa1f7a1c545bc72fec24f96debfbe00dff4d0a27d987c7cc70fd160c718bd25d9a0d291c241fc527aeef897842b7c8a48b35d3  rsyslog.initd
+c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3  rsyslog.confd
+d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f  rsyslog.logrotate
+032ccce1850bc89fb37b4b23f1607ce73086ff2b057838a1b83e36751ee0412c537fc0c9cbc2c6e8098311e6a04569c7fc7f7dea80111e8c8623b3b0cc3cccd1  rsyslog.conf"
diff --git a/main/rsyslog/musl-fix-headers.patch b/main/rsyslog/musl-fix-headers.patch
new file mode 100644
index 0000000000..c14c94085a
--- /dev/null
+++ b/main/rsyslog/musl-fix-headers.patch
@@ -0,0 +1,38 @@
+--- rsyslog-6.4.2.orig/tools/omfile.c
++++ rsyslog-6.4.2/tools/omfile.c
+@@ -37,6 +37,7 @@
+  */
+ #include "config.h"
+ #include "rsyslog.h"
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+--- rsyslog-6.4.2.orig/tools/pidfile.c
++++ rsyslog-6.4.2/tools/pidfile.c
+@@ -29,6 +29,7 @@
+  *	First version (v0.2) released
+  */
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+--- rsyslog-6.4.2.orig/tools/syslogd.c
++++ rsyslog-6.4.2/tools/syslogd.c
+@@ -46,13 +46,14 @@
+ #define DEFUPRI		(LOG_USER|LOG_NOTICE)
+ #define TIMERINTVL	30		/* interval for checking flush, mark */
+ 
++#define GNU_SOURCE
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <ctype.h>
+ #include <limits.h>
+-#define GNU_SOURCE
+ #include <string.h>
+ #include <stdarg.h>
+ #include <time.h>
-- 
cgit v1.2.3