[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: d/winbind.service: order it before nss-user-lookup.target (#1068649)

[Michael Tokarev (@mjt)]

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


Commits:
36c5a87e by Michael Tokarev at 2024-05-02T13:32:32+03:00
d/winbind.service: order it before nss-user-lookup.target (#1068649)

- - - - -
f5f0261d by Michael Tokarev at 2024-05-02T13:32:49+03:00
d/winbind.service: fix typo

- - - - -
bcaafe56 by Michael Tokarev at 2024-05-02T13:36:50+03:00
d/winbind.service: nmb.service is nmbd.service in debian

- - - - -
758a6622 by Michael Tokarev at 2024-05-02T14:06:41+03:00
move include/samba/core/*.h from samba-libs to libwbclient-dev (#1064544)

Since samba-dev depends on libwbclient-dev, this wont break anything,
but will make libwbclient-dev more self-contained.

Also remove old (pre-bullseye) versioned breaks on samba-libs
for libwbclient-dev.

- - - - -
c30a1fb3 by Michael Tokarev at 2024-05-02T14:08:32+03:00
update changelog; upload version 4.19.6+dfsg-2 to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/libwbclient-dev.install
- debian/samba-dev.install
- debian/winbind.service


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+samba (2:4.19.6+dfsg-2) unstable; urgency=medium
+
+  [ Michael Tokarev ]
+  * meaningful-error-if-no-python3-markdown.patch:
+    update to include 2 other places where markdown gets improted
+  * d/winbind.service:
+    - order it before nss-user-lookup.target (Closes: #1068649)
+    - fix typo
+    - nmb.service is nmbd.service in debian
+  * move include/samba/core/*.h from samba-libs to libwbclient-dev
+    (Closes: #1064544)
+
+  [ Alex Murray ]
+  * fix smbd apparmor breakage since change to local systemd services
+    (Cloes: #1069661)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Thu, 02 May 2024 14:08:31 +0300
+
 samba (2:4.19.6+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/bugfix release:


=====================================
debian/control
=====================================
@@ -223,7 +223,8 @@ Package: samba-ad-provision
 Architecture: all
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+ python3-markdown,
 Replaces: samba (<< 2:4.17.3+dfsg-4~)
 Breaks:   samba (<< 2:4.17.3+dfsg-4~)
 Description: Samba files needed for AD domain provision
@@ -510,8 +511,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libwbclient0 (= ${binary:Version}), ${misc:Depends}
-Breaks: samba-libs (<< 2:4.11.0+dfsg-1~), samba-dev (<< 2:4.11)
-Replaces: samba-dev (<< 2:4.11)
+# include/samba-4.0/core/*.h moved from samba-dev in 4.19.6+dfsg-2
+Breaks:   samba-dev (<< 2:4.19.6+dfsg-2~)
+Replaces: samba-dev (<< 2:4.19.6+dfsg-2~)
 Description: Samba winbind client library - development files
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with


=====================================
debian/libwbclient-dev.install
=====================================
@@ -1,3 +1,4 @@
+usr/include/samba-4.0/core/*.h
 usr/include/samba-4.0/wbclient.h
 usr/lib/*/libwbclient.so
 usr/lib/*/pkgconfig/samba-util.pc


=====================================
debian/samba-dev.install
=====================================
@@ -3,7 +3,6 @@
 # wbclient.h: libwbclient-dev
 # ldb*.h (except ldb_wrap.h): libldb-dev
 usr/include/samba-4.0/charset.h
-usr/include/samba-4.0/core/*.h
 usr/include/samba-4.0/credentials.h
 usr/include/samba-4.0/dcerpc.h
 usr/include/samba-4.0/dcerpc_server.h


=====================================
debian/winbind.service
=====================================
@@ -1,11 +1,12 @@
 [Unit]
 Description=Samba Winbind Daemon
 Documentation=man:winbindd(8) man:samba(7) man:smb.conf(5)
-After=network.target nmb.service
+After=network.target nmbd.service
+Before=nss-user-lookup.target
 
 [Service]
 Type=notify
-PIDFile=/ruin/samba/winbindd.pid
+PIDFile=/run/samba/winbindd.pid
 EnvironmentFile=-/etc/default/samba
 ExecStart=/usr/sbin/winbindd --foreground --no-process-group $WINBINDOPTIONS
 ExecReload=/bin/kill -HUP $MAINPID



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

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/6822c3b9252f6769bfe2c4b48f9620910b637ca3...c30a1fb3c99f41b05b6b803934eca903c625d618
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/20240502/bdee6a36/attachment-0001.htm>