diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-02-07 21:35:13 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-12 10:02:03 -0700 |
commit | 8550bb5a03b606db59179c46959fa4a0235cc2a3 (patch) | |
tree | 68f85ae7c71a4090ad8d6c348379a30f0f2dacfd /meta-networking | |
parent | 2f695cb0c9642798f7f17df7e1a60b368ecfcdad (diff) | |
download | meta-openembedded-8550bb5a03b606db59179c46959fa4a0235cc2a3.tar.gz |
libtalloc: Upgrade to 2.1.11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch | 58 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb (renamed from meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb) | 5 |
2 files changed, 33 insertions, 30 deletions
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch index 35f8eaf7d..63f21e775 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch +++ b/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch | |||
@@ -25,10 +25,10 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
25 | wscript | 7 ++- | 25 | wscript | 7 ++- |
26 | 3 files changed, 79 insertions(+), 19 deletions(-) | 26 | 3 files changed, 79 insertions(+), 19 deletions(-) |
27 | 27 | ||
28 | diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure | 28 | Index: talloc-2.1.11/lib/replace/system/wscript_configure |
29 | index 2035474..10f9ae7 100644 | 29 | =================================================================== |
30 | --- a/lib/replace/system/wscript_configure | 30 | --- talloc-2.1.11.orig/lib/replace/system/wscript_configure |
31 | +++ b/lib/replace/system/wscript_configure | 31 | +++ talloc-2.1.11/lib/replace/system/wscript_configure |
32 | @@ -1,6 +1,10 @@ | 32 | @@ -1,6 +1,10 @@ |
33 | #!/usr/bin/env python | 33 | #!/usr/bin/env python |
34 | 34 | ||
@@ -41,10 +41,10 @@ index 2035474..10f9ae7 100644 | |||
41 | conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') | 41 | conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') |
42 | 42 | ||
43 | # solaris varients of getXXent_r | 43 | # solaris varients of getXXent_r |
44 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 44 | Index: talloc-2.1.11/lib/replace/wscript |
45 | index fc43e1a..12d2a70 100644 | 45 | =================================================================== |
46 | --- a/lib/replace/wscript | 46 | --- talloc-2.1.11.orig/lib/replace/wscript |
47 | +++ b/lib/replace/wscript | 47 | +++ talloc-2.1.11/lib/replace/wscript |
48 | @@ -23,6 +23,41 @@ def set_options(opt): | 48 | @@ -23,6 +23,41 @@ def set_options(opt): |
49 | opt.PRIVATE_EXTENSION_DEFAULT('') | 49 | opt.PRIVATE_EXTENSION_DEFAULT('') |
50 | opt.RECURSE('buildtools/wafsamba') | 50 | opt.RECURSE('buildtools/wafsamba') |
@@ -129,38 +129,45 @@ index fc43e1a..12d2a70 100644 | |||
129 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 129 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
130 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 130 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
131 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 131 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
132 | @@ -248,17 +298,18 @@ def configure(conf): | 132 | @@ -267,21 +317,21 @@ def configure(conf): |
133 | |||
134 | conf.CHECK_FUNCS('prctl dirname basename') | 133 | conf.CHECK_FUNCS('prctl dirname basename') |
135 | 134 | ||
135 | strlcpy_in_bsd = False | ||
136 | - | ||
136 | - # libbsd on some platforms provides strlcpy and strlcat | 137 | - # libbsd on some platforms provides strlcpy and strlcat |
137 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): | 138 | - if not conf.CHECK_FUNCS('strlcpy strlcat'): |
138 | - conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | 139 | - if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', |
139 | - checklibc=True) | 140 | + if Options.options.enable_libbsd: |
141 | + # libbsd on some platforms provides strlcpy and strlcat | ||
142 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): | ||
143 | + if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | ||
144 | checklibc=True): | ||
145 | - strlcpy_in_bsd = True | ||
140 | - if not conf.CHECK_FUNCS('getpeereid'): | 146 | - if not conf.CHECK_FUNCS('getpeereid'): |
141 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 147 | - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
142 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 148 | - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
143 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 149 | - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
144 | - | 150 | - if not conf.CHECK_FUNCS('setproctitle_init'): |
145 | - if not conf.CHECK_FUNCS('closefrom'): | 151 | - conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') |
146 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 152 | + strlcpy_in_bsd = True |
147 | + if Options.options.enable_libbsd: | ||
148 | + # libbsd on some platforms provides strlcpy and strlcat | ||
149 | + if not conf.CHECK_FUNCS('strlcpy strlcat'): | ||
150 | + conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', | ||
151 | + checklibc=True) | ||
152 | + if not conf.CHECK_FUNCS('getpeereid'): | 153 | + if not conf.CHECK_FUNCS('getpeereid'): |
153 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') | 154 | + conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') |
154 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): | 155 | + if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): |
155 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') | 156 | + conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') |
156 | + | 157 | + if not conf.CHECK_FUNCS('setproctitle_init'): |
158 | + conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h') | ||
159 | |||
160 | - if not conf.CHECK_FUNCS('closefrom'): | ||
161 | - conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | ||
157 | + if not conf.CHECK_FUNCS('closefrom'): | 162 | + if not conf.CHECK_FUNCS('closefrom'): |
158 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') | 163 | + conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') |
159 | 164 | ||
160 | conf.CHECK_CODE(''' | 165 | conf.CHECK_CODE(''' |
161 | struct ucred cred; | 166 | struct ucred cred; |
162 | --- a/wscript | 167 | Index: talloc-2.1.11/wscript |
163 | +++ b/wscript | 168 | =================================================================== |
169 | --- talloc-2.1.11.orig/wscript | ||
170 | +++ talloc-2.1.11/wscript | ||
164 | @@ -32,7 +32,12 @@ def set_options(opt): | 171 | @@ -32,7 +32,12 @@ def set_options(opt): |
165 | opt.add_option('--enable-talloc-compat1', | 172 | opt.add_option('--enable-talloc-compat1', |
166 | help=("Build talloc 1.x.x compat library [False]"), | 173 | help=("Build talloc 1.x.x compat library [False]"), |
@@ -172,9 +179,6 @@ index fc43e1a..12d2a70 100644 | |||
172 | + opt.add_option('--without-valgrind', | 179 | + opt.add_option('--without-valgrind', |
173 | + help=("disable use of valgrind"), | 180 | + help=("disable use of valgrind"), |
174 | + action="store_false", dest='enable_valgrind', default=False) | 181 | + action="store_false", dest='enable_valgrind', default=False) |
175 | 182 | ||
176 | def configure(conf): | 183 | def configure(conf): |
177 | conf.RECURSE('lib/replace') | 184 | conf.RECURSE('lib/replace') |
178 | -- | ||
179 | 2.8.3 | ||
180 | |||
diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb index 23dca15fd..848cf4d99 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.1.10.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb | |||
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 | |||
9 | SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ | 9 | SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ |
10 | file://options-2.1.10.patch \ | 10 | file://options-2.1.10.patch \ |
11 | " | 11 | " |
12 | 12 | SRC_URI[md5sum] = "452596f904ca2b10322bdaabf147a721" | |
13 | SRC_URI[md5sum] = "48b8822a76797bb143e3e38ed738c320" | 13 | SRC_URI[sha256sum] = "639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3" |
14 | SRC_URI[sha256sum] = "c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619" | ||
15 | 14 | ||
16 | inherit waf-samba | 15 | inherit waf-samba |
17 | 16 | ||