--- embedaddon/sudo/mkpkg	2012/05/29 12:26:49	1.1.1.2
+++ embedaddon/sudo/mkpkg	2012/10/09 09:29:52	1.1.1.3
@@ -78,20 +78,6 @@ top_srcdir=`dirname $0`
 test -n "$osversion" || exit 1
 osrelease=`echo "$osversion" | sed -e 's/^[^0-9]*//' -e 's/-.*$//'`
 
-# Default paths
-prefix=/usr/local
-
-# Linux distros may build binaries as pie files.
-# This is really something libtool should figure out, but it does not.
-case "$osversion" in
-    *-s390*|*-sparc*|*-alpha*)
-	F_PIE=-fPIE
-	;;
-    *)
-	F_PIE=-fpie
-	;;
-esac
-
 # Choose compiler options by osversion if not cross-compiling.
 if [ "$crossbuild" = "false" ]; then
     case "$osversion" in
@@ -120,21 +106,19 @@ fi
 # We use the same configure options as vendor packages when possible.
 case "$osversion" in
     centos*|rhel*)
-	prefix=/usr
 	if [ $osrelease -ge 40 ]; then
 	    # RHEL 4 and up support SELinux
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"
 	fi
 	if [ $osrelease -ge 50 ]; then
-	    # 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"
+	    # RHEL 5 and up has audit support and uses a separate PAM
+	    # config file for "sudo -i".
 	    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="--prefix=$prefix
+	configure_opts="--prefix=/usr
 		--with-logging=syslog
 		--with-logfac=authpriv
 		--with-pam
@@ -148,12 +132,9 @@ case "$osversion" in
 		$configure_opts"
 	;;
     sles*)
-	prefix=/usr
 	if [ $osrelease -ge 10 ]; then
-	    # SLES 10 and higher build pies
-	    export CFLAGS="-O2 -g $F_PIE" LDFLAGS="-pie"
+	    # SLES 11 and higher has SELinux
 	    if [ $osrelease -ge 11 ]; then
-		# SLES 11 and higher has SELinux
 		configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"
 	    fi
 	fi
@@ -165,8 +146,8 @@ case "$osversion" in
 	esac
 	# Note, must indent with tabs, not spaces due to IFS trickery
 	# XXX - SuSE uses secure path but only for env_reset
-	configure_opts="--prefix=$prefix
-		--libexecdir=$prefix/$libexec/sudo
+	configure_opts="--prefix=/usr
+		--libexecdir=/usr/$libexec/sudo
 		--with-logging=syslog
 		--with-logfac=auth
 		--with-all-insults
@@ -184,26 +165,21 @@ case "$osversion" in
 	make_opts='docdir=$(datarootdir)/doc/packages/$(PACKAGE_TARNAME)'
 	;;
     deb*|ubu*)
-	prefix=/usr
+	# Man pages should be compressed in .deb files
+	export MANCOMPRESS='gzip -9'
+	export MANCOMPRESSEXT='.gz'
 	# If Ubuntu, add --enable-admin-flag
 	case "$osversion" in
 	    ubu*)
 		configure_opts="${configure_opts}${configure_opts+$tab}--enable-admin-flag${tab}--without-lecture"
-		if [ $osrelease -ge 1004 ]; then
-		    export CFLAGS="-O2 -g $F_PIE" LDFLAGS="-pie"
-		fi
 		;;
-	    deb*)
-		if [ $osrelease -ge 600 ]; then
-		    export CFLAGS="-O2 -g $F_PIE" LDFLAGS="-pie"
-		fi
-		;;
 	esac
 	# Note, must indent with tabs, not spaces due to IFS trickery
 	if test "$flavor" = "ldap"; then
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap
 		--with-ldap-conf-file=/etc/sudo-ldap.conf"
 	fi
+	configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"
 	configure_opts="--prefix=/usr
 		--with-all-insults
 		--with-pam
@@ -238,13 +214,8 @@ case "$osversion" in
 	fi
 	export CFLAGS="-O2 -g $ARCH_FLAGS $SDK_FLAGS"
 	export LDFLAGS="$ARCH_FLAGS $SDK_FLAGS"
-	if [ $osrelease -ge 105 ]; then
-	    CFLAGS="$CFLAGS $F_PIE"
-	    LDFLAGS="$LDFLAGS -Wl,-pie"
-	fi
 	# Note, must indent with tabs, not spaces due to IFS trickery
-	configure_opts="--prefix=$prefix
-		--with-pam
+	configure_opts="--with-pam
 		--without-tty-tickets
 		--enable-zlib=system
 		--with-ldap
@@ -255,6 +226,23 @@ case "$osversion" in
 		--with-env-editor
 		$configure_opts"
 	;;
+    aix*)
+	# Note, must indent with tabs, not spaces due to IFS trickery
+	# Note: we include our own zlib instead of relying on the
+	#       AIX freeware version being installed.
+	configure_opts="
+		--prefix=/opt/freeware
+		--mandir=/opt/freeware/man
+		--with-insults=disabled
+		--with-logging=syslog
+		--with-logfac=auth
+		--with-editor=/usr/bin/vi
+		--with-env-editor
+		--enable-zlib=builtin
+		--disable-nls
+		$configure_opts"
+	PPVARS="${PPVARS}${PPVARS+$space}aix_freeware=true"
+	;;
     *)
 	# For Solaris, add project support and use let configure choose zlib.
 	# For all others, use the builtin zlib and disable NLS support.
@@ -266,7 +254,7 @@ case "$osversion" in
 	    configure_opts="${configure_opts}${configure_opts+$tab}--with-ldap"
 	fi
 	# Note, must indent with tabs, not spaces due to IFS trickery
-	configure_opts="--prefix=$prefix
+	configure_opts="
 		--with-insults=disabled
 		--with-logging=syslog
 		--with-logfac=auth