Prepare for 0.2.0.5 ; fix ftms and support more defs in headersHEADmastermain

Signed-off-by: Laurent Bercot <ska@appnovation.com>

8 files changed, 28 insertions, 11 deletions

diff --git a/COPYING b/COPYING
index 1631a79..ce2bdb1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2023 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2018-2024 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index c30b34a..f0586f9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/
   - To run the test suite and the nsssd-* programs:
-      s6 version 2.12.0.0 or later: https://skarnet.org/software/s6/
+      s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index a3d84a0..6729928 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for nsss.
 
+In 0.2.0.5
+----------
+
+ - Bugfixes.
+
+
 In 0.2.0.4
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index e0b596b..94c80b8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -81,11 +81,11 @@ functions.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.14.0.0 or later. It's a build-time requirement. It's also a run-time
+2.14.3.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.12.0.0 or later. It's a <em>run-time</em> requirement only, to run
+2.13.0.1 or later. It's a <em>run-time</em> requirement only, to run
 the nsssd service (and can be done without if you have a suitable replacement
 for <a href="//skarnet.org/software/s6/s6-ipcserver.html">s6-ipcserver</a>). </li>
 </ul>
@@ -100,7 +100,7 @@ for <a href="//skarnet.org/software/s6/s6-ipcserver.html">s6-ipcserver</a>). </l
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of nsss is <a href="nsss-0.2.0.4.tar.gz">0.2.0.4</a>. </li>
+ <li> The current released version of nsss is <a href="nsss-0.2.0.5.tar.gz">0.2.0.5</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/nsss/">nsss
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 5c9a94b..1c888c7 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in nsss </h1>
 
+<h2> In 0.2.0.5 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.3.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a> run-time
+dependency bumped to 2.13.0.1. </li>
+</ul>
+
 <h2> In 0.2.0.4 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 22e540c..b239c3b 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=nsss
-version=0.2.0.4
+version=0.2.0.5
 category=admin
 package_macro_name=NSSS
diff --git a/src/include/nsss/grp.h b/src/include/nsss/grp.h
index 8e16467..001a98e 100644
--- a/src/include/nsss/grp.h
+++ b/src/include/nsss/grp.h
@@ -20,7 +20,7 @@ extern "C" {
 #define getgrnam nsss_unix_getgrnam
 #define getgrnam_r nsss_unix_getgrnam_r
 
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE)
 # define getgrouplist nsss_unix_getgrouplist
 #endif
 
@@ -38,7 +38,7 @@ extern "C" {
 #define getgrnam nsss_switch_getgrnam
 #define getgrnam_r nsss_switch_getgrnam_r
 
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE)
 # define getgrouplist nsss_switch_getgrouplist
 #endif
 
@@ -55,7 +55,7 @@ extern "C" {
 #define getgrnam nsss_all_getgrnam
 #define getgrnam_r nsss_all_getgrnam_r
 
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE)
 # define getgrouplist nsss_all_getgrouplist
 #endif
 
@@ -69,7 +69,7 @@ extern "C" {
    do not conflict with nsss operation.
  */
 
-#if defined(__GNU__) && (defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE))
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_DEFAULT_SOURCE)
 #include <sys/types.h>
 extern int setgroups (size_t, gid_t const *) ;
 extern int initgroups (char const *, gid_t) ;
diff --git a/src/include/nsss/shadow.h b/src/include/nsss/shadow.h
index 5665fc8..dc20d5e 100644
--- a/src/include/nsss/shadow.h
+++ b/src/include/nsss/shadow.h
@@ -51,6 +51,8 @@ extern "C" {
    do not conflict with nsss operation.
  */
 
+#define SHADOW "/etc/shadow"
+
 #include <stdio.h>
 
 extern struct spwd *fgetspent (FILE *) ;