Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1674125422144790"
MIME-Version: 1.0
Date: Thu, 19 Jan 2023 10:50:22 +0000
From: "Stephen Borrill" <sborrill@netbsd.org>
Subject: CVS commit: pkgsrc/shells/bash
To: pkgsrc-changes@NetBSD.org
Reply-To: sborrill@netbsd.org
Message-Id: <20230119105022.1E8E9FA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	sborrill
Date:		Thu Jan 19 10:50:22 UTC 2023

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

Log Message:
bash: fix build on old OS versions

Fix build on older OS versions that lack _SC_REALTIME_SIGNALS,
_SC_TIMER_MAX, _SC_CPUTIME, _SC_THREAD_CPUTIME, SC_DELAYTIMER_MAX and
_SC_SIGQUEUE_MAX such as NetBSD 7


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/shells/bash/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c

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


--_----------=_1674125422144790
Content-Disposition: inline
Content-Length: 4563
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.77 pkgsrc/shells/bash/distinfo:1.78
--- pkgsrc/shells/bash/distinfo:1.77	Wed Dec 14 16:48:41 2022
+++ pkgsrc/shells/bash/distinfo	Thu Jan 19 10:50:21 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2022/12/14 16:48:41 kre Exp $
+$NetBSD: distinfo,v 1.78 2023/01/19 10:50:21 sborrill Exp $
 
 BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd
 SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
@@ -55,6 +55,6 @@ SHA1 (patch-builtins_ulimit.def) = 13900
 SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
 SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
 SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
-SHA1 (patch-examples_loadables_getconf.c) = a71df9f54d77ee14de453b67bd4b3658ad7123eb
+SHA1 (patch-examples_loadables_getconf.c) = d745abf6281f7d61ba946cda9edb246ed5e18587
 SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207
 SHA1 (patch-support_shobj-conf) = 010d5058262a23add420deed6c44a605bb16aa26

Index: pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c
diff -u pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c:1.1 pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c:1.2
--- pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c:1.1	Tue Oct  4 12:45:31 2022
+++ pkgsrc/shells/bash/patches/patch-examples_loadables_getconf.c	Thu Jan 19 10:50:21 2023
@@ -1,10 +1,56 @@
-$NetBSD: patch-examples_loadables_getconf.c,v 1.1 2022/10/04 12:45:31 kim Exp $
+$NetBSD: patch-examples_loadables_getconf.c,v 1.2 2023/01/19 10:50:21 sborrill Exp $
 
-Handle _SC_RTSIG_MAX not being defined (NetBSD 9)
+Handle _SC_RTSIG_MAX not being defined (NetBSD 9) as well as other missing
+definitions (_SC_REALTIME_SIGNALS, _SC_TIMER_MAX, _SC_CPUTIME,
+_SC_THREAD_CPUTIME, SC_DELAYTIMER_MAX, _SC_SIGQUEUE_MAX) on earlier OS
+versions.
 
 --- examples/loadables/getconf.c.orig	2021-12-03 16:46:22.000000000 +0000
-+++ examples/loadables/getconf.c	2022-10-04 12:38:07.370372821 +0000
-@@ -846,7 +846,9 @@
++++ examples/loadables/getconf.c	2023-01-18 16:04:51.328120013 +0000
+@@ -329,7 +329,9 @@
+     { "_POSIX_PRIORITIZED_IO", _SC_PRIORITIZED_IO, SYSCONF },
+ #endif
+     { "_POSIX_PRIORITY_SCHEDULING", _SC_PRIORITY_SCHEDULING, SYSCONF },
++#ifdef _SC_REALTIME_SIGNALS
+     { "_POSIX_REALTIME_SIGNALS", _SC_REALTIME_SIGNALS, SYSCONF },
++#endif
+     { "_POSIX_SAVED_IDS", _SC_SAVED_IDS, SYSCONF },
+ #ifdef _SC_SELECT
+     { "_POSIX_SELECT", _SC_SELECT, SYSCONF },
+@@ -366,7 +368,9 @@
+     { "_POSIX_THREAD_PROCESS_SHARED", _SC_THREAD_PROCESS_SHARED, SYSCONF },
+     { "_POSIX_THREAD_SAFE_FUNCTIONS", _SC_THREAD_SAFE_FUNCTIONS, SYSCONF },
+     { "_POSIX_TIMERS", _SC_TIMERS, SYSCONF },
++#ifdef _SC_TIMER_MAX
+     { "TIMER_MAX", _SC_TIMER_MAX, SYSCONF },
++#endif
+ #ifdef _POSIX_TZNAME_MAX
+     { "_POSIX_TZNAME_MAX", _SC_TZNAME_MAX, SYSCONF },
+ #else
+@@ -743,8 +747,12 @@
+     { "_POSIX_C_LANG_SUPPORT_R", _SC_C_LANG_SUPPORT_R, SYSCONF },
+ #endif
+     { "_POSIX_CLOCK_SELECTION", _SC_CLOCK_SELECTION, SYSCONF },
++#ifdef _SC_CPUTIME
+     { "_POSIX_CPUTIME", _SC_CPUTIME, SYSCONF },
++#endif
++#ifdef _SC_THREAD_CPUTIME
+     { "_POSIX_THREAD_CPUTIME", _SC_THREAD_CPUTIME, SYSCONF },
++#endif
+ #ifdef _SC_DEVICE_SPECIFIC
+     { "_POSIX_DEVICE_SPECIFIC", _SC_DEVICE_SPECIFIC, SYSCONF },
+ #endif
+@@ -826,7 +834,9 @@
+ #ifdef _SC_AIO_PRIO_DELTA_MAX
+     { "AIO_PRIO_DELTA_MAX", _SC_AIO_PRIO_DELTA_MAX, SYSCONF },
+ #endif
++#ifdef _SC_DELAYTIMER_MAX
+     { "DELAYTIMER_MAX", _SC_DELAYTIMER_MAX, SYSCONF },
++#endif
+     { "HOST_NAME_MAX", _SC_HOST_NAME_MAX, SYSCONF },
+     { "LOGIN_NAME_MAX", _SC_LOGIN_NAME_MAX, SYSCONF },
+     { "MQ_OPEN_MAX", _SC_MQ_OPEN_MAX, SYSCONF },
+@@ -846,14 +856,18 @@
  #ifdef _SC_TRACE_LOG
      { "_POSIX_TRACE_LOG", _SC_TRACE_LOG, SYSCONF },
  #endif
@@ -14,3 +60,12 @@ Handle _SC_RTSIG_MAX not being defined (
  #ifdef _SC_SEM_NSEMS_MAX
      { "SEM_NSEMS_MAX", _SC_SEM_NSEMS_MAX, SYSCONF },
  #endif
+ #ifdef _SC_SEM_VALUE_MAX
+     { "SEM_VALUE_MAX", _SC_SEM_VALUE_MAX, SYSCONF },
+ #endif
++#ifdef _SC_SIGQUEUE_MAX
+     { "SIGQUEUE_MAX", _SC_SIGQUEUE_MAX, SYSCONF },
++#endif
+     { "FILESIZEBITS", _PC_FILESIZEBITS, PATHCONF },
+ #ifdef _PC_ALLOC_SIZE_MIN
+     { "POSIX_ALLOC_SIZE_MIN", _PC_ALLOC_SIZE_MIN, PATHCONF },


--_----------=_1674125422144790--