[Pkg-nagios-changes] [pkg-check-mk] 05/09: Update debian/patches/02_wato-sudoers.dpatch

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-check-mk.

commit 0e5a16c0e619c2bc34e3008e50cb9ff7476dc0ae
Author: Thomas Bechtold <thomasbechtold at jpberlin.de>
Date:   Wed Aug 7 11:50:27 2013 +0200

    Update debian/patches/02_wato-sudoers.dpatch
---
 debian/changelog                      |    1 +
 debian/patches/02_wato-sudoers.dpatch |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce0b3df..1c54b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ check-mk (1.2.2p2-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #678396).
   * Update defaults in debian/defaults.nagios3 and debian/defaults.icinga.
+  * Update debian/patches/02_wato-sudoers.dpatch.
 
  -- Thomas Bechtold <t.bechtold at telekom.de>  Wed, 07 Aug 2013 09:39:46 +0200
 
diff --git a/debian/patches/02_wato-sudoers.dpatch b/debian/patches/02_wato-sudoers.dpatch
index d19513c..fceab98 100755
--- a/debian/patches/02_wato-sudoers.dpatch
+++ b/debian/patches/02_wato-sudoers.dpatch
@@ -6,12 +6,12 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-check-mk~/setup.sh pkg-check-mk/setup.sh
---- pkg-check-mk~/setup.sh	2011-11-10 09:50:10.000000000 +0100
-+++ pkg-check-mk/setup.sh	2011-11-10 09:50:56.207820998 +0100
-@@ -571,28 +571,12 @@
+--- pkg-check-mk~/setup.sh	2013-08-07 11:44:12.000000000 +0200
++++ pkg-check-mk/setup.sh	2013-08-07 11:47:40.344748346 +0200
+@@ -718,28 +718,11 @@
  	return
      fi
-  
+ 
 -    sudolines="Defaults:$wwwuser !requiretty\n$wwwuser ALL = (root) NOPASSWD: $bindir/check_mk --automation *"
 -
 -    if [ ! -e /etc/sudoers ] ; then
@@ -20,7 +20,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 -        echo "to use WATO - the Check_MK Web Administration Tool"
 -        echo
 -        echo -e "$sudolines"
--        echo 
+-        echo
 -        echo
 -        return
 -    fi
@@ -30,11 +30,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 -        # already present. Do not touch.
 -        return
 -    fi
-+    sudolines="Defaults:$wwwuser !requiretty\n$wwwuser ALL = (nagios) NOPASSWD: $bindir/check_mk --automation *"
- 
+-
 -    echo >> /etc/sudoers
 -    echo "# Needed for  WATO - the Check_MK Web Administration Tool" >> /etc/sudoers
 -    echo -e "$sudolines" >> /etc/sudoers
++    sudolines="Defaults:$wwwuser !requiretty\n$wwwuser ALL = (nagios) NOPASSWD: $bindir/check_mk --automation *"
 +    mkdir -p $DESTDIR/etc/sudoers.d
 +    echo >> $DESTDIR/etc/sudoers.d/check_mk_wato
 +    echo "# Needed for  WATO - the Check_MK Web Administration Tool" >> $DESTDIR/etc/sudoers.d/check_mk_wato

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git