moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

samba: remove systemd support; unbreak musl cross compilation.

Browse source
This commit is contained in:
Juan RP 2015-06-13 11:44:25 +02:00
parent 425757ad88
commit 6115538d71
8 changed files with 11 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/samba/files/nmbd.service
View file

@ -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

6
srcpkgs/samba/files/samba.tmpfiles
View file

@ -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 - -

12
srcpkgs/samba/files/smbd.service
View file

@ -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

9
srcpkgs/samba/files/smbd.socket
View file

@ -1,9 +0,0 @@
[Unit]
Description=Samba SMB/CIFS server socket
[Socket]
ListenStream=445
Accept=yes
[Install]
WantedBy=sockets.target

7
srcpkgs/samba/files/smbd@.service
View file

@ -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

12
srcpkgs/samba/files/winbindd.service
View file

@ -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

10
srcpkgs/samba/patches/musl.patch Normal file
View file

@ -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

12
srcpkgs/samba/template
View file

@ -1,7 +1,7 @@
# Template file for 'samba' # Template file for 'samba'
pkgname=samba pkgname=samba
version=3.6.25 version=3.6.25
revision=6 revision=7
build_pie=yes build_pie=yes
build_wrksrc=source3 build_wrksrc=source3
build_style=gnu-configure build_style=gnu-configure
@ -22,7 +22,6 @@ distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
checksum=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 checksum=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
lib32disabled=yes lib32disabled=yes
build_options="systemd"
conf_files="/etc/pam.d/samba" conf_files="/etc/pam.d/samba"
make_dirs="/etc/samba/private 0750 root root" make_dirs="/etc/samba/private 0750 root root"
hostmakedepends="pkg-config perl python-devel" hostmakedepends="pkg-config perl python-devel"
@ -76,15 +75,6 @@ post_install() {
rm -f ${DESTDIR}/usr/lib/libtevent* rm -f ${DESTDIR}/usr/lib/libtevent*
rm -f ${DESTDIR}/usr/include/samba/tevent* 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 nmbd
vsv smbd vsv smbd