From patchwork Fri Nov 16 17:12:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 999096 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jVkaOhS7"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42xPtj59ZRz9s7T for ; Sat, 17 Nov 2018 04:12:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 09451883E0; Fri, 16 Nov 2018 17:12:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FBAwU7uEt-Un; Fri, 16 Nov 2018 17:12:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 378A6883E1; Fri, 16 Nov 2018 17:12:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BC9CC1BF29F for ; Fri, 16 Nov 2018 17:12:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BA23D2624B for ; Fri, 16 Nov 2018 17:12:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uUpvpqxvtHCj for ; Fri, 16 Nov 2018 17:12:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by silver.osuosl.org (Postfix) with ESMTPS id B496A261B1 for ; Fri, 16 Nov 2018 17:12:36 +0000 (UTC) Received: by mail-ed1-f53.google.com with SMTP id y56so7687554edd.11 for ; Fri, 16 Nov 2018 09:12:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rQZylQS3tbUTnyAud/1jsoMzZWfFtdkVunExDHyi0j4=; b=jVkaOhS7tRVgiM+91YAQmpX9XReQ6CbI9GAPdxWrm/dLSJsn+Ij9lsMtNBsVNacYVS AgkiqYfEjNkG6h09ROm9Bt/FaY3+P0JoxY0sg7k5uB/nlYDg9iG7VJBEGMSkX2HqfaNN OPXiU6m9ZotuuHRquOWDXnpDwrTI4R4RDZJeM7d3Jpumw6HaYSjloxQjNWF9+xyxzlB7 F8fq+XSX8UWRVrN+q3uyPP22PrKt97AUlnOF2Z2BxO5arBbFijsMFOdpIRTUEATpNoc+ /litrbaEcTEMdNqP7W1ub+fR6g03bsrsa4FdlI5wKGlugxpCv00g6wLE26JkPbOAQkoL +/Qg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rQZylQS3tbUTnyAud/1jsoMzZWfFtdkVunExDHyi0j4=; b=PB254AgSkrabGD67Seqfp/NUAbk7c17TYS63XWaI3nniu2w08PsLoeZc8OrZC0GRks BNFy21XpOfzQh9cMyXgOdaiBxGaLRxe3NUvTGeKGvKqZv5y1JkZYOtv6dcmKTYzIjCN5 xl89ejiFLIau6dQvlyvRcox06ZjaqpNXdv3sxZpOlNVce8QzcPFrOCNdkCTJSgAiuuU9 L2Ek899Qqy3a898eASx1Ap+g71mIai30znEEDHU3wlc7CTI6Q4J8uQf8BFkBgxP8QbUo lZyLTanxZs83jauzn6+GeLHzhiMACI/q8EchCGckBmRSwCZq5d/9+rI0k1ufESI/PoA2 hzEQ== X-Gm-Message-State: AGRZ1gJHQvkZrzhJGPdkwve7ziT50yd+1CAIecnH09Gmo76MVp74vAzA bWGs6jbnHS2xImH02lugmulrWtjS X-Google-Smtp-Source: AJdET5cKjDWS9XXYWA0BsB+wQPy9roqDA8GL0Bg3vAcuioigazfrZa7I2nKU+2JagXP6YreI7e6yFQ== X-Received: by 2002:a50:d712:: with SMTP id t18-v6mr10678377edi.75.1542388354739; Fri, 16 Nov 2018 09:12:34 -0800 (PST) Received: from dell5510.suse.cz ([62.201.25.198]) by smtp.gmail.com with ESMTPSA id r46-v6sm4380516edd.87.2018.11.16.09.12.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 09:12:34 -0800 (PST) From: Petr Vorel To: buildroot@buildroot.org Date: Fri, 16 Nov 2018 18:12:22 +0100 Message-Id: <20181116171222.23391-2-petr.vorel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116171222.23391-1-petr.vorel@gmail.com> References: <20181116171222.23391-1-petr.vorel@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] libtirpc: Fix whitespace on 4th patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Petr Vorel --- ...es-needed-to-build-rpcbind-on-top-of.patch | 78 +++++++++---------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch index 7f53ffca16..797fb7a42c 100644 --- a/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch +++ b/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch @@ -22,16 +22,16 @@ index aa5908e..4999066 100644 +++ b/Makefile.am @@ -2,6 +2,9 @@ SUBDIRS = src man doc rpcgen ACLOCAL_AMFLAGS = -I m4 - + GENFILES = tirpc/rpcsvc/crypt.h \ + tirpc/rpcsvc/mount.h \ + tirpc/rpcsvc/nfs_prot.h \ + tirpc/rpcsvc/rquota.h \ tirpc/rpc/rpcb_prot.h - + noinst_HEADERS = tirpc/reentrant.h \ @@ -11,6 +14,9 @@ noinst_HEADERS = tirpc/reentrant.h \ - + nobase_include_HEADERS = tirpc/netconfig.h \ tirpc/rpcsvc/crypt.x \ + tirpc/rpcsvc/mount.x \ @@ -53,23 +53,23 @@ index 0000000..f68a06f + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. -+ * ++ * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -+ * ++ * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. -+ * ++ * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. -+ * ++ * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. -+ * ++ * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 @@ -101,13 +101,13 @@ index 0000000..f68a06f + * or a directory. The file handle can contain whatever information the + * server needs to distinguish an individual file. + */ -+typedef opaque fhandle[FHSIZE]; ++typedef opaque fhandle[FHSIZE]; +#ifdef WANT_NFS3 +typedef opaque fhandle3; +#endif + +/* -+ * If a status of zero is returned, the call completed successfully, and ++ * If a status of zero is returned, the call completed successfully, and + * a file handle for the directory follows. A non-zero status indicates + * some sort of error. The status corresponds with UNIX error numbers. + */ @@ -203,20 +203,20 @@ index 0000000..f68a06f + void + MOUNTPROC_NULL(void) = 0; + -+ /* ++ /* + * If fhs_status is 0, then fhs_fhandle contains the -+ * file handle for the directory. This file handle may ++ * file handle for the directory. This file handle may + * be used in the NFS protocol. This procedure also adds + * a new entry to the mount list for this client mounting + * the directory. + * Unix authentication required. + */ -+ fhstatus ++ fhstatus + MOUNTPROC_MNT(dirpath) = 1; + + /* -+ * Returns the list of remotely mounted filesystems. The -+ * mountlist contains one entry for each hostname and ++ * Returns the list of remotely mounted filesystems. The ++ * mountlist contains one entry for each hostname and + * directory pair. + */ + mountlist @@ -273,8 +273,8 @@ index 0000000..f68a06f + MOUNTPROC_MNT(dirpath) = 1; + + /* -+ * Returns the list of remotely mounted filesystems. The -+ * mountlist contains one entry for each hostname and ++ * Returns the list of remotely mounted filesystems. The ++ * mountlist contains one entry for each hostname and + * directory pair. + */ + mountlist @@ -308,7 +308,7 @@ new file mode 100644 index 0000000..01564f8 --- /dev/null +++ b/tirpc/rpcsvc/nfs_prot.x -@@ -0,0 +1,1266 @@ +@@ -0,0 +1,1265 @@ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape @@ -316,23 +316,23 @@ index 0000000..01564f8 + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. -+ * ++ * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -+ * ++ * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. -+ * ++ * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. -+ * ++ * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. -+ * ++ * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 @@ -413,7 +413,7 @@ index 0000000..01564f8 + opaque data[NFS_FHSIZE]; +}; + -+/* ++/* + * Timeval + */ +struct nfstime { @@ -455,7 +455,7 @@ index 0000000..01564f8 +}; + + -+typedef string filename; ++typedef string filename; +typedef string nfspath; + +/* @@ -529,7 +529,7 @@ index 0000000..01564f8 +}; + +/* -+ * Arguments to remote write ++ * Arguments to remote write + */ +struct writeargs { + nfs_fh file; /* handle for file */ @@ -694,7 +694,7 @@ index 0000000..01564f8 + opaque data; +}; + -+/* ++/* + * Timeval (v3) + */ +struct nfstime3 { @@ -1448,28 +1448,28 @@ index 0000000..01564f8 + */ +program NFS_PROGRAM { + version NFS_VERSION { -+ void ++ void + NFSPROC_NULL(void) = 0; + -+ attrstat ++ attrstat + NFSPROC_GETATTR(nfs_fh) = 1; + -+ attrstat ++ attrstat + NFSPROC_SETATTR(sattrargs) = 2; + -+ void ++ void + NFSPROC_ROOT(void) = 3; + -+ diropres ++ diropres + NFSPROC_LOOKUP(diropargs) = 4; + -+ readlinkres ++ readlinkres + NFSPROC_READLINK(nfs_fh) = 5; + -+ readres ++ readres + NFSPROC_READ(readargs) = 6; + -+ void ++ void + NFSPROC_WRITECACHE(void) = 7; + + attrstat @@ -1574,7 +1574,6 @@ index 0000000..01564f8 + } = 3; +} = 100003; +#endif -+ diff --git a/tirpc/rpcsvc/rquota.x b/tirpc/rpcsvc/rquota.x new file mode 100644 index 0000000..72864d1 @@ -1616,7 +1615,7 @@ index 0000000..72864d1 + unsigned int rq_curfiles; /* current # allocated files */ + unsigned int rq_btimeleft; /* time left for excessive disk use */ + unsigned int rq_ftimeleft; /* time left for excessive files */ -+}; ++}; + +enum gqr_status { + Q_OK = 1, /* quota returned */ @@ -1642,12 +1641,11 @@ index 0000000..72864d1 + RQUOTAPROC_GETQUOTA(getquota_args) = 1; + + /* -+ * Get active quotas only ++ * Get active quotas only + */ + getquota_rslt + RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2; + } = 1; +} = 100011; --- +-- 1.9.1 -