From 2a9643f6aef1a52cdada648f72f1d0ec9c1b711d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 21 Nov 2016 14:04:51 +0000
Subject:  Increase s6-log "s" limit to 256MB

---
 INSTALL                         | 2 +-
 doc/index.html                  | 4 ++--
 doc/s6-log.html                 | 2 +-
 doc/upgrade.html                | 6 ++++++
 package/info                    | 2 +-
 src/daemontools-extras/s6-log.c | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4f0e1e5..b6e47bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.4.0.1 or later: http://skarnet.org/software/skalibs/
   - execline version 2.2.0.0 or later: http://skarnet.org/software/execline/
 
  This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index f85da66..319ba22 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -83,7 +83,7 @@ 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="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.4.0.0 or later. It's a build-time requirement. It's also a run-time
+2.4.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> <a href="http://skarnet.org/software/execline/">execline</a> version
@@ -100,7 +100,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.4.0.0.tar.gz">2.4.0.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.4.1.0.tar.gz">2.4.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/s6-log.html b/doc/s6-log.html
index 0ef84f3..ce55c4b 100644
--- a/doc/s6-log.html
+++ b/doc/s6-log.html
@@ -195,7 +195,7 @@ By default, <em>number</em> is 10. </li>
  <li> <strong>s<em>filesize</em></strong>: next rotations will occur when
 <tt>current</tt> log files approach <em>filesize</em> bytes. By default,
 <em>filesize</em> is 99999; it cannot be set lower than 4096 or
-higher than 16777215. </li>
+higher than 268435455. </li>
  <li> <strong>S<em>totalsize</em></strong>: next logdirs will contain up
 to <em>totalsize</em> bytes of archived (and maybe processed) log files. If
 archived log files take more space than that, the older ones are suppressed
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 18e1fc0..7a76617 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.4.1.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.4.0.1. </li>
+</ul>
+
 <h2> in 2.4.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 6bb3e27..c7aeacf 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.4.0.0
+version=2.4.1.0
 category=admin
 package_macro_name=S6
diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index c3aec9c..0602c66 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -824,7 +824,7 @@ static inline void script_secondpass (char const *const *argv, scriptelem_t *scr
       case 's' :
         if (!uint320_scan(*argv + 1, &s)) goto fail ;
         if (s < 4096) s = 4096 ;
-        if (s > 16777215) s = 16777215 ;
+        if (s > 268435455) s = 268435455 ;
         break ;
       case 'S' :
         if (!uint640_scan(*argv + 1, &maxdirsize)) goto fail ;
-- 
cgit v1.2.3