From: Bdale Garbee <bdale@gag.com>
Date: Thu, 6 Apr 2006 00:53:13 +0000 (-0700)
Subject: Imported Debian patch 1.6.8p12-3
X-Git-Tag: debian/1.6.8p12-3^0
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e118edbac36c8b452e1c19ca0122cddd10e10ba0;p=debian%2Fsudo

Imported Debian patch 1.6.8p12-3
---

diff --git a/debian/changelog b/debian/changelog
index b7cb5e4..a85acd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sudo (1.6.8p12-3) unstable; urgency=low
+
+  * force-feed configure knowledge of nroff's path so we get unformatted man
+    pages installed without build-depending on groff-base, closes: #360894
+  * add a reference to OPTIONS in the man page, closes: #186226
+
+ -- Bdale Garbee <bdale@gag.com>  Wed,  5 Apr 2006 17:53:13 -0700
+
 sudo (1.6.8p12-2) unstable; urgency=low
 
   * fix typos in init scripts, closes: #346325
diff --git a/debian/rules b/debian/rules
index fca7b5f..3e99018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,8 @@ config-stamp:
 
 	# simple version
 	mkdir -p build-simple
-	cd build-simple && ../configure --prefix=/usr -v \
+	cd build-simple && NROFFPROG=/usr/bin/nroff ../configure \
+		--prefix=/usr -v \
 		--with-all-insults \
 		--with-exempt=sudo --with-pam --with-fqdn \
 		--with-logging=syslog --with-logfac=authpriv \
@@ -27,7 +28,8 @@ config-stamp:
 
 	# LDAP version
 	mkdir -p build-ldap
-	cd build-ldap && ../configure --prefix=/usr -v \
+	cd build-ldap && NROFFPROG=/usr/bin/nroff ../configure \
+		--prefix=/usr -v \
 		--with-all-insults \
 		--with-exempt=sudo --with-pam --with-ldap --with-fqdn \
 		--with-logging=syslog --with-logfac=authpriv \
diff --git a/sudo.pod b/sudo.pod
index 6321380..8e762bb 100644
--- a/sudo.pod
+++ b/sudo.pod
@@ -440,6 +440,10 @@ to make the C<cd> and file redirection work.
 L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<sudoers(@mansectform@)>,
 L<passwd(@mansectform@)>, L<visudo(@mansectsu@)>
 
+The file /usr/share/doc/sudo/OPTIONS describes the options used for building
+the Debian version of sudo, some of which change default behaviors documented
+elsewhere in this document.
+
 =head1 AUTHORS
 
 Many people have worked on B<sudo> over the years; this