[patch] AIX package build fixes, please commit

[Darren Tucker]

Hello All,
	This is a resend of a patch I posted nearly two weeks ago. As
of a few minutes ago, it hasn't been committed and thus the AIX package
builds from CVS fail. (I know because I now have a cron job that tells
me :-)

	Could someone please review and commit the attached patch and
chmod a+x contrib/aix/*.sh, or let me know what needs to be changed?

	It makes the following changes (relative to 3.1p1):

* Gets version number from ssh -V as suggested by Tim Rice.
* Does a better job of generating valid AIX package version numbers
(fixes inutoc "format of the toc file is invalid" and "invalid level"
errors reported by Mandar Mirashi).
* Tests for "make install" failure and doesn't generate empty package
in that case.
* Generate file sizes in inventory file.

        Tested and resulting packages installed on AIX 4.2.1 and 4.3.3.
Patch is also available here:
http://www.zip.com.au/~dtucker/openssh-3.1p1-aixbff.patch

		-Daz.
-------------- next part --------------
diff -c -r openssh-3.1p1/contrib/aix/buildbff.sh openssh-3.1p1-aix/contrib/aix/buildbff.sh
*** openssh-3.1p1/contrib/aix/buildbff.sh	Tue Mar  5 13:38:37 2002
--- openssh-3.1p1-aix/contrib/aix/buildbff.sh	Sat Mar  9 11:43:36 2002
***************
*** 11,31 ****
  
  umask 022
  PKGNAME=openssh
  
! PATH=$PATH:`pwd`		# set path for external tools
  export PATH
  
! ## Extract common info requires for the 'info' part of the package.
! VERSION=`tail -1 ../../version.h | sed -e 's/.*_\([0-9]\)/\1/g' | sed 's/\"$//'`
! BFFVERSION=`echo $VERSION | sed 's/p/./g'`
! 
! echo "Building BFF for $PKGNAME $VERSION (package version $BFFVERSION)"
! PKGDIR=package
! 
! # Clean build directory and package file
  rm -rf $PKGDIR
  mkdir $PKGDIR
- rm -f $PKGNAME-$VERSION.bff
  
  if [ ! -f ../../Makefile ]
  then
--- 11,24 ----
  
  umask 022
  PKGNAME=openssh
+ PKGDIR=package
  
! PATH=`pwd`:$PATH		# set path for external tools
  export PATH
  
! # Clean build directory 
  rm -rf $PKGDIR
  mkdir $PKGDIR
  
  if [ ! -f ../../Makefile ]
  then
***************
*** 40,45 ****
--- 33,61 ----
  cd ../.. 
  make install-nokeys DESTDIR=$FAKE_ROOT
  
+ if [ $? -gt 0 ]
+ then
+ 	echo "Fake root install failed, stopping."
+ 	exit 1
+ fi
+ 
+ #
+ # Extract common info requires for the 'info' part of the package.
+ #	AIX requires 4-part version numbers
+ #
+ VERSION=`./ssh -V 2>&1 | sed -e 's/,.*//' | cut -f 2 -d _`
+ MAJOR=`echo $VERSION | cut -f 1 -d p | cut -f 1 -d .`
+ MINOR=`echo $VERSION | cut -f 1 -d p | cut -f 2 -d .`
+ PATCH=`echo $VERSION | cut -f 1 -d p | cut -f 3 -d .`
+ PORTABLE=`echo $VERSION | cut -f 2 -d p`
+ if [ "$PATCH" = "" ]
+ then
+ 	PATCH=0
+ fi
+ BFFVERSION=`printf "%d.%d.%d.%d" $MAJOR $MINOR $PATCH $PORTABLE`
+ 
+ echo "Building BFF for $PKGNAME $VERSION (package version $BFFVERSION)"
+ 
  #
  # Fill in some details, like prefix and sysconfdir
  #	the eval also expands variables like sysconfdir=${prefix}/etc
***************
*** 175,180 ****
--- 191,197 ----
  #	file list on the fly and feed it to backup using -i
  #
  echo Creating $PKGNAME-$VERSION.bff with backup...
+ rm -f $PKGNAME-$VERSION.bff
  (
  	echo "./lpp_name"
  	find . ! -name lpp_name -a ! -name . -print 
diff -c -r openssh-3.1p1/contrib/aix/inventory.sh openssh-3.1p1-aix/contrib/aix/inventory.sh
*** openssh-3.1p1/contrib/aix/inventory.sh	Tue Mar  5 13:38:37 2002
--- openssh-3.1p1-aix/contrib/aix/inventory.sh	Sat Mar  9 11:04:45 2002
***************
*** 52,58 ****
  	} elsif ( -f $_ ) {
  		# Entry is File
  		print "\ttype=FILE\n";
! 		print "\tsize=VOLATILE\n";
  		print "\tchecksum=VOLATILE\n";
  	} elsif ( -d $_ ) {
  		# Entry is Directory
--- 52,58 ----
  	} elsif ( -f $_ ) {
  		# Entry is File
  		print "\ttype=FILE\n";
! 		print "\tsize=$sz\n";
  		print "\tchecksum=VOLATILE\n";
  	} elsif ( -d $_ ) {
  		# Entry is Directory