Rebase to 1.9.17p2

- sudo-1.9.17p2 is available Resolves: rhbz#2383665
Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
2025-10-21 10:16:55 +02:00 · 2025-07-25 18:50:05 +00:00 · 2025-07-17 18:36:52 +00:00 · 2025-07-07 13:15:19 +02:00 · 2025-07-05 12:22:08 +02:00 · 2025-07-05 12:13:06 +02:00
50 changed files with 8109 additions and 734 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,31 @@
 /sudo-738c3cbf3e8400bf4a5aeab8966427ff6d630cd2.tar.gz
 /sudo-1.8.19p2.tar.gz
 /sudo-1.8.20b1.tar.gz
 /sudo-1.8.20p1.tar.gz
 /sudo-1.8.20p2.tar.gz
 /sudo-1.8.21p2.tar.gz
 /sudo-1.8.22b1.tar.gz
 /sudo-1.8.23b3.tar.gz
 /sudo-1.8.23.tar.gz
 /sudo-1.8.25.tar.gz
 /sudo-1.8.25p1.tar.gz
 /sudo-1.8.27.tar.gz
 /sudo-1.8.28.tar.gz
 /sudo-1.8.28p1.tar.gz
 /sudo-1.8.29.tar.gz
 /sudo-1.9.0b1.tar.gz
 /sudo-1.9.0b4.tar.gz
 /sudo-1.9.1.tar.gz
 /sudo-1.9.2.tar.gz
 /sudo-1.9.3p1.tar.gz
 /sudo-1.9.5p1.tar.gz
 /sudo-1.9.5p2.tar.gz
 /sudo-1.9.8p2.tar.gz
 /sudo-1.9.11p3.tar.gz
 /sudo-1.9.12p2.tar.gz
 /sudo-1.9.13p2.tar.gz
 /sudo-1.9.14p3.tar.gz
 /sudo-1.9.15p4.tar.gz
 /sudo-1.9.15p5.tar.gz
 /sudo-1.9.17p1.tar.gz
 /sudo-1.9.17p2.tar.gz
--- a/833
+++ b/833
@ -0,0 +1,833 @@
 * Sat Aug  7 2021 Matthew Miller <mattdm@fedoraproject.org> - 1.9.7p2-2 
 - drop obsolete requirement for post script that doesn't exist anymore 
  (thanks @scfc)
 - remove commented-out lines from prior PR
 * Fri Jul 30 2021 Peter Czanik <peter@czanik.hu> - 1.9.7p2-1
 - update to 1.9.7p2
 - follow up path change in strip patch
 - added --enable-zlib=system configure parameter, so sudo uses system zlib,
  autoconf is no more needed
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5p2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.9.5p2-2
 - Rebuilt for Python 3.10
 * Tue Jan 26 2021 Matthew Miller <mattdm@fedoraproject.org> - 1.9.5p2-1
 - rebase to 1.9.5p2
 Resolves: rhbz#1920611
 - fixed CVE-2021-3156 sudo: Heap buffer overflow in argument parsing
 Resolves: rhbz#1920618
 * Mon Jan 18 2021 Radovan Sroka <rsroka@redhat.com> - 1.9.5p1-1
 - rebase to 1.9.5p1
 Resolves: rhbz#1902758
 - fixed double free in sss_to_sudoers
 Resolves: rhbz#1885874
 - fixed CVE-2021-23239 sudo: possible directory existence test due to race condition in sudoedit
 Resolves: rhbz#1915055
 - fixed CVE-2021-23240 sudo: symbolic link attack in SELinux-enabled sudoedit
 Resolves: rhbz#1915054
 * Wed Jan 13 2021 Jonathan Lebon <jonathan@jlebon.com> - 1.9.3p1-2
 - split out Python modules into separate subpackage
 Resolves: rhbz#1909299
 * Mon Oct 05 2020 Radovan Sroka <rsroka@redhat.com> - 1.9.3p1-1
 - rebase to 1.9.3p1
 - enable python modules
 Resolves: rhbz#1881112
 * Tue Sep 15 2020 Radovan Sroka <rsroka@redhat.com> - 1.9.2-1
 - rebase to 1.9.2
 Resolves: rhbz#1859577
 - added logsrvd subpackage
 - added openssl-devel buildrequires
 Resolves: rhbz#1860653
 - fixed sudo runstatedir path
 - it was generated as /sudo instead of /run/sudo
 Resolves: rhbz#1868215
 - added /var/lib/snapd/snap/bin to secure_path variable
 Resolves: rhbz#1691996
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-3
 - Second attempt - Rebuilt for
  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 * Wed Jul 08 2020 Attila Lakatos <alakatos@redhat.com> - 1.9.1-1
 - rebase to 1.9.1
 Resolves: rhbz#1848788
 - fix rpmlint errors
 Resolves: rhbz#1817139
 * Wed Mar 25 2020 Attila Lakatos <alakatos@redhat.com> - 1.9.0-0.1.b4
 - update to latest development version 1.9.0b4
 Resolves: rhbz#1816593
 - setrlimit(RLIMIT_CORE): Operation not permitted warning message fix
 Resolves: rhbz#1773148
 * Mon Feb 24 2020 Attila Lakatos <alakatos@redhat.com> - 1.9.0-0.1.b1
 - update to latest development version 1.9.0b1
 - added sudo_logsrvd and sudo_sendlog to files and their appropriate man pages
 Resolves: rhbz#1787823
 - Stack based buffer overflow in when pwfeedback is enabled
 Resolves: rhbz#1796945
 - fixes: CVE-2019-18634
 - By using ! character in the shadow file instead of a password hash can access to a run as all sudoer account
 Resolves: rhbz#1786709
 - fixes CVE-2019-19234
 - attacker with access to a Runas ALL sudoer account can impersonate a nonexistent user
 Resolves: rhbz#1786705
 - fixes CVE-2019-19232
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.29-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 * Mon Nov 11 2019 Radovan Sroka <rsroka@redhat.com> - 1.8.29-1
 - rebase to 1.8.29
 Resolves: rhbz#1766233
 * Tue Oct 22 2019 Radovan Sroka <rsroka@redhat.com> - 1.8.28p1-1
 - rebase to 1.8.28p1
 Resolves: rhbz#1762350
 * Tue Oct 15 2019 Radovan Sroka <rsroka@redhat.com> - 1.8.28-1
 - rebase to 1.8.28
 Resolves: rhbz#1761533
 - set always_set_home by default
 Resolves: rhbz#1728687
 - Sync sudoers options from rhel8 to fedora
 Resolves: rhbz#1761781
 - CVE-2019-14287
 Resolves: rhbz#1761584
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.27-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 * Sun Mar 31 2019 Marek Tamaskovic <mtamasko@redhat.com> 1.8.27-2
 - resolves rhbz#1676925
 - Removed PS1, PS2 from sudoers
 * Mon Mar 11 2019 Radovan Sroka <rsroka@redhat.com> 1.8.27-1
 - rebase sudo to 1.8.27
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.25p1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 * Mon Oct 01 2018 Radovan Sroka <rsroka@redhat.com> 1.8.25p1-1
 - rebase sudo to 1.8.25p1
 * Mon Sep 10 2018 Radovan Sroka <rsroka@redhat.com> 1.8.25-1
 - rebase sudo to latest stawble version
 - install /etc/dnf/protected.d/sudo instead of /etc/yum/protected.d/sudo (1626968)
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 * Tue Jul 03 2018 Matthew Miller <mattdm@fedoraproject.org> - 1.8.23-2
 - remove defattr, as default is now sane
 * Wed May 09 2018 Daniel Kopecek <dkopecek@redhat.com> - 1.8.23-1
 - update to 1.8.23
 * Wed Apr 18 2018 Daniel Kopecek <dkopecek@redhat.com> - 1.8.23-0.1.b3
 - update to 1.8.23b3
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-0.2.b1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 * Thu Dec 14 2017 Radovan Sroka <rsroka@redhat.com> - 1.8.22b1-1
 - update to 1.8.22b1
 - Added /usr/local/sbin and /usr/local/bin to secure path rhbz#1166185
 * Thu Sep 21 2017 Marek Tamaskovic <mtamasko@redhat.com> - 1.8.21p2-1
 - update to 1.8.21p2
 - Moved libsudo_util.so from the -devel sub-package to main package (1481225)
 * Wed Sep 06 2017 Matthew Miller <mattdm@fedoraproject.org> - 1.8.20p2-4
 - replace file-based requirements with package-level ones:
 - /etc/pam.d/system-auth to 'pam'
 - /bin/chmod to 'coreutils' (bug #1488934)
 - /usr/bin/vi to vim-minimal
 - ... and make vim-minimal "recommends" instead of "requires", because
  other editors can be configured.
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.20p2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.20p2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 * Thu Jun 01 2017 Daniel Kopecek <dkopecek@redhat.com> 1.8.20p2-1
 - update to 1.8.20p2
 * Wed May 31 2017 Daniel Kopecek <dkopecek@redhat.com> 1.8.20p1-1
 - update to 1.8.20p1
 - fixes CVE-2017-1000367
  Resolves: rhbz#1456884
 * Fri Apr 07 2017 Jiri Vymazal <jvymazal@redhat.com> - 1.8.20-0.1.b1
 - update to latest development version 1.8.20b1
 - added sudo to dnf/yum protected packages
  Resolves: rhbz#1418756
 * Mon Feb 13 2017 Tomas Sykora <tosykora@redhat.com> - 1.8.19p2-1
 - update to 1.8.19p2
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.19-0.3.20161108git738c3cb
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 * Tue Nov 08 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.19-0.2.20161108git738c3cb
 - update to latest development version
 - fixes CVE-2016-7076
 * Fri Sep 23 2016 Radovan Sroka <rsroka@redhat.com> 1.8.19-0.1.20160923git90e4538
 - we were not able to update from rc and beta versions to stable one
 - so this is a new snapshot package which resolves it
 * Wed Sep 21 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18-1
 - update to 1.8.18
 * Fri Sep 16 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18rc4-1
 - update to 1.8.18rc4
 * Wed Sep 14 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18rc2-1
 - update to 1.8.18rc2
 - dropped sudo-1.8.14p1-ldapconfpatch.patch
  upstreamed --> https://www.sudo.ws/pipermail/sudo-workers/2016-September/001006.html
 * Fri Aug 26 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18b2-1
 - update to 1.8.18b2
 - added --disable-root-mailer as configure option
  Resolves: rhbz#1324091
 * Fri Jun 24 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.17p1-1
 - update to 1.8.17p1
 - install the /var/db/sudo/lectured
  Resolves: rhbz#1321414
 * Tue May 31 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-4
 - removed INPUTRC from env_keep to prevent a possible info leak
  Resolves: rhbz#1340701
 * Fri May 13 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-3
 - fixed upstream patch for rhbz#1328735
 * Thu May 12 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-2
 - fixed invalid sesh argument array construction
 * Mon Apr 04 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-1
 - update to 1.8.16
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 * Thu Nov  5 2015 Daniel Kopecek <dkopecek@redhat.com> 1.8.15-1
 - update to 1.8.15
 - fixes CVE-2015-5602
 * Mon Aug 24 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-3
 - enable upstream test suite
 * Mon Aug 24 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-2
 - add patch that resolves initialization problem before sudo_strsplit call
 - add patch that resolves deadcode in visudo.c
 - add patch that removes extra while in visudo.c and sudoers.c
 * Mon Jul 27 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-1
 - update to 1.8.14p3
 * Mon Jul 20 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p1-1
 - update to 1.8.14p1-1
 - rebase sudo-1.8.14b3-ldapconfpatch.patch -> sudo-1.8.14p1-ldapconfpatch.patch
 - rebase sudo-1.8.14b4-docpassexpire.patch -> sudo-1.8.14p1-docpassexpire.patch
 * Tue Jul 14 2015 Radovan Sroka <rsroka@redhat.com> 1.8.12-2
 - add patch3 sudo.1.8.14b4-passexpire.patch that makes change in documentation about timestamp_time
 - Resolves: rhbz#1162070
 * Fri Jul 10 2015 Radovan Sroka <rsroka@redhat.com> - 1.8.14b4-1
 - Update to 1.8.14b4
 - Add own %%{_tmpfilesdir}/sudo.conf
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 * Wed Feb 18 2015 Daniel Kopecek <dkopecek@redhat.com> - 1.8.12
 - update to 1.8.12
 - fixes CVE-2014-9680
 * Mon Nov  3 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.11p2-1
 - update to 1.8.11p2
 - added patch to fix upstream bug #671 -- exiting immediately
  when audit is disabled
 * Tue Sep 30 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.11-1
 - update to 1.8.11
 - major changes & fixes:
  - when running a command in the background, sudo will now forward
    SIGINFO to the command
  - the passwords in ldap.conf and ldap.secret may now be encoded in base64.
  - SELinux role changes are now audited. For sudoedit, we now audit
    the actual editor being run, instead of just the sudoedit command.
  - it is now possible to match an environment variable's value as well as
    its name using env_keep and env_check
  - new files created via sudoedit as a non-root user now have the proper group id
  - sudoedit now works correctly in conjunction with sudo's SELinux RBAC support
  - it is now possible to disable network interface probing in sudo.conf by
    changing the value of the probe_interfaces setting
  - when listing a user's privileges (sudo -l), the sudoers plugin will now prompt
    for the user's password even if the targetpw, rootpw or runaspw options are set.
  - the new use_netgroups sudoers option can be used to explicitly enable or disable
    netgroups support
  - visudo can now export a sudoers file in JSON format using the new -x flag
 - added patch to read ldap.conf more closely to nss_ldap
 - require /usr/bin/vi instead of vim-minimal
 - include pam.d/system-auth in PAM session phase from pam.d/sudo
 - include pam.d/sudo in PAM session phase from pam.d/sudo-i
 * Tue Aug  5 2014 Tom Callaway <spot@fedoraproject.org> - 1.8.8-6
 - fix license handling
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 * Sat May 31 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.8-4
 - Drop ChangeLog, we ship NEWS
 * Mon Mar 10 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.8-3
 - remove bundled copy of zlib before compilation
 - drop the requiretty Defaults setting from sudoers
 * Sat Jan 25 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.8.8-2
 - Own the %%{_libexecdir}/sudo dir.
 * Mon Sep 30 2013 Daniel Kopecek <dkopecek@redhat.com> - 1.8.8-1
 - update to 1.8.8
 - major changes & fixes:
  - LDAP SASL support now works properly with Kerberos
  - root may no longer change its SELinux role without entering a password
  - user messages are now always displayed in the user's locale, even when
    the same message is being logged or mailed in a different locale.
  - log files created by sudo now explicitly have the group set to group
    ID 0 rather than relying on BSD group semantics
  - sudo now stores its libexec files in a sudo subdirectory instead of in
    libexec itself
  - system_group and group_file sudoers group provider plugins are now
    installed by default
  - the paths to ldap.conf and ldap.secret may now be specified as arguments
    to the sudoers plugin in the sudo.conf file
  - ...and many new features and settings. See the upstream ChangeLog for the
    full list.
 - several sssd support fixes
 - added patch to make uid/gid specification parsing more strict (don't accept
  an invalid number as uid/gid)
 - use the _pkgdocdir macro
  (see https://fedoraproject.org/wiki/Changes/UnversionedDocdirs)
 - fixed several bugs found by the clang static analyzer
 - added %%post dependency on chmod
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.6p7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 * Thu Feb 28 2013 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p7-1
 - update to 1.8.6p7
 - fixes CVE-2013-1775 and CVE-2013-1776
 - fixed several packaging issues (thanks to ville.skytta@iki.fi)
  - build with system zlib.
  - let rpmbuild strip libexecdir/*.so.
  - own the %%{_docdir}/sudo-* dir.
  - fix some rpmlint warnings (spaces vs tabs, unescaped macros).
  - fix bogus %%changelog dates.
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.6p3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 * Mon Nov 12 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p3-2
 - added upstream patch for a regression
 - don't include arch specific files in the -devel subpackage
 - ship only one sample plugin in the -devel subpackage
 * Tue Sep 25 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p3-1
 - update to 1.8.6p3
 - drop -pipelist patch (fixed in upstream)
 * Thu Sep  6 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6-1
 - update to 1.8.6
 * Thu Jul 26 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.5-4
 - added patches that fix & improve SSSD support (thanks to pbrezina@redhat.com)
 - re-enabled SSSD support
 - removed libsss_sudo dependency
 * Tue Jul 24 2012 Bill Nottingham <notting@redhat.com> - 1.8.5-3
 - flip sudoers2ldif executable bit after make install, not in setup
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 * Thu May 17 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.5-1
 - update to 1.8.5
 - fixed CVE-2012-2337
 - temporarily disabled SSSD support
 * Wed Feb 29 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-6
 - fixed problems with undefined symbols (rhbz#798517)
 * Wed Feb 22 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-5
 - SSSD patch update
 * Tue Feb  7 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-4
 - added SSSD support
 * Thu Jan 26 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-3
 - added patch for CVE-2012-0809
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3p1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 * Thu Nov 10 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-1
 - update to 1.8.3p1
 - disable output word wrapping if the output is piped
 * Wed Sep  7 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.8.1p2-2
 - Remove execute bit from sample script in docs so we don't pull in perl
 * Tue Jul 12 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.1p2-1
 - rebase to 1.8.1p2
 - removed .sudoi patch
 - fixed typo: RELPRO -> RELRO
 - added -devel subpackage for the sudo_plugin.h header file
 - use default ldap configuration files again
 * Fri Jun  3 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-4
 - build with RELRO
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4p5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 * Mon Jan 17 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-2
 - rebase to 1.7.4p5
 - fixed sudo-1.7.4p4-getgrouplist.patch
 - fixes CVE-2011-0008, CVE-2011-0010
 * Tue Nov 30 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-5
 - anybody in the wheel group has now root access (using password) (rhbz#656873)
 - sync configuration paths with the nss_ldap package (rhbz#652687)
 * Wed Sep 29 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-4
 - added upstream patch to fix rhbz#638345
 * Mon Sep 20 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-3
 - added patch for #635250
 - /var/run/sudo -> /var/db/sudo in .spec
 * Tue Sep  7 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-2
 - sudo now uses /var/db/sudo for timestamps
 * Tue Sep  7 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-1
 - update to new upstream version
 - new command available: sudoreplay
 - use native audit support
 - corrected license field value: BSD -> ISC
 * Wed Jun  2 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p6-2
 - added patch that fixes insufficient environment sanitization issue (#598154)
 * Wed Apr 14 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p6-1
 - update to new upstream version
 - merged .audit and .libaudit patch
 - added sudoers.ldap.5* to files
 * Mon Mar  1 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p5-2
 - update to new upstream version
 * Tue Feb 16 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-5
 - fixed no valid sudoers sources found (#558875)
 * Wed Feb 10 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-4
 - audit related Makefile.in and configure.in corrections
 - added --with-audit configure option
 - removed call to libtoolize
 * Wed Feb 10 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-3
 - fixed segfault when #include directive is used in cycles (#561336)
 * Fri Jan  8 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.7.2p2-2
 - Add /etc/sudoers.d dir and use it in default config (#551470).
 - Drop *.pod man page duplicates from docs.
 * Thu Jan 07 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-1
 - new upstream version 1.7.2p2-1
 - commented out unused aliases in sudoers to make visudo happy (#550239)
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.7.1-7
 - rebuilt with new audit
 * Thu Aug 20 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-6
 - moved secure_path from compile-time option to sudoers file (#517428)
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Thu Jul 09 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-4
 - moved the closefrom() call before audit_help_open() (sudo-1.7.1-auditfix.patch)
 - epoch number sync
 * Mon Jun 22 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-1
 - updated sudo to version 1.7.1
 - fixed small bug in configure.in (sudo-1.7.1-conffix.patch)
 * Tue Feb 24 2009 Daniel Kopecek <dkopecek@redhat.com> 1.6.9p17-6
 - fixed building with new libtool
 - fix for incorrect handling of groups in Runas_User
 - added /usr/local/sbin to secure-path
 * Tue Jan 13 2009 Daniel Kopecek <dkopecek@redhat.com> 1.6.9p17-3
 - build with sendmail installed
 - Added /usr/local/bin to secure-path
 * Tue Sep 02 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p17-2
 - adjust audit patch, do not scream when kernel is
  compiled without audit netlink support (#401201)
 * Fri Jul 04 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p17-1
 - upgrade
 * Wed Jun 18 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-7
 - build with newer autoconf-2.62 (#449614)
 * Tue May 13 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-6
 - compiled with secure path (#80215)
 * Mon May 05 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-5
 - fix path to updatedb in /etc/sudoers (#445103)
 * Mon Mar 31 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-4
 - include ldap files in rpm package (#439506)
 * Thu Mar 13 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-3
 - include [sudo] in password prompt (#437092)
 * Tue Mar 04 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-2
 - audit support improvement
 * Thu Feb 21 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-1
 - upgrade to the latest upstream release
 * Wed Feb 06 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p12-1
 - upgrade to the latest upstream release
 - add selinux support
 * Mon Feb 04 2008 Dennis Gilmore <dennis@ausil.us> 1.6.9p4-6
 - sparc64 needs to be in the -fPIE list with s390
 * Mon Jan 07 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-5
 - fix complains about audit_log_user_command(): Connection
  refused (#401201)
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.6.9p4-4
 - Rebuild for deps
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.6.9p4-3
 - Rebuild for openssl bump
 * Thu Aug 30 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-2
 - fix autotools stuff and add audit support
 * Mon Aug 20 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-1
 - upgrade to upstream release
 * Thu Apr 12 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-14
 - also use getgrouplist() to determine group membership (#235915)
 * Mon Feb 26 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-13
 - fix some spec file issues
 * Thu Dec 14 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-12
 - fix rpmlint issue
 * Thu Oct 26 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-11
 - fix typo in sudoers file (#212308)
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-10
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 * Thu Sep 21 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-9
 - fix sudoers file, X apps didn't work (#206320)
 * Tue Aug 08 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-8
 - use Red Hat specific default sudoers file
 * Sun Jul 16 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-7
 - fix #198755 - make login processes (sudo -i) initialise session keyring
  (thanks for PAM config files to David Howells)
 - add IPv6 support (patch by Milan Zazrivec)
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-6.1
 - rebuild
 * Mon May 29 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-6
 - fix #190062 - "ssh localhost sudo su" will show the password in clear
 * Tue May 23 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-5
 - add LDAP support (#170848)
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-4.1
 - bump again for double-long bug on ppc(64)
 * Wed Feb  8 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-4
 - reset env. by default
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 * Mon Jan 23 2006 Dan Walsh <dwalsh@redhat.com> 1.6.8p12-3
 - Remove selinux patch.  It has been decided that the SELinux patch for sudo is
 - no longer necessary.  In tageted policy it had no effect.  In strict/MLS policy
 - We require the person using sudo to execute newrole before using sudo.
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 * Fri Nov 25 2005 Karel Zak <kzak@redhat.com> 1.6.8p12-1
 - new upstream version 1.6.8p12
 * Tue Nov  8 2005 Karel Zak <kzak@redhat.com> 1.6.8p11-1
 - new upstream version 1.6.8p11
 * Thu Oct 13 2005 Tomas Mraz <tmraz@redhat.com> 1.6.8p9-6
 - use include instead of pam_stack in pam config
 * Tue Oct 11 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-5
 - enable interfaces in selinux patch
 - merge sudo-1.6.8p8-sesh-stopsig.patch to selinux patch
 * Mon Sep 19 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-4
 - fix debuginfo
 * Mon Sep 19 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-3
 - fix #162623 - sesh hangs when child suspends
 * Mon Aug 1 2005 Dan Walsh <dwalsh@redhat.com> 1.6.8p9-2
 - Add back in interfaces call, SELinux has been fixed to work around
 * Tue Jun 21 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-1
 - new version 1.6.8p9 (resolve #161116 - CAN-2005-1993 sudo trusted user arbitrary command execution)
 * Tue May 24 2005 Karel Zak <kzak@redhat.com> 1.6.8p8-2
 - fix #154511 - sudo does not use limits.conf
 * Mon Apr  4 2005 Thomas Woerner <twoerner@redhat.com> 1.6.8p8-1
 - new version 1.6.8p8: new sudoedit and sudo_noexec
 * Wed Feb  9 2005 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-31
 - rebuild
 * Mon Oct  4 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-30.1
 - added missing BuildRequires for libselinux-devel (#132883)
 * Wed Sep 29 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-30
 - Fix missing param error in sesh
 * Mon Sep 27 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-29
 - Remove full patch check from sesh
 * Thu Jul 8 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-28
 - Fix selinux patch to switch to root user
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Tue Apr 13 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-26
 - Eliminate tty handling from selinux
 * Thu Apr  1 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-25
 - fixed spec file: sesh in file section with selinux flag (#119682)
 * Tue Mar 30 2004 Colin Walters <walters@redhat.com> 1.6.7p5-24
 - Enhance sesh.c to fork/exec children itself, to avoid
  having sudo reap all domains.
 - Only reinstall default signal handlers immediately before
  exec of child with SELinux patch
 * Thu Mar 18 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-23
 - change to default to sysadm_r
 - Fix tty handling
 * Thu Mar 18 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-22
 - Add /bin/sesh to run selinux code.
 - replace /bin/bash -c with /bin/sesh
 * Tue Mar 16 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-21
 - Hard code to use "/bin/bash -c" for selinux
 * Tue Mar 16 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-20
 - Eliminate closing and reopening of terminals, to match su.
 * Mon Mar 15 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-19
 - SELinux fixes to make transitions work properly
 * Fri Mar  5 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-18
 - pied sudo
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Tue Jan 27 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-16
 - Eliminate interfaces call, since this requires big SELinux privs
 - and it seems to be useless.
 * Tue Jan 27 2004 Karsten Hopp <karsten@redhat.de> 1.6.7p5-15
 - visudo requires vim-minimal or setting EDITOR to something useful (#68605)
 * Mon Jan 26 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-14
 - Fix is_selinux_enabled call
 * Tue Jan 13 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-13
 - Clean up patch on failure
 * Tue Jan 6 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-12
 - Remove sudo.te for now.
 * Fri Jan 2 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-11
 - Fix usage message
 * Mon Dec 22 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-10
 - Clean up sudo.te to not blow up if pam.te not present
 * Thu Dec 18 2003 Thomas Woerner <twoerner@redhat.com>
 - added missing BuildRequires for groff
 * Tue Dec 16 2003 Jeremy Katz <katzj@redhat.com> 1.6.7p5-9
 - remove left-over debugging code
 * Tue Dec 16 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-8
 - Fix terminal handling that caused Sudo to exit on non selinux machines.
 * Mon Dec 15 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-7
 - Remove sudo_var_run_t which is now pam_var_run_t
 * Fri Dec 12 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-6
 - Fix terminal handling and policy
 * Thu Dec 11 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-5
 - Fix policy
 * Thu Nov 13 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-4.sel
 - Turn on SELinux support
 * Tue Jul 29 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-3
 - Add support for SELinux
 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Mon May 19 2003 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-1
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt
 * Tue Nov 12 2002 Nalin Dahyabhai <nalin@redhat.com> 1.6.6-2
 - remove absolute path names from the PAM configuration, ensuring that the
  right modules get used for whichever arch we're built for
 - don't try to install the FAQ, which isn't there any more
 * Thu Jun 27 2002 Bill Nottingham <notting@redhat.com> 1.6.6-1
 - update to 1.6.6
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 * Thu May 23 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 * Thu Apr 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p2-2
 - Fix bug #63768
 * Thu Mar 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p2-1
 - 1.6.5p2
 * Fri Jan 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p1-1
 - 1.6.5p1
 - Hope this "a new release per day" madness stops ;)
 * Thu Jan 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5-1
 - 1.6.5
 * Tue Jan 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.4p1-1
 - 1.6.4p1
 * Mon Jan 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.4-1
 - Update to 1.6.4
 * Mon Jul 23 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.3p7-2
 - Add build requirements (#49706)
 - s/Copyright/License/
 - bzip2 source
 * Sat Jun 16 2001 Than Ngo <than@redhat.com>
 - update to 1.6.3p7
 - use %%{_tmppath}
 * Fri Feb 23 2001 Bernhard Rosenkraenzer <bero@redhat.com>
 - 1.6.3p6, fixes buffer overrun
 * Tue Oct 10 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - 1.6.3p5
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 * Tue Jun 06 2000 Karsten Hopp <karsten@redhat.de>
 - fixed owner of sudo and visudo
 * Thu Jun  1 2000 Nalin Dahyabhai <nalin@redhat.com>
 - modify PAM setup to use system-auth
 - clean up buildrooting by using the makeinstall macro
 * Tue Apr 11 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - initial build in main distrib
 - update to 1.6.3
 - deal with compressed man pages
 * Tue Dec 14 1999 Preston Brown <pbrown@redhat.com>
 - updated to 1.6.1 for Powertools 6.2
 - config files are now noreplace.
 * Thu Jul 22 1999 Tim Powers <timp@redhat.com>
 - updated to 1.5.9p2 for Powertools 6.1
 * Wed May 12 1999 Bill Nottingham <notting@redhat.com>
 - sudo is configured with pam. There's no pam.d file. Oops.
 * Mon Apr 26 1999 Preston Brown <pbrown@redhat.com>
 - upgraded to 1.59p1 for powertools 6.0
 * Tue Oct 27 1998 Preston Brown <pbrown@redhat.com>
 - fixed so it doesn't find /usr/bin/vi first, but instead /bin/vi (always installed)
 * Thu Oct 08 1998 Michael Maher <mike@redhat.com>
 - built package for 5.2
 * Mon May 18 1998 Michael Maher <mike@redhat.com>
 - updated SPEC file
 * Thu Jan 29 1998 Otto Hammersmith <otto@redhat.com>
 - updated to 1.5.4
 * Tue Nov 18 1997 Otto Hammersmith <otto@redhat.com>
 - built for glibc, no problems
 * Fri Apr 25 1997 Michael Fulbright <msf@redhat.com>
 - Fixed for 4.2 PowerTools
 - Still need to be pamified
 - Still need to move stmp file to /var/log
 * Mon Feb 17 1997 Michael Fulbright <msf@redhat.com>
 - First version for PowerCD.
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (sudo-1.8.20b1.tar.gz) = 8fd9a8d74883b83a4302c0e6e9980773d73c592be69e5246fcab097ae293c299b886a6f83d714bf1638d366f1bc0f00436e291c4f18611049a92f39bdd892e37
+SHA512 (sudo-1.9.17p2.tar.gz) = c8abd6ca56e54a081c9ef1e9f6579d1db5b93ff857e60d1f58d1f425d7dc23c31c58d40b7819780688f66dfdf87a1f3bbe0a78387b007e2beb1b0e546203ea93
--- a/sudo-1.6.7p5-strip.patch
+++ b/sudo-1.6.7p5-strip.patch
@ -1,11 +0,0 @@
 --- sudo-1.6.7p5/install-sh.strip	2005-07-21 14:28:25.000000000 +0200
 +++ sudo-1.6.7p5/install-sh	2005-07-21 14:29:18.000000000 +0200
@@ -138,7 +138,7 @@
 	fi
 	;;
     X-s)
 -	STRIPIT=true
 +	#STRIPIT=true
 	;;
     X--)
 	shift
--- a/sudo.rpmlintrc
+++ b/sudo.rpmlintrc
@ -0,0 +1,16 @@
 # Sudo allows restricted root access for specified users. In other words,
 # it is a special package, which requires special permissions on on some
 # of the installed files.
 addFilter("missing-call-to-setgroups-before-setuid (/usr/bin/sudo|/usr/bin/sudoreplay|/usr/sbin/sudo_logsrvd|/usr/sbin/sudo_sendlog|/usr/libexec/sudo/sudoers.so|)$")
 addFilter("non-readable (/etc/sudo.conf|/etc/sudo_logsrvd.conf|/etc/sudoers|/usr/bin/sudoreplay) .*$")
 addFilter("non-standard-dir-perm (/etc/sudoers.d|/var/db/sudo|/var/db/sudo/lectured) .*$")
 addFilter("setuid-binary /usr/bin/sudo .*$")
 addFilter("non-standard-executable-perm (/usr/bin/sudo|/usr/bin/sudoreplay) .*$")
 addFilter("wrong-file-end-of-line-encoding /usr/share/doc/sudo/schema.ActiveDirectory$")
 addFilter("non-standard-dir-in-var db$")
--- a/sudo.spec
+++ b/sudo.spec
@ -1,35 +1,35 @@
-%global user            millert
+# comment out if no extra version
-%global debug_package   %{nil}
+%global extraver p2
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.8.20
+Version: 1.9.17
-Release: 0.1.b1%{?dist}
+# remove -b 3 after rebase !!!
 # use "-p -e % {?extraver}" when beta
 # use "-e % {?extraver}"" when patch version
 # use nothing special when normal version
 Release: %autorelease -e %{?extraver}
 License: ISC
-Group: Applications/System
+URL: https://www.sudo.ws
-URL: http://www.courtesan.com/sudo/
+Source0: %{url}/dist/%{name}-%{version}%{?extraver}.tar.gz
 Source0: https://www.sudo.ws/dist/beta/%{name}-%{version}b1.tar.gz
 Source1: sudoers
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: pam
-Requires: /etc/pam.d/system-auth
+Recommends: system-default-editor
-Requires: /usr/bin/vi
+Recommends: %{name}-python-plugin%{?_isa} = %{version}-%{release}
 Requires(post): /bin/chmod
 BuildRequires: make
 BuildRequires: pam-devel
 BuildRequires: groff
 BuildRequires: openldap-devel
 BuildRequires: flex
 BuildRequires: bison
-BuildRequires: automake autoconf libtool
+BuildRequires: libtool
 BuildRequires: audit-libs-devel libcap-devel
 BuildRequires: libselinux-devel
-BuildRequires: sendmail
+BuildRequires: systemd-rpm-macros
 BuildRequires: gettext
 BuildRequires: zlib-devel
 # don't strip
 Patch1: sudo-1.6.7p5-strip.patch
 %description
 Sudo (superuser do) allows a system administrator to give certain
 users (or groups of users) the ability to run some (or all) commands
@ -43,78 +43,91 @@ on many different machines.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 %description    devel
 The %{name}-devel package contains header files developing sudo
 plugins that use %{name}.
 %prep
 %setup -q -n sudo-1.8.20b1
-%patch1 -p1 -b .strip
+%package        logsrvd
 Summary:        High-performance log server for %{name}
 Requires:       %{name} = %{version}-%{release}
 BuildRequires:  openssl-devel
 %description    logsrvd
 %{name}-logsrvd is a high-performance log server that accepts event and I/O logs from sudo.
 It can be used to implement centralized logging of sudo logs.
 %package        python-plugin
 Summary:        Python plugin for %{name}
 Requires:       %{name} = %{version}-%{release}
 BuildRequires:  python3-devel
 %description    python-plugin
 %{name}-python-plugin allows using sudo plugins written in Python.
 %prep
 %autosetup -p1 -n %{name}-%{version}%{?extraver}
 %build
 # Remove bundled copy of zlib
 rm -rf zlib/
 autoreconf -I m4 -fv --install
 %ifarch s390 s390x sparc64
 F_PIE=-fPIE
 %else
 F_PIE=-fpie
 %endif
 export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %configure \
        --prefix=%{_prefix} \
        --sbindir=%{_sbindir} \
        --libdir=%{_libdir} \
        --docdir=%{_pkgdocdir} \
        --enable-tmpfiles.d=%{_tmpfilesdir} \
        --enable-openssl \
        --disable-root-mailer \
        --disable-intercept \
        --with-logging=syslog \
        --with-logfac=authpriv \
        --with-pam \
        --with-pam-login \
-        --with-editor=/bin/vi \
+        --with-editor=%{_bindir}/nano:%{_bindir}/vim:%{_bindir}/vi \
        --with-env-editor \
        --with-ignore-dot \
        --with-tty-tickets \
        --with-ldap \
        --with-selinux \
        --with-sendmail=/usr/sbin/sendmail \
        --with-passprompt="[sudo] password for %p: " \
        --enable-python \
        --enable-zlib=system \
        --with-linux-audit \
        --with-sssd
 #       --without-kerb5 \
 #       --without-kerb4
-make
+%make_build
 %check
-make check
+%make_build check
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/*
 install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo
 install -p -d -m 700 $RPM_BUILD_ROOT/var/db/sudo/lectured
 install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
 install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
-#add sudo to protected packages
+# Add sudo to protected packages. Old location for yum/dnf.
-install -p -d -m 755 $RPM_BUILD_ROOT/etc/yum/protected.d/
+mkdir -p $RPM_BUILD_ROOT/etc/dnf/protected.d/
-touch sudo.conf
+echo "sudo" >$RPM_BUILD_ROOT/etc/dnf/protected.d/sudo.conf
-echo sudo > sudo.conf
+# Add sudo to protected packages. New location for dnf5.
-install -p -c -m 0644 sudo.conf $RPM_BUILD_ROOT/etc/yum/protected.d/
+mkdir -p $RPM_BUILD_ROOT/usr/share/dnf5/libdnf.conf.d/
-rm -f sudo.conf
+cat >$RPM_BUILD_ROOT/usr/share/dnf5/libdnf.conf.d/protect-sudo.conf <<EOF
 [main]
 protected_packages = sudo
 EOF
 chmod +x $RPM_BUILD_ROOT%{_libexecdir}/sudo/*.so # for stripping, reset in %%files
 # Remove execute permission on this script so we don't pull in perl deps
 chmod -x $RPM_BUILD_ROOT%{_pkgdocdir}/sudoers2ldif
 # Don't package LICENSE as a doc
 rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/LICENSE
@ -124,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/examples/sudo
 #Remove all .la files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 # Remove sudoers.dist
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sudoers.dist
 %find_lang sudo
 %find_lang sudoers
@ -151,31 +167,34 @@ session    include      sudo
 EOF
 %clean
 rm -rf $RPM_BUILD_ROOT
 %files -f sudo_all.lang
 %defattr(-,root,root)
 %attr(0440,root,root) %config(noreplace) /etc/sudoers
 %attr(0750,root,root) %dir /etc/sudoers.d/
 %config(noreplace) /etc/pam.d/sudo
 %config(noreplace) /etc/pam.d/sudo-i
 %attr(0644,root,root) %{_tmpfilesdir}/sudo.conf
-%attr(0644,root,root) /etc/yum/protected.d/sudo.conf
+%attr(0644,root,root) %config(noreplace) /etc/dnf/protected.d/sudo.conf
 %attr(0640,root,root) %config(noreplace) /etc/sudo.conf
 %dir /usr/share/dnf5
 %dir /usr/share/dnf5/libdnf.conf.d
 /usr/share/dnf5/libdnf.conf.d/protect-sudo.conf
 %dir /var/db/sudo
 %dir /var/db/sudo/lectured
 %attr(4111,root,root) %{_bindir}/sudo
 %{_bindir}/sudoedit
 %attr(0111,root,root) %{_bindir}/sudoreplay
 %attr(0755,root,root) %{_sbindir}/visudo
 %{_bindir}/cvtsudoers
 %dir %{_libexecdir}/sudo
 %attr(0755,root,root) %{_libexecdir}/sudo/sesh
 %attr(0644,root,root) %{_libexecdir}/sudo/sudo_noexec.so
 %attr(0644,root,root) %{_libexecdir}/sudo/sudoers.so
 %attr(0644,root,root) %{_libexecdir}/sudo/audit_json.so
 %attr(0644,root,root) %{_libexecdir}/sudo/group_file.so
 %attr(0644,root,root) %{_libexecdir}/sudo/system_group.so
 %attr(0644,root,root) %{_libexecdir}/sudo/libsudo_util.so.?.?.?
 %{_libexecdir}/sudo/libsudo_util.so.?
 %{_libexecdir}/sudo/libsudo_util.so
 %{_mandir}/man5/sudoers.5*
 %{_mandir}/man5/sudoers.ldap.5*
 %{_mandir}/man5/sudo.conf.5*
@ -183,683 +202,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
 %{_mandir}/man1/cvtsudoers.1.gz
 %{_mandir}/man5/sudoers_timestamp.5.gz
 %dir %{_pkgdocdir}/
 %{_pkgdocdir}/*
 %{!?_licensedir:%global license %%doc}
-%license doc/LICENSE
+%license LICENSE.md
 %exclude %{_pkgdocdir}/ChangeLog
 # Make sure permissions are ok even if we're updating
 %post
 /bin/chmod 0440 /etc/sudoers || :
 %files devel
 %defattr(-,root,root,-)
 %doc plugins/sample/sample_plugin.c
 %{_includedir}/sudo_plugin.h
-%{_mandir}/man8/sudo_plugin.8*
+%{_mandir}/man5/sudo_plugin.5*
-%{_libexecdir}/sudo/libsudo_util.so
+
 %files logsrvd
 %attr(0640,root,root) %config(noreplace) /etc/sudo_logsrvd.conf
 %attr(0755,root,root) %{_sbindir}/sudo_logsrvd
 %attr(0755,root,root) %{_sbindir}/sudo_sendlog
 %{_mandir}/man5/sudo_logsrv.proto.5.gz
 %{_mandir}/man5/sudo_logsrvd.conf.5.gz
 %{_mandir}/man8/sudo_logsrvd.8.gz
 %{_mandir}/man8/sudo_sendlog.8.gz
 %files python-plugin
 %{_mandir}/man5/sudo_plugin_python.5.gz
 %attr(0644,root,root) %{_libexecdir}/sudo/python_plugin.so
 %changelog
-* Fri Apr 07 2017 Jiri Vymazal <jvymazal@redhat.com> - 1.8.20-0.1.b1
+%autochangelog
 - update to latest development version 1.8.20b1
 - added sudo to dnf/yum protected packages
  Resolves: rhbz#1418756
 * Mon Feb 13 2017 Tomas Sykora <tosykora@redhat.com> - 1.8.19p2-1
 - update to 1.8.19p2
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.19-0.3.20161108git738c3cb
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 * Tue Nov 08 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.19-0.2.20161108git738c3cb
 - update to latest development version
 - fixes CVE-2016-7076
 * Fri Sep 23 2016 Radovan Sroka <rsroka@redhat.com> 1.8.19-0.1.20160923git90e4538
 - we were not able to update from rc and beta versions to stable one
 - so this is a new snapshot package which resolves it
 * Wed Sep 21 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18-1
 - update to 1.8.18
 * Fri Sep 16 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18rc4-1
 - update to 1.8.18rc4
 * Wed Sep 14 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18rc2-1
 - update to 1.8.18rc2
 - dropped sudo-1.8.14p1-ldapconfpatch.patch
  upstreamed --> https://www.sudo.ws/pipermail/sudo-workers/2016-September/001006.html
 * Fri Aug 26 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18b2-1
 - update to 1.8.18b2
 - added --disable-root-mailer as configure option
  Resolves: rhbz#1324091
 * Fri Jun 24 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.17p1-1
 - update to 1.8.17p1
 - install the /var/db/sudo/lectured
  Resolves: rhbz#1321414
 * Tue May 31 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-4
 - removed INPUTRC from env_keep to prevent a possible info leak
  Resolves: rhbz#1340701
 * Fri May 13 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-3
 - fixed upstream patch for rhbz#1328735
 * Thu May 12 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-2
 - fixed invalid sesh argument array construction
 * Mon Apr 04 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.16-1
 - update to 1.8.16
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 * Thu Nov  5 2015 Daniel Kopecek <dkopecek@redhat.com> 1.8.15-1
 - update to 1.8.15
 - fixes CVE-2015-5602
 * Mon Aug 24 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-3
 - enable upstream test suite
 * Mon Aug 24 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-2
 - add patch that resolves initialization problem before sudo_strsplit call
 - add patch that resolves deadcode in visudo.c 
 - add patch that removes extra while in visudo.c and sudoers.c
 * Mon Jul 27 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p3-1
 - update to 1.8.14p3
 * Mon Jul 20 2015 Radovan Sroka <rsroka@redhat.com> 1.8.14p1-1
 - update to 1.8.14p1-1
 - rebase sudo-1.8.14b3-ldapconfpatch.patch -> sudo-1.8.14p1-ldapconfpatch.patch
 - rebase sudo-1.8.14b4-docpassexpire.patch -> sudo-1.8.14p1-docpassexpire.patch
 * Tue Jul 14 2015 Radovan Sroka <rsroka@redhat.com> 1.8.12-2
 - add patch3 sudo.1.8.14b4-passexpire.patch that makes change in documentation about timestamp_time
 - Resolves: rhbz#1162070
 * Fri Jul 10 2015 Radovan Sroka <rsroka@redhat.com> - 1.8.14b4-1
 - Update to 1.8.14b4
 - Add own %%{_tmpfilesdir}/sudo.conf
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 * Wed Feb 18 2015 Daniel Kopecek <dkopecek@redhat.com> - 1.8.12
 - update to 1.8.12
 - fixes CVE-2014-9680
 * Mon Nov  3 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.11p2-1
 - update to 1.8.11p2
 - added patch to fix upstream bug #671 -- exiting immediately
  when audit is disabled
 * Tue Sep 30 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.11-1
 - update to 1.8.11
 - major changes & fixes:
  - when running a command in the background, sudo will now forward
    SIGINFO to the command
  - the passwords in ldap.conf and ldap.secret may now be encoded in base64. 
  - SELinux role changes are now audited. For sudoedit, we now audit
    the actual editor being run, instead of just the sudoedit command. 
  - it is now possible to match an environment variable's value as well as
    its name using env_keep and env_check
  - new files created via sudoedit as a non-root user now have the proper group id
  - sudoedit now works correctly in conjunction with sudo's SELinux RBAC support
  - it is now possible to disable network interface probing in sudo.conf by
    changing the value of the probe_interfaces setting
  - when listing a user's privileges (sudo -l), the sudoers plugin will now prompt
    for the user's password even if the targetpw, rootpw or runaspw options are set.
  - the new use_netgroups sudoers option can be used to explicitly enable or disable
    netgroups support
  - visudo can now export a sudoers file in JSON format using the new -x flag
 - added patch to read ldap.conf more closely to nss_ldap
 - require /usr/bin/vi instead of vim-minimal
 - include pam.d/system-auth in PAM session phase from pam.d/sudo
 - include pam.d/sudo in PAM session phase from pam.d/sudo-i
 * Tue Aug  5 2014 Tom Callaway <spot@fedoraproject.org> - 1.8.8-6
 - fix license handling
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 * Sat May 31 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.8.8-4
 - Drop ChangeLog, we ship NEWS
 * Mon Mar 10 2014 Daniel Kopecek <dkopecek@redhat.com> - 1.8.8-3
 - remove bundled copy of zlib before compilation
 - drop the requiretty Defaults setting from sudoers
 * Sat Jan 25 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.8.8-2
 - Own the %%{_libexecdir}/sudo dir.
 * Mon Sep 30 2013 Daniel Kopecek <dkopecek@redhat.com> - 1.8.8-1
 - update to 1.8.8
 - major changes & fixes:
  - LDAP SASL support now works properly with Kerberos
  - root may no longer change its SELinux role without entering a password
  - user messages are now always displayed in the user's locale, even when
    the same message is being logged or mailed in a different locale.
  - log files created by sudo now explicitly have the group set to group
    ID 0 rather than relying on BSD group semantics
  - sudo now stores its libexec files in a sudo subdirectory instead of in
    libexec itself
  - system_group and group_file sudoers group provider plugins are now
    installed by default
  - the paths to ldap.conf and ldap.secret may now be specified as arguments
    to the sudoers plugin in the sudo.conf file
  - ...and many new features and settings. See the upstream ChangeLog for the
    full list.
 - several sssd support fixes
 - added patch to make uid/gid specification parsing more strict (don't accept
  an invalid number as uid/gid)
 - use the _pkgdocdir macro
  (see https://fedoraproject.org/wiki/Changes/UnversionedDocdirs)
 - fixed several bugs found by the clang static analyzer
 - added %%post dependency on chmod
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.6p7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 * Thu Feb 28 2013 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p7-1
 - update to 1.8.6p7
 - fixes CVE-2013-1775 and CVE-2013-1776
 - fixed several packaging issues (thanks to ville.skytta@iki.fi)
  - build with system zlib.
  - let rpmbuild strip libexecdir/*.so.
  - own the %%{_docdir}/sudo-* dir.
  - fix some rpmlint warnings (spaces vs tabs, unescaped macros).
  - fix bogus %%changelog dates.
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.6p3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 * Mon Nov 12 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p3-2
 - added upstream patch for a regression
 - don't include arch specific files in the -devel subpackage
 - ship only one sample plugin in the -devel subpackage
 * Tue Sep 25 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6p3-1
 - update to 1.8.6p3
 - drop -pipelist patch (fixed in upstream)
 * Thu Sep  6 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.6-1
 - update to 1.8.6
 * Thu Jul 26 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.5-4
 - added patches that fix & improve SSSD support (thanks to pbrezina@redhat.com)
 - re-enabled SSSD support
 - removed libsss_sudo dependency
 * Tue Jul 24 2012 Bill Nottingham <notting@redhat.com> - 1.8.5-3
 - flip sudoers2ldif executable bit after make install, not in setup
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 * Thu May 17 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.5-1
 - update to 1.8.5
 - fixed CVE-2012-2337
 - temporarily disabled SSSD support 
 * Wed Feb 29 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-6
 - fixed problems with undefined symbols (rhbz#798517)
 * Wed Feb 22 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-5
 - SSSD patch update
 * Tue Feb  7 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-4
 - added SSSD support
 * Thu Jan 26 2012 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-3
 - added patch for CVE-2012-0809
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3p1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 * Thu Nov 10 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.3p1-1
 - update to 1.8.3p1
 - disable output word wrapping if the output is piped 
 * Wed Sep  7 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.8.1p2-2
 - Remove execute bit from sample script in docs so we don't pull in perl
 * Tue Jul 12 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.8.1p2-1
 - rebase to 1.8.1p2
 - removed .sudoi patch
 - fixed typo: RELPRO -> RELRO
 - added -devel subpackage for the sudo_plugin.h header file
 - use default ldap configuration files again
 * Fri Jun  3 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-4
 - build with RELRO
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4p5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 * Mon Jan 17 2011 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p5-2
 - rebase to 1.7.4p5
 - fixed sudo-1.7.4p4-getgrouplist.patch
 - fixes CVE-2011-0008, CVE-2011-0010
 * Tue Nov 30 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-5
 - anybody in the wheel group has now root access (using password) (rhbz#656873)
 - sync configuration paths with the nss_ldap package (rhbz#652687)
 * Wed Sep 29 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-4
 - added upstream patch to fix rhbz#638345
 * Mon Sep 20 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-3
 - added patch for #635250
 - /var/run/sudo -> /var/db/sudo in .spec
 * Tue Sep  7 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-2
 - sudo now uses /var/db/sudo for timestamps
 * Tue Sep  7 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.4p4-1
 - update to new upstream version
 - new command available: sudoreplay
 - use native audit support
 - corrected license field value: BSD -> ISC
 * Wed Jun  2 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p6-2
 - added patch that fixes insufficient environment sanitization issue (#598154)
 * Wed Apr 14 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p6-1
 - update to new upstream version
 - merged .audit and .libaudit patch
 - added sudoers.ldap.5* to files
 * Mon Mar  1 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p5-2
 - update to new upstream version
 * Tue Feb 16 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-5
 - fixed no valid sudoers sources found (#558875)
 * Wed Feb 10 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-4
 - audit related Makefile.in and configure.in corrections
 - added --with-audit configure option
 - removed call to libtoolize
 * Wed Feb 10 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-3
 - fixed segfault when #include directive is used in cycles (#561336)
 * Fri Jan  8 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.7.2p2-2
 - Add /etc/sudoers.d dir and use it in default config (#551470).
 - Drop *.pod man page duplicates from docs.
 * Thu Jan 07 2010 Daniel Kopecek <dkopecek@redhat.com> - 1.7.2p2-1
 - new upstream version 1.7.2p2-1
 - commented out unused aliases in sudoers to make visudo happy (#550239)
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.7.1-7
 - rebuilt with new audit
 * Thu Aug 20 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-6
 - moved secure_path from compile-time option to sudoers file (#517428)
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 * Thu Jul 09 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-4
 - moved the closefrom() call before audit_help_open() (sudo-1.7.1-auditfix.patch)
 - epoch number sync
 * Mon Jun 22 2009 Daniel Kopecek <dkopecek@redhat.com> 1.7.1-1
 - updated sudo to version 1.7.1
 - fixed small bug in configure.in (sudo-1.7.1-conffix.patch)
 * Tue Feb 24 2009 Daniel Kopecek <dkopecek@redhat.com> 1.6.9p17-6
 - fixed building with new libtool
 - fix for incorrect handling of groups in Runas_User
 - added /usr/local/sbin to secure-path
 * Tue Jan 13 2009 Daniel Kopecek <dkopecek@redhat.com> 1.6.9p17-3
 - build with sendmail installed
 - Added /usr/local/bin to secure-path
 * Tue Sep 02 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p17-2
 - adjust audit patch, do not scream when kernel is
  compiled without audit netlink support (#401201)
 * Fri Jul 04 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p17-1
 - upgrade
 * Wed Jun 18 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-7
 - build with newer autoconf-2.62 (#449614)
 * Tue May 13 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-6
 - compiled with secure path (#80215)
 * Mon May 05 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-5
 - fix path to updatedb in /etc/sudoers (#445103)
 * Mon Mar 31 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-4
 - include ldap files in rpm package (#439506)
 * Thu Mar 13 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-3
 - include [sudo] in password prompt (#437092)
 * Tue Mar 04 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-2
 - audit support improvement
 * Thu Feb 21 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p13-1
 - upgrade to the latest upstream release
 * Wed Feb 06 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p12-1
 - upgrade to the latest upstream release
 - add selinux support
 * Mon Feb 04 2008 Dennis Gilmore <dennis@ausil.us> 1.6.9p4-6
 - sparc64 needs to be in the -fPIE list with s390
 * Mon Jan 07 2008 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-5
 - fix complains about audit_log_user_command(): Connection 
  refused (#401201)
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.6.9p4-4
 - Rebuild for deps
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.6.9p4-3
 - Rebuild for openssl bump
 * Thu Aug 30 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-2
 - fix autotools stuff and add audit support
 * Mon Aug 20 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.9p4-1
 - upgrade to upstream release
 * Thu Apr 12 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-14
 - also use getgrouplist() to determine group membership (#235915)
 * Mon Feb 26 2007 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-13
 - fix some spec file issues
 * Thu Dec 14 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-12
 - fix rpmlint issue
 * Thu Oct 26 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-11
 - fix typo in sudoers file (#212308)
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-10
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 * Thu Sep 21 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-9
 - fix sudoers file, X apps didn't work (#206320)
 * Tue Aug 08 2006 Peter Vrabec <pvrabec@redhat.com> 1.6.8p12-8
 - use Red Hat specific default sudoers file
 * Sun Jul 16 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-7
 - fix #198755 - make login processes (sudo -i) initialise session keyring
  (thanks for PAM config files to David Howells)
 - add IPv6 support (patch by Milan Zazrivec)
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-6.1
 - rebuild
 * Mon May 29 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-6
 - fix #190062 - "ssh localhost sudo su" will show the password in clear
 * Tue May 23 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-5
 - add LDAP support (#170848)
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-4.1
 - bump again for double-long bug on ppc(64)
 * Wed Feb  8 2006 Karel Zak <kzak@redhat.com> 1.6.8p12-4
 - reset env. by default
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.6.8p12-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 * Mon Jan 23 2006 Dan Walsh <dwalsh@redhat.com> 1.6.8p12-3
 - Remove selinux patch.  It has been decided that the SELinux patch for sudo is
 - no longer necessary.  In tageted policy it had no effect.  In strict/MLS policy
 - We require the person using sudo to execute newrole before using sudo.
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 * Fri Nov 25 2005 Karel Zak <kzak@redhat.com> 1.6.8p12-1
 - new upstream version 1.6.8p12
 * Tue Nov  8 2005 Karel Zak <kzak@redhat.com> 1.6.8p11-1
 - new upstream version 1.6.8p11
 * Thu Oct 13 2005 Tomas Mraz <tmraz@redhat.com> 1.6.8p9-6
 - use include instead of pam_stack in pam config
 * Tue Oct 11 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-5
 - enable interfaces in selinux patch
 - merge sudo-1.6.8p8-sesh-stopsig.patch to selinux patch
 * Mon Sep 19 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-4
 - fix debuginfo
 * Mon Sep 19 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-3
 - fix #162623 - sesh hangs when child suspends
 * Mon Aug 1 2005 Dan Walsh <dwalsh@redhat.com> 1.6.8p9-2
 - Add back in interfaces call, SELinux has been fixed to work around
 * Tue Jun 21 2005 Karel Zak <kzak@redhat.com> 1.6.8p9-1
 - new version 1.6.8p9 (resolve #161116 - CAN-2005-1993 sudo trusted user arbitrary command execution)
 * Tue May 24 2005 Karel Zak <kzak@redhat.com> 1.6.8p8-2
 - fix #154511 - sudo does not use limits.conf
 * Mon Apr  4 2005 Thomas Woerner <twoerner@redhat.com> 1.6.8p8-1
 - new version 1.6.8p8: new sudoedit and sudo_noexec
 * Wed Feb  9 2005 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-31
 - rebuild
 * Mon Oct  4 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-30.1
 - added missing BuildRequires for libselinux-devel (#132883) 
 * Wed Sep 29 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-30
 - Fix missing param error in sesh
 * Mon Sep 27 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-29
 - Remove full patch check from sesh
 * Thu Jul 8 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-28
 - Fix selinux patch to switch to root user
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Tue Apr 13 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-26
 - Eliminate tty handling from selinux
 * Thu Apr  1 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-25
 - fixed spec file: sesh in file section with selinux flag (#119682)
 * Tue Mar 30 2004 Colin Walters <walters@redhat.com> 1.6.7p5-24
 - Enhance sesh.c to fork/exec children itself, to avoid
  having sudo reap all domains.
 - Only reinstall default signal handlers immediately before
  exec of child with SELinux patch
 * Thu Mar 18 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-23
 - change to default to sysadm_r 
 - Fix tty handling
 * Thu Mar 18 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-22
 - Add /bin/sesh to run selinux code.
 - replace /bin/bash -c with /bin/sesh
 * Tue Mar 16 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-21
 - Hard code to use "/bin/bash -c" for selinux 
 * Tue Mar 16 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-20
 - Eliminate closing and reopening of terminals, to match su.
 * Mon Mar 15 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-19
 - SELinux fixes to make transitions work properly
 * Fri Mar  5 2004 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-18
 - pied sudo
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Tue Jan 27 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-16
 - Eliminate interfaces call, since this requires big SELinux privs
 - and it seems to be useless.
 * Tue Jan 27 2004 Karsten Hopp <karsten@redhat.de> 1.6.7p5-15
 - visudo requires vim-minimal or setting EDITOR to something useful (#68605)
 * Mon Jan 26 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-14
 - Fix is_selinux_enabled call
 * Tue Jan 13 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-13
 - Clean up patch on failure 
 * Tue Jan 6 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-12
 - Remove sudo.te for now.
 * Fri Jan 2 2004 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-11
 - Fix usage message
 * Mon Dec 22 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-10
 - Clean up sudo.te to not blow up if pam.te not present
 * Thu Dec 18 2003 Thomas Woerner <twoerner@redhat.com>
 - added missing BuildRequires for groff
 * Tue Dec 16 2003 Jeremy Katz <katzj@redhat.com> 1.6.7p5-9
 - remove left-over debugging code
 * Tue Dec 16 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-8
 - Fix terminal handling that caused Sudo to exit on non selinux machines.
 * Mon Dec 15 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-7
 - Remove sudo_var_run_t which is now pam_var_run_t
 * Fri Dec 12 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-6
 - Fix terminal handling and policy
 * Thu Dec 11 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-5
 - Fix policy
 * Thu Nov 13 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-4.sel
 - Turn on SELinux support
 * Tue Jul 29 2003 Dan Walsh <dwalsh@redhat.com> 1.6.7p5-3
 - Add support for SELinux
 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 * Mon May 19 2003 Thomas Woerner <twoerner@redhat.com> 1.6.7p5-1
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt
 * Tue Nov 12 2002 Nalin Dahyabhai <nalin@redhat.com> 1.6.6-2
 - remove absolute path names from the PAM configuration, ensuring that the
  right modules get used for whichever arch we're built for
 - don't try to install the FAQ, which isn't there any more
 * Thu Jun 27 2002 Bill Nottingham <notting@redhat.com> 1.6.6-1
 - update to 1.6.6
 * Fri Jun 21 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 * Thu May 23 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 * Thu Apr 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p2-2
 - Fix bug #63768
 * Thu Mar 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p2-1
 - 1.6.5p2
 * Fri Jan 18 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5p1-1
 - 1.6.5p1
 - Hope this "a new release per day" madness stops ;)
 * Thu Jan 17 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.5-1
 - 1.6.5
 * Tue Jan 15 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.4p1-1
 - 1.6.4p1
 * Mon Jan 14 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.4-1
 - Update to 1.6.4
 * Mon Jul 23 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.6.3p7-2
 - Add build requirements (#49706)
 - s/Copyright/License/
 - bzip2 source
 * Sat Jun 16 2001 Than Ngo <than@redhat.com>
 - update to 1.6.3p7
 - use %%{_tmppath}
 * Fri Feb 23 2001 Bernhard Rosenkraenzer <bero@redhat.com>
 - 1.6.3p6, fixes buffer overrun
 * Tue Oct 10 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - 1.6.3p5
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 * Tue Jun 06 2000 Karsten Hopp <karsten@redhat.de>
 - fixed owner of sudo and visudo
 * Thu Jun  1 2000 Nalin Dahyabhai <nalin@redhat.com>
 - modify PAM setup to use system-auth
 - clean up buildrooting by using the makeinstall macro
 * Tue Apr 11 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - initial build in main distrib
 - update to 1.6.3
 - deal with compressed man pages
 * Tue Dec 14 1999 Preston Brown <pbrown@redhat.com>
 - updated to 1.6.1 for Powertools 6.2
 - config files are now noreplace.
 * Thu Jul 22 1999 Tim Powers <timp@redhat.com>
 - updated to 1.5.9p2 for Powertools 6.1
 * Wed May 12 1999 Bill Nottingham <notting@redhat.com>
 - sudo is configured with pam. There's no pam.d file. Oops.
 * Mon Apr 26 1999 Preston Brown <pbrown@redhat.com>
 - upgraded to 1.59p1 for powertools 6.0
 * Tue Oct 27 1998 Preston Brown <pbrown@redhat.com>
 - fixed so it doesn't find /usr/bin/vi first, but instead /bin/vi (always installed)
 * Thu Oct 08 1998 Michael Maher <mike@redhat.com>
 - built package for 5.2 
 * Mon May 18 1998 Michael Maher <mike@redhat.com>
 - updated SPEC file
 * Thu Jan 29 1998 Otto Hammersmith <otto@redhat.com>
 - updated to 1.5.4
 * Tue Nov 18 1997 Otto Hammersmith <otto@redhat.com>
 - built for glibc, no problems
 * Fri Apr 25 1997 Michael Fulbright <msf@redhat.com>
 - Fixed for 4.2 PowerTools 
 - Still need to be pamified
 - Still need to move stmp file to /var/log
 * Mon Feb 17 1997 Michael Fulbright <msf@redhat.com>
 - First version for PowerCD.
--- a/30
+++ b/30
@ -30,7 +30,7 @@
 # Cmnd_Alias SOFTWARE = /bin/rpm, /usr/bin/up2date, /usr/bin/yum
 ## Services
-# Cmnd_Alias SERVICES = /sbin/service, /sbin/chkconfig
+# Cmnd_Alias SERVICES = /sbin/service, /sbin/chkconfig, /usr/bin/systemctl start, /usr/bin/systemctl stop, /usr/bin/systemctl reload, /usr/bin/systemctl restart, /usr/bin/systemctl status, /usr/bin/systemctl enable, /usr/bin/systemctl disable
 ## Updating the locate database
 # Cmnd_Alias LOCATE = /usr/bin/updatedb
@ -54,14 +54,38 @@
 #
 Defaults   !visiblepw
 #
 # Preserving HOME has security implications since many programs
 # use it when searching for configuration files. Note that HOME
 # is already set when the the env_reset option is enabled, so
 # this option is only effective for configurations where either
 # env_reset is disabled or HOME is present in the env_keep list.
 #
 Defaults    always_set_home
 Defaults    match_group_by_gid
 # Prior to version 1.8.15, groups listed in sudoers that were not
 # found in the system group database were passed to the group
 # plugin, if any. Starting with 1.8.15, only groups of the form
 # %:group are resolved via the group plugin by default.
 # We enable always_query_group_plugin to restore old behavior.
 # Disable this option for new behavior.
 Defaults    always_query_group_plugin
 Defaults    env_reset
 Defaults    env_keep =  "COLORS DISPLAY HOSTNAME HISTSIZE KDEDIR LS_COLORS"
-Defaults    env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE"
+Defaults    env_keep += "MAIL QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE"
 Defaults    env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES"
 Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
 Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
-Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin
+#
 # Adding HOME to env_keep may enable a user to run unrestricted
 # commands via sudo.
 #
 # Defaults   env_keep += "HOME"
 Defaults    secure_path = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/var/lib/snapd/snap/bin
 ## Next comes the main part: which users can run what software on 
 ## which machines (the sudoers file can be shared between multiple
--- a/tests/fully-qualified-hostnames/Makefile
+++ b/tests/fully-qualified-hostnames/Makefile
@ -0,0 +1,71 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /CoreOS/sudo/Sanity/fully-qualified-hostnames
 #   Description: checks if sudo works correctly when FQDN is used in /etc/sudoers
 #   Author: Milos Malik <mmalik@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/CoreOS/sudo/Sanity/fully-qualified-hostnames
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) runtest.sh Makefile PURPOSE ssh-sudo.exp
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	chmod a+x runtest.sh
 	chmod a+x ssh-sudo.exp
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     checks if sudo works correctly when FQDN is used in /etc/sudoers" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          sudo" >> $(METADATA)
 	@echo "Requires:        sudo" >> $(METADATA)
 	@echo "Requires:        sed" >> $(METADATA)
 	@echo "Requires:        grep" >> $(METADATA)
 	@echo "Requires:        mktemp" >> $(METADATA)
 	@echo "Requires:        openssh-server" >> $(METADATA)
 	@echo "Requires:        openssh-clients" >> $(METADATA)
 	@echo "Requires:        expect" >> $(METADATA)
 	@echo "Requires:        shadow-utils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/fully-qualified-hostnames/PURPOSE
+++ b/tests/fully-qualified-hostnames/PURPOSE
@ -0,0 +1,3 @@
 PURPOSE of /CoreOS/sudo/Sanity/fully-qualified-hostnames
 Description: checks if sudo works correctly when FQDN is used in /etc/sudoers
 Author: Milos Malik <mmalik@redhat.com>
--- a/tests/fully-qualified-hostnames/runtest.sh
+++ b/tests/fully-qualified-hostnames/runtest.sh
@ -0,0 +1,106 @@
 #!/bin/bash
 # vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   runtest.sh of /CoreOS/sudo/Sanity/fully-qualified-hostnames
 #   Description: checks if sudo works correctly when FQDN is used in /etc/sudoers
 #   Author: Milos Malik <mmalik@redhat.com>
 #   Edit: Ales "alich" Marecek <amarecek@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Include rhts environment
 . /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 PACKAGE="sudo"
 USER_NAME="user${RANDOM}"
 USER_SECRET="s3kr3T${RANDOM}"
 CONFIG_FILE="/etc/sudoers"
 OUTPUT_FILE="sudo.log"
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm ${PACKAGE}
        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
        rlRun "cp ssh-sudo.exp ${TmpDir}" 0 "Copying expect file"
        rlRun "pushd $TmpDir"
        OUTPUT_FILE="${TmpDir}/${OUTPUT_FILE}"
        rlFileBackup ${CONFIG_FILE} ~/.ssh
        id ${USER_NAME} && userdel -r ${USER_NAME}
        rlRun "useradd ${USER_NAME}"
        rlRun "echo ${USER_SECRET} | passwd --stdin ${USER_NAME}"
        rlRun "sed -i 's/^.*requiretty.*$//' ${CONFIG_FILE}"
        rlRun "sed -i 's/^.*lecture.*$//' ${CONFIG_FILE}"
        rlRun "echo \"Defaults !requiretty, !lecture\" >> ${CONFIG_FILE}"
        rlRun "echo \"${USER_NAME} ${HOSTNAME} = (root) `which id`\" >> ${CONFIG_FILE}"
        rlRun "> ~/.ssh/known_hosts"
    rlPhaseEnd
    if rlIsRHEL 5; then
    rlPhaseStartTest
        rlRun "strings `which sudo` | grep fqdn"
    rlPhaseEnd
    fi
    if echo ${HOSTNAME} | grep -q '^localhost'; then
    rlPhaseStartTest
        rlLogInfo "skipping fqdn option enabled tests, cannot run with local-only host name ${HOSTNAME}"
    rlPhaseEnd
    else
    rlPhaseStartTest "fqdn option is enabled, command is valid"
        rlRun "sed -i 's/^.*fqdn.*$//' ${CONFIG_FILE}"
        rlRun "echo \"Defaults fqdn\" >> ${CONFIG_FILE}"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost id 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertGrep "uid=0.*gid=0.*groups=0" ${OUTPUT_FILE}
    rlPhaseEnd
    rlPhaseStartTest "fqdn option is enabled, command is invalid"
        rlRun "sed -i 's/^.*fqdn.*$//' ${CONFIG_FILE}"
        rlRun "echo \"Defaults fqdn\" >> ${CONFIG_FILE}"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost w 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertGrep "user.*is not allowed to execute" ${OUTPUT_FILE}
    rlPhaseEnd
    fi
    rlPhaseStartTest "fqdn option is disabled, command is valid"
        rlRun "sed -i 's/^.*fqdn.*$//' ${CONFIG_FILE}"
        rlRun "echo \"Defaults !fqdn\" >> ${CONFIG_FILE}"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost id 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertGrep "uid=0.*gid=0.*groups=0" ${OUTPUT_FILE}
    rlPhaseEnd
    rlPhaseStartTest "fqdn option is disabled, command is invalid"
        rlRun "sed -i 's/^.*fqdn.*$//' ${CONFIG_FILE}"
        rlRun "echo \"Defaults !fqdn\" >> ${CONFIG_FILE}"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost w 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertGrep "user.*is not allowed to execute" ${OUTPUT_FILE}
    rlPhaseEnd
    rlPhaseStartCleanup
        rlRun "userdel -rf ${USER_NAME}"
        rlFileRestore
        rlRun "popd"
        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
    rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd
--- a/tests/fully-qualified-hostnames/ssh-sudo.exp
+++ b/tests/fully-qualified-hostnames/ssh-sudo.exp
@ -0,0 +1,20 @@
 #!/usr/bin/expect -f
 # usage:
 # ./ssh-sudo.exp username password hostname command
 set username [lrange $argv 0 0]
 set password [lrange $argv 1 1]
 set hostname [lrange $argv 2 2]
 set command  [lrange $argv 3 3]
 set timeout 5
 spawn ssh -t $username@$hostname sudo $command
 expect "*yes/no*" {
    send -- "yes\r"
 }
 expect "*assword*" {
    send -- "$password\r"
 }
 expect "*assword*" {
    send -- "$password\r"
 }
 expect eof
--- a/tests/run-as/Makefile
+++ b/tests/run-as/Makefile
@ -0,0 +1,68 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /CoreOS/sudo/Sanity/run-as
 #   Description: Test feature 'run as'. This means -u, -g options.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2017 Red Hat, Inc.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/CoreOS/sudo/Sanity/run-as
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) runtest.sh Makefile PURPOSE
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Test feature 'run as'. This means -u, -g options." >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RunFor:          sudo" >> $(METADATA)
 	@echo "Requires:        sudo" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/tcf)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Cleanup)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/testUser)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/ConditionalPhases)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/PURPOSE
+++ b/tests/run-as/PURPOSE
@ -0,0 +1,3 @@
 PURPOSE of /CoreOS/sudo/Sanity/run-as
 Description: Test feature 'run as'. This means -u, -g options.
 Author: Dalibor Pospisil <dapospis@redhat.com>
--- a/tests/run-as/distribution/Library/Cleanup/Makefile
+++ b/tests/run-as/distribution/Library/Cleanup/Makefile
@ -0,0 +1,59 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/Cleanup
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/Cleanup
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides function to define cleanup stack which can do its work at any time of the test run." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "Provides:        library(distribution/Cleanup)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/Cleanup/lib.sh
+++ b/tests/run-as/distribution/Library/Cleanup/lib.sh
@ -0,0 +1,314 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = Cleanup
 #   library-version = 9
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_Cleanup_LIB_VERSION=9
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Cleanup
 =head1 DESCRIPTION
 This file contains functions which provides cleanup stack functionality.
 =head1 USAGE
 To use this functionality you need to import library distribution/Cleanup and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/Cleanup)" >> $(METADATA)
 B<Code example>
 	rlJournalStart
 	  rlPhaseStartSetup
 	    rlImport 'distribution/Cleanup'
 	    tmp=$(mktemp)
 	    CleanupRegister "
 	      rlLog 'Removing data'
 	      rlRun \"rm -f ${tmp}\"
 	    "
 	    rlLog 'Creating some data'
 	    rlRun "echo 'asdfalkjh' > $tmp"
 	    CleanupRegister "
 	      rlLog 'just something to demonstrate unregistering'
 	    "
 	    ID1=$CleanupRegisterID
 	    CleanupUnregister $ID1
 	    CleanupRegister "
 	      rlLog 'just something to demonstrate partial cleanup'
 	    "
 	    ID2=$CleanupRegisterID
 	    CleanupRegister "rlLog 'cleanup some more things'"
 	    # cleanup everything upto ID2
 	    CleanupDo $ID2
 	    CleanupRegister --mark "
 	      rlLog 'yet another something to demonstrate partial cleanup using internal ID saving'
 	    "
 	    CleanupRegister "rlLog 'cleanup some more things'"
 	    # cleanup everything upto last mark
 	    CleanupDo --mark
 	  rlPhaseEnd
 	  rlPhaseStartCleanup
 	    CleanupDo
 	  rlPhaseEnd
 	  rlJournalPrintText
 	rlJournalEnd
 =head1 FUNCTIONS
 =cut
 echo -n "loading library Cleanup v$__INTERNAL_Cleanup_LIB_VERSION... "
 __INTERNAL_Cleanup_stack_file="$BEAKERLIB_DIR/Cleanup_stack"
 touch "$__INTERNAL_Cleanup_stack_file"
 chmod ug+rw "$__INTERNAL_Cleanup_stack_file"
 # CleanupRegister ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # CleanupRegister [--mark] CLEANUP_CODE
 #   --mark  - also mark this position
 CleanupRegister() {
  local mark=0
  [[ "$1" == "--mark" ]] && {
    mark=1
    shift
  }
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  CleanupRegisterID="${RANDOM}$(date +"%s%N")"
  echo -n "Registering cleanup ID=$CleanupRegisterID" >&2
  if [[ $mark -eq 1 ]]; then
    __INTERNAL_CleanupMark=( "$CleanupRegisterID" "${__INTERNAL_CleanupMark[@]}" )
    echo -n " with mark" >&2
  fi
  echo " '$1'" >&2
  rlLogDebug "prepending '$1'"
  local ID_tag="# ID='$CleanupRegisterID'"
  __INTERNAL_Cleanup_stack="$ID_tag
 $1
 $ID_tag
 $__INTERNAL_Cleanup_stack"
  if ! CleanupSetStack "$__INTERNAL_Cleanup_stack"; then
    rlLogError "an error occured while registering the cleanup '$1'"
    return 1
  fi
  return 0
 }; # end of CleanupRegister }}}
 # __INTERNAL_Cleanup_get_stack_part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # 1: ID
 #    -ID    - everything upto the ID
 # 2: ''     - return ID only
 #    'rest' - return exact oposit
 __INTERNAL_Cleanup_get_stack_part() {
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): $* begin"
  local ID="$1"
  local n='1 0 1'
  local stack=''
  [[ "${ID:0:1}" == "-" ]] && {
    ID="${ID:1}"
    n='0 0 1'
  }
  [[ "$2" == "rest" ]] && {
    n="$(echo "${n//0/2}")"
    n="$(echo "${n//1/0}")"
    n="$(echo "${n//2/1}")"
  }
  n=($n)
  [[ -n "$DEBUG" ]] && rlLogDebug "$(set | grep ^n=)"
  local ID_tag="# ID='$ID'"
  while IFS= read -r line; do
    [[ "$line" == "$ID_tag" ]] && {
      n=( "${n[@]:1}" )
      continue
    }
    if [[ $n -eq 0 ]]; then
      stack="$stack
 $line"
    fi
  done < <(echo "$__INTERNAL_Cleanup_stack")
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): cleanup stack part is '${stack:1}'"
  echo "${stack:1}"
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): $* end"
 }; # end of __INTERNAL_Cleanup_get_stack_part }}}
 # CleanupUnregister ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupUnregister() {
  local ID="$1"
  rlLog "Unregistering cleanup ID='$ID'"
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  rlLogDebug "removing ID='$ID'"
  if ! CleanupSetStack "$(__INTERNAL_Cleanup_get_stack_part "$ID" 'rest')"; then
    rlLogError "an error occured while registering the cleanup '$1'"
    return 1
  fi
  return 0
 }; # end of CleanupUnregister }}}
 # CleanupMark ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_CleanupMark=()
 CleanupMark() {
  echo -n "Setting cleanup mark" >&2
  CleanupRegister --mark '' 2>/dev/null
  local res=$?
  echo " ID='$CleanupRegisterID'" >&2
  return $res
 }; # end of CleanupMark }}}
 # CleanupDo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # 1: ''   - cleanup all
 #    ID   - cleanup ID only
 #    -ID  - cleanup all upto ID, including
 #    mark - cleanup all unto last mark, including
 CleanupDo() {
  local ID="$1"
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  local res tmp newstack=''
  tmp="$(mktemp)"
  if [[ "$ID" == "mark" || "$ID" == "--mark" ]]; then
    echo "execute cleanup upto mark='$__INTERNAL_CleanupMark'" >&2
    __INTERNAL_Cleanup_get_stack_part "-$__INTERNAL_CleanupMark" | grep -v "^# ID='" > "$tmp"
    newstack="$(__INTERNAL_Cleanup_get_stack_part "-$__INTERNAL_CleanupMark" 'rest')"
    __INTERNAL_CleanupMark=("${__INTERNAL_CleanupMark[@]:1}")
  elif [[ -n "$ID" ]]; then
    echo "execute cleanup for ID='$ID'" >&2
    __INTERNAL_Cleanup_get_stack_part "$ID" | grep -v "^# ID='" > "$tmp"
    newstack="$(__INTERNAL_Cleanup_get_stack_part "$ID" 'rest')"
  else
    CleanupTrapUnhook
    trap "echo 'temporarily blocking ctrl+c until cleanup is done' >&2" SIGINT
    cat "$__INTERNAL_Cleanup_stack_file" | grep -v "^# ID='" > "$tmp"
    echo "execute whole cleanup stack" >&2
  fi
  . "$tmp"
  res=$?
  [[ $res -ne 0 ]] && {
    echo "cleanup code:" >&2
    cat -n "$tmp" >&2
  }
  rm -f "$tmp"
  echo "cleanup execution done" >&2
  if [[ -z "$ID" ]]; then 
    trap - SIGINT
  fi
  if ! CleanupSetStack "$newstack"; then
    rlLogError "an error occured while cleaning the stack"
    return 1
  fi
  return $res
 }; # end of CleanupDo }}}
 # CleanupGetStack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupGetStack() {
  rlLogDebug "getting cleanup stack"
  if [[ -r "$__INTERNAL_Cleanup_stack_file" ]]; then
    if __INTERNAL_Cleanup_stack="$(cat "$__INTERNAL_Cleanup_stack_file")"; then
      rlLogDebug "cleanup stack is '$__INTERNAL_Cleanup_stack'"
      return 0
    fi
  fi
  rlLogError "could not load cleanup stack"
  return 1
 }; # end of CleanupGetStack }}}
 # CleanupSetStack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupSetStack() {
  rlLogDebug "setting cleanup stack to '$1'"
  __INTERNAL_Cleanup_stack="$1"
  if echo "$__INTERNAL_Cleanup_stack" > "$__INTERNAL_Cleanup_stack_file"; then
    rlLogDebug "cleanup stack is now '$__INTERNAL_Cleanup_stack'"
    return 0
  fi
  rlLogError "could not set cleanup stack"
  return 1
 }; # end of CleanupSetStack }}}
 __INTERNAL_Cleanup_signals=''
 __INTERNAL_Cleanup_trap_code='rlJournalStart; rlPhaseStartCleanup; CleanupDo; rlPhaseEnd; rlJournalPrintText; rlJournalEnd; exit'
 # CleanupTrapHook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupTrapHook() {
  rlLog "register cleanup trap"
  __INTERNAL_Cleanup_signals="${1:-"SIGHUP SIGINT SIGTERM EXIT"}"
  eval "trap \"${__INTERNAL_Cleanup_trap_code}\" $__INTERNAL_Cleanup_signals"
 }; # end of CleanupTrapHook }}}
 # CleanupTrapUnhook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupTrapUnhook() {
  if [[ -n "$__INTERNAL_Cleanup_signals" ]]; then
    rlLog "unregister cleanup trap"
    eval trap - $__INTERNAL_Cleanup_signals
    __INTERNAL_Cleanup_signals=''
  fi
 }; # end of CleanupTrapUnhook }}}
 # CleanupLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupLibraryLoaded() {
  CleanupTrapHook
 }; # end of CleanupLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/run-as/distribution/Library/ConditionalPhases/Makefile
+++ b/tests/run-as/distribution/Library/ConditionalPhases/Makefile
@ -0,0 +1,59 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/ConditionalPhases
 #   Description: Implements conditional phases.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/ConditionalPhases
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Implements conditional phases." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "Provides:        library(distribution/ConditionalPhases)" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/ConditionalPhases/lib.sh
+++ b/tests/run-as/distribution/Library/ConditionalPhases/lib.sh
@ -0,0 +1,166 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = ConditionalPhases
 #   library-version = 2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_ConditionalPhases_LIB_VERSION=2
 __INTERNAL_ConditionalPhases_LIB_NAME='distribution/ConditionalPhases'
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library distribution/condpahses
 =head1 DESCRIPTION
 Implements conditional phases to eficiently select test phases to be execute
 using white and black lists.
 To use this functionality you need to import library
 distribution/ConditionalPhases and add following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/ConditionalPhases)" >> $(METADATA)
 =head1 USAGE
 =head2 Conditional phases
 Each test phase can be conditionally skipped based on a bash regular expression
 given in CONDITIONAL_PHASES_BL and/or CONDITIONAL_PHASES_WL variables.
 =over
 =item CONDITIONAL_PHASES_BL
 It is a black list. If match phase name the respective phase should be skipped.
 =item CONDITIONAL_PHASES_WL
 It is a white list. If does B<not> match phase name the respective phase should
 be skipped excluding phases contatning 'setup' or 'cleanup' in its name. Names
 'setup' and 'cleanup' are matched case insenitively.
 =back
 Actual skipping has to be done in the test case itself by using return code of
 functions I<rlPhaseStart>, I<rlPhaseStartSetup>, I<rlPhaseStartTest>, and
 I<rlPhaseStartCleanup>.
 Example:
    rlPhaseStartTest "phase name" && {
      ...
    rlPhaseEnd; }
 Evaluation of the phase relevancy works as follows:
    1. If CONDITIONAL_PHASES_BL is non-empty and matches phase name => return 2.
    2. If phase name contains word 'setup' or 'cleanup' or CONDITIONAL_PHASES_WL
       is empty => return 0.
    3. If CONDITIONAL_PHASES_WL is non-empty and matches phase name => return 0
       otherwise return 1.
 Normaly Setup and Cleanup phases are not skipped unless hey are B<explicitly>
 black-listed.
 To make the test work properly with conditional phases it is necessary to
 surround phase code with curly brackets and make it conditionally executed
 based on rlPhaseStart* function's exit code the same way as it is demostrated in
 the example above. To make the process easy you can use following command:
    sed 's/rlPhaseStart[^{]*$/& \&\& {/;s/rlPhaseEnd[^}]*$/&; }/'
 This code can be embedded in Makefile by modifying build target to following
 form:
    build: $(BUILT_FILES)
    	grep -Eq 'rlPhase(Start[^{]*|End[^}]*)$' runtest.sh && sed -i 's/rlPhaseStart[^{]*$/& \&\& {/;s/rlPhaseEnd[^}]*$/&; }/' testrun.sh
    	test -x runtest.sh || chmod a+x runtest.sh
 =cut
 #'
 echo -n "loading library $__INTERNAL_ConditionalPhases_LIB_NAME v$__INTERNAL_ConditionalPhases_LIB_VERSION... "
 # ConditionalPhasesLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 ConditionalPhasesLibraryLoaded() {
  if [[ -n "$CONDITIONAL_PHASES_BL" || -n "$CONDITIONAL_PHASES_WL" ]]; then
    __INTERNAL_ConditionalPhases_eval() {
      # check phases black-list
      [[ -n "$CONDITIONAL_PHASES_BL" && "$1" =~ $CONDITIONAL_PHASES_BL ]] && {
        rlLogWarning "phase '$1' should be skipped as it is defined in \$CONDITIONAL_PHASES_BL='$CONDITIONAL_PHASES_BL'"
        return 2
      }
      # always execute Setup, Cleanup and if no PHASES (white-list) specified
      [[ "$1" =~ $(echo "\<[Ss][Ee][Tt][Uu][Pp]\>") || "$1" =~ $(echo "\<[Cc][Ll][Ee][Aa][Nn][Uu][Pp]\>") ]] && {
        rlLogInfo "phase '$1' will be executed as 'setup' and 'cleanup' phases are allowed by default, these can be black-listed"
        return 0
      }
      [[ -z "$CONDITIONAL_PHASES_WL" ]] && {
        rlLogInfo "phase '$1' will be executed as there is no rule for it"
        return 0
      }
      [[ "$1" =~ $CONDITIONAL_PHASES_WL ]] && {
        rlLogInfo "phase '$1' will be executed as it is defined in \$CONDITIONAL_PHASES_WL='$CONDITIONAL_PHASES_WL'"
        return 0
      } || {
        rlLogWarning "phase '$1' should be skipped as it is not defined in \$CONDITIONAL_PHASES_WL='$CONDITIONAL_PHASES_WL'"
        return 1
      }
    }
    rlLogInfo "replacing rlPhaseStart by modified function with conditional phases implemented"
    :; rlPhaseStart() {
        if [ "x$1" = "xFAIL" -o "x$1" = "xWARN" ] ; then
            __INTERNAL_ConditionalPhases_eval "$2" && \
            rljAddPhase "$1" "$2"
            return $?
        else
            rlLogError "rlPhaseStart: Unknown phase type: $1"
            return 1
        fi
    }
  else
    rlLogInfo "Neither CONDITIONAL_PHASES_WL nor CONDITIONAL_PHASES_BL is defined, not applying modifications"
  fi
 }; # end of ConditionalPhasesLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
 echo 'done.'
--- a/tests/run-as/distribution/Library/Log/Makefile
+++ b/tests/run-as/distribution/Library/Log/Makefile
@ -0,0 +1,48 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/Log
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/Log
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides yet another logging facility that does not rely on beakerlib while it can integrate with it." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/opts)" >> $(METADATA)
 	@echo "Provides:        library(distribution/Log)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/Log/lib.sh
+++ b/tests/run-as/distribution/Library/Log/lib.sh
@ -0,0 +1,637 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = Log
 #   library-version = 11
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_Log_LIB_VERSION=11
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Log
 =head1 DESCRIPTION
 This library provide logging capability which does not rely on beakerlib so it
 can be used standalone.
 If it is used within beakerlib it automatically bypass all messages to the
 beakerlib.
 Also this library provide journaling feature so the summary can be printed out
 at the end.
 =head1 USAGE
 To use this functionality you need to import library distribution/Log and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 =head1 FUNCTIONS
 =cut
 echo -n "loading library Log v$__INTERNAL_Log_LIB_VERSION... "
 __INTERNAL_Log_prefix=''
 __INTERNAL_Log_prefix2=''
 __INTERNAL_Log_postfix=''
 __INTERNAL_Log_default_level=3
 __INTERNAL_Log_level=$__INTERNAL_Log_default_level
 LogSetDebugLevel() {
  if [[ -n "$1" ]]; then 
    if [[ "$1" =~ ^[0-9]+$ ]]; then 
      let __INTERNAL_Log_level=$__INTERNAL_Log_default_level+$1;
    else
      __INTERNAL_Log_level=255
    fi
  else
    __INTERNAL_Log_level=$__INTERNAL_Log_default_level
  fi
 }
 LogSetDebugLevel "$DEBUG"
 let __INTERNAL_Log_level_LOG=0
 let __INTERNAL_Log_level_FATAL=0
 let __INTERNAL_Log_level_ERROR=1
 let __INTERNAL_Log_level_WARNING=2
 let __INTERNAL_Log_level_INFO=3
 let __INTERNAL_Log_level_DEBUG=4
 let __INTERNAL_Log_level_MORE=5
 let __INTERNAL_Log_level_MORE_=$__INTERNAL_Log_level_MORE+1
 let __INTERNAL_Log_level_MORE__=$__INTERNAL_Log_level_MORE_+1
 let __INTERNAL_Log_level_MORE___=$__INTERNAL_Log_level_MORE__+1
 # Log ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 Log() {
  LogMore___ -f "begin '$*'"
  local pri=$2 message="${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
  if [[ -n "$pri" ]]; then
    LogPrintMessage "$pri" "$message"
    LogjAddMessage "$pri" "$message"
  else
    LogPrintMessage "$(date +%H:%M:%S)" "$message"
    LogjAddMessage "INFO" "$message"
  fi
  LogMore___ -f "end"
  return 0
 }; # end of Log }}}
 __INTERNAL_Log_condition() {
  cat <<EOF
  __INTERNAL_Log_level_do=$1
  if [[ \$__INTERNAL_Log_level -ge \$__INTERNAL_Log_level_do ]]; then
    [[ -z "$2" ]] && return 1
  else
    return 0
  fi
 EOF
 }
 # LogInfo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogInfo() {
  __INTERNAL_LogPrio='INFO'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_INFO  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='INFO'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogInfo }}}
 # LogWarn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogWarn() {
  __INTERNAL_LogPrio='WARNING'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_WARNING  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='WARNING'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogWarn }}}
 # LogWarning ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogWarning() {
  __INTERNAL_LogPrio='WARNING'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_WARNING  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='WARNING'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogWarning }}}
 # LogError ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogError() {
  __INTERNAL_LogPrio='ERROR'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_ERROR  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='ERROR'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogError }}}
 # LogFatal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFatal() {
  __INTERNAL_LogPrio='FATAL'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_FATAL  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='FATAL'
  Log "$1" $__INTERNAL_LogPrio
  exit 255
  LogMore___ -f "end"
 }; # end of LogFatal }}}
 # LogPASS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogPASS() {
  LogMore___ -f "begin '$*'"
  Log "$1" PASS
  LogMore___ -f "end"
  return 0
 }
 LogPass() {
  LogPASS "$@"
 }; # end of LogPASS }}}
 # LogFAIL ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFAIL() {
  LogMore___ -f "begin '$*'"
  Log "$1" FAIL
  LogMore___ -f "end"
  return 0
 }
 LogFail() {
  LogFAIL "$@"
 }; # end of LogFAIL }}}
 # LogDo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogDo() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    local tmp=${BASH_REMATCH[1]:-1}
    pref="${FUNCNAME[$tmp]}(): "
  }
  LogPrintMessage "$__INTERNAL_LogPrio" "${__INTERNAL_Log_prefix}${pref}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
  return 0
 }; # end of LogDo }}}
 # LogDebug ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogDebug() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  __INTERNAL_Log_level_do=${2:-$__INTERNAL_Log_level_DEBUG}
  __INTERNAL_LogPrio='DEBUG'
  [[ $__INTERNAL_Log_level_do -ge $__INTERNAL_Log_level_MORE ]] && __INTERNAL_LogPrio="${__INTERNAL_LogPrio}:$(($__INTERNAL_Log_level_do-$__INTERNAL_Log_level_DEBUG+1))"
  eval "$(__INTERNAL_Log_condition \${2:-\$__INTERNAL_Log_level_DEBUG}  \"\$1\")"
  LogDo $pref "$1"
  return 0
 }; # end of LogDebug }}}
 # LogMore ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore() {
  # log if DEBUG does not containg a number
  # or the number is greater or equal to 2
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" ${2:-$__INTERNAL_Log_level_MORE}
 }; # end of LogMore }}}
 # LogMore_ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore_() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE_
 }; # end of LogMore_ }}}
 # LogMore__ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore__() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE__
 }; # end of LogMore__ }}}
 # LogMore___ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore___() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE___
 }; # end of LogMore___ }}}
 # LogMoreLow ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreLow_Obs=''
 LogMoreLow() {
  [[ -z "$__INTERNAL_LogMoreLow_Obs" ]] && {
    LogMore_ -f "LogMoreLow is obsoleted by LogMore_"
    __INTERNAL_LogMoreLow_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE_
 }; # end of LogMoreLow }}}
 # LogMoreMed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreMed_Obs=''
 LogMoreMed() {
  [[ -z "$__INTERNAL_LogMoreMed_Obs" ]] && {
    LogMore__ -f "LogMoreMed is obsoleted by LogMore__"
    __INTERNAL_LogMoreMed_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE__
 }; # end of LogMoreMed }}}
 # LogMoreHigh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreHigh_Obs=''
 LogMoreHigh() {
  [[ -z "$__INTERNAL_LogMoreHigh_Obs" ]] && {
    LogMore___ -f "LogMoreHigh is obsoleted by LogMore___"
    __INTERNAL_LogMoreHigh_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE___
 }; # end of LogMoreHigh }}}
 # LogjAddMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogjAddMessage() {
  LogMore__ -f "begin '$*'"
  __INTERNAL_Log_journal=("${__INTERNAL_Log_journal[@]}" "$1" "$2")
  LogMore__ -f "end"
  true;
 }; # end of LogjAddMessage }}}
 # __INTERNAL_LogCenterText ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogCenterText() {
  local spaces='                                                                              '
  # strip colors
  local log_pri_strip=$(echo -en "$1" | sed -r "s:\x1B\[[0-9;]*[mK]::g")
  local log_pri_strip_count=${#log_pri_strip}
  local left_spaces=$(( ($2 - $log_pri_strip_count) / 2 ))
  local right_spaces=$(( $2 - $log_pri_strip_count - $left_spaces ))
  echo -en "${spaces:0:$left_spaces}${1}${spaces:0:$right_spaces}"
 }; # end of __INTERNAL_LogCenterText }}}
 # LogPrintMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogPrintMessage() {
  echo -e ":: [$(__INTERNAL_LogCenterText "$1" 10)] :: $2" >&2
  return 0
 }; # end of LogPrintMessage }}}
 # LogReport ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 LogReport
 Prints final report similar to breakerlib's rlJournalPrintText. This is useful
 mainly if you use TCF without beakerlib.
    LogReport
 =cut
 #'
 LogReport() {
  echo -e "\n ====== Summary report begin ======"
  local a p l i
  for i in $(seq 0 2 $((${#__INTERNAL_Log_journal[@]}-1)) ); do
    LogPrintMessage "${__INTERNAL_Log_journal[$i]}" "${__INTERNAL_Log_journal[$((++i))]}"
  done
  echo " ======= Summary report end ======="
  __INTERNAL_Log_journal=()
 }; # end of LogReport }}}
 # LogFile ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFile() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  cat $1 | while IFS= read line; do
    Log "$line" "${prio:-$2}"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogText ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogText() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  {
    if [[ "$1" == "-" ]]; then
      cat -
    else
      echo "$1"
    fi
  } | while IFS= read line; do
    Log "$line" "${prio:-$2}"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogStrippedDiff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogStrippedDiff() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  {
    if [[ -n "$2" ]]; then
      diff -U0 "$1" "$2"
    else
      cat $1
    fi
  } | grep -v -e '^@@ ' -e '^--- ' -e '^+++ ' | while IFS= read line; do
    Log "$line" "$prio"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogRun ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogRun() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogMore
  local dolog=$?
  [[ $dolog -eq 0 ]] || {
    local param params blacklist="[[:space:]]|>|<|\|"
    [[ "${#@}" -eq 1 ]] && params="$1" || {
      for param in "$@"; do
        if [[ "$param" =~ $blacklist ]]; then
          params="$params \"${param//\"/\\\"}\""
        else
          params="$params $param"
        fi
      done
      params="${params:1}"
    }
    LogDo $pref "executing >>>>> ${params} <<<<<"
  }
  eval "$@"
  ret=$?
  [[ $dolog -eq 0 ]] || LogMore $pref "execution >>>>> ${params} <<<<< returned '$ret'"
  return $ret
 }; # end of LogRun }}}
 # LogDebugNext ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugNext() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}))"
  }
  LogDebug '' ${1:-$__INTERNAL_Log_level_DEBUG} || {
    __INTERNAL_Log_DEBUGING=0
    trap "
      __INTERNAL_Log_DEBUGING_res=\$?
      let __INTERNAL_Log_DEBUGING++
      if [[ \$__INTERNAL_Log_DEBUGING -eq 1 ]]; then
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
      else
        trap - DEBUG
        LogDebug $pref \"execution >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<< returned \$__INTERNAL_Log_DEBUGING_res\" ${1:-$__INTERNAL_Log_level_DEBUG}
      fi" DEBUG 
  }
 }; # end of LogDebugNext }}}
 # LogMoreNext ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogMoreNext() {
  LogMore || {
    local pref=''
    [[ "$1" =~ ^-f([0-9]*) ]] && {
      shift
      pref="-f$((${BASH_REMATCH[1]:-1}))"
    }
    LogDebugNext $pref  ${1:-$__INTERNAL_Log_level_MORE}
  }
 }; # end of LogMoreNext }}}
 LogNext() {
  LogMoreNext "$@"
 }
 # LogDebugOn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugOn() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}))"
  }
  LogDebug '' ${1:-$__INTERNAL_Log_level_DEBUG} || {
    trap "
      __INTERNAL_Log_DEBUGING_res=\$?
      let __INTERNAL_Log_DEBUGING++
      if [[ -z \"\$__INTERNAL_Log_DEBUGING_cmd\" ]]; then
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
      else
        LogDebug $pref \"execution >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<< returned \$__INTERNAL_Log_DEBUGING_res\" ${1:-$__INTERNAL_Log_level_DEBUG}
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        if [[ \"\$__INTERNAL_Log_DEBUGING_cmd\" =~ LogDebugOff ]]; then
          trap - DEBUG
        else
          LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
        fi
      fi" DEBUG 
  }
 }; # end of LogDebugOn }}}
 # LogMoreOn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogMoreOn() {
  LogMore || {
    local pref=''
    [[ "$1" =~ ^-f([0-9]*) ]] && {
      shift
      pref="-f$((${BASH_REMATCH[1]:-1}))"
    }
    LogDebugOn $pref ${1:-$__INTERNAL_Log_level_MORE}
  }
 }; # end of LogMoreOn }}}
 # LogDebugOff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugOff() {
  __INTERNAL_Log_DEBUGING_cmd=''
 }; # end of LogDebugOff }}}
 # LogVar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogVar() {
  [[ -n "$DEBUG" ]] && {
    echo -n 'eval '
    while [[ -n "$1" ]]; do
      echo -n "LogDebug -f \"\$(set | grep -P '^$1=')\";"
      shift
    done
  }
 }; # end of LogVar }}}
 # __INTERNAL_LogRedirectToBeakerlib ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogRedirectToBeakerlib() {
  echo -e "\nrunning inside the beakerlib - redirect own logging functions to beakerlib ones"
  true; LogjAddMessage() {
    LogMore___ -f "begin $*"
    rljAddMessage "$2" "$1"
    LogMore___ -f "end $*"
  }
  true; Log() {
    LogMore___ -f "begin $*"
    case ${2} in
      INFO)
        LogjAddMessage "INFO" "$1"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      BEGIN)
        LogjAddMessage "INFO" "$*:"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      WARNING|WARN|ERROR|FATAL)
        LogjAddMessage "WARNING" "$1"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      SKIP|SKIPPING)
        LogjAddMessage "WARNING" "$*:"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      FAIL)
        rlFail "$*"
        return $?
        ;;
      PASS)
        rlPass "$*"
        return $?
        ;;
      *)
        rlLog "$*"
        ;;
    esac
    LogMore___ -f "end $*"
    return 0;
  }
 }
 # end of __INTERNAL_LogRedirectToBeakerlib }}}
 # LogLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogLibraryLoaded() {
  declare -F rlDie > /dev/null && __INTERNAL_LogRedirectToBeakerlib
  return 0
 }; # end of LogLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/run-as/distribution/Library/opts/Makefile
+++ b/tests/run-as/distribution/Library/opts/Makefile
@ -0,0 +1,48 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/opts
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/opts
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides simple way for defining script's or function's options including help" >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/opts)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/opts/lib.sh
+++ b/tests/run-as/distribution/Library/opts/lib.sh
@ -0,0 +1,338 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = opts
 #   library-version = 4
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_opts_LIB_VERSION=4
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library opts
 =head1 DESCRIPTION
 This library provides simple way for defining script's or function's option
 agruments including help.
 =head1 USAGE
 To use this functionality you need to import library distribution/opts and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/opts)" >> $(METADATA)
 B<Code example>
 	testfunction() {
 	  optsBegin -h "Usage: $0 [options]
 	  options:
 	"
 	  optsAdd 'flag1' --flag
 	  optsAdd 'optional1|o' --optional
 	  optsAdd 'Optional2|O' "echo opt \$1" --optional --long --var-name opt
 	  optsAdd 'mandatory1|m' "echo man \$1" --mandatory
 	  optsDone; eval "${optsCode}"
 	  echo "$optional1"
 	  echo "$opt"
 	  echo "$mandatory1"
 	}
 =head1 FUNCTIONS
 =cut
 echo -n "loading library opts v$__INTERNAL_opts_LIB_VERSION... "
 # optsAdd ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsAdd() {
  LogMoreMed -f "begin '$*'"
  local GETOPT=$(getopt -q -o fomv:d:lh:l -l flag,opt,optional,mandatory,varname:,default:,local,help:,long -- "$@")
  eval set -- "$GETOPT"
  local type='f' var_name var_name_set default help long
  while [[ -n "$@" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    -h|--help)
      shift
      help="$1"
      ;;
    -l|--long)
      long=1
      ;;
    -d|--default)
      shift
      default="$1"
      ;;
    -v|--varname|--var-name)
      shift
      var_name="$1"
      var_name_set=1
      ;;
    -f|--flag)
      type='f'
      ;;
    -o|--opt|--optional)
      type='o'
      ;;
    -m|--mandatory)
      type='m'
      ;;
    *)
      echo "unknown option '$1'"
      return 1
      ;;
    esac
    shift;
  done
  [ -z "$var_name" ] && {
    var_name=$(echo -n "$1" | cut -d '|' -f 1 | sed -e 's/-//g;s/^[0-9]/_\0/')
    LogMoreHigh -f "constructing variable name '$var_name'"
  }
  local opts='' opts_help='' optsi=''
  for optsi in $(echo -n "$1" | tr '|' ' '); do
    if [[ ${#optsi} -ge 2 || $long -eq 1 ]]; then 
      opts="$opts|--$optsi"
      opts_help="$opts_help|--$optsi[=ARG]"
      __INTERNAL_opts_long="${__INTERNAL_opts_long},${optsi}"
      LogMoreHigh -f "adding long option '$optsi'"
      case $type in
      m)
        __INTERNAL_opts_long="${__INTERNAL_opts_long}:"
        ;;
      o)
        __INTERNAL_opts_long="${__INTERNAL_opts_long}::"
        ;;
      esac
    else
      opts="$opts|-$optsi"
      opts_help="$opts_help|-${optsi}[ARG]"
      __INTERNAL_opts_short="${__INTERNAL_opts_short}${optsi}"
      LogMoreHigh -f "adding short option '$optsi'"
      case $type in
      m)
        __INTERNAL_opts_short="${__INTERNAL_opts_short}:"
        ;;
      o)
        __INTERNAL_opts_short="${__INTERNAL_opts_short}::"
        ;;
      esac
    fi
  done
  optsCode="${optsCode}
  ${opts:1})
    optsPresent=\"\${optsPresent}$var_name \""
  LogMoreHigh -f "adding code for processing option '${opts:1}'"
  __INTERNAL_opts_init_var="$__INTERNAL_opts_init_var
 ${__INTERNAL_opts_local}$var_name=()"
  __INTERNAL_opts_default="$__INTERNAL_opts_default
 [[ \"\$optsPresent\" =~ \$(echo \"\<${var_name}\>\") ]] || ${__INTERNAL_opts_local}$var_name='$default'"
  case $type in
  f)
    [[ -z "$2" || -n "$var_name_set" ]] && {
      local val=1
      [[ -n "$default" ]] && val=''
      optsCode="$optsCode
    $var_name+=( '$val' )"
    }
    __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts:1}"
    ;;
  o|m)
    optsCode="$optsCode
    shift"
    [[ -z "$2" || -n "$var_name_set"  ]] && optsCode="$optsCode
    $var_name+=( \"\$1\" )"
    if [[ "$type" == "o" ]]; then
      __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts_help:1}"
    else
      __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts:1} ARG"
    fi
    ;;
  esac
  [[ -n "$2" ]] && {
  optsCode="$optsCode
    $2"
  }
  optsCode="$optsCode
    ;;"
  __INTERNAL_opts_help="${__INTERNAL_opts_help}${help:+
      $help
 }"
  LogMoreMed -f "end"
 }; # end of optsAdd }}}
 # optsBegin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsBegin() {
  LogMoreMed -f "begin '$*'"
  optsCode=''
  optsPresent=' '
  __INTERNAL_opts_short='.'
  __INTERNAL_opts_long='help'
  __INTERNAL_opts_help=''
  __INTERNAL_opts_local=''
  __INTERNAL_opts_default=''
  __INTERNAL_opts_init_var=''
  [[ "${FUNCNAME[1]}" != "main" ]] && __INTERNAL_opts_local='local '
  while [[ -n "$1" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    -h|--help)
      shift
      __INTERNAL_opts_help="$1"
      ;;
    *)
      echo "unknown option '$1'"
      return 1
      ;;
    esac
    shift;
  done
  LogMoreMed -f "end"
 }; # end of optsBegin }}}
 # optsDone ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsDone() {
  LogMoreMed -f "begin '$*'"
  optsCode="${__INTERNAL_opts_local}GETOPT=\$(getopt -o ${__INTERNAL_opts_short} -l ${__INTERNAL_opts_long} -- \"\$@\")
 [[ \$? -ne 0 ]] && {
  echo 'Exiting'
  return 1 >& /dev/null
  exit 1
 }
 eval set -- \"\$GETOPT\"
 ${__INTERNAL_opts_init_var:1}
 while [[ -n \"\$1\" ]]; do
  case \$1 in
  --)
    shift; break
    ;;
 ${optsCode}
  --help)
    echo \"\$__INTERNAL_opts_help\"
    return >& /dev/null
    exit
    ;;
  *)
    echo \"unknown option '\$1'\"
    return 1 >& /dev/null
    exit 1
  ;;
  esac
  shift
 done
 ${__INTERNAL_opts_default:1}
 unset optsCode __INTERNAL_opts_help __INTERNAL_opts_short __INTERNAL_opts_long __INTERNAL_opts_default __INTERNAL_opts_init_var __INTERNAL_opts_local
 "
  if ! echo "$optsCode" | grep -q -- '--help$'; then
    __INTERNAL_opts_help="$__INTERNAL_opts_help
  --help
      Show this help."
  fi
  LogMoreHigh -f "optsCode:\n$optsCode"
  LogMoreMed -f "end"
 }; # end of optsDone }}}
 # optsSelfCheck ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsSelfCheck() {
  optsBegin -h "Usage: $0 [options]
  options:
 "
 #  optsAdd 'help' -f 'echo help'
  optsAdd 'flag' -f 'echo f'
  optsAdd 'optional|o' -o "echo opt \$1"
  optsAdd 'Optional|O' -o "echo opt \$1" --long
  optsAdd 'mandatory|m' -m "echo man \$1"
  optsDone
  echo "${optsCode}"
  echo ...
  eval "${optsCode}"
  echo ...
  fce() {
    optsBegin -h "Usage: $0 [options]
  options:
 "
  #  optsAdd 'help' -f 'echo help'
    optsAdd 'flag' -f
    optsAdd 'optional|o' -o "echo opt \$1"
    optsAdd 'Optional|O' -o "echo opt \$1" --long
    optsAdd 'mandatory|m' -m "echo man \$1"
    optsDone
    echo "${optsCode}"
    echo ...
    eval "${optsCode}"
    echo ...
  }
  echo -e 'test for opts in function\n========================='
  fce --help
 }; # end of optsSelfCheck }}}
 # optsLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsLibraryLoaded() {
  return 0
 }; # end of LogLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/run-as/distribution/Library/tcf/Makefile
+++ b/tests/run-as/distribution/Library/tcf/Makefile
@ -0,0 +1,60 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/tcf
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/tcf
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Block style coding with ability of skipping parts." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/tcf)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/tcf/lib.sh
+++ b/tests/run-as/distribution/Library/tcf/lib.sh
@ -0,0 +1,903 @@
 #!/bin/bash
 # try-check-final.sh
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = tcf
 #   library-version = 14
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_tcf_LIB_VERSION=14
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Try-Check-Final
 =head1 DESCRIPTION
 This file contains functions which gives user the ability to define blocks of
 code where some of the blocks can be automatically skipped if some of preceeding
 blocks failed.
 ATTENTION
 This plugin modifies some beakerlib functions! If you suspect that it breakes
 some functionality set the environment variable TCF_NOHACK to nonempty value.
 =head1 USAGE
 To use this functionality you need to import library distribution/tcf and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/tcf)" >> $(METADATA)
 =head1 FUNCTIONS
 =cut
 echo -n "loading library try-check-final v$__INTERNAL_tcf_LIB_VERSION... "
 let __INTERNAL_tcf_DEBUG_LEVEL_LOW=3
 let __INTERNAL_tcf_DEBUG_LEVEL_MED=$__INTERNAL_tcf_DEBUG_LEVEL_LOW+1
 let __INTERNAL_tcf_DEBUG_LEVEL_HIGH=$__INTERNAL_tcf_DEBUG_LEVEL_LOW+2
 # global variables {{{
 __INTERNAL_tcf_result=0
 __INTERNAL_tcf_result_file="${BEAKERLIB_DIR:-"/var/tmp"}/tcf.result"
 echo -n "$__INTERNAL_tcf_result" > "$__INTERNAL_tcf_result_file"
 __INTERNAL_tcf_current_level_data=()
 __INTERNAL_tcf_current_level_val=0
 __INTERNAL_tcf_journal=()
 #}}}
 # __INTERNAL_tcf_colorize ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_colorize() {
  local a
  case $1 in
    PASS)
      a="${__INTERNAL_tcf_color_green}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    FAIL)
      a="${__INTERNAL_tcf_color_red}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    SKIPPING|WARNING)
      a="${__INTERNAL_tcf_color_yellow}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    BEGIN|INFO)
      a="${__INTERNAL_tcf_color_blue}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    *)
      a=$1
  esac
  echo -n "$a"
 }; # end of __INTERNAL_tcf_colorize }}}
 # __INTERNAL_tcf_colors_setup ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_colors_setup(){
  T="$TERM"
  [[ -t 1 ]] || T=""
  [[ -t 2 ]] || T=""
  [[ "$1" == "--force" ]] && T="xterm"
  case $T in
    xterm|screen)
      __INTERNAL_tcf_color_black="\e[0;30m"
      __INTERNAL_tcf_color_dark_gray="\e[1;30m"
      __INTERNAL_tcf_color_blue="\e[0;34m"
      __INTERNAL_tcf_color_light_blue="\e[1;34m"
      __INTERNAL_tcf_color_green="\e[0;32m"
      __INTERNAL_tcf_color_light_green="\e[1;32m"
      __INTERNAL_tcf_color_cyan="\e[0;36m"
      __INTERNAL_tcf_color_light_cyan="\e[1;36m"
      __INTERNAL_tcf_color_red="\e[0;31m"
      __INTERNAL_tcf_color_light_red="\e[1;31m"
      __INTERNAL_tcf_color_purple="\e[0;35m"
      __INTERNAL_tcf_color_light_purple="\e[1;35m"
      __INTERNAL_tcf_color_brown="\e[0;33m"
      __INTERNAL_tcf_color_yellow="\e[1;33m"
      __INTERNAL_tcf_color_light_gray="\e[0;37m"
      __INTERNAL_tcf_color_white="\e[1;37m"
      __INTERNAL_tcf_color_reset="\e[00m"
      ;;
    * )
      __INTERNAL_tcf_color_black=""
      __INTERNAL_tcf_color_dark_gray=""
      __INTERNAL_tcf_color_blue=""
      __INTERNAL_tcf_color_light_blue=""
      __INTERNAL_tcf_color_green=""
      __INTERNAL_tcf_color_light_green=""
      __INTERNAL_tcf_color_cyan=""
      __INTERNAL_tcf_color_light_cyan=""
      __INTERNAL_tcf_color_red=""
      __INTERNAL_tcf_color_light_red=""
      __INTERNAL_tcf_color_purple=""
      __INTERNAL_tcf_color_light_purple=""
      __INTERNAL_tcf_color_brown=""
      __INTERNAL_tcf_color_yellow=""
      __INTERNAL_tcf_color_light_gray=""
      __INTERNAL_tcf_color_white=""
      __INTERNAL_tcf_color_reset=""
      ;;
  esac
 }; # end of __INTERNAL_tcf_colors_setup
 __INTERNAL_tcf_colors_setup; # }}}
 # __INTERNAL_tcf_copy_function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_copy_function() {
    declare -F $1 > /dev/null || return 1
    eval "$(echo -n "${2}() "; declare -f ${1} | tail -n +2)"
 }; # end of __INTERNAL_tcf_copy_function }}}
 # __INTERNAL_tcf_addE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_addE2R() {
  __INTERNAL_tcf_copy_function $1 TCF_orig_$1
  eval "${1}() { TCF_orig_${1} \"\$@\"; tcfE2R; }"
 }; # end of __INTERNAL_tcf_addE2R }}}
 # __INTERNAL_tcf_insertE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_insertE2R() {
  __INTERNAL_tcf_copy_function $1 TCF_orig_$1
  eval "$(echo -n "${1}() "; declare -f ${1} | tail -n +2 | sed -e 's/\(.*__INTERNAL_ConditionalAssert.*\)/\1\ntcfE2R;/')"
 }; # end of __INTERNAL_tcf_insertE2R }}}
 # __INTERNAL_tcf_get_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_get_current_level() {
  local l=$__INTERNAL_tcf_current_level_val
  if [[ $1 ]]; then
    l=$(($l+$1))
  fi
  local i
  for i in $(seq 1 $(($l*2)) ); do echo -n " "; done
  return $l
 }; # end of __INTERNAL_tcf_get_current_level }}}
 # __INTERNAL_tcf_incr_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_incr_current_level() {
  let __INTERNAL_tcf_current_level_val++
  __INTERNAL_Log_prefix=$(__INTERNAL_tcf_get_current_level)
 }; # end of __INTERNAL_tcf_incr_current_level }}}
 # __INTERNAL_tcf_decr_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_decr_current_level() {
  let __INTERNAL_tcf_current_level_val--
  __INTERNAL_Log_prefix=$(__INTERNAL_tcf_get_current_level)
 }; # end of __INTERNAL_tcf_decr_current_level }}}
 # __INTERNAL_tcf_do_hack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_do_hack() {
   LogDebug "TCF_NOHACK='$TCF_NOHACK'"
   if [[ -z "$TCF_NOHACK" ]]; then
    tcfChk "Apply TCF beakerlib hacks" && {
      rlLog "  injecting tcf hacks into the beakerlib functions"
      echo -n "patching rlLog"
      local rlL=$(declare -f rlLog | sed -e 's|\] ::|\0${__INTERNAL_Log_prefix}|;s|$3 $1"|${3:+"$3 "}$1"|')
      eval "$rlL"
      echo -n ", rljAddTest"
      __INTERNAL_tcf_copy_function rljAddTest __INTERNAL_tcf_orig_rljAddTest
      true; rljAddTest() {
        local a="${__INTERNAL_Log_prefix}$1"; shift
        [[ "$1" != "FAIL" ]]; tcfE2R
        __INTERNAL_tcf_journal=("${__INTERNAL_tcf_journal[@]}" "$1" "$a")
        __INTERNAL_tcf_orig_rljAddTest "$a" "$@"
      }
      echo -n ", rljAddMessage"
      __INTERNAL_tcf_copy_function rljAddMessage __INTERNAL_tcf_orig_rljAddMessage
      true; rljAddMessage() {
        local a="${__INTERNAL_Log_prefix}$1"; shift
        __INTERNAL_tcf_journal=("${__INTERNAL_tcf_journal[@]}" "$1" "$a")
        __INTERNAL_tcf_orig_rljAddMessage "$a" "$@"
      }
      echo -n ", __INTERNAL_LogAndJournalFail"
      __INTERNAL_tcf_copy_function __INTERNAL_LogAndJournalFail __INTERNAL_tcf_orig___INTERNAL_LogAndJournalFail
      true; __INTERNAL_LogAndJournalFail() {
        tcfNOK
        __INTERNAL_tcf_orig___INTERNAL_LogAndJournalFail "$@"
      }
      echo "."
    tcfFin --no-assert --ignore; }
  else
    Log "skip hacking beakerlib functions"
  fi
 }; # end of __INTERNAL_tcf_do_hack }}}
 # __INTERNAL_tcf_kill_old_plugin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_kill_old_plugin() {
    tcfChk "Get rid of the old TCF implementation. removing" && {
      local comma='' i
      for i in Try Chk Fin E2R RES OK NOK NEG TCFcheckFinal TCFreport; do
        echo -n "${comma}rl$i"
        unset -f rl$i
        comma=', '
      done
      echo '.'
    tcfFin --no-assert; }
 }; # end of __INTERNAL_tcf_kill_old_plugin }}}
 : <<'=cut'
 =pod
 =head2 Block functions
 =cut
 # __INTERNAL_tcf_parse_params ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_parse_params() {
  local GETOPT=$(getopt -q -o if: -l ignore,no-assert,fail-tag: -- "$@")
  eval set -- "$GETOPT"
  echo "local ignore noass title fail_tag"
  echo "[ -z \"\$ignore\" ] && ignore=0"
  echo "[ -z \"\$noass\" ] && noass=0"
  echo "[ -z \"\$fail_tag\" ] && fail_tag='FAIL'"
  while [[ -n "$@" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    --ignore|-i)
      echo "ignore=1"
      echo "noass=1"
      ;;
    --no-assert|-n)
      echo "noass=1"
      ;;
    --fail-tag|-f)
      shift
      echo "fail_tag='$1'"
      ;;
    *)
      echo "unknown option $1"
      return 1
      ;;
    esac
    shift;
  done
  [[ -n "$1" ]] && echo "title=\"${1}\""
  echo "eval set -- \"$(echo "$GETOPT" | sed -e 's/.*-- //')\""
 }; # end of __INTERNAL_tcf_parse_params }}}
 # tcfTry ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfTry
 Starting function of block which will be skipped if an error has been detected
 by tcfFin function occurent before.
    tcfTry ["title"] [-i|--ignore] [--no-assert] [--fail-tag TAG] && {
      <some code>
    tcfFin; }
 If title is omitted than noting is printed out so no error will be reported (no
 Assert is executed) thus at least the very top level tcfTry should have title.
 tcfTry and tcfChk blocks are stackable so you can organize them into a hierarchy
 structure.
 Note that tcfFin has to be used otherwise the overall result will not be
 accurate.
 =over
 =item title
 Text which will be displayed and logged at the beginning and the end (in tcfFin
 function) of the block.
 =item -i, --ignore
 Do not propagate the actual result to the higher level result.
 =item -n, --no-assert
 Do not log error into the journal.
 =item -f, --fail-tag TAG
 If the result of the block is FAIL, use TAG instead ie. INFO or WARNING.
 =back
 Returns 1 if and error occured before, otherwise returns 0.
 =cut
 tcfTry() {
  LogMoreLow -f "begin '$*'"
  local vars=$(__INTERNAL_tcf_parse_params "$@") || { Log "$vars" FAIL; return 1; }
  LogMoreMed -f "vars:\n$vars"
  LogMoreLow -f "evaluating options start"
  eval "$vars"
  LogMoreLow -f "evaluating options end"
  local incr=
  local pp="SKIPPING"
  tcfRES; # to set __INTERNAL_tcf_result
  LogMoreLow -f "result was $__INTERNAL_tcf_result"
  if [[ $__INTERNAL_tcf_result -eq 0 ]]; then
    __INTERNAL_tcf_current_level_data=("$__INTERNAL_tcf_result" "$vars" "${__INTERNAL_tcf_current_level_data[@]}")
    pp="BEGIN"
    incr=1
  fi
  if [[ -n "$title" ]]; then
    Log "$title" "$pp"
    [[ -n "$incr" ]] && {
      LogMoreLow -f "increment indentation level"
      __INTERNAL_tcf_incr_current_level
    }
  fi
  LogMoreLow -f "end"
  return $__INTERNAL_tcf_result
 }; # end of tcfTry }}}
 # tcfChk ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfChk
 Starting function of block which will be always executed.
    tcfChk ["title"] [-i|--ignore] [--no-assert] [--fail-tag TAG] && {
      <some code>
    tcfFin; }
 If title is omitted than noting is printed out so no error will be reported (no
 Assert is executed) thus at least the very top level tcfChk should have title.
 tcfTry and tcfChk blocks are stackable so you can organize them into a hierarchy
 structure.
 Note that tcfFin has to be used otherwise the overall result will not be
 accurate.
 For details about arguments see tcfTry.
 Returns 0.
 =cut
 tcfChk() {
  LogMoreLow -f "begin '$*'"
  tcfRES; # to set __INTERNAL_tcf_result
  local res=$__INTERNAL_tcf_result
  tcfRES 0
  tcfTry "$@"
  __INTERNAL_tcf_current_level_data[0]=$res
  LogMoreLow -f "end"
  return $__INTERNAL_tcf_result
 }; # end of tcfChk }}}
 # tcfFin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfFin
 Ending function of block. It does some evaluation of previous local and global
 results and puts it into the global result.
    tcfTry ["title"] && {
      <some code>
    tcfFin [-i|--ignore] [--no-assert] [--fail-tag TAG]; }
 Local result is actualy exit code of the last command int the body.
 Global result is an internal varibale hodning previous local results.
 Respectively last error or 0.
 For details about arguments see tcfTry.
 Returns local result of the preceeding block.
 =cut
 tcfFin() {
  local RES=$?
  LogMoreLow -f "begin '$*'"
  LogMoreMed -f "previous exit code was '$RES'"
  local vars=$(__INTERNAL_tcf_parse_params "$@") || { Log "$vars" FAIL; return 1; }
  LogMoreMed -f "vars:\n$vars"
  LogMoreLow -f "evaluating options start"
  eval "$vars"
  LogMoreLow -f "evaluating options end"
  tcfRES; # to set __INTERNAL_tcf_result
  [[ $RES -ne 0 ]] && tcfRES $RES
  RES=$__INTERNAL_tcf_result
  LogMoreMed -f "overall result is '$RES'"
  LogMoreMed -f "data:\n${__INTERNAL_tcf_current_level_data[1]}"
  LogMoreLow -f "evaluating data start"
  eval "${__INTERNAL_tcf_current_level_data[1]}"
  LogMoreLow -f "evaluating data end"
  if [[ -n "$title" ]]; then
    __INTERNAL_tcf_decr_current_level
    if [[ $ignore -eq 1 ]]; then
      RES=0
      [[ $__INTERNAL_tcf_result -ne 0 ]] && title="$title - ignored"
    fi
    if [[ $noass -eq 0 ]]; then
      tcfAssert0 "$title" $__INTERNAL_tcf_result "$fail_tag"
    else
      if [[ $__INTERNAL_tcf_result -eq 0 ]]; then
        local pp="PASS"
        LogInfo "$title - $pp"
      else
        local pp="${fail_tag:-FAIL}"
        LogWarn "$title - $pp"
      fi
    fi
  fi
  if [[ $__INTERNAL_tcf_result -eq 0 || $ignore -eq 1 ]]; then
    tcfRES ${__INTERNAL_tcf_current_level_data[0]}
  fi
  local i
  for i in 0 1; do unset __INTERNAL_tcf_current_level_data[$i]; done
  __INTERNAL_tcf_current_level_data=("${__INTERNAL_tcf_current_level_data[@]}")
  LogMoreLow -f "end"
  return $RES
 }; # end of tcfFin }}}
 : <<'=cut'
 =pod
 =head2 Functions for manipulation with the results
 =cut
 # tcfRES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfRES
 Sets and return the global result.
    tcfRES [-p|--print] [number]
 =over
 =item -p --print
 Also print the result value.
 =item number
 If present the global result is set to this value.
 =back
 Returns global result.
 =cut
 tcfRES() {
  local p=0
  while [[ -n "$1" ]]; do
    case $1 in
    --print|-p)
      p=1
      ;;
    *)
      break
      ;;
    esac
    shift
  done
  if [[ -n "$1" ]]; then
    __INTERNAL_tcf_result=$1
    echo -n "$__INTERNAL_tcf_result" > "$__INTERNAL_tcf_result_file"
  else
    __INTERNAL_tcf_result="$(cat "$__INTERNAL_tcf_result_file")"
  fi
  [[ $p -eq 1 ]] && echo $__INTERNAL_tcf_result
  return $__INTERNAL_tcf_result
 }; # end of tcfRES }}}
 # tcfOK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfOK
 Sets the global result to 0.
    tcfOK
 Returns global result.
 =cut
 tcfOK() {
  tcfRES 0
 }; # end of tcfOK }}}
 # tcfNOK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfNOK
 Sets the global result to 1 or given number.
    tcfNOK [number]
 =over
 =item number
 If present the global result is set to this value.
 =back
 Returns global result.
 =cut
 tcfNOK() {
  if [[ -n "$1" ]]; then
    [[ $1 -eq 0 ]] && echo "You have requested result '0'. You should use tcfOK instead."
    tcfRES $1
  else
    tcfRES 1
  fi
 }; # end of tcfNOK }}}
 # tcfE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfE2R
 Converts exit code of previous command to local result if the exit code is not 0
 (zero).
    <some command>
    tcfE2R [number]
 =over
 =item number
 If present use it instead of exit code.
 =back
 Returns original exit code or given number.
 =cut
 tcfE2R() {
  local res=$?
  [[ -n "$1" ]] && res=$1
  [[ $res -ne 0 ]] && tcfRES $res
  return $res
 }; # end of tcfE2R }}}
 : <<'=cut'
 =pod
 =head2 Functions for manipulation with the exit codes
 =cut
 # tcfNEG ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfNEG
 Negates exit code of previous command.
    <some command>
    tcfNEG
 Returns 1 if original exit code was 0, otherwise returns 0.
 =cut
 tcfNEG() {
  [[ $? -eq 0 ]] && return 1 || return 0
 }; # end of tcfNEG }}}
 # tcfRun ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfRun
 Simmilar to rlRun but it also annouces the beginnign of the command.
    tcfRun [--fail-tag|-f TAG] command [exp_result [title]]
 Moreover if 'command not found' appears on STDERR it should produce WARNING.
 =over
 =item command
 Command to execute.
 =item exp_result
 Specification of expect resutl.
 It can be a list of values or intervals or * for any result. Also negation (!) can be used.
 Example:
    <=2,7,10-12,>252,!254 means following values 0,1,2,7,10,11,12,253,255
 =item title
 Text which will be displayed and logged at the beginning and the end of command execution.
 =item --fail-tag | -f
 If the command fails use TAG instead of FAIL.
 =back
 Returns exit code of the executed command.
 =cut
 tcfRun() {
  LogMore_ -f "begin      $*"
  optsBegin
  optsAdd 'fail-tag|f' --mandatory
  optsAdd 'timeout' --optional 'timeout="${1:-10}"'
  optsAdd 'kill-timeout|kt' --mandatory --default 5
  optsAdd 'signal' --mandatory --default TERM
  optsAdd 'check-code' --mandatory --default 'kill -0 $cmdpid >&/dev/null'
  optsAdd 'kill-code' --mandatory --default '/bin/kill -$signal -- $cmdpid'
  optsAdd 'allow-skip|as' --flag
  optsAdd 'no-assert|n' --flag
  optsDone; eval "${optsCode}"
  LogMore_ -f "after opts $*"
  [[ -z "$allowskip" ]] && tcfChk
    local orig_expecode="${2:-0}"
    local expecode="$orig_expecode"
    [[ "$expecode" == "*" ]] && expecode="0-255"
    local command="$1"
    local comment="Running command '$command'"
    [[ -n "$3" ]] && comment="$3"
    [[ -n "$expecode" ]] && {
      expecode=$(echo "$expecode" | tr ',-' '\n ' | sed -e 's/^!=/!/;s/^=//;s/^<=\(.\+\)$/0 \1/;s/^>=\(.\+\)$/\1 255/;s/^<\(.\+\)$/0 \$(( \1 - 1 ))/;s/^>\(.\+\)$/\$(( \1 + 1 )) 255/' | while read line; do [[ "$line" =~ ^[^\ ]+$ ]] && echo "$line" || eval seq $line; done; )
      tcfE2R
      LogMoreLow -f "orig_expecode='$orig_expecode'" 
      LogMoreLow -f "expecode='$expecode'" 
    }
    tcfTry ${noassert:+--no-assert} "$comment" && {
      local errout=$(mktemp)
      LogMoreLow -f "executing '$command'"
      if [[ "$optsPresent" =~ $(echo "\<timeout\>") ]]; then
        LogDebug -f "using watchdog feature"
        local ec="$(mktemp)"
        eval "$command; echo $? > $ec 2> >(tee $errout)" &
        local cmdpid=$!
        local time_start=$(date +%s)
        local timeout_t=$(( $time_start + $timeout ))
        while true; do
          if ! eval "$checkcode"; then
             Log "command finished in $(($(date +%s) - $time_start )) seconds"
             local res="$(cat $ec)"
             break
          elif [[ $(date +%s) -ge $timeout_t ]]; then
            echo
            Log "command is still running, sending $signal signal"
            eval "$killcode"
            tcfNOK 255
            echo 255 > $ec
            let timeout_t+=killtimeout
            signal=KILL
          fi
          sleep 0.1
        done
        rm -f $ec
      else
        eval "$command" 2> >(tee $errout)
        local res=$?
      fi
      LogMoreLow -f "got '$res'" 
      local resmatch=$(echo "$expecode" | grep "^\!\?${res}$")
      LogMoreLow -f "resmatch='$resmatch'" 
      [[ -n "$resmatch" && ! "$resmatch" =~ '!' ]]
      if tcfE2R; then
        ! grep -iq "command not found" $errout || { failtag='WARNING'; tcfNOK; }
      else
        Log "Expected result was '$orig_expecode', got '$res'!"
      fi
    tcfFin ${failtag:+--fail-tag "$failtag"}; }
    rm -f $errout
  [[ -z "$allowskip" ]] && tcfFin
  LogMore_ -f "end $*"
  return $res
 }; # end of tcfRun }}}
 : <<'=cut'
 =pod
 =head2 Functions for logging
 =cut
 # tcfAssert0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 tcfAssert0() {
  LogMoreLow -f "begin '$*'"
  local RES="${3:-FAIL}"
  [[ $2 -eq 0 ]] && RES='PASS'
  Log "$1" $RES
  LogMoreLow -f "end"
 }; # end of tcfAssert0 }}}
 # tcfCheckFinal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfCheckFinal
 Check that all tcfTry / tcfChk functions have been close by tcfFin.
    tcfCheckFinal
 =cut
 tcfCheckFinal() {
  tcfAssert0 "Check that TCF block cache is empty" ${#__INTERNAL_tcf_current_level_data[@]}
  tcfAssert0 "Check that TCF current level is 0" $__INTERNAL_tcf_current_level_val
 }; # end of tcfCheckFinal }}}
 echo "done."
 : <<'=cut'
 =pod
 =head2 Self check functions
 =cut
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # tcfSelfCheck {{{
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : <<'=cut'
 =pod
 =head3 tcfSelfCheck
 Does some basic functionality tests.
    tcfSelfCheck
 The function is called also by the following command:
    ./lib.sh selfcheck
 =cut
 tcfSelfCheck() {
  tcfChk "check 1" &&{
    tcfTry "try 1.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 1.2 - false" &&{
      false
    tcfFin;}
    tcfTry "try 1.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfChk "check 2" &&{
    tcfTry "try 2.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 2.2 - true - ignore" &&{
      true
    tcfFin -i;}
    tcfTry "try 2.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfChk "check 3" &&{
    tcfTry "try 3.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 3.2 - false - ignore" &&{
      false
    tcfFin -i;}
    tcfTry "try 3.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfCheckFinal
  tcfAssert0 "Overall result" $(tcfRES -p)
  LogReport
 }
 if [[ "$1" == "selfcheck" ]]; then
  tcfSelfCheck
 fi; # end of tcfSelfCheck }}}
 # tcfLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 tcfLibraryLoaded() {
  rlImport distribution/Log
  declare -F rlDie > /dev/null && {
    #rlJournalStart
    #rlPhaseStartSetup "TCF"
    echo -e "\nrunning inside the beakerlib - using rlAssert0"
    true; tcfAssert0() {
      local text="$1"
      [[ "$3" != "FAIL" && "$3" != "PASS" ]] && text="$text - $3"
      __INTERNAL_ConditionalAssert "$text" "$2"
    }
    __INTERNAL_tcf_do_hack
    #rlPhaseEnd
    #rlJournalEnd
  };
  if declare -F rlE2R >& /dev/null; then
    __INTERNAL_tcf_kill_old_plugin
  fi
  true
 }; # end of tcfLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/run-as/distribution/Library/testUser/Makefile
+++ b/tests/run-as/distribution/Library/testUser/Makefile
@ -0,0 +1,60 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/testUser
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/testUser
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Setup/cleanup standard testing user." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/testUser)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/run-as/distribution/Library/testUser/lib.sh
+++ b/tests/run-as/distribution/Library/testUser/lib.sh
@ -0,0 +1,234 @@
 #!/bin/bash
 # try-check-final.sh
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = testUser
 #   library-version = 7
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library testUser
 =head1 DESCRIPTION
 This library provide s function for maintaining testing users.
 =head1 USAGE
 To use this functionality you need to import library distribution/testUser and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/testUser)" >> $(METADATA)
 =head1 VARIABLES
 =over
 =item testUser
 Array of testing user login names.
 =item testUserPasswd
 Array of testing users passwords.
 =item testUserUID
 Array of testing users UIDs.
 =item testUserGID
 Array of testing users primary GIDs.
 =item testUserGroup
 Array of testing users primary group names.
 =item testUserGIDs
 Array of space separated testing users all GIDs.
 =item testUserGroups
 Array of space separated testing users all group names.
 =item testUserGecos
 Array of testing users gecos fields.
 =item testUserHomeDir
 Array of testing users home directories.
 =item testUserShell
 Array of testing users default shells.
 =back
 =head1 FUNCTIONS
 =cut
 echo -n "loading library testUser... "
 : <<'=cut'
 =pod
 =head3 testUserSetup, testUserCleanup
 Creates/removes testing user(s).
    rlPhaseStartSetup
        testUserSetup [NUM]
    rlPhaseEnd
    rlPhaseStartCleanup
        testUserCleanup
    rlPhaseEnd
 =over
 =item NUM
 Optional number of user to be created. If not specified one user is created.
 =back
 Returns 0 if success.
 =cut
 testUserSetup() {
  # parameter dictates how many users should be created, defaults to 1
  local res=0
  local count_created=0
  local count_wanted=${1:-"1"}
  local index=0
  (( $count_wanted < 1 )) && return 1
  while (( $count_created != $count_wanted ));do
    let index++
    local newUser="testuser${index}"
    local newUserPasswd="redhat"
    id "$newUser" &> /dev/null && continue # if user with the name exists, try again
    # create
    useradd -m $newUser >&2 || ((res++))
    echo "$newUserPasswd" | passwd --stdin $newUser || ((res++))
    # save the users array
    testUser+=($newUser)
    testUserPasswd+=($newUserPasswd)
    set | grep "^testUser=" > $__INTERNAL_testUser_users_file
    set | grep "^testUserPasswd=" >> $__INTERNAL_testUser_users_file
    ((count_created++))
  done
  __INTERNAL_testUserRefillInfo || ((res++))
  echo ${res}
  [[ $res -eq 0 ]]
 }
 __INTERNAL_testUserRefillInfo() {
  local res=0
  local user
  testUserUID=()
  testUserGID=()
  testUserGroup=()
  testUserGIDs=()
  testUserGroups=()
  testUserGecos=()
  testUserHomeDir=()
  testUserShell=()
  for user in ${testUser[@]}; do
    local ent_passwd=$(getent passwd ${user}) || ((res++))
    local users_id="$(id ${user})" || ((res++))
    # testUser is filled during user creation - already present
    # testUserPasswd is saved same way as testUser - already present
    testUserUID+=("$(echo "$ent_passwd" | cut -d ':' -f 3)")
    testUserGID+=("$(echo "$ent_passwd" | cut -d ':' -f 4)")
    testUserGroup+=("$(echo "$users_id" | sed -r 's/.*gid=(\S+).*/\1/;s/[[:digit:]]+\(//g;s/\)//g;s/,/ /g')")
    testUserGIDs+=("$(echo "$users_id" | sed -r 's/.*groups=(\S+).*/\1/;s/\([^\)]+\)//g;s/\)//g;s/,/ /g')")
    testUserGroups+=("$(echo "$users_id" | sed -r 's/.*groups=(\S+).*/\1/;s/[[:digit:]]+\(//g;s/\)//g;s/,/ /g')")
    testUserGecos+=("$(echo "$ent_passwd" | cut -d ':' -f 5)")
    testUserHomeDir+=("$(echo "$ent_passwd" | cut -d ':' -f 6)")
    testUserShell+=("$(echo "$ent_passwd" | cut -d ':' -f 7)")
  done
  echo ${res}
  [[ $res -eq 0 ]]
 }
 testUserCleanup() {
  local res=0
  for user in ${testUser[@]}; do
    userdel -rf "$user" >&2 || ((res++))
  done
  unset testUser
  __INTERNAL_testUserRefillInfo
  rm -f $__INTERNAL_testUser_users_file >&2 || ((res++))
  echo ${res}
  [[ $res -eq 0 ]]
 }
 # testUserLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 testUserLibraryLoaded() {
  local res=0
  # necessary init steps
  __INTERNAL_testUser_users_file="$BEAKERLIB_DIR/users"
  # try to fill in users array with previous data
  [[ -f ${__INTERNAL_testUser_users_file} ]] && . ${__INTERNAL_testUser_users_file} >&2
  __INTERNAL_testUserRefillInfo >&2 || ((res++))
  [[ $res -eq 0 ]]
 }; # end of testUserLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
 echo "done."
--- a/tests/run-as/runtest.sh
+++ b/tests/run-as/runtest.sh
@ -0,0 +1,163 @@
 #!/bin/bash
 # vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   runtest.sh of /CoreOS/sudo/Sanity/run-as
 #   Description: Test feature 'run as'. This means -u, -g options.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2017 Red Hat, Inc.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1151, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Include Beaker environment
 . /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 PACKAGE="sudo"
 rlJournalStart && {
  rlPhaseStartSetup && {
    [[ -z "$BEAKERLIB_LIBRARY_PATH" ]] && BEAKERLIB_LIBRARY_PATH="`dirname "$(readlink -f "$0")"`"
    rlRun "rlImport --all" 0 "Import libraries" || rlDie "cannot continue"
    tcfRun "rlCheckMakefileRequires"
    rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
    CleanupRegister "rlRun 'rm -r $TmpDir' 0 'Removing tmp directory'"
    CleanupRegister 'rlRun "popd"'
    rlRun "pushd $TmpDir"
    CleanupRegister 'tcfRun "testUserCleanup"'
    tcfRun "testUserSetup 5"
    CleanupRegister 'rlRun "rlFileRestore"'
    rlRun "rlFileBackup --clean /etc/sudoers.d"
    cat > /etc/sudoers.d/testing << EOF
      Defaults !requiretty
      $testUser   ALL = (ALL:ALL) NOPASSWD: ALL
      ${testUser[1]}   ALL = ( ${testUser[0]} ) NOPASSWD: ALL
      ${testUser[2]}   ALL = ( ${testUser[0]}, ${testUser[1]} ) NOPASSWD: ALL
      ${testUser[3]}   ALL = ( : ${testUserGroup[1]}, ${testUser[0]} ) NOPASSWD: ALL
      ${testUser[4]}   ALL = ( ${testUser[0]} : ${testUserGroup[2]} ) NOPASSWD: ALL
 EOF
    rlRun "cat /etc/sudoers.d/testing"
  rlPhaseEnd; }
  CMD='bash -c "ps -o user:15,group:15,ruser:15,rgroup:15,args --ppid $$"'
  tcfTry "Tests" --no-assert && {
    test() {
      local who="$1" as="$2" as_grp="$3" exp_res="$4"
      if [[ -z "$exp_res" || "$exp_res" == "0" ]]; then
        rlRun -s "su -l $who -c 'sudo ${as:+-u $as} ${as_grp:+-g $as_grp} $CMD'"
        [[ -n "$as_grp" && -z "$as" ]] && as="$who"
        as="${as:-root}"
        as_grp="${as_grp:-$as}"
        rlAssertGrep "$as\s+$as_grp\s+$as\s+$as_grp\s+" $rlRun_LOG -Eq
        rm -f $rlRun_LOG
      else
        rlRun -s "su -l $who -c 'sudo ${as:+-u $as} ${as_grp:+-g $as_grp} $CMD'" 1
        [[ -n "$as_grp" && -z "$as" ]] && as="$who"
        as="${as:-root}"
        as_grp="${as_grp:-$as}"
        rlAssertNotGrep "$as\s+$as_grp\s+$as\s+$as_grp\s+" $rlRun_LOG -Eq
        rm -f $rlRun_LOG
      fi
    }
    rlPhaseStartTest "run as a default user" && {
      tcfChk "Test phase" && {
        tcfChk "$testUser can run as all" && {
          test $testUser "" "" "" 0
        tcfFin; }
        tcfChk "${testUser[1]} cannot run as anyone" && {
          test ${testUser[1]} "" "" 1
        tcfFin; }
        tcfChk "${testUser[2]} cannot run as anyone" && {
          test ${testUser[2]} "" "" 1
        tcfFin; }
      tcfFin; }
    rlPhaseEnd; }
    rlPhaseStartTest "run as a user (-u)" && {
      tcfChk "Test phase" && {
        tcfChk "$testUser can run as all" && {
          test $testUser "root" "" 0
          test $testUser "${testUser[1]}" "" 0
          test $testUser "${testUser[2]}" "" 0
        tcfFin; }
        tcfChk "${testUser[1]} can run as $testUser" && {
          test ${testUser[1]} "root" "" 1
          test ${testUser[1]} "${testUser[0]}" "" 0
          test ${testUser[1]} "${testUser[2]}" "" 1
        tcfFin; }
        tcfChk "${testUser[2]} can run as $testUser and ${testUser[1]}" && {
          test ${testUser[2]} "root" "" 1
          test ${testUser[2]} "${testUser[0]}" "" 0
          test ${testUser[2]} "${testUser[1]}" "" 0
        tcfFin; }
      tcfFin; }
    rlPhaseEnd; }
    rlPhaseStartTest "run as a group (-g)" && {
      tcfChk "Test phase" && {
        tcfChk "$testUser can run as all" && {
          test $testUser "" "root" 0
          test $testUser "" "${testUserGroup[1]}" 0
          test $testUser "" "${testUserGroup[2]}" 0
        tcfFin; }
        tcfChk "${testUser[4]} can run as ${testUserGroup[2]}" && {
          test ${testUser[4]} "" "root" 1
          test ${testUser[4]} "" "${testUserGroup[0]}" 1
          test ${testUser[4]} "" "${testUserGroup[2]}" 0
        tcfFin; }
        #tcfChk "${testUser[2]} can run as ${testUserGroup[1]}" && {
        #  test ${testUser[2]} "" "root" 1
        #  test ${testUser[2]} "" "${testUserGroup[1]}" 1
        #  test ${testUser[2]} "" "${testUserGroup[2]}" 1
        #tcfFin; }
        #tcfChk "${testUser[3]}" && {
        #  test ${testUser[2]} "" "root" 1
        #  test ${testUser[2]} "" "${testUserGroup[1]}" 0
        #  test ${testUser[2]} "" "${testUserGroup[2]}" 0
        #tcfFin; }
      tcfFin; }
    rlPhaseEnd; }
      rlPhaseStartTest "run as both user (-u) and group (-g)" && {
      tcfChk "Test phase" && {
        tcfChk "$testUser can run as all" && {
          test $testUser "${testUser[1]}" "root" 0
          test $testUser "${testUser[2]}" "${testUserGroup[1]}" 0
          test $testUser "${testUser[1]}" "${testUserGroup[2]}" 0
        tcfFin; }
        tcfChk "${testUser[4]} can run as ${testUser[0]} ${testUserGroup[2]}" && {
          test ${testUser[4]} "${testUser[0]}" "root" 1
          test ${testUser[4]} "${testUser[0]}" "${testUserGroup[0]}" 0
          #test ${testUser[4]} "${testUser[0]}" "${testUserGroup[4]}" 0
          test ${testUser[4]} "${testUser[4]}" "${testUserGroup[4]}" 0
          test ${testUser[4]} "${testUser[0]}" "${testUserGroup[3]}" 1
          test ${testUser[4]} "${testUser[0]}" "${testUserGroup[2]}" 0
        tcfFin; }
      tcfFin; }
    rlPhaseEnd; }
  tcfFin; }
  rlPhaseStartCleanup && {
    CleanupDo
    tcfCheckFinal
  rlPhaseEnd; }
  rlJournalPrintText
 rlJournalEnd; }
--- a/tests/sudoers-options-sanity-test/Makefile
+++ b/tests/sudoers-options-sanity-test/Makefile
@ -0,0 +1,67 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /CoreOS/sudo/Sanity/sudoers-options-sanity-test
 #   Description: This sanity test checks pre-defined (some are commented) options (examples) in sudoers file.
 #   Author: Ales Marecek <amarecek@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/CoreOS/sudo/Sanity/sudoers-options-sanity-test
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) runtest.sh Makefile PURPOSE
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Ales Marecek <amarecek@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/tcf)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Cleanup)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/ConditionalPhases)" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/testUser)" >> $(METADATA)
 	@echo "Description:     This sanity test checks pre-defined (some are commented) options (examples) in sudoers file." >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        30m" >> $(METADATA)
 	@echo "RunFor:          sudo" >> $(METADATA)
 	@echo "Requires:        sudo grep coreutils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/PURPOSE
+++ b/tests/sudoers-options-sanity-test/PURPOSE
@ -0,0 +1,3 @@
 PURPOSE of /CoreOS/sudo/Sanity/sudoers-options-sanity-test
 Description: This sanity test checks pre-defined (some are commented) options (examples) in sudoers file.
 Author: Ales Marecek <amarecek@redhat.com>
--- a/tests/sudoers-options-sanity-test/distribution/Library/Cleanup/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/Cleanup/Makefile
@ -0,0 +1,59 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/Cleanup
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/Cleanup
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides function to define cleanup stack which can do its work at any time of the test run." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "Provides:        library(distribution/Cleanup)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/Cleanup/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/Cleanup/lib.sh
@ -0,0 +1,314 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = Cleanup
 #   library-version = 9
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_Cleanup_LIB_VERSION=9
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Cleanup
 =head1 DESCRIPTION
 This file contains functions which provides cleanup stack functionality.
 =head1 USAGE
 To use this functionality you need to import library distribution/Cleanup and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/Cleanup)" >> $(METADATA)
 B<Code example>
 	rlJournalStart
 	  rlPhaseStartSetup
 	    rlImport 'distribution/Cleanup'
 	    tmp=$(mktemp)
 	    CleanupRegister "
 	      rlLog 'Removing data'
 	      rlRun \"rm -f ${tmp}\"
 	    "
 	    rlLog 'Creating some data'
 	    rlRun "echo 'asdfalkjh' > $tmp"
 	    CleanupRegister "
 	      rlLog 'just something to demonstrate unregistering'
 	    "
 	    ID1=$CleanupRegisterID
 	    CleanupUnregister $ID1
 	    CleanupRegister "
 	      rlLog 'just something to demonstrate partial cleanup'
 	    "
 	    ID2=$CleanupRegisterID
 	    CleanupRegister "rlLog 'cleanup some more things'"
 	    # cleanup everything upto ID2
 	    CleanupDo $ID2
 	    CleanupRegister --mark "
 	      rlLog 'yet another something to demonstrate partial cleanup using internal ID saving'
 	    "
 	    CleanupRegister "rlLog 'cleanup some more things'"
 	    # cleanup everything upto last mark
 	    CleanupDo --mark
 	  rlPhaseEnd
 	  rlPhaseStartCleanup
 	    CleanupDo
 	  rlPhaseEnd
 	  rlJournalPrintText
 	rlJournalEnd
 =head1 FUNCTIONS
 =cut
 echo -n "loading library Cleanup v$__INTERNAL_Cleanup_LIB_VERSION... "
 __INTERNAL_Cleanup_stack_file="$BEAKERLIB_DIR/Cleanup_stack"
 touch "$__INTERNAL_Cleanup_stack_file"
 chmod ug+rw "$__INTERNAL_Cleanup_stack_file"
 # CleanupRegister ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # CleanupRegister [--mark] CLEANUP_CODE
 #   --mark  - also mark this position
 CleanupRegister() {
  local mark=0
  [[ "$1" == "--mark" ]] && {
    mark=1
    shift
  }
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  CleanupRegisterID="${RANDOM}$(date +"%s%N")"
  echo -n "Registering cleanup ID=$CleanupRegisterID" >&2
  if [[ $mark -eq 1 ]]; then
    __INTERNAL_CleanupMark=( "$CleanupRegisterID" "${__INTERNAL_CleanupMark[@]}" )
    echo -n " with mark" >&2
  fi
  echo " '$1'" >&2
  rlLogDebug "prepending '$1'"
  local ID_tag="# ID='$CleanupRegisterID'"
  __INTERNAL_Cleanup_stack="$ID_tag
 $1
 $ID_tag
 $__INTERNAL_Cleanup_stack"
  if ! CleanupSetStack "$__INTERNAL_Cleanup_stack"; then
    rlLogError "an error occured while registering the cleanup '$1'"
    return 1
  fi
  return 0
 }; # end of CleanupRegister }}}
 # __INTERNAL_Cleanup_get_stack_part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # 1: ID
 #    -ID    - everything upto the ID
 # 2: ''     - return ID only
 #    'rest' - return exact oposit
 __INTERNAL_Cleanup_get_stack_part() {
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): $* begin"
  local ID="$1"
  local n='1 0 1'
  local stack=''
  [[ "${ID:0:1}" == "-" ]] && {
    ID="${ID:1}"
    n='0 0 1'
  }
  [[ "$2" == "rest" ]] && {
    n="$(echo "${n//0/2}")"
    n="$(echo "${n//1/0}")"
    n="$(echo "${n//2/1}")"
  }
  n=($n)
  [[ -n "$DEBUG" ]] && rlLogDebug "$(set | grep ^n=)"
  local ID_tag="# ID='$ID'"
  while IFS= read -r line; do
    [[ "$line" == "$ID_tag" ]] && {
      n=( "${n[@]:1}" )
      continue
    }
    if [[ $n -eq 0 ]]; then
      stack="$stack
 $line"
    fi
  done < <(echo "$__INTERNAL_Cleanup_stack")
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): cleanup stack part is '${stack:1}'"
  echo "${stack:1}"
  rlLogDebug "__INTERNAL_Cleanup_get_stack_part(): $* end"
 }; # end of __INTERNAL_Cleanup_get_stack_part }}}
 # CleanupUnregister ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupUnregister() {
  local ID="$1"
  rlLog "Unregistering cleanup ID='$ID'"
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  rlLogDebug "removing ID='$ID'"
  if ! CleanupSetStack "$(__INTERNAL_Cleanup_get_stack_part "$ID" 'rest')"; then
    rlLogError "an error occured while registering the cleanup '$1'"
    return 1
  fi
  return 0
 }; # end of CleanupUnregister }}}
 # CleanupMark ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_CleanupMark=()
 CleanupMark() {
  echo -n "Setting cleanup mark" >&2
  CleanupRegister --mark '' 2>/dev/null
  local res=$?
  echo " ID='$CleanupRegisterID'" >&2
  return $res
 }; # end of CleanupMark }}}
 # CleanupDo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # 1: ''   - cleanup all
 #    ID   - cleanup ID only
 #    -ID  - cleanup all upto ID, including
 #    mark - cleanup all unto last mark, including
 CleanupDo() {
  local ID="$1"
  if ! CleanupGetStack; then
    rlLogError "cannot continue, could not get cleanup stack"
    return 1
  fi
  local res tmp newstack=''
  tmp="$(mktemp)"
  if [[ "$ID" == "mark" || "$ID" == "--mark" ]]; then
    echo "execute cleanup upto mark='$__INTERNAL_CleanupMark'" >&2
    __INTERNAL_Cleanup_get_stack_part "-$__INTERNAL_CleanupMark" | grep -v "^# ID='" > "$tmp"
    newstack="$(__INTERNAL_Cleanup_get_stack_part "-$__INTERNAL_CleanupMark" 'rest')"
    __INTERNAL_CleanupMark=("${__INTERNAL_CleanupMark[@]:1}")
  elif [[ -n "$ID" ]]; then
    echo "execute cleanup for ID='$ID'" >&2
    __INTERNAL_Cleanup_get_stack_part "$ID" | grep -v "^# ID='" > "$tmp"
    newstack="$(__INTERNAL_Cleanup_get_stack_part "$ID" 'rest')"
  else
    CleanupTrapUnhook
    trap "echo 'temporarily blocking ctrl+c until cleanup is done' >&2" SIGINT
    cat "$__INTERNAL_Cleanup_stack_file" | grep -v "^# ID='" > "$tmp"
    echo "execute whole cleanup stack" >&2
  fi
  . "$tmp"
  res=$?
  [[ $res -ne 0 ]] && {
    echo "cleanup code:" >&2
    cat -n "$tmp" >&2
  }
  rm -f "$tmp"
  echo "cleanup execution done" >&2
  if [[ -z "$ID" ]]; then 
    trap - SIGINT
  fi
  if ! CleanupSetStack "$newstack"; then
    rlLogError "an error occured while cleaning the stack"
    return 1
  fi
  return $res
 }; # end of CleanupDo }}}
 # CleanupGetStack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupGetStack() {
  rlLogDebug "getting cleanup stack"
  if [[ -r "$__INTERNAL_Cleanup_stack_file" ]]; then
    if __INTERNAL_Cleanup_stack="$(cat "$__INTERNAL_Cleanup_stack_file")"; then
      rlLogDebug "cleanup stack is '$__INTERNAL_Cleanup_stack'"
      return 0
    fi
  fi
  rlLogError "could not load cleanup stack"
  return 1
 }; # end of CleanupGetStack }}}
 # CleanupSetStack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupSetStack() {
  rlLogDebug "setting cleanup stack to '$1'"
  __INTERNAL_Cleanup_stack="$1"
  if echo "$__INTERNAL_Cleanup_stack" > "$__INTERNAL_Cleanup_stack_file"; then
    rlLogDebug "cleanup stack is now '$__INTERNAL_Cleanup_stack'"
    return 0
  fi
  rlLogError "could not set cleanup stack"
  return 1
 }; # end of CleanupSetStack }}}
 __INTERNAL_Cleanup_signals=''
 __INTERNAL_Cleanup_trap_code='rlJournalStart; rlPhaseStartCleanup; CleanupDo; rlPhaseEnd; rlJournalPrintText; rlJournalEnd; exit'
 # CleanupTrapHook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupTrapHook() {
  rlLog "register cleanup trap"
  __INTERNAL_Cleanup_signals="${1:-"SIGHUP SIGINT SIGTERM EXIT"}"
  eval "trap \"${__INTERNAL_Cleanup_trap_code}\" $__INTERNAL_Cleanup_signals"
 }; # end of CleanupTrapHook }}}
 # CleanupTrapUnhook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupTrapUnhook() {
  if [[ -n "$__INTERNAL_Cleanup_signals" ]]; then
    rlLog "unregister cleanup trap"
    eval trap - $__INTERNAL_Cleanup_signals
    __INTERNAL_Cleanup_signals=''
  fi
 }; # end of CleanupTrapUnhook }}}
 # CleanupLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 CleanupLibraryLoaded() {
  CleanupTrapHook
 }; # end of CleanupLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/sudoers-options-sanity-test/distribution/Library/ConditionalPhases/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/ConditionalPhases/Makefile
@ -0,0 +1,59 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/ConditionalPhases
 #   Description: Implements conditional phases.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/ConditionalPhases
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Implements conditional phases." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "Provides:        library(distribution/ConditionalPhases)" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/ConditionalPhases/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/ConditionalPhases/lib.sh
@ -0,0 +1,166 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = ConditionalPhases
 #   library-version = 2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_ConditionalPhases_LIB_VERSION=2
 __INTERNAL_ConditionalPhases_LIB_NAME='distribution/ConditionalPhases'
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library distribution/condpahses
 =head1 DESCRIPTION
 Implements conditional phases to eficiently select test phases to be execute
 using white and black lists.
 To use this functionality you need to import library
 distribution/ConditionalPhases and add following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/ConditionalPhases)" >> $(METADATA)
 =head1 USAGE
 =head2 Conditional phases
 Each test phase can be conditionally skipped based on a bash regular expression
 given in CONDITIONAL_PHASES_BL and/or CONDITIONAL_PHASES_WL variables.
 =over
 =item CONDITIONAL_PHASES_BL
 It is a black list. If match phase name the respective phase should be skipped.
 =item CONDITIONAL_PHASES_WL
 It is a white list. If does B<not> match phase name the respective phase should
 be skipped excluding phases contatning 'setup' or 'cleanup' in its name. Names
 'setup' and 'cleanup' are matched case insenitively.
 =back
 Actual skipping has to be done in the test case itself by using return code of
 functions I<rlPhaseStart>, I<rlPhaseStartSetup>, I<rlPhaseStartTest>, and
 I<rlPhaseStartCleanup>.
 Example:
    rlPhaseStartTest "phase name" && {
      ...
    rlPhaseEnd; }
 Evaluation of the phase relevancy works as follows:
    1. If CONDITIONAL_PHASES_BL is non-empty and matches phase name => return 2.
    2. If phase name contains word 'setup' or 'cleanup' or CONDITIONAL_PHASES_WL
       is empty => return 0.
    3. If CONDITIONAL_PHASES_WL is non-empty and matches phase name => return 0
       otherwise return 1.
 Normaly Setup and Cleanup phases are not skipped unless hey are B<explicitly>
 black-listed.
 To make the test work properly with conditional phases it is necessary to
 surround phase code with curly brackets and make it conditionally executed
 based on rlPhaseStart* function's exit code the same way as it is demostrated in
 the example above. To make the process easy you can use following command:
    sed 's/rlPhaseStart[^{]*$/& \&\& {/;s/rlPhaseEnd[^}]*$/&; }/'
 This code can be embedded in Makefile by modifying build target to following
 form:
    build: $(BUILT_FILES)
    	grep -Eq 'rlPhase(Start[^{]*|End[^}]*)$' runtest.sh && sed -i 's/rlPhaseStart[^{]*$/& \&\& {/;s/rlPhaseEnd[^}]*$/&; }/' testrun.sh
    	test -x runtest.sh || chmod a+x runtest.sh
 =cut
 #'
 echo -n "loading library $__INTERNAL_ConditionalPhases_LIB_NAME v$__INTERNAL_ConditionalPhases_LIB_VERSION... "
 # ConditionalPhasesLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 ConditionalPhasesLibraryLoaded() {
  if [[ -n "$CONDITIONAL_PHASES_BL" || -n "$CONDITIONAL_PHASES_WL" ]]; then
    __INTERNAL_ConditionalPhases_eval() {
      # check phases black-list
      [[ -n "$CONDITIONAL_PHASES_BL" && "$1" =~ $CONDITIONAL_PHASES_BL ]] && {
        rlLogWarning "phase '$1' should be skipped as it is defined in \$CONDITIONAL_PHASES_BL='$CONDITIONAL_PHASES_BL'"
        return 2
      }
      # always execute Setup, Cleanup and if no PHASES (white-list) specified
      [[ "$1" =~ $(echo "\<[Ss][Ee][Tt][Uu][Pp]\>") || "$1" =~ $(echo "\<[Cc][Ll][Ee][Aa][Nn][Uu][Pp]\>") ]] && {
        rlLogInfo "phase '$1' will be executed as 'setup' and 'cleanup' phases are allowed by default, these can be black-listed"
        return 0
      }
      [[ -z "$CONDITIONAL_PHASES_WL" ]] && {
        rlLogInfo "phase '$1' will be executed as there is no rule for it"
        return 0
      }
      [[ "$1" =~ $CONDITIONAL_PHASES_WL ]] && {
        rlLogInfo "phase '$1' will be executed as it is defined in \$CONDITIONAL_PHASES_WL='$CONDITIONAL_PHASES_WL'"
        return 0
      } || {
        rlLogWarning "phase '$1' should be skipped as it is not defined in \$CONDITIONAL_PHASES_WL='$CONDITIONAL_PHASES_WL'"
        return 1
      }
    }
    rlLogInfo "replacing rlPhaseStart by modified function with conditional phases implemented"
    :; rlPhaseStart() {
        if [ "x$1" = "xFAIL" -o "x$1" = "xWARN" ] ; then
            __INTERNAL_ConditionalPhases_eval "$2" && \
            rljAddPhase "$1" "$2"
            return $?
        else
            rlLogError "rlPhaseStart: Unknown phase type: $1"
            return 1
        fi
    }
  else
    rlLogInfo "Neither CONDITIONAL_PHASES_WL nor CONDITIONAL_PHASES_BL is defined, not applying modifications"
  fi
 }; # end of ConditionalPhasesLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
 echo 'done.'
--- a/tests/sudoers-options-sanity-test/distribution/Library/Log/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/Log/Makefile
@ -0,0 +1,48 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/Log
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/Log
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides yet another logging facility that does not rely on beakerlib while it can integrate with it." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/opts)" >> $(METADATA)
 	@echo "Provides:        library(distribution/Log)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/Log/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/Log/lib.sh
@ -0,0 +1,637 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = Log
 #   library-version = 11
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_Log_LIB_VERSION=11
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Log
 =head1 DESCRIPTION
 This library provide logging capability which does not rely on beakerlib so it
 can be used standalone.
 If it is used within beakerlib it automatically bypass all messages to the
 beakerlib.
 Also this library provide journaling feature so the summary can be printed out
 at the end.
 =head1 USAGE
 To use this functionality you need to import library distribution/Log and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 =head1 FUNCTIONS
 =cut
 echo -n "loading library Log v$__INTERNAL_Log_LIB_VERSION... "
 __INTERNAL_Log_prefix=''
 __INTERNAL_Log_prefix2=''
 __INTERNAL_Log_postfix=''
 __INTERNAL_Log_default_level=3
 __INTERNAL_Log_level=$__INTERNAL_Log_default_level
 LogSetDebugLevel() {
  if [[ -n "$1" ]]; then 
    if [[ "$1" =~ ^[0-9]+$ ]]; then 
      let __INTERNAL_Log_level=$__INTERNAL_Log_default_level+$1;
    else
      __INTERNAL_Log_level=255
    fi
  else
    __INTERNAL_Log_level=$__INTERNAL_Log_default_level
  fi
 }
 LogSetDebugLevel "$DEBUG"
 let __INTERNAL_Log_level_LOG=0
 let __INTERNAL_Log_level_FATAL=0
 let __INTERNAL_Log_level_ERROR=1
 let __INTERNAL_Log_level_WARNING=2
 let __INTERNAL_Log_level_INFO=3
 let __INTERNAL_Log_level_DEBUG=4
 let __INTERNAL_Log_level_MORE=5
 let __INTERNAL_Log_level_MORE_=$__INTERNAL_Log_level_MORE+1
 let __INTERNAL_Log_level_MORE__=$__INTERNAL_Log_level_MORE_+1
 let __INTERNAL_Log_level_MORE___=$__INTERNAL_Log_level_MORE__+1
 # Log ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 Log() {
  LogMore___ -f "begin '$*'"
  local pri=$2 message="${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
  if [[ -n "$pri" ]]; then
    LogPrintMessage "$pri" "$message"
    LogjAddMessage "$pri" "$message"
  else
    LogPrintMessage "$(date +%H:%M:%S)" "$message"
    LogjAddMessage "INFO" "$message"
  fi
  LogMore___ -f "end"
  return 0
 }; # end of Log }}}
 __INTERNAL_Log_condition() {
  cat <<EOF
  __INTERNAL_Log_level_do=$1
  if [[ \$__INTERNAL_Log_level -ge \$__INTERNAL_Log_level_do ]]; then
    [[ -z "$2" ]] && return 1
  else
    return 0
  fi
 EOF
 }
 # LogInfo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogInfo() {
  __INTERNAL_LogPrio='INFO'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_INFO  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='INFO'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogInfo }}}
 # LogWarn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogWarn() {
  __INTERNAL_LogPrio='WARNING'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_WARNING  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='WARNING'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogWarn }}}
 # LogWarning ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogWarning() {
  __INTERNAL_LogPrio='WARNING'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_WARNING  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='WARNING'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogWarning }}}
 # LogError ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogError() {
  __INTERNAL_LogPrio='ERROR'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_ERROR  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='ERROR'
  Log "$1" $__INTERNAL_LogPrio
  LogMore___ -f "end"
  return 0
 }; # end of LogError }}}
 # LogFatal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFatal() {
  __INTERNAL_LogPrio='FATAL'
  eval "$(__INTERNAL_Log_condition \$__INTERNAL_Log_level_FATAL  \"\$1\")"
  LogMore___ -f "begin '$*'"
  __INTERNAL_LogPrio='FATAL'
  Log "$1" $__INTERNAL_LogPrio
  exit 255
  LogMore___ -f "end"
 }; # end of LogFatal }}}
 # LogPASS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogPASS() {
  LogMore___ -f "begin '$*'"
  Log "$1" PASS
  LogMore___ -f "end"
  return 0
 }
 LogPass() {
  LogPASS "$@"
 }; # end of LogPASS }}}
 # LogFAIL ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFAIL() {
  LogMore___ -f "begin '$*'"
  Log "$1" FAIL
  LogMore___ -f "end"
  return 0
 }
 LogFail() {
  LogFAIL "$@"
 }; # end of LogFAIL }}}
 # LogDo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogDo() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    local tmp=${BASH_REMATCH[1]:-1}
    pref="${FUNCNAME[$tmp]}(): "
  }
  LogPrintMessage "$__INTERNAL_LogPrio" "${__INTERNAL_Log_prefix}${pref}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
  return 0
 }; # end of LogDo }}}
 # LogDebug ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogDebug() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  __INTERNAL_Log_level_do=${2:-$__INTERNAL_Log_level_DEBUG}
  __INTERNAL_LogPrio='DEBUG'
  [[ $__INTERNAL_Log_level_do -ge $__INTERNAL_Log_level_MORE ]] && __INTERNAL_LogPrio="${__INTERNAL_LogPrio}:$(($__INTERNAL_Log_level_do-$__INTERNAL_Log_level_DEBUG+1))"
  eval "$(__INTERNAL_Log_condition \${2:-\$__INTERNAL_Log_level_DEBUG}  \"\$1\")"
  LogDo $pref "$1"
  return 0
 }; # end of LogDebug }}}
 # LogMore ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore() {
  # log if DEBUG does not containg a number
  # or the number is greater or equal to 2
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" ${2:-$__INTERNAL_Log_level_MORE}
 }; # end of LogMore }}}
 # LogMore_ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore_() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE_
 }; # end of LogMore_ }}}
 # LogMore__ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore__() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE__
 }; # end of LogMore__ }}}
 # LogMore___ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogMore___() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE___
 }; # end of LogMore___ }}}
 # LogMoreLow ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreLow_Obs=''
 LogMoreLow() {
  [[ -z "$__INTERNAL_LogMoreLow_Obs" ]] && {
    LogMore_ -f "LogMoreLow is obsoleted by LogMore_"
    __INTERNAL_LogMoreLow_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE_
 }; # end of LogMoreLow }}}
 # LogMoreMed ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreMed_Obs=''
 LogMoreMed() {
  [[ -z "$__INTERNAL_LogMoreMed_Obs" ]] && {
    LogMore__ -f "LogMoreMed is obsoleted by LogMore__"
    __INTERNAL_LogMoreMed_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE__
 }; # end of LogMoreMed }}}
 # LogMoreHigh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogMoreHigh_Obs=''
 LogMoreHigh() {
  [[ -z "$__INTERNAL_LogMoreHigh_Obs" ]] && {
    LogMore___ -f "LogMoreHigh is obsoleted by LogMore___"
    __INTERNAL_LogMoreHigh_Obs=1
  }
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogDebug $pref "$1" $__INTERNAL_Log_level_MORE___
 }; # end of LogMoreHigh }}}
 # LogjAddMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogjAddMessage() {
  LogMore__ -f "begin '$*'"
  __INTERNAL_Log_journal=("${__INTERNAL_Log_journal[@]}" "$1" "$2")
  LogMore__ -f "end"
  true;
 }; # end of LogjAddMessage }}}
 # __INTERNAL_LogCenterText ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogCenterText() {
  local spaces='                                                                              '
  # strip colors
  local log_pri_strip=$(echo -en "$1" | sed -r "s:\x1B\[[0-9;]*[mK]::g")
  local log_pri_strip_count=${#log_pri_strip}
  local left_spaces=$(( ($2 - $log_pri_strip_count) / 2 ))
  local right_spaces=$(( $2 - $log_pri_strip_count - $left_spaces ))
  echo -en "${spaces:0:$left_spaces}${1}${spaces:0:$right_spaces}"
 }; # end of __INTERNAL_LogCenterText }}}
 # LogPrintMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogPrintMessage() {
  echo -e ":: [$(__INTERNAL_LogCenterText "$1" 10)] :: $2" >&2
  return 0
 }; # end of LogPrintMessage }}}
 # LogReport ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 LogReport
 Prints final report similar to breakerlib's rlJournalPrintText. This is useful
 mainly if you use TCF without beakerlib.
    LogReport
 =cut
 #'
 LogReport() {
  echo -e "\n ====== Summary report begin ======"
  local a p l i
  for i in $(seq 0 2 $((${#__INTERNAL_Log_journal[@]}-1)) ); do
    LogPrintMessage "${__INTERNAL_Log_journal[$i]}" "${__INTERNAL_Log_journal[$((++i))]}"
  done
  echo " ======= Summary report end ======="
  __INTERNAL_Log_journal=()
 }; # end of LogReport }}}
 # LogFile ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogFile() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  cat $1 | while IFS= read line; do
    Log "$line" "${prio:-$2}"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogText ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogText() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  {
    if [[ "$1" == "-" ]]; then
      cat -
    else
      echo "$1"
    fi
  } | while IFS= read line; do
    Log "$line" "${prio:-$2}"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogStrippedDiff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogStrippedDiff() {
  LogMore__ -f "begin '$*'"
  local prio=''
  [[ $# -ge 3 ]] && {
    optsBegin
    optsAdd 'prio|tag|p|t' --mandatory
    optsDone; eval "${optsCode}"
  }
  {
    if [[ -n "$2" ]]; then
      diff -U0 "$1" "$2"
    else
      cat $1
    fi
  } | grep -v -e '^@@ ' -e '^--- ' -e '^+++ ' | while IFS= read line; do
    Log "$line" "$prio"
  done
  LogMore__ -f "end"
 }; #}}}
 # LogRun ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogRun() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}+1))"
  }
  LogMore
  local dolog=$?
  [[ $dolog -eq 0 ]] || {
    local param params blacklist="[[:space:]]|>|<|\|"
    [[ "${#@}" -eq 1 ]] && params="$1" || {
      for param in "$@"; do
        if [[ "$param" =~ $blacklist ]]; then
          params="$params \"${param//\"/\\\"}\""
        else
          params="$params $param"
        fi
      done
      params="${params:1}"
    }
    LogDo $pref "executing >>>>> ${params} <<<<<"
  }
  eval "$@"
  ret=$?
  [[ $dolog -eq 0 ]] || LogMore $pref "execution >>>>> ${params} <<<<< returned '$ret'"
  return $ret
 }; # end of LogRun }}}
 # LogDebugNext ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugNext() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}))"
  }
  LogDebug '' ${1:-$__INTERNAL_Log_level_DEBUG} || {
    __INTERNAL_Log_DEBUGING=0
    trap "
      __INTERNAL_Log_DEBUGING_res=\$?
      let __INTERNAL_Log_DEBUGING++
      if [[ \$__INTERNAL_Log_DEBUGING -eq 1 ]]; then
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
      else
        trap - DEBUG
        LogDebug $pref \"execution >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<< returned \$__INTERNAL_Log_DEBUGING_res\" ${1:-$__INTERNAL_Log_level_DEBUG}
      fi" DEBUG 
  }
 }; # end of LogDebugNext }}}
 # LogMoreNext ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogMoreNext() {
  LogMore || {
    local pref=''
    [[ "$1" =~ ^-f([0-9]*) ]] && {
      shift
      pref="-f$((${BASH_REMATCH[1]:-1}))"
    }
    LogDebugNext $pref  ${1:-$__INTERNAL_Log_level_MORE}
  }
 }; # end of LogMoreNext }}}
 LogNext() {
  LogMoreNext "$@"
 }
 # LogDebugOn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugOn() {
  local pref=''
  [[ "$1" =~ ^-f([0-9]*) ]] && {
    shift
    pref="-f$((${BASH_REMATCH[1]:-1}))"
  }
  LogDebug '' ${1:-$__INTERNAL_Log_level_DEBUG} || {
    trap "
      __INTERNAL_Log_DEBUGING_res=\$?
      let __INTERNAL_Log_DEBUGING++
      if [[ -z \"\$__INTERNAL_Log_DEBUGING_cmd\" ]]; then
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
      else
        LogDebug $pref \"execution >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<< returned \$__INTERNAL_Log_DEBUGING_res\" ${1:-$__INTERNAL_Log_level_DEBUG}
        __INTERNAL_Log_DEBUGING_cmd=\"\$BASH_COMMAND\"
        if [[ \"\$__INTERNAL_Log_DEBUGING_cmd\" =~ LogDebugOff ]]; then
          trap - DEBUG
        else
          LogDebug $pref \"executing >>>>> \$__INTERNAL_Log_DEBUGING_cmd <<<<<\" ${1:-$__INTERNAL_Log_level_DEBUG}
        fi
      fi" DEBUG 
  }
 }; # end of LogDebugOn }}}
 # LogMoreOn ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogMoreOn() {
  LogMore || {
    local pref=''
    [[ "$1" =~ ^-f([0-9]*) ]] && {
      shift
      pref="-f$((${BASH_REMATCH[1]:-1}))"
    }
    LogDebugOn $pref ${1:-$__INTERNAL_Log_level_MORE}
  }
 }; # end of LogMoreOn }}}
 # LogDebugOff ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 # log info about execution to Debug level
 LogDebugOff() {
  __INTERNAL_Log_DEBUGING_cmd=''
 }; # end of LogDebugOff }}}
 # LogVar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogVar() {
  [[ -n "$DEBUG" ]] && {
    echo -n 'eval '
    while [[ -n "$1" ]]; do
      echo -n "LogDebug -f \"\$(set | grep -P '^$1=')\";"
      shift
    done
  }
 }; # end of LogVar }}}
 # __INTERNAL_LogRedirectToBeakerlib ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_LogRedirectToBeakerlib() {
  echo -e "\nrunning inside the beakerlib - redirect own logging functions to beakerlib ones"
  true; LogjAddMessage() {
    LogMore___ -f "begin $*"
    rljAddMessage "$2" "$1"
    LogMore___ -f "end $*"
  }
  true; Log() {
    LogMore___ -f "begin $*"
    case ${2} in
      INFO)
        LogjAddMessage "INFO" "$1"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      BEGIN)
        LogjAddMessage "INFO" "$*:"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      WARNING|WARN|ERROR|FATAL)
        LogjAddMessage "WARNING" "$1"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      SKIP|SKIPPING)
        LogjAddMessage "WARNING" "$*:"
        LogPrintMessage "$2" "${__INTERNAL_Log_prefix}${__INTERNAL_Log_prefix2}${1}${__INTERNAL_Log_postfix}"
        ;;
      FAIL)
        rlFail "$*"
        return $?
        ;;
      PASS)
        rlPass "$*"
        return $?
        ;;
      *)
        rlLog "$*"
        ;;
    esac
    LogMore___ -f "end $*"
    return 0;
  }
 }
 # end of __INTERNAL_LogRedirectToBeakerlib }}}
 # LogLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 LogLibraryLoaded() {
  declare -F rlDie > /dev/null && __INTERNAL_LogRedirectToBeakerlib
  return 0
 }; # end of LogLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/sudoers-options-sanity-test/distribution/Library/opts/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/opts/Makefile
@ -0,0 +1,48 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/opts
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/opts
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Provides simple way for defining script's or function's options including help" >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/opts)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/opts/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/opts/lib.sh
@ -0,0 +1,338 @@
 #!/bin/bash
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = opts
 #   library-version = 4
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_opts_LIB_VERSION=4
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library opts
 =head1 DESCRIPTION
 This library provides simple way for defining script's or function's option
 agruments including help.
 =head1 USAGE
 To use this functionality you need to import library distribution/opts and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/opts)" >> $(METADATA)
 B<Code example>
 	testfunction() {
 	  optsBegin -h "Usage: $0 [options]
 	  options:
 	"
 	  optsAdd 'flag1' --flag
 	  optsAdd 'optional1|o' --optional
 	  optsAdd 'Optional2|O' "echo opt \$1" --optional --long --var-name opt
 	  optsAdd 'mandatory1|m' "echo man \$1" --mandatory
 	  optsDone; eval "${optsCode}"
 	  echo "$optional1"
 	  echo "$opt"
 	  echo "$mandatory1"
 	}
 =head1 FUNCTIONS
 =cut
 echo -n "loading library opts v$__INTERNAL_opts_LIB_VERSION... "
 # optsAdd ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsAdd() {
  LogMoreMed -f "begin '$*'"
  local GETOPT=$(getopt -q -o fomv:d:lh:l -l flag,opt,optional,mandatory,varname:,default:,local,help:,long -- "$@")
  eval set -- "$GETOPT"
  local type='f' var_name var_name_set default help long
  while [[ -n "$@" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    -h|--help)
      shift
      help="$1"
      ;;
    -l|--long)
      long=1
      ;;
    -d|--default)
      shift
      default="$1"
      ;;
    -v|--varname|--var-name)
      shift
      var_name="$1"
      var_name_set=1
      ;;
    -f|--flag)
      type='f'
      ;;
    -o|--opt|--optional)
      type='o'
      ;;
    -m|--mandatory)
      type='m'
      ;;
    *)
      echo "unknown option '$1'"
      return 1
      ;;
    esac
    shift;
  done
  [ -z "$var_name" ] && {
    var_name=$(echo -n "$1" | cut -d '|' -f 1 | sed -e 's/-//g;s/^[0-9]/_\0/')
    LogMoreHigh -f "constructing variable name '$var_name'"
  }
  local opts='' opts_help='' optsi=''
  for optsi in $(echo -n "$1" | tr '|' ' '); do
    if [[ ${#optsi} -ge 2 || $long -eq 1 ]]; then 
      opts="$opts|--$optsi"
      opts_help="$opts_help|--$optsi[=ARG]"
      __INTERNAL_opts_long="${__INTERNAL_opts_long},${optsi}"
      LogMoreHigh -f "adding long option '$optsi'"
      case $type in
      m)
        __INTERNAL_opts_long="${__INTERNAL_opts_long}:"
        ;;
      o)
        __INTERNAL_opts_long="${__INTERNAL_opts_long}::"
        ;;
      esac
    else
      opts="$opts|-$optsi"
      opts_help="$opts_help|-${optsi}[ARG]"
      __INTERNAL_opts_short="${__INTERNAL_opts_short}${optsi}"
      LogMoreHigh -f "adding short option '$optsi'"
      case $type in
      m)
        __INTERNAL_opts_short="${__INTERNAL_opts_short}:"
        ;;
      o)
        __INTERNAL_opts_short="${__INTERNAL_opts_short}::"
        ;;
      esac
    fi
  done
  optsCode="${optsCode}
  ${opts:1})
    optsPresent=\"\${optsPresent}$var_name \""
  LogMoreHigh -f "adding code for processing option '${opts:1}'"
  __INTERNAL_opts_init_var="$__INTERNAL_opts_init_var
 ${__INTERNAL_opts_local}$var_name=()"
  __INTERNAL_opts_default="$__INTERNAL_opts_default
 [[ \"\$optsPresent\" =~ \$(echo \"\<${var_name}\>\") ]] || ${__INTERNAL_opts_local}$var_name='$default'"
  case $type in
  f)
    [[ -z "$2" || -n "$var_name_set" ]] && {
      local val=1
      [[ -n "$default" ]] && val=''
      optsCode="$optsCode
    $var_name+=( '$val' )"
    }
    __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts:1}"
    ;;
  o|m)
    optsCode="$optsCode
    shift"
    [[ -z "$2" || -n "$var_name_set"  ]] && optsCode="$optsCode
    $var_name+=( \"\$1\" )"
    if [[ "$type" == "o" ]]; then
      __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts_help:1}"
    else
      __INTERNAL_opts_help="${__INTERNAL_opts_help}
  ${opts:1} ARG"
    fi
    ;;
  esac
  [[ -n "$2" ]] && {
  optsCode="$optsCode
    $2"
  }
  optsCode="$optsCode
    ;;"
  __INTERNAL_opts_help="${__INTERNAL_opts_help}${help:+
      $help
 }"
  LogMoreMed -f "end"
 }; # end of optsAdd }}}
 # optsBegin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsBegin() {
  LogMoreMed -f "begin '$*'"
  optsCode=''
  optsPresent=' '
  __INTERNAL_opts_short='.'
  __INTERNAL_opts_long='help'
  __INTERNAL_opts_help=''
  __INTERNAL_opts_local=''
  __INTERNAL_opts_default=''
  __INTERNAL_opts_init_var=''
  [[ "${FUNCNAME[1]}" != "main" ]] && __INTERNAL_opts_local='local '
  while [[ -n "$1" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    -h|--help)
      shift
      __INTERNAL_opts_help="$1"
      ;;
    *)
      echo "unknown option '$1'"
      return 1
      ;;
    esac
    shift;
  done
  LogMoreMed -f "end"
 }; # end of optsBegin }}}
 # optsDone ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsDone() {
  LogMoreMed -f "begin '$*'"
  optsCode="${__INTERNAL_opts_local}GETOPT=\$(getopt -o ${__INTERNAL_opts_short} -l ${__INTERNAL_opts_long} -- \"\$@\")
 [[ \$? -ne 0 ]] && {
  echo 'Exiting'
  return 1 >& /dev/null
  exit 1
 }
 eval set -- \"\$GETOPT\"
 ${__INTERNAL_opts_init_var:1}
 while [[ -n \"\$1\" ]]; do
  case \$1 in
  --)
    shift; break
    ;;
 ${optsCode}
  --help)
    echo \"\$__INTERNAL_opts_help\"
    return >& /dev/null
    exit
    ;;
  *)
    echo \"unknown option '\$1'\"
    return 1 >& /dev/null
    exit 1
  ;;
  esac
  shift
 done
 ${__INTERNAL_opts_default:1}
 unset optsCode __INTERNAL_opts_help __INTERNAL_opts_short __INTERNAL_opts_long __INTERNAL_opts_default __INTERNAL_opts_init_var __INTERNAL_opts_local
 "
  if ! echo "$optsCode" | grep -q -- '--help$'; then
    __INTERNAL_opts_help="$__INTERNAL_opts_help
  --help
      Show this help."
  fi
  LogMoreHigh -f "optsCode:\n$optsCode"
  LogMoreMed -f "end"
 }; # end of optsDone }}}
 # optsSelfCheck ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsSelfCheck() {
  optsBegin -h "Usage: $0 [options]
  options:
 "
 #  optsAdd 'help' -f 'echo help'
  optsAdd 'flag' -f 'echo f'
  optsAdd 'optional|o' -o "echo opt \$1"
  optsAdd 'Optional|O' -o "echo opt \$1" --long
  optsAdd 'mandatory|m' -m "echo man \$1"
  optsDone
  echo "${optsCode}"
  echo ...
  eval "${optsCode}"
  echo ...
  fce() {
    optsBegin -h "Usage: $0 [options]
  options:
 "
  #  optsAdd 'help' -f 'echo help'
    optsAdd 'flag' -f
    optsAdd 'optional|o' -o "echo opt \$1"
    optsAdd 'Optional|O' -o "echo opt \$1" --long
    optsAdd 'mandatory|m' -m "echo man \$1"
    optsDone
    echo "${optsCode}"
    echo ...
    eval "${optsCode}"
    echo ...
  }
  echo -e 'test for opts in function\n========================='
  fce --help
 }; # end of optsSelfCheck }}}
 # optsLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 optsLibraryLoaded() {
  return 0
 }; # end of LogLibraryLoaded }}}
 echo "done."
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/sudoers-options-sanity-test/distribution/Library/tcf/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/tcf/Makefile
@ -0,0 +1,60 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/tcf
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/tcf
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Block style coding with ability of skipping parts." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/tcf)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/tcf/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/tcf/lib.sh
@ -0,0 +1,903 @@
 #!/bin/bash
 # try-check-final.sh
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = tcf
 #   library-version = 14
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 __INTERNAL_tcf_LIB_VERSION=14
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library Try-Check-Final
 =head1 DESCRIPTION
 This file contains functions which gives user the ability to define blocks of
 code where some of the blocks can be automatically skipped if some of preceeding
 blocks failed.
 ATTENTION
 This plugin modifies some beakerlib functions! If you suspect that it breakes
 some functionality set the environment variable TCF_NOHACK to nonempty value.
 =head1 USAGE
 To use this functionality you need to import library distribution/tcf and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/tcf)" >> $(METADATA)
 =head1 FUNCTIONS
 =cut
 echo -n "loading library try-check-final v$__INTERNAL_tcf_LIB_VERSION... "
 let __INTERNAL_tcf_DEBUG_LEVEL_LOW=3
 let __INTERNAL_tcf_DEBUG_LEVEL_MED=$__INTERNAL_tcf_DEBUG_LEVEL_LOW+1
 let __INTERNAL_tcf_DEBUG_LEVEL_HIGH=$__INTERNAL_tcf_DEBUG_LEVEL_LOW+2
 # global variables {{{
 __INTERNAL_tcf_result=0
 __INTERNAL_tcf_result_file="${BEAKERLIB_DIR:-"/var/tmp"}/tcf.result"
 echo -n "$__INTERNAL_tcf_result" > "$__INTERNAL_tcf_result_file"
 __INTERNAL_tcf_current_level_data=()
 __INTERNAL_tcf_current_level_val=0
 __INTERNAL_tcf_journal=()
 #}}}
 # __INTERNAL_tcf_colorize ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_colorize() {
  local a
  case $1 in
    PASS)
      a="${__INTERNAL_tcf_color_green}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    FAIL)
      a="${__INTERNAL_tcf_color_red}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    SKIPPING|WARNING)
      a="${__INTERNAL_tcf_color_yellow}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    BEGIN|INFO)
      a="${__INTERNAL_tcf_color_blue}${1}${__INTERNAL_tcf_color_reset}"
      ;;
    *)
      a=$1
  esac
  echo -n "$a"
 }; # end of __INTERNAL_tcf_colorize }}}
 # __INTERNAL_tcf_colors_setup ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_colors_setup(){
  T="$TERM"
  [[ -t 1 ]] || T=""
  [[ -t 2 ]] || T=""
  [[ "$1" == "--force" ]] && T="xterm"
  case $T in
    xterm|screen)
      __INTERNAL_tcf_color_black="\e[0;30m"
      __INTERNAL_tcf_color_dark_gray="\e[1;30m"
      __INTERNAL_tcf_color_blue="\e[0;34m"
      __INTERNAL_tcf_color_light_blue="\e[1;34m"
      __INTERNAL_tcf_color_green="\e[0;32m"
      __INTERNAL_tcf_color_light_green="\e[1;32m"
      __INTERNAL_tcf_color_cyan="\e[0;36m"
      __INTERNAL_tcf_color_light_cyan="\e[1;36m"
      __INTERNAL_tcf_color_red="\e[0;31m"
      __INTERNAL_tcf_color_light_red="\e[1;31m"
      __INTERNAL_tcf_color_purple="\e[0;35m"
      __INTERNAL_tcf_color_light_purple="\e[1;35m"
      __INTERNAL_tcf_color_brown="\e[0;33m"
      __INTERNAL_tcf_color_yellow="\e[1;33m"
      __INTERNAL_tcf_color_light_gray="\e[0;37m"
      __INTERNAL_tcf_color_white="\e[1;37m"
      __INTERNAL_tcf_color_reset="\e[00m"
      ;;
    * )
      __INTERNAL_tcf_color_black=""
      __INTERNAL_tcf_color_dark_gray=""
      __INTERNAL_tcf_color_blue=""
      __INTERNAL_tcf_color_light_blue=""
      __INTERNAL_tcf_color_green=""
      __INTERNAL_tcf_color_light_green=""
      __INTERNAL_tcf_color_cyan=""
      __INTERNAL_tcf_color_light_cyan=""
      __INTERNAL_tcf_color_red=""
      __INTERNAL_tcf_color_light_red=""
      __INTERNAL_tcf_color_purple=""
      __INTERNAL_tcf_color_light_purple=""
      __INTERNAL_tcf_color_brown=""
      __INTERNAL_tcf_color_yellow=""
      __INTERNAL_tcf_color_light_gray=""
      __INTERNAL_tcf_color_white=""
      __INTERNAL_tcf_color_reset=""
      ;;
  esac
 }; # end of __INTERNAL_tcf_colors_setup
 __INTERNAL_tcf_colors_setup; # }}}
 # __INTERNAL_tcf_copy_function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_copy_function() {
    declare -F $1 > /dev/null || return 1
    eval "$(echo -n "${2}() "; declare -f ${1} | tail -n +2)"
 }; # end of __INTERNAL_tcf_copy_function }}}
 # __INTERNAL_tcf_addE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_addE2R() {
  __INTERNAL_tcf_copy_function $1 TCF_orig_$1
  eval "${1}() { TCF_orig_${1} \"\$@\"; tcfE2R; }"
 }; # end of __INTERNAL_tcf_addE2R }}}
 # __INTERNAL_tcf_insertE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_insertE2R() {
  __INTERNAL_tcf_copy_function $1 TCF_orig_$1
  eval "$(echo -n "${1}() "; declare -f ${1} | tail -n +2 | sed -e 's/\(.*__INTERNAL_ConditionalAssert.*\)/\1\ntcfE2R;/')"
 }; # end of __INTERNAL_tcf_insertE2R }}}
 # __INTERNAL_tcf_get_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_get_current_level() {
  local l=$__INTERNAL_tcf_current_level_val
  if [[ $1 ]]; then
    l=$(($l+$1))
  fi
  local i
  for i in $(seq 1 $(($l*2)) ); do echo -n " "; done
  return $l
 }; # end of __INTERNAL_tcf_get_current_level }}}
 # __INTERNAL_tcf_incr_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_incr_current_level() {
  let __INTERNAL_tcf_current_level_val++
  __INTERNAL_Log_prefix=$(__INTERNAL_tcf_get_current_level)
 }; # end of __INTERNAL_tcf_incr_current_level }}}
 # __INTERNAL_tcf_decr_current_level ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_decr_current_level() {
  let __INTERNAL_tcf_current_level_val--
  __INTERNAL_Log_prefix=$(__INTERNAL_tcf_get_current_level)
 }; # end of __INTERNAL_tcf_decr_current_level }}}
 # __INTERNAL_tcf_do_hack ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_do_hack() {
   LogDebug "TCF_NOHACK='$TCF_NOHACK'"
   if [[ -z "$TCF_NOHACK" ]]; then
    tcfChk "Apply TCF beakerlib hacks" && {
      rlLog "  injecting tcf hacks into the beakerlib functions"
      echo -n "patching rlLog"
      local rlL=$(declare -f rlLog | sed -e 's|\] ::|\0${__INTERNAL_Log_prefix}|;s|$3 $1"|${3:+"$3 "}$1"|')
      eval "$rlL"
      echo -n ", rljAddTest"
      __INTERNAL_tcf_copy_function rljAddTest __INTERNAL_tcf_orig_rljAddTest
      true; rljAddTest() {
        local a="${__INTERNAL_Log_prefix}$1"; shift
        [[ "$1" != "FAIL" ]]; tcfE2R
        __INTERNAL_tcf_journal=("${__INTERNAL_tcf_journal[@]}" "$1" "$a")
        __INTERNAL_tcf_orig_rljAddTest "$a" "$@"
      }
      echo -n ", rljAddMessage"
      __INTERNAL_tcf_copy_function rljAddMessage __INTERNAL_tcf_orig_rljAddMessage
      true; rljAddMessage() {
        local a="${__INTERNAL_Log_prefix}$1"; shift
        __INTERNAL_tcf_journal=("${__INTERNAL_tcf_journal[@]}" "$1" "$a")
        __INTERNAL_tcf_orig_rljAddMessage "$a" "$@"
      }
      echo -n ", __INTERNAL_LogAndJournalFail"
      __INTERNAL_tcf_copy_function __INTERNAL_LogAndJournalFail __INTERNAL_tcf_orig___INTERNAL_LogAndJournalFail
      true; __INTERNAL_LogAndJournalFail() {
        tcfNOK
        __INTERNAL_tcf_orig___INTERNAL_LogAndJournalFail "$@"
      }
      echo "."
    tcfFin --no-assert --ignore; }
  else
    Log "skip hacking beakerlib functions"
  fi
 }; # end of __INTERNAL_tcf_do_hack }}}
 # __INTERNAL_tcf_kill_old_plugin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_kill_old_plugin() {
    tcfChk "Get rid of the old TCF implementation. removing" && {
      local comma='' i
      for i in Try Chk Fin E2R RES OK NOK NEG TCFcheckFinal TCFreport; do
        echo -n "${comma}rl$i"
        unset -f rl$i
        comma=', '
      done
      echo '.'
    tcfFin --no-assert; }
 }; # end of __INTERNAL_tcf_kill_old_plugin }}}
 : <<'=cut'
 =pod
 =head2 Block functions
 =cut
 # __INTERNAL_tcf_parse_params ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 __INTERNAL_tcf_parse_params() {
  local GETOPT=$(getopt -q -o if: -l ignore,no-assert,fail-tag: -- "$@")
  eval set -- "$GETOPT"
  echo "local ignore noass title fail_tag"
  echo "[ -z \"\$ignore\" ] && ignore=0"
  echo "[ -z \"\$noass\" ] && noass=0"
  echo "[ -z \"\$fail_tag\" ] && fail_tag='FAIL'"
  while [[ -n "$@" ]]; do
    case $1 in
    --)
      shift; break
      ;;
    --ignore|-i)
      echo "ignore=1"
      echo "noass=1"
      ;;
    --no-assert|-n)
      echo "noass=1"
      ;;
    --fail-tag|-f)
      shift
      echo "fail_tag='$1'"
      ;;
    *)
      echo "unknown option $1"
      return 1
      ;;
    esac
    shift;
  done
  [[ -n "$1" ]] && echo "title=\"${1}\""
  echo "eval set -- \"$(echo "$GETOPT" | sed -e 's/.*-- //')\""
 }; # end of __INTERNAL_tcf_parse_params }}}
 # tcfTry ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfTry
 Starting function of block which will be skipped if an error has been detected
 by tcfFin function occurent before.
    tcfTry ["title"] [-i|--ignore] [--no-assert] [--fail-tag TAG] && {
      <some code>
    tcfFin; }
 If title is omitted than noting is printed out so no error will be reported (no
 Assert is executed) thus at least the very top level tcfTry should have title.
 tcfTry and tcfChk blocks are stackable so you can organize them into a hierarchy
 structure.
 Note that tcfFin has to be used otherwise the overall result will not be
 accurate.
 =over
 =item title
 Text which will be displayed and logged at the beginning and the end (in tcfFin
 function) of the block.
 =item -i, --ignore
 Do not propagate the actual result to the higher level result.
 =item -n, --no-assert
 Do not log error into the journal.
 =item -f, --fail-tag TAG
 If the result of the block is FAIL, use TAG instead ie. INFO or WARNING.
 =back
 Returns 1 if and error occured before, otherwise returns 0.
 =cut
 tcfTry() {
  LogMoreLow -f "begin '$*'"
  local vars=$(__INTERNAL_tcf_parse_params "$@") || { Log "$vars" FAIL; return 1; }
  LogMoreMed -f "vars:\n$vars"
  LogMoreLow -f "evaluating options start"
  eval "$vars"
  LogMoreLow -f "evaluating options end"
  local incr=
  local pp="SKIPPING"
  tcfRES; # to set __INTERNAL_tcf_result
  LogMoreLow -f "result was $__INTERNAL_tcf_result"
  if [[ $__INTERNAL_tcf_result -eq 0 ]]; then
    __INTERNAL_tcf_current_level_data=("$__INTERNAL_tcf_result" "$vars" "${__INTERNAL_tcf_current_level_data[@]}")
    pp="BEGIN"
    incr=1
  fi
  if [[ -n "$title" ]]; then
    Log "$title" "$pp"
    [[ -n "$incr" ]] && {
      LogMoreLow -f "increment indentation level"
      __INTERNAL_tcf_incr_current_level
    }
  fi
  LogMoreLow -f "end"
  return $__INTERNAL_tcf_result
 }; # end of tcfTry }}}
 # tcfChk ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfChk
 Starting function of block which will be always executed.
    tcfChk ["title"] [-i|--ignore] [--no-assert] [--fail-tag TAG] && {
      <some code>
    tcfFin; }
 If title is omitted than noting is printed out so no error will be reported (no
 Assert is executed) thus at least the very top level tcfChk should have title.
 tcfTry and tcfChk blocks are stackable so you can organize them into a hierarchy
 structure.
 Note that tcfFin has to be used otherwise the overall result will not be
 accurate.
 For details about arguments see tcfTry.
 Returns 0.
 =cut
 tcfChk() {
  LogMoreLow -f "begin '$*'"
  tcfRES; # to set __INTERNAL_tcf_result
  local res=$__INTERNAL_tcf_result
  tcfRES 0
  tcfTry "$@"
  __INTERNAL_tcf_current_level_data[0]=$res
  LogMoreLow -f "end"
  return $__INTERNAL_tcf_result
 }; # end of tcfChk }}}
 # tcfFin ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfFin
 Ending function of block. It does some evaluation of previous local and global
 results and puts it into the global result.
    tcfTry ["title"] && {
      <some code>
    tcfFin [-i|--ignore] [--no-assert] [--fail-tag TAG]; }
 Local result is actualy exit code of the last command int the body.
 Global result is an internal varibale hodning previous local results.
 Respectively last error or 0.
 For details about arguments see tcfTry.
 Returns local result of the preceeding block.
 =cut
 tcfFin() {
  local RES=$?
  LogMoreLow -f "begin '$*'"
  LogMoreMed -f "previous exit code was '$RES'"
  local vars=$(__INTERNAL_tcf_parse_params "$@") || { Log "$vars" FAIL; return 1; }
  LogMoreMed -f "vars:\n$vars"
  LogMoreLow -f "evaluating options start"
  eval "$vars"
  LogMoreLow -f "evaluating options end"
  tcfRES; # to set __INTERNAL_tcf_result
  [[ $RES -ne 0 ]] && tcfRES $RES
  RES=$__INTERNAL_tcf_result
  LogMoreMed -f "overall result is '$RES'"
  LogMoreMed -f "data:\n${__INTERNAL_tcf_current_level_data[1]}"
  LogMoreLow -f "evaluating data start"
  eval "${__INTERNAL_tcf_current_level_data[1]}"
  LogMoreLow -f "evaluating data end"
  if [[ -n "$title" ]]; then
    __INTERNAL_tcf_decr_current_level
    if [[ $ignore -eq 1 ]]; then
      RES=0
      [[ $__INTERNAL_tcf_result -ne 0 ]] && title="$title - ignored"
    fi
    if [[ $noass -eq 0 ]]; then
      tcfAssert0 "$title" $__INTERNAL_tcf_result "$fail_tag"
    else
      if [[ $__INTERNAL_tcf_result -eq 0 ]]; then
        local pp="PASS"
        LogInfo "$title - $pp"
      else
        local pp="${fail_tag:-FAIL}"
        LogWarn "$title - $pp"
      fi
    fi
  fi
  if [[ $__INTERNAL_tcf_result -eq 0 || $ignore -eq 1 ]]; then
    tcfRES ${__INTERNAL_tcf_current_level_data[0]}
  fi
  local i
  for i in 0 1; do unset __INTERNAL_tcf_current_level_data[$i]; done
  __INTERNAL_tcf_current_level_data=("${__INTERNAL_tcf_current_level_data[@]}")
  LogMoreLow -f "end"
  return $RES
 }; # end of tcfFin }}}
 : <<'=cut'
 =pod
 =head2 Functions for manipulation with the results
 =cut
 # tcfRES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfRES
 Sets and return the global result.
    tcfRES [-p|--print] [number]
 =over
 =item -p --print
 Also print the result value.
 =item number
 If present the global result is set to this value.
 =back
 Returns global result.
 =cut
 tcfRES() {
  local p=0
  while [[ -n "$1" ]]; do
    case $1 in
    --print|-p)
      p=1
      ;;
    *)
      break
      ;;
    esac
    shift
  done
  if [[ -n "$1" ]]; then
    __INTERNAL_tcf_result=$1
    echo -n "$__INTERNAL_tcf_result" > "$__INTERNAL_tcf_result_file"
  else
    __INTERNAL_tcf_result="$(cat "$__INTERNAL_tcf_result_file")"
  fi
  [[ $p -eq 1 ]] && echo $__INTERNAL_tcf_result
  return $__INTERNAL_tcf_result
 }; # end of tcfRES }}}
 # tcfOK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfOK
 Sets the global result to 0.
    tcfOK
 Returns global result.
 =cut
 tcfOK() {
  tcfRES 0
 }; # end of tcfOK }}}
 # tcfNOK ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfNOK
 Sets the global result to 1 or given number.
    tcfNOK [number]
 =over
 =item number
 If present the global result is set to this value.
 =back
 Returns global result.
 =cut
 tcfNOK() {
  if [[ -n "$1" ]]; then
    [[ $1 -eq 0 ]] && echo "You have requested result '0'. You should use tcfOK instead."
    tcfRES $1
  else
    tcfRES 1
  fi
 }; # end of tcfNOK }}}
 # tcfE2R ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfE2R
 Converts exit code of previous command to local result if the exit code is not 0
 (zero).
    <some command>
    tcfE2R [number]
 =over
 =item number
 If present use it instead of exit code.
 =back
 Returns original exit code or given number.
 =cut
 tcfE2R() {
  local res=$?
  [[ -n "$1" ]] && res=$1
  [[ $res -ne 0 ]] && tcfRES $res
  return $res
 }; # end of tcfE2R }}}
 : <<'=cut'
 =pod
 =head2 Functions for manipulation with the exit codes
 =cut
 # tcfNEG ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfNEG
 Negates exit code of previous command.
    <some command>
    tcfNEG
 Returns 1 if original exit code was 0, otherwise returns 0.
 =cut
 tcfNEG() {
  [[ $? -eq 0 ]] && return 1 || return 0
 }; # end of tcfNEG }}}
 # tcfRun ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfRun
 Simmilar to rlRun but it also annouces the beginnign of the command.
    tcfRun [--fail-tag|-f TAG] command [exp_result [title]]
 Moreover if 'command not found' appears on STDERR it should produce WARNING.
 =over
 =item command
 Command to execute.
 =item exp_result
 Specification of expect resutl.
 It can be a list of values or intervals or * for any result. Also negation (!) can be used.
 Example:
    <=2,7,10-12,>252,!254 means following values 0,1,2,7,10,11,12,253,255
 =item title
 Text which will be displayed and logged at the beginning and the end of command execution.
 =item --fail-tag | -f
 If the command fails use TAG instead of FAIL.
 =back
 Returns exit code of the executed command.
 =cut
 tcfRun() {
  LogMore_ -f "begin      $*"
  optsBegin
  optsAdd 'fail-tag|f' --mandatory
  optsAdd 'timeout' --optional 'timeout="${1:-10}"'
  optsAdd 'kill-timeout|kt' --mandatory --default 5
  optsAdd 'signal' --mandatory --default TERM
  optsAdd 'check-code' --mandatory --default 'kill -0 $cmdpid >&/dev/null'
  optsAdd 'kill-code' --mandatory --default '/bin/kill -$signal -- $cmdpid'
  optsAdd 'allow-skip|as' --flag
  optsAdd 'no-assert|n' --flag
  optsDone; eval "${optsCode}"
  LogMore_ -f "after opts $*"
  [[ -z "$allowskip" ]] && tcfChk
    local orig_expecode="${2:-0}"
    local expecode="$orig_expecode"
    [[ "$expecode" == "*" ]] && expecode="0-255"
    local command="$1"
    local comment="Running command '$command'"
    [[ -n "$3" ]] && comment="$3"
    [[ -n "$expecode" ]] && {
      expecode=$(echo "$expecode" | tr ',-' '\n ' | sed -e 's/^!=/!/;s/^=//;s/^<=\(.\+\)$/0 \1/;s/^>=\(.\+\)$/\1 255/;s/^<\(.\+\)$/0 \$(( \1 - 1 ))/;s/^>\(.\+\)$/\$(( \1 + 1 )) 255/' | while read line; do [[ "$line" =~ ^[^\ ]+$ ]] && echo "$line" || eval seq $line; done; )
      tcfE2R
      LogMoreLow -f "orig_expecode='$orig_expecode'" 
      LogMoreLow -f "expecode='$expecode'" 
    }
    tcfTry ${noassert:+--no-assert} "$comment" && {
      local errout=$(mktemp)
      LogMoreLow -f "executing '$command'"
      if [[ "$optsPresent" =~ $(echo "\<timeout\>") ]]; then
        LogDebug -f "using watchdog feature"
        local ec="$(mktemp)"
        eval "$command; echo $? > $ec 2> >(tee $errout)" &
        local cmdpid=$!
        local time_start=$(date +%s)
        local timeout_t=$(( $time_start + $timeout ))
        while true; do
          if ! eval "$checkcode"; then
             Log "command finished in $(($(date +%s) - $time_start )) seconds"
             local res="$(cat $ec)"
             break
          elif [[ $(date +%s) -ge $timeout_t ]]; then
            echo
            Log "command is still running, sending $signal signal"
            eval "$killcode"
            tcfNOK 255
            echo 255 > $ec
            let timeout_t+=killtimeout
            signal=KILL
          fi
          sleep 0.1
        done
        rm -f $ec
      else
        eval "$command" 2> >(tee $errout)
        local res=$?
      fi
      LogMoreLow -f "got '$res'" 
      local resmatch=$(echo "$expecode" | grep "^\!\?${res}$")
      LogMoreLow -f "resmatch='$resmatch'" 
      [[ -n "$resmatch" && ! "$resmatch" =~ '!' ]]
      if tcfE2R; then
        ! grep -iq "command not found" $errout || { failtag='WARNING'; tcfNOK; }
      else
        Log "Expected result was '$orig_expecode', got '$res'!"
      fi
    tcfFin ${failtag:+--fail-tag "$failtag"}; }
    rm -f $errout
  [[ -z "$allowskip" ]] && tcfFin
  LogMore_ -f "end $*"
  return $res
 }; # end of tcfRun }}}
 : <<'=cut'
 =pod
 =head2 Functions for logging
 =cut
 # tcfAssert0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 tcfAssert0() {
  LogMoreLow -f "begin '$*'"
  local RES="${3:-FAIL}"
  [[ $2 -eq 0 ]] && RES='PASS'
  Log "$1" $RES
  LogMoreLow -f "end"
 }; # end of tcfAssert0 }}}
 # tcfCheckFinal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 : <<'=cut'
 =pod
 =head3 tcfCheckFinal
 Check that all tcfTry / tcfChk functions have been close by tcfFin.
    tcfCheckFinal
 =cut
 tcfCheckFinal() {
  tcfAssert0 "Check that TCF block cache is empty" ${#__INTERNAL_tcf_current_level_data[@]}
  tcfAssert0 "Check that TCF current level is 0" $__INTERNAL_tcf_current_level_val
 }; # end of tcfCheckFinal }}}
 echo "done."
 : <<'=cut'
 =pod
 =head2 Self check functions
 =cut
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # tcfSelfCheck {{{
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : <<'=cut'
 =pod
 =head3 tcfSelfCheck
 Does some basic functionality tests.
    tcfSelfCheck
 The function is called also by the following command:
    ./lib.sh selfcheck
 =cut
 tcfSelfCheck() {
  tcfChk "check 1" &&{
    tcfTry "try 1.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 1.2 - false" &&{
      false
    tcfFin;}
    tcfTry "try 1.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfChk "check 2" &&{
    tcfTry "try 2.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 2.2 - true - ignore" &&{
      true
    tcfFin -i;}
    tcfTry "try 2.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfChk "check 3" &&{
    tcfTry "try 3.1 - true" &&{
      true
    tcfFin;}
    tcfTry "try 3.2 - false - ignore" &&{
      false
    tcfFin -i;}
    tcfTry "try 3.3 - true" &&{
      true
    tcfFin;}
  tcfFin;}
  tcfCheckFinal
  tcfAssert0 "Overall result" $(tcfRES -p)
  LogReport
 }
 if [[ "$1" == "selfcheck" ]]; then
  tcfSelfCheck
 fi; # end of tcfSelfCheck }}}
 # tcfLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 tcfLibraryLoaded() {
  rlImport distribution/Log
  declare -F rlDie > /dev/null && {
    #rlJournalStart
    #rlPhaseStartSetup "TCF"
    echo -e "\nrunning inside the beakerlib - using rlAssert0"
    true; tcfAssert0() {
      local text="$1"
      [[ "$3" != "FAIL" && "$3" != "PASS" ]] && text="$text - $3"
      __INTERNAL_ConditionalAssert "$text" "$2"
    }
    __INTERNAL_tcf_do_hack
    #rlPhaseEnd
    #rlJournalEnd
  };
  if declare -F rlE2R >& /dev/null; then
    __INTERNAL_tcf_kill_old_plugin
  fi
  true
 }; # end of tcfLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
--- a/tests/sudoers-options-sanity-test/distribution/Library/testUser/Makefile
+++ b/tests/sudoers-options-sanity-test/distribution/Library/testUser/Makefile
@ -0,0 +1,60 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /distribution/Library/testUser
 #   Description: Block style coding with ability of skipping parts.
 #   Author: Dalibor Pospisil <dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/distribution/Library/testUser
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) lib.sh Makefile
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Dalibor Pospisil <dapospis@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Setup/cleanup standard testing user." >> $(METADATA)
 	@echo "Type:            Library" >> $(METADATA)
 	@echo "TestTime:        5m" >> $(METADATA)
 	@echo "RhtsRequires:    library(distribution/Log)" >> $(METADATA)
 	@echo "Provides:        library(distribution/testUser)" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/sudoers-options-sanity-test/distribution/Library/testUser/lib.sh
+++ b/tests/sudoers-options-sanity-test/distribution/Library/testUser/lib.sh
@ -0,0 +1,234 @@
 #!/bin/bash
 # try-check-final.sh
 # Authors: 	Dalibor Pospíšil	<dapospis@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #   library-prefix = testUser
 #   library-version = 7
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 : <<'=cut'
 =pod
 =head1 NAME
 BeakerLib library testUser
 =head1 DESCRIPTION
 This library provide s function for maintaining testing users.
 =head1 USAGE
 To use this functionality you need to import library distribution/testUser and add
 following line to Makefile.
 	@echo "RhtsRequires:    library(distribution/testUser)" >> $(METADATA)
 =head1 VARIABLES
 =over
 =item testUser
 Array of testing user login names.
 =item testUserPasswd
 Array of testing users passwords.
 =item testUserUID
 Array of testing users UIDs.
 =item testUserGID
 Array of testing users primary GIDs.
 =item testUserGroup
 Array of testing users primary group names.
 =item testUserGIDs
 Array of space separated testing users all GIDs.
 =item testUserGroups
 Array of space separated testing users all group names.
 =item testUserGecos
 Array of testing users gecos fields.
 =item testUserHomeDir
 Array of testing users home directories.
 =item testUserShell
 Array of testing users default shells.
 =back
 =head1 FUNCTIONS
 =cut
 echo -n "loading library testUser... "
 : <<'=cut'
 =pod
 =head3 testUserSetup, testUserCleanup
 Creates/removes testing user(s).
    rlPhaseStartSetup
        testUserSetup [NUM]
    rlPhaseEnd
    rlPhaseStartCleanup
        testUserCleanup
    rlPhaseEnd
 =over
 =item NUM
 Optional number of user to be created. If not specified one user is created.
 =back
 Returns 0 if success.
 =cut
 testUserSetup() {
  # parameter dictates how many users should be created, defaults to 1
  local res=0
  local count_created=0
  local count_wanted=${1:-"1"}
  local index=0
  (( $count_wanted < 1 )) && return 1
  while (( $count_created != $count_wanted ));do
    let index++
    local newUser="testuser${index}"
    local newUserPasswd="redhat"
    id "$newUser" &> /dev/null && continue # if user with the name exists, try again
    # create
    useradd -m $newUser >&2 || ((res++))
    echo "$newUserPasswd" | passwd --stdin $newUser || ((res++))
    # save the users array
    testUser+=($newUser)
    testUserPasswd+=($newUserPasswd)
    set | grep "^testUser=" > $__INTERNAL_testUser_users_file
    set | grep "^testUserPasswd=" >> $__INTERNAL_testUser_users_file
    ((count_created++))
  done
  __INTERNAL_testUserRefillInfo || ((res++))
  echo ${res}
  [[ $res -eq 0 ]]
 }
 __INTERNAL_testUserRefillInfo() {
  local res=0
  local user
  testUserUID=()
  testUserGID=()
  testUserGroup=()
  testUserGIDs=()
  testUserGroups=()
  testUserGecos=()
  testUserHomeDir=()
  testUserShell=()
  for user in ${testUser[@]}; do
    local ent_passwd=$(getent passwd ${user}) || ((res++))
    local users_id="$(id ${user})" || ((res++))
    # testUser is filled during user creation - already present
    # testUserPasswd is saved same way as testUser - already present
    testUserUID+=("$(echo "$ent_passwd" | cut -d ':' -f 3)")
    testUserGID+=("$(echo "$ent_passwd" | cut -d ':' -f 4)")
    testUserGroup+=("$(echo "$users_id" | sed -r 's/.*gid=(\S+).*/\1/;s/[[:digit:]]+\(//g;s/\)//g;s/,/ /g')")
    testUserGIDs+=("$(echo "$users_id" | sed -r 's/.*groups=(\S+).*/\1/;s/\([^\)]+\)//g;s/\)//g;s/,/ /g')")
    testUserGroups+=("$(echo "$users_id" | sed -r 's/.*groups=(\S+).*/\1/;s/[[:digit:]]+\(//g;s/\)//g;s/,/ /g')")
    testUserGecos+=("$(echo "$ent_passwd" | cut -d ':' -f 5)")
    testUserHomeDir+=("$(echo "$ent_passwd" | cut -d ':' -f 6)")
    testUserShell+=("$(echo "$ent_passwd" | cut -d ':' -f 7)")
  done
  echo ${res}
  [[ $res -eq 0 ]]
 }
 testUserCleanup() {
  local res=0
  for user in ${testUser[@]}; do
    userdel -rf "$user" >&2 || ((res++))
  done
  unset testUser
  __INTERNAL_testUserRefillInfo
  rm -f $__INTERNAL_testUser_users_file >&2 || ((res++))
  echo ${res}
  [[ $res -eq 0 ]]
 }
 # testUserLibraryLoaded ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {{{
 testUserLibraryLoaded() {
  local res=0
  # necessary init steps
  __INTERNAL_testUser_users_file="$BEAKERLIB_DIR/users"
  # try to fill in users array with previous data
  [[ -f ${__INTERNAL_testUser_users_file} ]] && . ${__INTERNAL_testUser_users_file} >&2
  __INTERNAL_testUserRefillInfo >&2 || ((res++))
  [[ $res -eq 0 ]]
 }; # end of testUserLibraryLoaded }}}
 : <<'=cut'
 =pod
 =head1 AUTHORS
 =over
 =item *
 Dalibor Pospisil <dapospis@redhat.com>
 =back
 =cut
 echo "done."
--- a/tests/sudoers-options-sanity-test/runtest.sh
+++ b/tests/sudoers-options-sanity-test/runtest.sh
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,53 @@
 ---
 - hosts: localhost
  tags: [ always ]
  tasks:
  - set_fact:
      our_required_packages:
      - sudo
      - passwd          # sudoers-options-sanity-test needs passwd command
      - postfix         # sudoers-options-sanity-test needs mailq command
      - wget            # upstream-testsuite-execution-and-rebuild-test needs wget command
      - yum-utils       # upstream-testsuite-execution-and-rebuild-test needs yum-builddep command
      - rpm-build       # upstream-testsuite-execution-and-rebuild-test needs rpmbuild command
      - openssh-clients # use_pty-option needs ssh command
      - expect          # use_pty-option needs expect command
      - procps          # run-as needs ps command
 - hosts: localhost
  tags:
  - classic
  roles:
  - role: standard-test-beakerlib
    tests:
    - sudoers-options-sanity-test
    - upstream-testsuite-execution-and-rebuild-test
    #- use_pty-option    # test logic is currently broken; maintainer is looking into it
    - run-as
    - fully-qualified-hostnames
    required_packages: "{{ our_required_packages }}"
 - hosts: localhost
  tags:
  - container
  roles:
  - role: standard-test-beakerlib
    tests:
    - sudoers-options-sanity-test
    - upstream-testsuite-execution-and-rebuild-test
    #- use_pty-option   # cannot run (needs sshd configured and running)
    - run-as
    #- fully-qualified-hostnames   # cannot run (needs sshd configured and running)
    required_packages: "{{ our_required_packages }}"
 - hosts: localhost
  tags:
  - atomic
  roles:
  - role: standard-test-beakerlib
    tests:
    - run-as
 # - sudoers-options-sanity-test      # cannot run (needs to re-install package)
 # - upstream-testsuite-execution-and-rebuild-test    # cannot run (needs compiler suite)
 # - use_pty-option   # cannot run (needs expect)
 # - fully-qualified-hostnames   # cannot run (needs expect)
--- a/tests/upstream-testsuite-execution-and-rebuild-test/Makefile
+++ b/tests/upstream-testsuite-execution-and-rebuild-test/Makefile
@ -0,0 +1,70 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /CoreOS/sudo/Sanity/upstream-testsuite-execution-and-rebuild-test
 #   Description: This test rebuild sudo source rpm and checks that rebuild is OK. The second - main - part is about upstream testsuite execution.
 #   Author: Ales Marecek <amarecek@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/CoreOS/sudo/Sanity/upstream-testsuite-execution-and-rebuild-test
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) runtest.sh Makefile PURPOSE
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	test -x runtest.sh || chmod a+x runtest.sh
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Ales Marecek <amarecek@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     This test rebuild sudo source rpm and checks that rebuild is OK. The second - main - part is about upstream testsuite execution." >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        15m" >> $(METADATA)
 	@echo "RunFor:          sudo" >> $(METADATA)
 	@echo "Requires:        sudo" >> $(METADATA)
 	@echo "Requires:        sed" >> $(METADATA)
 	@echo "Requires:        grep" >> $(METADATA)
 	@echo "Requires:        rpm-build" >> $(METADATA)
 	@echo "Requires:        yum-utils" >> $(METADATA)
 	@echo "Requires:        make" >> $(METADATA)
 	@echo "Requires:        libcap-devel" >> $(METADATA)
 	@echo "Requires:        audit-libs-devel" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/upstream-testsuite-execution-and-rebuild-test/PURPOSE
+++ b/tests/upstream-testsuite-execution-and-rebuild-test/PURPOSE
@ -0,0 +1,3 @@
 PURPOSE of /CoreOS/sudo/Sanity/upstream-testsuite-execution-and-rebuild-test
 Description: This test rebuild sudo source rpm and checks that rebuild is OK. The second - main - part is about upstream testsuite execution.
 Author: Ales Marecek <amarecek@redhat.com>
--- a/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh
+++ b/tests/upstream-testsuite-execution-and-rebuild-test/runtest.sh
@ -0,0 +1,80 @@
 #!/bin/bash
 # vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   runtest.sh of /CoreOS/sudo/Sanity/upstream-testsuite-execution-and-rebuild-test
 #   Description: This test rebuild sudo source rpm and checks that rebuild is OK. The second - main - part is about upstream testsuite execution.
 #   Author: Ales Marecek <amarecek@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Include Beaker environment
 . /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 PACKAGE="sudo"
 _SPEC_DIR="$(rpm --eval=%_specdir)"
 _BUILD_DIR="$(rpm --eval=%_builddir)"
 _LOG_REBUILD_F="${PACKAGE}-rebuild.log"
 _LOG_TESTSUITE_F="${PACKAGE}-testsuite.log"
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm $PACKAGE
        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
        rlRun "pushd $TmpDir"
 	# Source package is needed for code inspection
 	rlFetchSrcForInstalled "${PACKAGE}" || yumdownloader --source "${PACKAGE}"
    rlRun "find . -size 0 -delete" 0 "Remove empty src.rpm-s"
 	rlRun "yum-builddep -y --nogpgcheck ${PACKAGE}-*.src.rpm" 0 "Installing build dependencies"
 	[ -d ${_BUILD_DIR} ] && rlRun "rm -rf ${_BUILD_DIR}/*" 0 "Cleaning build directory"
 	rlRun "rpm -ivh ${PACKAGE}-*.src.rpm" 0 "Installing source rpm"
    rlPhaseEnd
    rlPhaseStartTest
 	rlRun "QA_RPATHS=0x0002 rpmbuild -ba ${_SPEC_DIR}/${PACKAGE}.spec" 0 "Test: Rebuild of source '${PACKAGE}' package"
 	rlGetPhaseState
 	if [ $? -eq 0 ]; then
 		cd ${_BUILD_DIR}/${PACKAGE}-*
 		rlRun -s "make check" 0 "Test: Upstream testsuite"
 		cd ${TmpDir}
 		while read -r I; do
 		    if [[ "$I" =~ $(echo '([^:]+): .+ tests run, .+ errors, (.*)% success rate') ]]; then
 		        [[ "${BASH_REMATCH[2]}" == "100" ]]
 		        rlAssert0 "Test: Checking tests of '${BASH_REMATCH[1]}'" $?
 		    elif [[ "$I" =~ $(echo "([^:]+): .+ tests passed; (.+)/.+ tests failed") ]]; then
 		        [[ "${BASH_REMATCH[2]}" == "0" ]]
 		        rlAssert0 "Test: Checking tests of '${BASH_REMATCH[1]}'" $?
 		    fi
 		done < $rlRun_LOG
 		rm -f $rlRun_LOG
 	else
 		rlFail "Skipping testsuite part because rebuild part failed."
 	fi
    rlPhaseEnd
    rlPhaseStartCleanup
        rlRun "popd"
        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
    rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd
--- a/tests/use_pty-option/Makefile
+++ b/tests/use_pty-option/Makefile
@ -0,0 +1,72 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Makefile of /CoreOS/sudo/Sanity/use_pty-option
 #   Description: checks if use_pty option in /etc/sudoers works as expected
 #   Author: Milos Malik <mmalik@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export TEST=/CoreOS/sudo/Sanity/use_pty-option
 export TESTVERSION=1.0
 BUILT_FILES=
 FILES=$(METADATA) runtest.sh Makefile PURPOSE forker.sh ssh-sudo.exp
 .PHONY: all install download clean
 run: $(FILES) build
 	./runtest.sh
 build: $(BUILT_FILES)
 	chmod a+x runtest.sh
 	chmod a+x ssh-sudo.exp
 clean:
 	rm -f *~ $(BUILT_FILES)
 include /usr/share/rhts/lib/rhts-make.include
 $(METADATA): Makefile
 	@echo "Owner:           Milos Malik <mmalik@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
 	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     checks if use_pty option in /etc/sudoers works as expected" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          sudo" >> $(METADATA)
 	@echo "Requires:        sudo" >> $(METADATA)
 	@echo "Requires:        iputils" >> $(METADATA)
 	@echo "Requires:        sed" >> $(METADATA)
 	@echo "Requires:        grep" >> $(METADATA)
 	@echo "Requires:        mktemp" >> $(METADATA)
 	@echo "Requires:        openssh-server" >> $(METADATA)
 	@echo "Requires:        openssh-clients" >> $(METADATA)
 	@echo "Requires:        expect" >> $(METADATA)
 	@echo "Requires:        shadow-utils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
 	rhts-lint $(METADATA)
--- a/tests/use_pty-option/PURPOSE
+++ b/tests/use_pty-option/PURPOSE
@ -0,0 +1,4 @@
 PURPOSE of /CoreOS/sudo/Sanity/use_pty-option
 Description: checks if use_pty option in /etc/sudoers works as expected
 Author: Milos Malik <mmalik@redhat.com>
--- a/tests/use_pty-option/forker.sh
+++ b/tests/use_pty-option/forker.sh
@ -0,0 +1,5 @@
 #!/bin/bash
 for i in `seq 1 10`; do
    ( ping -c 10 -q www.redhat.com & )
 done
--- a/tests/use_pty-option/runtest.sh
+++ b/tests/use_pty-option/runtest.sh
@ -0,0 +1,76 @@
 #!/bin/bash
 # vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   runtest.sh of /CoreOS/sudo/Sanity/use_pty-option
 #   Description: checks if use_pty option in /etc/sudoers works as expected
 #   Author: Milos Malik <mmalik@redhat.com>
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 #   Copyright (c) 2011 Red Hat, Inc. All rights reserved.
 #
 #   This copyrighted material is made available to anyone wishing
 #   to use, modify, copy, or redistribute it subject to the terms
 #   and conditions of the GNU General Public License version 2.
 #
 #   This program is distributed in the hope that it will be
 #   useful, but WITHOUT ANY WARRANTY; without even the implied
 #   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 #   PURPOSE. See the GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public
 #   License along with this program; if not, write to the Free
 #   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #   Boston, MA 02110-1301, USA.
 #
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Include rhts environment
 . /usr/bin/rhts-environment.sh
 . /usr/share/beakerlib/beakerlib.sh
 PACKAGE="sudo"
 USER_NAME="user${RANDOM}"
 USER_SECRET="s3kr3T${RANDOM}"
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm ${PACKAGE}
        OUTPUT_FILE=`mktemp`
        rlFileBackup /etc/sudoers
        rlFileBackup --clean ~/.ssh
        rlRun "useradd ${USER_NAME}"
        rlRun "echo ${USER_SECRET} | passwd --stdin ${USER_NAME}"
        rlRun "cp ./forker.sh /home/${USER_NAME}/"
        rlRun "chown ${USER_NAME}:${USER_NAME} /home/${USER_NAME}/forker.sh"
        rlRun "chmod u+x /home/${USER_NAME}/forker.sh"
        rlRun "echo \"${USER_NAME} ALL = NOPASSWD: /home/${USER_NAME}/forker.sh\" >> /etc/sudoers"
        rlRun "sed -i 's/^.*requiretty.*$//' /etc/sudoers"
        rlRun "echo \"Defaults !requiretty\" >> /etc/sudoers"
        rlRun "> ~/.ssh/known_hosts"
    rlPhaseEnd
    rlPhaseStartTest "use_pty option is enabled"
        rlRun "sed -i 's/^.*use_pty.*$//' /etc/sudoers"
        rlRun "echo \"Defaults use_pty\" >> /etc/sudoers"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost ./forker.sh 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertNotGrep "ping statistics" ${OUTPUT_FILE}
    rlPhaseEnd
    rlPhaseStartTest "use_pty option is disabled"
        rlRun "sed -i 's/^.*use_pty.*$//' /etc/sudoers"
        rlRun "echo \"Defaults !use_pty\" >> /etc/sudoers"
        rlRun "./ssh-sudo.exp ${USER_NAME} ${USER_SECRET} localhost ./forker.sh 2>&1 | tee ${OUTPUT_FILE}"
        rlAssertGrep "ping statistics" ${OUTPUT_FILE}
    rlPhaseEnd
    rlPhaseStartCleanup
        rlRun "userdel -rf ${USER_NAME}"
        rlFileRestore
        rm -f ${OUTPUT_FILE}
    rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd
--- a/tests/use_pty-option/ssh-sudo.exp
+++ b/tests/use_pty-option/ssh-sudo.exp
@ -0,0 +1,20 @@
 #!/usr/bin/expect -f
 # usage:
 # ./ssh-sudo.exp username password hostname command
 set username [lrange $argv 0 0]
 set password [lrange $argv 1 1]
 set hostname [lrange $argv 2 2]
 set command  [lrange $argv 3 3]
 set timeout 15
 spawn ssh $username@$hostname sudo $command
 expect "*yes/no*" {
    send -- "yes\r"
 }
 expect "*assword*" {
    send -- "$password\r"
 }
 expect "*assword*" {
    send -- "$password\r"
 }
 expect eof
Author	SHA1	Message	Date
Alejandro López	2ead99a2b1	Rebase to 1.9.17p2 - sudo-1.9.17p2 is available Resolves: rhbz#2383665	2025-10-21 10:16:55 +02:00
Fedora Release Engineering	81e84c1f06	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-25 18:50:05 +00:00
Radovan Sroka	f78ef048db	Merge #29 `Move yum/dnf protection removal config file under /usr`	2025-07-17 18:36:52 +00:00
Björn Esser	1899e2aa8d	Drop '-std=gnu17' from CFLAGS, as C23 builds fine now This was introduced in commit `e2e397029e` for an older version of sudo that was FTBFS for GCC 15 defaulting to C23. Signed-off-by: Björn Esser <besser82@fedoraproject.org>	2025-07-07 13:15:19 +02:00
Björn Esser	04179b5417	Re-apply changes from commit `e2e397029e` Signed-off-by: Björn Esser <besser82@fedoraproject.org>	2025-07-05 12:22:08 +02:00
Björn Esser	9641cbaa6b	Rebase to sudo 1.9.17p1 - sudo-1_9_16p2 is available Resolves: rhbz#2309626 - sudo: LPE via host option Resolves: CVE-2025-32462 - Properly apply system buildflags - Use new build macros, drop unneeded %%defattr Signed-off-by: Björn Esser <besser82@fedoraproject.org>	2025-07-05 12:13:06 +02:00
Python Maint	aa37372f8a	Rebuilt for Python 3.14	2025-06-02 20:53:02 +02:00
Zbigniew Jędrzejewski-Szmek	770b8e2647	Move yum/dnf protection removal config file under /usr https://github.com/uapi-group/specifications/issues/76 Actually, add a new file under /usr, but keep the old file in /etc because it's still needed for dnf. The new file in the new location is useful because it means that we get the correct behaviour even when /etc is emptied (on systems with new dnf version). dnf5 reads the new location: https://github.com/rpm-software-management/dnf5/issues/1107 https://github.com/rpm-software-management/dnf5/pull/1110	2025-03-12 07:34:49 +00:00
Yaakov Selkowitz	e2e397029e	Fix build with GCC 15 GCC 15 defaults to C23, which changes the interpretation of function declarations without parameters to be `void` rather than of an unknown number and type (as in K&R). The sudoers plugin relies on the older behaviour for its hook functions.	2025-02-26 12:59:14 -05:00
Fedora Release Engineering	ac16a17374	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-19 11:50:30 +00:00
Fedora Release Engineering	f568249113	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-20 06:36:47 +00:00
Python Maint	47db28a693	Rebuilt for Python 3.13	2024-06-07 09:11:33 +02:00
Adam Williamson	545c191f72	Backport upstream fix for tests with Python 3.13+	2024-05-02 23:09:47 -07:00
Yaakov Selkowitz	df275faead	Avoid sendmail build dependency sudo should be compatible with any MTA, any of which in Fedora provide /usr/sbin/sendmail, and is used at build time only to determine its location. Instead of generalizing the build requirement (e.g. for RHEL 10 which includes only postfix), we can just tell sudo its location during configure, in which case it is not needed at all to build. However, doing so uncovered that systemd's presence was being relied upon without being specified. This too can be avoided by using the macros to define the proper tmpfiles location during configure.	2024-02-08 16:46:56 -05:00
Radovan Sroka	462f43c97a	Rabase to 1.9.15p5 - sudo-1_9_15p5 is available Resolves: rhbz#2248505 - TRIAGE CVE-2023-42465 sudo: Targeted Corruption of Register and Stack Variables Resolves: rhbz#2255569 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2024-01-24 11:05:13 +01:00
Yaakov Selkowitz	da01b87507	Rebase to 1.9.14p3 - sudo-1_9_14p2 is available Resolves: rhbz#2175672 - sudo fails to build with Python 3.12: FAILED: testcase check_example_group_plugin_is_able_to_debug() Resolves: rhbz#2186412 Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>	2023-07-24 22:08:49 -04:00
Fedora Release Engineering	347c83287d	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-22 02:42:07 +00:00
Leigh Scott	328503ded5	Rebuilt for Python 3.12	2023-07-06 14:20:50 +01:00
Radovan Sroka	06544f1ab2	- migrated to SPDX license Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2023-06-20 15:00:57 +02:00
Python Maint	85dfa5defb	Rebuilt for Python 3.12	2023-06-13 20:59:29 +02:00
Florian Weimer	025901c345	Port configure script to C99 Related to: <https://fedoraproject.org/wiki/Changes/PortingToModernC> <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>	2023-04-26 12:08:16 +02:00
Radovan Sroka	8d3c03b4da	Rebase to sudo 1.9.13p2 - sudo-1.9.13p2 is available Resolves: rhbz#2169840 - sudo: double free with per-command chroot sudoers rules Resolves: CVE-2023-27320 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2023-03-01 17:45:33 +01:00
Radovan Sroka	61dacac7f9	Rebase to sudo 1.9.12p2 - sudo-1.9.12p2 is available Resolves: rhbz#2137775 - sudo: arbitrary file write with privileges of the RunAs user Resolves: CVE-2023-22809 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2023-01-19 14:19:32 +01:00
Fedora Release Engineering	e56d19d93d	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-23 09:34:59 +00:00
Radovan Sroka	d9475dd3d9	Update to 1.9.11p3 Resolves: rhbz#2047541 Resolves: rhbz#2062150 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2022-06-22 15:57:57 +02:00
Python Maint	7a172559a3	Rebuilt for Python 3.11	2022-06-13 15:38:33 +02:00
Matthew Miller	4a2b9f551b	recommend system-default-editor instead of nano specifically	2022-06-06 12:54:31 -04:00
Fedora Release Engineering	23fd9b0822	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-22 01:48:40 +00:00
Radovan Sroka	c3febb3692	Rebuild. previously built with wrong version Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2021-10-06 19:17:44 +02:00
Radovan Sroka	206108fe35	Set up update workflow with %autorelease macro - removed stri patch that was not relevant - intercept feature is not compatible with selinux rbac support so we do not build it anymore Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2021-10-06 17:15:52 +02:00
Matthew Miller	b9a4f24d95	rhbz#1328973 -- make nano the default with fallback to vim and vi in that order and make nano the "Recommends" instead of vim-minimal.	2021-10-03 16:18:20 -04:00
Matthew Miller	bf29ad1a05	Update to 1.9.8p2, and include new sudo_intercept.so	2021-10-03 15:51:02 -04:00
Sahana Prasad	9c56ac9403	Rebuilt with OpenSSL 3.0.0	2021-09-14 19:15:57 +02:00
Matthew Miller	f02ed1c65e	enable rpmautospec (https://docs.pagure.org/Fedora-Infra.rpmautospec/)	2021-08-25 11:03:18 -04:00
Matthew Miller	d2dc2ddaf7	drop obsolete requirement for post script that doesn't exist anymore (thanks @scfc) remove commented-out lines from prior PR	2021-08-07 12:50:43 -04:00
Matthew Miller	442af28d89	- drop obsolete requirement for post script that doesn't exist anymore (thanks @scfc) - remove commented-out lines from prior PR	2021-08-07 12:49:06 -04:00
Matthew Miller	dd1363faa3	update sources file for previous PR	2021-08-07 12:43:08 -04:00
Peter Czanik	d8c0683b91	- update to 1.9.7p2 - follow up path change in strip patch - added --enable-zlib=system configure parameter, so sudo uses system zlib, autoconf is no more needed Signed-off-by: Peter Czanik <peter@czanik.hu>	2021-08-05 08:25:56 +02:00
Fedora Release Engineering	e9983f0902	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-23 18:25:32 +00:00
Python Maint	5590a6628d	Rebuilt for Python 3.10	2021-06-04 21:15:47 +02:00
Matthew Miller	571662fc2e	update rhbz entries in changelog	2021-01-26 14:52:06 -05:00
Matthew Miller	36f24bedc6	update to 1.9.5p2 to address bug 1920618 - CVE-2021-3156 sudo: Heap buffer overflow in argument parsing	2021-01-26 14:00:13 -05:00
Radovan Sroka	a0dc0e6d59	Rebase to 1.9.5p1 Resolves: rhbz#1902758 - fixed double free in sss_to_sudoers Resolves: rhbz#1885874 - fixed CVE-2021-23239 sudo: possible directory existence test due to race condition in sudoedit Resolves: rhbz#1915055 - fixed CVE-2021-23240 sudo: symbolic link attack in SELinux-enabled sudoedit Resolves: rhbz#1915054 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2021-01-18 21:07:57 +01:00
Jonathan Lebon	e30e387ccf	Split out -python-plugin subpackage This will allow environments where Python is not desirable to still make use of sudo, such as Fedora CoreOS and other variants which value minimalism. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1909299	2021-01-14 09:05:22 +00:00
Tom Stellard	f6041d82cf	Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot	2021-01-08 22:03:13 +00:00
Michel Alexandre Salim	47a5b50ae2	Update sudo URL http://www.courtesan.com/sudo/ redirects to https://www.sudo.ws/sudo/ (which is identical to https://www.sudo.ws). The latter is also the website referenced in the tarball's README. Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>	2020-12-03 16:10:49 -08:00
Radovan Sroka	68203ed1a2	Rebase to 1.9.3p1 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2020-10-05 15:33:02 +02:00
Radovan Sroka	35c555c44a	Rebase to 1.9.2 Resolves: rhbz#1859577 - added logsrvd subpackage - added openssl-devel buildrequires Resolves: rhbz#1860653 - fixed sudo runstatedir path - it was generated as /sudo instead of /run/sudo Resolves: rhbz#1868215 - added /var/lib/snapd/snap/bin to secure_path variable Resolves: rhbz#1691996 Signed-off-by: Radovan Sroka <rsroka@redhat.com>	2020-09-15 16:49:29 +02:00
Fedora Release Engineering	845456e9a7	- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-08-01 09:14:45 +00:00
Fedora Release Engineering	c5932df566	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-29 11:37:20 +00:00
alakatos	306df891f5	Rebase to 1.9.1 Resolves: rhbz#1848788 - fix rpmlint warnings Resolves: rhbz#1817139	2020-07-10 09:44:22 +02:00
Jens Petersen	72a557140c	upstream patch for setrlimit(RLIMIT_CORE) rootless container warnings (#1773148 )	2020-03-26 18:53:44 +08:00
Jens Petersen	5d1ef1f39f	remove trailing whitespaces	2020-03-26 18:53:05 +08:00
alakatos	8fc22fffbc	Update to latest development version 1.9.0b4 Resolves: rhbz#1816593	2020-03-25 16:47:47 +01:00
alakatos	bb269d08fa	Revert "update to 1.9.0b4" This reverts commit `94269e7c20`.	2020-03-25 16:10:12 +01:00
Jens Petersen	94269e7c20	update to 1.9.0b4	2020-03-24 17:24:41 +08:00
Cropi	19b1d360de	Update to latest development version 1.9.0b1	2020-03-03 13:48:35 +01:00
Fedora Release Engineering	709fe6b2d8	- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-01-31 00:29:35 +00:00
Radovan Sroka	514d3fed7f	Rebase to 1.8.29 Resolves: rhbz#1766233	2019-11-11 15:58:05 +01:00
Radovan Sroka	aebc79494c	Rebase to 1.8.28p1 Resolves: rhbz#176235	2019-10-22 14:18:32 +02:00
Radovan Sroka	cd84c5542c	Remove PS1 and PS2 from env_keep This was removed with in rhel8 -> fedora sync	2019-10-15 14:05:33 +02:00
Radovan Sroka	4e850fe054	Rebase to 1.8.28 Resolves: rhbz#1761533 - set always_set_home by default Resolves: rhbz#1728687 - Sync sudoers options from rhel8 to fedora Resolves: rhbz#1761781 - CVE-2019-14287 Resolves: rhbz#1761584	2019-10-15 13:56:35 +02:00
Radovan Sroka	80a319a607	Merge #7 `Drop legacy %post chmod /etc/sudoers`	2019-10-15 11:03:05 +00:00
Fedora Release Engineering	14fb2d7432	- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-07-27 00:22:59 +00:00
Marek Tamaskovic	5ee35457d5	Edit sudoers resolves rhbz#1676925	2019-04-01 11:11:41 +02:00
Radovan Sroka	906c92082e	Rebase sudo to 1.8.27	2019-03-11 12:32:44 +01:00
Fedora Release Engineering	bd4c63f292	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-03 08:47:43 +00:00
Igor Gnatenko	9bdb7bba3b	Remove obsolete BuildRoot tag Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2019-01-29 05:36:33 +01:00
Igor Gnatenko	977357a694	Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag	2019-01-28 20:24:51 +01:00
Radovan Sroka	44df529c96	Rebase sudo to 1.8.25p1	2018-10-01 12:55:58 +02:00
Radovan Sroka	4f41fcf52f	Rebase sudo to latest stable version - install /etc/dnf/protected.d/sudo instead of /etc/yum/protected.d/sudo (1626968)	2018-09-10 13:19:02 +02:00
Fedora Release Engineering	5d1426712a	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-14 06:51:35 +00:00
Matthew Miller	126b2225b3	defattr no longer needed https://fedoraproject.org/wiki/Packaging:Guidelines#File_Permissions	2018-07-03 16:12:49 -04:00
Daniel Kopeček	9d54237c1d	update to 1.8.23	2018-05-09 13:48:35 +02:00
Daniel Kopeček	81b76510d4	update to 1.8.23b3	2018-04-18 12:54:42 +02:00
Igor Gnatenko	9bb27fa63d	Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-02-14 08:52:13 +01:00
Fedora Release Engineering	41ef6145c0	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-09 17:52:13 +00:00
Colin Walters	29adaddcb8	Drop legacy %post chmod /etc/sudoers The RPM permissions have been set at `0440` for a long, long time. This `%post` invocation dates beyond the import from CVS in 2004. Further, this change will actually undo local admin changes to use e.g. `0600` or something if they want to harden it further. This is similar to: https://src.fedoraproject.org/rpms/nfs-utils/pull-request/1 I'm just making this change as it shows up as error spew when doing `rpm-ostree compose tree`.	2017-12-14 10:38:30 -05:00
Radovan Sroka	ddbf4e5ddd	Update to 1.8.22b1 - Added /usr/local/sbin and /usr/local/bin to secure path rhbz#1166185	2017-12-14 12:08:51 +01:00
Rachel Sibley	60f7afa183	Initial commit for downstream tests using standard test interface	2017-10-05 15:32:54 -04:00
Marek Tamaskovic	0c12737f71	Update to sudo-1.8.21p2 Fix changelog	2017-10-04 12:03:18 +02:00
Matthew Miller	3e6b39b185	Replace file-based requirements with package-level ones: - /etc/pam.d/system-auth to 'pam' - /bin/chmod to 'coreutils' (bug #1488934) - /usr/bin/vi to vim-minimal - ... and make vim-minimal "recommends" instead of "requires", because other editors can be configured.	2017-09-06 12:53:03 -04:00
Fedora Release Engineering	185e4548ca	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild	2017-08-03 08:56:24 +00:00
Fedora Release Engineering	7769b86dd9	- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild	2017-07-27 19:27:35 +00:00
Daniel Kopeček	e0f60ff106	update to 1.8.20p2	2017-06-01 12:33:48 +02:00
Daniel Kopeček	ababf7ba8f	update to 1.8.20p1 fixes CVE-2017-1000367 Resolves: rhbz#1456884	2017-05-31 09:05:44 +02:00
`@ -1 +1 @@`
	`SHA512 (sudo-1.8.20b1.tar.gz) = 8fd9a8d74883b83a4302c0e6e9980773d73c592be69e5246fcab097ae293c299b886a6f83d714bf1638d366f1bc0f00436e291c4f18611049a92f39bdd892e37`	`SHA512 (sudo-1.9.17p2.tar.gz) = c8abd6ca56e54a081c9ef1e9f6579d1db5b93ff857e60d1f58d1f425d7dc23c31c58d40b7819780688f66dfdf87a1f3bbe0a78387b007e2beb1b0e546203ea93`