From 6115538d71ebf49af03b744d4b6253ba38ca2c3e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 13 Jun 2015 11:44:25 +0200
Subject: [PATCH] samba: remove systemd support; unbreak musl cross
 compilation.

---
 srcpkgs/samba/files/nmbd.service     | 12 ------------
 srcpkgs/samba/files/samba.tmpfiles   |  6 ------
 srcpkgs/samba/files/smbd.service     | 12 ------------
 srcpkgs/samba/files/smbd.socket      |  9 ---------
 srcpkgs/samba/files/smbd@.service    |  7 -------
 srcpkgs/samba/files/winbindd.service | 12 ------------
 srcpkgs/samba/patches/musl.patch     | 10 ++++++++++
 srcpkgs/samba/template               | 12 +-----------
 8 files changed, 11 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/samba/files/nmbd.service
 delete mode 100644 srcpkgs/samba/files/samba.tmpfiles
 delete mode 100644 srcpkgs/samba/files/smbd.service
 delete mode 100644 srcpkgs/samba/files/smbd.socket
 delete mode 100644 srcpkgs/samba/files/smbd@.service
 delete mode 100644 srcpkgs/samba/files/winbindd.service
 create mode 100644 srcpkgs/samba/patches/musl.patch

diff --git a/srcpkgs/samba/files/nmbd.service b/srcpkgs/samba/files/nmbd.service
deleted file mode 100644
index 1072b735053..00000000000
--- a/srcpkgs/samba/files/nmbd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba NetBIOS name server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/nmbd.pid
-ExecStart=/usr/sbin/nmbd -D
-ExecReload=/usr/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/samba/files/samba.tmpfiles b/srcpkgs/samba/files/samba.tmpfiles
deleted file mode 100644
index a3b76a86399..00000000000
--- a/srcpkgs/samba/files/samba.tmpfiles
+++ /dev/null
@@ -1,6 +0,0 @@
-# Required directories at runtime by samba.
-d	/run/samba/socket	0755	root	root	-	-
-d	/etc/samba/private      0700    root    root	-	-
-d	/var/samba              0750    root    root	-	-
-d	/var/spool/samba        1777    root    root	-	-
-d	/var/log/samba          0750    root    root	-	-
diff --git a/srcpkgs/samba/files/smbd.service b/srcpkgs/samba/files/smbd.service
deleted file mode 100644
index a4cf8df702c..00000000000
--- a/srcpkgs/samba/files/smbd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server
-After=network.target nmbd.service winbindd.service
-
-[Service]
-Type=forking
-PIDFile=/run/smbd.pid
-ExecStart=/usr/sbin/smbd -D
-ExecReload=/usr/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/samba/files/smbd.socket b/srcpkgs/samba/files/smbd.socket
deleted file mode 100644
index 833bf438832..00000000000
--- a/srcpkgs/samba/files/smbd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server socket
-
-[Socket]
-ListenStream=445
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/srcpkgs/samba/files/smbd@.service b/srcpkgs/samba/files/smbd@.service
deleted file mode 100644
index 38761bcf8ad..00000000000
--- a/srcpkgs/samba/files/smbd@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server instance
-
-[Service]
-ExecStart=/usr/sbin/smbd -F
-ExecReload=/usr/bin/kill -HUP $MAINPID
-StandardInput=socket
diff --git a/srcpkgs/samba/files/winbindd.service b/srcpkgs/samba/files/winbindd.service
deleted file mode 100644
index a704bb25895..00000000000
--- a/srcpkgs/samba/files/winbindd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Samba Winbind daemon
-After=network.target nmbd.service
-
-[Service]
-Type=forking
-PIDFile=/run/winbindd.pid
-ExecStart=/usr/sbin/winbindd -D
-ExecReload=/usr/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/samba/patches/musl.patch b/srcpkgs/samba/patches/musl.patch
new file mode 100644
index 00000000000..c119a7576b9
--- /dev/null
+++ b/srcpkgs/samba/patches/musl.patch
@@ -0,0 +1,10 @@
+--- source3/include/samba_linux_quota.h.orig	2015-06-13 11:42:24.658548702 +0200
++++ source3/include/samba_linux_quota.h	2015-06-13 11:42:33.241642520 +0200
+@@ -40,6 +40,7 @@
+  *	Headerfile for old quotafile format
+  */
+ 
++#include <sys/cdefs.h>
+ #include <sys/types.h>
+ 
+ #define V1_DQBLK_SIZE_BITS 10
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 45359b88fc8..d143597311b 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
 version=3.6.25
-revision=6
+revision=7
 build_pie=yes
 build_wrksrc=source3
 build_style=gnu-configure
@@ -22,7 +22,6 @@ distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
 checksum=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
 
 lib32disabled=yes
-build_options="systemd"
 conf_files="/etc/pam.d/samba"
 make_dirs="/etc/samba/private 0750 root root"
 hostmakedepends="pkg-config perl python-devel"
@@ -76,15 +75,6 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/libtevent*
 	rm -f ${DESTDIR}/usr/include/samba/tevent*
 
-	# systemd units
-	if [ "$build_option_systemd" ]; then
-		for f in ${FILESDIR}/*.{service,socket}; do
-			vinstall ${f} 644 usr/lib/systemd/system
-		done
-		# systemd tmpfiles
-		vinstall ${FILESDIR}/samba.tmpfiles 644 usr/lib/tmpfiles.d samba.conf
-	fi
-
 	vsv nmbd
 	vsv smbd