Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sca-appliance-agent for
openSUSE:Factory checked in at 2021-03-15 10:54:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-appliance-agent (Old)
and /work/SRC/openSUSE:Factory/.sca-appliance-agent.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-appliance-agent"
Mon Mar 15 10:54:51 2021 rev:4 rq:878673 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/sca-appliance-agent/sca-appliance-agent.changes
2018-01-26 13:39:15.557967959 +0100
+++
/work/SRC/openSUSE:Factory/.sca-appliance-agent.new.2401/sca-appliance-agent.changes
2021-03-15 10:54:51.621214081 +0100
@@ -1,0 +2,7 @@
+Fri Mar 12 23:24:10 UTC 2021 - [email protected]
+
+- Removed references to Novell (bsc#1183471)
+- New supportconfigs with xz compression are processed (bsc#1183343)
+- setup-sca correctly runs sdagent-config (bsc#1183464)
+
+-------------------------------------------------------------------
Old:
----
sca-appliance-agent-1.3.tar.gz
New:
----
sca-appliance-agent-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-appliance-agent.spec ++++++
--- /var/tmp/diff_new_pack.yVcgxe/_old 2021-03-15 10:54:52.085214794 +0100
+++ /var/tmp/diff_new_pack.yVcgxe/_new 2021-03-15 10:54:52.085214794 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sca-appliance-agent
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,12 +21,12 @@
%define sca_configdir %{_sysconfdir}/%{sca_common}
Name: sca-appliance-agent
-Version: 1.3
+Version: 1.3.1
Release: 0
Summary: Supportconfig Analysis Appliance Agent
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/Monitoring
-Url: https://github.com/g23guy/sca-appliance-agent
+URL: https://github.com/g23guy/sca-appliance-agent
Source: %{name}-%{version}.tar.gz
Requires: sca-appliance-common
Requires: sca-patterns-base
++++++ sca-appliance-agent-1.3.tar.gz -> sca-appliance-agent-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-agent-1.3/bin/reportfull.php
new/sca-appliance-agent-1.3.1/bin/reportfull.php
--- old/sca-appliance-agent-1.3/bin/reportfull.php 2015-11-03
22:25:17.240863421 +0100
+++ new/sca-appliance-agent-1.3.1/bin/reportfull.php 2021-03-12
23:20:18.883634579 +0100
@@ -1,5 +1,5 @@
-<?PHP //echo "<!-- Modified: Date = 2015 Mar 05 -->\n";
- $sver = '1.0.21ag';
+<?PHP //echo "<!-- Modified: Date = 2021 Mar 12 -->\n";
+ $sver = '1.0.25ag';
$givenArchiveID = $argv[1];
if ( ! is_numeric($givenArchiveID) ) {
die("<HTML><FONT SIZE=\"-1\"><B>ERROR</B>: Invalid ArchiveID,
Only numeric values allowed.</FONT><BR></HTML>");
@@ -255,15 +255,7 @@
echo "\n<TABLE CELLPADDING=\"5\">\n";
echo "<TR><TD> </TD></TR>\n";
- if ( $SRNum > 0 ) {
- if ( $SRView == 0 ) {
- echo "<TR><TD><B>SR#:</B></TD><TD><A
HREF=\"https://secure-www.novell.com/center/eservice/\";
TARGET=\"_blank\">$SRNum</A></TD></TR>\n";
- } elseif ($SRView == 1 ) {
- echo "<TR><TD><B>SR#:</B></TD><TD><A
HREF=\"https://crystal10.innerweb.novell.com/CE10/viewer.jsp?id=4843&prompts=SRID=$SRNum\";
TARGET=\"_blank\">$SRNum</A></TD></TR>\n";
- } else {
- echo "<TR><TD><B>SR#:</B></TD><TD>$SRNum</TD></TR>\n";
- }
- }
+ echo "<TR><TD><B>SR#:</B></TD><TD>$SRNum</TD></TR>\n";
echo "<TR><TD><B>Server
Name:</B></TD><TD>$ServerName</TD><TD><B>Hardware:</B></TD><TD>$Hardware</TD></TR>\n";
echo "<TR><TD><B>Distribution:</B></TD><TD>$Distro
($Architecture)</TD><TD><B>Service Pack:</B></TD><TD>$DistroSP</TD></TR>\n";
if ( isset($OESDistro) ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-agent-1.3/bin/sdagent-config
new/sca-appliance-agent-1.3.1/bin/sdagent-config
--- old/sca-appliance-agent-1.3/bin/sdagent-config 2018-01-03
20:23:32.361957124 +0100
+++ new/sca-appliance-agent-1.3.1/bin/sdagent-config 2021-03-12
19:41:20.282358695 +0100
@@ -1,15 +1,15 @@
#!/bin/bash
-SVER='1.0.6'
+SVER='1.0.7'
##############################################################################
# sdagent-config - SCA Agent Configuration Tool
-# Copyright (C) 2014 SUSE LLC
+# Copyright (C) 2014-2021 SUSE LLC
#
# Description: Configures the Agent Server to communicate with the Broker
# Server.
# Runs on: Agent Server
-# Modified: 2018 Jan 03
+# Modified: 2021 Mar 12
#
##############################################################################
#
@@ -98,8 +98,14 @@
main() {
if ping -c1 -w1 $OPT_BROKER &>/dev/null; then
- DB_CONNECT="-h $OPT_BROKER -u $DB_USER -p${OPT_PASS} $DB_NAME"
test -z "$SERVER_NAME" && SERVER_NAME=$(hostname)
+ LOCAL_BROKER=0
+ if [[ "$OPT_BROKER" -eq "$SERVER_NAME" ]]; then
+ DB_CONNECT="-u $DB_USER -p${OPT_PASS} $DB_NAME"
+ LOCAL_BROKER=1
+ else
+ DB_CONNECT="-h $OPT_BROKER -u $DB_USER -p${OPT_PASS}
$DB_NAME"
+ fi
mysql $DB_CONNECT -e "SELECT AgentID,Hostname FROM Agents WHERE
( Hostname LIKE \"${SERVER_NAME}%\" )"
echo
AGENT_ID=$(mysql -NB $DB_CONNECT -e "SELECT AgentID FROM Agents
WHERE ( Hostname LIKE \"${SERVER_NAME}%\" )" 2>/dev/null)
@@ -120,6 +126,9 @@
OPT_OUTSRC_DIR=$(echo $OPT_OUTSRC | sed -e
"s!${OPT_OUTSRC_TYPE}://${OPT_OUTSRC_HOST}!!g")
testURL Output $OPT_OUTSRC $OPT_OUTSRC_TYPE
$OPT_INSRC_DIR
OPT_EMAIL_ADMIN=$(echo $OPT_EMAIL_ADMIN | sed
-e "s!,! !g;s! ! !g")
+ if (( LOCAL_BROKER )); then
+ sed -i -e "s!-h \$DB_HOSTNAME !!"
$AGENT_CONFIG
+ fi
sed -i -e
"s!^AGENT_ID=.*!AGENT_ID=${AGENT_ID}!;s!^DB_PASS=.*!DB_PASS='$OPT_PASS'!;s!^DB_HOSTNAME=.*!DB_HOSTNAME='${OPT_BROKER}'!"
$AGENT_CONFIG
sed -i -e
"s!^INSRC=.*!INSRC='${OPT_INSRC}'!;s!^OUTSRC=.*!OUTSRC='${OPT_OUTSRC}'!"
$AGENT_CONFIG
sed -i -e
"s!^INSRC_TYPE=.*!INSRC_TYPE='${OPT_INSRC_TYPE}'!;s!^INSRC_HOST=.*!INSRC_HOST='${OPT_INSRC_HOST}'!;s!^INSRC_DIR=.*!INSRC_DIR='${OPT_INSRC_DIR}'!"
$AGENT_CONFIG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-agent-1.3/bin/sdagent-supportconfig
new/sca-appliance-agent-1.3.1/bin/sdagent-supportconfig
--- old/sca-appliance-agent-1.3/bin/sdagent-supportconfig 2018-01-25
01:35:06.900318027 +0100
+++ new/sca-appliance-agent-1.3.1/bin/sdagent-supportconfig 2021-03-12
23:27:20.812334081 +0100
@@ -1,15 +1,15 @@
#!/bin/bash
-SVER='1.0.42'
+SVER='1.0.44'
##############################################################################
# sdagent-suportconfig - SCA Agent Worker for Supportconfig Archives
-# Copyright (C) 2015-2018 SUSE LLC
+# Copyright (C) 2015-2021 SUSE LLC
#
# Description: A process forked by the sdagent to analyze a supportconfig
# archive. Supportconfig archives can be from any server.
# Runs on: Agent Server
-# Modified: 2018 Jan 24
+# Modified: 2021 Mar 12
#
##############################################################################
#
@@ -702,7 +702,9 @@
msg debug "> extractArchive" "$ARCHFILE"
setArchiveState Extracting
cd $WORKDIR
- if echo "$ARCHFILE" | egrep 'tbz$|tar\.bz2$' &>/dev/null; then
+ if echo "$ARCHFILE" | egrep 'txz$|tar\.xz$' &>/dev/null; then
+ DCBIN='xz -d'
+ elif echo "$ARCHFILE" | egrep 'tbz$|tar\.bz2$' &>/dev/null; then
DCBIN='bzip2 -d'
elif echo "$ARCHFILE" | egrep 'tgz$|tar\.gz$' &>/dev/null; then
DCBIN='gzip -d'
@@ -714,7 +716,7 @@
$DCBIN "$ARCHFILE" &>/dev/null
RC=$?
test $RC -gt 0 && retryArchive "Cannot decompress tar ball
archive, $DCBIN ERROR=$RC"
- TARFILE=$(echo "$ARCHFILE" | sed -e
's/tbz$/tar/;s/tar.bz2$/tar/;s/tgz$/tar/;s/tar.gz$/tar/')
+ TARFILE=$(echo "$ARCHFILE" | sed -e
's/txz$/tar/;s/tbz$/tar/;s/tgz$/tar/;s/tar.xz$/tar/;s/tar.bz2$/tar/;s/tar.gz$/tar/')
msg verbose "EXTRACT" "tar xf $TARFILE"
tar xf "$TARFILE" &>/dev/null
RC=$?
@@ -803,20 +805,9 @@
SCRIPT_VERSION=""
RC=1
fi
- OES=$(sed -ne '/\/etc\/novell-release$/,/#==/p' $ENVFILE |
egrep -v "^$|^#")
- if [[ -n "$OES" ]]; then
- if echo "$OES" | grep Desktop &>/dev/null; then
- OES_DISTRO=''
- OES_SPLEVEL=''
- else
- OES_DISTRO=$(echo "$OES" | head -1)
- OES_SPLEVEL=$(echo "$OES" | grep PATCHLEVEL |
awk '{print $NF}' | sed -e 's/SP//')
- [[ -z "$OES_SPLEVEL" ]] && OES_SPLEVEL=None
- fi
- else
- OES_DISTRO=''
- OES_SPLEVEL=''
- fi
+ OES=''
+ OES_DISTRO=''
+ OES_SPLEVEL=''
msg debug VAR "OES_DISTRO='$OES_DISTRO',
OES_SPLEVEL='$OES_SPLEVEL'"
SRNUM=0
TMPSR=$(grep "^SR#:" $ENVFILE | awk '{print $NF}')
@@ -839,12 +830,7 @@
VIRT=''
VIRT_HARD='See hardware.txt'
fi
- NOWSSBE=$(grep -i NOWS-SBE $RPMLIST)
- if [[ -n "$NOWSSBE" ]]; then
- NOWSVER=$(grep -i NOWS-copyMedia $RPMLIST | head -1 |
awk '{print $3}')
- else
- unset NOWSVER
- fi
+ unset NOWSVER
SLEPOS=$(grep -A4 '/etc/slepos-release' $ENVFILE | grep -v
'/etc/slepos-release' | head -1)
PLUGINS=$(grep "^supportutils-plugin-[[:alpha:]]*[[:space:]]"
$RPMLIST | awk '{print $1}' | sed -e 's/supportutils-plugin-//g')
@@ -905,17 +891,6 @@
fi
fi
- # Open Enterprise Server (OES)
- RELEASEINFO=$(sed -ne '/\/etc\/novell-release$/,/#==/p' $ENVFILE |
egrep -v "^$|^#")
- if echo "$RELEASEINFO" | grep -i 'open enterprise' &>/dev/null
- then
- VER=$(echo "$RELEASEINFO" | grep VERSION | head -1 | awk
'{print $NF}')
- VER_MAJOR=${VER/\.*/}
- REL=$(echo "$RELEASEINFO" | grep PATCHLEVEL | head -1 | awk
'{print $NF}')
- PATTERN_GROUPS="$PATTERN_GROUPS OES/oes${VER_MAJOR}all"
- PATTERN_GROUPS="$PATTERN_GROUPS OES/oes${VER_MAJOR}sp${REL}"
- fi
-
# SUSE Manager (SUMA)
RELEASEINFO=$(egrep
'^susemanager[[:space:]]|^susemanager-proxy[[:space:]]' $RPMFILE)
if [[ -n "$RELEASEINFO" ]]
@@ -931,33 +906,6 @@
PATTERN_GROUPS="$PATTERN_GROUPS HAE"
fi
- # eDirectory
- RELEASEINFO=$(egrep -i "NDSserv[[:space:]]" $RPMFILE | grep -v
"^sca-patterns-" )
- if [[ -n "$RELEASEINFO" ]]
- then
- PATTERN_GROUPS="$PATTERN_GROUPS edirectory"
- fi
-
- # GroupWise
- if egrep -i "groupwise" $RPMFILE | grep -v "^sca-patterns-" &>/dev/null
- then
- PATTERN_GROUPS="$PATTERN_GROUPS groupwise"
- fi
-
- # GroupWise Datasync Mobility
- RELEASEINFO=$(egrep -i "datasync-common[[:space:]]" $RPMFILE | grep -v
"^sca-patterns-" )
- if [[ -n "$RELEASEINFO" ]]
- then
- PATTERN_GROUPS="$PATTERN_GROUPS groupwise"
- fi
-
- # Filr
- RELEASEINFO=$(sed -ne '/\/etc\/Novell-VA-release/,/#==/p' $ENVFILE |
egrep -v "^$|^#")
- if [[ -n "$RELEASEINFO" ]]
- then
- PATTERN_GROUPS="$PATTERN_GROUPS filr"
- fi
-
msg verbose PATTERNS "patternPreProcessor Manifest: $PATTERN_GROUPS"
EFFECTIVE_GROUPS=''
msg verbose PATTERNS "patternPreProcessor: Creating pattern manifest"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-agent-1.3/docs/README.agent
new/sca-appliance-agent-1.3.1/docs/README.agent
--- old/sca-appliance-agent-1.3/docs/README.agent 2015-07-17
00:26:16.591448607 +0200
+++ new/sca-appliance-agent-1.3.1/docs/README.agent 2021-03-12
23:34:45.972391194 +0100
@@ -14,7 +14,7 @@
yast add-on
Click Add, http, Next
Repository Name: SCA Appliance
- URL of the Repository:
http://download.opensuse.org/repositories/Novell:/NTS:/SCA/openSUSE_12.3/
+ URL of the Repository:
https://download.opensuse.org/repositories/isv:/SUSE:/SupportTools:/Factory/SLE_15_SP2/
Click Next
Search phrase: sca-
Packages to Install: sca-agent, sca-patterns-*
(findutils-locate is optional)
@@ -24,4 +24,3 @@
Install the Agent Server's root crontab
(/usr/share/doc/packages/sca/sdagent.cron)
Logout of the Agent Server
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-agent-1.3/man/sdagent.conf.5
new/sca-appliance-agent-1.3.1/man/sdagent.conf.5
--- old/sca-appliance-agent-1.3/man/sdagent.conf.5 2015-07-17
00:26:16.593448627 +0200
+++ new/sca-appliance-agent-1.3.1/man/sdagent.conf.5 2021-03-12
23:36:39.537317108 +0100
@@ -1,4 +1,4 @@
-.TH SDAGENT.CONF 5 "20 Mar 2014" "sca-appliance-agent" "Supportconfig Analysis
Manual"
+.TH SDAGENT.CONF 5 "12 Mar 2021" "sca-appliance-agent" "Supportconfig Analysis
Manual"
.SH NAME
sdagent.conf - Supportconfig Diagnostic Agent configuration file
.SH DESCRIPTION
@@ -14,7 +14,7 @@
Examples:
.RE
.RS
-.B ftp://ftp.novell.com/incoming
+.B ftp://ftp.server.com/upload
.RE
.RS
.B file:///srv/ftp
@@ -47,7 +47,7 @@
Examples:
.RE
.RS
-.B ftp://ftp.novell.com/incoming
+.B ftp://ftp.server.com/incoming
.RE
.RS
.B file:///srv/ftp
