Merge branch 'sr.2019.10.03' into 'master'

Miscellaneous bumps, 2019.10.03

See merge request adelie/packages!361

11 files changed, 158 insertions, 467 deletions

diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD
index dfdd3ae61..a95050c83 100644
--- a/system/cryptsetup/APKBUILD
+++ b/system/cryptsetup/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: 
 pkgname=cryptsetup
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=0
 pkgdesc="Setup tool for block device encryption"
 url="https://gitlab.com/cryptsetup/cryptsetup"
@@ -56,6 +56,6 @@ libs() {
 	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
-sha512sums="f5e2d733b1897f85aec0bd940efd9fb4f20e3628c39f1c00b3a9707ce4c0d9f4192e67dab0588a889ba148874c52bbb410634349490ff8ea7b779c5f8bd7bdd8  cryptsetup-2.2.0.tar.gz
+sha512sums="697d77e756a3eeb8138f974a2259d4f7b9cd32c6d5569b0b04866747abb2a48ae5ed914a044ec8513bc66bbe0a9d10a439cb55f22c7c147b52561c870e964e65  cryptsetup-2.2.1.tar.gz
 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733  dmcrypt.confd
 81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c  dmcrypt.initd"
diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD
index b0b3bc585..146fff618 100644
--- a/system/fakeroot/APKBUILD
+++ b/system/fakeroot/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=fakeroot
-pkgver=1.23
+pkgver=1.24
 pkgrel=0
 pkgdesc="Utility to provide a 'fake' root environment as a non-privileged user"
 arch="all"
@@ -12,7 +12,7 @@ makedepends_host="libcap-dev acl-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
 checkdepends="bash sharutils"
 subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.xz
+source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
 	fakeroot-hide-dlsym-errors.patch
 	fakeroot-no64.patch
 	fakeroot-stdint.patch
@@ -45,7 +45,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036  fakeroot_1.23.orig.tar.xz
+sha512sums="b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487  fakeroot_1.24.orig.tar.gz
 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354  fakeroot-hide-dlsym-errors.patch
 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209  fakeroot-no64.patch
 ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac  fakeroot-stdint.patch
diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD
index 05a9d955a..c789cd3a0 100644
--- a/system/findutils/APKBUILD
+++ b/system/findutils/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: 	
 pkgname=findutils
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.7.0
+pkgrel=0
 pkgdesc="GNU utilities for finding files"
 url="https://www.gnu.org/software/findutils/"
 arch="all"
@@ -12,10 +12,10 @@ depends=""
 makedepends=""
 checkdepends="coreutils diffutils dejagnu"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	localename-test-fix.patch
+source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
 	gnulib-tests-dont-require-gpg-passphrase.patch
 	sysmacros.patch
+	gnulib-test-datetime.patch
 	"
 
 build() {
@@ -39,7 +39,7 @@ package() {
 	rm -rf "$pkgdir"/usr/lib
 }
 
-sha512sums="41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4  findutils-4.6.0.tar.gz
-39fc0bc7602dd5300cf0b5488a7d14b6d00e05fedd6067ff45a229e65ff020d0003c0bb8e43807d9874afeb39c1dae6d612182caeb7de76156e1bc6ceb50adfc  localename-test-fix.patch
-96351821572bee9e23760568b5a9f326c8727b6904a8b9f6fc8e5b8e14b42265c632cea09a913db830844f3015f91a03b9c4dd72862f40a3c3814556497434e2  gnulib-tests-dont-require-gpg-passphrase.patch
-2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487  sysmacros.patch"
+sha512sums="650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e  findutils-4.7.0.tar.xz
+dc7e9c4fdd36d05ca230e3456a8005a5fcd353db07181e0d17ab66db4eb967e6bdfe3b6f1da0edbb38e973fea89ae174ea31e6839f59d3084b15f08de363f139  gnulib-tests-dont-require-gpg-passphrase.patch
+2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487  sysmacros.patch
+8e367ba108b66ea27b2a289e51acbdf540d7e7ab5dfb8347a007eaf763355707db43c44e530fbec40f47578405880ff99d34eec97570365f2ab3439c4f1bf358  gnulib-test-datetime.patch"
diff --git a/system/findutils/gnulib-test-datetime.patch b/system/findutils/gnulib-test-datetime.patch
new file mode 100644
index 000000000..2b227fc27
--- /dev/null
+++ b/system/findutils/gnulib-test-datetime.patch
@@ -0,0 +1,24 @@
+--- coreutils-8.31/gnulib-tests/test-parse-datetime.c.old	2019-06-01 07:46:25.716292871 +0000
++++ coreutils-8.31/gnulib-tests/test-parse-datetime.c	2019-06-01 22:07:59.456653669 +0000
+@@ -432,21 +432,5 @@
+   ASSERT (   parse_datetime (&result, "TZ=\"\\\\\"", &now));
+   ASSERT (   parse_datetime (&result, "TZ=\"\\\"\"", &now));
+ 
+-  /* Outlandishly-long time zone abbreviations should not cause problems.  */
+-  {
+-    static char const bufprefix[] = "TZ=\"";
+-    enum { tzname_len = 2000 };
+-    static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789";
+-    enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix };
+-    char buf[bufsize];
+-    memcpy (buf, bufprefix, sizeof bufprefix - 1);
+-    memset (buf + sizeof bufprefix - 1, 'X', tzname_len);
+-    strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix);
+-    ASSERT (parse_datetime (&result, buf, &now));
+-    LOG (buf, now, result);
+-    ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3
+-            && result.tv_nsec == 123456789);
+-  }
+-
+   return 0;
+ }
diff --git a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch
index 755126f64..46b921ff9 100644
--- a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch
+++ b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch
@@ -1,5 +1,5 @@
---- findutils-4.6.0/tests/test-vc-list-files-git.sh.old	2018-01-03 18:36:29.000000000 -0600
-+++ findutils-4.6.0/tests/test-vc-list-files-git.sh	2018-06-18 21:57:08.305562148 -0500
+--- findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh.old	2018-01-03 18:36:29.000000000 -0600
++++ findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh	2018-06-18 21:57:08.305562148 -0500
 @@ -32,6 +32,7 @@
    touch d/a b c &&
    git config user.email "you@example.com" &&
diff --git a/system/findutils/localename-test-fix.patch b/system/findutils/localename-test-fix.patch
deleted file mode 100644
index 666261f03..000000000
--- a/system/findutils/localename-test-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- findutils-4.6.0/tests/localename.c.old	2016-12-31 13:54:43.000000000 +0000
-+++ findutils-4.6.0/tests/localename.c	2017-07-30 16:40:47.098541270 +0000
-@@ -40,7 +40,7 @@
- # if defined __APPLE__ && defined __MACH__
- #  include <xlocale.h>
- # endif
--# if __GLIBC__ >= 2 && !defined __UCLIBC__
-+# if defined __linux__
- #  include <langinfo.h>
- # endif
- # if !defined IN_LIBINTL
-@@ -2692,16 +2692,19 @@
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
--#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-+#  if defined(_NL_LOCALE_NAME)
-+        const char *name = nl_langinfo(_NL_LOCALE_NAME(category));
-+#   if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
--        const char *name =
--          nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-+	if (name[0] == '\0')
-+          name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-         if (name[0] == '\0')
-           /* Fallback code for glibc < 2.4, which did not implement
-              nl_langinfo (_NL_LOCALE_NAME (category)).  */
-           name = thread_locale->__names[category];
-+#   endif
-         return name;
- #  elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__)
-         /* FreeBSD, Mac OS X */
diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index 4fefa4e22..f5d28b236 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=python3
 pkgver=3.6.9
 _basever="${pkgver%.*}"
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level scripting language"
 url="https://www.python.org"
 arch="all"
@@ -41,6 +41,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
 	musl-find_library.patch
 	fix-xattrs-glibc.patch
 	CVE-2019-16056.patch
+	CVE-2019-16935.patch
 	"
 builddir="$srcdir/Python-$pkgver"
 
@@ -60,6 +61,8 @@ builddir="$srcdir/Python-$pkgver"
 #     - CVE-2019-9948
 #   3.6.9-r1:
 #     - CVE-2019-16056
+#   3.6.9-r2:
+#     - CVE-2019-16935
 
 prepare() {
 	default_prepare
@@ -139,13 +142,14 @@ EOF
 	# dumb
 	fail="$fail test_ssl"					# tries to do SSLv2 which we have disabled in OpenSSL
 
-	# needs network but doesn't declare it
-	fail="$fail test_normalization"
+	# hangs when run with other tests - run separately
+	fail="$fail test_threading"
 
-	# defaults from Tools/scripts/run_tests.py, with -network added
-	use="all,-largefile,-audio,-gui,-network"
+	# defaults from Tools/scripts/run_tests.py + -network,-urlfetch
+	use="all,-largefile,-audio,-gui,-network,-urlfetch"
 
 	make quicktest TESTOPTS="--use '$use' --exclude $fail"
+	make test TESTOPTS="test_threading"
 }
 
 package() {
@@ -188,4 +192,5 @@ wininst() {
 sha512sums="05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819  Python-3.6.9.tar.xz
 ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch
 37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad  fix-xattrs-glibc.patch
-1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0  CVE-2019-16056.patch"
+1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0  CVE-2019-16056.patch
+7f94d887c81f79d90afd4a9621547c13cbdd0232250f62a686b26a63160a4d286a6db9b342d06b9b63af64f994835b489c37bab499a2093c3c2585dc7a04d8a1  CVE-2019-16935.patch"
diff --git a/system/python3/CVE-2019-16935.patch b/system/python3/CVE-2019-16935.patch
new file mode 100644
index 000000000..567eb90fc
--- /dev/null
+++ b/system/python3/CVE-2019-16935.patch
@@ -0,0 +1,80 @@
+From 1698cacfb924d1df452e78d11a4bf81ae7777389 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@redhat.com>
+Date: Sat, 28 Sep 2019 09:33:00 +0200
+Subject: [PATCH] bpo-38243, xmlrpc.server: Escape the server_title (GH-16373)
+ (GH-16441)
+
+Escape the server title of xmlrpc.server.DocXMLRPCServer
+when rendering the document page as HTML.
+
+(cherry picked from commit e8650a4f8c7fb76f570d4ca9c1fbe44e91c8dfaa)
+---
+ Lib/test/test_docxmlrpc.py                       | 16 ++++++++++++++++
+ Lib/xmlrpc/server.py                             |  3 ++-
+ .../2019-09-25-13-21-09.bpo-38243.1pfz24.rst     |  3 +++
+ 3 files changed, 21 insertions(+), 1 deletion(-)
+ create mode 100644 Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst
+
+diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
+index 00903337c07c2..d2adb21af0fb3 100644
+--- a/Lib/test/test_docxmlrpc.py
++++ b/Lib/test/test_docxmlrpc.py
+@@ -1,5 +1,6 @@
+ from xmlrpc.server import DocXMLRPCServer
+ import http.client
++import re
+ import sys
+ from test import support
+ threading = support.import_module('threading')
+@@ -193,6 +194,21 @@ def test_annotations(self):
+              b'method_annotation</strong></a>(x: bytes)</dt></dl>'),
+             response.read())
+ 
++    def test_server_title_escape(self):
++        # bpo-38243: Ensure that the server title and documentation
++        # are escaped for HTML.
++        self.serv.set_server_title('test_title<script>')
++        self.serv.set_server_documentation('test_documentation<script>')
++        self.assertEqual('test_title<script>', self.serv.server_title)
++        self.assertEqual('test_documentation<script>',
++                self.serv.server_documentation)
++
++        generated = self.serv.generate_html_documentation()
++        title = re.search(r'<title>(.+?)</title>', generated).group()
++        documentation = re.search(r'<p><tt>(.+?)</tt></p>', generated).group()
++        self.assertEqual('<title>Python: test_title&lt;script&gt;</title>', title)
++        self.assertEqual('<p><tt>test_documentation&lt;script&gt;</tt></p>', documentation)
++
+ 
+ if __name__ == '__main__':
+     unittest.main()
+diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
+index 3e0dca027f068..efe593748968c 100644
+--- a/Lib/xmlrpc/server.py
++++ b/Lib/xmlrpc/server.py
+@@ -106,6 +106,7 @@ def export_add(self, x, y):
+ 
+ from xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode
+ from http.server import BaseHTTPRequestHandler
++import html
+ import http.server
+ import socketserver
+ import sys
+@@ -904,7 +905,7 @@ def generate_html_documentation(self):
+                                 methods
+                             )
+ 
+-        return documenter.page(self.server_title, documentation)
++        return documenter.page(html.escape(self.server_title), documentation)
+ 
+ class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
+     """XML-RPC and documentation request handler class.
+diff --git a/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst
+new file mode 100644
+index 0000000000000..98d7be129573a
+--- /dev/null
++++ b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst
+@@ -0,0 +1,3 @@
++Escape the server title of :class:`xmlrpc.server.DocXMLRPCServer`
++when rendering the document page as HTML.
++(Contributed by Dong-hee Na in :issue:`38243`.)
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
-