[meta-networking][PATCH 0/3] update to samba 4.7.5

[meta-networking][PATCH 0/3] update to samba 4.7.5

[Johannes Pointner]

This series upgrades samba to 4.7.5 and includes needed updates for libldb
and libtevent.

Johannes Pointner (3):
  libtevent: update to version 0.9.36
  libldb: update to version 1.3.1
  samba: update to 4.7.5

 .../samba/{samba_4.7.0.bb => samba_4.7.5.bb}       |  7 +--
 ...ions-for-packages.patch => options-1.3.1.patch} | 38 ++++++++----
 .../libldb/{libldb_1.2.2.bb => libldb_1.3.1.bb}    |  6 +-
 .../{options-0.9.33.patch => options-0.9.36.patch} | 68 ++++++++++------------
 .../{libtevent_0.9.33.bb => libtevent_0.9.36.bb}   |  6 +-
 5 files changed, 67 insertions(+), 58 deletions(-)
 rename meta-networking/recipes-connectivity/samba/{samba_4.7.0.bb => samba_4.7.5.bb} (97%)
 rename meta-networking/recipes-support/libldb/libldb/{ldb-Add-configure-options-for-packages.patch => options-1.3.1.patch} (83%)
 rename meta-networking/recipes-support/libldb/{libldb_1.2.2.bb => libldb_1.3.1.bb} (91%)
 rename meta-networking/recipes-support/libtevent/libtevent/{options-0.9.33.patch => options-0.9.36.patch} (81%)
 rename meta-networking/recipes-support/libtevent/{libtevent_0.9.33.bb => libtevent_0.9.36.bb} (89%)

-- 
2.16.2

[meta-networking][PATCH 1/3] libtevent: update to version 0.9.36

[Johannes Pointner]

Version >= 0.9.34 needed to build samba 4.7.5.

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
---
 .../{options-0.9.33.patch => options-0.9.36.patch} | 68 ++++++++++------------
 .../{libtevent_0.9.33.bb => libtevent_0.9.36.bb}   |  6 +-
 2 files changed, 35 insertions(+), 39 deletions(-)
 rename meta-networking/recipes-support/libtevent/libtevent/{options-0.9.33.patch => options-0.9.36.patch} (81%)
 rename meta-networking/recipes-support/libtevent/{libtevent_0.9.33.bb => libtevent_0.9.36.bb} (89%)

diff --git a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
similarity index 81%
rename from meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch
rename to meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
index 84b1a3688..363c5867c 100644
--- a/meta-networking/recipes-support/libtevent/libtevent/options-0.9.33.patch
+++ b/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
@@ -1,7 +1,7 @@
-From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001
+From c3e2e4f89cf37b27609fd02ad67eb02d0015cc1e Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Wed, 21 Sep 2016 09:57:49 +0800
-Subject: [PATCH] tevent: Add configure options for packages
+Subject: [PATCH 1/1] tevent: Add configure options for packages
 
 Add configure options for the following packages:
  - acl
@@ -19,30 +19,12 @@ Modified to apply to version 0.9.33.
 
 Signed-off-by: Joe Slater <joe.slater@windriver.com>
 ---
- lib/replace/system/wscript_configure |  6 ++-
- lib/replace/wscript                  | 85 ++++++++++++++++++++++++++++--------
- wscript                              |  7 ++-
- 3 files changed, 79 insertions(+), 19 deletions(-)
- mode change 100755 => 100644 wscript
+ lib/replace/wscript | 89 ++++++++++++++++++++++++++++++++++++++++-------------
+ wscript             |  7 ++++-
+ 2 files changed, 73 insertions(+), 23 deletions(-)
 
-diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure
-index 2035474..10f9ae7 100644
---- a/lib/replace/system/wscript_configure
-+++ b/lib/replace/system/wscript_configure
-@@ -1,6 +1,10 @@
- #!/usr/bin/env python
- 
--conf.CHECK_HEADERS('sys/capability.h')
-+import Options
-+
-+if Options.options.enable_libcap:
-+    conf.CHECK_HEADERS('sys/capability.h')
-+
- conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r')
- 
- # solaris varients of getXXent_r
 diff --git a/lib/replace/wscript b/lib/replace/wscript
-index fc43e1a..12d2a70 100644
+index 2c638b7..079761d 100644
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
 @@ -23,6 +23,41 @@ def set_options(opt):
@@ -118,32 +100,33 @@ index fc43e1a..12d2a70 100644
      conf.CHECK_HEADERS('port.h')
      conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h')
      conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h')
-@@ -73,7 +121,9 @@ def configure(conf):
- 
-     conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+@@ -101,7 +149,8 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
  
 -    conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
 +    if Options.options.enable_valgrind:
 +        conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
-+
      conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
      conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
      conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
-@@ -248,17 +298,18 @@ def configure(conf):
+@@ -294,22 +343,18 @@ def configure(conf):
  
      conf.CHECK_FUNCS('prctl dirname basename')
  
+-    strlcpy_in_bsd = False
+-
 -    # libbsd on some platforms provides strlcpy and strlcat
 -    if not conf.CHECK_FUNCS('strlcpy strlcat'):
--        conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
--                checklibc=True)
+-        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+-                               checklibc=True):
+-            strlcpy_in_bsd = True
 -    if not conf.CHECK_FUNCS('getpeereid'):
 -        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 -    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 -        conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
--
--    if not conf.CHECK_FUNCS('closefrom'):
--        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
+-    if not conf.CHECK_FUNCS('setproctitle_init'):
+-        conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
 +    if Options.options.enable_libbsd:
 +        # libbsd on some platforms provides strlcpy and strlcat
 +        if not conf.CHECK_FUNCS('strlcpy strlcat'):
@@ -153,12 +136,25 @@ index fc43e1a..12d2a70 100644
 +            conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 +        if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 +            conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
-+
+ 
+-    if not conf.CHECK_FUNCS('closefrom'):
+-        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
 +        if not conf.CHECK_FUNCS('closefrom'):
 +            conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
  
      conf.CHECK_CODE('''
                  struct ucred cred;
+@@ -660,7 +705,7 @@ removeea setea
+     # look for a method of finding the list of network interfaces
+     for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
+         bsd_for_strlcpy = ''
+-        if strlcpy_in_bsd:
++        if Options.options.enable_libbsd:
+             bsd_for_strlcpy = ' bsd'
+         if conf.CHECK_CODE('''
+                            #define %s 1
+diff --git a/wscript b/wscript
+index 94d190f..742f779 100644
 --- a/wscript
 +++ b/wscript
 @@ -22,7 +22,12 @@ def set_options(opt):
@@ -176,5 +172,5 @@ index fc43e1a..12d2a70 100644
  def configure(conf):
      conf.RECURSE('lib/replace')
 -- 
-2.8.3
+2.16.2
 
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
similarity index 89%
rename from meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb
rename to meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
index f50830069..a83851ea4 100644
--- a/meta-networking/recipes-support/libtevent/libtevent_0.9.33.bb
+++ b/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
@@ -7,12 +7,12 @@ DEPENDS += "libtalloc"
 RDEPENDS_python-tevent = "python"
 
 SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \
-           file://options-0.9.33.patch \
+           file://options-0.9.36.patch \
 "
 LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a"
 
-SRC_URI[md5sum] = "527a43f35b4251e46f28921342895223"
-SRC_URI[sha256sum] = "22712ee981fd4298fcd5f3afb27d87a72257cebad37812cfbd3da5d968ed1bdc"
+SRC_URI[md5sum] = "87d67bca75b231814435c47bec0aff8a"
+SRC_URI[sha256sum] = "bd2b6be3fd1601ed7f176e99111e322c57d58e425cc149ee80c7dd4fed263b4c"
 
 inherit waf-samba
 
-- 
2.16.2

[meta-networking][PATCH 2/3] libldb: update to version 1.3.1

[Johannes Pointner]

Version >= 1.2.3 needed to build samba 4.7.5.

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
---
 ...ions-for-packages.patch => options-1.3.1.patch} | 38 +++++++++++++++-------
 .../libldb/{libldb_1.2.2.bb => libldb_1.3.1.bb}    |  6 ++--
 2 files changed, 30 insertions(+), 14 deletions(-)
 rename meta-networking/recipes-support/libldb/libldb/{ldb-Add-configure-options-for-packages.patch => options-1.3.1.patch} (83%)
 rename meta-networking/recipes-support/libldb/{libldb_1.2.2.bb => libldb_1.3.1.bb} (91%)

diff --git a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
similarity index 83%
rename from meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch
rename to meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
index 93bd4578e..ffe253b63 100644
--- a/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch
+++ b/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
@@ -1,7 +1,7 @@
-From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001
+From a4da3ab4d76013aaa731d43d52ccca1ebd37c395 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Wed, 21 Sep 2016 10:06:39 +0800
-Subject: [PATCH] ldb: Add configure options for packages
+Subject: [PATCH 1/1] ldb: Add configure options for packages
 
 Add configure options for the following packages:
  - acl
@@ -16,9 +16,9 @@ Upstream-Status: Inappropriate [oe deterministic build specific]
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
 ---
  lib/replace/system/wscript_configure |  6 ++-
- lib/replace/wscript                  | 85 ++++++++++++++++++++++++++++--------
+ lib/replace/wscript                  | 94 +++++++++++++++++++++++++++---------
  wscript                              |  7 +++
- 3 files changed, 80 insertions(+), 18 deletions(-)
+ 3 files changed, 83 insertions(+), 24 deletions(-)
 
 diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure
 index 2035474..10f9ae7 100644
@@ -37,7 +37,7 @@ index 2035474..10f9ae7 100644
  
  # solaris varients of getXXent_r
 diff --git a/lib/replace/wscript b/lib/replace/wscript
-index 145300d..8218fa5 100644
+index 2f94d49..68b2d3a 100644
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
 @@ -23,6 +23,41 @@ def set_options(opt):
@@ -124,18 +124,23 @@ index 145300d..8218fa5 100644
      conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
      conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
      conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
-@@ -248,17 +298,18 @@ def configure(conf):
+@@ -266,22 +316,20 @@ def configure(conf):
  
      conf.CHECK_FUNCS('prctl dirname basename')
  
+-    strlcpy_in_bsd = False
+-
 -    # libbsd on some platforms provides strlcpy and strlcat
 -    if not conf.CHECK_FUNCS('strlcpy strlcat'):
--        conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
--                checklibc=True)
+-        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+-                               checklibc=True):
+-            strlcpy_in_bsd = True
 -    if not conf.CHECK_FUNCS('getpeereid'):
 -        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 -    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 -        conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+-    if not conf.CHECK_FUNCS('setproctitle_init'):
+-        conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
 -
 -    if not conf.CHECK_FUNCS('closefrom'):
 -        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
@@ -148,17 +153,28 @@ index 145300d..8218fa5 100644
 +            conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 +        if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 +            conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
++        if not conf.CHECK_FUNCS('setproctitle_init'):
++            conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
 +
 +        if not conf.CHECK_FUNCS('closefrom'):
 +            conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
  
      conf.CHECK_CODE('''
                  struct ucred cred;
+@@ -632,7 +680,7 @@ removeea setea
+     # look for a method of finding the list of network interfaces
+     for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']:
+         bsd_for_strlcpy = ''
+-        if strlcpy_in_bsd:
++        if Options.options.enable_libbsd:
+             bsd_for_strlcpy = ' bsd'
+         if conf.CHECK_CODE('''
+                            #define %s 1
 diff --git a/wscript b/wscript
-index 2af8571..059408b 100755
+index 8ae5be3..a178cc4 100644
 --- a/wscript
 +++ b/wscript
-@@ -29,6 +29,13 @@ def set_options(opt):
+@@ -31,6 +31,13 @@ def set_options(opt):
      opt.RECURSE('lib/replace')
      opt.tool_options('python') # options for disabling pyc or pyo compilation
  
@@ -173,5 +189,5 @@ index 2af8571..059408b 100755
      conf.RECURSE('lib/tdb')
      conf.RECURSE('lib/tevent')
 -- 
-2.8.3
+2.16.2
 
diff --git a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb
similarity index 91%
rename from meta-networking/recipes-support/libldb/libldb_1.2.2.bb
rename to meta-networking/recipes-support/libldb/libldb_1.3.1.bb
index cb9ea9283..7e14cde35 100644
--- a/meta-networking/recipes-support/libldb/libldb_1.2.2.bb
+++ b/meta-networking/recipes-support/libldb/libldb_1.3.1.bb
@@ -8,7 +8,7 @@ RDEPENDS_pyldb += "python"
 
 SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \
            file://do-not-import-target-module-while-cross-compile.patch \
-           file://ldb-Add-configure-options-for-packages.patch \
+           file://options-1.3.1.patch \
           "
 
 PACKAGECONFIG ??= "\
@@ -29,8 +29,8 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada
                     file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \
                     file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42"
 
-SRC_URI[md5sum] = "91284a12423def99a6592e393e3b7fbb"
-SRC_URI[sha256sum] = "0cedeadb75de401c9735127f654dbc1a391c4327a2b83be54078be286fed1113"
+SRC_URI[md5sum] = "e5233f202bca27f6ce8474fb8ae65983"
+SRC_URI[sha256sum] = "b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2"
 
 inherit waf-samba
 
-- 
2.16.2

[meta-networking][PATCH 3/3] samba: update to 4.7.5

[Johannes Pointner]

This includes security fixes that adresses the following defects:
CVE-2017-14746: s3: smbd: Fix SMB1 use-after-free crash bug.
CVE-2017-15275: s3: smbd: Chain code can return uninitialized memory when
talloc buffer is grown.

* Detail release note:
  - https://www.samba.org/samba/history/samba-4.7.5.html

Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
---
 .../recipes-connectivity/samba/{samba_4.7.0.bb => samba_4.7.5.bb}  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
 rename meta-networking/recipes-connectivity/samba/{samba_4.7.0.bb => samba_4.7.5.bb} (97%)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.5.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/samba/samba_4.7.0.bb
rename to meta-networking/recipes-connectivity/samba/samba_4.7.5.bb
index a50b24de5..87f404900 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.7.5.bb
@@ -30,11 +30,8 @@ SRC_URI_append_libc-musl = " \
            file://samba-4.3.9-remove-getpwent_r.patch \
           "
 
-SRC_URI[md5sum] = "cf5eaf34f510e3d5643c0dcfd49fcc40"
-SRC_URI[sha256sum] = "bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936"
-
-#SRC_URI[md5sum] = "c6ee5c766016d59908c8fb672fbbd445"
-#SRC_URI[sha256sum] = "9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa"
+SRC_URI[md5sum] = "3629a134253d6a4a16ebd23a508b0d5b"
+SRC_URI[sha256sum] = "316d04fa9fbabad6f2739fe68e1928778af4866265409119aba6ef3435c8fe8d"
 
 inherit systemd waf-samba cpan-base perlnative update-rc.d
 # remove default added RDEPENDS on perl
-- 
2.16.2