From patchwork Wed Apr 19 02:10:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 97588 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp113517qgf; Tue, 18 Apr 2017 19:10:59 -0700 (PDT) X-Received: by 10.99.53.207 with SMTP id c198mr534390pga.182.1492567859863; Tue, 18 Apr 2017 19:10:59 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h64si891824pfh.8.2017.04.18.19.10.59; Tue, 18 Apr 2017 19:10: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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AF8BA71B04; Wed, 19 Apr 2017 02:10:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by mail.openembedded.org (Postfix) with ESMTP id A15EF71AC9 for ; Wed, 19 Apr 2017 02:10:46 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id 34so1724313pgx.3 for ; Tue, 18 Apr 2017 19:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=h5y8OUEJprVzE+e7YpNyYSMByd3BdUUubRi6Zzu1Tuw=; b=VeZFI/7XGKLkgbjQ5WGBV0wtWnUd491ouMX6luzwxC+4e48hJD+R8FDu9LZ8DOPT6P +NdUNHYwQv8HHPOxBBvycxKs4Cm4/Wcy2lZM/ApLT6y8layQKaGHSbJlI8S5bxB5lZ1x 2YwUNX+l4jR5GE0s4EohJLAFilGgFFKMAHhedOTFiquPAodi/RAMyBMjREEIHEDfLASJ hnsjyBc6LCJDApiXhNmwA6KQ4vKtCfCjqqfcqKSliwIkV+jYrLj8XKA/VdqmmMD9zjAP aeBUgQQTAT8UOZhLR7cOIyyILZ1tIGHerj68slQqZ+dilMjwdh5RZFHP6zUjvUPJF9YR c7rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h5y8OUEJprVzE+e7YpNyYSMByd3BdUUubRi6Zzu1Tuw=; b=T0HcE6o3+syePuYIT3spbagHlkjCYAVV7tGiLepXXlaFEB+jVgUgJOSSNbpEnl4vyu L5f79avoKA1BTgij1E4tZH0GFktWKO6feCCW9yhJFI+b4doWyGgb59rBmim3k8KNOEpn UdzKAlLF4iPVC92sBozeTBQjhFPSJgsc0SUsUW94imawhHfU9VWVkPUsd7VtWponWILq HLOaeZmEZNm0+EwUTSG+QRNtMu+XRmxQ+d+t44Tak42w52qLlwitb9PSazKbe2gzKTpT PhVOOENjw+vMlgawVqP5PvSb77vQnKrAvx/ST+cKPhmh+QXGM5MxJGuBPB3dhJogGKQj p4Tw== X-Gm-Message-State: AN3rC/5LDOoAwasP1B0091qEmf6u8q3MiXsF0reheYAjZCUc+3oJ2MTk hqcnYk8oH5uuSFrm X-Received: by 10.99.181.18 with SMTP id y18mr528280pge.192.1492567848109; Tue, 18 Apr 2017 19:10:48 -0700 (PDT) Received: from localhost.localdomain (c-76-102-32-192.hsd1.ca.comcast.net. [76.102.32.192]) by smtp.gmail.com with ESMTPSA id f124sm814242pgc.43.2017.04.18.19.10.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 19:10:46 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 18 Apr 2017 19:10:37 -0700 Message-Id: <20170419021037.2685-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.12.2 Subject: [OE-core] [PATCH V2 3/5] 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 Use memset() API instead of __bzero() Drop the patch removing des_* functions for musl Signed-off-by: Khem Raj --- V1 -> V2 - Add missing Upstream-Status for patches .../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.12.2 -- _______________________________________________ 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 00000000000..d2b4da6ae2c --- /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 31e97744cbb..00000000000 --- 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 b96abc4d57e..662c8999c20 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 \ "