X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=mkpkg;h=d2aec97fa122870187d29ce3fc01387387180bc4;hb=db542536bfb942d0168310cac588babc62657621;hp=12c1d849c443ae1452e54362fcf2bc4d0b6bce23;hpb=7a01b10fee894dea7ecb3252886912eab41e9693;p=debian%2Fsudo

diff --git a/mkpkg b/mkpkg
index 12c1d84..d2aec97 100755
--- a/mkpkg
+++ b/mkpkg
@@ -122,18 +122,18 @@ case "$osversion" in
     centos*|rhel*)
 	prefix=/usr
 	if [ $osrelease -ge 50 ]; then
-	    # RHEL 5 and up build pies and have audit support
-	    export CFLAGS="-O2 $F_PIE" LDFLAGS="-pie"
+	    # RHEL 5 and up build pies, have audit support and use a
+	    # separate PAM config file for "sudo -i".
+	    export CFLAGS="-O2 -g $F_PIE" LDFLAGS="-pie"
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-linux-audit"
+	    configure_opts="${configure_opts}${configure_opts+$tab}--with-pam-login"
 	    PPVARS="${PPVARS}${PPVARS+$space}linux_audit=1.4.0"
 	fi
 	# Note, must indent with tabs, not spaces due to IFS trickery
-	configure_opts="$configure_opts
-		--prefix=$prefix
+	configure_opts="--prefix=$prefix
 		--with-logging=syslog
 		--with-logfac=authpriv
 		--with-pam
-		--with-pam-login
 		--enable-zlib=system
 		--with-editor=/bin/vi
 		--with-env-editor
@@ -141,27 +141,28 @@ case "$osversion" in
 		--with-tty-tickets
 		--with-ldap
 		--with-selinux
-		--with-passprompt=[sudo] password for %p: "
+		--with-passprompt=[sudo] password for %p: 
+		$configure_opts"
 	;;
     sles*)
 	prefix=/usr
 	if [ $osrelease -ge 10 ]; then
 	    # SLES 10 and higher build pies
-	    export CFLAGS="-O2 $F_PIE" LDFLAGS="-pie"
+	    export CFLAGS="-O2 -g $F_PIE" LDFLAGS="-pie"
 	    if [ $osrelease -ge 11 ]; then
 		# SLES 11 and higher has SELinux
 		configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"
 	    fi
 	fi
 	# SuSE doesn't have /usr/libexec
+	libexec=lib
 	case "$osversion" in
-	    *64*)	libexec=lib64;;
-	    *)		libexec=lib;;
+	    *64*)	gcc -v 2>&1 | grep "with-cpu=[^ ]*32" >/dev/null || libexec=lib64
+			;;
 	esac
 	# Note, must indent with tabs, not spaces due to IFS trickery
 	# XXX - SuSE uses secure path but only for env_reset
-	configure_opts="$configure_opts
-		--prefix=$prefix
+	configure_opts="--prefix=$prefix
 		--libexecdir=$prefix/$libexec/sudo
 		--with-logging=syslog
 		--with-logfac=auth
@@ -174,7 +175,8 @@ case "$osversion" in
 		--enable-zlib=system
 		--with-ldap
 		--with-env-editor
-		--with-passprompt=%p\'s password: "
+		--with-passprompt=%p\'s password: 
+		$configure_opts"
 
 	make_opts='docdir=$(datarootdir)/doc/packages/$(PACKAGE_TARNAME)'
 	;;
@@ -191,8 +193,7 @@ case "$osversion" in
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap
 		--with-ldap-conf-file=/etc/sudo-ldap.conf"
 	fi
-	configure_opts="$configure_opts
-		--prefix=/usr
+	configure_opts="--prefix=/usr
 		--with-all-insults
 		--with-exempt=sudo
 		--with-pam
@@ -211,26 +212,27 @@ case "$osversion" in
 		--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"
+		--with-secure-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin
+		$configure_opts"
 	;;
     *)
 	# For Solaris, add project support and use let configure choose zlib.
-	# For all others, use the builtin zlib.
+	# For all others, use the builtin zlib and disable NLS support.
 	case "$osversion" in
 	    sol*) configure_opts="${configure_opts}${configure_opts+$tab}--with-project";;
-	    *) configure_opts="${configure_opts}${configure_opts+$tab}--enable-zlib=builtin";;
+	    *) configure_opts="${configure_opts}${configure_opts+$tab}--enable-zlib=builtin${tab}--disable-nls";;
 	esac
 	if test "$flavor" = "ldap"; then
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap"
 	fi
 	# Note, must indent with tabs, not spaces due to IFS trickery
-	configure_opts="$configure_opts
-		--prefix=$prefix
+	configure_opts="--prefix=$prefix
 		--with-insults=disabled
 		--with-logging=syslog
 		--with-logfac=auth
 		--with-editor=/usr/bin/vim:/usr/bin/vi:/bin/vi
-		--with-env-editor"
+		--with-env-editor
+		$configure_opts"
 	;;
 esac