Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1551338457206400"
MIME-Version: 1.0
Date: Thu, 28 Feb 2019 07:20:57 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/shells/bash
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20190228072057.B26D9FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1551338457206400
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Thu Feb 28 07:20:57 UTC 2019

Modified Files:
	pkgsrc/shells/bash: distinfo
Added Files:
	pkgsrc/shells/bash/patches: patch-examples_loadables_fdflags.c

Log Message:
bash: handle O_CLOEXEC not being defined (Solaris 10)

(While this says "example", it's built during the "make install" phase)

Reported by Hiroshi Hakoyama in PR pkg/52045


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/bash/patches/patch-examples_loadables_fdflags.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1551338457206400
Content-Disposition: inline
Content-Length: 2210
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/shells/bash/distinfo
diff -u pkgsrc/shells/bash/distinfo:1.52 pkgsrc/shells/bash/distinfo:1.53
--- pkgsrc/shells/bash/distinfo:1.52	Mon Jan 21 09:03:44 2019
+++ pkgsrc/shells/bash/distinfo	Thu Feb 28 07:20:57 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2019/01/21 09:03:44 leot Exp $
+$NetBSD: distinfo,v 1.53 2019/02/28 07:20:57 maya Exp $
 
 SHA1 (bash-5.0.tar.gz) = d116b469b9e6ea5264a74661d3a4c797da7f997b
 RMD160 (bash-5.0.tar.gz) = a081428a896d617855499376b670eca3433a27c1
@@ -9,6 +9,7 @@ SHA1 (patch-ag) = cd3b151e3bb045d2bb609c
 SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
 SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
+SHA1 (patch-examples_loadables_fdflags.c) = 92a63c8f4c94ccf9cf782e934a0806930d172654
 SHA1 (patch-examples_loadables_push.c) = 57a3c7de9ea0a75c373db678d9500954bcf40ff4
 SHA1 (patch-shell.c) = daa07914d4c318cd72463f80344f4f7c364809cd
 SHA1 (patch-support_shobj-conf) = 8750c104549ea8a4a722bd21a684a9fe13e05fe5

Added files:

Index: pkgsrc/shells/bash/patches/patch-examples_loadables_fdflags.c
diff -u /dev/null pkgsrc/shells/bash/patches/patch-examples_loadables_fdflags.c:1.1
--- /dev/null	Thu Feb 28 07:20:57 2019
+++ pkgsrc/shells/bash/patches/patch-examples_loadables_fdflags.c	Thu Feb 28 07:20:57 2019
@@ -0,0 +1,35 @@
+$NetBSD: patch-examples_loadables_fdflags.c,v 1.1 2019/02/28 07:20:57 maya Exp $
+
+Handle O_CLOEXEC not being defined (Solaris 10)
+
+--- examples/loadables/fdflags.c.orig	2017-02-02 16:40:42.000000000 +0000
++++ examples/loadables/fdflags.c
+@@ -113,8 +113,11 @@ getflags(int fd, int p)
+       return -1;
+     }
+ 
+-  if (c)
++  if (c) {
++#ifdef O_CLOEXEC
+     f |= O_CLOEXEC;
++#endif
++  }
+ 
+   return f & getallflags();
+ }
+@@ -198,6 +201,7 @@ setone(int fd, char *v, int verbose)
+ 
+   parseflags(v, &pos, &neg);
+ 
++#ifdef O_CLOEXEC
+   cloexec = -1;
+   if ((pos & O_CLOEXEC) && (f & O_CLOEXEC) == 0)
+     cloexec = FD_CLOEXEC;
+@@ -209,6 +213,7 @@ setone(int fd, char *v, int verbose)
+   pos &= ~O_CLOEXEC;
+   neg &= ~O_CLOEXEC;
+   f &= ~O_CLOEXEC;
++#endif
+ 
+   n = f;
+   n |= pos;


--_----------=_1551338457206400--