* sudo: update to version 1.6.9p2. It patches some compile

	breakage, when trying to cross compile. It also allows to
	install a user sudoers file from projectroot.

	Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7593 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 41 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index e597d4ead..c02deb989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-27  Robert Schwebel <r.schwebel@pengutronix.de>
 
+	* sudo: update to version 1.6.9p2. It patches some compile
+	breakage, when trying to cross compile. It also allows to
+	install a user sudoers file from projectroot.
+
+	Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
+
 	* netkit-ftp: Removed libc dependency from netkit-ftp.
 	Removed ipkg dependency to libc from netkit-ftp packet. As
 	we use glibc this caused the packet to refuse installation.
diff --git a/patches/sudo-1.6.9p2/generic/0001-FixCrossCompile.patch b/patches/sudo-1.6.9p2/generic/0001-FixCrossCompile.patch
new file mode 100644
index 000000000..d3b3762d8
--- /dev/null
+++ b/patches/sudo-1.6.9p2/generic/0001-FixCrossCompile.patch
@@ -0,0 +1,11 @@
+--- sudo-1.6.8p12/configure.orig	2007-07-06 16:42:44.000000000 +0200
++++ sudo-1.6.8p12/configure	2007-07-06 16:43:33.000000000 +0200
+@@ -24397,7 +24397,7 @@ if test "$cross_compiling" = yes; then
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++    }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
diff --git a/rules/sudo.in b/rules/sudo.in
index daecd83b7..b101f98d0 100644
--- a/rules/sudo.in
+++ b/rules/sudo.in
@@ -8,14 +8,18 @@ config SUDO
  	  as few privileges as possible but still allow
 	  people to get their work done.
 
-config SUDO_DONT_SEND_MAILS
-	bool "don't send mails"
-	depends on SUDO
+if SUDO
+
+config SUDO_NO_SENDMAIL
+	bool "Send no mails"
+	default y
+
+config SUDO_NO_PAM
+	bool "Don't use libpam"
 	default y
 
 config SUDO_ETC_SUDOERS
 	bool "Install sudoers file into /etc"
-	depends on SUDO
 	default y
 	help
 	  Installs /etc/sudoers from a selectable source
@@ -41,3 +45,5 @@ config SUDO_ETC_SUDOERS
 
 	endchoice
 
+
+endif
diff --git a/rules/sudo.make b/rules/sudo.make
index 10dceed88..df8bc3c78 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -74,6 +74,13 @@ ifdef PTXCONF_SUDO_DONT_SEND_MAILS
 SUDO_AUTOCONF += --without-sendmail
 endif
 
+  ifdef PTXCONF_SUDO_NO_SENDMAIL
+SUDO_AUTOCONF += --without-sendmail
+  endif
+  ifdef PTXCONF_SUDO_NO_PAM
+SUDO_AUTOCONF += --without-pam
+  endif
+
 $(STATEDIR)/sudo.prepare: $(sudo_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SUDO_DIR)/config.cache)
@@ -112,7 +119,7 @@ sudo_targetinstall: $(STATEDIR)/sudo.targetinstall
 $(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
-	@$(call install_init,  sudo)
+	@$(call install_init, sudo)
 	@$(call install_fixup, sudo,PACKAGE,sudo)
 	@$(call install_fixup, sudo,PRIORITY,optional)
 	@$(call install_fixup, sudo,VERSION,$(SUDO_VERSION))
@@ -126,14 +133,14 @@ $(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default)
 
 	@$(call install_copy, sudo, 0, 0, 0755, $(SUDO_DIR)/.libs/sudo_noexec.so, /usr/libexec/sudo_noexec.so)
 
-ifdef PTXCONF_SUDO_ETC_SUDOERS
-ifdef PTXCONF_SUDO_ETC_SUDOERS_DEFAULT
+ ifdef PTXCONF_SUDO_ETC_SUDOERS
+  ifdef PTXCONF_SUDO_ETC_SUDOERS_DEFAULT
 	@$(call install_copy, sudo, 0, 0, 0440, $(SUDO_DIR)/sudoers, /etc/sudoers,n)
-endif
-ifdef PTXCONF_SUDO_ETC_SUDOERS_USER
+  endif
+  ifdef PTXCONF_SUDO_ETC_SUDOERS_USER
 	@$(call install_copy, sudo, 0, 0, 0440, ${PTXDIST_WORKSPACE}/projectroot/etc/sudoers, /etc/sudoers,n)
-endif
-endif
+  endif
+ endif
 	@$(call install_finish, sudo)
 
 	@$(call touch, $@)