Skip to contentSkip to conversation

package/samba4: security bump version to 4.11.4

PATCH New Bernd Kuhls 3 participants 3 messages Jan 4, 2020 – Jan 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/samba4: security bump version to 4.11.4

Version 4.11.3 fixes

CVE-2019-14861: Samba AD DC zone-named record Denial of Service in DNS
management server (dnsserver).
CVE-2019-14870: DelegationNotAllowed not being enforced in protocol
transition on Samba AD DC.

Changelog:
https://www.samba.org/samba/history/samba-4.11.3.html
https://www.samba.org/samba/history/samba-4.11.4.html

Removed patches applied upstream, rebased patch 0002.

---
 ...ilt-heimdal-build-tools-in-case-of-.patch} |   8 +-
 .../samba4/0002-waf-upgrade-to-2.0.18.patch   | 736 ------------------
 ....patch => 0003-Fix-unistd.h-include.patch} |   0
 ...t_args-instead-of-exec_args-to-suppo.patch |  62 --
 ...004-Include-stdint.h-before-cmoka.h.patch} |   0
 ...re-forking-if-cross-compilation-is-e.patch |  40 -
 ...s-environment-to-cross-execute-tests.patch |  36 -
 ...autobuild-harden-samba-xc-test-suite.patch |  59 --
 ...cript_build-do-not-add-host-include-.patch |  30 -
 package/samba4/samba4.hash                    |   4 +-
 package/samba4/samba4.mk                      |   2 +-
 11 files changed, 7 insertions(+), 970 deletions(-)
 rename package/samba4/{0007-build-find-pre-built-heimdal-build-tools-in-case-of-.patch => 0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch} (96%)
 delete mode 100644 package/samba4/0002-waf-upgrade-to-2.0.18.patch
 rename package/samba4/{0008-Fix-unistd.h-include.patch => 0003-Fix-unistd.h-include.patch} (100%)
 delete mode 100644 package/samba4/0003-wafsamba-use-test_args-instead-of-exec_args-to-suppo.patch
 rename package/samba4/{0010-Include-stdint.h-before-cmoka.h.patch => 0004-Include-stdint.h-before-cmoka.h.patch} (100%)
 delete mode 100644 package/samba4/0004-wafsamba-avoid-pre-forking-if-cross-compilation-is-e.patch
 delete mode 100644 package/samba4/0005-wafsamba-pass-environment-to-cross-execute-tests.patch
 delete mode 100644 package/samba4/0006-autobuild-harden-samba-xc-test-suite.patch
 delete mode 100644 package/samba4/0009-heimdal_build-wscript_build-do-not-add-host-include-.patch
package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch renamed from package/samba4/0007-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +4 -4
similarity index 96%
rename from package/samba4/0007-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
rename to package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
index 3405e1b0cf..563b274d57 100644
@@ -74,13 +74,13 @@ index 0ff6dad2f55..f77c177442f 100644
  check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
  
  if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
-@@ -94,6 +86,3 @@ finally:
- # With the proper checks in place we should be able to build against the system libtommath.
+@@ -88,7 +88,4 @@
  #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
  #    conf.define('USING_SYSTEM_TOMMATH', 1)
--
+ 
 -check_system_heimdal_binary("compile_et")
 -check_system_heimdal_binary("asn1_compile")
+-
+ conf.define('USING_SYSTEM_KRB5', 1)
 -- 
 2.20.1
-
package/samba4/0002-waf-upgrade-to-2.0.18.patch deleted +0 -736

736 lines not on this page · raw message

package/samba4/0003-Fix-unistd.h-include.patch renamed from package/samba4/0008-Fix-unistd.h-include.patch +0 -0
similarity index 100%
rename from package/samba4/0008-Fix-unistd.h-include.patch
rename to package/samba4/0003-Fix-unistd.h-include.patch
package/samba4/0003-wafsamba-use-test_args-instead-of-exec_args-to-suppo.patch deleted +0 -62

62 lines not on this page · raw message

package/samba4/0004-Include-stdint.h-before-cmoka.h.patch renamed from package/samba4/0010-Include-stdint.h-before-cmoka.h.patch +0 -0
similarity index 100%
rename from package/samba4/0010-Include-stdint.h-before-cmoka.h.patch
rename to package/samba4/0004-Include-stdint.h-before-cmoka.h.patch
package/samba4/0004-wafsamba-avoid-pre-forking-if-cross-compilation-is-e.patch deleted +0 -40
deleted file mode 100644
index 5005e01508..0000000000
@@ -1,40 +0,0 @@
-From 9c3cf5f67053124c6bbdf9c4705fa1d2d416f873 Mon Sep 17 00:00:00 2001
-From: Uri Simchoni <[email protected]>
-Date: Mon, 7 Oct 2019 00:37:31 +0300
-Subject: [PATCH] wafsamba: avoid pre-forking if cross-compilation is enabled
-
-Waf supports pre-forking to run configuration tests, but this
-doesn't play well with Samba's cross-compilation support, because
-Samba monkey-patches the actual fork+exec, which doesn't happen
-in a pre-forked process pool.
-
-This patch emulates the impact of WAF_NO_PREFORK env var when
-cross-compilation is enabled.
-
-The blueprint for the solution has been suggested by Thomas Nagy
-in https://bugzilla.samba.org/show_bug.cgi?id=13846#c7 (item #2)
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846
-
-Signed-off-by: Uri Simchoni <[email protected]>
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- buildtools/wafsamba/samba_cross.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
-index 60ddf967237..6fca470f2b7 100644
---- a/buildtools/wafsamba/samba_cross.py
-+++ b/buildtools/wafsamba/samba_cross.py
-@@ -147,6 +147,8 @@ def SAMBA_CROSS_ARGS(conf, msg=None):
-     if real_Popen is None:
-         real_Popen  = Utils.subprocess.Popen
-         Utils.subprocess.Popen = cross_Popen
-+        Utils.run_process = Utils.run_regular_process
-+        Utils.get_process = Utils.alloc_process_pool = Utils.nada
- 
-     ret = []
- 
--- 
-2.20.1
-
package/samba4/0005-wafsamba-pass-environment-to-cross-execute-tests.patch deleted +0 -36
deleted file mode 100644
index 7b37b0458f..0000000000
@@ -1,36 +0,0 @@
-From 8a173f08d32960091d0ee9cab1b1e1e6df17c85a Mon Sep 17 00:00:00 2001
-From: Uri Simchoni <[email protected]>
-Date: Mon, 7 Oct 2019 00:37:41 +0300
-Subject: [PATCH] wafsamba: pass environment to cross-execute tests
-
-This can come in handy for cross-execute scripts in general, and
-is particularly required by the samba-xc test for cross-answers /
-cross-execute, because Samba sets LD_LIBRARY_PATH during rpath
-checks, and the test program needs that in order to successfully
-run.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13846
-
-Signed-off-by: Uri Simchoni <[email protected]>
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- buildtools/wafsamba/samba_cross.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
-index 6fca470f2b7..0868a855a0d 100644
---- a/buildtools/wafsamba/samba_cross.py
-+++ b/buildtools/wafsamba/samba_cross.py
-@@ -120,7 +120,8 @@ class cross_Popen(Utils.subprocess.Popen):
-             if use_answers:
-                 p = real_Popen(newargs,
-                                stdout=Utils.subprocess.PIPE,
--                               stderr=Utils.subprocess.PIPE)
-+                               stderr=Utils.subprocess.PIPE,
-+                               env=kw.get('env', {}))
-                 ce_out, ce_err = p.communicate()
-                 ans = (p.returncode, samba_utils.get_string(ce_out))
-                 add_answer(ca_file, msg, ans)
--- 
-2.20.1
-
package/samba4/0006-autobuild-harden-samba-xc-test-suite.patch deleted +0 -59

59 lines not on this page · raw message

package/samba4/0009-heimdal_build-wscript_build-do-not-add-host-include-.patch deleted +0 -30
deleted file mode 100644
index ff1f05ec4d..0000000000
@@ -1,30 +0,0 @@
-From 25a8d80820ee6713988d72cca69707b03d06e707 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <[email protected]>
-Date: Sun, 21 Jul 2019 15:12:03 +0200
-Subject: [PATCH] heimdal_build/wscript_build: do not add host include patch
-
-Fixes cross-compile.
-
-Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- source4/heimdal_build/wscript_build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
-index 163b622fca9..27adbc06dc6 100644
---- a/source4/heimdal_build/wscript_build
-+++ b/source4/heimdal_build/wscript_build
-@@ -140,7 +140,7 @@ def HEIMDAL_ASN1(name, source,
-             samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
-             depends_on     = '',
-             samba_deps     = to_list('roken replace'),
--            samba_includes = includes + ["/usr/include/heimdal"],
-+            samba_includes = includes,
-             local_include  = True)
- 
- 
--- 
-2.20.1
-
package/samba4/samba4.hash +2 -2
index d4b177a45f..e8bd026a9e 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://download.samba.org/pub/samba/stable/samba-4.11.2.tar.asc
-sha256 d27bf1b7cf5f25fb5587896fccb73747a705f7cf7ee352b5cbab82841db09f1f  samba-4.11.2.tar.gz
+# https://download.samba.org/pub/samba/stable/samba-4.11.4.tar.asc
+sha256 b95471ba450757109dce65acfe75dafc719c5cc5d464fc65ee442433a461db24  samba-4.11.4.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
package/samba4/samba4.mk +1 -1
index c5d2d6c6ea..965d593bd1 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SAMBA4_VERSION = 4.11.2
+SAMBA4_VERSION = 4.11.4
 SAMBA4_SITE = https://download.samba.org/pub/samba/stable
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
 SAMBA4_INSTALL_STAGING = YES
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/samba4: security bump version to 4.11.4

Quoted 28 lines · On Sat, 4 Jan 2020 16:14:57 +0100 Bernd Kuhls <[email protected]> wrote:

Version 4.11.3 fixes

CVE-2019-14861: Samba AD DC zone-named record Denial of Service in DNS
management server (dnsserver).
CVE-2019-14870: DelegationNotAllowed not being enforced in protocol
transition on Samba AD DC.

Changelog:
https://www.samba.org/samba/history/samba-4.11.3.html
https://www.samba.org/samba/history/samba-4.11.4.html

Removed patches applied upstream, rebased patch 0002.

---
 ...ilt-heimdal-build-tools-in-case-of-.patch} |   8 +-
 .../samba4/0002-waf-upgrade-to-2.0.18.patch   | 736 ------------------
 ....patch => 0003-Fix-unistd.h-include.patch} |   0
 ...t_args-instead-of-exec_args-to-suppo.patch |  62 --
 ...004-Include-stdint.h-before-cmoka.h.patch} |   0
 ...re-forking-if-cross-compilation-is-e.patch |  40 -
 ...s-environment-to-cross-execute-tests.patch |  36 -
 ...autobuild-harden-samba-xc-test-suite.patch |  59 --
 ...cript_build-do-not-add-host-include-.patch |  30 -
 package/samba4/samba4.hash                    |   4 +-
 package/samba4/samba4.mk                      |   2 +-
 11 files changed, 7 insertions(+), 970 deletions(-)
 rename package/samba4/{0007-build-find-pre-built-heimdal-build-tools-in-case-of-.patch => 0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch} (96%)
Quoted 8 lines
 delete mode 100644 package/samba4/0002-waf-upgrade-to-2.0.18.patch
 rename package/samba4/{0008-Fix-unistd.h-include.patch => 0003-Fix-unistd.h-include.patch} (100%)
 delete mode 100644 package/samba4/0003-wafsamba-use-test_args-instead-of-exec_args-to-suppo.patch
 rename package/samba4/{0010-Include-stdint.h-before-cmoka.h.patch => 0004-Include-stdint.h-before-cmoka.h.patch} (100%)
 delete mode 100644 package/samba4/0004-wafsamba-avoid-pre-forking-if-cross-compilation-is-e.patch
 delete mode 100644 package/samba4/0005-wafsamba-pass-environment-to-cross-execute-tests.patch
 delete mode 100644 package/samba4/0006-autobuild-harden-samba-xc-test-suite.patch
 delete mode 100644 package/samba4/0009-heimdal_build-wscript_build-do-not-add-host-include-.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/samba4: security bump version to 4.11.4

In reply to Bernd Kuhls
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Version 4.11.3 fixes
CVE-2019-14861: Samba AD DC zone-named record Denial of Service in DNS
management server (dnsserver).
CVE-2019-14870: DelegationNotAllowed not being enforced in protocol
transition on Samba AD DC.

Quoted 7 lines

Changelog:
https://www.samba.org/samba/history/samba-4.11.3.html
https://www.samba.org/samba/history/samba-4.11.4.html

Removed patches applied upstream, rebased patch 0002.

For 2019.02.x I have instead bumped to 4.9.17, and for 2019.11.x to 4.10.11, both fixing the same issue.

Signature · 1 line
Bye, Peter Korsgaard