From patchwork Thu Mar 15 17:29:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131826 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1396709ljb; Thu, 15 Mar 2018 10:30:26 -0700 (PDT) X-Google-Smtp-Source: AG47ELtM6RdeP26O6mtLM1piDNifR4O/ZBeU5N5XFBKc/sODCk9aLTOuDG2aP/5KVTYnkF4MtfYa X-Received: by 2002:a17:902:82c2:: with SMTP id u2-v6mr8755928plz.401.1521135025580; Thu, 15 Mar 2018 10:30:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135025; cv=none; d=google.com; s=arc-20160816; b=G2MPP0nNZ05E97KqQjiYdUKVLgo6u6FC2sIp+LCOoKglRq5cCZQz/FcLVWD6bMsE4J j8Q4HgVqhIpx2171NsT4gKdvqlaoNMXavT/+Any6uaMTPzUxf8dkz0UCpEQ/cQRgpIn1 kvBlDLdLAmmA/DezrXcxOdXMidt6RiKJdUYQWzIeHFJWM+THXKB+pkzGM9Oj+/Ldvgg9 H529q+rF4b9ijxzo/8+tZTm9IVRMrJXDSSveu0e6BCiuPb5V/t6PZdtJNyg0y1d5PQ3D bapfng9n+q9Lbl9nYch6vYEApbE1VXdLAcRpz1oe43bTYe82GqU1+wPtfkDf1OnHRfDk QNDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=J9l6xpytLko+9YwQIGN+HhG7BpDk/IG2HtJQSCD2LDw=; b=kTHLsBSfysbn4seGTE4Bi2lhsJfLKlP86scvd0uiktabOI3fqycehFvXhgqaMrW68X FVttTBCS0zg4ogmX+9qd8Wq2faV+xGjtimJvjzBZG9SHIIgg0m9IZ/RxPVOlZBMrhT2A gqPY2VNsgw32FmiFU+OQ8WS7FeiTrVx3I1oaREnfGlqgY2wirNkE2Tzi4o1Vt7RVr+AF ZmLojXPhYOzVKhiMgj33igD8ysoZ8Jyjo0jQkDlO/n+1G6zPy9l+32U1XTC9SgPc7x4G eRThe8QzmX3cYCJkloPt/YO+6ytIwk6lTB/XqxUpCv30SJg3UMkt4EHkKaDFhbaFyMtG U7Hw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c5-v6si4382708pll.90.2018.03.15.10.30.25; Thu, 15 Mar 2018 10:30:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3646E7882C; Thu, 15 Mar 2018 17:30:21 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id A619D6FFF7 for ; Thu, 15 Mar 2018 17:30:19 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEkq006068 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:17 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhh-0003Aq-U8; Thu, 15 Mar 2018 10:30:13 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:29:57 -0700 Message-Id: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 01/13] unfs3: Fix build with musl X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj Should also fix build on new build hosts where with glibc 2.27 rpc support is dropped in favor of libtirpc Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/world-broken.inc | 5 --- .../0001-daemon.c-Libtirpc-porting-fixes.patch | 37 ++++++++++++++++++++++ meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb | 10 ++++-- 3 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc index d4bdddf..0166963 100644 --- a/meta/conf/distro/include/world-broken.inc +++ b/meta/conf/distro/include/world-broken.inc @@ -5,11 +5,6 @@ # rt-tests needs PI mutex support in libc EXCLUDE_FROM_WORLD_pn-rt-tests_libc-musl = "1" -# error: no member named 'sin_port' in 'struct sockaddr_in6' -# this is due to libtirpc using ipv6 but portmap rpc expecting ipv4 -EXCLUDE_FROM_WORLD_pn-portmap_libc-musl = "1" -EXCLUDE_FROM_WORLD_pn-unfs3_libc-musl = "1" - # error: use of undeclared identifier '_STAT_VER' EXCLUDE_FROM_WORLD_pn-pseudo_libc-musl = "1" diff --git a/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch b/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch new file mode 100644 index 0000000..6eee674 --- /dev/null +++ b/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch @@ -0,0 +1,37 @@ +From c7a2a65d6c2a433312540c207860740d6e4e7629 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 11 Mar 2018 17:32:54 -0700 +Subject: [PATCH] daemon.c: Libtirpc porting fixes + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + daemon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/daemon.c b/daemon.c +index 22f30f6..028a181 100644 +--- a/daemon.c ++++ b/daemon.c +@@ -117,7 +117,7 @@ void logmsg(int prio, const char *fmt, ...) + */ + struct in_addr get_remote(struct svc_req *rqstp) + { +- return (svc_getcaller(rqstp->rq_xprt))->sin_addr; ++ return ((struct sockaddr_in*)svc_getcaller(rqstp->rq_xprt))->sin_addr; + } + + /* +@@ -125,7 +125,7 @@ struct in_addr get_remote(struct svc_req *rqstp) + */ + short get_port(struct svc_req *rqstp) + { +- return (svc_getcaller(rqstp->rq_xprt))->sin_port; ++ return ((struct sockaddr_in*)svc_getcaller(rqstp->rq_xprt))->sin_port; + } + + /* +-- +2.16.2 + diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb index e7574fb..fd9a5cd 100644 --- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb @@ -9,9 +9,11 @@ RECIPE_UPSTREAM_DATE = "Oct 08, 2015" CHECK_DATE = "Dec 10, 2015" DEPENDS = "flex-native bison-native flex" -DEPENDS_append_libc-musl = " libtirpc" +DEPENDS += "libtirpc" DEPENDS_append_class-nativesdk = " flex-nativesdk" +ASNEEDED = "" + MOD_PV = "497" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protocol=http \ @@ -22,7 +24,8 @@ SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV};protoco file://rename_fh_cache.patch \ file://relative_max_socket_path_len.patch \ file://tcp_no_delay.patch \ - " + file://0001-daemon.c-Libtirpc-porting-fixes.patch \ + " SRC_URI[md5sum] = "3687acc4ee992e536472365dd99712a7" SRC_URI[sha256sum] = "274b43ada9c6eea1da26eb7010d72889c5278984ba0b50dff4e093057d4d64f8" @@ -30,7 +33,8 @@ BBCLASSEXTEND = "native nativesdk" inherit autotools EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS += " -I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" # Turn off these header detects else the inode search # will walk entire file systems and this is a real problem From patchwork Thu Mar 15 17:29:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131831 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1397856ljb; Thu, 15 Mar 2018 10:31:13 -0700 (PDT) X-Google-Smtp-Source: AG47ELu88060qLsIARy2RatGZszQTYGhwANz0BjZfEp48KF4g+t9DfmmBSHcuyrQtDB/AYNMsbw0 X-Received: by 2002:a17:902:8501:: with SMTP id bj1-v6mr9052546plb.110.1521135072940; Thu, 15 Mar 2018 10:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135072; cv=none; d=google.com; s=arc-20160816; b=pTX1Ruo2XSQrAxMHTJnlDltQqYwK3mIGpzXDwrkwgp1SyqRg8ywe37D5mVQ/5y1a+i 1DMQN3nK0aZ7AOZmYa0OTM3JJxaU4joqSvDiHj9OxXxvUbz5KRn2rvz7sL+z4oL6OLul igRUB9A2cNRplBC6bLnpPxaoDsySnA9XfoHHi+YoRxt6Ern4cAadg4J8+1/MLzUTNxnr 8NibRjUO6f9b3s69H2sBUYQx2tWLRxQRfDeVNCqo7EUB4jt9ZoRGTFY1tiGK0nEG+6Ea PlkDZUIKxn7LSxir1hofJDNtgNyzzIw36hmQNEl4+5BCTZ85Crz4rE0x+j3ZcC0QwbCp l5Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=9ahLGzZzzMH90QstdurOswh+EA6L2cy2CYQ6Zcnn6N0=; b=zQahQd98IRmCSK62EM75j7xUcoGk4zosWtZSb3tH0Ml9ZjfB0YBaygwIz2MMiOBNAk Of3LZCY7BeFWEAYgDm48tIg/PbiU8sGFFdq/8+KCAhBt66fBV3oE8XIn4l2lzdoZcdI6 CaMuaWIq/5cP4GC2TxMo6Z82Z3/x/gFbruO/zlZMV3M//Z3U2Gy9+N8j6LgiCpi45mYJ ruDYtRUGX46nCKrBQykR/q6nEvLovQBQVu4mel775SOJ7VLfB/JBrLggbDpfPbHvZ23v uXGBO0fj91Hyy7gq7Dxuj+SgRROaxt1VBdJAT6GU5IHEwetdZv5VKJ8d3yOoW+OMq7aI Sgdg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w14-v6si4387507plq.718.2018.03.15.10.31.12; Thu, 15 Mar 2018 10:31:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 749CF78930; Thu, 15 Mar 2018 17:30:42 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 74916788FD for ; Thu, 15 Mar 2018 17:30:22 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUESj006069 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:17 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhh-0003Au-Uk; Thu, 15 Mar 2018 10:30:13 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:29:58 -0700 Message-Id: <1521135009-12149-2-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 02/13] libtirpc: Backport fixes from 1.0.2rc3 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj These fixes are needed for it to work with gcc7 Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...d-missing-rwlock_unlocks-in-xprt_register.patch | 62 -- .../libtirpc/libtirpc/libtirpc-1.0.2-rc3.patch | 743 +++++++++++++++++++++ .../libtirpc/remove-des-functionality.patch | 39 +- meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb | 4 +- 4 files changed, 762 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-Add-missing-rwlock_unlocks-in-xprt_register.patch create mode 100644 meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.2-rc3.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-Add-missing-rwlock_unlocks-in-xprt_register.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-Add-missing-rwlock_unlocks-in-xprt_register.patch deleted file mode 100644 index 50613ba..0000000 --- a/meta/recipes-extended/libtirpc/libtirpc/0001-Add-missing-rwlock_unlocks-in-xprt_register.patch +++ /dev/null @@ -1,62 +0,0 @@ -Subject: [PATCH] Add missing rwlock_unlocks in xprt_register - -It looks like in b2c9430f46c4ac848957fb8adaac176a3f6ac03f when svc_run -switched to poll, an early return was added, but the rwlock was not -unlocked. - -I observed that rpcbind built against libtirpc-1.0.1 would handle only -one request before hanging, and tracked it down to a missing -rwlock_unlock here. - -Fixes: b2c9430f46c4 ('Use poll() instead of select() in svc_run()') - -Upstream-Status: Backport - -Signed-off-by: Michael Forney -Signed-off-by: Steve Dickson -Signed-off-by: Maxin B. John ---- - src/svc.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/svc.c b/src/svc.c -index 9c41445..b59467b 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -99,7 +99,7 @@ xprt_register (xprt) - { - __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *)); - if (__svc_xports == NULL) -- return; -+ goto unlock; - } - if (sock < _rpc_dtablesize()) - { -@@ -120,14 +120,14 @@ xprt_register (xprt) - svc_pollfd[i].fd = sock; - svc_pollfd[i].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); -- return; -+ goto unlock; - } - - new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd, - sizeof (struct pollfd) - * (svc_max_pollfd + 1)); - if (new_svc_pollfd == NULL) /* Out of memory */ -- return; -+ goto unlock; - svc_pollfd = new_svc_pollfd; - ++svc_max_pollfd; - -@@ -135,6 +135,7 @@ xprt_register (xprt) - svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); - } -+unlock: - rwlock_unlock (&svc_fd_lock); - } - --- -2.5.3 - diff --git a/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.2-rc3.patch b/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.2-rc3.patch new file mode 100644 index 0000000..113dabe --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/libtirpc-1.0.2-rc3.patch @@ -0,0 +1,743 @@ +Backport the 1.0.2 RC3 changes, this fixes issues with gcc7 + +Upstream-Status: Backport + +Signed-off-by: Khem Raj + +diff --git a/src/Makefile.am b/src/Makefile.am +index e4ed8aa..fba2aa4 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ + svc_auth_des.c \ + svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c debug.c ++ auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c +diff --git a/src/auth_des.c b/src/auth_des.c +index 4d3639e..af2f61f 100644 +--- a/src/auth_des.c ++++ b/src/auth_des.c +@@ -46,8 +46,8 @@ + #include + #include + #include +-#undef NIS +-#include ++ ++#include "nis.h" + + #if defined(LIBC_SCCS) && !defined(lint) + #endif +diff --git a/src/auth_gss.c b/src/auth_gss.c +index 9b88c38..5959893 100644 +--- a/src/auth_gss.c ++++ b/src/auth_gss.c +@@ -526,6 +526,14 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret) + gr.gr_major != GSS_S_CONTINUE_NEEDED)) { + options_ret->major_status = gr.gr_major; + options_ret->minor_status = gr.gr_minor; ++ if (call_stat != RPC_SUCCESS) { ++ struct rpc_err err; ++ clnt_geterr(gd->clnt, &err); ++ LIBTIRPC_DEBUG(1, ("authgss_refresh: %s errno: %s", ++ clnt_sperrno(call_stat), strerror(err.re_errno))); ++ } else ++ gss_log_status("authgss_refresh:", ++ gr.gr_major, gr.gr_minor); + return FALSE; + } + +diff --git a/src/auth_time.c b/src/auth_time.c +index 10e58eb..7f83ab4 100644 +--- a/src/auth_time.c ++++ b/src/auth_time.c +@@ -44,8 +44,8 @@ + #include + //#include + #include +-#undef NIS +-#include ++ ++#include "nis.h" + + + #ifdef TESTING +diff --git a/src/des_impl.c b/src/des_impl.c +index c5b7ed6..9dbccaf 100644 +--- a/src/des_impl.c ++++ b/src/des_impl.c +@@ -6,7 +6,8 @@ + /* see to obtain a copy. */ + #include + #include +-#include ++#include ++#include + + + static const uint32_t des_SPtrans[8][64] = +diff --git a/src/getpublickey.c b/src/getpublickey.c +index 764a5f9..8cf4dc2 100644 +--- a/src/getpublickey.c ++++ b/src/getpublickey.c +@@ -38,8 +38,10 @@ + #include + #include + #include ++#ifdef YP + #include + #include ++#endif + #include + #include + +diff --git a/src/nis.h b/src/nis.h +new file mode 100644 +index 0000000..588c041 +--- /dev/null ++++ b/src/nis.h +@@ -0,0 +1,70 @@ ++/* ++ * Copyright (c) 2010, Oracle America, Inc. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are ++ * met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above ++ * copyright notice, this list of conditions and the following ++ * disclaimer in the documentation and/or other materials ++ * provided with the distribution. ++ * * Neither the name of the "Oracle America, Inc." nor the names of its ++ * contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE ++ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#ifndef _INTERNAL_NIS_H ++#define _INTERNAL_NIS_H 1 ++ ++/* This file only contains the definition of nis_server, to be ++ able to compile libtirpc without the need to have a glibc ++ with sunrpc or a libnsl already installed. */ ++ ++#define NIS_PK_NONE 0 ++ ++struct nis_attr { ++ char *zattr_ndx; ++ struct { ++ u_int zattr_val_len; ++ char *zattr_val_val; ++ } zattr_val; ++}; ++typedef struct nis_attr nis_attr; ++ ++typedef char *nis_name; ++ ++struct endpoint { ++ char *uaddr; ++ char *family; ++ char *proto; ++}; ++typedef struct endpoint endpoint; ++ ++struct nis_server { ++ nis_name name; ++ struct { ++ u_int ep_len; ++ endpoint *ep_val; ++ } ep; ++ uint32_t key_type; ++ netobj pkey; ++}; ++typedef struct nis_server nis_server; ++ ++#endif /* ! _INTERNAL_NIS_H */ +diff --git a/src/rpc_dtablesize.c b/src/rpc_dtablesize.c +index 13d320c..3fe503a 100644 +--- a/src/rpc_dtablesize.c ++++ b/src/rpc_dtablesize.c +@@ -27,22 +27,14 @@ + */ + + #include +- + #include +- +-int _rpc_dtablesize(void); /* XXX */ ++#include ++#include + + /* + * Cache the result of getdtablesize(), so we don't have to do an + * expensive system call every time. + */ +-/* +- * XXX In FreeBSD 2.x, you can have the maximum number of open file +- * descriptors be greater than FD_SETSIZE (which us 256 by default). +- * +- * Since old programs tend to use this call to determine the first arg +- * for _select(), having this return > FD_SETSIZE is a Bad Idea(TM)! +- */ + int + _rpc_dtablesize(void) + { +diff --git a/src/rpc_soc.c b/src/rpc_soc.c +index 1ec7b3f..ed0892a 100644 +--- a/src/rpc_soc.c ++++ b/src/rpc_soc.c +@@ -61,8 +61,8 @@ + #include + #include + #include +-#include + ++#include "nis.h" + #include "rpc_com.h" + + extern mutex_t rpcsoc_lock; +diff --git a/src/rtime.c b/src/rtime.c +index c34e0af..b642840 100644 +--- a/src/rtime.c ++++ b/src/rtime.c +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -67,7 +68,8 @@ rtime(addrp, timep, timeout) + struct timeval *timeout; + { + int s; +- fd_set readfds; ++ struct pollfd fd; ++ int milliseconds; + int res; + unsigned long thetime; + struct sockaddr_in from; +@@ -94,31 +96,32 @@ rtime(addrp, timep, timeout) + addrp->sin_port = serv->s_port; + + if (type == SOCK_DGRAM) { +- res = sendto(s, (char *)&thetime, sizeof(thetime), 0, ++ res = sendto(s, (char *)&thetime, sizeof(thetime), 0, + (struct sockaddr *)addrp, sizeof(*addrp)); + if (res < 0) { + do_close(s); +- return(-1); ++ return(-1); + } +- do { +- FD_ZERO(&readfds); +- FD_SET(s, &readfds); +- res = select(_rpc_dtablesize(), &readfds, +- (fd_set *)NULL, (fd_set *)NULL, timeout); +- } while (res < 0 && errno == EINTR); ++ ++ milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000); ++ fd.fd = s; ++ fd.events = POLLIN; ++ do ++ res = poll (&fd, 1, milliseconds); ++ while (res < 0 && errno == EINTR); + if (res <= 0) { + if (res == 0) { + errno = ETIMEDOUT; + } + do_close(s); +- return(-1); ++ return(-1); + } + fromlen = sizeof(from); +- res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, ++ res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, + (struct sockaddr *)&from, &fromlen); + do_close(s); + if (res < 0) { +- return(-1); ++ return(-1); + } + } else { + if (connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) { +diff --git a/src/svc.c b/src/svc.c +index 9c41445..b59467b 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -99,7 +99,7 @@ xprt_register (xprt) + { + __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *)); + if (__svc_xports == NULL) +- return; ++ goto unlock; + } + if (sock < _rpc_dtablesize()) + { +@@ -120,14 +120,14 @@ xprt_register (xprt) + svc_pollfd[i].fd = sock; + svc_pollfd[i].events = (POLLIN | POLLPRI | + POLLRDNORM | POLLRDBAND); +- return; ++ goto unlock; + } + + new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd, + sizeof (struct pollfd) + * (svc_max_pollfd + 1)); + if (new_svc_pollfd == NULL) /* Out of memory */ +- return; ++ goto unlock; + svc_pollfd = new_svc_pollfd; + ++svc_max_pollfd; + +@@ -135,6 +135,7 @@ xprt_register (xprt) + svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI | + POLLRDNORM | POLLRDBAND); + } ++unlock: + rwlock_unlock (&svc_fd_lock); + } + +diff --git a/src/svc_auth_des.c b/src/svc_auth_des.c +index 5bc264c..2e90146 100644 +--- a/src/svc_auth_des.c ++++ b/src/svc_auth_des.c +@@ -86,13 +86,13 @@ static struct cache_entry *authdes_cache/* [AUTHDES_CACHESZ] */; + static short *authdes_lru/* [AUTHDES_CACHESZ] */; + + static void cache_init(); /* initialize the cache */ +-static short cache_spot(); /* find an entry in the cache */ +-static void cache_ref(/*short sid*/); /* note that sid was ref'd */ ++static short cache_spot(des_block *key, char *name, struct timeval *timestamp); /* find an entry in the cache */ ++static void cache_ref(short sid); /* note that sid was ref'd */ + +-static void invalidate(); /* invalidate entry in cache */ ++static void invalidate(char *cred); /* invalidate entry in cache */ + + /* +- * cache statistics ++ * cache statistics + */ + static struct { + u_long ncachehits; /* times cache hit, and is not replay */ +diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c +index b6aa407..bece46a 100644 +--- a/src/svc_auth_gss.c ++++ b/src/svc_auth_gss.c +@@ -129,6 +129,8 @@ struct svc_rpc_gss_data { + ((struct svc_rpc_gss_data *)(auth)->svc_ah_private) + + /* Global server credentials. */ ++static u_int _svcauth_req_time = 0; ++static gss_OID_set_desc _svcauth_oid_set = {1, GSS_C_NULL_OID }; + static gss_cred_id_t _svcauth_gss_creds; + static gss_name_t _svcauth_gss_name = GSS_C_NO_NAME; + static char * _svcauth_svc_name = NULL; +@@ -167,6 +169,7 @@ svcauth_gss_import_name(char *service) + gss_name_t name; + gss_buffer_desc namebuf; + OM_uint32 maj_stat, min_stat; ++ bool_t result; + + gss_log_debug("in svcauth_gss_import_name()"); + +@@ -181,22 +184,21 @@ svcauth_gss_import_name(char *service) + maj_stat, min_stat); + return (FALSE); + } +- if (svcauth_gss_set_svc_name(name) != TRUE) { +- gss_release_name(&min_stat, &name); +- return (FALSE); +- } +- return (TRUE); ++ result = svcauth_gss_set_svc_name(name); ++ gss_release_name(&min_stat, &name); ++ return result; + } + + static bool_t +-svcauth_gss_acquire_cred(u_int req_time, gss_OID_set_desc *oid_set) ++svcauth_gss_acquire_cred(void) + { + OM_uint32 maj_stat, min_stat; + + gss_log_debug("in svcauth_gss_acquire_cred()"); + +- maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, req_time, +- oid_set, GSS_C_ACCEPT, ++ maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, ++ _svcauth_req_time, &_svcauth_oid_set, ++ GSS_C_ACCEPT, + &_svcauth_gss_creds, NULL, NULL); + + if (maj_stat != GSS_S_COMPLETE) { +@@ -300,6 +302,8 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, + NULL, + &gd->deleg); + ++ xdr_free((xdrproc_t)xdr_rpc_gss_init_args, (caddr_t)&recv_tok); ++ + if (gr->gr_major != GSS_S_COMPLETE && + gr->gr_major != GSS_S_CONTINUE_NEEDED) { + gss_log_status("svcauth_gss_accept_sec_context: accept_sec_context", +@@ -352,8 +356,11 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, + return (FALSE); + + rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS; +- rqst->rq_xprt->xp_verf.oa_base = checksum.value; ++ memcpy(rqst->rq_xprt->xp_verf.oa_base, checksum.value, ++ checksum.length); + rqst->rq_xprt->xp_verf.oa_length = checksum.length; ++ ++ gss_release_buffer(&min_stat, &checksum); + } + return (TRUE); + } +@@ -435,10 +442,13 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num) + maj_stat, min_stat); + return (FALSE); + } ++ + rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS; +- rqst->rq_xprt->xp_verf.oa_base = (caddr_t)checksum.value; ++ memcpy(rqst->rq_xprt->xp_verf.oa_base, checksum.value, checksum.length); + rqst->rq_xprt->xp_verf.oa_length = (u_int)checksum.length; + ++ gss_release_buffer(&min_stat, &checksum); ++ + return (TRUE); + } + +@@ -568,6 +578,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + gss_qop_t qop; + struct svcauth_gss_cache_entry **ce; + time_t now; ++ enum auth_stat result = AUTH_OK; ++ OM_uint32 min_stat; + + gss_log_debug("in svcauth_gss()"); + +@@ -621,19 +633,25 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + XDR_DESTROY(&xdrs); + + /* Check version. */ +- if (gc->gc_v != RPCSEC_GSS_VERSION) +- return (AUTH_BADCRED); ++ if (gc->gc_v != RPCSEC_GSS_VERSION) { ++ result = AUTH_BADCRED; ++ goto out; ++ } + + /* Check RPCSEC_GSS service. */ + if (gc->gc_svc != RPCSEC_GSS_SVC_NONE && + gc->gc_svc != RPCSEC_GSS_SVC_INTEGRITY && +- gc->gc_svc != RPCSEC_GSS_SVC_PRIVACY) +- return (AUTH_BADCRED); ++ gc->gc_svc != RPCSEC_GSS_SVC_PRIVACY) { ++ result = AUTH_BADCRED; ++ goto out; ++ } + + /* Check sequence number. */ + if (gd->established) { +- if (gc->gc_seq > MAXSEQ) +- return (RPCSEC_GSS_CTXPROBLEM); ++ if (gc->gc_seq > MAXSEQ) { ++ result = RPCSEC_GSS_CTXPROBLEM; ++ goto out; ++ } + + if ((offset = gd->seqlast - gc->gc_seq) < 0) { + gd->seqlast = gc->gc_seq; +@@ -643,7 +661,8 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + } + else if (offset >= gd->win || (gd->seqmask & (1 << offset))) { + *no_dispatch = 1; +- return (RPCSEC_GSS_CTXPROBLEM); ++ result = RPCSEC_GSS_CTXPROBLEM; ++ goto out; + } + gd->seq = gc->gc_seq; + gd->seqmask |= (1 << offset); +@@ -654,35 +673,52 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + rqst->rq_svcname = (char *)gd->ctx; + } + ++ rqst->rq_xprt->xp_verf.oa_base = msg->rm_call.cb_verf.oa_base; ++ + /* Handle RPCSEC_GSS control procedure. */ + switch (gc->gc_proc) { + + case RPCSEC_GSS_INIT: + case RPCSEC_GSS_CONTINUE_INIT: +- if (rqst->rq_proc != NULLPROC) +- return (AUTH_FAILED); /* XXX ? */ ++ if (rqst->rq_proc != NULLPROC) { ++ result = AUTH_FAILED; /* XXX ? */ ++ break; ++ } + + if (_svcauth_gss_name == GSS_C_NO_NAME) { +- if (!svcauth_gss_import_name("nfs")) +- return (AUTH_FAILED); ++ if (!svcauth_gss_import_name("nfs")) { ++ result = AUTH_FAILED; ++ break; ++ } + } + +- if (!svcauth_gss_acquire_cred(0, GSS_C_NULL_OID_SET)) +- return (AUTH_FAILED); ++ if (!svcauth_gss_acquire_cred()) { ++ result = AUTH_FAILED; ++ break; ++ } + +- if (!svcauth_gss_accept_sec_context(rqst, &gr)) +- return (AUTH_REJECTEDCRED); ++ if (!svcauth_gss_accept_sec_context(rqst, &gr)) { ++ result = AUTH_REJECTEDCRED; ++ break; ++ } + +- if (!svcauth_gss_nextverf(rqst, htonl(gr.gr_win))) +- return (AUTH_FAILED); ++ if (!svcauth_gss_nextverf(rqst, htonl(gr.gr_win))) { ++ result = AUTH_FAILED; ++ break; ++ } + + *no_dispatch = TRUE; + + call_stat = svc_sendreply(rqst->rq_xprt, + (xdrproc_t)xdr_rpc_gss_init_res, (caddr_t)&gr); + +- if (!call_stat) +- return (AUTH_FAILED); ++ gss_release_buffer(&min_stat, &gr.gr_token); ++ free(gr.gr_ctx.value); ++ ++ if (!call_stat) { ++ result = AUTH_FAILED; ++ break; ++ } + + if (gr.gr_major == GSS_S_COMPLETE) + gd->established = TRUE; +@@ -690,27 +726,37 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + break; + + case RPCSEC_GSS_DATA: +- if (!svcauth_gss_validate(gd, msg, &qop)) +- return (RPCSEC_GSS_CREDPROBLEM); ++ if (!svcauth_gss_validate(gd, msg, &qop)) { ++ result = RPCSEC_GSS_CREDPROBLEM; ++ break; ++ } + +- if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) +- return (AUTH_FAILED); ++ if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) { ++ result = AUTH_FAILED; ++ break; ++ } + + if (!gd->callback_done) { + gd->callback_done = TRUE; + gd->sec.qop = qop; + (void)rpc_gss_num_to_qop(gd->rcred.mechanism, + gd->sec.qop, &gd->rcred.qop); +- if (!svcauth_gss_callback(rqst, gd)) +- return (AUTH_REJECTEDCRED); ++ if (!svcauth_gss_callback(rqst, gd)) { ++ result = AUTH_REJECTEDCRED; ++ break; ++ } + } + + if (gd->locked) { + if (gd->rcred.service != +- _rpc_gss_svc_to_service(gc->gc_svc)) +- return (AUTH_FAILED); +- if (gd->sec.qop != qop) +- return (AUTH_BADVERF); ++ _rpc_gss_svc_to_service(gc->gc_svc)) { ++ result = AUTH_FAILED; ++ break; ++ } ++ if (gd->sec.qop != qop) { ++ result = AUTH_BADVERF; ++ break; ++ } + } + + if (gd->sec.qop != qop) { +@@ -724,17 +770,25 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + break; + + case RPCSEC_GSS_DESTROY: +- if (rqst->rq_proc != NULLPROC) +- return (AUTH_FAILED); /* XXX ? */ ++ if (rqst->rq_proc != NULLPROC) { ++ result = AUTH_FAILED; /* XXX ? */ ++ break; ++ } + +- if (!svcauth_gss_validate(gd, msg, &qop)) +- return (RPCSEC_GSS_CREDPROBLEM); ++ if (!svcauth_gss_validate(gd, msg, &qop)) { ++ result = RPCSEC_GSS_CREDPROBLEM; ++ break; ++ } + +- if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) +- return (AUTH_FAILED); ++ if (!svcauth_gss_nextverf(rqst, htonl(gc->gc_seq))) { ++ result = AUTH_FAILED; ++ break; ++ } + +- if (!svcauth_gss_release_cred()) +- return (AUTH_FAILED); ++ if (!svcauth_gss_release_cred()) { ++ result = AUTH_FAILED; ++ break; ++ } + + SVCAUTH_DESTROY(&SVC_XP_AUTH(rqst->rq_xprt)); + SVC_XP_AUTH(rqst->rq_xprt).svc_ah_ops = svc_auth_none.svc_ah_ops; +@@ -743,10 +797,12 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) + break; + + default: +- return (AUTH_REJECTEDCRED); ++ result = AUTH_REJECTEDCRED; + break; + } +- return (AUTH_OK); ++out: ++ xdr_free((xdrproc_t)xdr_rpc_gss_cred, (caddr_t)gc); ++ return result; + } + + static bool_t +@@ -890,7 +946,6 @@ bool_t + rpc_gss_set_svc_name(char *principal, char *mechanism, u_int req_time, + u_int UNUSED(program), u_int UNUSED(version)) + { +- gss_OID_set_desc oid_set; + rpc_gss_OID oid; + char *save; + +@@ -902,14 +957,13 @@ rpc_gss_set_svc_name(char *principal, char *mechanism, u_int req_time, + + if (!rpc_gss_mech_to_oid(mechanism, &oid)) + goto out_err; +- oid_set.count = 1; +- oid_set.elements = (gss_OID)oid; + + if (!svcauth_gss_import_name(principal)) + goto out_err; +- if (!svcauth_gss_acquire_cred(req_time, &oid_set)) +- goto out_err; + ++ _svcauth_req_time = req_time; ++ _svcauth_oid_set.count = 1; ++ _svcauth_oid_set.elements = (gss_OID)oid; + free(_svcauth_svc_name); + _svcauth_svc_name = save; + return TRUE; +diff --git a/src/svc_vc.c b/src/svc_vc.c +index 6ae613d..97a76a3 100644 +--- a/src/svc_vc.c ++++ b/src/svc_vc.c +@@ -270,14 +270,8 @@ makefd_xprt(fd, sendsize, recvsize) + struct cf_conn *cd; + const char *netid; + struct __rpc_sockinfo si; +- +- assert(fd != -1); + +- if (fd >= FD_SETSIZE) { +- warnx("svc_vc: makefd_xprt: fd too high\n"); +- xprt = NULL; +- goto done; +- } ++ assert(fd != -1); + + xprt = mem_alloc(sizeof(SVCXPRT)); + if (xprt == NULL) { +@@ -338,22 +332,10 @@ rendezvous_request(xprt, msg) + r = (struct cf_rendezvous *)xprt->xp_p1; + again: + len = sizeof addr; +- if ((sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr, +- &len)) < 0) { ++ sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr, &len); ++ if (sock < 0) { + if (errno == EINTR) + goto again; +- +- if (errno == EMFILE || errno == ENFILE) { +- /* If there are no file descriptors available, then accept will fail. +- We want to delay here so the connection request can be dequeued; +- otherwise we can bounce between polling and accepting, never +- giving the request a chance to dequeue and eating an enormous +- amount of cpu time in svc_run if we're polling on many file +- descriptors. */ +- struct timespec ts = { .tv_sec = 0, .tv_nsec = 50000000 }; +- nanosleep (&ts, NULL); +- goto again; +- } + return (FALSE); + } + /* +diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h +index d2881ad..018aa48 100644 +--- a/tirpc/rpc/des.h ++++ b/tirpc/rpc/des.h +@@ -82,6 +82,6 @@ struct desparams { + /* + * Software DES. + */ +-extern int _des_crypt( char *, int, struct desparams * ); ++extern int _des_crypt( char *, unsigned, struct desparams * ); + + #endif +diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h +index 147f909..e07503c 100644 +--- a/tirpc/rpc/rpcent.h ++++ b/tirpc/rpc/rpcent.h +@@ -60,10 +60,11 @@ struct rpcent { + extern struct rpcent *getrpcbyname(const char *); + extern struct rpcent *getrpcbynumber(int); + extern struct rpcent *getrpcent(void); +-#endif + + extern void setrpcent(int); + extern void endrpcent(void); ++#endif ++ + #ifdef __cplusplus + } + #endif diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch index 512e934..31e9774 100644 --- a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch +++ b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch @@ -6,21 +6,22 @@ Signed-off-by: Khem Raj Signed-off-by: Thomas Petazzoni Signed-off-by: Maxin B. John --- -diff -Naur libtirpc-1.0.1-orig/src/Makefile.am libtirpc-1.0.1/src/Makefile.am ---- libtirpc-1.0.1-orig/src/Makefile.am 2015-10-30 17:15:14.000000000 +0200 -+++ libtirpc-1.0.1/src/Makefile.am 2015-12-21 15:56:17.094702429 +0200 -@@ -22,9 +22,8 @@ +Index: libtirpc-1.0.1/src/Makefile.am +=================================================================== +--- libtirpc-1.0.1.orig/src/Makefile.am ++++ libtirpc-1.0.1/src/Makefile.am +@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ - svc_auth_des.c \ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c debug.c +- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c + debug.c ## XDR libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -@@ -41,8 +40,8 @@ +@@ -41,8 +40,8 @@ if GSS libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) endif @@ -31,18 +32,11 @@ diff -Naur libtirpc-1.0.1-orig/src/Makefile.am libtirpc-1.0.1/src/Makefile.am CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in -diff -Naur libtirpc-1.0.1-orig/src/rpc_soc.c libtirpc-1.0.1/src/rpc_soc.c ---- libtirpc-1.0.1-orig/src/rpc_soc.c 2015-10-30 17:15:14.000000000 +0200 -+++ libtirpc-1.0.1/src/rpc_soc.c 2015-12-21 15:56:17.095702416 +0200 -@@ -61,7 +61,6 @@ - #include - #include - #include --#include - - #include "rpc_com.h" - -@@ -522,86 +521,6 @@ +Index: libtirpc-1.0.1/src/rpc_soc.c +=================================================================== +--- libtirpc-1.0.1.orig/src/rpc_soc.c ++++ libtirpc-1.0.1/src/rpc_soc.c +@@ -522,86 +522,6 @@ clnt_broadcast(prog, vers, proc, xargs, } /* @@ -129,10 +123,11 @@ diff -Naur libtirpc-1.0.1-orig/src/rpc_soc.c libtirpc-1.0.1/src/rpc_soc.c * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() */ CLIENT * -diff -Naur libtirpc-1.0.1-orig/src/svc_auth.c libtirpc-1.0.1/src/svc_auth.c ---- libtirpc-1.0.1-orig/src/svc_auth.c 2015-10-30 17:15:14.000000000 +0200 -+++ libtirpc-1.0.1/src/svc_auth.c 2015-12-21 15:56:17.095702416 +0200 -@@ -114,9 +114,6 @@ +Index: libtirpc-1.0.1/src/svc_auth.c +=================================================================== +--- libtirpc-1.0.1.orig/src/svc_auth.c ++++ libtirpc-1.0.1/src/svc_auth.c +@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch case AUTH_SHORT: dummy = _svcauth_short(rqst, msg); return (dummy); diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb index e321d47..8ba5475 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb @@ -11,8 +11,8 @@ PROVIDES = "virtual/librpc" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ + file://libtirpc-1.0.2-rc3.patch \ file://libtirpc-0.2.1-fortify.patch \ - file://0001-Add-missing-rwlock_unlocks-in-xprt_register.patch \ " SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ @@ -32,7 +32,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-gssapi" do_configure_prepend () { - cp -r ${S}/../tirpc ${S} + cp -r ${WORKDIR}/tirpc ${S} } do_install_append() { From patchwork Thu Mar 15 17:29:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131832 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1398015ljb; Thu, 15 Mar 2018 10:31:20 -0700 (PDT) X-Google-Smtp-Source: AG47ELsN+NreUG+//q5QYNsAbTe0qu9PI+l+Mta06K77U8ownEhZctXl4sdCfWKGrWbzAkEAklaG X-Received: by 2002:a17:902:a70c:: with SMTP id w12-v6mr8103203plq.243.1521135080737; Thu, 15 Mar 2018 10:31:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135080; cv=none; d=google.com; s=arc-20160816; b=VgWHvxNVGvk3gvpM8WZOVin3XC0CHbu+ZIGvCyQI9uU8p31CTNPjS2TCtBgFGwfRmc r9vw6jkIumF5RvU/8T5Aa8BLzqagh1thN2zTqf6fWmo6vNenKadAxzcpcQMX9zskvMhK 6gWdNBS6ajpeZ0v/T52WtjBxwgX5Mz2dorcfI/lxY3wZrvTCqaYlXMKboROc45L4sB/e o0f8o9Gz0YLrx5hyA3Yap9KkqKjk+EHOeGYtIeUqPJeoyOSm9/V+WJxcXtAPicp87x+F WUIPAOvTsi7ft8QKXhL1t7rHcBSFlz3/blsdrefsFuphQNIUNMeuQykB9XeLG765b34m gK3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=TO65HT/IXpnhvgISn9lRn1y/JxoQLsTYg4Bwua9rNaM=; b=Lu4fLxbnVa7t27A1KxmXYRWwLg8WAJp8/IWgv8ojzH3UnIK+iW4uQz3CxgLxU2kwvW GM9YYD4OLpKKMrotVAsSiCEe9OGID344BdLwNw3n/QeA3SFBM4SRNovEwidQgs+AxLX8 lIRkcb03W4j3Ich0f4ltueE8XH6F0SjNxYOaNS1gvQ6/dApz/UWqAGz49vdFxOH1qMsW 4IozE11Z6S8sIguJmyOSqWLwELg5cGQhF/C/hWC8q402mUfQFsjqSwuU8bOqLhV3MFkP kPXdmiU2Q7MeF2/aiLFzTHwXyWU548H3QnwhxoV2tc4gnF4CcMkzYBOv64JpR1mahv5U rx0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 91-v6si4406472ply.646.2018.03.15.10.31.20; Thu, 15 Mar 2018 10:31:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 782987890E; Thu, 15 Mar 2018 17:30:43 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 665F87887F for ; Thu, 15 Mar 2018 17:30:24 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEGT006070 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:17 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhh-0003Ay-VN; Thu, 15 Mar 2018 10:30:13 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:29:59 -0700 Message-Id: <1521135009-12149-3-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 03/13] libtirpc: Expose key_secretkey_is_set API X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj libnsl needs this API Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libtirpc/export_key_secretkey_is_set.patch | 24 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch b/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch new file mode 100644 index 0000000..a276ba2 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch @@ -0,0 +1,24 @@ +Add key_secretkey_is_set to exported symbols map + +key_secret_is_set is a typo in libtirpc map +Patch taken from + +https://sourceforge.net/p/libtirpc/discussion/637321/thread/fd73d431/ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: libtirpc-1.0.1/src/libtirpc.map +=================================================================== +--- libtirpc-1.0.1.orig/src/libtirpc.map ++++ libtirpc-1.0.1/src/libtirpc.map +@@ -298,7 +298,7 @@ TIRPC_0.3.2 { + key_gendes; + key_get_conv; + key_setsecret; +- key_secret_is_set; ++ key_secretkey_is_set; + key_setnet; + netname2host; + netname2user; diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb index 8ba5475..b96abc4 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb @@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ file://libtirpc-1.0.2-rc3.patch \ file://libtirpc-0.2.1-fortify.patch \ + file://export_key_secretkey_is_set.patch \ " SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ From patchwork Thu Mar 15 17:30:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131829 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1397390ljb; Thu, 15 Mar 2018 10:30:53 -0700 (PDT) X-Google-Smtp-Source: AG47ELuuHIMgrfRZITQKtcYG2TARHdoe2HSWGKTMPKP829bhmLp+C3e/kItvUG1UOjSL8fWjjvVJ X-Received: by 2002:a17:902:a58c:: with SMTP id az12-v6mr8780904plb.156.1521135053706; Thu, 15 Mar 2018 10:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135053; cv=none; d=google.com; s=arc-20160816; b=xzm9Z0UtRUaNymvTPTQ60B55b3/oZH2fP0afAoOZr+/c4VUAEO/kTWLmT8BI7gld82 637ZxsO/+3294X004pOOJGtwAkNdQeU8ZQB6xyc5iAjMbWEnRGh1oH8f0F3+vSQIzfLu h1rxRpmA+EWWkMt2cAsZiwNEXWdHQJWLdTTsyGKOPtyQgWYKIxGvD7vGL/3Imd8gs9ya Dl6bbNO2ewRC+s+yXMiuNeq2Nhc22uoA7ohOh3OyO7y3FLwSOoH7F8x5Y1NhBIvAawf6 bXrPbq9+WPHQt8B9PG/HL2doCvpYveNQbibnNSd2rZchiAeuS1Z6zitkMwri0BaMmb85 LLxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=1m6mvKm1tkLFu+V6A9xHw+RtMa7Ch3onYw5NzyYi/xQ=; b=rOMqg3wppoRSCIa2WygSNhKqORuzciTJcE4q6q0hmwCxw4vNeyp+4Uex970GjPzNvG 15CnrFgIacGC9l0A4QmrvhEcLWAkIr+rbUi0WVFtjzAzgrNP8e0OVNIhY8gkvaUl00km cITzmBjLkfEgc0qihE/D93Ix/92BFm0YEKdHqyy2Og8FC5ie2KmNKdtHSc1DUsim7ahT piCoNookDMH+iITnB8kppFhK2U7cTsl7udMIxylFK6mvtVZytOCbfYcguxYNVREVUFPQ 5Iven+POGVbDSnAUAAzywuKW/sTSR5ep3R1CPonMBB0JTTCAp9ilc94Re1ugQaJ/fOP5 tfhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n34-v6si3661919pld.331.2018.03.15.10.30.53; Thu, 15 Mar 2018 10:30:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 329B478923; Thu, 15 Mar 2018 17:30:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 5D6EC788F0 for ; Thu, 15 Mar 2018 17:30:22 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEQX006071 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:17 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhh-0003B3-Vv; Thu, 15 Mar 2018 10:30:13 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:30:00 -0700 Message-Id: <1521135009-12149-4-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 04/13] libtirpc: Enable des APIs for musl X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj Use memset() API instead of __bzero() Drop the patch removing des_* functions for musl Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../0001-replace-__bzero-with-memset-API.patch | 30 +++++ .../libtirpc/remove-des-functionality.patch | 139 --------------------- meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb | 5 +- 3 files changed, 33 insertions(+), 141 deletions(-) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch new file mode 100644 index 0000000..d2b4da6 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch @@ -0,0 +1,30 @@ +From 20badc3e3608953fb5b36bb2e16fa51bd731aebc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Apr 2017 09:35:35 -0700 +Subject: [PATCH] replace __bzero() with memset() API + +memset is available across all libc implementation + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/des_impl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/des_impl.c b/src/des_impl.c +index 9dbccaf..15bec2a 100644 +--- a/src/des_impl.c ++++ b/src/des_impl.c +@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, struct desparams *desp) + } + tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; + tbuf[0] = tbuf[1] = 0; +- __bzero (schedule, sizeof (schedule)); ++ memset (schedule, 0, sizeof (schedule)); + + return (1); + } +-- +2.12.2 + diff --git a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch b/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch deleted file mode 100644 index 31e9774..0000000 --- a/meta/recipes-extended/libtirpc/libtirpc/remove-des-functionality.patch +++ /dev/null @@ -1,139 +0,0 @@ -uclibc and musl does not provide des functionality. Lets disable it. - -Upstream-Status: Inappropriate [uclibc and musl specific] - -Signed-off-by: Khem Raj -Signed-off-by: Thomas Petazzoni -Signed-off-by: Maxin B. John ---- -Index: libtirpc-1.0.1/src/Makefile.am -=================================================================== ---- libtirpc-1.0.1.orig/src/Makefile.am -+++ libtirpc-1.0.1/src/Makefile.am -@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u - pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ -- svc_auth_des.c \ - svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c debug.c des_crypt.c des_impl.c -+ debug.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -@@ -41,8 +40,8 @@ if GSS - libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) - endif - --libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c -+#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -+#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in -Index: libtirpc-1.0.1/src/rpc_soc.c -=================================================================== ---- libtirpc-1.0.1.orig/src/rpc_soc.c -+++ libtirpc-1.0.1/src/rpc_soc.c -@@ -522,86 +522,6 @@ clnt_broadcast(prog, vers, proc, xargs, - } - - /* -- * Create the client des authentication object. Obsoleted by -- * authdes_seccreate(). -- */ --AUTH * --authdes_create(servername, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- case AF_INET6: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_seccreate(servername, window, hostname, ckey); -- return (nauth); -- } --fallback: -- return authdes_seccreate(servername, window, NULL, ckey); --} -- --/* -- * Create the client des authentication object. Obsoleted by -- * authdes_pk_seccreate(). -- */ --extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *, -- const des_block *, nis_server *); -- --AUTH * --authdes_pk_create(servername, pkey, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- netobj *pkey; /* public key */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL); -- return (nauth); -- } --fallback: -- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL); --} -- -- --/* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() - */ - CLIENT * -Index: libtirpc-1.0.1/src/svc_auth.c -=================================================================== ---- libtirpc-1.0.1.orig/src/svc_auth.c -+++ libtirpc-1.0.1/src/svc_auth.c -@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch - case AUTH_SHORT: - dummy = _svcauth_short(rqst, msg); - return (dummy); -- case AUTH_DES: -- dummy = _svcauth_des(rqst, msg); -- return (dummy); - #ifdef HAVE_RPCSEC_GSS - case RPCSEC_GSS: - dummy = _svcauth_gss(rqst, msg, no_dispatch); diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb index b96abc4..662c899 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb @@ -14,12 +14,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ file://libtirpc-1.0.2-rc3.patch \ file://libtirpc-0.2.1-fortify.patch \ file://export_key_secretkey_is_set.patch \ - " + file://0001-replace-__bzero-with-memset-API.patch \ + " SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ " -SRC_URI_append_libc-musl = " file://remove-des-functionality.patch \ +SRC_URI_append_libc-musl = " \ file://Use-netbsd-queue.h.patch \ " From patchwork Thu Mar 15 17:30:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131830 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1397549ljb; Thu, 15 Mar 2018 10:30:59 -0700 (PDT) X-Google-Smtp-Source: AG47ELv7yEoxhmQvBR6UfLr525KgPc4r34ZK4GfhTsfvrjO3aOX3rdKPd9SmMr1bskjBAQ32SAfP X-Received: by 10.99.60.6 with SMTP id j6mr7126897pga.73.1521135059578; Thu, 15 Mar 2018 10:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135059; cv=none; d=google.com; s=arc-20160816; b=GOlFs6t7ZaUlG6FA2wOKQrXoc9PG7pyyXTAkJTRn5PWt/gQ2Sf16VfalxG6QbdE1RR y0UdxoqCLuXr4yYU6EwK++sAqDWfeQL7RKZJCwSBgMesU7Xcrm5J61U8qV+CG6y+kj1g 0VnX/WP6hD7L+O6gYUMEClFBx2e2yIH1dgrl6+6+nkFUG6ABVHZ5f+vFxknePu7OyXwk lXutdVUvYIXTLXTfASEB7zlFNncc2Oi0ljpVFf8WAD7BqJSdkn0i8TEG6D3wSfZd3tO0 da6UrLwNrK3pEUTN8CO1QoxTTyVv51sEsAGGWc4hygvFksavmC8lsmbaQPTxZqvA5mIW NRGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=DBSIbIxj6QeQdb+w+gTsvRg1S+YKUEv26n49W142gys=; b=Hgb2mRyKT2ogR4/gDPnrS55RwcRgaCQ/7JIs6/+xJxQ0GJdp4y9TWKcDRtAGm3oRvF JtyHLOAszX3M0gDbf/hgon4rCkmNog9KV460oUFHmITaYuxU2FjPsGoxmi2gcUjhl7hP a/lRTFHdxOHwaVWPS1AZ3jq7riq1DpwnWRUdIRg95E42gF2RGT9tWztxaRUira1VryFY xjeJW1bv7ODbNg8vgDutELnJwHZn0vmM141usAO0SopGB2fiXRdWkgZN7MiS0z022V57 2a6Ly+FDrWLHraBc0LJVYvm6G/CK54PHPzCJwhoqftBcTcRQk3u64V2+qmNDcklzQoze QSrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u11si3695469pgo.695.2018.03.15.10.30.59; Thu, 15 Mar 2018 10:30:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 38F2778927; Thu, 15 Mar 2018 17:30:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id C88CC788B8 for ; Thu, 15 Mar 2018 17:30:22 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEDk006072 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:17 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhi-0003B9-0L; Thu, 15 Mar 2018 10:30:14 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:30:01 -0700 Message-Id: <1521135009-12149-5-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 05/13] libtirpc: Fix build error due to missing stdint.h> include X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../0001-include-stdint.h-for-uintptr_t.patch | 32 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch new file mode 100644 index 0000000..1fe9833 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch @@ -0,0 +1,32 @@ +From b80d3b573c1dade2b29b22f8acc3b9e2c7ddefd7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 20 May 2017 13:36:43 -0700 +Subject: [PATCH] include stdint.h for uintptr_t + +Fixes +| ../../libtirpc-1.0.1/src/xdr_sizeof.c:93:13: error: 'uintptr_t' undeclared (first use in this function); did you mean '__intptr_t'? +| if (len < (uintptr_t)xdrs->x_base) { +| ^~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/xdr_sizeof.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c +index d23fbd1..79d6707 100644 +--- a/src/xdr_sizeof.c ++++ b/src/xdr_sizeof.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "un-namespace.h" + + /* ARGSUSED */ +-- +2.13.0 + diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb index 662c899..5518fb3 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb @@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ file://libtirpc-0.2.1-fortify.patch \ file://export_key_secretkey_is_set.patch \ file://0001-replace-__bzero-with-memset-API.patch \ + file://0001-include-stdint.h-for-uintptr_t.patch \ " SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \ From patchwork Thu Mar 15 17:30:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131828 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1397196ljb; Thu, 15 Mar 2018 10:30:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELusELLyY7AvyClHJS5u5SN7aVB1c+PmWaFTTA7clYQkWh+lmectQ3m1v5ZxDJDeZY7uC5Sh X-Received: by 10.99.0.19 with SMTP id 19mr7420136pga.25.1521135046112; Thu, 15 Mar 2018 10:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135046; cv=none; d=google.com; s=arc-20160816; b=AeF6pRsv8wRwepYizAIg5skUmYLkKZue2W4ZDXJPH98D+i+U2bEXUpmPqdRiA09OK6 m5LlovAaPPvzlggvTYlFpwUkxNKTTPS2SYFDExxIeTflbBnbR1glDwLKROrFXrp4DYQp CkfASyv8yA/if4yBCJXk9/d+Ka7/QtxnagCTOlSkxU+TIOk+6veLN9T1Efl4NydnHbHu 28gzm1+751TDkCgp9y417zDtUuAQ6B680k/D9xmItQPnCYhtd2ygeRgjhTASS1a/eXQn xl4N9JymMMCKBFxIloHIt2l2GseoMJvty39ExDHx5VJop7/ujKGLVHwJKkZBtKMa7gkE /Wew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=Ouu9Jlv/EJwLPCN/o+oChlz7re3zy5bKc01p+5+Di18=; b=emEEYcKnBOieuao5+/i96gSbLFMhjKM3y7H++AYIoeZjfy0sJgohKmGTzK+Qv4XtL0 XJ8RGRWTJMBi/dATjHXfrURpfWs88zriHRbp0zUB7U7rfuYcrQRmFlk1sOLhrKy4Ljgz 2Cyh/8C82Dkhf0WUyYb9oGN/Ccw+je2Adjm6dr4YvjgMMkDKdCwpibgKD3AkLDnN5Qnc meJUNlL+9F64dw0LHp5d5R+/1HvsEjSARIulGyHPEl/9jeL/Fw8fnW7yxjhISDYJu+56 rxmf1COz+m9QFmLxKHo6wwMf7D+dfewm9QGmxy//HBCCFJtWrLNoolSEs9qrH5Y3GQP/ bynQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b1si3687596pgf.657.2018.03.15.10.30.45; Thu, 15 Mar 2018 10:30:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2DA4C788F2; Thu, 15 Mar 2018 17:30:38 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id EEEC978891 for ; Thu, 15 Mar 2018 17:30:21 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEb3006075 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:18 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhi-0003BR-2F; Thu, 15 Mar 2018 10:30:14 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:30:04 -0700 Message-Id: <1521135009-12149-8-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 08/13] libtirpc: stop dropping in NIS headers X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Ross Burton libtirpc prior to 1.0.2 assumed that the system provided nis.h but this isn't always true. Until now we've been using a tarball of the missing files from Gentoo, but libtirpc 1.0.2 added a copy of nis.h to the sources so this isn't required anymore. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb index 94fd5f9..07e4c79 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb @@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ PROVIDES = "virtual/librpc" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \ - ${GENTOO_MIRROR}/${BPN}-glibc-nfs.tar.xz;name=glibc-nfs \ +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://export_key_secretkey_is_set.patch \ file://0001-replace-__bzero-with-memset-API.patch \ file://0001-include-stdint.h-for-uintptr_t.patch \ @@ -23,19 +22,13 @@ SRC_URI_append_libc-musl = " \ file://Use-netbsd-queue.h.patch \ " -SRC_URI[libtirpc.md5sum] = "d5a37f1dccec484f9cabe2b97e54e9a6" -SRC_URI[libtirpc.sha256sum] = "723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5" -SRC_URI[glibc-nfs.md5sum] = "5ae500b9d0b6b72cb875bc04944b9445" -SRC_URI[glibc-nfs.sha256sum] = "2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83" +SRC_URI[md5sum] = "d5a37f1dccec484f9cabe2b97e54e9a6" +SRC_URI[sha256sum] = "723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5" inherit autotools pkgconfig EXTRA_OECONF = "--disable-gssapi" -do_configure_prepend () { - cp -r ${WORKDIR}/tirpc ${S} -} - do_install_append() { chown root:root ${D}${sysconfdir}/netconfig } From patchwork Thu Mar 15 17:30:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131827 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1397021ljb; Thu, 15 Mar 2018 10:30:39 -0700 (PDT) X-Google-Smtp-Source: AG47ELu79AIRzJQJys1zGHfy+dsPliAOxpzzSsdR293bY3vggot+4l+N39c9Cu4DKOH/F8bPC74p X-Received: by 2002:a17:902:20e6:: with SMTP id v35-v6mr8979466plg.226.1521135039515; Thu, 15 Mar 2018 10:30:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521135039; cv=none; d=google.com; s=arc-20160816; b=mc/D+Ugp+u3W/3YuDCOVMqqw5cjCu3+Rdd9Eq6pERAQMjV6ScghZdiFPKMwenVbGr+ QSZInoLRFJanInoQyxb93p+ofxEjnqFcve9/BwtAU2mditoLEqaKZsSj4wpKF8r+zTc3 usa+u5Odw9D6Jb/vU4gUIACRk/iXHR5jmFx+0zF+SIUhuxfaY/vweNg2J2OThV+22drC ZItmfxKZGRQhKPlJifxDnTUABFRBg89LRqPLDYcJNI9RmYeBk/u9zcLKU58q/sqfDCWO 8oNbDuFomvgopAjastCO39UO7kTydTtxM724DHQhlZFvNGoX7MKc8HixwV5WMtOHnj8N bUDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=lg2FChDF7vGR3I21HCPCMrCFEEIDDt81NaXN6SLAo6k=; b=NPZqPemCVEJAlB4SJPOKUBAgXDvRgqXr1r1lGWj6Qw5nwPyAoNtSPhypxSMD45Jt4p 06KppeQ1YMbcfKiWlWQy5Ze956RDtXC/Opds9Jh8yfKDvKet8J0p6R//QPgyL1MdBwHS e899hXgq1iRZRgnYvX19J416tmI92qlbBYnStBXZqelOrQ/agSFq2uqZoXE0V3EymS3m Q24KbrJNRAGLYoLb8awB8r9yyw/ac9IBn2vVwcFBWedRPgFWK/46oJdfhv+kYszUlI0U I6MaQn7g0GWX/Tq8UbygTUlJRFLxgJMU2EUNAq2wLVntKr19NtGgQybqSmQye8IXXSIH IHkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a3-v6si4282406plc.370.2018.03.15.10.30.39; Thu, 15 Mar 2018 10:30:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B3EFA78913; Thu, 15 Mar 2018 17:30:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id A808478891 for ; Thu, 15 Mar 2018 17:30:19 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id w2FHUEBl006077 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 17:30:18 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewWhi-0003BW-2o; Thu, 15 Mar 2018 10:30:14 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 10:30:05 -0700 Message-Id: <1521135009-12149-9-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521135009-12149-1-git-send-email-richard.purdie@linuxfoundation.org> X-Virus-Scanned: clamav-milter 0.99.3 at dan X-Virus-Status: Clean Subject: [OE-core] [morty][PATCH 09/13] libtirpc: Extend to native and nativesdk recipes X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb index 07e4c79..cea2338 100644 --- a/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb +++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb @@ -32,3 +32,5 @@ EXTRA_OECONF = "--disable-gssapi" do_install_append() { chown root:root ${D}${sysconfdir}/netconfig } + +BBCLASSEXTEND = "native nativesdk"