mirror of
https://abf.rosa.ru/djam/samba.git
synced 2025-02-24 01:22:47 +00:00
add info to patches
This commit is contained in:
Aleksandr Proklov
parent
d3c2fbc985
commit
381b482055
8 changed files with 127 additions and 16 deletions
|
|
@ -1,3 +1,22 @@
|
|||
From 63cf6814016d4a68a49773b1cf282bc78f42d5ba Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Bartlett <abartlet@samba.org>
|
||||
Date: Mon, 11 Mar 2019 13:29:40 +1300
|
||||
Subject: [PATCH 1/2] samba-tool dbcheck: Avoid creating child DNs via ldb.Dn()
|
||||
format arguments
|
||||
|
||||
If we call dn.add_base() we avoid a problematic round-trip via the linearized DN.
|
||||
|
||||
This has been particularly a problem in the python bindings, while now resolved, as strings
|
||||
are different between Python2 and Python3.
|
||||
|
||||
[ mikhailnov: rediffed for v4.10.8 ]
|
||||
|
||||
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
python/samba/dbchecker.py | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/dbchecker.py
|
||||
--- samba-4.12.0_orig/python/samba/dbchecker.py 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/python/samba/dbchecker.py 2020-03-19 15:08:15.433649691 +0800
|
||||
|
|
@ -44,3 +63,5 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
|
|||
|
||||
if obj.dn == deleted_objects_dn:
|
||||
expected_dn = obj.dn
|
||||
--
|
||||
2.20.1
|
||||
|
|
|
|||
|
|
@ -1,3 +1,24 @@
|
|||
From ea0d7ff3ae64d7eb7608b830920f3b5088b01925 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Bartlett <abartlet@samba.org>
|
||||
Date: Mon, 11 Mar 2019 13:48:29 +1300
|
||||
Subject: [PATCH 2/2] samba-tool dbcheck: Avoid creating an RDN via ldb.Dn()
|
||||
format arguments
|
||||
|
||||
If we instead call dn.set_component() to overwrite a dummy DN we avoid parsing
|
||||
the full DN and set the RDN attribute and value directly as a string and
|
||||
string/size pair.
|
||||
|
||||
This may avoid some Python string issues due to the different handling of strings
|
||||
in Python2 and Python3.
|
||||
|
||||
[ mikhailnov: rediffed for v4.10.8 ]
|
||||
|
||||
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
|
||||
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
---
|
||||
python/samba/dbchecker.py | 12 ++++++++----
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/dbchecker.py
|
||||
--- samba-4.12.0_orig/python/samba/dbchecker.py 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/python/samba/dbchecker.py 2020-03-19 15:14:13.881649351 +0800
|
||||
|
|
@ -27,3 +48,5 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
|
|||
new_parent = new_dn.parent()
|
||||
|
||||
attributes = ""
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -1,3 +1,13 @@
|
|||
From 3749e2253f5eec9adc61aadb48ae7ddb4be43d3a Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Thu, 24 Jan 2019 01:29:06 +0300
|
||||
Subject: [PATCH] Lock order violation
|
||||
|
||||
Workaround/fix for https://bugzilla.samba.org/show_bug.cgi?id=11761
|
||||
---
|
||||
source3/modules/vfs_acl_tdb.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/source3/modules/vfs_acl_tdb.c samba-4.12.0/source3/modules/vfs_acl_tdb.c
|
||||
--- samba-4.12.0_orig/source3/modules/vfs_acl_tdb.c 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/source3/modules/vfs_acl_tdb.c 2020-03-19 15:22:27.777648882 +0800
|
||||
|
|
@ -10,3 +20,5 @@ diff -ruN samba-4.12.0_orig/source3/modules/vfs_acl_tdb.c samba-4.12.0/source3/m
|
|||
unbecome_root();
|
||||
|
||||
if (acl_db == NULL) {
|
||||
--
|
||||
2.17.1
|
||||
34
OpenBSD-Reverse-order-of-paths-added.patch
Normal file
34
OpenBSD-Reverse-order-of-paths-added.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
From 66fa8e15ab47a6569e639f6c1e8d46f0cfa465c8 Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Zhukov <persgray@gmail.com>
|
||||
Date: Fri, 17 May 2013 12:51:03 +0400
|
||||
Subject: [PATCH] Reverse order of paths added to get more reliable builds
|
||||
|
||||
When processing configure time checks, there is a Samba-specific hook activated for each check being made. This hooks looks into CPPPATH and LIBPATH, and, if the default path supplied by configure option does not present there, adds those to respective lists in those variables. I do not know, why, but new paths are prepended to this list instead of being appended to it. As a result, the results of previous configure checks are not reliable anymore, because they were made in a different environment, not looking at the directories added later. This could (and break) some setups, especially on *BSD, when base system and additional packages install headers and/or libraries with the same name.
|
||||
|
||||
The patch below reverses the order of paths being appended. I suspect this could be wrong, because this seems an obvious decision for initial implementation, but there are no comments in the code describing the reasons to do this either way.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9890
|
||||
---
|
||||
buildtools/wafsamba/samba_conftests.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/buildtools/wafsamba/samba_conftests.py samba-4.12.0/buildtools/wafsamba/samba_conftests.py
|
||||
--- samba-4.12.0_orig/buildtools/wafsamba/samba_conftests.py 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/buildtools/wafsamba/samba_conftests.py 2020-03-19 15:55:35.801646993 +0800
|
||||
@@ -40,9 +40,9 @@
|
||||
def add_options_dir(dirs, env):
|
||||
for x in dirs:
|
||||
if not x in env.CPPPATH:
|
||||
- env.CPPPATH = [os.path.join(x, 'include')] + env.CPPPATH
|
||||
+ env.CPPPATH = env.CPPPATH + [os.path.join(x, 'include')]
|
||||
if not x in env.LIBPATH:
|
||||
- env.LIBPATH = [os.path.join(x, 'lib')] + env.LIBPATH
|
||||
+ env.LIBPATH = env.LIBPATH + [os.path.join(x, 'lib')]
|
||||
|
||||
add_options_dir(additional_dirs, kw['env'])
|
||||
|
||||
--
|
||||
1.8.2.2
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,18 +1,13 @@
|
|||
diff -ruN samba-4.12.0_orig/buildtools/wafsamba/samba_conftests.py samba-4.12.0/buildtools/wafsamba/samba_conftests.py
|
||||
--- samba-4.12.0_orig/buildtools/wafsamba/samba_conftests.py 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/buildtools/wafsamba/samba_conftests.py 2020-03-19 15:55:35.801646993 +0800
|
||||
@@ -40,9 +40,9 @@
|
||||
def add_options_dir(dirs, env):
|
||||
for x in dirs:
|
||||
if not x in env.CPPPATH:
|
||||
- env.CPPPATH = [os.path.join(x, 'include')] + env.CPPPATH
|
||||
+ env.CPPPATH = env.CPPPATH + [os.path.join(x, 'include')]
|
||||
if not x in env.LIBPATH:
|
||||
- env.LIBPATH = [os.path.join(x, 'lib')] + env.LIBPATH
|
||||
+ env.LIBPATH = env.LIBPATH + [os.path.join(x, 'lib')]
|
||||
|
||||
add_options_dir(additional_dirs, kw['env'])
|
||||
|
||||
From 35cf08ed071ed50875025c880b48643b350097be Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Thu, 7 Feb 2019 21:28:29 +0300
|
||||
Subject: [PATCH] Clearer debug about ulimits
|
||||
Sent to upstream: https://lists.samba.org/archive/samba-technical/2019-February/132406.html
|
||||
|
||||
---
|
||||
source3/param/loadparm.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/source3/param/loadparm.c samba-4.12.0/source3/param/loadparm.c
|
||||
--- samba-4.12.0_orig/source3/param/loadparm.c 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/source3/param/loadparm.c 2020-03-19 15:55:35.805646993 +0800
|
||||
|
|
@ -37,3 +32,5 @@ diff -ruN samba-4.12.0_orig/source3/param/loadparm.c samba-4.12.0/source3/param/
|
|||
rlimit_max,
|
||||
MIN_OPEN_FILES_WINDOWS));
|
||||
rlimit_max = MIN_OPEN_FILES_WINDOWS;
|
||||
--
|
||||
2.19.2
|
||||
|
|
@ -1,3 +1,14 @@
|
|||
From 9b1d27b606bf5349229a2ff4bdf5d141055dcdea Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Wed, 27 Mar 2019 23:53:50 +0300
|
||||
Subject: [PATCH] Force libsystemd
|
||||
|
||||
For some reason waf failed to switch to libsystemd after not finding libsystemd-daemon, which was depreceated long time ago
|
||||
---
|
||||
lib/util/wscript_build | 4 ++--
|
||||
lib/util/wscript_configure | 24 +++---------------------
|
||||
2 files changed, 5 insertions(+), 23 deletions(-)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/lib/util/wscript_build samba-4.12.0/lib/util/wscript_build
|
||||
--- samba-4.12.0_orig/lib/util/wscript_build 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/lib/util/wscript_build 2020-03-19 15:30:21.949648431 +0800
|
||||
|
|
@ -55,3 +66,5 @@ diff -ruN samba-4.12.0_orig/lib/util/wscript_configure samba-4.12.0/lib/util/wsc
|
|||
|
||||
conf.SET_TARGET_TYPE('lttng-ust', 'EMPTY')
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -1,3 +1,11 @@
|
|||
From 371e987689d16074e43fb9f23e775120513f1d7c Mon Sep 17 00:00:00 2001
|
||||
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||||
Date: Thu, 24 Jan 2019 01:21:29 +0300
|
||||
Subject: [PATCH] ROSA bind GID
|
||||
|
||||
ROSA's bind package must have user group 'named' by default
|
||||
(package bind-9.11.4-P1-1 does not have it, but I'll make it have it)
|
||||
|
||||
diff -ruN samba-4.12.0_orig/python/samba/provision/__init__.py samba-4.12.0/python/samba/provision/__init__.py
|
||||
--- samba-4.12.0_orig/python/samba/provision/__init__.py 2020-01-31 18:25:36.000000000 +0800
|
||||
+++ samba-4.12.0/python/samba/provision/__init__.py 2020-03-19 15:31:58.309648340 +0800
|
||||
|
|
@ -23,3 +31,5 @@ diff -ruN samba-4.12.0_orig/source4/scripting/bin/samba_upgradedns samba-4.12.0/
|
|||
try:
|
||||
return grp.getgrnam(name)[2]
|
||||
except KeyError:
|
||||
-
|
||||
2.17.1
|
||||
|
|
@ -114,12 +114,13 @@ Source100: %{name}.rpmlintrc
|
|||
# in some cases conditions like 'if platform=OpenBSD' are removed;
|
||||
# in some cases patches are just rediffed.
|
||||
Patch2: samba-4.3.11-winbind-service.patch
|
||||
Patch4: OpenBSD-Reverse-order-of-paths-added.patch
|
||||
Patch7: OpenBSD-Lock-order-violation.patch
|
||||
Patch8: ROSA-bind-GID.patch
|
||||
Patch10: ROSA-vendor-version.patch
|
||||
Patch11: ROSA-smb-default-config.patch
|
||||
Patch12: ROSA-Clearer-debug-about-ulimits.patch
|
||||
Patch13: ROSA-Force-libsystemd.patch
|
||||
#Patch13: ROSA-Force-libsystemd.patch
|
||||
|
||||
# https://bugzilla.rosalinux.ru/show_bug.cgi?id=10068
|
||||
# Rediffed from https://gitlab.com/samba-team/samba/merge_requests/289
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue