diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 70d8d9b..2fdbcc1 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.7.4 +pkgver=4.7.5 pkgrel=1 arch=(x86_64) url="http://www.samba.org" @@ -22,13 +22,6 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.gz http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc samba.logrotate samba.pam - samba.service - samba.conf.d - smbd.service - smbd.socket - nmbd.service - smbd@.service - winbindd.service samba.conf) validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key ### UNINSTALL dmapi package before building!!! @@ -78,6 +71,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a --with-ldap \ --with-winbind \ --with-acl-support \ + --with-systemd \ --enable-gnutls \ --with-pam \ --with-pammodulesdir=/usr/lib/security \ @@ -208,19 +202,19 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ ${pkgdir}/usr/${script} done - # install systemd files + # XXX: 4.8.0: use --systemd-install-services and patch + # packaging/wscript_build to use /etc/conf.d install -d -m755 ${pkgdir}/usr/lib/systemd/system - #for i in smbd nmbd winbindd; do - install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ - install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ + sed -i -e '/^EnvironmentFile/ s/sysconfig/conf.d/' ${srcdir}/samba-${pkgver}/packaging/systemd/*.service + install -m644 ${srcdir}/samba-${pkgver}/packaging/systemd/*.service ${pkgdir}/usr/lib/systemd/system install -d -m755 ${pkgdir}/etc/conf.d - install -m644 ${srcdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba - #done + install -m644 ${srcdir}/samba-${pkgver}/packaging/systemd/samba.sysconfig ${pkgdir}/etc/conf.d/samba + # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf - # install sample smb.conf + # create config dir install -d -m755 ${pkgdir}/etc/samba - + mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private @@ -239,15 +233,8 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('427e7feb988603c51f01c97803305fed' +md5sums=('3629a134253d6a4a16ebd23a508b0d5b' 'SKIP' - '5697da77590ec092cc8a883bae06093c' + '995621522c6ec9b68c1b858ceed627ed' '96f82c38f3f540b53f3e5144900acf17' - 'ee4763a656cf00d92bfda31b6bb2c5cb' - '6c447748a064d631435dbef0a3dcf32f' - 'e4ae6a3cac080602120aa151918c4a36' - 'a78b9aa93eb14b0ac445897395693225' - 'df6380c73cb73163968eabc8650f7358' - '70afd2db60a2e8eff7615dbdecd887ac' - 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') diff --git a/trunk/nmbd.service b/trunk/nmbd.service deleted file mode 100644 index e138225..0000000 --- a/trunk/nmbd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Samba NetBIOS name server -After=network.target - -[Service] -Type=forking -PIDFile=/var/run/nmbd.pid -ExecStart=/usr/bin/nmbd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/trunk/samba.conf.d b/trunk/samba.conf.d deleted file mode 100644 index 7607426..0000000 --- a/trunk/samba.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -## Path: Network/Samba -## Description: Samba process options -## Type: string -## Default: "" -## ServiceRestart: samba -SAMBAOPTIONS="" -## Type: string -## Default: "" -## ServiceRestart: smb -SMBDOPTIONS="" -## Type: string -## Default: "" -## ServiceRestart: nmb -NMBDOPTIONS="" -## Type: string -## Default: "" -## ServiceRestart: winbind -WINBINDOPTIONS="" diff --git a/trunk/samba.logrotate b/trunk/samba.logrotate index 581f4c3..ff28608 100644 --- a/trunk/samba.logrotate +++ b/trunk/samba.logrotate @@ -1,9 +1,5 @@ /var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { notifempty missingok - sharedscripts copytruncate - postrotate - /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true - endscript } diff --git a/trunk/samba.service b/trunk/samba.service deleted file mode 100644 index 562d425..0000000 --- a/trunk/samba.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Samba AD Daemon -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/samba.pid -LimitNOFILE=16384 -EnvironmentFile=-/etc/conf.d/samba -ExecStart=/usr/bin/samba $SAMBAOPTIONS -ExecReload=/usr/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/trunk/smbd.service b/trunk/smbd.service deleted file mode 100644 index 0a8125d..0000000 --- a/trunk/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=/var/run/smbd.pid -ExecStart=/usr/bin/smbd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/trunk/smbd.socket b/trunk/smbd.socket deleted file mode 100644 index 833bf43..0000000 --- a/trunk/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/trunk/smbd@.service b/trunk/smbd@.service deleted file mode 100644 index 071eb57..0000000 --- a/trunk/smbd@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server instance - -[Service] -ExecStart=/usr/bin/smbd -F -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket diff --git a/trunk/winbindd.service b/trunk/winbindd.service deleted file mode 100644 index 41ecbfd..0000000 --- a/trunk/winbindd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Samba Winbind daemon -After=network.target nmbd.service - -[Service] -Type=forking -PIDFile=/var/run/winbindd.pid -ExecStart=/usr/bin/winbindd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target