Hello community, here is the log from the commit of package supportutils checked in at Fri Nov 21 15:51:59 CET 2008. -------- --- supportutils/supportutils.changes 2008-11-14 19:45:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/supportutils/supportutils.changes 2008-11-20 19:04:35.184217000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 20 10:21:02 MDT 2008 - jrecord@novell.com + +-echolog not trapped after tar ball (bnc#447212) +-added default ntp log (bnc#447168) +-fixed scp .md5 upload (bnc#446669) +-fixed encrypted uploads (bnc#446146) +-enhanced sbm output +-fixed gpg encryption with -Q (bnc#446647) +*supportconfig: 2.25-71 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils.spec ++++++ --- /var/tmp/diff_new_pack.C25771/_old 2008-11-21 15:51:35.000000000 +0100 +++ /var/tmp/diff_new_pack.C25771/_new 2008-11-21 15:51:35.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/Management AutoReqProv: on Version: 1.01 -Release: 23 +Release: 24 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +85,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 20 2008 jrecord@novell.com +-echolog not trapped after tar ball (bnc#447212) +-added default ntp log (bnc#447168) +-fixed scp .md5 upload (bnc#446669) +-fixed encrypted uploads (bnc#446146) +-enhanced sbm output +-fixed gpg encryption with -Q (bnc#446647) + *supportconfig: 2.25-71 * Fri Nov 14 2008 jrecord@novell.com -added screen buffer mode -b (bnc#444285) -replaced SPident with sam for SLE11 (bnc#443468) ++++++ supportutils-1.01.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportconfig new/supportutils-1.01/supportconfig --- old/supportutils-1.01/supportconfig 2008-11-14 19:43:38.000000000 +0100 +++ new/supportutils-1.01/supportconfig 2008-11-20 19:03:49.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER=2.25-65 -SDATE="2008 11 14" +SVER=2.25-71 +SDATE="2008 11 20" ############################################################################## # supportconfig - Gathers system troubleshooting information for NTS. @@ -141,6 +141,7 @@ XPLUGIN_DIR=/opt/supportconfig/plugins SAVE_LOGS_ONLY=0 USE_SAVED_LOGS_ONLY=0 +ENCRYPTED_TARBALL=0 # These are minimum options and should never be unset. MIN_OPTION_RPM=1 @@ -198,6 +199,7 @@ echo " services include: ftp, scp, http, https" echo " -M <string> Contact store ID" echo " -X <number> Max system logs line count" + echo " -b Screen buffer mode" echo " -d Exclude detailed disk info and scans" echo " -e Search root file system for eDirectory instances; -L implied. Be patient." echo " -f From directory. Don't collect report files, just use files in that" @@ -2015,6 +2017,7 @@ done KEYNAME=logfile FILES=$(grep ^${KEYNAME} $CONFFILE | awk '{print $2}') + [ -z "$FILES" ] && FILES=/var/log/ntp test $ADD_OPTION_LOGS -eq 1 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES fi echolog Done @@ -2039,6 +2042,7 @@ done KEYNAME=logfile FILES=$(grep ^${KEYNAME} $CONFFILE | awk '{print $2}') + [ -z "$FILES" ] && FILES=/var/log/ntp test $ADD_OPTION_LOGS -eq 1 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES fi echolog Done @@ -3144,10 +3148,20 @@ exit 13 fi if (( VAR_OPTION_SILENT )); then - : + gpg --batch --yes --trust-model always --encrypt --recipient "$VAR_OPTION_GPG_UID" $TARBALL &> /dev/null + ERR=$? + if [ $ERR -ne 0 ]; then + echo "ERROR: gpg failed, RC=$ERR, aborting" + echo + exit 13 + fi else - echo "Encrypting Tar Ball" - ehr + if (( $VAR_OPTION_SBM )); then + echo "Encrypting Tar Ball..." + else + echo "Encrypting Tar Ball" + ehr + fi echo echo "Using GPG Key: $VAR_OPTION_GPG_UID" echo "Command: gpg --batch --yes --trust-model always --encrypt --recipient \"$VAR_OPTION_GPG_UID\" $TARBALL" @@ -3158,8 +3172,8 @@ echo exit 13 fi - TARBALL="${TARBALL}.gpg" - echo "Encrypted File: $TARBALL" + ENCRYPTED_TARBALL=1 + echo "Encrypted File: ${TARBALL}.gpg" echo fi } @@ -3172,59 +3186,133 @@ case $UPLOAD_SERVICE in ftp) UPLOAD_URL=$(echo ${VAR_OPTION_UPLOAD_TARGET} | sed -e 's!ftp://!!g;s!/!:/!') - ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" &>/dev/null - ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}" "${TARBALL}" &>/dev/null + if (( ENCRYPTED_TARBALL )); then + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" &>/dev/null + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.gpg" "${TARBALL}.gpg" &>/dev/null + else + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" &>/dev/null + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}" "${TARBALL}" &>/dev/null + fi ;; scp) UPLOAD_URL=$(echo ${VAR_OPTION_UPLOAD_TARGET} | sed -e 's!scp://!!g;s!/!:/!') - scp -qp "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" &>/dev/null - scp -qp "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" &>/dev/null + if (( ENCRYPTED_TARBALL )); then + scp -qp "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" &>/dev/null + scp -qp "${TARBALL}.gpg" "${UPLOAD_URL}/${TARBALL_FILE}.gpg" &>/dev/null + else + scp -qp "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" &>/dev/null + scp -qp "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" &>/dev/null + fi ;; http|https) - UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") - curl -s -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" &>/dev/null - UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}/g") - curl -s -L -A SupportConfig -T "${TARBALL}" "${UPLOAD_URL}" &>/dev/null + if (( ENCRYPTED_TARBALL )); then + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") + curl -s -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" &>/dev/null + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.gpg/g") + curl -s -L -A SupportConfig -T "${TARBALL}.gpg" "${UPLOAD_URL}" &>/dev/null + else + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") + curl -s -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" &>/dev/null + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}/g") + curl -s -L -A SupportConfig -T "${TARBALL}" "${UPLOAD_URL}" &>/dev/null + fi ;; *) exit 7 ;; esac else - echo "Uploading Tar Ball" - ehr + if (( $VAR_OPTION_SBM )); then + echo "Uploading Tar Ball..." + else + echo "Uploading Tar Ball" + ehr + fi echo case $UPLOAD_SERVICE in ftp) UPLOAD_URL=$(echo ${VAR_OPTION_UPLOAD_TARGET} | sed -e 's!ftp://!!g;s!/!:/!') - echo "ftp -vu \"${UPLOAD_URL}/${TARBALL_FILE}.md5\" \"${TARBALL}.md5\"" - echo - ftp -vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" - echo - echo "ftp -vu \"${UPLOAD_URL}/${TARBALL_FILE}\" \"${TARBALL}\"" - echo - ftp -vu "${UPLOAD_URL}/${TARBALL_FILE}" "${TARBALL}" + if (( VAR_OPTION_SBM )); then + if (( ENCRYPTED_TARBALL )); then + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" &>/dev/null + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.gpg" "${TARBALL}.gpg" &>/dev/null + else + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" &>/dev/null + ftp -Vu "${UPLOAD_URL}/${TARBALL_FILE}" "${TARBALL}" &>/dev/null + fi + else + echo "ftp -vu \"${UPLOAD_URL}/${TARBALL_FILE}.md5\" \"${TARBALL}.md5\"" + echo + ftp -vu "${UPLOAD_URL}/${TARBALL_FILE}.md5" "${TARBALL}.md5" + echo + if (( ENCRYPTED_TARBALL )); then + echo "ftp -vu \"${UPLOAD_URL}/${TARBALL_FILE}.gpg\" \"${TARBALL}.gpg\"" + echo + ftp -vu "${UPLOAD_URL}/${TARBALL_FILE}.gpg" "${TARBALL}.gpg" + else + echo "ftp -vu \"${UPLOAD_URL}/${TARBALL_FILE}\" \"${TARBALL}\"" + echo + ftp -vu "${UPLOAD_URL}/${TARBALL_FILE}" "${TARBALL}" + fi + fi ;; scp) UPLOAD_URL=$(echo ${VAR_OPTION_UPLOAD_TARGET} | sed -e 's!scp://!!g;s!/!:/!') - echo "scp -p \"${TARBALL}\" \"${UPLOAD_URL}/${TARBALL_FILE}\"" - echo - scp -p "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" - echo - echo "scp -p \"${TARBALL}\" \"${UPLOAD_URL}/${TARBALL_FILE}\"" - echo - scp -p "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" + if (( VAR_OPTION_SBM )); then + if (( ENCRYPTED_TARBALL )); then + scp -qp "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" &>/dev/null + scp -qp "${TARBALL}.gpg" "${UPLOAD_URL}/${TARBALL_FILE}.gpg" &>/dev/null + else + scp -qp "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" &>/dev/null + scp -qp "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" &>/dev/null + fi + else + echo "scp -p \"${TARBALL}.md5\" \"${UPLOAD_URL}/${TARBALL_FILE}.md5\"" + echo + scp -p "${TARBALL}.md5" "${UPLOAD_URL}/${TARBALL_FILE}.md5" + echo + if (( ENCRYPTED_TARBALL )); then + echo "scp -p \"${TARBALL}.gpg\" \"${UPLOAD_URL}/${TARBALL_FILE}.gpg\"" + echo + scp -p "${TARBALL}.gpg" "${UPLOAD_URL}/${TARBALL_FILE}.gpg" + else + echo "scp -p \"${TARBALL}\" \"${UPLOAD_URL}/${TARBALL_FILE}\"" + echo + scp -p "${TARBALL}" "${UPLOAD_URL}/${TARBALL_FILE}" + fi + fi ;; http|https) - UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") - echo "curl -v -L -A SupportConfig -T \"${TARBALL}.md5\" \"${UPLOAD_URL}\"" - echo - curl -v -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" - echo - UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}/g") - echo "curl -v -L -A SupportConfig -T \"${TARBALL}\" \"${UPLOAD_URL}\"" - echo - curl -v -L -A SupportConfig -T "${TARBALL}" "${UPLOAD_URL}" + if (( VAR_OPTION_SBM )); then + if (( ENCRYPTED_TARBALL )); then + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") + curl -s -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" &>/dev/null + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.gpg/g") + curl -s -L -A SupportConfig -T "${TARBALL}.gpg" "${UPLOAD_URL}" &>/dev/null + else + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") + curl -s -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" &>/dev/null + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}/g") + curl -s -L -A SupportConfig -T "${TARBALL}" "${UPLOAD_URL}" &>/dev/null + fi + else + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.md5/g") + echo "curl -v -L -A SupportConfig -T \"${TARBALL}.md5\" \"${UPLOAD_URL}\"" + echo + curl -v -L -A SupportConfig -T "${TARBALL}.md5" "${UPLOAD_URL}" + echo + if (( ENCRYPTED_TARBALL )); then + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}.gpg/g") + echo "curl -v -L -A SupportConfig -T \"${TARBALL}.gpg\" \"${UPLOAD_URL}\"" + echo + curl -v -L -A SupportConfig -T "${TARBALL}.gpg" "${UPLOAD_URL}" + else + UPLOAD_URL=$(echo $VAR_OPTION_UPLOAD_TARGET | sed -e "s/{[Tt][Aa][Rr][Bb][Aa][Ll][Ll]}/${TARBALL_FILE}/g") + echo "curl -v -L -A SupportConfig -T \"${TARBALL}\" \"${UPLOAD_URL}\"" + echo + curl -v -L -A SupportConfig -T "${TARBALL}" "${UPLOAD_URL}" + fi + fi ;; *) echo "ERROR: Unsupported upload service type: ${UPLOAD_SERVICE}" @@ -3476,7 +3564,13 @@ # creating tar ball for NTS TARBALL=${LOG}.${COMPRESS} -test $VAR_OPTION_SILENT -eq 0 && { echo Creating Tar Ball; } +if ! (( $VAR_OPTION_SILENT )); then + if (( $VAR_OPTION_SBM )); then + echo 'Creating Tar Ball...' + else + echo 'Creating Tar Ball' + fi +fi cd $LOG cd .. tar ${COMPRESS_OPT} ${TARBALL} ${BASE}/* @@ -3497,6 +3591,9 @@ following URL: https://secure-support.novell.com/eService_enu + You can also upload the tar ball to ftp.novell.com/incoming, or just use + supportconfig -ur <srnum>, to upload the tar ball automatically. + If you cannot attach the tar ball to the SR, then email it to the engineer. ============================================================================= @@ -3504,6 +3601,9 @@ EOF1 fi +trap "{ echo TERMINATED BY USER; echo; exit 5; }" SIGINT +trap "{ echo SKIPPED BY USER; return 4; }" SIGQUIT + test -n "$VAR_OPTION_GPG_UID" && encrypt_tarball upload_tarball diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.changes new/supportutils-1.01/supportutils.changes --- old/supportutils-1.01/supportutils.changes 2008-11-14 19:43:38.000000000 +0100 +++ new/supportutils-1.01/supportutils.changes 2008-11-20 19:03:49.000000000 +0100 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Nov 20 10:21:02 MDT 2008 - jrecord@novell.com + +-echolog not trapped after tar ball (bnc#447212) +-added default ntp log (bnc#447168) +-fixed scp .md5 upload (bnc#446669) +-fixed encrypted uploads (bnc#446146) +-enhanced sbm output +-fixed gpg encryption with -Q (bnc#446647) +*supportconfig: 2.25-71 + +------------------------------------------------------------------- Fri Nov 14 11:38:15 MDT 2008 - jrecord@novell.com -added screen buffer mode -b (bnc#444285) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/supportutils-1.01/supportutils.spec new/supportutils-1.01/supportutils.spec --- old/supportutils-1.01/supportutils.spec 2008-11-14 19:43:38.000000000 +0100 +++ new/supportutils-1.01/supportutils.spec 2008-11-20 19:03:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package supportutils (Version 1.01.23) +# spec file for package supportutils (Version 1.01.24) # # Copyright (C) 2008 Novell, Inc. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/Management Autoreqprov: on Version: 1.01 -Release: 23 +Release: 24 Source: %{name}-%{version}.tar.gz Summary: Support Troubleshooting Tools BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org