aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-18 07:34:50 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-18 07:34:50 +0000
commite56c3b915a642c9e3a643ef57bac044a4f6c10bc (patch)
tree45fdb923cabe83a8d68f32cc5f8a4833475b0ef9
parente171568571e813a13cca66856b7fd97de1846da2 (diff)
downloadaports-e56c3b915a642c9e3a643ef57bac044a4f6c10bc.tar.bz2
aports-e56c3b915a642c9e3a643ef57bac044a4f6c10bc.tar.xz
main/samba: fix musl build
-rw-r--r--main/samba/APKBUILD6
-rw-r--r--main/samba/musl-fix-headers.patch11
-rw-r--r--main/transmission/musl-fix-includes.patch11
3 files changed, 27 insertions, 1 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 8e57987246..f3a635aaef 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
pkgver=4.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
arch="all"
@@ -20,6 +20,7 @@ makedepends="popt-dev ncurses-dev openldap-dev heimdal-dev e2fsprogs-dev
tevent-dev iniparser-dev perl subunit-dev"
source="http://us1.samba.org/samba/ftp/stable/samba-$pkgver.tar.gz
fix-libreplace.patch
+ musl-fix-headers.patch
samba.initd
samba.confd
samba.logrotate
@@ -289,16 +290,19 @@ libs() {
md5sums="a5dbfe87f4cb3d9d91e15e5df99a59a1 samba-4.1.3.tar.gz
b8c06c1a37bce8a7feea3b6896483da0 fix-libreplace.patch
+2386589c1e2cbcf95b644554b8a2f4d1 musl-fix-headers.patch
044c756d3c33c2d610c40bcd76cfb75c samba.initd
c150433426e18261e6e3eed3930e1a76 samba.confd
b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate"
sha256sums="71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db samba-4.1.3.tar.gz
13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827 fix-libreplace.patch
+0cf7e4eadf442422434d2b0fb43193f3a79f2887e32432f12cb6aed1941e807a musl-fix-headers.patch
86646cb845aababd9e8655994379526f03327a2cc33b489c3a7dea83ab689c8f samba.initd
1d12f98a7727967b04eb123109b34cfffef320822dc0e8059286b6e3394c3fc0 samba.confd
4c2b7d529126b2fc4f62fb09d99e49a87632d723a2d9d289a61e37dd84145be1 samba.logrotate"
sha512sums="c3e08df4e23c02ab759e819809ac8b146972508bbbbfc666e47ac180dea75dde85564e839aa4935e43f9b894bdf650fd3ed36463e70e9065c6e1c745142984d5 samba-4.1.3.tar.gz
4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2 fix-libreplace.patch
+8d2e1be5f020d0558917f328770b289d0a41836616952d0d3208cecd457df3649f1357a2d35dc54123559ab6a1b720f3189286c65cee90b02ccbae7d676ae383 musl-fix-headers.patch
59d05252b8ebbe6ba6a419edc86b66b9541d0bac9dbe810cccb20e64f6044e2900cc6c0979e077741ed00fbbf2d51f9184c83715013299782707b44e39aa99b1 samba.initd
4faf581ecef3ec38319e3c4ab6d3995c51fd7ba83180dc5553a2ff4dfb92efadb43030c543292130c4ed0c281dc0972c6973d52d48062c5edb39bb1c4bbb6dd6 samba.confd
f88ebe59ca3a9e9b77dd5993c13ef3e73a838efb8ed858088b464a330132d662f33e25c27819e38835389dee23057a3951de11bae1eef55db8ff5e1ec6760053 samba.logrotate"
diff --git a/main/samba/musl-fix-headers.patch b/main/samba/musl-fix-headers.patch
new file mode 100644
index 0000000000..ccfe39afca
--- /dev/null
+++ b/main/samba/musl-fix-headers.patch
@@ -0,0 +1,11 @@
+--- samba-4.1.3/source3/include/samba_linux_quota.h.orig
++++ samba-4.1.3/source3/include/samba_linux_quota.h
+@@ -227,7 +227,7 @@
+ #endif
+ #endif
+
+-long quotactl __P((int, const char *, qid_t, caddr_t));
++long quotactl(int, const char *, qid_t, caddr_t);
+
+ #endif /* _QUOTA_LINUX */
+
diff --git a/main/transmission/musl-fix-includes.patch b/main/transmission/musl-fix-includes.patch
new file mode 100644
index 0000000000..acda02b8b7
--- /dev/null
+++ b/main/transmission/musl-fix-includes.patch
@@ -0,0 +1,11 @@
+--- transmission-2.82.orig/libtransmission/transmission.h
++++ transmission-2.82/libtransmission/transmission.h
+@@ -43,6 +43,8 @@
+
+ #include <inttypes.h> /* uintN_t */
+ #include <time.h> /* time_t */
++#include <fcntl.h> /* off_t */
++#include <stdio.h> /* ssize_t */
+
+ #if !defined (__cplusplus)
+ #ifdef HAVE_STDBOOL_H