sudo-selinux 1.8.23-2 update

3 files changed, 55 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d9e97b6bea2..f53c2aa988fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sudo-selinux
 	pkgdesc = Give certain users the ability to run some commands as root - SELinux support
-	pkgver = 1.8.22
-	pkgrel = 1
+	pkgver = 1.8.23
+	pkgrel = 2
 	url = https://www.sudo.ws/sudo/
 	install = sudo.install
 	arch = x86_64
@@ -12,18 +12,20 @@ pkgbase = sudo-selinux
 	depends = pam-selinux
 	depends = libldap
 	depends = libselinux
-	provides = sudo=1.8.22-1
-	provides = selinux-sudo=1.8.22-1
+	provides = sudo=1.8.23-2
+	provides = selinux-sudo=1.8.23-2
 	conflicts = sudo
 	conflicts = selinux-sudo
 	backup = etc/sudoers
 	backup = etc/pam.d/sudo
-	source = https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz
-	source = https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz.sig
+	source = https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz
+	source = https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz.sig
+	source = allow-preserve-env-with-arg.patch
 	source = sudo.pam
 	validpgpkeys = 59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB
-	sha256sums = 7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02
+	sha256sums = d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679
 	sha256sums = SKIP
+	sha256sums = 439edd65dbc0115794dec833968c538c98a275522ec9a2e0ac3d4a9eb9cc3b33
 	sha256sums = d1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2
 
 pkgname = sudo-selinux
diff --git a/PKGBUILD b/PKGBUILD
index b2da3a7e67d0..e5431f60bcde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,14 @@
 # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 # SELinux Contributor: Timothée Ravier <tim@siosm.fr>
 # SELinux Contributor: Nicky726 <Nicky726@gmail.com>
+#
+# This PKGBUILD is maintained on https://github.com/archlinuxhardened/selinux.
+# If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=sudo-selinux
-_sudover=1.8.22
+_sudover=1.8.23
 pkgver=${_sudover/p/.p}
-pkgrel=1
+pkgrel=2
 pkgdesc="Give certain users the ability to run some commands as root - SELinux support"
 arch=('x86_64')
 url="https://www.sudo.ws/sudo/"
@@ -22,14 +25,19 @@ provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
 backup=('etc/sudoers' 'etc/pam.d/sudo')
 install=${pkgname/-selinux}.install
 source=(https://www.sudo.ws/sudo/dist/${pkgname/-selinux}-$_sudover.tar.gz{,.sig}
+        allow-preserve-env-with-arg.patch
         sudo.pam)
-sha256sums=('7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02'
+sha256sums=('d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679'
             'SKIP'
+            '439edd65dbc0115794dec833968c538c98a275522ec9a2e0ac3d4a9eb9cc3b33'
             'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
 validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB')
 
 prepare() {
   cd "$srcdir/${pkgname/-selinux}-$_sudover"
+
+  # https://bugzilla.sudo.ws/show_bug.cgi?id=835
+  patch -Np1 -i ../allow-preserve-env-with-arg.patch
 }
 
 build() {
diff --git a/allow-preserve-env-with-arg.patch b/allow-preserve-env-with-arg.patch
new file mode 100644
index 000000000000..8bf6acc1be47
--- /dev/null
+++ b/allow-preserve-env-with-arg.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1526483443 21600
+# Node ID 8ea75ca8fbd2de3877fed1b83a63d9ac8a9c14b1
+# Parent  7972215392428f23eb47c11ddffc0cc8a824fff0
+Only set MODE_PRESERVE_ENV when preserving the entire environment.
+Fixes a problem introduced in 1.8.23 where "sudo -i" could not be
+used in conjunction with --preserve-env=VARIABLE.  Bug #835
+
+diff -r 797221539242 -r 8ea75ca8fbd2 src/parse_args.c
+--- a/src/parse_args.c	Tue May 15 16:35:07 2018 -0600
++++ b/src/parse_args.c	Wed May 16 09:10:43 2018 -0600
+@@ -330,14 +330,15 @@
+ 		case 'E':
+ 		    /*
+ 		     * Optional argument is a comma-separated list of
+-		     * environment variables to preserve.  If not present,
+-		     * preserve everything.
++		     * environment variables to preserve.
++		     * If not present, preserve everything.
+ 		     */
+-		    if (optarg == NULL)
++		    if (optarg == NULL) {
+ 			sudo_settings[ARG_PRESERVE_ENVIRONMENT].value = "true";
+-		    else
++			SET(flags, MODE_PRESERVE_ENV);
++		    } else {
+ 			parse_env_list(&extra_env, optarg);
+-		    SET(flags, MODE_PRESERVE_ENV);
++		    }
+ 		    break;
+ 		case 'e':
+ 		    if (mode && mode != MODE_EDIT)
+