diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/meaningful-error-if-no-python3-markdown.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch | 25 |
3 files changed, 35 insertions, 31 deletions
diff --git a/debian/patches/meaningful-error-if-no-python3-markdown.patch b/debian/patches/meaningful-error-if-no-python3-markdown.patch index 80ffd73..da085f9 100644 --- a/debian/patches/meaningful-error-if-no-python3-markdown.patch +++ b/debian/patches/meaningful-error-if-no-python3-markdown.patch @@ -1,14 +1,10 @@ From: Michael Tokarev <mjt@tls.msk.ru> Date: Fri, 2 Dec 2022 11:08:27 +0300 -Updated: Thu, 03 Aug 2023 17:10:59 +0300 +Updated: Mon, 08 Apr 2024 14:14:38 +0300 Subject: print meaningful error message if python3-markdown is not installed Debian-Specific: yes Forwarded: not-needed ---- - python/samba/netcmd/domain/schemaupgrade.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/python/samba/netcmd/domain/schemaupgrade.py b/python/samba/netcmd/domain/schemaupgrade.py index 1d67ab58c15..858802635a2 100644 --- a/python/samba/netcmd/domain/schemaupgrade.py @@ -22,3 +18,37 @@ index 1d67ab58c15..858802635a2 100644 + raise CommandError('Failed to import module markdown, please install python3-markdown package') from samba.schema import Schema +diff --git a/python/samba/ms_forest_updates_markdown.py b/python/samba/ms_forest_updates_markdown.py +index 0a0d2111a72..a5ef6ec7279 100644 +--- a/python/samba/ms_forest_updates_markdown.py ++++ b/python/samba/ms_forest_updates_markdown.py +@@ -24,7 +24,11 @@ + + import re + import os +-import markdown ++try: ++ import markdown ++except ImportError as e: ++ e.add_note('Please install python3-markdown package') ++ raise + import xml.etree.ElementTree as ET + from samba.common import get_string + +diff --git a/python/samba/ms_schema_markdown.py b/python/samba/ms_schema_markdown.py +index 8a9ad78b870..9af9406081b 100644 +--- a/python/samba/ms_schema_markdown.py ++++ b/python/samba/ms_schema_markdown.py +@@ -22,7 +22,11 @@ + + import re + import os +-import markdown ++try: ++ import markdown ++except ImportError as e: ++ e.add_note('Please install python3-markdown package') ++ raise + import xml.etree.ElementTree as ET + + diff --git a/debian/patches/series b/debian/patches/series index 4c13d2d..b06c91a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ smbclient-pager.patch usershare.patch heimdal-rfc3454.txt add-so-version-to-private-libraries -smbd.service-Run-update-apparmor-samba-profile-befor.patch fix-nfs-service-name-to-nfs-kernel-server.patch ctdb-config-enable-syslog-by-default.patch Force-LDB-as-standalone.patch diff --git a/debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch b/debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch deleted file mode 100644 index c5a64dc..0000000 --- a/debian/patches/smbd.service-Run-update-apparmor-samba-profile-befor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0ecd28ff3fd7f3d5c20705a2b8233fc8648cbf9c Mon Sep 17 00:00:00 2001 -From: Mathieu Parent <math.parent@gmail.com> -Date: Thu, 21 Feb 2019 21:04:30 +0100 -Subject: [PATCH] smbd.service: Run update-apparmor-samba-profile before start - -Bug-Debian: https://bugs.debian.org/896080 ---- - packaging/systemd/smb.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/packaging/systemd/smb.service.in b/packaging/systemd/smb.service.in -index 18912ef0e98..6bb24861682 100644 ---- a/packaging/systemd/smb.service.in -+++ b/packaging/systemd/smb.service.in -@@ -10,6 +10,7 @@ NotifyAccess=all - PIDFile=@PIDDIR@/smbd.pid - LimitNOFILE=16384 - EnvironmentFile=-@SYSCONFDIR@/sysconfig/samba -+ExecStartPre=/usr/share/samba/update-apparmor-samba-profile - ExecStart=@SBINDIR@/smbd --foreground --no-process-group $SMBDOPTIONS - ExecReload=/bin/kill -HUP $MAINPID - LimitCORE=infinity --- -2.20.1 - |