[Pkg-samba-maint] [Git][samba-team/samba][master] 6 commits: Add patch traffic_packets: fix SyntaxWarning: "is" with a literal (Closes: #964165)
Mathieu Parent
gitlab at salsa.debian.org
Sat Jul 4 23:30:32 BST 2020
Mathieu Parent pushed to branch master at Debian Samba Team / samba
Commits:
30dccb53 by Mathieu Parent at 2020-07-04T23:11:53+02:00
Add patch traffic_packets: fix SyntaxWarning: "is" with a literal (Closes: #964165)
- - - - -
f1b3200b by David Disseldorp at 2020-07-04T23:12:00+02:00
traffic_packets: fix SyntaxWarning: "is" with a literal
Python 3.8 adds this warning via https://bugs.python.org/issue34850:
the "is" and "is not" operator sometimes is used with string and
numerical literals. This code "works" on CPython by accident, because
of caching on different levels (small integers and strings caches,
interned strings, deduplicating constants at compile time). But it
shouldn't work on other implementations, and can not work even on
early or future CPython versions.
Reported-by: L. van Belle <belle at samba.org>
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Noel Power <noel.power at suse.com>
Autobuild-User(master): David Disseldorp <ddiss at samba.org>
Autobuild-Date(master): Mon Apr 27 12:19:59 UTC 2020 on sn-devel-184
- - - - -
a8f0336c by Mathieu Parent at 2020-07-04T23:43:55+02:00
Add patch Rename mdfind to mdsearch (Closes: #963985)
- - - - -
1fad9eff by Mathieu Parent at 2020-07-04T23:43:55+02:00
Rename mdfind to mdsearch
GNUstep as an mdfind binary, and both should be co-instalable.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14431
Signed-off-by: Mathieu Parent <math.parent at gmail.com>
- - - - -
a0bd8602 by Mathieu Parent at 2020-07-04T23:57:47+02:00
d/smbclient.install: Rename mdfind to mdsearch
- - - - -
9b614ae5 by Mathieu Parent at 2020-07-04T23:58:38+02:00
Release 2:4.12.5+dfsg-3
- - - - -
13 changed files:
- debian/changelog
- + debian/patches/Rename-mdfind-to-mdsearch.patch
- debian/patches/series
- + debian/patches/traffic_packets-fix-SyntaxWarning-is-with-a-literal.patch
- debian/smbclient.install
- docs-xml/manpages/mdfind.1.xml → docs-xml/manpages/mdsearch.1.xml
- docs-xml/wscript_build
- python/samba/emulate/traffic_packets.py
- python/samba/tests/blackbox/mdfind.py → python/samba/tests/blackbox/mdsearch.py
- source3/rpc_server/mdssvc/es_mapping.c
- source3/utils/mdfind.c → source3/utils/mdsearch.c
- source3/utils/wscript_build
- source4/selftest/tests.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+samba (2:4.12.5+dfsg-3) unstable; urgency=high
+
+ * Add Breaks: sssd-ad-common (<< 2.3.0), due to libndr so bump
+ (Closes: #963971)
+ * Add patch traffic_packets: fix SyntaxWarning: "is" with a literal
+ (Closes: #964165)
+ * Add patch Rename mdfind to mdsearch (Closes: #963985)
+
+ -- Mathieu Parent <sathieu at debian.org> Sat, 04 Jul 2020 23:57:59 +0200
+
samba (2:4.12.5+dfsg-2) unstable; urgency=high
* Add missing symbol (path_expand_tilde)
=====================================
debian/patches/Rename-mdfind-to-mdsearch.patch
=====================================
@@ -0,0 +1,184 @@
+From 32d876c6fa18cfbd2f81823c122a9eb5c50a6313 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Sat, 4 Jul 2020 23:16:40 +0200
+Subject: [PATCH] Rename mdfind to mdsearch
+
+GNUstep as an mdfind binary, and both should be co-instalable.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14431
+
+Signed-off-by: Mathieu Parent <math.parent at gmail.com>
+---
+ docs-xml/manpages/{mdfind.1.xml => mdsearch.1.xml} | 10 +++++-----
+ docs-xml/wscript_build | 2 +-
+ python/samba/tests/blackbox/{mdfind.py => mdsearch.py} | 10 +++++-----
+ source3/rpc_server/mdssvc/es_mapping.c | 2 +-
+ source3/utils/{mdfind.c => mdsearch.c} | 2 +-
+ source3/utils/wscript_build | 4 ++--
+ source4/selftest/tests.py | 2 +-
+ 7 files changed, 16 insertions(+), 16 deletions(-)
+ rename docs-xml/manpages/{mdfind.1.xml => mdsearch.1.xml} (94%)
+ rename python/samba/tests/blackbox/{mdfind.py => mdsearch.py} (93%)
+ rename source3/utils/{mdfind.c => mdsearch.c} (98%)
+
+diff --git a/docs-xml/manpages/mdfind.1.xml b/docs-xml/manpages/mdsearch.1.xml
+similarity index 94%
+rename from docs-xml/manpages/mdfind.1.xml
+rename to docs-xml/manpages/mdsearch.1.xml
+index 0deef066059..c75d1f045f0 100644
+--- a/docs-xml/manpages/mdfind.1.xml
++++ b/docs-xml/manpages/mdsearch.1.xml
+@@ -1,9 +1,9 @@
+ <?xml version="1.0" encoding="iso-8859-1"?>
+ <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+-<refentry id="mdfind.1">
++<refentry id="mdsearch.1">
+
+ <refmeta>
+- <refentrytitle>mdfind</refentrytitle>
++ <refentrytitle>mdsearch</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">User Commands</refmiscinfo>
+@@ -11,7 +11,7 @@
+ </refmeta>
+
+ <refnamediv>
+- <refname>mdfind</refname>
++ <refname>mdsearch</refname>
+ <refpurpose>Run Spotlight searches against an SMB server</refpurpose>
+ </refnamediv>
+
+@@ -32,7 +32,7 @@
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>1</manvolnum></citerefentry> suite.</para>
+
+- <para>mdfind is a simple utility to run Spotlight searches against an SMB server
++ <para>mdsearch is a simple utility to run Spotlight searches against an SMB server
+ that runs the Spotlight <emphasis>mdssvc</emphasis> RPC service.</para>
+ </refsect1>
+
+@@ -143,6 +143,6 @@
+ Andrew Tridgell. Samba is now developed by the Samba Team as an Open
+ Source project similar to the way the Linux kernel is developed.</para>
+
+- <para>The mdfind manpage was written by Ralph Boehme.</para>
++ <para>The mdsearch manpage was written by Ralph Boehme.</para>
+ </refsect1>
+ </refentry>
+diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+index c7684088989..6dd336629de 100644
+--- a/docs-xml/wscript_build
++++ b/docs-xml/wscript_build
+@@ -19,7 +19,7 @@ manpages='''
+ manpages/libsmbclient.7
+ manpages/lmhosts.5
+ manpages/log2pcap.1
+- manpages/mdfind.1
++ manpages/mdsearch.1
+ manpages/mvxattr.1
+ manpages/net.8
+ manpages/nmbd.8
+diff --git a/python/samba/tests/blackbox/mdfind.py b/python/samba/tests/blackbox/mdsearch.py
+similarity index 93%
+rename from python/samba/tests/blackbox/mdfind.py
+rename to python/samba/tests/blackbox/mdsearch.py
+index 5c1c0c3d155..8da5a49e136 100644
+--- a/python/samba/tests/blackbox/mdfind.py
++++ b/python/samba/tests/blackbox/mdsearch.py
+@@ -1,5 +1,5 @@
+ #
+-# Blackbox tests for mdfind
++# Blackbox tests for mdsearch
+ #
+ # Copyright (C) Ralph Boehme 2019
+ #
+@@ -17,7 +17,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+-"""Blackbox test for mdfind"""
++"""Blackbox test for mdsearch"""
+
+ import os
+ import time
+@@ -95,8 +95,8 @@ class MdfindBlackboxTests(BlackboxTestCase):
+ self.server.server_activate()
+ self.server.serve_forever()
+
+- def test_mdfind(self):
+- """Simple blackbox test for mdfind"""
++ def test_mdsearch(self):
++ """Simple blackbox test for mdsearch"""
+
+ username = os.environ["USERNAME"]
+ password = os.environ["PASSWORD"]
+@@ -123,7 +123,7 @@ class MdfindBlackboxTests(BlackboxTestCase):
+ self.server.json_in = json_in.replace("%BASEPATH%", self.sharepath)
+ self.server.json_out = json_out.replace("%BASEPATH%", self.sharepath)
+
+- output = self.check_output("mdfind -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
++ output = self.check_output("mdsearch -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
+
+ actual = output.decode('utf-8').splitlines()
+ expected = ["%s/%s" % (self.sharepath, file) for file in testfiles]
+diff --git a/source3/rpc_server/mdssvc/es_mapping.c b/source3/rpc_server/mdssvc/es_mapping.c
+index 5c71e503bf5..e55a0768d47 100644
+--- a/source3/rpc_server/mdssvc/es_mapping.c
++++ b/source3/rpc_server/mdssvc/es_mapping.c
+@@ -41,7 +41,7 @@
+ * search term, the corresponding Spotlight query and the final string that gets
+ * sent to the target Elasticsearch server.
+ *
+- * string | mdfind | http
++ * string | mdsearch | http
+ * -------+--------+------
+ * x!x x!x x\\!x
+ * x&x x&x x\\&x
+diff --git a/source3/utils/mdfind.c b/source3/utils/mdsearch.c
+similarity index 98%
+rename from source3/utils/mdfind.c
+rename to source3/utils/mdsearch.c
+index 2f952c29b4f..df146063508 100644
+--- a/source3/utils/mdfind.c
++++ b/source3/utils/mdsearch.c
+@@ -90,7 +90,7 @@ int main(int argc, char **argv)
+ long_options,
+ POPT_CONTEXT_KEEP_FIRST);
+
+- poptSetOtherOptionHelp(pc, "mdfind [OPTIONS] <server> <share> <query>\n");
++ poptSetOtherOptionHelp(pc, "mdsearch [OPTIONS] <server> <share> <query>\n");
+
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ DBG_ERR("Invalid option %s: %s\n",
+diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
+index 6157cac9050..3393111ccfc 100644
+--- a/source3/utils/wscript_build
++++ b/source3/utils/wscript_build
+@@ -312,8 +312,8 @@ bld.SAMBA3_BINARY('smbstatus',
+ CONN_TDB
+ ''')
+
+-bld.SAMBA3_BINARY('mdfind',
+- source='mdfind.c',
++bld.SAMBA3_BINARY('mdsearch',
++ source='mdsearch.c',
+ deps='''
+ talloc
+ tevent
+diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
+index 7f866d97249..5c5a27e8e3b 100755
+--- a/source4/selftest/tests.py
++++ b/source4/selftest/tests.py
+@@ -916,7 +916,7 @@ planoldpythontestsuite("ad_dc_ntvfs",
+ extra_args=['-U"$USERNAME%$PASSWORD"'])
+ planoldpythontestsuite("none", "samba.tests.loadparm")
+ planoldpythontestsuite("fileserver",
+- "samba.tests.blackbox.mdfind",
++ "samba.tests.blackbox.mdsearch",
+ extra_args=['-U"$USERNAME%$PASSWORD"'])
+
+ #
+--
+2.26.2
+
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,5 @@ add-so-version-to-private-libraries
heimdal-rfc3454.txt
smbd.service-Run-update-apparmor-samba-profile-befor.patch
fix-nfs-service-name-to-nfs-kernel-server.patch
+traffic_packets-fix-SyntaxWarning-is-with-a-literal.patch
+Rename-mdfind-to-mdsearch.patch
=====================================
debian/patches/traffic_packets-fix-SyntaxWarning-is-with-a-literal.patch
=====================================
@@ -0,0 +1,39 @@
+From 1f97aeac6b866ff4ecdb704ecf15130eb2f87a9a Mon Sep 17 00:00:00 2001
+From: David Disseldorp <ddiss at samba.org>
+Date: Tue, 21 Apr 2020 14:43:14 +0200
+Subject: [PATCH] traffic_packets: fix SyntaxWarning: "is" with a literal
+
+Python 3.8 adds this warning via https://bugs.python.org/issue34850:
+ the "is" and "is not" operator sometimes is used with string and
+ numerical literals. This code "works" on CPython by accident, because
+ of caching on different levels (small integers and strings caches,
+ interned strings, deduplicating constants at compile time). But it
+ shouldn't work on other implementations, and can not work even on
+ early or future CPython versions.
+
+Reported-by: L. van Belle <belle at samba.org>
+Signed-off-by: David Disseldorp <ddiss at samba.org>
+Reviewed-by: Noel Power <noel.power at suse.com>
+
+Autobuild-User(master): David Disseldorp <ddiss at samba.org>
+Autobuild-Date(master): Mon Apr 27 12:19:59 UTC 2020 on sn-devel-184
+---
+ python/samba/emulate/traffic_packets.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/samba/emulate/traffic_packets.py b/python/samba/emulate/traffic_packets.py
+index a585482ccd4..95c7465d2fc 100644
+--- a/python/samba/emulate/traffic_packets.py
++++ b/python/samba/emulate/traffic_packets.py
+@@ -336,7 +336,7 @@ def packet_ldap_3(packet, conversation, context):
+
+ # try to guess the search expression (don't bother for base searches, as
+ # they're only looking up a single object)
+- if (filter is None or filter is '') and scope != SCOPE_BASE:
++ if (filter is None or filter == '') and scope != SCOPE_BASE:
+ filter = context.guess_search_filter(attrs, dn_sig, dn)
+
+ samdb.search(dn,
+--
+2.26.2
+
=====================================
debian/smbclient.install
=====================================
@@ -1,6 +1,6 @@
usr/bin/cifsdd
usr/bin/findsmb
-usr/bin/mdfind
+usr/bin/mdsearch
usr/bin/rpcclient
usr/bin/smbcacls
usr/bin/smbclient
@@ -11,7 +11,7 @@ usr/bin/smbtar
usr/bin/smbtree
usr/lib/*/samba/smbspool_krb5_wrapper
usr/share/man/man1/findsmb.1
-usr/share/man/man1/mdfind.1
+usr/share/man/man1/mdsearch.1
usr/share/man/man1/rpcclient.1
usr/share/man/man1/smbcacls.1
usr/share/man/man1/smbclient.1
=====================================
docs-xml/manpages/mdfind.1.xml → docs-xml/manpages/mdsearch.1.xml
=====================================
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="mdfind.1">
+<refentry id="mdsearch.1">
<refmeta>
- <refentrytitle>mdfind</refentrytitle>
+ <refentrytitle>mdsearch</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">User Commands</refmiscinfo>
@@ -11,7 +11,7 @@
</refmeta>
<refnamediv>
- <refname>mdfind</refname>
+ <refname>mdsearch</refname>
<refpurpose>Run Spotlight searches against an SMB server</refpurpose>
</refnamediv>
@@ -32,7 +32,7 @@
<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> suite.</para>
- <para>mdfind is a simple utility to run Spotlight searches against an SMB server
+ <para>mdsearch is a simple utility to run Spotlight searches against an SMB server
that runs the Spotlight <emphasis>mdssvc</emphasis> RPC service.</para>
</refsect1>
@@ -143,6 +143,6 @@
Andrew Tridgell. Samba is now developed by the Samba Team as an Open
Source project similar to the way the Linux kernel is developed.</para>
- <para>The mdfind manpage was written by Ralph Boehme.</para>
+ <para>The mdsearch manpage was written by Ralph Boehme.</para>
</refsect1>
</refentry>
=====================================
docs-xml/wscript_build
=====================================
@@ -19,7 +19,7 @@ manpages='''
manpages/libsmbclient.7
manpages/lmhosts.5
manpages/log2pcap.1
- manpages/mdfind.1
+ manpages/mdsearch.1
manpages/mvxattr.1
manpages/net.8
manpages/nmbd.8
=====================================
python/samba/emulate/traffic_packets.py
=====================================
@@ -336,7 +336,7 @@ def packet_ldap_3(packet, conversation, context):
# try to guess the search expression (don't bother for base searches, as
# they're only looking up a single object)
- if (filter is None or filter is '') and scope != SCOPE_BASE:
+ if (filter is None or filter == '') and scope != SCOPE_BASE:
filter = context.guess_search_filter(attrs, dn_sig, dn)
samdb.search(dn,
=====================================
python/samba/tests/blackbox/mdfind.py → python/samba/tests/blackbox/mdsearch.py
=====================================
@@ -1,5 +1,5 @@
#
-# Blackbox tests for mdfind
+# Blackbox tests for mdsearch
#
# Copyright (C) Ralph Boehme 2019
#
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-"""Blackbox test for mdfind"""
+"""Blackbox test for mdsearch"""
import os
import time
@@ -95,8 +95,8 @@ class MdfindBlackboxTests(BlackboxTestCase):
self.server.server_activate()
self.server.serve_forever()
- def test_mdfind(self):
- """Simple blackbox test for mdfind"""
+ def test_mdsearch(self):
+ """Simple blackbox test for mdsearch"""
username = os.environ["USERNAME"]
password = os.environ["PASSWORD"]
@@ -123,7 +123,7 @@ class MdfindBlackboxTests(BlackboxTestCase):
self.server.json_in = json_in.replace("%BASEPATH%", self.sharepath)
self.server.json_out = json_out.replace("%BASEPATH%", self.sharepath)
- output = self.check_output("mdfind -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
+ output = self.check_output("mdsearch -s %s -U %s%%%s fileserver spotlight '*==\"samba*\"'" % (config, username, password))
actual = output.decode('utf-8').splitlines()
expected = ["%s/%s" % (self.sharepath, file) for file in testfiles]
=====================================
source3/rpc_server/mdssvc/es_mapping.c
=====================================
@@ -41,7 +41,7 @@
* search term, the corresponding Spotlight query and the final string that gets
* sent to the target Elasticsearch server.
*
- * string | mdfind | http
+ * string | mdsearch | http
* -------+--------+------
* x!x x!x x\\!x
* x&x x&x x\\&x
=====================================
source3/utils/mdfind.c → source3/utils/mdsearch.c
=====================================
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
long_options,
POPT_CONTEXT_KEEP_FIRST);
- poptSetOtherOptionHelp(pc, "mdfind [OPTIONS] <server> <share> <query>\n");
+ poptSetOtherOptionHelp(pc, "mdsearch [OPTIONS] <server> <share> <query>\n");
while ((opt = poptGetNextOpt(pc)) != -1) {
DBG_ERR("Invalid option %s: %s\n",
=====================================
source3/utils/wscript_build
=====================================
@@ -310,8 +310,8 @@ bld.SAMBA3_BINARY('smbstatus',
CONN_TDB
''')
-bld.SAMBA3_BINARY('mdfind',
- source='mdfind.c',
+bld.SAMBA3_BINARY('mdsearch',
+ source='mdsearch.c',
deps='''
talloc
tevent
=====================================
source4/selftest/tests.py
=====================================
@@ -864,7 +864,7 @@ planoldpythontestsuite("ad_dc_ntvfs",
extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("none", "samba.tests.loadparm")
planoldpythontestsuite("fileserver",
- "samba.tests.blackbox.mdfind",
+ "samba.tests.blackbox.mdsearch",
extra_args=['-U"$USERNAME%$PASSWORD"'])
#
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/a3504968b70842d17ee82363975d34c6f694e6ef...9b614ae58238ac0ff5b48fdd13d2fe4d44c98eb8
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/a3504968b70842d17ee82363975d34c6f694e6ef...9b614ae58238ac0ff5b48fdd13d2fe4d44c98eb8
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/20200704/8421b5f2/attachment-0001.html>
More information about the Pkg-samba-maint
mailing list