Merge branch 'sr.2019.10.03' into 'master'

Miscellaneous bumps, 2019.10.03

See merge request adelie/packages!361

3 files changed, 28 insertions, 412 deletions

diff --git a/system/sudo/APKBUILD b/system/sudo/APKBUILD
index 2cb62343a..3bad54e5e 100644
--- a/system/sudo/APKBUILD
+++ b/system/sudo/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Horst Burkhardt <horst@adelielinux.org>
 pkgname=sudo
-pkgver=1.8.27
+pkgver=1.8.28
 if [ "${pkgver%_*}" != "$pkgver" ]; then
 	_realver=${pkgver%_*}${pkgver#*_}
 else
@@ -23,13 +23,15 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-lang"
 source="https://www.sudo.ws/dist/sudo-${_realver}.tar.gz
 	fix-cross-compile.patch
 	musl-fix-headers.patch
-	test-suite.patch
+	SIGUNUSED.patch
 	"
 builddir="$srcdir"/$pkgname-$_realver
 
 # secfixes:
 #   1.8.20_p2-r0:
-#   - CVE-2017-1000368
+#     - CVE-2017-1000368
+#   1.8.28:
+#     - CVE-2019-14287
 
 build() {
 	./configure \
@@ -45,6 +47,11 @@ build() {
 		--with-passprompt="[sudo] Password for %p: " \
 		--with-insults=disabled \
 		--with-all-insults
+
+	# Workaround until SIGUNUSED.patch is not needed anymore
+	rm lib/util/mksiglist.h lib/util/mksigname.h
+	make -C lib/util DEVEL=1 mksiglist.h mksigname.h
+
 	make
 }
 
@@ -60,7 +67,7 @@ package() {
 	rm -rf "$pkgdir"/var/run
 }
 
-sha512sums="0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac  sudo-1.8.27.tar.gz
+sha512sums="09e589cdfd18d7c43b0859a0e11c008b3cb995ae4f8c89c717c5242db9e5696361eb574ebe74a0b5316afffb3a8037f7a7f3c249176e8ed9caffeb4cd860ddc7  sudo-1.8.28.tar.gz
 f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c  fix-cross-compile.patch
 dcc03abdd672c934f90dfd3683b3f81a8d39cfff91307d2dbd20a31a852022ab605d034c4fe11860ba99b78d391a9812fca1d6e052620b8ff2c42e4f0c7a1a62  musl-fix-headers.patch
-3feb9f586fb36cdddaf61523926554533d73b4b03e7bfe5da40b754d68c4cc58c796310cc3a3419dd0d87d30d836d5f9921f5ea3c7c7a0099626f49c161279dc  test-suite.patch"
+2733c220ccbdaf61a32d8c72a5bc0209673733014f0d71b568f1523b71416e9d1754dd8c95bc6cd99aa7f935ed6e93c5f19b1a1dbb7dfc2daf9917fd37f96e78  SIGUNUSED.patch"
diff --git a/system/sudo/SIGUNUSED.patch b/system/sudo/SIGUNUSED.patch
new file mode 100644
index 000000000..969c3e82d
--- /dev/null
+++ b/system/sudo/SIGUNUSED.patch
@@ -0,0 +1,16 @@
+--- sudo-1.8.28/lib/util/siglist.in	2019-10-10 11:32:54.000000000 -0500
++++ sudo-1.8.28/lib/util/siglist.in	2019-10-14 16:42:46.259938722 -0500
+@@ -17,11 +17,12 @@
+     EMT     EMT trap
+     FPE     Floating point exception
+     KILL    Killed
++# before UNUSED (musl defines them as the same number)
++    SYS     Bad system call
+ # before BUS (Older Linux doesn't really have a BUS, but defines it to UNUSED)
+     UNUSED  Unused
+     BUS     Bus error
+     SEGV    Memory fault
+-    SYS     Bad system call
+     PIPE    Broken pipe
+     ALRM    Alarm clock
+     TERM    Terminated
diff --git a/system/sudo/test-suite.patch b/system/sudo/test-suite.patch
deleted file mode 100644
index eb19ff09c..000000000
--- a/system/sudo/test-suite.patch
+++ /dev/null
@@ -1,407 +0,0 @@
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@sudo.ws>
-# Date 1552053510 25200
-# Node ID e82a381f4f3de693f880aab2781fd65c01030ec0
-# Parent  09a915110812b9d6603995aa27be94b71c5df1e7
-Test cvtsudoers stdout and stderr separately.
-Fixes a test failure on systems with musl libc.  Bug #873
-
-diff -r 09a915110812 -r e82a381f4f3d MANIFEST
---- a/MANIFEST	Wed Mar 06 20:15:11 2019 -0700
-+++ b/MANIFEST	Fri Mar 08 06:58:30 2019 -0700
-@@ -450,6 +450,7 @@
- plugins/sudoers/regress/cvtsudoers/test24.sh
- plugins/sudoers/regress/cvtsudoers/test25.out.ok
- plugins/sudoers/regress/cvtsudoers/test25.sh
-+plugins/sudoers/regress/cvtsudoers/test26.err.ok
- plugins/sudoers/regress/cvtsudoers/test26.out.ok
- plugins/sudoers/regress/cvtsudoers/test26.sh
- plugins/sudoers/regress/cvtsudoers/test27.out.ok
-@@ -465,6 +466,7 @@
- plugins/sudoers/regress/cvtsudoers/test31.conf
- plugins/sudoers/regress/cvtsudoers/test31.out.ok
- plugins/sudoers/regress/cvtsudoers/test31.sh
-+plugins/sudoers/regress/cvtsudoers/test32.err.ok
- plugins/sudoers/regress/cvtsudoers/test32.out.ok
- plugins/sudoers/regress/cvtsudoers/test32.sh
- plugins/sudoers/regress/cvtsudoers/test33.out.ok
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh
---- a/plugins/sudoers/regress/cvtsudoers/test1.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test user and host filters
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh
---- a/plugins/sudoers/regress/cvtsudoers/test10.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test command defaults filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh
---- a/plugins/sudoers/regress/cvtsudoers/test11.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,5 +3,4 @@
- # Test that Aliases are removed when filtering by defaults type
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh
---- a/plugins/sudoers/regress/cvtsudoers/test12.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,5 +3,4 @@
- # Test that Aliases are removed when filtering by defaults type
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh
---- a/plugins/sudoers/regress/cvtsudoers/test13.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,5 +3,4 @@
- # Test that Aliases are removed when filtering by defaults type
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh
---- a/plugins/sudoers/regress/cvtsudoers/test14.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,5 +3,4 @@
- # Test that Aliases are removed when filtering by defaults type
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh
---- a/plugins/sudoers/regress/cvtsudoers/test15.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test filters and pruning
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF
- user1, user2, user3, %group1 host1, host2, host3 = ALL
- EOF
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh
---- a/plugins/sudoers/regress/cvtsudoers/test16.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test filters and pruning
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF
- user1, user2, user3, %group1 host1, host2, host3 = ALL
- EOF
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh
---- a/plugins/sudoers/regress/cvtsudoers/test17.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test filters and pruning
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF
- user1, user2, user3, %group1 host1, host2, host3 = ALL
- EOF
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh
---- a/plugins/sudoers/regress/cvtsudoers/test18.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test filters and pruning
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF
- user1, user2, user3, %group1 ALL = ALL
- EOF
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh
---- a/plugins/sudoers/regress/cvtsudoers/test19.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,5 +3,4 @@
- # Test filters and pruning; alias contents don't get pruned
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh
---- a/plugins/sudoers/regress/cvtsudoers/test2.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test user and host filters, expanding aliases
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh
---- a/plugins/sudoers/regress/cvtsudoers/test20.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test cvtsudoers.conf
- #
- 
--exec 2>&1
- ./cvtsudoers -c $TESTDIR/test20.conf <<EOF
- Defaults:SOMEUSERS authenticate, timestamp_timeout=0
- User_Alias SOMEUSERS = user1, user2, user3
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh
---- a/plugins/sudoers/regress/cvtsudoers/test21.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test cvtsudoers.conf
- #
- 
--exec 2>&1
- ./cvtsudoers -c $TESTDIR/test21.conf <<EOF
- Defaults authenticate, timestamp_timeout=0
- User_Alias FULLTIMERS = user1, user2, user3
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh
---- a/plugins/sudoers/regress/cvtsudoers/test22.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDAP base filtering.
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
- dn: dc=sudo,dc=ws
- objectClass: dcObject
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh
---- a/plugins/sudoers/regress/cvtsudoers/test23.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,6 +3,5 @@
- # Test round-tripping of sudoers -> LDIF -> sudoers
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \
-     ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#'
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh
---- a/plugins/sudoers/regress/cvtsudoers/test24.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,6 +3,5 @@
- # Test round-tripping of LDIF -> sudoers -> LDIF
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \
-     ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws"
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh
---- a/plugins/sudoers/regress/cvtsudoers/test25.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDIF base64 attribute parsing
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
- # defaults, SUDOers, sudo.ws
- dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok	Fri Mar 08 06:58:30 2019 -0700
-@@ -0,0 +1,3 @@
-+cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
-+cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
-+cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok
---- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok	Fri Mar 08 06:58:30 2019 -0700
-@@ -1,3 +0,0 @@
--cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
--cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
--cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh
---- a/plugins/sudoers/regress/cvtsudoers/test26.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDIF invalid base64 attribute parsing
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
- # defaults, SUDOers, sudo.ws
- dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh
---- a/plugins/sudoers/regress/cvtsudoers/test27.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test base64 encoding of non-safe strings
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF
- Defaults badpass_message="Bad password¡"
- 
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh
---- a/plugins/sudoers/regress/cvtsudoers/test28.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDAP sudoOrder when converting to sudoers.
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
- dn: dc=sudo,dc=ws
- objectClass: dcObject
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh
---- a/plugins/sudoers/regress/cvtsudoers/test29.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDAP sudoOrder when converting to sudoers.
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
- dn: dc=sudo,dc=ws
- objectClass: dcObject
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh
---- a/plugins/sudoers/regress/cvtsudoers/test3.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test group and host filters
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh
---- a/plugins/sudoers/regress/cvtsudoers/test30.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -4,7 +4,6 @@
- # See https://bugzilla.sudo.ws/show_bug.cgi?id=853
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -e -f json <<EOF
- Cmnd_Alias	CMDA=/path/to/cmda
- Cmnd_Alias	CMDB=/path/to/cmdb
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh
---- a/plugins/sudoers/regress/cvtsudoers/test31.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test cvtsudoers.conf with padding
- #
- 
--exec 2>&1
- ./cvtsudoers -c $TESTDIR/test31.conf <<EOF
- Defaults authenticate, timestamp_timeout=0
- User_Alias FULLTIMERS = user1, user2, user3
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok	Fri Mar 08 06:58:30 2019 -0700
-@@ -0,0 +1,1 @@
-+cvtsudoers: too many sudoers entries, maximum 10
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok
---- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok	Fri Mar 08 06:58:30 2019 -0700
-@@ -1,4 +1,3 @@
--cvtsudoers: too many sudoers entries, maximum 10
- dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com
- objectClass: top
- objectClass: sudoRole
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh
---- a/plugins/sudoers/regress/cvtsudoers/test32.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test cvtsudoers.conf with invalid padding
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF
- user0  ALL = (ALL:ALL) ALL
- user1  ALL = (ALL:ALL) ALL
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh
---- a/plugins/sudoers/regress/cvtsudoers/test33.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers.
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
- dn: dc=sudo,dc=ws
- objectClass: dcObject
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh
---- a/plugins/sudoers/regress/cvtsudoers/test4.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test group and host filters, expanding aliases
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh
---- a/plugins/sudoers/regress/cvtsudoers/test5.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test defaults type filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh
---- a/plugins/sudoers/regress/cvtsudoers/test6.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test global defaults filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh
---- a/plugins/sudoers/regress/cvtsudoers/test7.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test user defaults filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh
---- a/plugins/sudoers/regress/cvtsudoers/test8.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test runas defaults filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers
- 
- exit 0
-diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh
---- a/plugins/sudoers/regress/cvtsudoers/test9.sh	Wed Mar 06 20:15:11 2019 -0700
-+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh	Fri Mar 08 06:58:30 2019 -0700
-@@ -3,7 +3,6 @@
- # Test host defaults filtering
- #
- 
--exec 2>&1
- ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers
- 
- exit 0
-