[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/rules: move samba-common install to d/samba-common.install

[Michael Tokarev (@mjt)]

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


Commits:
ed3e0a61 by Michael Tokarev at 2024-05-26T18:44:26+03:00
d/rules: move samba-common install to d/samba-common.install

- - - - -
7815d4f0 by Michael Tokarev at 2024-05-26T18:44:57+03:00
d/rules: install samba-ad-dc init files for the right package

- - - - -
556942c9 by Michael Tokarev at 2024-05-26T18:47:07+03:00
d/samba.postinst: remove nmbd_error_handler for the initscript (it is not used in systemd case)

- - - - -
a3fe36a5 by Michael Tokarev at 2024-05-26T18:48:23+03:00
update changelog; upload version 4.20.1+dfsg-3 to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/panic-action
- debian/rules
- + debian/samba-common.install
- debian/samba.postinst


Changes:

=====================================
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 at tls.msk.ru>  Sun, 26 May 2024 18:48:17 +0300
+
 samba (2:4.20.1+dfsg-2) unstable; urgency=medium
 
   * move many files from samba package to samba-ad-dc package.


=====================================
debian/panic-action
=====================================


=====================================
debian/rules
=====================================
@@ -284,9 +284,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
 
@@ -305,8 +302,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}))
@@ -319,7 +316,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)


=====================================
debian/samba-common.install
=====================================
@@ -0,0 +1,3 @@
+debian/is-configured usr/share/samba/
+debian/panic-action usr/share/samba/
+debian/gdbcommands etc/samba/


=====================================
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



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/64e8262307bb5e04c0c8e19b1079bd844b784b89...a3fe36a5e485c9764a9b653a7e99e319c74387e6

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/64e8262307bb5e04c0c8e19b1079bd844b784b89...a3fe36a5e485c9764a9b653a7e99e319c74387e6
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/20240526/cff8c8b4/attachment-0001.htm>