Prepare for 2.15.0.1; fix s6-accessrules-cdb-from-fs args numbering

5 files changed, 26 insertions, 15 deletions

diff --git a/doc/index.html b/doc/index.html
index 9da9001..53d0b49 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,12 +84,12 @@ with s6</a> </li>
  <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.15.0.0 or later. It's a build-time requirement. It's also a run-time
+2.15.0.1 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> (Optional, but really recommended for full functionality):
 <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.9.0 or later. When s6 is built with execline support (which is the default),
+2.9.9.1 or later. When s6 is built with execline support (which is the default),
 execline is a build-time requirement, and also a run-time requirement for
 certain binaries that spawn scripts interpreted with
 <a href="//skarnet.org/software/execline/execlineb.html">execlineb</a>. </li>
@@ -116,8 +116,8 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.15.0.0.tar.gz">2.15.0.0</a>.
-You can access its checksum <a href="s6-2.15.0.0.tar.gz.sha256">here</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.15.0.1.tar.gz">2.15.0.1</a>.
+You can access its checksum <a href="s6-2.15.0.1.tar.gz.sha256">here</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index e8cedc5..e8cf485 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -19,6 +19,15 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.15.0.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.15.0.1. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+recommended dependency bumped to 2.9.9.1. </li>
+</ul>
+
 <h2> in 2.15.0.0 </h2>
 
 <ul>
diff --git a/package/deps-build b/package/deps-build
index dd5716d..071d42c 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,3 +1,3 @@
-true		true		/package/prog/skalibs	2.15.0.0	libskarnet
+true		true		/package/prog/skalibs	2.15.0.1	libskarnet
 $usensss	false		/package/admin/nsss	0.2.1.2		libnsss
-$useexecline	$useexecline	/package/admin/execline	2.9.9.0		libexecline
+$useexecline	$useexecline	/package/admin/execline	2.9.9.1		libexecline
diff --git a/package/info b/package/info
index edaa30f..6eff7fb 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.15.0.0
+version=2.15.0.1
 category=admin
 package_macro_name=S6
diff --git a/src/conn-tools/s6-accessrules-cdb-from-fs.c b/src/conn-tools/s6-accessrules-cdb-from-fs.c
index f1efefa..c876155 100644
--- a/src/conn-tools/s6-accessrules-cdb-from-fs.c
+++ b/src/conn-tools/s6-accessrules-cdb-from-fs.c
@@ -130,11 +130,11 @@ int main (int argc, char const *const *argv)
 
   golc = gol_main(argc, argv, 0, 0, rgola, 1, 0, wgola) ;
   argc -= golc ; argv += golc ;
-  if (argc < 3) strerr_dieusage(100, USAGE) ;
+  if (argc < 2) strerr_dieusage(100, USAGE) ;
 
   if (wgola[GOLA_MODE] && !uint0_oscan(wgola[GOLA_MODE], &mode))
     strerr_dief1x(100, "mode needs to be an unsigned integer (in octal)") ;
-  if (!stralloc_cats(&tmp, argv[1])) return 0 ;
+  if (!stralloc_cats(&tmp, argv[0])) return 0 ;
   if (!stralloc_readyplus(&tmp, 8210))
     strerr_diefu1sys(111, "stralloc_catb") ;
   stralloc_catb(&tmp, SUFFIX, sizeof(SUFFIX)) ;
@@ -145,13 +145,13 @@ int main (int argc, char const *const *argv)
     cleanup() ;
     strerr_diefu1sys(111, "cdbmake_start") ;
   }
-  dir = opendir(argv[2]) ;
+  dir = opendir(argv[1]) ;
   if (!dir)
   {
     cleanup() ;
-    strerr_diefu2sys(111, "opendir ", argv[2]) ;
+    strerr_diefu2sys(111, "opendir ", argv[1]) ;
   }
-  if (!stralloc_cats(&sa, argv[2]) || !stralloc_catb(&sa, "/", 1)) dienomem() ;
+  if (!stralloc_cats(&sa, argv[1]) || !stralloc_catb(&sa, "/", 1)) dienomem() ;
   start = sa.len ;
 
   for (;;)
@@ -173,6 +173,7 @@ int main (int argc, char const *const *argv)
       strerr_diefu2sys(111, "opendir ", sa.s) ;
     }
     sa.s[base-1] = '/' ;
+
     for (;;)
     {
       errno = 0 ;
@@ -194,9 +195,10 @@ int main (int argc, char const *const *argv)
   if (errno)
   {
     cleanup() ;
-    strerr_diefu2sys(111, "readdir ", argv[2]) ;
+    strerr_diefu2sys(111, "readdir ", argv[1]) ;
   }
   dir_close(dir) ;
+
   if (!cdbmake_finish(&c))
   {
     cleanup() ;
@@ -213,10 +215,10 @@ int main (int argc, char const *const *argv)
     cleanup() ;
     strerr_diefu2sys(111, "chmod ", tmp.s) ;
   }
-  if (rename(tmp.s, argv[1]) < 0)
+  if (rename(tmp.s, argv[0]) < 0)
   {
     cleanup() ;
-    strerr_diefu4sys(111, "rename ", tmp.s, " to ", argv[1]) ;
+    strerr_diefu4sys(111, "rename ", tmp.s, " to ", argv[0]) ;
   }
   return 0 ;
 }