diff --git a/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch b/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch
index f90f782..9a5e106 100644
--- a/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch
+++ b/SOURCES/0001-Syslog-restored-Augeas-1.1.0-tree-compatibility-for-.patch
@@ -97,5 +97,5 @@ index 2ad1c165..329d121e 100644
= "*.* @far.far.away\n"
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch b/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch
index 7462242..c249934 100644
--- a/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch
+++ b/SOURCES/0002-Revert-Use-Quote-module-in-dovecot.patch
@@ -82,5 +82,5 @@ index 33ea16f1..8e8c083b 100644
}
}
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch b/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch
index 731fa59..fed2fed 100644
--- a/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch
+++ b/SOURCES/0003-Revert-Jaas-add-several-improvements-to-cover-more-v.patch
@@ -139,5 +139,5 @@ index 5f2bfb13..d5ede698 100644
- { }
}
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch b/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch
index eb867c2..2964e9c 100644
--- a/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch
+++ b/SOURCES/0004-UpdateDB-autoload-etc-updatedb.conf-with-Simplevars.patch
@@ -47,5 +47,5 @@ index 40cd26fb..c7309b16 100644
-
-let xfm = transform lns filter
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch b/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch
index 9fb279f..9020437 100644
--- a/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch
+++ b/SOURCES/0005-Revert-Dnsmasq-add-structure-to-address-and-server-o.patch
@@ -11,8 +11,8 @@ unstructured.
Conflicts:
NEWS
---
- lenses/dnsmasq.aug | 34 +++++++++----------------------
- lenses/tests/test_dnsmasq.aug | 47 -------------------------------------------
+ lenses/dnsmasq.aug | 34 +++++++------------------
+ lenses/tests/test_dnsmasq.aug | 47 -----------------------------------
2 files changed, 9 insertions(+), 72 deletions(-)
diff --git a/lenses/dnsmasq.aug b/lenses/dnsmasq.aug
@@ -134,5 +134,5 @@ index c6a63d96..0abfa6bd 100644
- { "domain" = "qux.net" }
- }
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch b/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch
index 5a38e91..d041f82 100644
--- a/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch
+++ b/SOURCES/0006-Sshd-revert-Sshd-module-to-1.1.0-compatible-add-Sshd.patch
@@ -8,10 +8,10 @@ the lens from 1.4.0 has been kept in the Sshd_140 module and is not
loaded by default. Use aug_transform, augtool --transform etc. to use
it instead of Sshd.
---
- lenses/sshd.aug | 52 ++++++---------
- lenses/sshd_140.aug | 141 +++++++++++++++++++++++++++++++++++++++++
- lenses/tests/test_sshd.aug | 56 ----------------
- lenses/tests/test_sshd_140.aug | 136 +++++++++++++++++++++++++++++++++++++++
+ lenses/sshd.aug | 52 +++++-------
+ lenses/sshd_140.aug | 141 +++++++++++++++++++++++++++++++++
+ lenses/tests/test_sshd.aug | 56 -------------
+ lenses/tests/test_sshd_140.aug | 136 +++++++++++++++++++++++++++++++
tests/Makefile.am | 1 +
5 files changed, 298 insertions(+), 88 deletions(-)
create mode 100644 lenses/sshd_140.aug
@@ -486,5 +486,5 @@ index b4563540..387ac7d2 100644
lens-stunnel.sh \
lens-subversion.sh \
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch b/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch
index 82c2d91..f9270c3 100644
--- a/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch
+++ b/SOURCES/0007-Dhcpd-revert-Dhcpd-module-to-1.1.0-compatible-add-Dh.patch
@@ -8,10 +8,10 @@ the lens from 1.4.0 has been kept in the Dhcpd_140 module and is not
loaded by default. Use aug_transform, augtool --transform etc. to use
it instead of Dhcpd.
---
- lenses/dhcpd.aug | 182 +++---------
- lenses/dhcpd_140.aug | 512 +++++++++++++++++++++++++++++++++
- lenses/tests/test_dhcpd.aug | 214 +-------------
- lenses/tests/test_dhcpd_140.aug | 606 ++++++++++++++++++++++++++++++++++++++++
+ lenses/dhcpd.aug | 182 ++--------
+ lenses/dhcpd_140.aug | 512 +++++++++++++++++++++++++++
+ lenses/tests/test_dhcpd.aug | 214 +----------
+ lenses/tests/test_dhcpd_140.aug | 606 ++++++++++++++++++++++++++++++++
tests/Makefile.am | 1 +
5 files changed, 1152 insertions(+), 363 deletions(-)
create mode 100644 lenses/dhcpd_140.aug
@@ -1746,5 +1746,5 @@ index 387ac7d2..315cac9c 100644
lens-dnsmasq.sh \
lens-dovecot.sh \
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch b/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch
index 867d8e3..6f2846a 100644
--- a/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch
+++ b/SOURCES/0008-Slapd-revert-Slapd-module-to-1.1.0-compatible-add-Sl.patch
@@ -8,10 +8,10 @@ the lens from 1.4.0 has been kept in the Slapd_140 module and is not
loaded by default. Use aug_transform, augtool --transform etc. to use
it instead of Slapd.
---
- lenses/slapd.aug | 18 ++---
- lenses/slapd_140.aug | 158 ++++++++++++++++++++++++++++++++++++++++
- lenses/tests/test_slapd.aug | 55 ++++----------
- lenses/tests/test_slapd_140.aug | 94 ++++++++++++++++++++++++
+ lenses/slapd.aug | 18 ++--
+ lenses/slapd_140.aug | 158 ++++++++++++++++++++++++++++++++
+ lenses/tests/test_slapd.aug | 55 +++--------
+ lenses/tests/test_slapd_140.aug | 94 +++++++++++++++++++
tests/Makefile.am | 1 +
5 files changed, 273 insertions(+), 53 deletions(-)
create mode 100644 lenses/slapd_140.aug
@@ -414,5 +414,5 @@ index 315cac9c..65d8993e 100644
lens-solaris_system.sh \
lens-soma.sh \
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch b/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch
index 80611a5..d5f28ac 100644
--- a/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch
+++ b/SOURCES/0009-Rhsm-new-lens-to-parse-subscription-manager-s-rhsm.c.patch
@@ -9,8 +9,8 @@ Conflicts:
NEWS
---
doc/naturaldocs/conf/lenses/Menu.txt | 2 +
- lenses/rhsm.aug | 42 ++++++++++
- lenses/tests/test_rhsm.aug | 151 +++++++++++++++++++++++++++++++++++
+ lenses/rhsm.aug | 42 ++++++++
+ lenses/tests/test_rhsm.aug | 151 +++++++++++++++++++++++++++
tests/Makefile.am | 1 +
4 files changed, 196 insertions(+)
create mode 100644 lenses/rhsm.aug
@@ -254,5 +254,5 @@ index 65d8993e..4d2b2605 100644
lens-rsyncd.sh \
lens-rsyslog.sh \
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch b/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch
index f23a93f..15481ba 100644
--- a/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch
+++ b/SOURCES/0010-Fix-sudoers-lens-recognize-match_group_by_gid.patch
@@ -25,5 +25,5 @@ index 7567772d..0437daae 100644
let parameter_flag = [ del_negate . negate_node?
. key parameter_flag_kw ]
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch b/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch
index 8a82ba5..6ccffd6 100644
--- a/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch
+++ b/SOURCES/0011-src-pathx.c-parse_name-correctly-handle-trailing-whi.patch
@@ -21,8 +21,8 @@ get stripped, avoiding all these headaches.
Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
---
- src/pathx.c | 27 +++++++++++++++++++------
- tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/pathx.c | 27 ++++++++++++++++-----
+ tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/src/pathx.c b/src/pathx.c
@@ -158,5 +158,5 @@ index 335e7bf8..dbba29e0 100644
aug_close(aug);
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch b/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch
index ff17889..85d9a56 100644
--- a/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch
+++ b/SOURCES/0012-tests-test-save.c-testSaveNoPermission-skip-when-roo.patch
@@ -24,5 +24,5 @@ index 4b6470f2..8775ba54 100644
char *path = NULL;
const char *v;
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0013-Chrony-allow-signed-numbers.patch b/SOURCES/0013-Chrony-allow-signed-numbers.patch
index 045ef5e..c5f323f 100644
--- a/SOURCES/0013-Chrony-allow-signed-numbers.patch
+++ b/SOURCES/0013-Chrony-allow-signed-numbers.patch
@@ -48,5 +48,5 @@ index c4b552eb..905ecee4 100644
{ "bindcmdaddress" = "127.0.0.1" }
{ "bindcmdaddress" = "::1" }
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch b/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch
index 39dafa4..9b4e4d3 100644
--- a/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch
+++ b/SOURCES/0014-Fix-430-support-Krb5-include-dir.patch
@@ -48,5 +48,5 @@ index e17a659a..743bb375 100644
+ { "include" = "/etc/krb5.other_conf.d/other.conf" }
+ { "includedir" = "/etc/krb5.conf.d/" }
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch b/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch
index 0ac4371..720905a 100644
--- a/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch
+++ b/SOURCES/0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch
@@ -7,7 +7,7 @@ These keys are used to control the permissions for files and
directories.
---
lenses/cgconfig.aug | 2 +-
- lenses/tests/test_cgconfig.aug | 45 ++++++++++++++++++++++++++++++++++++++++++
+ lenses/tests/test_cgconfig.aug | 45 ++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/lenses/cgconfig.aug b/lenses/cgconfig.aug
@@ -77,5 +77,5 @@ index 6cd0856d..84fd2ded 100644
+ { }
+
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch b/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch
index 46ec4ff..dada3fd 100644
--- a/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch
+++ b/SOURCES/0016-Grub-handle-top-level-boot-directive-494.patch
@@ -51,5 +51,5 @@ index f022ef72..8a0d9f4a 100644
{ "file" = "HD(1,800,64000,9895c137-d4b2-4e3b-a93b-dc9ac4)" } }
{ "password" = "$1$M9NLj$p2gs87vwNv48BUu.wAfVw0"
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch b/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch
index c015569..608225c 100644
--- a/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch
+++ b/SOURCES/0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch
@@ -46,5 +46,5 @@ index fa044aea..438f619a 100644
test Fstab.lns get no_passno = no_passno_tree
--
-2.14.3
+2.17.2
diff --git a/SOURCES/0018-Fix-sudoers-lens-always_query_group_plugin-588.patch b/SOURCES/0018-Fix-sudoers-lens-always_query_group_plugin-588.patch
new file mode 100644
index 0000000..0754fb6
--- /dev/null
+++ b/SOURCES/0018-Fix-sudoers-lens-always_query_group_plugin-588.patch
@@ -0,0 +1,26 @@
+From fb806708da719a37422d33fdda77de702c3c646e Mon Sep 17 00:00:00 2001
+From: Steve Traylen <steve.traylen@cern.ch>
+Date: Thu, 1 Nov 2018 13:54:32 +0100
+Subject: [PATCH] Fix sudoers lens: "always_query_group_plugin" (#588)
+
+The option is now enabled by default in the default sudoers of
+RHEL 7.6 (and probably soon CentOS 7).
+---
+ lenses/sudoers.aug | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lenses/sudoers.aug b/lenses/sudoers.aug
+index 0437daae..d6140a8b 100644
+--- a/lenses/sudoers.aug
++++ b/lenses/sudoers.aug
+@@ -308,6 +308,7 @@ let parameter_flag_kw = "always_set_home" | "authenticate" | "env_editor"
+ | "closefrom_override" | "compress_io" | "fast_glob"
+ | "log_input" | "log_output" | "pwfeedback"
+ | "umask_override" | "use_pty" | "match_group_by_gid"
++ | "always_query_group_plugin"
+
+ let parameter_flag = [ del_negate . negate_node?
+ . key parameter_flag_kw ]
+--
+2.17.2
+
diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec
index 096195a..72b051e 100644
--- a/SPECS/augeas.spec
+++ b/SPECS/augeas.spec
@@ -1,6 +1,6 @@
Name: augeas
Version: 1.4.0
-Release: 6%{?dist}
+Release: 6%{?dist}.1
Summary: A library for changing configuration files
Group: System Environment/Libraries
@@ -24,6 +24,7 @@ Patch14: 0014-Fix-430-support-Krb5-include-dir.patch
Patch15: 0015-Cgconfig-allow-fperm-dperm-in-admin-task.patch
Patch16: 0016-Grub-handle-top-level-boot-directive-494.patch
Patch17: 0017-Fstab-allow-leading-whitespace-in-lines-with-spec-54.patch
+Patch18: 0018-Fix-sudoers-lens-always_query_group_plugin-588.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,6 +83,7 @@ The libraries for %{name}.
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
# Patches affect Makefile.am and configure.ac, so rerun autotools.
autoreconf
@@ -143,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/augeas.pc
%changelog
+* Thu Nov 15 2018 Pino Toscano <ptoscano@redhat.com> - 1.4.0-6.el7_6.1
+- Sudoers: handle "always_query_group_plugin" option (RHBZ#1650174)
+
* Thu Mar 29 2018 Pino Toscano <ptoscano@redhat.com> - 1.4.0-6
- Fstab: allow leading whitespaces (RHBZ#1544520)