From patchwork Thu Mar 15 13:40:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131782 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1136410ljb; Thu, 15 Mar 2018 06:41:13 -0700 (PDT) X-Google-Smtp-Source: AG47ELteLcLVo35IttG7G/V6XV1ThXHa5DXQvZ2HE+LGBmyEqUuIRpBoqTU+6zXBFV9DaLl3Hfv/ X-Received: by 2002:a17:902:32a2:: with SMTP id z31-v6mr7994885plb.32.1521121273003; Thu, 15 Mar 2018 06:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521121272; cv=none; d=google.com; s=arc-20160816; b=i2YrtvsrnZxLPt+kJ0KBBS6vYZlIp3zCtgJ03cP1PeR9FWCSXotAF4VvCHGOX66+AT q97ZavVocQX2tkbwZ3SkIrKVLhMkHkVK7eTt4JH9mhI6F47SbH1b6wO3EtMMNbZDUbsm +iyHlXIldgin3c+aNSVAe2NFA5vbUrAbecqKml0pP9VEqU7JzOL0TlNQknGb3m1IXkj7 U4iZxrzHDJ1X7cwIrSr9Mvf3msZgFhhX90NYiW4G+Q5lSgAV0jvRdio7qbKf9BsyZSmT 1XtSx4B9dSXk2lMknKxyeJxWH1diqQpGEOfeum8fQlDNU7t3hvXZ/4O2tmB5uFRCa/N2 uiGw== 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=G36wMe8Sgu/z3Ld5qDSlf2nHdsA4O7Gk+uYn7ote9rE=; b=NaWSLj3PqspySAiGc4gUCifgb+rJ21T2jhQL2NWfSglj8QTsCeBPZdchpYauAf6Eha 5EDsL0WRp0KDzsTd/NsIcI9e39fY5e1gVZplOupp+i5mIBI0hyWTPnGMS+8tl9r5hzaB ZVV2ahxK5a7hWcxeBAPV1WDkKPuWOEW4crwJrmJVFfxvf8V1mtvJDJO8GGK/yFaffPFD xlsQMHdTll5eiLTeJrTWqSJjZCm+avgUUz1XHq22dwboHu7hsgDj+wIZn8EIAN1WtRoi M7PIm+7Z44ZX7diczIfquTyLyq9bNdrWyeovao4KjX+I5vX39HGG/khhLb6/XZMMTpkn iMIw== 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 h13si3147836pfh.182.2018.03.15.06.41.12; Thu, 15 Mar 2018 06:41: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 A37CF788BC; Thu, 15 Mar 2018 13:41:10 +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 9FACA78824 for ; Thu, 15 Mar 2018 13:41:08 +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 w2FDf49j016284 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 13:41:07 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002QN-CI; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:50 -0700 Message-Id: <1521121262-9269-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] [pyro][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 52aa17e..8a76e5d 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" # Only subversion url left in OE-Core, use a mirror tarball instead since @@ -25,7 +27,8 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/trunk_svn.code.sf.ne 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] = "2e43e471c77ade0331901c40b8f8e9a3" SRC_URI[sha256sum] = "21009468a9ba07b72ea93780d025a63ab4e55bf8fc3127803c296f0900fe1bac" @@ -33,7 +36,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 13:40:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131786 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1136874ljb; Thu, 15 Mar 2018 06:41:42 -0700 (PDT) X-Google-Smtp-Source: AG47ELvhxNi/vEJiDEmIjlrxgiQfpe0wUSEpYeUd+D/5kYWsdycemn3N0uSkd/KiFaX2kAsshHrd X-Received: by 2002:a17:902:d694:: with SMTP id v20-v6mr8160201ply.34.1521121302081; Thu, 15 Mar 2018 06:41:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521121302; cv=none; d=google.com; s=arc-20160816; b=wz5svMtWgBLB4M7ibwnHliGE8YIhgs1/mAjtsepYJPX6j05+Ql14HPhCtHaXeBxhZL dhiV7X+IYfp4pB1DnT9TpgCdEKqnOwQXYqLAxfroJODo4KOFj3lqQctXRlBy4KeYVrFw kCZTB8aMXY3UnVCRTIXDdUpD1NyxH7No4pVRVGuoiVstBGxYLNG0ui2gZJ7GJg0sqigu h+TCPz/iof0V9695mSemqm+FXm+GBE/QoQEuk6SC/z3SIK94CyNAO2O/fC9HWlD0U+sD IcFH15NEiO7iwF9f33pf1Y3DHLext7B89DcHel/HbN4tO1M7UUb8FzHtzFfWOY0Sy7/a PE3A== 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=Vh6Wn7//qP0R2l9qFcMe5gamsZVwNWqSjbFOsx4avJK3U1L97XAr7N1hJuvf15Cc0G bHSk+RJSs8u9TWOEzJOGQlSDLBt3ql2zd9HaZNfU1apGoebGFVcraZRfpvk5y5ROITB9 qPtB+tALWAoYMt8uea2ZklsKgUIRnslN3Bn/8KXc8LBOjRwJODKUY/lRgPE7Y4LRLyng X6ItISHmzo0e9HG534fPkIhTsAYqulOD+n1g0eM9o4GkdaT+rnxcujhF2a9EB5C+t4gD laFH454jmaxPGXoyz0HtWDEKsrPbOUYQwlOD8wZLucTcS2VoZhZiGBYpwB9Kh+DyXlGI QUZQ== 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 i12-v6si4050720plk.508.2018.03.15.06.41.41; Thu, 15 Mar 2018 06:41:42 -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 485DA7890A; Thu, 15 Mar 2018 13:41:19 +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 0DEA2788EE for ; Thu, 15 Mar 2018 13:41:12 +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 w2FDf438016285 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 13:41:07 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002QR-D0; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:51 -0700 Message-Id: <1521121262-9269-2-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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 13:40:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131783 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1136528ljb; Thu, 15 Mar 2018 06:41:20 -0700 (PDT) X-Google-Smtp-Source: AG47ELvCDCQGFbbQ2Df5Uc5VzTqErJi1BA4TysAHyM/CItdC7CG4M9ugOEJFO3w3Z38GRNvsBTYu X-Received: by 10.98.61.73 with SMTP id k70mr7804303pfa.10.1521121280757; Thu, 15 Mar 2018 06:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521121280; cv=none; d=google.com; s=arc-20160816; b=B8WNzE2C1aFRvwYaXvxXjuQH3SzPVE44wUzelGL1DkV/wtGull5z8JaOPlMQIJ5u2Q 0h1wW7I8ZBrzP1RBGCUU6cobg3VMUJqgvQNDah4hlxLW5ZqoOfq6n3Wbb46vmtTnNmtX 2IAgfF8hvCKroAhDyD6pfV5zKeyydMAzjNY2BwxArGKeZi7XQYemCtngvNOg01GSev9b 6eoEzsjcSDgtyXEdzs7DSUN3/dRYHREL7GooKfXjusKbna4mCZLEQ5X2vkBs1uMTJdDS xR7gLPfvlS1sG8wbeB237FRMQFIkg2AltpNYcINkT6UmmF0mZoA1Au9OQVwY43VMvs04 3W/w== 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=SxIPs651p99KjfoR+X+mJ36Bj4QzdEjT8nsEdk0H3YVLI1okwyCBPIjdZiIDIN89sk g1oPKvO5qcBJBbnl9z1zyNoDrFeMBhCNUiWjvOF+P1dzPBicd6pFPcc495XM77vfQ7Jl zlgZzIuyVkmcowaA+uWns96dVso+gBphs9w9W5nQxvam09C+cSqVsQFlDFRuCMRUygj5 zftsQPgOiS2r8gQYPIxDRt3uf3ENT7oCQPVqpbHie1W4Ua6wMHb0xHnJnjnWPRlP9MkA KvbTEjL05kG14Ua+/XyyZaDcVdvCHkvWUPVFBucoYE5kwAbQ+fAt8m5F5Dwp/DRAWcoD zLjQ== 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 k11si3470781pgq.0.2018.03.15.06.41.20; Thu, 15 Mar 2018 06:41: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 EFFAC788F4; Thu, 15 Mar 2018 13:41:14 +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 CE8C0788CC for ; Thu, 15 Mar 2018 13:41:12 +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 w2FDf43E016286 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 13:41:07 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002QV-Db; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:52 -0700 Message-Id: <1521121262-9269-3-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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 13:40:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131785 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1136767ljb; Thu, 15 Mar 2018 06:41:35 -0700 (PDT) X-Google-Smtp-Source: AG47ELupOSfsv1d2Isvcf6/Ivu9JBBFqLpFUDx50aGouWwxXoudZc32WGdy2Xt0lnbk7yZIZ+6am X-Received: by 2002:a17:902:720b:: with SMTP id ba11-v6mr8099274plb.148.1521121295356; Thu, 15 Mar 2018 06:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521121295; cv=none; d=google.com; s=arc-20160816; b=s7XWBgHzGTR1gLO5XfhM0sM2rMl2MjfAKAUAYUbXLHb4L/EVcf+A7PkkXTcIKA76lS Z65q9jMANjhiSz9JrxZRotdl3N3pwm10o8q2RDFlypfrX6yA3UKmCnap8xOnP1VyF0tp pkkIxFthqSVxoB9uwmMBRywTOwiN1ihBZ1YP1zRdWFmt7eAZTF8pXfaXoDsZjUHYztSw dm4JtrHAK1fL/H90M76RgzUPkFZT7dOgFoIKGyGa7sRSpKkSeOm9zjK7djE9ZT5yHHtJ 4HyiD0D5g2+OTx3OhHanAX3H7kXVMkGIMVEC7kaCwgn/TIFzAdQni9N6eJ6iwBSKBmy1 gi+w== 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=Axax1RI+xl5k5UNwG91kA0KfpB9mXkfsJLRjsArPvv7jCwNf7LQQoo8j1XDDEtd5D8 W656U5ecvuX2WOr7mtR3LFF7woy8ZRH3HbcDGc3VxaHGE9vPF5hlIma6OSgSiXsMz7uj ZCIpetctbgg3Fh+sHdoeizQoQIYhqlPTXzAwAiVVkwIYAoysLtvbhjos3qsWOz7eUEMS ZV8LucywdijDXXIDR7mdpDPvfU3cciJxq8Mcw1aCFn6pwiXv/TD8BY6YE/0afhz16uIA NvfdyJr+1+OAaNTH2DffFSUxQR1MuhAVAjvbn8oIEw4ZUpo7eRs/+A2J0RsFixhYXaki 1ZTQ== 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 a8-v6si4050114ple.435.2018.03.15.06.41.35; Thu, 15 Mar 2018 06:41:35 -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 328BC788FF; Thu, 15 Mar 2018 13:41:17 +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 D018E788EB for ; Thu, 15 Mar 2018 13:41:12 +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 w2FDf4tq016287 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 13:41:07 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002Qa-ER; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:53 -0700 Message-Id: <1521121262-9269-4-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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 13:40:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 131784 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1136666ljb; Thu, 15 Mar 2018 06:41:28 -0700 (PDT) X-Google-Smtp-Source: AG47ELuCX1FVR0DZO1FWgTiALAZm/M606unTTRqFkk3xf+xQ4iCSylHIiuk9I46U381bSaZc9iVB X-Received: by 10.99.170.73 with SMTP id x9mr6777060pgo.393.1521121288431; Thu, 15 Mar 2018 06:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521121288; cv=none; d=google.com; s=arc-20160816; b=VcbqR1P74Qp+QrmwcC9ODO3WRRSd18M5qzeTc1N2LfmcENILHSj6gbkpiH1KiAWXvG Ks+d2CbcvigXBWiwb3NCZIsLOtOYEzEthXYTnk6ynwOdq0kBC0tdsVAafvpSpCnoj3IL nKK1YYuIiIuluCvWrnDw0ixdBz8JjgmjQHDW5SYgllpBp3RdKFcjmPeblxzIXu3whgX6 F/btxBH/PRa2g3nNkB1G4y7oD7UdePHCEkwclExO8SzDPhRSBY/iium8lzKp2MxqMYYG 1S5Mhqz4GuCj9mRXy5msRsTnSF8yVCcXHfhpP7uAvZ3OFYVWzuE6Wgk/Lfdpd4p/nfca +C+w== 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=mxxq87GqJUobiRO3cNhHWYZTtTsBGsBuXEvYMZQStkPbjEepYW0nY8LqbTBx8jM2FL L2S0jlogVRFRnXM8kWP71W5f/XeF9MbRAZ8R9rPWi7v59iyNdt6vFaZucARX8mVZ4EdN yzG0Jx7hRPMiSXejNqupGtfeIjZbCmnGJQbvBjIVfXctULcRL6p8uR8QFWHP7+ZrZVMo 0tGJOOmvalw4MaFiPQRze5HUMPQrtsQScGjD4/KaUPcYA11hrpbw5SvSLxddraB33ZNL gqEmz+FKJ4Uzkk3837x0Cry2OOYqYSZlb+RP3WrVzbhxAs93klSJnt8f1gNpNZV+4+8F NOPg== 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 u24si3785663pfh.326.2018.03.15.06.41.28; Thu, 15 Mar 2018 06:41:28 -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 20DF7788F8; Thu, 15 Mar 2018 13:41:16 +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 CCBB1788C9 for ; Thu, 15 Mar 2018 13:41:12 +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 w2FDf4oX016288 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 13:41:07 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002Qf-F0; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:54 -0700 Message-Id: <1521121262-9269-5-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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 13:40: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: 131792 Delivered-To: patch@linaro.org Received: by 10.80.210.197 with SMTP id q5csp1521254edg; Thu, 15 Mar 2018 07:06:38 -0700 (PDT) X-Google-Smtp-Source: AG47ELueKLMeqngr/OI4gqz0yT22DOYHXfC/1D/PM6ypR/D5GMfo+w6pj+rKfPxe3S09F4anXlpF X-Received: by 2002:a17:902:b683:: with SMTP id c3-v6mr8127274pls.154.1521122798054; Thu, 15 Mar 2018 07:06:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521122798; cv=none; d=google.com; s=arc-20160816; b=k+tsPpSAKOAaOkIYrL1GuTPrY0rfUK5cPo5AoIKmhUcNeOeAmTCfxxURol2V83orHU aZOU2I2Eqtq268lvaDCivz3Ym3MtV8MrkGYIuAdujcjKQAGom98taFfPG9x9IhryK5ir X9ypam7SMQGRyZLlQ4QDbf24BJlCkRbbfEnd9twG1HuFX91oXATKSotePIkv5YSz8BNE IZU+bo0wAurRO3KBnH9zrjgI2WL0uylh0O2KPMwggOBUwttGtJUUFBgs5zoh99f9J5nj AvXDMwTdo6lHfsXOSf4ZdHLXn1dwwH1SUH50cNO802KXLXnbequz/PTXVbmeZqF6pJQk 8aag== 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=mAdre4kPzWz6klFPk8RJiERldPphZT0swggh5JH2gNhPPCSZZJ84oKBEN6cvPzNVqW rDu6t4vYQzUXFWOyU9u6kgFVtsNLYhI7aItF5lBPPw5us1eEkHDpL5dxLnhZePH0KdWJ HUvpTqp8C8Fzgm1e8dJ092DSOyP5IMjxXexahvcfiQA/W0lMfFMAoHGfJGc3AmRdzoLm ovvQiRZHEjD7HcPgE5Gf7URvWPTk+qbg968lZOUPJjyG5vbTV84kCaRHVZ/xm0ouY6HE rOQtmYYOMgtE8lmYek/GZYf13JkHWQ+bAZm9ZwvrKcJ0VpZpD3NKVqlpA7R2lrolZTDt Q+Og== 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 w3si3429889pgq.415.2018.03.15.07.06.37; Thu, 15 Mar 2018 07:06:38 -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 10FB4788DC; Thu, 15 Mar 2018 14:06:29 +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 9ACC6788D5 for ; Thu, 15 Mar 2018 14:06:27 +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 w2FE6MPX018563 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 14:06:25 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002Qu-Gy; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:57 -0700 Message-Id: <1521121262-9269-8-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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 13:40: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: 131790 Delivered-To: patch@linaro.org Received: by 10.80.210.197 with SMTP id q5csp1520705edg; Thu, 15 Mar 2018 07:06:15 -0700 (PDT) X-Google-Smtp-Source: AG47ELuqwC7WFoelhfQKP0WJ8Iq9NGaP1mccDW4QJdgpgID8Q5wW9lUZyNhZjr8zAP9VUP+SAWG4 X-Received: by 2002:a17:902:d892:: with SMTP id b18-v6mr2966580plz.241.1521122775052; Thu, 15 Mar 2018 07:06:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521122775; cv=none; d=google.com; s=arc-20160816; b=0YqysQ4ik1fvMYKni2ECvv68Kr+h/pMMEYc1u1nbui63NtxUlWjoEKYf0YQG9PHrWw ciI/zuVgaZiWb9OLOp7FU0jcVImVN18ME855G21k6vEKmBmWxQA3cgF/28bkINcxuxPa f5TZZQ/1nclgMm6mio1JodJDMwrl51zHrqHTajiJd1XZdboeLP7DhzVV6Y6J3XL90imq 70UusPwfp41nSJFPiXPQIDwY/vCGAF2h+KItgDbzg7gWGZUVtL5RL8kp7OaE+sIOqQbI ORk/E5KX+C9P3HVQERqtlZKsGTqcYkpHHWjzFiAxmOolFNliANJidR979gzF6B+A3xL3 bKyg== 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=YILxXSb6PeiN0//nL5ApgL58Cndydd0W7LswyX81dpQFuO8IS/rQBm1SXI6aK3MkT3 otiiyfqyEHBYTNBJQ5SE2Uutxfhp6s+XlXeKu1Nu4D6IZpYjqrGkj7rvDYJgLRJajv5g Gs7Jwu5FyVXeQ5bbrL0PaLkkE9WSv61p5OfZWvtf875t3VBLZVhWvPZJV43uON/8HePI NJqB6EbnDxETLhyE04U9wAAQ1pcBSJl8Ejld7vd+WjtIEw3AeoU26ynDTDx6b7LsO6iV UnDnhhgCGRcDtAFLRmJj/1RKvuB4lOlKNIKeT5sOxEwt33TOjtz/xTT5jMJohW/tA0H7 F3hw== 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 t4si3843756pfh.290.2018.03.15.07.06.14; Thu, 15 Mar 2018 07:06:15 -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 B6654788CF; Thu, 15 Mar 2018 14:06:12 +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 6B40A788B6 for ; Thu, 15 Mar 2018 14:06:10 +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 w2FE66Ww018537 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Mar 2018 14:06:09 GMT Received: from richard by hex with local (Exim 4.86_2) (envelope-from ) id 1ewT7w-0002Qz-HZ; Thu, 15 Mar 2018 06:41:04 -0700 From: Richard Purdie To: openembedded-core@lists.openembedded.org Date: Thu, 15 Mar 2018 06:40:58 -0700 Message-Id: <1521121262-9269-9-git-send-email-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521121262-9269-1-git-send-email-richard.purdie@linuxfoundation.org> References: <1521121262-9269-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] [pyro][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"