diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2024-01-03 12:59:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-03 23:36:34 +0000 |
commit | e08a0caab4cc30b7b98032af28dc4bbad5172ead (patch) | |
tree | cd33b79ef2cdf564d8da16b8a0d221e09c203cc0 /meta/recipes-extended/tcp-wrappers | |
parent | 30e0c90f3076410aeb7e6bcf3f3844567913f184 (diff) | |
download | poky-e08a0caab4cc30b7b98032af28dc4bbad5172ead.tar.gz |
tcp-wrappers: drop libnsl2 build dependency
The only libnsl2 function which is used by tcp-wrappers is
'yp_get_default_domain()'. When USE_GETDOMAIN is set, this is
implemented as a simple wrapper around getdomainname() so that libnsl2
is not used at all.
We added a patch which does '#include <rpcsvc/ypclnt.h>' to avoid
implicit forward declaration. By conditionalizing this, the libnsl2
dependency can be dropped completely.
(From OE-Core rev: b013f6ce40d315c894064cf9fa77d9c7a9dad2b0)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/tcp-wrappers')
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch | 9 | ||||
-rw-r--r-- | meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch index ec793ac8ff..474703885d 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch | |||
@@ -20,11 +20,16 @@ diff --git a/hosts_access.c b/hosts_access.c | |||
20 | index 0133e5e..58697ea 100644 | 20 | index 0133e5e..58697ea 100644 |
21 | --- a/hosts_access.c | 21 | --- a/hosts_access.c |
22 | +++ b/hosts_access.c | 22 | +++ b/hosts_access.c |
23 | @@ -33,6 +33,7 @@ static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22"; | 23 | @@ -33,6 +33,12 @@ static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22"; |
24 | #endif | 24 | #endif |
25 | #include <netinet/in.h> | 25 | #include <netinet/in.h> |
26 | #include <arpa/inet.h> | 26 | #include <arpa/inet.h> |
27 | +#include <rpcsvc/ypclnt.h> | 27 | +#ifdef USE_GETDOMAIN |
28 | +/* defined in workarounds.c */ | ||
29 | +extern int yp_get_default_domain(char **ptr); | ||
30 | +#else | ||
31 | +# include <rpcsvc/ypclnt.h> | ||
32 | +#endif /* USE_GETDOMAIN */ | ||
28 | #include <stdio.h> | 33 | #include <stdio.h> |
29 | #include <stdlib.h> | 34 | #include <stdlib.h> |
30 | #include <syslog.h> | 35 | #include <syslog.h> |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index c655da1199..bcd1d6f792 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | |||
@@ -7,8 +7,6 @@ SECTION = "console/network" | |||
7 | LICENSE = "BSD-1-Clause" | 7 | LICENSE = "BSD-1-Clause" |
8 | LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" | 8 | LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" |
9 | 9 | ||
10 | DEPENDS += "libnsl2" | ||
11 | |||
12 | PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev ${PN} ${PN}-doc" | 10 | PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev ${PN} ${PN}-doc" |
13 | FILES:libwrap = "${base_libdir}/lib*${SOLIBS}" | 11 | FILES:libwrap = "${base_libdir}/lib*${SOLIBS}" |
14 | FILES:libwrap-doc = "${mandir}/man3 ${mandir}/man5" | 12 | FILES:libwrap-doc = "${mandir}/man3 ${mandir}/man5" |