From: Jean Delvare <jdelvare@suse.de>
Subject: compat/getopt: Handle a second separator

getopt can be passed 2 '--' separators. The first one tells that
getopt options are over and target program options start. The second
one tells that the target program's options are over and following
arguments should be treated as non-options even if they look like
options.

This second separator was not handled, causing the compatibility
getopt script to treat the following arguments as options, eventually
failing one way or another.

Properly detect and handle the second separator. This fixes the first
half of bug #54772:
https://savannah.nongnu.org/bugs/index.php?54772

Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
 compat/getopt.in |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- quilt.orig/compat/getopt.in	2018-10-03 15:23:21.147620172 +0200
+++ quilt/compat/getopt.in	2018-10-03 16:05:56.818667040 +0200
@@ -8,12 +8,12 @@
 
 use strict;
 
-my $opts;
+my $opts = '';
 my @words;
 my $found_sep = 0;
 
 foreach my $arg (@ARGV) {
-  if ($arg eq '--') {
+  if (!$found_sep && $arg eq '--') {
     $found_sep = 1;
   }
   else {
@@ -62,10 +62,17 @@ sub quote_word
 	return "'$word'";
 }
 
+# there can be a second separator, to inhibit processing following arguments
+# as options
+$found_sep = 0;
 foreach my $word (@words) {
+	if ($word eq '--') {
+		$found_sep = 1;
+		next;
+	}
 
 	# allow '-' to be an option value
-	if (!$need_param && $word !~ /^-./) {
+	if ($found_sep || (!$need_param && $word !~ /^-./)) {
 		push @barewords, quote_word($word);
 		next;
 	}
'0ec1833c1f18027ef71231f37ade182f76b3c0f2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0ec1833c1f18027ef71231f37ade182f76b3c0f2'>root</a>/<a href='/guix/log/gnu?id=0ec1833c1f18027ef71231f37ade182f76b3c0f2'>gnu</a>/<a href='/guix/log/gnu/packages?id=0ec1833c1f18027ef71231f37ade182f76b3c0f2'>packages</a>/<a href='/guix/log/gnu/packages/acl.scm?id=0ec1833c1f18027ef71231f37ade182f76b3c0f2'>acl.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/acl.scm?id=0ec1833c1f18027ef71231f37ade182f76b3c0f2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-18 14:37:26 +0000'>2021-10-18</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=e486b2b674badc80627b11077b7df2ac1cab92d8'>Merge remote-tracking branch 'signed/master' into core-updates</a></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-10-18 12:25:47 +0200'>2021-10-18</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=9cda21cf20a5c9bdf97e3a6d6c8f901fc3e4307d'>gnu: python-pylibacl: Add missing brace in description.</a><span class='msg-avail'>...<span class='msg-tooltip'>Regression introduced in 133f780039e63798535e4f52a4d9f1810ea5b2ab.

* gnu/packages/acl.scm (python-pylibacl)[description]: Add missing brace.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-15 17:30:56 +0200'>2021-10-15</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=133f780039e63798535e4f52a4d9f1810ea5b2ab'>gnu: python-pylibacl: Improve description.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/acl.scm (python-pylibacl)[synopsis]: Use @acronym{}.
[description]: Turn into a full sentence, mark up, and edit for GNU.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-10-15 17:30:56 +0200'>2021-10-15</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=a9b8443cc530fbf404f86c215ed77b8baeb0d108'>gnu: python-pylibacl: Do not return #t from custom phases.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/acl.scm (python-pylibacl)[arguments]: Don't explicitly
return #t from phases.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-07-23 17:26:45 +0200'>2021-07-23</span></td><td><a href='/guix/commit/gnu/packages/acl.scm?id=5d435b2235d5e269499be2ea67613c164e65efb6'>gnu: acl: Update to 2.3.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/acl.scm (acl): Update to 2.3.1.
</span></span></td><td>Marius Bakke</td></tr>