Restore the dot removal in the os version reported by polypkg.

Adapt mkpkg and sudo.pp to the change.

mkpkg

@@ -12,6 +12,7 @@ IFS=" 	$nl"
 top_srcdir=`dirname $0`
 
 platform=`$top_srcdir/pp --probe` || exit 1
+osrelease=`echo "$platform" | sed -e 's/^[^0-9]*//' -e 's/-.*$//'`
 
 # Default paths
 prefix=/usr/local
@@ -32,15 +33,11 @@ esac
 case "$platform" in
     centos*|rhel*)
 	prefix=/usr
-	case "$platform" in
+	if [ $osrelease -ge 50 ]; then
-	    centos[0-4].*|rhel[0-4].*)
+	    # RHEL 5 and up build pies and have audit support
-		;;
+	    export CFLAGS="$F_PIE" LDFLAGS="-pie"
-	    *)
+	    configure_opts="--with-linux-audit"
-		# RHEL 5 and up build pies and have audit support
+	fi
-		export CFLAGS="$F_PIE" LDFLAGS="-pie"
-		configure_opts="--with-linux-audit"
-		;;
-	esac
 	# Note, must indent with tabs, not spaces due to IFS trickery
 	configure_opts="$configure_opts
 		--prefix=$prefix
@@ -59,19 +56,14 @@ case "$platform" in
 	;;
     sles*)
 	prefix=/usr
-	case "$platform" in
+	if [ $osrelease -ge 10 ]; then
-	    sles[0-9].*)
+	    # SLES 10 and higher build pies
-		;;
+	    export CFLAGS="$F_PIE" LDFLAGS="-pie"
-	    sles10.*)
+	    if [ $osrelease -ge 11 ]; then
-		# SLES 10 and higher build pies
+		# SLES 11 and higher has SELinux
-		export CFLAGS="$F_PIE" LDFLAGS="-pie"
-		;;
-	    *)
-		# SLES 11 and higher has SELinux too
-		export CFLAGS="$F_PIE" LDFLAGS="-pie"
 		configure_opts="--with-selinux"
-		;;
+	    fi
-	esac
+	fi
 	# SuSE doesn't have /usr/libexec
 	case "$platform" in
 	    *64*)	libexec=lib64;;

pp

@@ -3762,7 +3762,6 @@ pp_deb_make_data() {
     done 
 
     # If no copyright file is present add one. This is a debian requirement.
-    # XXX - include the LICENSE file instead?
     share_doc="/usr/share/doc/`pp_deb_cmp_full_name $cmp`"
     if [ ! -f "$data/$share_doc/copyright" ]
     then
@@ -3957,8 +3956,7 @@ 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
 
@@ -5036,7 +5034,7 @@ pp_rpm_detect_distro () {
           /^SuSE SLES-[0-9]/  { print "sles" substr($2,6); exit; }
        ' /etc/SuSE-release`
     fi
-    #pp_rpm_distro=`echo $pp_rpm_distro | tr -d .`
+    pp_rpm_distro=`echo $pp_rpm_distro | tr -d .`
     test -z "$pp_rpm_distro" &&
        pp_warn "unknown distro"
 }

sudo.pp

@@ -22,18 +22,13 @@ still allow people to get their work done."
 
 %set [rpm]
 	# Add distro info to release
+	osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*//' -e 's/-.*$//'`
 	case "$pp_rpm_distro" in
 	centos*|rhel*)
-		d=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*//' -e 's/[^0-9].*$//'`
+		pp_rpm_release="$pp_rpm_release.el${osrelease%%[0-9]}"
-		if test -n "$d"; then
-		    pp_rpm_release="$pp_rpm_release.el$d"
-		fi
 		;;
 	sles*)
-		d=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*//' -e 's/[^0-9].*$//'`
+		pp_rpm_release="$pp_rpm_release.sles$osrelease"
-		if test -n "$d"; then
-		    pp_rpm_release="$pp_rpm_release.sles$d"
-		fi
 		;;
 	esac
 
@@ -72,53 +67,53 @@ still allow people to get their work done."
 
 	# Choose the correct PAM file by distro, must be tab indented for "<<-"
 	case "$pp_rpm_distro" in
-	centos[0-4].*|rhel[0-4].*)
-		mkdir -p ${pp_destdir}/etc/pam.d
-		cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
-		#%PAM-1.0
-		auth       required	pam_stack.so service=system-auth
-		account    required	pam_stack.so service=system-auth
-		password   required	pam_stack.so service=system-auth
-		session    required	pam_limits.so
-		EOF
-		;;
 	centos*|rhel*)
 		mkdir -p ${pp_destdir}/etc/pam.d
-		cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
+		if test $osrelease -lt 50; then
-		#%PAM-1.0
+			cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
-		auth       include	system-auth
+			#%PAM-1.0
-		account    include	system-auth
+			auth       required	pam_stack.so service=system-auth
-		password   include	system-auth
+			account    required	pam_stack.so service=system-auth
-		session    optional	pam_keyinit.so revoke
+			password   required	pam_stack.so service=system-auth
-		session    required	pam_limits.so
+			session    required	pam_limits.so
-		EOF
+			EOF
-		cat > ${pp_destdir}/etc/pam.d/sudo-i <<-EOF
+		else
-		#%PAM-1.0
+			cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
-		auth       include	sudo
+			#%PAM-1.0
-		account    include	sudo
+			auth       include	system-auth
-		password   include	sudo
+			account    include	system-auth
-		session    optional	pam_keyinit.so force revoke
+			password   include	system-auth
-		session    required	pam_limits.so
+			session    optional	pam_keyinit.so revoke
-		EOF
+			session    required	pam_limits.so
-		;;
+			EOF
-	  sles9.*)
+			cat > ${pp_destdir}/etc/pam.d/sudo-i <<-EOF
-		mkdir -p ${pp_destdir}/etc/pam.d
+			#%PAM-1.0
-		cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
+			auth       include	sudo
-		#%PAM-1.0
+			account    include	sudo
-		auth     required       pam_unix2.so
+			password   include	sudo
-		session  required       pam_limits.so
+			session    optional	pam_keyinit.so force revoke
-		EOF
+			session    required	pam_limits.so
+			EOF
+		fi
 		;;
 	  sles*)
 		mkdir -p ${pp_destdir}/etc/pam.d
-		cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
+		if test $osrelease -lt 10; then
-		#%PAM-1.0
+			cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
-		auth     include	common-auth
+			#%PAM-1.0
-		account  include	common-account
+			auth     required       pam_unix2.so
-		password include	common-password
+			session  required       pam_limits.so
-		session  include	common-session
+			EOF
-		# session  optional	pam_xauth.so
+		else
-		EOF
+			cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF
+			#%PAM-1.0
+			auth     include	common-auth
+			account  include	common-account
+			password include	common-password
+			session  include	common-session
+			# session  optional	pam_xauth.so
+			EOF
+		fi
 		;;
 	esac