diff --git a/.gitignore b/.gitignore index 0a0d844..1f23f49 100644 --- a/.gitignore +++ b/.gitignore @@ -307,3 +307,5 @@ samba-3.6.0pre1.tar.gz /samba-4.22.4.tar.xz /samba-4.23.0.tar.asc /samba-4.23.0.tar.xz +/samba-4.23.3.tar.asc +/samba-4.23.3.tar.xz diff --git a/redhat-4.23.patch b/redhat-4.23.patch deleted file mode 100644 index fb9f52c..0000000 --- a/redhat-4.23.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6809c206abe133782f1dc0db6ae63b0a0ff11dc2 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Fri, 12 Sep 2025 15:37:38 +0200 -Subject: [PATCH 1/2] ctdb: Fix redefinitoin of pmdaResult - -../../ctdb/utils/pmda/pmda_ctdb.c:52:9: warning: 'pmdaResult' redefined - 52 | #define pmdaResult pmResult - | ^~~~~~~~~~ -In file included from ../../ctdb/utils/pmda/pmda_ctdb.c:35: -/usr/include/pcp/pmda.h:30:9: note: this is the location of the previous definition - 30 | #define pmdaResult pmResult_v2 - | ^~~~~~~~~~ - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=15904 - -Signed-off-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy - -Autobuild-User(master): Andreas Schneider -Autobuild-Date(master): Sat Sep 13 08:12:42 UTC 2025 on atb-devel-224 - -(cherry picked from commit d4b448c305f674646001e293d8aa6ebc0ca6dc77) -(cherry picked from commit 3749bc3dda3b1c7941c881f5b5269ea4b8a2d348) ---- - ctdb/utils/pmda/pmda_ctdb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c -index 9845f26defb..5c09aca7b84 100644 ---- a/ctdb/utils/pmda/pmda_ctdb.c -+++ b/ctdb/utils/pmda/pmda_ctdb.c -@@ -48,7 +48,7 @@ - #define pmSetProgname(a) __pmSetProgname(a) - #endif - --#ifdef HAVE_STRUCT_PMRESULT -+#if !defined(pmdaResult) && defined(HAVE_STRUCT_PMRESULT) - #define pmdaResult pmResult - #endif - --- -2.51.0 - - -From 05f813d6f45061023170798470c70a1ed925dc84 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Fri, 12 Sep 2025 18:19:29 +0200 -Subject: [PATCH 2/2] winbind: Initialize idmap in winbindd_getgroups - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=15914 -Signed-off-by: Volker Lendecke -Reviewed-by: Ralph Boehme - -Autobuild-User(master): Volker Lendecke -Autobuild-Date(master): Sat Sep 13 05:44:20 UTC 2025 on atb-devel-224 - -(cherry picked from commit beaf661b1ec1f048efc8eb2b383fc989a79ae009) - -Autobuild-User(v4-23-test): Jule Anger -Autobuild-Date(v4-23-test): Wed Sep 17 08:48:10 UTC 2025 on atb-devel-224 - -(cherry picked from commit babc0c7cb6094459ebb9ba1a722136889601b0ca) ---- - source3/winbindd/winbindd_getgroups.c | 29 +++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/source3/winbindd/winbindd_getgroups.c b/source3/winbindd/winbindd_getgroups.c -index 26933d9d788..2308da20ed3 100644 ---- a/source3/winbindd/winbindd_getgroups.c -+++ b/source3/winbindd/winbindd_getgroups.c -@@ -38,6 +38,7 @@ struct winbindd_getgroups_state { - gid_t *gids; - }; - -+static void winbindd_getgroups_idmap_initialized(struct tevent_req *subreq); - static void winbindd_getgroups_lookupname_done(struct tevent_req *subreq); - static void winbindd_getgroups_gettoken_done(struct tevent_req *subreq); - static void winbindd_getgroups_sid2gid_done(struct tevent_req *subreq); -@@ -72,16 +73,40 @@ struct tevent_req *winbindd_getgroups_send(TALLOC_CTX *mem_ctx, - return tevent_req_post(req, ev); - } - -+ subreq = wb_parent_idmap_setup_send(state, state->ev); -+ if (tevent_req_nomem(subreq, req)) { -+ return tevent_req_post(req, ev); -+ } -+ tevent_req_set_callback(subreq, -+ winbindd_getgroups_idmap_initialized, -+ req); -+ return req; -+} -+ -+static void winbindd_getgroups_idmap_initialized(struct tevent_req *subreq) -+{ -+ struct tevent_req *req = tevent_req_callback_data(subreq, -+ struct tevent_req); -+ struct winbindd_getgroups_state *state = tevent_req_data( -+ req, struct winbindd_getgroups_state); -+ const struct wb_parent_idmap_config *cfg = NULL; -+ NTSTATUS status; -+ -+ status = wb_parent_idmap_setup_recv(subreq, &cfg); -+ TALLOC_FREE(subreq); -+ if (tevent_req_nterror(req, status)) { -+ return; -+ } -+ - subreq = dcerpc_wbint_NormalizeNameUnmap_send(state, - state->ev, - idmap_child_handle(), - state->request_name, - &state->unmapped_name); - if (tevent_req_nomem(subreq, req)) { -- return tevent_req_post(req, ev); -+ return; - } - tevent_req_set_callback(subreq, winbindd_getgroups_unmap_done, req); -- return req; - } - - static void winbindd_getgroups_unmap_done(struct tevent_req *subreq) --- -2.51.0 - diff --git a/samba.spec b/samba.spec index 9ca8887..31a33cb 100644 --- a/samba.spec +++ b/samba.spec @@ -120,7 +120,7 @@ %bcond lmdb 0 %endif -%global samba_version 4.23.0 +%global samba_version 4.23.3 # The release field is extended: # [.][.]%%{?dist}[.] @@ -230,7 +230,7 @@ Source202: samba.abignore # git format-patch --stdout -l1 --no-renames -N > redhat-4.23.patch # where N is number of commits -Patch0: redhat-4.23.patch +# Patch0: redhat-4.23.patch Requires(pre): %{name}-common = %{samba_depver} Requires: %{name}-common = %{samba_depver} diff --git a/sources b/sources index 9c54049..632f990 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.23.0.tar.asc) = 508587816e941cd8dc9f65b7f05c828ce859fb7f74a01a200f685c5188c79c916b4d5b167b71298c53cc8a01d6e17a272ea773980488af532a85308fd1142156 -SHA512 (samba-4.23.0.tar.xz) = 660b35a99544a868b11b24ea3c2ed58de5f68c7fc12d3ea71bc84724285eee4375d13ccf357f0248352fab344d76303660e09598f5f1988f3d0f8e76c535a781 +SHA512 (samba-4.23.3.tar.asc) = 27804ead26f8363d2a84b8ad37495a60b28c80b002e3c7420d434792c893355bd2652a8222825dbc877acbba65db18c4a648eaec218d69f275428b6f6d8a990e +SHA512 (samba-4.23.3.tar.xz) = 5cb15c8eeda14dc4317b239864a4b7aa50b9c16a49ac9aefdc06ba6bde9b869fee2955eb21ed4620b73bb68682d368821869594fd106f3387e9ced9978483e7e