[Pkg-samba-maint] [Git][samba-team/samba][bullseye] fixup two applied patches to make quilt happy
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Tue Apr 12 08:34:41 BST 2022
Michael Tokarev pushed to branch bullseye at Debian Samba Team / samba
Commits:
4004883a by Michael Tokarev at 2022-04-12T10:34:13+03:00
fixup two applied patches to make quilt happy
In d/patches we have 2 fixes from upstream which
in one .patch contain several combined commits:
CVE-2021-23192-only-4.13-v2.patch
CVE-2021-3738-dsdb-crash-4.13-v03.patch
The upstream commits first creates a file (in
selftest/knownfail.d/) and next deletes this just-created
file in next commit. So effectively this new file gets
deleted and after applying this combined fix we should
not have this "phantom" file.
Unfortunately, quilt+patch does not work here correctly,
keeping the phantom file after un-applying the combined
patch. This is because quilt, during the "pop" operation,
tries to restore the state before the patch as it knows,
but it knows nothing about the add+delete of such phantom
files.
So the result is that source stays unclean, and the patches
can't be applied the second time, since the combined patch
contains a hunk to create the knownfail.d file which is now
already exist.
Remove the hunks from the combined patch files which creates
and immediately deletes these phantom files, which are:
selftest/knownfail.d/dcerpc-auth-fraq
selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
- - - - -
2 changed files:
- debian/patches/CVE-2021-23192-only-4.13-v2.patch
- debian/patches/CVE-2021-3738-dsdb-crash-4.13-v03.patch
Changes:
=====================================
debian/patches/CVE-2021-23192-only-4.13-v2.patch
=====================================
@@ -3327,9 +3327,7 @@ Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Samuel Cabrero <scabrero at samba.org>
---
python/samba/tests/dcerpc/raw_protocol.py | 1273 +++++++++++++++++++++
- selftest/knownfail.d/dcerpc-auth-fraq | 20 +
- 2 files changed, 1293 insertions(+)
- create mode 100644 selftest/knownfail.d/dcerpc-auth-fraq
+ 1 files changed, 1273 insertions(+)
diff --git a/python/samba/tests/dcerpc/raw_protocol.py b/python/samba/tests/dcerpc/raw_protocol.py
index 3dbc8d1179f5..5fe148ce93a5 100755
@@ -4615,32 +4613,6 @@ index 3dbc8d1179f5..5fe148ce93a5 100755
def _test_neg_xmit_check_values(self,
req_xmit=None,
req_recv=None,
-diff --git a/selftest/knownfail.d/dcerpc-auth-fraq b/selftest/knownfail.d/dcerpc-auth-fraq
-new file mode 100644
-index 000000000000..f3c62b65e9e9
---- /dev/null
-+++ b/selftest/knownfail.d/dcerpc-auth-fraq
-@@ -0,0 +1,20 @@
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_all_111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_alone
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_all_111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_context_111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_level_111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_type_111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSame111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSameNone
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSameNone111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_lastSameNone
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_lastSameNone111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_firstSame2
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNext111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNext2
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNextNone
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNextNone111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSame111
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSame2
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSameNone
-+^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSameNone111
--
2.25.1
@@ -4662,10 +4634,8 @@ Reviewed-by: Samuel Cabrero <scabrero at samba.org>
librpc/rpc/dcerpc_pkt_auth.h | 1 +
librpc/rpc/dcesrv_auth.c | 28 +++++++++
librpc/rpc/dcesrv_core.c | 86 +++++++++++++++++++++------
- selftest/knownfail.d/dcerpc-auth-fraq | 20 -------
source4/librpc/rpc/dcerpc.c | 1 +
- 6 files changed, 109 insertions(+), 46 deletions(-)
- delete mode 100644 selftest/knownfail.d/dcerpc-auth-fraq
+ 5 files changed, 109 insertions(+), 26 deletions(-)
diff --git a/librpc/rpc/dcerpc_pkt_auth.c b/librpc/rpc/dcerpc_pkt_auth.c
index 322d7497893c..1cb191468b5d 100644
@@ -4953,32 +4923,6 @@ index 32f5a8e14ad0..7d53b945b41c 100644
}
}
-diff --git a/selftest/knownfail.d/dcerpc-auth-fraq b/selftest/knownfail.d/dcerpc-auth-fraq
-deleted file mode 100644
-index f3c62b65e9e9..000000000000
---- a/selftest/knownfail.d/dcerpc-auth-fraq
-+++ /dev/null
-@@ -1,20 +0,0 @@
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_all_111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_alone
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_all_111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_context_111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_level_111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_auth_MPX_middle_auth_type_111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSame111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSameNone
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_firstSameNone111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_lastSameNone
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_MPX_first1_lastSameNone111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_firstSame2
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNext111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNext2
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNextNone
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastNextNone111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSame111
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSame2
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSameNone
--^samba.tests.dcerpc.raw_protocol.samba.tests.dcerpc.raw_protocol.TestDCERPC_BIND.test_ntlmssp_multi_auth_first1_lastSameNone111
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 4847e8a02004..baf6df6e498b 100644
--- a/source4/librpc/rpc/dcerpc.c
=====================================
debian/patches/CVE-2021-3738-dsdb-crash-4.13-v03.patch
=====================================
@@ -233,18 +233,9 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14468
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
- .../knownfail.d/drsuapi.DsBindAssocGroupWS | 1 +
source4/torture/rpc/drsuapi.c | 172 ++++++++++++++++++
- 2 files changed, 173 insertions(+)
- create mode 100644 selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-
-diff --git a/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS b/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-new file mode 100644
-index 00000000000..9af5a904fdd
---- /dev/null
-+++ b/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-@@ -0,0 +1 @@
-+^samba4.rpc.drsuapi.*drsuapi.DsBindAssocGroupWS
+ 1 files changed, 172 insertions(+)
+
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 3e8105af07b..1cd8f77db9c 100644
--- a/source4/torture/rpc/drsuapi.c
@@ -715,18 +706,9 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14468
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
- .../knownfail.d/drsuapi.DsBindAssocGroupWS | 1 -
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 55 +++++++------------
- 2 files changed, 19 insertions(+), 37 deletions(-)
- delete mode 100644 selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-
-diff --git a/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS b/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-deleted file mode 100644
-index 9af5a904fdd..00000000000
---- a/selftest/knownfail.d/drsuapi.DsBindAssocGroupWS
-+++ /dev/null
-@@ -1 +0,0 @@
--^samba4.rpc.drsuapi.*drsuapi.DsBindAssocGroupWS
+ 1 files changed, 19 insertions(+), 36 deletions(-)
+
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 7e2b6174d2f..239971d7009 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/4004883adacddc6c7a67740823048d43ba06ad12
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/4004883adacddc6c7a67740823048d43ba06ad12
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/20220412/31c92606/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list