[contrib/aix/buildbff.sh contrib/aix/inventory.sh] AIX package

build fixes.  Patch by Darren Tucker <dtucker@zip.com.au>
[contrib/solaris/buildpkg.sh] add missing dirs to SYSTEM_DIR. Have
postinstall check for $piddir and add if necessary.

diff --git a/ChangeLog b/ChangeLog
index 9fa5aad00529bd9a5b1fed90b6c42cad26e020ab..87ed4f19ce4bb622e4943fc2b6a4ce8e97d21d81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
    warn if directory does not exist. Put system directories in front of
    PATH for finding entorpy commands.
+ - (tim) [contrib/aix/buildbff.sh contrib/aix/inventory.sh] AIX package
+   build fixes.  Patch by Darren Tucker <dtucker@zip.com.au>
+   [contrib/solaris/buildpkg.sh] add missing dirs to SYSTEM_DIR. Have
+   postinstall check for $piddir and add if necessary.
 
 20020311
  - (tim) [contrib/solaris/buildpkg.sh, contrib/solaris/README] Updated to

diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index 6c7aaf4547d4c55f0f744f84dd2cb96212d9271e..4095884845d02a81cc0de041cc357053ee49c952 100755 (executable)
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -11,21 +11,14 @@
 
 umask 022
 PKGNAME=openssh
+PKGDIR=package
 
-PATH=$PATH:`pwd`               # set path for external tools
+PATH=`pwd`:$PATH               # 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
+# Clean build directory 
 rm -rf $PKGDIR
 mkdir $PKGDIR
-rm -f $PKGNAME-$VERSION.bff
 
 if [ ! -f ../../Makefile ]
 then
@@ -40,6 +33,29 @@ FAKE_ROOT=$START/$PKGDIR
 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,6 +191,7 @@ mv ../lpp_name .
 #      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 --git a/contrib/aix/inventory.sh b/contrib/aix/inventory.sh
index aa44ab9d4453999b96b4059d84fe63de89675f96..78df0d16e7a7ddb09ac9c59c156a2d580a4bda25 100755 (executable)
--- a/contrib/aix/inventory.sh
+++ b/contrib/aix/inventory.sh
@@ -52,7 +52,7 @@ find . ! -name . -print | perl -ne '{
        } elsif ( -f $_ ) {
                # Entry is File
                print "\ttype=FILE\n";
-               print "\tsize=VOLATILE\n";
+               print "\tsize=$sz\n";
                print "\tchecksum=VOLATILE\n";
        } elsif ( -d $_ ) {
                # Entry is Directory

diff --git a/contrib/solaris/buildpkg.sh b/contrib/solaris/buildpkg.sh
index 20f8544aa20e67fc88e7a7205959596d4fc2bfd5..1be6ed8d1dcb8fadbd5a71ee67d9932dbbf7d979 100755 (executable)
--- a/contrib/solaris/buildpkg.sh
+++ b/contrib/solaris/buildpkg.sh
@@ -29,6 +29,7 @@ SYSTEM_DIR="/etc      \
 /etc/rc0.d             \
 /etc/rc1.d             \
 /etc/rc2.d             \
+/etc/opt               \
 /opt                   \
 /opt/bin               \
 /usr                   \
@@ -49,6 +50,7 @@ SYSTEM_DIR="/etc      \
 /usr/local/sbin                \
 /usr/local/share       \
 /var                   \
+/var/opt               \
 /var/run               \
 /var/tmp               \
 /tmp"
@@ -201,6 +203,9 @@ installf ${PKGNAME} $TEST_DIR/etc/rcS.d/K30${SYSVINIT_NAME}=$TEST_DIR/etc/init.d
        installf ${PKGNAME} $TEST_DIR/etc/rc2.d/S98${SYSVINIT_NAME}=$TEST_DIR/etc/init.d/${SYSVINIT_NAME} l
 fi
 
+# If piddir doesn't exist we add it. (Ie. --with-pid-dir=/var/opt/ssh)
+[ -d $piddir ]  ||  installf ${PKGNAME} $TEST_DIR$piddir d 755 root sys
+
 installf -f ${PKGNAME}
 
 [ "\${POST_INS_START}" = "yes" ]  &&  ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start