[Pkg-samba-maint] [Git][samba-team/samba][debian_4.20] 4 commits: d/control: add Recommends: samba-ad-dc for samba for now to avoid breaking existing installs
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Sat Oct 26 11:20:06 BST 2024
Michael Tokarev pushed to branch debian_4.20 at Debian Samba Team / samba
Commits:
f3fea28c by Michael Tokarev at 2024-10-26T12:47:43+03:00
d/control: add Recommends: samba-ad-dc for samba for now to avoid breaking existing installs
- - - - -
493e3b15 by Michael Tokarev at 2024-10-26T12:47:49+03:00
d/samba.postrm: stop unmasking of samba-ad-dc (it is already done in postinst)
- - - - -
99ca36ff by Michael Tokarev at 2024-10-26T12:47:55+03:00
d/samba.postinst,d/samba.maintscripts: remove samba-ad-dc startup files and stop the service (#1085617)
- - - - -
a1029c96 by Michael Tokarev at 2024-10-26T13:18:39+03:00
update changelog; upload version 4.20.5+dfsg-2 to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/samba.maintscript
- debian/samba.postinst
- debian/samba.postrm
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+samba (2:4.20.5+dfsg-2) unstable; urgency=medium
+
+ * d/control: add Recommends: samba-ad-dc for samba for now
+ to avoid breaking existing installs (from 4.21 series)
+ * d/samba.postrm: stop unmasking of samba-ad-dc
+ (it is already done in postinst) (from 4.21 series)
+ * d/samba.postinst,d/samba.maintscripts: remove samba-ad-dc startup
+ files and stop the service (#1085617) (from 4.21 series)
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Sat, 26 Oct 2024 12:59:56 +0300
+
samba (2:4.20.5+dfsg-1) unstable; urgency=medium
* winbind: break old libpam-winbind & libnss-winbind
=====================================
debian/control
=====================================
@@ -93,6 +93,9 @@ Depends: passwd,
${shlibs:Depends}
Recommends: attr,
python3-samba,
+# samba-ad-dc has been split out of samba in 4.20.1+dfsg-2. Keep it
+# in Recommends for one release cycle to avoid breaking existing installs
+ samba-ad-dc,
Suggests: ctdb,
ufw,
winbind,
=====================================
debian/samba.maintscript
=====================================
@@ -1,2 +1,3 @@
rm_conffile /etc/cron.daily/samba 2:4.19.3+dfsg-3~
rm_conffile /etc/logrotate.d/samba 2:4.19.4+dfsg-3~
+rm_conffile /etc/init.d/samba-ad-dc 2:4.21.1+dfsg-1
=====================================
debian/samba.postinst
=====================================
@@ -49,17 +49,34 @@ then
fi
# in 2:4.20.1+dfsg-2 ad-dc functionality has been moved from samba to its own package.
-# warn about this only if ad-dc is configured but samba-ad-dc.service
-# (which is part of samba-ad-dc package) is not present
+# in 2:4.21.1+dfsg-2 we cleaned up the startup scripts
if [ configure = "$1" ] \
- && dpkg --compare-versions "$2" lt-nl 2:4.20.1+dfsg-2~ \
- && /usr/share/samba/is-configured samba-ad-dc \
- && [ ! -f /lib/systemd/system/samba-ad-dc.service ] \
- && [ ! -f /var/lib/dpkg/info/samba-ad-dc.list ]
+ && dpkg --compare-versions "$2" lt-nl 2:4.21.1+dfsg-2~~
then
- # here, the user might had requested to install samba-ad-dc *too*,
- # in the same `apt-get` run, but it's not installed yet. So this
- # warning will be useless, but at least it will help in other cases.
+
+ if [ ! -f /lib/systemd/system/samba-ad-dc.service ]
+ # samba-ad-dc package isn't installed
+ then
+ update-rc.d samba-ad-dc remove >/dev/null
+ if [ -x /usr/bin/deb-systemd-helper ]; then
+ deb-systemd-helper purge samba-ad-dc.service >/dev/null || :
+ fi
+ fi
+
+ if /usr/share/samba/is-configured samba-ad-dc
+ then
+
+ # use systemctl directly since the service file is gone
+ systemctl stop samba-ad-dc >/dev/null 2>&1 || :
+
+ # warn if ad-dc is configured but samba-ad-dc.service
+ # (which is part of samba-ad-dc package) is not present
+ if [ ! -f /lib/systemd/system/samba-ad-dc.service ] \
+ && [ ! -f /var/lib/dpkg/info/samba-ad-dc.list ]
+ then
+ # here, the user might had requested to install samba-ad-dc *too*,
+ # in the same `apt-get` run, but it's not installed yet. So this
+ # warning will be useless, but at least it will help in other cases.
# this doesn't work:
# . /usr/share/debconf/confmodule
@@ -71,20 +88,20 @@ then
# lintian errors out about this note being non-translatable etc
# so it requires too much efforts. Let's keep the user uninformed.
- cat <<'EOF' >&2
-WARNING: =====================================================================
-WARNING: Your samba appears to be configured as an Active Directory Domain
-WARNING: Controller (AD-DC). AD-DC functionality has been moved out of main
-WARNING: samba package to a separate samba-ad-dc package.
-WARNING:
-WARNING: Please install samba-ad-dc package for the Domain Controller to work.
-WARNING:
-WARNING: Please seee /usr/share/doc/samba/NEWS.Debian.gz for more information.
-WARNING: =====================================================================
+ cat <<-EOF >&2
+ WARNING: =====================================================================
+ WARNING: Your samba appears to be configured as an Active Directory Domain
+ WARNING: Controller (AD-DC). AD-DC functionality has been moved out of main
+ WARNING: samba package to a separate samba-ad-dc package.
+ WARNING:
+ WARNING: Please install samba-ad-dc package for the Domain Controller to work.
+ WARNING:
+ WARNING: Please seee /usr/share/doc/samba/NEWS.Debian.gz for more information.
+ WARNING: =====================================================================
EOF
- # use systemctl directly since the service file is gone
- systemctl stop samba-ad-dc >/dev/null 2>&1 || :
+ fi
+ fi
fi
#DEBHELPER#
=====================================
debian/samba.postrm
=====================================
@@ -9,11 +9,6 @@ if [ "$1" = purge ]; then
db_purge
fi
- if [ "$(readlink /etc/systemd/system/samba-ad-dc.service)" = '/dev/null' ]; then
- # Remove masking done by postinst (#832352)
- rm /etc/systemd/system/samba-ad-dc.service
- fi
-
if [ -f /etc/apparmor.d/samba/smbd-shares ]; then
rm /etc/apparmor.d/samba/smbd-shares
fi
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/bf81111c2234ae1d6031d0d9a1267bb7cbd77524...a1029c966691d6ae221d882f9bc904f913cd0924
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/bf81111c2234ae1d6031d0d9a1267bb7cbd77524...a1029c966691d6ae221d882f9bc904f913cd0924
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/20241026/777a508a/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list