From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 13 Jul 2010 21:52:09 +0000 (-0400)
Subject: Initial debian 4.0 support
X-Git-Tag: SUDO_1_7_4~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e50245b98b037aaed272e38e64e767b273546afe;p=sudo

Initial debian 4.0 support

--HG--
branch : 1.7
---

diff --git a/mkpkg b/mkpkg
index 070bbe95d..11faa56c5 100755
--- a/mkpkg
+++ b/mkpkg
@@ -72,7 +72,6 @@ case "$platform" in
 		--libexecdir=$prefix/$libexec/sudo
 		--with-logging=syslog
 		--with-logfac=auth
-		--with-insults=disabled
 		--with-all-insults
 		--with-ignore-dot
 		--with-tty-tickets
@@ -99,7 +98,6 @@ case "$platform" in
 		--libexecdir=$prefix/$libexec/sudo
 		--with-logging=syslog
 		--with-logfac=auth
-		--with-insults=disabled
 		--with-all-insults
 		--with-ignore-dot
 		--with-tty-tickets
@@ -128,7 +126,6 @@ case "$platform" in
 		--with-selinux
 		--with-logging=syslog
 		--with-logfac=auth
-		--with-insults=disabled
 		--with-all-insults
 		--with-ignore-dot
 		--with-tty-tickets
@@ -142,6 +139,30 @@ case "$platform" in
 	make_opts='docdir=$(datarootdir)/doc/packages/$(PACKAGE_TARNAME)'
 	export CFLAGS="$F_PIE" LDFLAGS="-pie"
 	;;
+    deb4*)
+	# XXX - create sudo group like debian does
+	# XXX - newer deb moved timestamps to /var/lib/sudo
+	# Note, must indent with tabs, not spaces due to IFS trickery
+	configure_opts="
+		--prefix=/usr
+		--with-ldap
+		--with-all-insults
+		--with-exempt=sudo
+		--with-pam
+		--with-fqdn
+		--with-logging=syslog
+		--with-logfac=authpriv
+		--with-env-editor
+		--with-editor=/usr/bin/editor
+		--with-timeout=15
+		--with-password-timeout=0
+		--disable-root-mailer
+		--disable-setresuid
+		--with-sendmail=/usr/sbin/sendmail
+		--mandir=/usr/share/man
+		--libexecdir=/usr/lib/sudo
+		--with-secure-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+	;;
     *)
 	# Note, must indent with tabs, not spaces due to IFS trickery
 	configure_opts="
diff --git a/pp b/pp
index 23edc521a..223ddb6bd 100755
--- a/pp
+++ b/pp
@@ -3957,7 +3957,8 @@ pp_backend_deb_probe() {
 	    ;;
 	*)
 	    # Remove trailing revision number and any dots
-            release=`echo $release | cut -dr -f1 | tr -d .`
+	    #release=`echo $release | cut -dr -f1 | tr -d .`
+            release=`echo $release | cut -dr -f1`
 	    ;;
     esac
 
diff --git a/sudo.pp b/sudo.pp
index e4cedfb8c..67205768d 100644
--- a/sudo.pp
+++ b/sudo.pp
@@ -93,6 +93,20 @@ still allow people to get their work done."
 	;;
   esac
 
+%set [deb]
+  # Choose the correct PAM file by distro
+  # XXX - missing deb5 and others
+  case "$pp_deb_distro" in
+    deb4.*)
+        mkdir -p ${pp_destdir}/etc/pam.d
+	cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
+	#%PAM-1.0
+	@include common-auth
+	@include common-account
+	EOF
+	;;
+  esac
+
 %set [aix]
   pp_aix_version=`echo $version | sed -e 's,\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)p\([0-9][0-9]*\)q\([0-9][0-9]*\),\1.\2.\3.\4,'`
   summary="Configurable super-user privileges"