Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • lts-team/packages/samba
  • thctlo/samba-lintianfix
  • arnaudr/samba
  • jrwren/samba
  • paride/samba
  • athos/samba
  • henrich/samba
  • cnotin/samba
  • mimi89999/samba
  • samba-team/samba
  • ahasenack/samba
  • jrtc27/samba
  • noel/samba
13 results
Show changes
samba (2:4.20.2+dfsg-6) unstable; urgency=medium
* make-python-optional.diff: remove the forgotten unneeded patch
* d/samba.NEWS: re-wrap it a little bit
* d/samba.postinst: notify the user about probably-missing samba-ad-dc
package on upgrade (debconf template samba/no-samba-ad-dc)
* d/samba-common.postinst: remove (clean up) old debconf entries
-- Michael Tokarev <mjt@tls.msk.ru> Mon, 08 Jul 2024 16:40:49 +0300
samba (2:4.20.2+dfsg-5) unstable; urgency=medium
* replace internal-to-samba-build python3-ldb-dev package
......
From: Michael Tokarev <mjt@tls.msk.ru>
Subject: samba-log-parser: make python optional
Date: Sun, 26 May 2024 14:40:40 +0300
Forwarded: not-needed
Debian-Specific: yes
samba-log-parser is a rarely used utility written in python.
It is the only python program in the samba-common-bin package.
By using this simple trick (wrapping the script into #!/bin/sh)
we can make the python package optional, to be able to install
minimal samba client.
--- a/source3/script/samba-log-parser
+++ b/source3/script/samba-log-parser
@@ -1,4 +1,9 @@
-#!/usr/bin/env python3
+#! /bin/sh
+""":"
+[ -x /usr/bin/python3 ] && exec /usr/bin/python3 "$0" "$@"
+echo "This program requires python3. Please install python3 package to use it." >&2
+exit 42
+":"""
#
#######################################################################
#
......@@ -25,5 +25,4 @@ silence-can-not-convert-group-sid.diff
edns0.patch
passchange-error-message.patch
lower-dns-lookup-mismatch-messages.patch
make-python-optional.diff
tilde-in-version.diff
......@@ -24,4 +24,10 @@ 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
then
echo PURGE | debconf-communicate samba-common
fi
#DEBHELPER#
......@@ -3,8 +3,8 @@ samba (2:4.20.1+dfsg-2) unstable; urgency=medium
Active Directory Domain Controller (AD-DC) functionality has been split out
of main samba (the file server) package into its own separate package named
samba-ad-dc. This includes the samba binary, the startup files and a few
support executables. Please additionally install samba-ad-dc package if
you need AD-DC functionality on your system.
support executables. Please additionally install samba-ad-dc package if you
need AD-DC functionality on your system.
-- Michael Tokarev <mjt@tls.msk.ru> Sun, 26 May 2024 13:44:07 +0300
......
......@@ -48,6 +48,45 @@ then
fi
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
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 ]
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
# db_title SAMBA || :
# db_input high samba/no-samba-ad-dc || :
# db_go || :
# because:
# debconf does not display this note anywhwere when DEBIAN_FRONTEND=noninteractive
# 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: =====================================================================
EOF
# use systemctl directly since the service file is gone
systemctl stop samba-ad-dc >/dev/null 2>&1 || :
fi
#DEBHELPER#
# remove msg.sock/ directory (moved to /run/samba/)
......