Accepting request 603566 from Base:System

OBS-URL: https://build.opensuse.org/request/show/603566
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sudo?expand=0&rev=96

sudo-1.8.22.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02
-size 3029051

sudo-1.8.23.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d863d29b6fc87bc784a3223350e2b28a2ff2c4738f0fb8f1c92bb38c3017e679
+size 3150674

sudo.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May  2 16:19:56 UTC 2018 - michael@stroeder.com
+
+- Update to 1.8.23
+  * primarily a bug fix release
+  * new cvtsudoers utility (replaces sudoers2ldif) and converts
+    between sudoers formats and perform some basic filtering.
+  * removed obsolete sudoers2ldif-env.patch
+  
 -------------------------------------------------------------------
 Mon Apr 16 15:18:12 UTC 2018 - kstreitova@suse.com
 

sudo.spec

@@ -17,7 +17,7 @@
 
 
 Name:           sudo
-Version:        1.8.22
+Version:        1.8.23
 Release:        0
 Summary:        Execute some commands as root
 License:        ISC
@@ -31,9 +31,8 @@ Source4:        sudo-i.pamd
 Source5:        README.SUSE
 Source6:        fate_313276_test.sh
 Source7:        README_313276.test
-Patch0:         sudoers2ldif-env.patch
 # PATCH-OPENSUSE: the "SUSE" branding of the default sudo config
-Patch1:         sudo-sudoers.patch
+Patch0:         sudo-sudoers.patch
 BuildRequires:  audit-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  groff
@@ -73,7 +72,6 @@ Tests for fate#313276
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %ifarch s390 s390x %{sparc}
@@ -113,7 +111,6 @@ make %{?_smp_mflags}
 install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/sudo
 install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/sudo-i
-mv %{buildroot}%{_docdir}/%{name}/sudoers2ldif %{buildroot}%{_sbindir}
 rm -f %{buildroot}%{_bindir}/sudoedit
 ln -sf %{_bindir}/sudo %{buildroot}%{_bindir}/sudoedit
 install -d -m 755 %{buildroot}%{_sysconfdir}/openldap/schema
@@ -150,6 +147,7 @@ chmod 0440 %{_sysconfdir}/sudoers
 %files -f %{name}.lang
 %license doc/LICENSE
 %doc %{_docdir}/%{name}
+%{_mandir}/man1/cvtsudoers.1%{ext_man}
 %{_mandir}/man5/sudoers.5%{ext_man}
 %{_mandir}/man5/sudo.conf.5%{ext_man}
 %{_mandir}/man5/sudoers.ldap.5%{ext_man}
@@ -169,8 +167,8 @@ chmod 0440 %{_sysconfdir}/sudoers
 %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/sudo.schema
 %{_bindir}/sudoedit
 %{_bindir}/sudoreplay
+%{_bindir}/cvtsudoers
 %{_sbindir}/visudo
-%attr(0755,root,root) %{_sbindir}/sudoers2ldif
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/sesh
 %{_libexecdir}/%{name}/sudo_noexec.so

sudoers2ldif-env.patch

@@ -1,10 +0,0 @@
-Index: b/plugins/sudoers/sudoers2ldif
-===================================================================
---- a/plugins/sudoers/sudoers2ldif
-+++ b/plugins/sudoers/sudoers2ldif
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # Copyright (c) 2007, 2010-2011, 2013 Todd C. Miller <Todd.Miller@sudo.ws>
- #