[Pkg-samba-maint] [Git][samba-team/samba][master] fix smbd apparmor breakage since change to local systemd services (#1069661)

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
6822c3b9 by Alex Murray at 2024-04-22T12:27:32+03:00
fix smbd apparmor breakage since change to local systemd services (#1069661)

- - - - -


3 changed files:

- debian/patches/series
- − debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch
- debian/samba.smbd.service


Changes:

=====================================
debian/patches/series
=====================================
@@ -5,7 +5,6 @@ smbclient-pager.patch
 usershare.patch
 heimdal-rfc3454.txt
 add-so-version-to-private-libraries
-smbd.service-Run-update-apparmor-samba-profile-befor.patch
 fix-nfs-service-name-to-nfs-kernel-server.patch
 ctdb-config-enable-syslog-by-default.patch
 Force-LDB-as-standalone.patch


=====================================
debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch deleted
=====================================
@@ -1,25 +0,0 @@
-From 0ecd28ff3fd7f3d5c20705a2b8233fc8648cbf9c Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent at gmail.com>
-Date: Thu, 21 Feb 2019 21:04:30 +0100
-Subject: [PATCH] smbd.service: Run update-apparmor-samba-profile before start
-
-Bug-Debian: https://bugs.debian.org/896080
----
- packaging/systemd/smb.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/packaging/systemd/smb.service.in b/packaging/systemd/smb.service.in
-index 18912ef0e98..6bb24861682 100644
---- a/packaging/systemd/smb.service.in
-+++ b/packaging/systemd/smb.service.in
-@@ -10,6 +10,7 @@ NotifyAccess=all
- PIDFile=@PIDDIR@/smbd.pid
- LimitNOFILE=16384
- EnvironmentFile=- at SYSCONFDIR@/sysconfig/samba
-+ExecStartPre=/usr/share/samba/update-apparmor-samba-profile
- ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS
- ExecReload=/bin/kill -HUP $MAINPID
- LimitCORE=infinity
--- 
-2.20.1
-


=====================================
debian/samba.smbd.service
=====================================
@@ -9,6 +9,7 @@ Type=notify
 PIDFile=/run/samba/smbd.pid
 LimitNOFILE=16384
 EnvironmentFile=-/etc/default/samba
+ExecStartPre=/usr/share/samba/update-apparmor-samba-profile
 ExecStart=/usr/sbin/smbd --foreground --no-process-group $SMBDOPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 LimitCORE=infinity



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/6822c3b9252f6769bfe2c4b48f9620910b637ca3

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/6822c3b9252f6769bfe2c4b48f9620910b637ca3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20240422/9e0b5dc0/attachment-0001.htm>