Re: [oe] [meta-networking][PATCH] samba: Update to 4.8.3

2018-07-30 Thread Khem Raj 
thansk fixed in local pull branch
On Sun, Jul 29, 2018 at 6:11 PM Yi Zhao  wrote:
>
>
>
> 在 2018年07月29日 15:42, Khem Raj 写道:
> > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb 
> > b/meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
> > similarity index 94%
> > rename from meta-networking/recipes-connectivity/samba/samba_4.7.8.bb
> > rename to meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
> > index fc1a2e0fd0..5afb1d1345 100644
> > --- a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb
> > +++ b/meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
> > @@ -13,25 +13,27 @@ ${SAMBA_MIRROR}
> > http://www.mirrorservice.org/sites/ftp.samba.org \n \
> >   "
> >
> >   SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
> > +   file://smb.conf \
> >  file://16-do-not-check-xsltproc-manpages.patch \
> >  
> > file://20-do-not-import-target-module-while-cross-compile.patch \
> >  file://21-add-config-option-without-valgrind.patch \
> > -   
> > file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
> > -   file://0006-avoid-using-colon-in-the-checking-msg.patch \
> >  file://netdb_defines.patch \
> >  file://glibc_only.patch \
> >  file://iconv-4.7.0.patch \
> >  file://dnsserver-4.7.0.patch \
> >  file://smb_conf-4.7.0.patch \
> >  file://volatiles.03_samba \
> > -  "
> > +   
> > file://0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch \
> > +   file://samba-pam.patch \
> > +   file://samba-4.3.9-remove-getpwent_r.patch \
> > +   "
> >   SRC_URI_append_libc-musl = " \
> >  file://samba-pam.patch \
> >  file://samba-4.3.9-remove-getpwent_r.patch \
> > "
> >
> > -SRC_URI[md5sum] = "16b70fda54cf84521ed976a0856430cc"
> > -SRC_URI[sha256sum] = 
> > "ca6fca9d7e248bcaa55c54bdcc115eeed10660074da5c54a2b78dd3604de"
> > +SRC_URI[md5sum] = "67f271ed6b793c2acfe014b5b8f0cca8"
> > +SRC_URI[sha256sum] = 
> > "e0569a8a605d5dfb49f1fdd11db796f4d36fe0351c4a7f21387ef253010b82ed"
> >
> >   UPSTREAM_CHECK_REGEX = "samba\-(?P4\.7(\.\d+)+).tar.gz"
> Please also update UPSTREAM_CHECK_REGEX to check 4.8 series:
> "samba\-(?P4\.8(\.\d+)+).tar.gz"
>
> //Yi
>
> >
> > @@ -39,7 +41,7 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d
> >   # remove default added RDEPENDS on perl
> >   RDEPENDS_${PN}_remove = "perl"
> >
> > -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent 
> > libldb libbsd libaio libpam"
> > +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent 
> > libbsd libaio libpam"
> >
> >   inherit distro_features_check
> >   REQUIRED_DISTRO_FEATURES = "pam"
> > @@ -104,7 +106,7 @@ 
> > SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU
> >   # .so files so there will not be a conflict.  This is not done 
> > consistantly, so be very careful
> >   # when adding to this list.
> >   #
> > -SAMBA4_LIBS="heimdal,cmocka,NONE"
> > +SAMBA4_LIBS="heimdal,cmocka,ldb,pyldb-util,NONE"
> >
> >   EXTRA_OECONF += "--enable-fhs \
> >--with-piddir=/run \
> > @@ -135,7 +137,7 @@ do_install_append() {
> >   done
> >
> >   install -d ${D}${systemd_system_unitdir}
> > -install -m 0644 packaging/systemd/*.service 
> > ${D}${systemd_system_unitdir}
> > +install -m 0644 ${S}/bin/default/packaging/systemd/*.service 
> > ${D}${systemd_system_unitdir}/
> >   sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \
> >   -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \
> >   -i ${D}${systemd_system_unitdir}/*.service
> > @@ -159,7 +161,7 @@ do_install_append() {
> >
> >   install -d ${D}${sysconfdir}/samba
> >   echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts
> > -install -m644 packaging/RHEL/setup/smb.conf 
> > ${D}${sysconfdir}/samba/smb.conf
> > +install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
> >   install -D -m 644 ${WORKDIR}/volatiles.03_samba 
> > ${D}${sysconfdir}/default/volatiles/03_samba
> >
> >   install -d ${D}${sysconfdir}/default
> > @@ -268,6 +270,7 @@ FILES_winbind = "${sbindir}/winbindd \
> >${libdir}/samba/idmap \
> >${libdir}/samba/nss_info \
> >${libdir}/winbind_krb5_locator.so \
> > + ${libdir}/winbind-krb5-localauth.so \
> >${sysconfdir}/init.d/winbind \
> >${systemd_system_unitdir}/winbind.service"
> >
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-networking][PATCH] samba: Update to 4.8.3

2018-07-29 Thread Yi Zhao 



在 2018年07月29日 15:42, Khem Raj 写道:

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb 
b/meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
similarity index 94%
rename from meta-networking/recipes-connectivity/samba/samba_4.7.8.bb
rename to meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
index fc1a2e0fd0..5afb1d1345 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.8.3.bb
@@ -13,25 +13,27 @@ ${SAMBA_MIRROR}
http://www.mirrorservice.org/sites/ftp.samba.org \n \
  "
  
  SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \

+   file://smb.conf \
 file://16-do-not-check-xsltproc-manpages.patch \
 file://20-do-not-import-target-module-while-cross-compile.patch \
 file://21-add-config-option-without-valgrind.patch \
-   
file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
-   file://0006-avoid-using-colon-in-the-checking-msg.patch \
 file://netdb_defines.patch \
 file://glibc_only.patch \
 file://iconv-4.7.0.patch \
 file://dnsserver-4.7.0.patch \
 file://smb_conf-4.7.0.patch \
 file://volatiles.03_samba \
-  "
+   
file://0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch \
+   file://samba-pam.patch \
+   file://samba-4.3.9-remove-getpwent_r.patch \
+   "
  SRC_URI_append_libc-musl = " \
 file://samba-pam.patch \
 file://samba-4.3.9-remove-getpwent_r.patch \
"
  
-SRC_URI[md5sum] = "16b70fda54cf84521ed976a0856430cc"

-SRC_URI[sha256sum] = 
"ca6fca9d7e248bcaa55c54bdcc115eeed10660074da5c54a2b78dd3604de"
+SRC_URI[md5sum] = "67f271ed6b793c2acfe014b5b8f0cca8"
+SRC_URI[sha256sum] = 
"e0569a8a605d5dfb49f1fdd11db796f4d36fe0351c4a7f21387ef253010b82ed"
  
  UPSTREAM_CHECK_REGEX = "samba\-(?P4\.7(\.\d+)+).tar.gz"
Please also update UPSTREAM_CHECK_REGEX to check 4.8 series: 
"samba\-(?P4\.8(\.\d+)+).tar.gz"


//Yi

  
@@ -39,7 +41,7 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d

  # remove default added RDEPENDS on perl
  RDEPENDS_${PN}_remove = "perl"
  
-DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam"

+DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd 
libaio libpam"
  
  inherit distro_features_check

  REQUIRED_DISTRO_FEATURES = "pam"
@@ -104,7 +106,7 @@ 
SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU
  # .so files so there will not be a conflict.  This is not done consistantly, 
so be very careful
  # when adding to this list.
  #
-SAMBA4_LIBS="heimdal,cmocka,NONE"
+SAMBA4_LIBS="heimdal,cmocka,ldb,pyldb-util,NONE"
  
  EXTRA_OECONF += "--enable-fhs \

   --with-piddir=/run \
@@ -135,7 +137,7 @@ do_install_append() {
  done
  
  install -d ${D}${systemd_system_unitdir}

-install -m 0644 packaging/systemd/*.service ${D}${systemd_system_unitdir}
+install -m 0644 ${S}/bin/default/packaging/systemd/*.service 
${D}${systemd_system_unitdir}/
  sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \
  -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \
  -i ${D}${systemd_system_unitdir}/*.service
@@ -159,7 +161,7 @@ do_install_append() {
  
  install -d ${D}${sysconfdir}/samba

  echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts
-install -m644 packaging/RHEL/setup/smb.conf 
${D}${sysconfdir}/samba/smb.conf
+install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
  install -D -m 644 ${WORKDIR}/volatiles.03_samba 
${D}${sysconfdir}/default/volatiles/03_samba
  
  install -d ${D}${sysconfdir}/default

@@ -268,6 +270,7 @@ FILES_winbind = "${sbindir}/winbindd \
   ${libdir}/samba/idmap \
   ${libdir}/samba/nss_info \
   ${libdir}/winbind_krb5_locator.so \
+ ${libdir}/winbind-krb5-localauth.so \
   ${sysconfdir}/init.d/winbind \
   ${systemd_system_unitdir}/winbind.service"
  


--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

[oe] [meta-networking][PATCH] samba: Update to 4.8.3

2018-07-29 Thread Khem Raj 
LDB 1.4.0 breaks Samba < 4.9 therefore use internal version

Signed-off-by: Khem Raj 
---
 ...ild-Samba-against-a-newer-minor-vers.patch |  86 ++
 ...timeout-for-nmbd-if-started-offline-.patch |  32 ---
 ...void-using-colon-in-the-checking-msg.patch |  32 ---
 .../samba/samba-4.3.9-remove-getpwent_r.patch |  36 ++-
 .../samba/samba/samba-pam.patch   |  21 +-
 .../recipes-connectivity/samba/samba/smb.conf | 254 ++
 .../samba/samba/smb_conf-4.7.0.patch  |  17 +-
 .../samba/{samba_4.7.8.bb => samba_4.8.3.bb}  |  21 +-
 8 files changed, 401 insertions(+), 98 deletions(-)
 create mode 100644 
meta-networking/recipes-connectivity/samba/samba/0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch
 delete mode 100644 
meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
 delete mode 100644 
meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch
 create mode 100644 meta-networking/recipes-connectivity/samba/samba/smb.conf
 rename meta-networking/recipes-connectivity/samba/{samba_4.7.8.bb => 
samba_4.8.3.bb} (94%)

diff --git 
a/meta-networking/recipes-connectivity/samba/samba/0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch
 
b/meta-networking/recipes-connectivity/samba/samba/0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch
new file mode 100644
index 00..4c94831d7f
--- /dev/null
+++ 
b/meta-networking/recipes-connectivity/samba/samba/0001-ldb-Refuse-to-build-Samba-against-a-newer-minor-vers.patch
@@ -0,0 +1,86 @@
+From 0bc8bc4143a58f91f6d7ce228b6763f377fdf45a Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett 
+Date: Thu, 12 Jul 2018 12:34:56 +1200
+Subject: [PATCH] ldb: Refuse to build Samba against a newer minor version of
+ ldb
+
+Samba is not compatible with new versions of ldb (except release versions)
+
+Other users would not notice the breakages, but Samba makes many
+more assuptions about the LDB internals than any other package.
+
+(Specifically, LDB 1.2 and 1.4 broke builds against released
+Samba versions)
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13519
+
+Signed-off-by: Andrew Bartlett 
+Reviewed-by: Gary Lockyer 
+(cherry picked from commit 52efa796538ae004ca62ea32fc8c833472991be6)
+---
+ lib/ldb/wscript | 32 ++--
+ 1 file changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/lib/ldb/wscript b/lib/ldb/wscript
+index d94086b..2bb0832 100644
+--- a/lib/ldb/wscript
 b/lib/ldb/wscript
+@@ -62,23 +62,33 @@ def configure(conf):
+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
+ 
+ if not conf.env.standalone_ldb:
++max_ldb_version = [int(x) for x in VERSION.split(".")]
++max_ldb_version[2] = 999
++max_ldb_version_dots = "%d.%d.%d" % tuple(max_ldb_version)
++
+ if conf.env.disable_python:
+-if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb', minversion=VERSION,
+- onlyif='talloc tdb tevent',
+- implied_deps='replace talloc tdb 
tevent'):
++if conf.CHECK_BUNDLED_SYSTEM_PKG('ldb',
++ minversion=VERSION,
++ maxversion=max_ldb_version_dots,
++ onlyif='talloc tdb tevent',
++ implied_deps='replace talloc tdb 
tevent'):
+ conf.define('USING_SYSTEM_LDB', 1)
+ else:
+ using_system_pyldb_util = True
+-if not conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', 
minversion=VERSION,
+- onlyif='talloc tdb tevent',
+- implied_deps='replace talloc tdb 
tevent ldb'):
++if not conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util',
++ minversion=VERSION,
++ 
maxversion=max_ldb_version_dots,
++ onlyif='talloc tdb tevent',
++ implied_deps='replace talloc 
tdb tevent ldb'):
+ using_system_pyldb_util = False
+ 
+ # We need to get a pyldb-util for all the python versions
+ # we are building for
+ if conf.env['EXTRA_PYTHON']:
+ name = 'pyldb-util' + 
conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
+-if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
++if not conf.CHECK_BUNDLED_SYSTEM_PKG(name,
++ minversion=VERSION,
++ 
maxversion=max_ldb_version_dots,
+  onlyif='talloc tdb 
tevent',
+