[arch-commits] Commit in samba/trunk (7 files)

[Tobias Powalowski]

    Date: Monday, March 28, 2022 @ 07:41:32
  Author: tpowa
Revision: 440743

upgpkg: samba 4.16.0-2: fix #69114 #66557

Modified:
  samba/trunk/PKGBUILD
Deleted:
  samba/trunk/nmbd.service
  samba/trunk/samba.conf.d
  samba/trunk/samba.service
  samba/trunk/smbd.service
  samba/trunk/smbd.socket
  samba/trunk/winbindd.service

------------------+
 PKGBUILD         |    6 ++++--
 nmbd.service     |   12 ------------
 samba.conf.d     |   18 ------------------
 samba.service    |   14 --------------
 smbd.service     |   12 ------------
 smbd.socket      |    9 ---------
 winbindd.service |   12 ------------
 7 files changed, 4 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-28 07:01:20 UTC (rev 440742)
+++ PKGBUILD	2022-03-28 07:41:32 UTC (rev 440743)
@@ -11,7 +11,7 @@
 pkgbase=samba
 pkgname=('smbclient' 'samba')
 pkgver=4.16.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url="https://www.samba.org"
 license=('GPL3')
@@ -197,7 +197,9 @@
 
   # Fix waf installing the wrong permissions for sudoers.d
   chmod 750 ${pkgdir}/etc/sudoers.d
-  chmod 600 ${pkgdir}/etc/sudoers.d/ctdb
+  chmod 440 ${pkgdir}/etc/sudoers.d/ctdb
+  # install ctdb service
+  install -D -m644 "${srcdir}"/ctdb/config/ctdb.service  ${pkgdir}/usr/lib/systemd/system/ctdb.service
 }
 
 # vim: ts=2 sw=2 et:

Deleted: nmbd.service
===================================================================
--- nmbd.service	2022-03-28 07:01:20 UTC (rev 440742)
+++ nmbd.service	2022-03-28 07:41:32 UTC (rev 440743)
@@ -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

Deleted: samba.conf.d
===================================================================
--- samba.conf.d	2022-03-28 07:01:20 UTC (rev 440742)
+++ samba.conf.d	2022-03-28 07:41:32 UTC (rev 440743)
@@ -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=""

Deleted: samba.service
===================================================================
--- samba.service	2022-03-28 07:01:20 UTC (rev 440742)
+++ samba.service	2022-03-28 07:41:32 UTC (rev 440743)
@@ -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

Deleted: smbd.service
===================================================================
--- smbd.service	2022-03-28 07:01:20 UTC (rev 440742)
+++ smbd.service	2022-03-28 07:41:32 UTC (rev 440743)
@@ -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

Deleted: smbd.socket
===================================================================
--- smbd.socket	2022-03-28 07:01:20 UTC (rev 440742)
+++ smbd.socket	2022-03-28 07:41:32 UTC (rev 440743)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Samba SMB/CIFS server socket
-
-[Socket]
-ListenStream=445
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Deleted: winbindd.service
===================================================================
--- winbindd.service	2022-03-28 07:01:20 UTC (rev 440742)
+++ winbindd.service	2022-03-28 07:41:32 UTC (rev 440743)
@@ -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