Merging debian version 2:4.20.1+dfsg-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 15 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index 453bb91..82b9bee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+samba (2:4.20.1+dfsg-3) unstable; urgency=medium
+
+  * d/rules: move samba-common install to d/samba-common.install
+  * d/rules: install samba-ad-dc init files for the right package
+  * d/samba.postinst: remove nmbd_error_handler for the initscript
+    (it is not used in systemd case)
+
+ -- Michael Tokarev <mjt@tls.msk.ru>  Sun, 26 May 2024 18:48:17 +0300
+
 samba (2:4.20.1+dfsg-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/panic-action b/debian/panic-action
index 7b73024..7b73024 100644..100755
--- a/debian/panic-action
+++ b/debian/panic-action
diff --git a/debian/rules b/debian/rules
index 9d23d97..1142fe1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -287,9 +287,6 @@ override_dh_auto_install-indep:
 ifeq (${DEB_VENDOR}, Ubuntu)
 	patch debian/samba-common/usr/share/samba/smb.conf debian/smb.conf.ubuntu.diff
 endif
-	install -Dp -m0755 debian/panic-action  -t debian/samba-common/usr/share/samba/
-	install -Dp -m0755 debian/is-configured -t debian/samba-common/usr/share/samba/
-	install -Dp -m0644 debian/gdbcommands -t debian/samba-common/etc/samba/
 	# we wrongly have pam file in samba-common instead of samba
 	install -Dp -m0644 debian/samba.pam debian/samba-common/etc/pam.d/samba
 
@@ -308,8 +305,8 @@ ifpkg = $(if $(filter ${1},${build-pkgs}),${2})
 override_dh_installinit:
 ifneq (,$(filter samba, ${build-pkgs}))
 	dh_installinit -psamba --name smbd
-	dh_installinit -psamba --name nmbd --error-handler nmbd_error_handler
-	dh_installinit -psamba --name samba-ad-dc
+	dh_installinit -psamba --name nmbd
+	dh_installinit -psamba-ad-dc
 endif
 	$(call ifpkg, winbind, dh_installinit -pwinbind)
 ifneq (,$(filter ctdb, ${build-pkgs}))
@@ -322,7 +319,7 @@ override_dh_installsystemd:
 ifneq (,$(filter samba, ${build-pkgs}))
 	dh_installsystemd -psamba --name=smbd
 	dh_installsystemd -psamba --name=nmbd
-	dh_installsystemd -psamba --name=samba-ad-dc
+	dh_installsystemd -psamba-ad-dc
 endif
 	$(call ifpkg, winbind, dh_installsystemd -pwinbind)
 	$(call ifpkg, ctdb, dh_installsystemd -pctdb --no-start --no-stop-on-upgrade)
diff --git a/debian/samba-common.install b/debian/samba-common.install
new file mode 100644
index 0000000..7986e10
--- /dev/null
+++ b/debian/samba-common.install
@@ -0,0 +1,3 @@
+debian/is-configured usr/share/samba/
+debian/panic-action usr/share/samba/
+debian/gdbcommands etc/samba/
diff --git a/debian/samba.postinst b/debian/samba.postinst
index ceb0b64..f15dfa5 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -2,23 +2,6 @@
 
 set -e
 
-nmbd_error_handler() {
-    if [ -d /sys/class/net/lo ] && ls /sys/class/net | grep -qv ^lo$; then
-        # https://bugs.debian.org/893762
-        echo 'WARNING: nmbd failed to start as there is no non-loopback interfaces available.'
-        echo 'Either add an interface or set "disable netbios = yes" in smb.conf'
-        return 0
-    elif command -v ip > /dev/null && ip a show | grep '^[[:space:]]*inet ' | grep -vq ' lo$'; then
-        # https://bugs.debian.org/859526
-        echo 'WARNING: nmbd failed to start as there is no local IPv4 non-loopback interfaces available.'
-        echo 'Either add an IPv4 address or set "disable netbios = yes" in smb.conf'
-        return 0
-    else
-        echo 'ERROR: nmbd failed to start.'
-        return 1 # caught by set -e
-    fi
-}
-
 # We generate several files during the postinst, and we don't want
 #	them to be readable only by root.
 umask 022