Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 execline (2.7.0.1-2.0antix1) unstable; urgency=medium
 .
   * antiX build to work with 66
Author: anticapitalista <antix@operamail.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2021-02-26

--- execline-2.7.0.1.orig/INSTALL
+++ execline-2.7.0.1/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.10.0.1 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.10.0.0 or later: https://skarnet.org/software/skalibs/
   - Optional: nsss version 0.1.0.0 or later: https://skarnet.org/software/nsss/
 
  This software will run on any operating system that implements
--- execline-2.7.0.1.orig/NEWS
+++ execline-2.7.0.1/NEWS
@@ -1,11 +1,5 @@
 Changelog for execline.
 
-In 2.7.0.1
-----------
-
- - Bugfixes.
-
-
 In 2.7.0.0
 ----------
 
--- execline-2.7.0.1.orig/README
+++ execline-2.7.0.1/README
@@ -26,4 +26,3 @@ for which a shell is overpowered.
 
  Please use the <skaware at list.skarnet.org> mailing-list for
 questions about execline.
-
--- execline-2.7.0.1.orig/doc/index.html
+++ execline-2.7.0.1/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issu
  <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.10.0.1 or later. It's a build-time requirement. It's also a run-time
+2.10.0.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>
 </ul>
@@ -77,7 +77,7 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.7.0.1.tar.gz">2.7.0.1</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.7.0.0.tar.gz">2.7.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/execline/">execline
 git repository</a>:
--- execline-2.7.0.1.orig/doc/trap.html
+++ execline-2.7.0.1/doc/trap.html
@@ -74,7 +74,7 @@ not forward any signals, and does not ig
 SIGTERM, unless caught by a <tt>SIGTERM</tt> directive, will kill the
 <tt>trap</tt> process (and leave <em>prog</em> running). With the
 <tt>-x</tt> option, without a <tt>SIGTERM</tt> directive, a SIGTERM
-will still be caught by <tt>trap</tt>, that will send it to
+will be still be caught by <tt>trap</tt>, that will send it to
 <em>prog</em>. Note that if a <tt>default</tt> directive is present,
 this option does nothing. </li>
 </ul>
@@ -89,7 +89,7 @@ can be the case in <tt>default</tt> dire
 <code><a href="multisubstitute.html">multisubstitute</a> { importas ! ! importas SIGNAL SIGNAL }<code>
 to get both <tt>$!</tt> and <tt>$SIGNAL</tt> substitutions. </li>
  <li> The <tt>-x</tt> option is basically a shortcut for a <code>default {
-multisubstitute { importas ! ! importas SIGNAL SIGNAL } kill -$SIGNAL $! }</code> directive. </li>
+multisusbstitute { importas ! ! importas SIGNAL SIGNAL } kill -$SIGNAL $! }</code> directive. </li>
  <li> <tt>trap</tt> is a standard shell builtin, with similar
 functionality. It is more idiomatic, and probably more efficient,
 to use that builtin in shell scripts, and to only use the
--- execline-2.7.0.1.orig/doc/upgrade.html
+++ execline-2.7.0.1/doc/upgrade.html
@@ -18,13 +18,6 @@
 
 <h1> What has changed in execline </h1>
 
-<h2> in 2.7.0.1 </h2>
-
-<ul>
- <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
-dependency bumped to 2.10.0.1. </li>
-</ul>
-
 <h2> in 2.7.0.0 </h2>
 
 <ul>
--- execline-2.7.0.1.orig/package/info
+++ execline-2.7.0.1/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.7.0.1
+version=2.7.0.0
 category=admin
 package_macro_name=EXECLINE
--- execline-2.7.0.1.orig/src/execline/emptyenv.c
+++ execline-2.7.0.1/src/execline/emptyenv.c
@@ -34,7 +34,7 @@ static void cleanupenv (char const *cons
         goto err ;
   }
   stralloc_free(&sa) ;
-  xmexec(argv) ;
+  xmexec_e(argv, envp) ;
 err:
   strerr_diefu1sys(111, "clean up environment") ;
 }
--- execline-2.7.0.1.orig/src/execline/trap.c
+++ execline-2.7.0.1/src/execline/trap.c
@@ -50,7 +50,7 @@ int main (int argc, char const **argv, c
 {
   size_t envlen = env_len(envp) ;
   iopause_fd x = { .events = IOPAUSE_READ } ;
-  sigset_t full, set ;
+  sigset_t set ;
   int xfersigs = 0 ;
   unsigned int argc1 ;
   unsigned int i = 0 ;
@@ -77,9 +77,6 @@ int main (int argc, char const **argv, c
   if (argc1 >= argc) strerr_dief1x(100, "unterminated block") ;
   if (argc1 + 1 == argc) dieusage() ;
   argv[argc1] = 0 ;
-  sigfillset(&full) ;
-  sigdelset(&full, SIGKILL) ;
-  sigdelset(&full, SIGSTOP) ;
   while (i < argc1)
   {
     unsigned int argc2 ;
@@ -91,13 +88,14 @@ int main (int argc, char const **argv, c
       strerr_dief3x(100, "unterminated", " internal block for directive ", argv[i-1]) ;
     if (argvs[sig])
       strerr_dief3x(100, "duplicate", " directive: ", argv[i-1]) ;
-    if (!sig || (sig != SIGCHLD && sigismember(&full, sig) > 0))
-      argvs[sig] = argv + i ;
-    else
+    switch (sig)
     {
-      char fmt[UINT_FMT] ;
-      fmt[uint_fmt(fmt, (unsigned int)sig)] = 0 ;
-      strerr_dief5x(100, "SIG", sig_name(sig), " (", fmt, ") cannot be trapped") ;
+      case SIGCHLD : strerr_dief2x(100, "SIGCHLD", " cannot be trapped") ;
+      case SIGKILL : strerr_dief2x(100, "SIGKILL", " cannot be trapped") ;
+      case SIGSTOP : strerr_dief2x(100, "SIGSTOP", " cannot be trapped") ;
+      default :
+        argvs[sig] = argv + i ;
+        break ;
     }
     argv[i + argc2] = 0 ;
     i += argc2 + 1 ;
@@ -105,14 +103,19 @@ int main (int argc, char const **argv, c
 
   if (argvs[0])
     for (i = 1 ; i < SKALIBS_NSIG ; i++)
-      if (!argvs[i] && sigismember(&full, i) > 0)
+      if (!argvs[i])
         argvs[i] = argvs[0] ;
 
-  if (xfersigs) set = full ;
+  if (xfersigs)
+  {
+    sigfillset(&set) ;
+    sigdelset(&set, SIGCHLD) ;
+    sigdelset(&set, SIGKILL) ;
+    sigdelset(&set, SIGSTOP) ;
+  }
   else
   {
     sigemptyset(&set) ;
-    sigaddset(&set, SIGCHLD) ;
     for (i = 1 ; i < SKALIBS_NSIG ; i++)
       if (argvs[i])
         sigaddset(&set, i) ;
--- execline-2.7.0.1.orig/src/libexecline/exlsn_exlp.c
+++ execline-2.7.0.1/src/libexecline/exlsn_exlp.c
@@ -20,6 +20,7 @@ int exlsn_exlp (int argc, char const **a
     }
   }
   argc -= localopt.ind ; argv += localopt.ind ;
+  if (!argc) return -3 ;
   n = exlp(nmin, envp, info) ;
   if (n < 0) return n ;
   return localopt.ind ;
