From f2a6be94a428c56d029b91884d8088cc89016e67f18cb805a3d35f261ca9b1ec Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 12 Jul 2013 14:58:55 +0000
Subject: [PATCH] Accepting request 182920 from
 home:vitezslav_cizek:branches:Base:System

- fix the default flag settings in manual to reflect changes caused by
  sudo-sudoers.patch (bnc#823292)

OBS-URL: https://build.opensuse.org/request/show/182920
OBS-URL: https://build.opensuse.org/package/show/Base:System/sudo?expand=0&rev=61
---
 sudo-sudoers.patch | 37 ++++++++++++++++++++++++++++++++++---
 sudo.changes       |  6 ++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/sudo-sudoers.patch b/sudo-sudoers.patch
index a2810f6..b36386a 100644
--- a/sudo-sudoers.patch
+++ b/sudo-sudoers.patch
@@ -1,7 +1,7 @@
-Index: sudo-1.8.0/plugins/sudoers/sudoers.in
+Index: sudo-1.8.6p3/plugins/sudoers/sudoers.in
 ===================================================================
---- sudo-1.8.0.orig/plugins/sudoers/sudoers.in
-+++ sudo-1.8.0/plugins/sudoers/sudoers.in
+--- sudo-1.8.6p3.orig/plugins/sudoers/sudoers.in	2012-09-18 15:56:30.000000000 +0200
++++ sudo-1.8.6p3/plugins/sudoers/sudoers.in	2013-06-11 15:23:30.510228590 +0200
 @@ -31,37 +31,36 @@
  ##
  ## Defaults specification
@@ -78,3 +78,34 @@ Index: sudo-1.8.0/plugins/sudoers/sudoers.in
  ## Read drop-in files from @sysconfdir@/sudoers.d
  ## (the '#' here does not indicate a comment)
  #includedir @sysconfdir@/sudoers.d
+Index: sudo-1.8.6p3/doc/sudoers.mdoc.in
+===================================================================
+--- sudo-1.8.6p3.orig/doc/sudoers.mdoc.in	2012-09-18 15:57:43.000000000 +0200
++++ sudo-1.8.6p3/doc/sudoers.mdoc.in	2013-06-11 15:27:23.331273355 +0200
+@@ -1468,7 +1468,7 @@ is present in the
+ .Em env_keep
+ list.
+ This flag is
+-.Em off
++.Em on
+ by default.
+ .It authenticate
+ If set, users must authenticate themselves via a password (or other
+@@ -1712,7 +1712,7 @@ If set,
+ .Nm sudo
+ will insult users when they enter an incorrect password.
+ This flag is
+-.Em @insults@
++.Em off
+ by default.
+ .It log_host
+ If set, the host name will be logged in the (non-syslog)
+@@ -2121,7 +2121,7 @@ database as an argument to the
+ .Fl u
+ option.
+ This flag is
+-.Em off
++.Em on
+ by default.
+ .It tty_tickets
+ If set, users must authenticate on a per-tty basis.
diff --git a/sudo.changes b/sudo.changes
index f8d9004..d9df169 100644
--- a/sudo.changes
+++ b/sudo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 12 12:07:27 UTC 2013 - vcizek@suse.com
+
+- fix the default flag settings in manual to reflect changes caused by
+  sudo-sudoers.patch (bnc#823292)
+
 -------------------------------------------------------------------
 Tue Jul  9 15:46:19 UTC 2013 - darin@darins.net