[Pkg-samba-maint] [Git][samba-team/samba][master] 12 commits: d/changelog: fix typo in previous entry
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Tue Sep 16 14:59:44 BST 2025
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
beb9ca17 by Michael Tokarev at 2025-09-16T16:15:29+03:00
d/changelog: fix typo in previous entry
- - - - -
ae99d710 by Michael Tokarev at 2025-09-16T16:15:29+03:00
d/smb.conf: disable netbios by default
- - - - -
670fafda by Michael Tokarev at 2025-09-16T16:15:29+03:00
d/samba.postinst: remove hunk for samba << 4.16.0 (pre-bookworm) concerning socket directory
- - - - -
932cced6 by Michael Tokarev at 2025-09-16T16:15:29+03:00
d/samba.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm) concerning handling of samba spool dir
- - - - -
a04e1b3d by Michael Tokarev at 2025-09-16T16:15:30+03:00
d/samba.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm) concerning masking of services
- - - - -
c392ccc4 by Michael Tokarev at 2025-09-16T16:15:30+03:00
d/winbind.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm) concerning masking of services
- - - - -
0d45d3e1 by Michael Tokarev at 2025-09-16T16:15:30+03:00
d/samba-common.postinst: actually clean-up old debconf entries
- - - - -
e3dd5b4d by Michael Tokarev at 2025-09-16T16:15:30+03:00
enable system libngtcp2 (for !pkg.samba.builtin-ngtcp2 build profile)
- - - - -
cbbd9c87 by Michael Tokarev at 2025-09-16T16:15:30+03:00
libmscat-deps.patch
Closes: #1103869
- - - - -
3d0264b2 by Michael Tokarev at 2025-09-16T16:15:30+03:00
create pkg.samba.dumpmscat build profile to build dumpmscat binary
This binary is only consumer of libtasn1 in samba, it is undocumented,
and apparently it's not been used for a very long time (#1103869).
Do not build it by default, but provide a possibility to build it
still, with pkg.samba.dumpmscat build profile.
- - - - -
26ebd37d by Michael Tokarev at 2025-09-16T16:15:30+03:00
d/control: describe all current build profiles
- - - - -
71c3bd93 by Michael Tokarev at 2025-09-16T16:17:51+03:00
update changelog; upload version 4.23.0+dfsg-3 to unstable
- - - - -
10 changed files:
- debian/changelog
- debian/control
- + debian/patches/libmscat-deps.patch
- debian/patches/series
- debian/samba-common.postinst
- debian/samba-libs.install
- debian/samba.install
- debian/samba.postinst
- debian/smb.conf
- debian/winbind.postinst
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,31 @@
+samba (2:4.23.0+dfsg-3) unstable; urgency=medium
+
+ * libmscat-deps.patch (Closes: #1103869)
+ * disable building undocumented dumpmscat binary, but provide
+ pkg.samba.dumpmscat build profile to enable buildig it
+ * enable system libngtcp2 (for !pkg.samba.builtin-ngtcp2 build profile)
+ * d/control: describe all current build profiles
+ * d/smb.conf: disable netbios by default
+ * d/samba.postinst: remove hunk for samba << 4.16.0 (pre-bookworm)
+ concerning socket directory
+ * d/samba.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm)
+ concerning handling of samba spool dir
+ * d/samba.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm)
+ concerning masking of services
+ * d/winbind.postinst: remove hunk for samba << 4.17.4-3 (pre-bookworm)
+ concerning masking of services
+ * d/samba-common.postinst: actually clean-up old debconf entries
+ * d/changelog: fix typo in previous entry
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Tue, 16 Sep 2025 16:17:37 +0300
+
samba (2:4.23.0+dfsg-2) unstable; urgency=medium
* d/rules: override dh_gencontrol for arch build only
(no need to do that for indep build)
* d/samba-libs.install: libquic is linux-specific
* d/samba-libs.install: ngtcp2 is linux-specific, not non-hurd
- * d/control: build-depend on :native varian of mingw gcc/tools
+ * d/control: build-depend on :native variant of mingw gcc/tools
(helps building for bookworm where these tools aren't M-A:foreign)
-- Michael Tokarev <mjt at tls.msk.ru> Sun, 14 Sep 2025 15:35:35 +0300
=====================================
debian/control
=====================================
@@ -1,3 +1,7 @@
+# Available build profiles:
+# pkg.samba.before-trixie: no t64, no usrmerge, no rpcsvc-proto
+# pkg.samba.builtin-ngtcp2: use built-in ngtcp2 (required version of libngtcp2 is >= 1.12.0)
+# pkg.samba.dumpmscat: build /usr/bin/dumpmscat binary
Source: samba
Section: net
Priority: optional
@@ -49,16 +53,16 @@ Build-Depends-Arch:
libkrb5-dev (>= 1.21.0~) <pkg.samba.mitkrb5>,
libldap2-dev,
liblmdb-dev,
-# libngtcp2-dev (>> 1.12.0~) [linux-any],
-# libngtcp2-crypto-gnutls-dev (>> 1.12.0~) [linux-any],
+ libngtcp2-dev (>> 1.12.0~) [linux-any] <!pkg.samba.builtin-ngtcp2>,
+ libngtcp2-crypto-gnutls-dev (>> 1.12.0~) [linux-any] <!pkg.samba.builtin-ngtcp2>,
libpam0g-dev,
libpcap-dev [hurd-any],
libpopt-dev,
libreadline-dev,
libtirpc-dev,
libsystemd-dev [linux-any],
- libtasn1-6-dev,
- libtasn1-bin,
+ libtasn1-6-dev <pkg.samba.dumpmscat>,
+ libtasn1-bin <pkg.samba.dumpmscat>,
liburing-dev [linux-any],
# xfslibs-dev is not multi-arch-usable but we only need .h (#1092689)
xfslibs-dev:native [linux-any],
@@ -77,6 +81,9 @@ Build-Depends-Arch:
# python3-iso8601 <!nocheck>,
# python3-pyasn1 <!nocheck>,
# tdb-tools <!nocheck>,
+Build-Conflicts-Arch:
+ libngtcp2-dev <pkg.samba.builtin-ngtcp2>,
+ libtasn1-bin <!pkg.samba.dumpmscat>,
Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/samba-team/samba
Vcs-Git: https://salsa.debian.org/samba-team/samba.git
=====================================
debian/patches/libmscat-deps.patch
=====================================
@@ -0,0 +1,13 @@
+From: Michael Tokarev <mjt at tls.msk.ru>
+Date: Sun, 14 Sep 2025 17:31:16 +0300
+Subject: provide dependencies for libmscat-private-samba.so
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=15916
+Forwarded: yes, https://bugzilla.samba.org/show_bug.cgi?id=15916
+
+diff --git a/lib/mscat/wscript b/lib/mscat/wscript
+--- a/lib/mscat/wscript
++++ b/lib/mscat/wscript
+@@ -35,2 +35,3 @@ def build(bld):
+ samba-util
++ samba-debug
+ ''',
=====================================
debian/patches/series
=====================================
@@ -24,3 +24,4 @@ ctdb-use-run-instead-of-var-run.patch
revert-ldb-use-hexchars_upper-from-replace.h.patch
replace-xpg-strerror.patch
add-support-for-bind-9.20.patch
+libmscat-deps.patch
=====================================
debian/samba-common.postinst
=====================================
@@ -25,7 +25,7 @@ if [ "$1" = configure ]; then
fi
# clean up old debconf entries
-if [ confogure = "$1" ] && dpkg --compare-versions "$2" lt-nl 2:4.20.2+dfsg-6
+if [ configure = "$1" ] && dpkg --compare-versions "$2" lt-nl 2:4.23.0+dfsg-3
then
echo PURGE | debconf-communicate samba-common
fi
=====================================
debian/samba-libs.install
=====================================
@@ -93,8 +93,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/samba/libmessages-dgm-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libmessages-util-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libmsghdr-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libmsrpc3-private-samba.so.0
-[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-crypto-gnutls-private-samba.so.0
-[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-private-samba.so.0
+[linux-any] <pkg.samba.builtin-ngtcp2> usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-crypto-gnutls-private-samba.so.0
+[linux-any] <pkg.samba.builtin-ngtcp2> usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libndr-samba-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libndr-samba4-private-samba.so.0
usr/lib/${DEB_HOST_MULTIARCH}/samba/libnetif-private-samba.so.0
=====================================
debian/samba.install
=====================================
@@ -1,6 +1,5 @@
#!/usr/bin/dh-exec --with-scripts=filter-arch,filter-build-profiles
etc/ufw/applications.d/samba
-usr/bin/dumpmscat
usr/bin/mvxattr
usr/bin/oLschema2ldif
usr/bin/pdbedit
@@ -12,7 +11,8 @@ usr/bin/smbstatus
<!pkg.samba.mitkrb5> usr/lib/${DEB_HOST_MULTIARCH}/samba/libhdb-private-samba.so.0
<!pkg.samba.mitkrb5> usr/lib/${DEB_HOST_MULTIARCH}/samba/libkdc-private-samba.so.0
<pkg.samba.mitkrb5> usr/lib/${DEB_HOST_MULTIARCH}/krb5/plugins/kdb/samba.so
-usr/lib/${DEB_HOST_MULTIARCH}/samba/libmscat-private-samba.so.0
+<pkg.samba.dumpmscat> usr/bin/dumpmscat
+<pkg.samba.dumpmscat> usr/lib/${DEB_HOST_MULTIARCH}/samba/libmscat-private-samba.so.0
usr/libexec/samba/samba-bgqd
usr/lib/${DEB_HOST_MULTIARCH}/samba/service/*.so
usr/sbin/eventlogadm
=====================================
debian/samba.postinst
=====================================
@@ -14,40 +14,6 @@ then
[ -d $dir ] || install -d -m 1770 -g sambashare $dir
fi
-# in 4.17.4+dfsg-3 we stopped masking services, unmask them here
-if [ configure = "$1" ] && dpkg --compare-versions "$2" lt-nl 2:4.17.4+dfsg-3~
-then
- for s in nmbd smbd samba-ad-dc; do
- if [ /dev/null = $(realpath /etc/systemd/system/$s.service) ]
- then
- rm -f /etc/systemd/system/$s.service
- fi
- done
-fi
-
-# remove old spool directory (point it to /var/tmp if in use)
-if [ configure = "$1" ] && dpkg --compare-versions "$2" lt-nl 2:4.17.4+dfsg-3~
-then
- dir=/var/spool/samba
- pat="^(\\s*path\\s*=\\s*)$dir"
- if grep -q -E "$pat\\s*$" /etc/samba/smb.conf ; then
- echo "WARNING: fixing smb.conf, replacing $dir with /var/tmp" >&2
- sed -ri "s|$pat\\s*$|\\1/var/tmp|" /etc/samba/smb.conf
- fi
- if [ -d $dir -a ! -L $dir ]; then
- echo "W: removing old samba print spool $dir" >&2
- rm -rf $dir
- fi
- # we can still have it in an include file (or have a subdir there?)
- if testparm -s 2>/dev/null | grep -E "$pat\\b" >&2; then
- echo "WARNING: $dir is still referenced in smb.conf. Please update smb.conf" >&2
- if [ ! -L $dir ]; then
- echo "WARNING: redirecting $dir to /var/tmp" >&2
- ln -s ../tmp $dir
- fi
- fi
-fi
-
# in 2:4.20.1+dfsg-2 ad-dc functionality has been moved from samba to its own package.
# in 2:4.21.1+dfsg-2 we cleaned up the startup scripts
if [ configure = "$1" ] \
@@ -106,13 +72,4 @@ fi
#DEBHELPER#
-# remove msg.sock/ directory (moved to /run/samba/)
-dir=/var/lib/samba/private/msg.sock
-if [ -d $dir -a configure = "$1" ] &&
- dpkg --compare-versions "$2" lt-nl 2:4.16.0+dfsg-7~
-then
- rm -f $dir/*
- rmdir $dir
-fi
-
exit 0
=====================================
debian/smb.conf
=====================================
@@ -28,6 +28,11 @@
# Change this to the workgroup/NT-domain name your Samba server will part of
workgroup = WORKGROUP
+# The NETBIOS service (nmbd) is obsolete for a long time. By default it is
+# disabled. If you need this, comment out the following line, and ensure
+# your system has at least one non-loopback network interface with IPv4 address.
+ disable netbios = yes
+
#### Networking ####
# The specific set of interfaces / networks to bind to
=====================================
debian/winbind.postinst
=====================================
@@ -2,17 +2,6 @@
set -e
-# in 4.17.4+dfsg-3 we stopped masking services, unmask them here
-if [ configure = "$1" ] && dpkg --compare-versions "$2" lt-nl 2:4.17.4+dfsg-3~
-then
- for s in winbind; do
- if [ /dev/null = $(realpath /etc/systemd/system/$s.service) ]
- then
- rm -f /etc/systemd/system/$s.service
- fi
- done
-fi
-
if [ configure = "$1" -a ! "$2" ] # only do this if not upgrading
then
# groupadd --force: ok if group already exist
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/03fcffdf6b274a7505e4030b52606e6d5f0c51a7...71c3bd93574d675169442702fb020803c1be1b8d
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/03fcffdf6b274a7505e4030b52606e6d5f0c51a7...71c3bd93574d675169442702fb020803c1be1b8d
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/20250916/9a1665ab/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list