Index: build =================================================================== RCS file: /cvs/cvsnt/redhat/build,v retrieving revision 1.1.2.5.4.15.2.6 retrieving revision 1.1.2.5.4.15.2.9 diff -c -r1.1.2.5.4.15.2.6 -r1.1.2.5.4.15.2.9 *** build 31 Jul 2017 04:17:09 -0000 1.1.2.5.4.15.2.6 --- build 21 Feb 2020 03:36:45 -0000 1.1.2.5.4.15.2.9 *************** *** 35,41 **** if [ "x$MYIPADDR" == "x10" ]; then MYHOST=acer64debian ! MYNETTIME=10.0.1.168 else MYHOST="-P 8227 abarrett@mail.march-hare.com" MYNETTIME=au.pool.ntp.org --- 35,41 ---- if [ "x$MYIPADDR" == "x10" ]; then MYHOST=acer64debian ! MYNETTIME=10.10.10.1 else MYHOST="-P 8227 abarrett@mail.march-hare.com" MYNETTIME=au.pool.ntp.org *************** *** 48,55 **** fi export LICENSEFILE ! REDHATVER=9 if [ -f /etc/redhat-release ]; then RHV=`cat /etc/redhat-release` REDHATVER=`echo $RHV | sed 's/(.*)//g'| sed 's/[[:space:],A-Z,a-z,[:punct:]]//g'` --- 48,57 ---- fi export LICENSEFILE ! RPMBUILDOPT= ! RPMBUILDARCH=i386 REDHATVER=9 + GPG_PASSPHRASE=`cat ~/passphrase.txt` if [ -f /etc/redhat-release ]; then RHV=`cat /etc/redhat-release` REDHATVER=`echo $RHV | sed 's/(.*)//g'| sed 's/[[:space:],A-Z,a-z,[:punct:]]//g'` *************** *** 57,62 **** --- 59,66 ---- # Set the current date/time #echo "Enter the root password so I can sync the local clock" > /dev/stderr + echo "Sync the local clock using ntpdate" > /dev/stderr + echo "/usr/sbin/ntpdate $MYNETTIME" > /dev/stderr sudo /usr/sbin/ntpdate $MYNETTIME echo "If prompted enter the password for $MYHOST so I can get the file 'release'" > /dev/stderr *************** *** 70,75 **** --- 74,81 ---- exit fi + if [ ! -f key-public-cvs-suite-support.asc ]; then echo "there is no GPG public key here"; exit 1; fi + if [ ! -f ~/.rpmmacros ]; then echo "there is no .rpmmacros in the home directory"; exit 1; fi scp $MYHOST:cvs/buildno . BNO=`cat buildno` BUILDNO=`echo $BNO | sed 's/[[:space:]]//g'` *************** *** 132,144 **** sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec fi ! if [ "x$REDHATVER" == "x70" -o "x$REDHATVER" == "x71" -o "x$REDHATVER" == "x72" -o "x$REDHATVER" == "x73" ]; then ! REDHATDIST="rhel6" sed "s/\$RPM_BUILD_ROOT/%{buildroot}/" cvsnt.spec.tmp1 sed "s/@LICENSEFILE@/$LICENSEFILE/" cvsnt.spec.tmp2 sed "s/cvsnt-pam/cvsnt-pam-5/" cvsnt.spec.tmp3 sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 ! sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec fi #echo "if you want to modify cvsnt.spec do so now, then press ENTER" --- 138,156 ---- sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec fi ! if [ "x$REDHATVER" == "x70" -o "x$REDHATVER" == "x71" -o "x$REDHATVER" == "x72" -o "x$REDHATVER" == "x73" -o "x$REDHATVER" == "x74" -o "x$REDHATVER" == "x75" -o "x$REDHATVER" == "x76" -o "x$REDHATVER" == "x77" -o "x$REDHATVER" == "x78" ]; then ! REDHATDIST="rhel7" ! RPMBUILDARCH=i686 ! RPMBUILDOPT="--target ${RPMBUILDARCH}" sed "s/\$RPM_BUILD_ROOT/%{buildroot}/" cvsnt.spec.tmp1 sed "s/@LICENSEFILE@/$LICENSEFILE/" cvsnt.spec.tmp2 sed "s/cvsnt-pam/cvsnt-pam-5/" cvsnt.spec.tmp3 sed "s/rh9/$REDHATDIST/" cvsnt.spec.tmp4 ! sed 's/CFLAGS="-I\/usr\/kerberos\/include"/CFLAGS="-I\/usr\/kerberos\/include -m32"/' cvsnt.spec.tmp5 ! sed 's/CXXFLAGS="-I\/usr\/kerberos\/include"/CXXFLAGS="-I\/usr\/kerberos\/include -m32"/' cvsnt.spec.tmp6 ! sed 's/CVSNT32OPT=""/CVSNT32OPT="-m32"/' cvsnt.spec.tmp7 ! sed 's/LDFLAGS="-L\/usr\/kerberos\/lib"/LDFLAGS="-L\/usr\/kerberos\/lib\/" SSL_LIBS="-L\/usr\/kerberos\/lib\/ -lssl -lcrypto"/' cvsnt.spec.tmp8 ! sed "s:--disable-postgres:--disable-postgres --with-oracle=${ORACLE_HOME}:" cvsnt.spec fi #echo "if you want to modify cvsnt.spec do so now, then press ENTER" *************** *** 164,179 **** echo "`which chgrp` $WHOAMI /usr/src/redhat/SOURCES/cvsnt-$VERSION.tar.gz" sudo chgrp $WHOAMI /usr/src/redhat/SOURCES/cvsnt-$VERSION.tar.gz echo "***************** BEGIN RPMBUILD" ! echo "`which rpmbuild` -vv -bb --sign /usr/src/redhat/SPECS/cvsnt.spec" ! sudo rpmbuild -vv -bb --sign /usr/src/redhat/SPECS/cvsnt.spec #echo "Press ENTER to continue" #read ! mkdir rpm rm rpm/* cp ~/key-public-cvs-suite-support.asc rpm ! cp /usr/src/redhat/RPMS/i386/cvsnt-$VERSION-1.i386.rpm rpm ! cp /usr/src/redhat/RPMS/i386/cvsnt-database-*-$VERSION-1.i386.rpm rpm ! cp /usr/src/redhat/RPMS/i386/cvsnt-protocol-*-$VERSION-1.i386.rpm rpm echo "If prompted enter the password for $MYHOST so I can put the file 'cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz'" > /dev/stderr if [ "x$MAJOR" == "x2.8" ]; then if [ "x$1" == "xfull" -o "x$1" == "xlicense.full" ]; then --- 176,197 ---- echo "`which chgrp` $WHOAMI /usr/src/redhat/SOURCES/cvsnt-$VERSION.tar.gz" sudo chgrp $WHOAMI /usr/src/redhat/SOURCES/cvsnt-$VERSION.tar.gz echo "***************** BEGIN RPMBUILD" ! #echo "`which rpmbuild` -vv -bb --sign /usr/src/redhat/SPECS/cvsnt.spec" ! #sudo rpmbuild -vv -bb --sign /usr/src/redhat/SPECS/cvsnt.spec ! echo "`which rpmbuild` -vv -bb $RPMBUILDOPT /usr/src/redhat/SPECS/cvsnt.spec" ! sudo rpmbuild -vv -bb $RPMBUILDOPT /usr/src/redhat/SPECS/cvsnt.spec ! if [ ! -f /usr/src/redhat/RPMS/${RPMBUILDARCH}/cvsnt-$VERSION-1.${RPMBUILDARCH}.rpm ]; then echo "rpmbuild did not successfully build the cvsnt rpm"; exit 1; fi #echo "Press ENTER to continue" #read ! if [ ! -d rpm ]; then mkdir rpm; fi rm rpm/* cp ~/key-public-cvs-suite-support.asc rpm ! cp /usr/src/redhat/RPMS/${RPMBUILDARCH}/cvsnt-$VERSION-1.${RPMBUILDARCH}.rpm rpm ! cp /usr/src/redhat/RPMS/${RPMBUILDARCH}/cvsnt-database-*-$VERSION-1.${RPMBUILDARCH}.rpm rpm ! cp /usr/src/redhat/RPMS/${RPMBUILDARCH}/cvsnt-protocol-*-$VERSION-1.${RPMBUILDARCH}.rpm rpm ! echo "Sign the RPM's?" ! echo " " ! find rpm -name "*.rpm" -exec ~/rpm_sign.exp "${GPG_PASSPHRASE}" {} \; echo "If prompted enter the password for $MYHOST so I can put the file 'cvsnt-$VERSION-$REDHATDIST-rpm.tar.gz'" > /dev/stderr if [ "x$MAJOR" == "x2.8" ]; then if [ "x$1" == "xfull" -o "x$1" == "xlicense.full" ]; then Index: cvsnt.spec.in =================================================================== RCS file: /cvs/cvsnt/redhat/cvsnt.spec.in,v retrieving revision 1.5.2.29.6.27.2.7 retrieving revision 1.5.2.29.6.27.2.11 diff -c -r1.5.2.29.6.27.2.7 -r1.5.2.29.6.27.2.11 *** cvsnt.spec.in 12 Dec 2016 05:16:13 -0000 1.5.2.29.6.27.2.7 --- cvsnt.spec.in 14 Feb 2020 05:21:03 -0000 1.5.2.29.6.27.2.11 *************** *** 213,230 **** LDFLAGS="-L/usr/kerberos/lib" CVSNT=`pwd` echo "Guess directory for make: %{_tmppath}/%{name}-root" echo "Directory for make: ${CVSNT}" make CVSNT=${CVSNT} cd ../march-hare/licenselib make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} cd ../cvsmanager make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} cd ../cvsproxy make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} cd ${CVSNT} %install --- 213,236 ---- LDFLAGS="-L/usr/kerberos/lib" CVSNT=`pwd` + CVSNT32OPT="" echo "Guess directory for make: %{_tmppath}/%{name}-root" echo "Directory for make: ${CVSNT}" + echo "Options (eg: 32 bit): ${CVSNT32OPT}" make CVSNT=${CVSNT} + echo " make CVSNT completed!" cd ../march-hare/licenselib make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} CVSNT32OPT=${CVSNT32OPT} ! echo " make licenselib completed!" cd ../cvsmanager make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} CVSNT32OPT=${CVSNT32OPT} ! echo " make cvsmanager completed!" cd ../cvsproxy make -f Makefile.linux CVSNT=${CVSNT} clean ! make -f Makefile.linux CVSNT=${CVSNT} CVSNT32OPT=${CVSNT32OPT} ! echo " make cvsproxy completed!" cd ${CVSNT} %install *************** *** 363,369 **** - Updated for cvsnt 2.8.01 Created sub packages for sync. ! * Tue Jan 9 2006 Tony Hoyle - Added requires: lines to subpackages * Thu Aug 18 2005 Tony Hoyle --- 369,375 ---- - Updated for cvsnt 2.8.01 Created sub packages for sync. ! * Tue Jan 10 2006 Tony Hoyle - Added requires: lines to subpackages * Thu Aug 18 2005 Tony Hoyle Index: rpm_sign.exp =================================================================== RCS file: rpm_sign.exp diff -N rpm_sign.exp *** /dev/null 1 Jan 1970 00:00:00 -0000 --- rpm_sign.exp 21 Feb 2020 03:36:45 -0000 1.1.2.1 *************** *** 0 **** --- 1,8 ---- + #!/usr/bin/expect -f + + set password [lindex $argv 0] + set files [lrange $argv 1 1] + spawn rpmsign --resign $files + expect "Enter pass phrase:" + send -- "$password\r" + expect eof