helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 21:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtalloc: Upgrade to 2.1.11

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj 2018-02-07 21:35:13 -08:00 committed by Joe MacDonald
parent 569c48ef5b
commit 4048f755f1
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch
View File

@ -25,10 +25,10 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
wscript | 7 ++- wscript | 7 ++-
3 files changed, 79 insertions(+), 19 deletions(-) 3 files changed, 79 insertions(+), 19 deletions(-)
diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure Index: talloc-2.1.11/lib/replace/system/wscript_configure
index 2035474..10f9ae7 100644 ===================================================================
--- a/lib/replace/system/wscript_configure --- talloc-2.1.11.orig/lib/replace/system/wscript_configure
+++ b/lib/replace/system/wscript_configure +++ talloc-2.1.11/lib/replace/system/wscript_configure
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
@ -41,10 +41,10 @@ index 2035474..10f9ae7 100644
conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r')
# solaris varients of getXXent_r # solaris varients of getXXent_r
diff --git a/lib/replace/wscript b/lib/replace/wscript Index: talloc-2.1.11/lib/replace/wscript
index fc43e1a..12d2a70 100644 ===================================================================
--- a/lib/replace/wscript --- talloc-2.1.11.orig/lib/replace/wscript
+++ b/lib/replace/wscript +++ talloc-2.1.11/lib/replace/wscript
@@ -23,6 +23,41 @@ def set_options(opt): @@ -23,6 +23,41 @@ def set_options(opt):
opt.PRIVATE_EXTENSION_DEFAULT('') opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba') opt.RECURSE('buildtools/wafsamba')
@ -129,38 +129,45 @@ index fc43e1a..12d2a70 100644
conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.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('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h')
@@ -248,17 +298,18 @@ def configure(conf): @@ -267,21 +317,21 @@ def configure(conf):
conf.CHECK_FUNCS('prctl dirname basename') conf.CHECK_FUNCS('prctl dirname basename')
strlcpy_in_bsd = False
-
- # libbsd on some platforms provides strlcpy and strlcat - # libbsd on some platforms provides strlcpy and strlcat
- if not conf.CHECK_FUNCS('strlcpy strlcat'): - if not conf.CHECK_FUNCS('strlcpy strlcat'):
- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
- checklibc=True) + if Options.options.enable_libbsd:
+ # libbsd on some platforms provides strlcpy and strlcat
+ if not conf.CHECK_FUNCS('strlcpy strlcat'):
+ if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
checklibc=True):
- strlcpy_in_bsd = True
- if not conf.CHECK_FUNCS('getpeereid'): - if not conf.CHECK_FUNCS('getpeereid'):
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.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') - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
- - if not conf.CHECK_FUNCS('setproctitle_init'):
- if not conf.CHECK_FUNCS('closefrom'): - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + strlcpy_in_bsd = True
+ if Options.options.enable_libbsd:
+ # 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 not conf.CHECK_FUNCS('getpeereid'): + if not conf.CHECK_FUNCS('getpeereid'):
+ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
+ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.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') + 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')
+ if not conf.CHECK_FUNCS('closefrom'): + if not conf.CHECK_FUNCS('closefrom'):
+ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
conf.CHECK_CODE(''' conf.CHECK_CODE('''
struct ucred cred; struct ucred cred;
--- a/wscript Index: talloc-2.1.11/wscript
+++ b/wscript ===================================================================
--- talloc-2.1.11.orig/wscript
+++ talloc-2.1.11/wscript
@@ -32,7 +32,12 @@ def set_options(opt): @@ -32,7 +32,12 @@ def set_options(opt):
opt.add_option('--enable-talloc-compat1', opt.add_option('--enable-talloc-compat1',
help=("Build talloc 1.x.x compat library [False]"), help=("Build talloc 1.x.x compat library [False]"),
@ -175,6 +182,3 @@ index fc43e1a..12d2a70 100644
def configure(conf): def configure(conf):
conf.RECURSE('lib/replace') conf.RECURSE('lib/replace')
--
2.8.3

5
meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb → meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb
View File

@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6
SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \
file://options-2.1.10.patch \ file://options-2.1.10.patch \
" "
SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721"
SRC_URI[md5sum] = "48b8822a76797bb143e3e38ed738c320" SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3"
SRC_URI[sha256sum] = "c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619"
inherit waf-samba inherit waf-samba