Hello community, here is the log from the commit of package supportutils for openSUSE:Factory checked in at 2018-01-28 20:32:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supportutils (Old) and /work/SRC/openSUSE:Factory/.supportutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supportutils" Sun Jan 28 20:32:21 2018 rev:5 rq:570003 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/supportutils/supportutils.changes 2018-01-24 15:32:16.873376156 +0100 +++ /work/SRC/openSUSE:Factory/.supportutils.new/supportutils.changes 2018-01-28 20:33:32.878540414 +0100 @@ -1,0 +2,7 @@ +Fri Jan 26 17:25:50 UTC 2018 - [email protected] + +- Added os-release processing (bsc#1077758) +- Removed invalid string tty string (bsc#1077681) +- Added SLE15 taint values (bsc#1077683) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils-3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/getappcore new/supportutils-3.1/bin/getappcore --- old/supportutils-3.1/bin/getappcore 2016-02-22 21:22:24.588745746 +0100 +++ new/supportutils-3.1/bin/getappcore 2018-01-26 18:17:52.914423586 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER=1.28 -SDATE="2013 07 02" +SVER=1.30 +SDATE="2018 01 26" SNAME=$(basename $0) # --------------------------------------------------------------------- # @@ -12,7 +12,7 @@ # Please submit bug fixes or comments via: # # http://en.opensuse.org/Supportutils#Reporting_Bugs # # # -# Copyright (C) 2007,2008 Novell, Inc. # +# Copyright (C) 2007,2008-2018 SUSE LINUX GmbH, Nuernberg, Germany # # # # --------------------------------------------------------------------- # # # @@ -30,7 +30,7 @@ # # # Authors/Contributors: # # Mike Latimer ([email protected]) # -# Jason Record ([email protected]) # +# Jason Record ([email protected]) # # # # Additional credit to Paul Hardwick ([email protected]) for his # # novell-getcore, which was inspiration for this (more generic) script # @@ -50,6 +50,8 @@ # --------------------------------------------------------------------- # # Changes: # # # +# 1.30 Release # +# - Added /etc/os-release processing # # 1.28 Release # # - Changed upload process to use curl instead of ftp # # 1.27 Release # @@ -66,7 +68,8 @@ GETAPPCORE_LOG=$TMP_DIR/getappcore.log GDBLIBS_CMD=$TMP_DIR/.gdblibs.cmd SERVER_NAME=$(/bin/uname -n) -SERVER_RELEASE=/etc/SuSE-release +SUSE_RELEASE="/etc/SuSE-release" +OS_RELEASE="/etc/os-release" UPLOAD=0 UPLOAD_URL="ftp://ftp.novell.com/incoming"; VERBOSE=0 @@ -114,10 +117,10 @@ show_title() { echo "####################################################################" | $TEE_BIN $GETAPPCORE_LOG echo "Get Application Core Tool, v$SVER" | $TEE_BIN -a $GETAPPCORE_LOG - echo "Date: $($DATE_BIN +'%D, %T')" | $TEE_BIN -a $GETAPPCORE_LOG - echo "Server: $SERVER_NAME" | $TEE_BIN -a $GETAPPCORE_LOG - echo "OS: $OS_VERSION - $OS_PATCHLEVEL" | $TEE_BIN -a $GETAPPCORE_LOG - echo "Kernel: $($UNAME_BIN -r) ($($UNAME_BIN -i))" | $TEE_BIN -a $GETAPPCORE_LOG + echo "Date: $($DATE_BIN +'%D, %T')" | $TEE_BIN -a $GETAPPCORE_LOG + echo "Server: $SERVER_NAME" | $TEE_BIN -a $GETAPPCORE_LOG + echo "OS: $OS_VERSION $OS_PATCHLEVEL" | $TEE_BIN -a $GETAPPCORE_LOG + echo "Kernel: $($UNAME_BIN -r) ($($UNAME_BIN -i))" | $TEE_BIN -a $GETAPPCORE_LOG echo "Corefile: $COREFILE" | $TEE_BIN -a $GETAPPCORE_LOG echo "####################################################################" | $TEE_BIN -a $GETAPPCORE_LOG echo @@ -172,9 +175,21 @@ # Determine the server versio and patch level # # --------------------------------------------------------- # get_server_release() { - OS_VERSION=$($HEAD_BIN -1 $SERVER_RELEASE) - OS_VERSION=${OS_VERSION%(*)} - OS_PATCHLEVEL=SP$($CAT_BIN $SERVER_RELEASE | $GREP_BIN PATCHLEVEL | $AWK_BIN '{print $3}') + if [[ -s $OS_RELEASE ]]; then + PRETTY_NAME=$(grep PRETTY_NAME $OS_RELEASE 2>/dev/null | cut -d= -f2) + VERSION_ID=$(grep VERSION_ID $OS_RELEASE 2>/dev/null | cut -d= -f2) + PRETTY_NAME=${PRETTY_NAME//\"/} + VERSION_ID=${VERSION_ID//\"/} + OS_VERSION=${PRETTY_NAME// SP*/} + VER=${VERSION_ID//.*/} + REL=${VERSION_ID//*./} + [[ $VER == $REL ]] && REL=0 + OS_PATCHLEVEL="SP${REL}" + else + OS_VERSION=$($HEAD_BIN -1 $SUSE_RELEASE) + OS_VERSION=${OS_VERSION%(*)} + OS_PATCHLEVEL=SP$($CAT_BIN $SUSE_RELEASE | $GREP_BIN PATCHLEVEL | $AWK_BIN '{print $3}') + fi } # --------------------------------------------------------- # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig new/supportutils-3.1/bin/supportconfig --- old/supportutils-3.1/bin/supportconfig 2018-01-23 17:37:34.967827254 +0100 +++ new/supportutils-3.1/bin/supportconfig 2018-01-26 18:25:27.973315708 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER='3.1-4.0' -SDATE='2018 01 23' +SVER='3.1-4.2' +SDATE='2018 01 26' ############################################################################## # supportconfig - Gathers system troubleshooting information for SUSE Support @@ -265,6 +265,21 @@ test $((TAINT & 1073741824)) -ne 0 && TAINT_STRING="${TAINT_STRING}N" || TAINT_STRING="${TAINT_STRING} " test $((TAINT & 2147483648)) -ne 0 && TAINT_STRING="${TAINT_STRING}X" || TAINT_STRING="${TAINT_STRING} " ;; + 15*) + test $((TAINT & 64)) -ne 0 && TAINT_STRING="${TAINT_STRING}U" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 128)) -ne 0 && TAINT_STRING="${TAINT_STRING}D" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 256)) -ne 0 && TAINT_STRING="${TAINT_STRING}A" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 512)) -ne 0 && TAINT_STRING="${TAINT_STRING}W" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 1024)) -ne 0 && TAINT_STRING="${TAINT_STRING}C" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 2048)) -ne 0 && TAINT_STRING="${TAINT_STRING}I" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 4096)) -ne 0 && TAINT_STRING="${TAINT_STRING}O" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 8192)) -ne 0 && TAINT_STRING="${TAINT_STRING}E" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 16384)) -ne 0 && TAINT_STRING="${TAINT_STRING}L" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 32768)) -ne 0 && TAINT_STRING="${TAINT_STRING}K" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 65536)) -ne 0 && TAINT_STRING="${TAINT_STRING}H" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 1073741824)) -ne 0 && TAINT_STRING="${TAINT_STRING}N" || TAINT_STRING="${TAINT_STRING} " + test $((TAINT & 2147483648)) -ne 0 && TAINT_STRING="${TAINT_STRING}X" || TAINT_STRING="${TAINT_STRING} " + ;; esac log_write $OF "Kernel Status -- Tainted: $TAINT_STRING" @@ -311,6 +326,21 @@ test $((TAINT & 1073741824)) -ne 0 && log_write $OF " TAINT: (N) Unsupported modules loaded" test $((TAINT & 2147483648)) -ne 0 && log_write $OF " TAINT: (X) Modules with external support loaded" ;; + 15*) + test $((TAINT & 64)) -ne 0 && log_write $OF " TAINT: (U) Userspace-defined problems" + test $((TAINT & 128)) -ne 0 && log_write $OF " TAINT: (D) Kernel has oopsed before" + test $((TAINT & 256)) -ne 0 && log_write $OF " TAINT: (A) ACPI table overridden" + test $((TAINT & 512)) -ne 0 && log_write $OF " TAINT: (W) Taint on warning" + test $((TAINT & 1024)) -ne 0 && log_write $OF " TAINT: (C) Modules from drivers/staging are loaded" + test $((TAINT & 2048)) -ne 0 && log_write $OF " TAINT: (I) Working around severe firmware bug" + test $((TAINT & 4096)) -ne 0 && log_write $OF " TAINT: (O) Out-of-tree module has been loaded" + test $((TAINT & 8192)) -ne 0 && log_write $OF " TAINT: (E) Unsigned module has been loaded" + test $((TAINT & 16384)) -ne 0 && log_write $OF " TAINT: (L) A soft lockup has previously occurred" + test $((TAINT & 32768)) -ne 0 && log_write $OF " TAINT: (K) Kernel has been live patched" + test $((TAINT & 65536)) -ne 0 && log_write $OF " TAINT: (H) System restored from unsafe hibernate snapshot image" + test $((TAINT & 1073741824)) -ne 0 && log_write $OF " TAINT: (N) Unsupported modules loaded" + test $((TAINT & 2147483648)) -ne 0 && log_write $OF " TAINT: (X) Modules with external support loaded" + ;; esac log_write $OF @@ -3770,7 +3800,6 @@ case $SLES_VER in 90*) log_cmd $OF "readlink -fv $OWSSLCHECK" ;; 10*|11*|12*) log_cmd $OF "readlink -ev $OWSSLCHECK" ;; -w do tty work esac fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig.rc new/supportutils-3.1/bin/supportconfig.rc --- old/supportutils-3.1/bin/supportconfig.rc 2018-01-23 17:37:34.967827254 +0100 +++ new/supportutils-3.1/bin/supportconfig.rc 2018-01-26 18:24:39.818707280 +0100 @@ -1260,7 +1260,26 @@ fi xml_write 'arch' "$(uname -i)" xml_write 'kernel' "$(uname -r)" - if [ -s /etc/SuSE-release ]; then + if [[ -s /etc/os-release ]]; then + if rpm -q 'SUSE_SLES_SAP-release' &>/dev/null; then + xml_write 'sle_type' 'SUSE Linux Enterprise Server for SAP Applications' + elif rpm -q 'SLES-for-VMware-release' &>/dev/null; then + xml_write 'sle_type' 'SUSE Linux Enterprise Server for VMware' + elif grep -i 'enterprise server' /etc/os-release &>/dev/null; then + xml_write 'sle_type' 'SUSE Linux Enterprise Server' + elif grep -i 'enterprise desktop' /etc/os-release &>/dev/null; then + xml_write 'sle_type' 'SUSE Linux Enterprise Desktop' + else + xml_write 'sle_type' '' + fi + VERSION_ID=$(grep VERSION_ID /etc/os-release 2>/dev/null | cut -d= -f2) + VERSION_ID=${VERSION_ID//\"/} + VER=${VERSION_ID//.*/} + REL=${VERSION_ID//*./} + [[ $VER == $REL ]] && REL=0 + xml_write 'sle_version' "$VER" + xml_write 'sle_patchlevel' "$REL" + elif [[ -s /etc/SuSE-release ]]; then if rpm -q 'SUSE_SLES_SAP-release' &>/dev/null; then xml_write 'sle_type' 'SUSE Linux Enterprise Server for SAP Applications' elif rpm -q 'SLES-for-VMware-release' &>/dev/null; then @@ -1280,7 +1299,7 @@ xml_write 'sle_patchlevel' '' fi - if [ -f /etc/novell-release ]; then + if [[ -f /etc/novell-release ]]; then if grep -i open /etc/novell-release &>/dev/null; then xml_write 'oes_version' "$(sed -ne 's/VERSION = //p' /etc/novell-release)" xml_write 'oes_patchlevel' "$(sed -ne 's/PATCHLEVEL = //p' /etc/novell-release)" @@ -1288,12 +1307,12 @@ fi echo '</summary>' >> $LOG/$XML_FILE echo '<customer>' >> $LOG/$XML_FILE - test -n "$VAR_OPTION_CONTACT_COMPANY" && { xml_write 'company' "$VAR_OPTION_CONTACT_COMPANY"; } - test -n "$VAR_OPTION_CONTACT_STOREID" && { xml_write 'storeid' "$VAR_OPTION_CONTACT_STOREID"; } - test -n "$VAR_OPTION_CONTACT_TERMINALID" && { xml_write 'terminalid' "$VAR_OPTION_CONTACT_TERMINALID"; } - test -n "$VAR_OPTION_CONTACT_NAME" && { xml_write 'contact' "$VAR_OPTION_CONTACT_NAME"; } - test -n "$VAR_OPTION_CONTACT_PHONE" && { xml_write 'phone' "$VAR_OPTION_CONTACT_PHONE"; } - test -n "$VAR_OPTION_CONTACT_EMAIL" && { xml_write 'email' "$VAR_OPTION_CONTACT_EMAIL"; } + test -n "$VAR_OPTION_CONTACT_COMPANY" && { xml_write 'company' "$VAR_OPTION_CONTACT_COMPANY"; } + test -n "$VAR_OPTION_CONTACT_STOREID" && { xml_write 'storeid' "$VAR_OPTION_CONTACT_STOREID"; } + test -n "$VAR_OPTION_CONTACT_TERMINALID" && { xml_write 'terminalid' "$VAR_OPTION_CONTACT_TERMINALID"; } + test -n "$VAR_OPTION_CONTACT_NAME" && { xml_write 'contact' "$VAR_OPTION_CONTACT_NAME"; } + test -n "$VAR_OPTION_CONTACT_PHONE" && { xml_write 'phone' "$VAR_OPTION_CONTACT_PHONE"; } + test -n "$VAR_OPTION_CONTACT_EMAIL" && { xml_write 'email' "$VAR_OPTION_CONTACT_EMAIL"; } xml_write 'srnum' "$CONTACT_SRNUM" echo '</customer>' >> $LOG/$XML_FILE wait_trace_off @@ -1326,19 +1345,20 @@ fi KERNBASE="${KERNMAJ}.${KERNREL}" KERNVER=$(echo $KERNBASE | awk -F\. '{printf "%g%02g%03g%02g%03g%03g%03g\n", $1, $2, $3, $4, $5, $6, $7}') - if [ $KERNVER -ge 31200900001000000 ]; then SLES_VER=120; -# elif [ $KERNVER -ge 30010100054002000 ]; then SLES_VER=114; - elif [ $KERNVER -ge 30007600000011000 ]; then SLES_VER=113; - elif [ $KERNVER -ge 30001300000027000 ]; then SLES_VER=112; - elif [ $KERNVER -ge 20603212000007000 ]; then SLES_VER=111; - elif [ $KERNVER -ge 20602719005000000 ]; then SLES_VER=110; - elif [ $KERNVER -ge 20601660000085001 ]; then SLES_VER=104; - elif [ $KERNVER -ge 20601660000054005 ]; then SLES_VER=103; - elif [ $KERNVER -ge 20601660000021000 ]; then SLES_VER=102; - elif [ $KERNVER -ge 20601646000012000 ]; then SLES_VER=101; - elif [ $KERNVER -ge 20601621000008000 ]; then SLES_VER=100; - elif [ $KERNVER -ge 20600500007097000 ]; then SLES_VER=90; - elif [ $KERNVER -ge 20401900120000000 ]; then SLES_VER=80; + if [[ $KERNVER -ge 41201400009001000 ]]; then SLES_VER=150; + elif [[ $KERNVER -ge 31200900001000000 ]]; then SLES_VER=120; +# elif [[ $KERNVER -ge 30010100054002000 ]]; then SLES_VER=114; + elif [[ $KERNVER -ge 30007600000011000 ]]; then SLES_VER=113; + elif [[ $KERNVER -ge 30001300000027000 ]]; then SLES_VER=112; + elif [[ $KERNVER -ge 20603212000007000 ]]; then SLES_VER=111; + elif [[ $KERNVER -ge 20602719005000000 ]]; then SLES_VER=110; + elif [[ $KERNVER -ge 20601660000085001 ]]; then SLES_VER=104; + elif [[ $KERNVER -ge 20601660000054005 ]]; then SLES_VER=103; + elif [[ $KERNVER -ge 20601660000021000 ]]; then SLES_VER=102; + elif [[ $KERNVER -ge 20601646000012000 ]]; then SLES_VER=101; + elif [[ $KERNVER -ge 20601621000008000 ]]; then SLES_VER=100; + elif [[ $KERNVER -ge 20600500007097000 ]]; then SLES_VER=90; + elif [[ $KERNVER -ge 20401900120000000 ]]; then SLES_VER=80; else SLES_VER=90; fi grep -i "open enterprise server" /etc/*release* &>/dev/null diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/spec/supportutils.changes new/supportutils-3.1/spec/supportutils.changes --- old/supportutils-3.1/spec/supportutils.changes 2018-01-23 17:37:35.015827885 +0100 +++ new/supportutils-3.1/spec/supportutils.changes 2018-01-26 18:26:01.924334835 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 26 17:25:50 UTC 2018 - [email protected] + +- Added os-release processing (bsc#1077758) +- Removed invalid string tty string (bsc#1077681) +- Added SLE15 taint values (bsc#1077683) + +------------------------------------------------------------------- Tue Jan 23 16:33:53 UTC 2018 - [email protected] - Added transactional update with OPTION_TRANSACTIONAL=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/spec/supportutils.spec new/supportutils-3.1/spec/supportutils.spec --- old/supportutils-3.1/spec/supportutils.spec 2018-01-23 17:37:35.039828201 +0100 +++ new/supportutils-3.1/spec/supportutils.spec 2018-01-26 18:26:04.928248059 +0100 @@ -1,7 +1,7 @@ # # spec file for package supportutils # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,6 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + %define support_libdir /usr/lib/supportconfig Name: supportutils @@ -22,17 +26,17 @@ Group: System/Monitoring Url: https://github.com/g23guy/supportutils Source: %{name}-%{version}.tar.gz +Requires: iproute2 +Requires: kmod-compat +Requires: ncurses-utils +Requires: net-tools Requires: sysfsutils Requires: tar -Requires: which Requires: util-linux-systemd -Requires: net-tools -Requires: ncurses-utils -Requires: kmod-compat -Requires: iproute2 +Requires: which +Provides: supportconfig-plugin-icommand Provides: supportconfig-plugin-resource Provides: supportconfig-plugin-tag -Provides: supportconfig-plugin-icommand BuildArch: noarch %description
