Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sca-appliance-broker for
openSUSE:Factory checked in at 2021-03-15 10:54:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-appliance-broker (Old)
and /work/SRC/openSUSE:Factory/.sca-appliance-broker.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-appliance-broker"
Mon Mar 15 10:54:52 2021 rev:4 rq:878675 version:1.3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/sca-appliance-broker/sca-appliance-broker.changes
2018-01-26 13:40:14.279225460 +0100
+++
/work/SRC/openSUSE:Factory/.sca-appliance-broker.new.2401/sca-appliance-broker.changes
2021-03-15 10:54:53.517216991 +0100
@@ -1,0 +2,7 @@
+Fri Mar 12 23:24:34 UTC 2021 - [email protected]
+
+- Removed Novell references (bsc#1183471)
+- New supportconfigs with xz compression are processed (bsc#1183343)
+- sdbroker-monitor runs without error (bsc#1183466)
+
+-------------------------------------------------------------------
Old:
----
sca-appliance-broker-1.3.tar.gz
New:
----
sca-appliance-broker-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-appliance-broker.spec ++++++
--- /var/tmp/diff_new_pack.BER6Us/_old 2021-03-15 10:54:53.941217642 +0100
+++ /var/tmp/diff_new_pack.BER6Us/_new 2021-03-15 10:54:53.945217648 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sca-appliance-broker
#
-# Copyright (c) 2017 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,20 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
%define sca_common sca
%define sca_webdir /srv/www/htdocs/%{sca_common}
%define sca_configdir %{_sysconfdir}/%{sca_common}
Name: sca-appliance-broker
-Version: 1.3
+Version: 1.3.1
Release: 0
Summary: Supportconfig Analysis Appliance Broker
-License: GPL-2.0
-URL: https://github.com/g23guy/sca-appliance-broker
+License: GPL-2.0-only
Group: System/Monitoring
+URL: https://github.com/g23guy/sca-appliance-broker
Source: %{name}-%{version}.tar.gz
Requires: sca-appliance-common
-Buildarch: noarch
+BuildArch: noarch
%description
Monitors inbound supportconfig archives and is responsible for
++++++ sca-appliance-broker-1.3.tar.gz -> sca-appliance-broker-1.3.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/sdbroker
new/sca-appliance-broker-1.3.1/bin/sdbroker
--- old/sca-appliance-broker-1.3/bin/sdbroker 2018-01-02 20:43:06.341603149
+0100
+++ new/sca-appliance-broker-1.3.1/bin/sdbroker 2021-03-12 21:21:16.332027636
+0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER='1.0.6'
+SVER='1.0.7'
##############################################################################
# sdbroker - Supportconfig Analysis Broker
-# Copyright (c) 2018 SUSE LLC
+# Copyright (c) 2018-2021 SUSE LLC
#
# Description: Maintains the list of new archives.
# Runs on: Broker Server
-# Modified: 2018 Jan 02
+# Modified: 2021 Mar 12
##############################################################################
#
@@ -159,7 +159,7 @@
msg debug CMD "Converting dos2unix"
dos2unix ${ARCHIVE_INBOUND}.raw &>/dev/null
msg debug CMD "Filtering supportconfig archives from FTP file list"
- egrep '.*t[g,b]z$|.*tar.gz$|.*tar.bz2$' ${ARCHIVE_INBOUND}.raw | sort |
uniq | grep -v '[[:space:]]' > ${ARCHIVE_INBOUND}.filtered
+ egrep '.*t[x,g,b]z$|.*tar.xz$|.*tar.gz$|.*tar.bz2$'
${ARCHIVE_INBOUND}.raw | sort | uniq | grep -v '[[:space:]]' >
${ARCHIVE_INBOUND}.filtered
ALL_ARCHIVES=$(cat ${ARCHIVE_INBOUND}.filtered | wc -l)
msg debug CMD "Converting archive list to SQL import file"
sed -e "s/\(.*\)/('\1'),/g;\$,\$s/),/);/;1iINSERT IGNORE INTO
\`Archives\` (\`Filename\`) VALUES" ${ARCHIVE_INBOUND}.filtered >
${ARCHIVE_INBOUND}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/sdbroker-monitor
new/sca-appliance-broker-1.3.1/bin/sdbroker-monitor
--- old/sca-appliance-broker-1.3/bin/sdbroker-monitor 2018-01-02
20:55:25.251959045 +0100
+++ new/sca-appliance-broker-1.3.1/bin/sdbroker-monitor 2021-03-12
20:36:05.075492234 +0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER='1.0.5'
+SVER='1.0.6'
##############################################################################
# sdbroker-monitor - SCA Broker Monitor
-# Copyright (C) 2018 SUSE LLC
+# Copyright (C) 2018-2021 SUSE LLC
#
# Description: Monitors the current status of Broker Server and it's Agents
# Runs on: Broker Server
-# Modified: 2018 Jan 02
+# Modified: 2021 Mar 12
#
##############################################################################
#
@@ -31,7 +31,7 @@
CURRENT_SCRIPT=$(basename $0)
. /etc/sca/sdbroker.conf
-[ -s /etc/sca/sdbroker-monitor.conf ]] && . /etc/sca/sdbroker-monitor.conf
+[[ -s /etc/sca/sdbroker-monitor.conf ]] && . /etc/sca/sdbroker-monitor.conf
msg() {
FACLEVEL='info'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/bin/setup-sca
new/sca-appliance-broker-1.3.1/bin/setup-sca
--- old/sca-appliance-broker-1.3/bin/setup-sca 2018-01-25 19:54:05.994477606
+0100
+++ new/sca-appliance-broker-1.3.1/bin/setup-sca 2021-03-12
23:01:47.789565631 +0100
@@ -1,14 +1,14 @@
#!/bin/bash
-SVER='1.0.38'
+SVER='1.0.40'
##############################################################################
# setup-sca - SCA Appliance Setup Tool
-# Copyright (C) 2014-2018 SUSE LLC
+# Copyright (C) 2014-2021 SUSE LLC
#
# Description: Sets up a standard local host configuration of the SCA
# appliance
-# Modified: 2018 Jan 25
+# Modified: 2018 Mar 12
#
##############################################################################
#
@@ -34,6 +34,7 @@
PHP_VERSION=''
SERVER=$(hostname -f &>/dev/null)
[[ -z "$SERVER" ]] && SERVER=$HOSTNAME
+ARCH_PREFIX='scc_'
title() {
echo
"####################################################################"
@@ -80,20 +81,20 @@
echo " 1. Login as root on the SUSE server to be analyzed"
if (( FTP_INSTALL ))
then
- echo " 2. Run a supportconfig and upload the
nts_<supportconfig_file>.tbz"
+ echo " 2. Run a supportconfig and upload the
${ARCH_PREFIX}<supportconfig_file>.tbz"
echo " to the appliance."
echo " 3. Examples include:"
echo
echo " supportconfig -U \"ftp://${SERVER}/upload/\"";
echo " supportconfig -U \"scp://${SERVER}/srv/ftp/upload/\""
- echo " ftp -u
\"${SERVER}:/upload/nts_<supportconig_file>.tbz\"
/path/to/local/nts_<supportconfig_file>.tbz"
+ echo " ftp -u
\"${SERVER}:/upload/${ARCH_PREFIX}<supportconfig_file>.tbz\"
/path/to/local/${ARCH_PREFIX}<supportconfig_file>.tbz"
else
- echo " 2. Run a supportconfig and upload the
nts_<supportconfig_file>.tbz"
+ echo " 2. Run a supportconfig and upload the
${ARCH_PREFIX}<supportconfig_file>.tbz"
echo " to the appliance."
echo " 3. Examples include:"
echo
echo " supportconfig -U \"scp://${SERVER}/tmp\""
- echo " scp /path/to/local/nts_<supportconifg_file>.tbz
${SERVER}:/tmp"
+ echo " scp
/path/to/local/${ARCH_PREFIX}<supportconfig_file>.tbz ${SERVER}:/tmp"
fi
echo
echo "To view the analysis reports, goto the URL:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/docs/README.broker
new/sca-appliance-broker-1.3.1/docs/README.broker
--- old/sca-appliance-broker-1.3/docs/README.broker 2017-07-07
18:13:36.977798784 +0200
+++ new/sca-appliance-broker-1.3.1/docs/README.broker 2021-03-12
23:41:40.369139506 +0100
@@ -13,7 +13,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-broker, sca-pattern-devel
(findutils-locate is optional)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/man/sdbroker.conf.5
new/sca-appliance-broker-1.3.1/man/sdbroker.conf.5
--- old/sca-appliance-broker-1.3/man/sdbroker.conf.5 2017-07-07
18:13:36.985798775 +0200
+++ new/sca-appliance-broker-1.3.1/man/sdbroker.conf.5 2021-03-12
23:43:46.305705693 +0100
@@ -1,4 +1,4 @@
-.TH SDBROKER.CONF 5 "03 Jul 2014" "sca-appliance-broker" "Supportconfig
Analysis Manual"
+.TH SDBROKER.CONF 5 "12 Mar 2021" "sca-appliance-broker" "Supportconfig
Analysis Manual"
.SH NAME
sdbroker.conf - Supportconfig Diagnostic Broker configuration file
.SH DESCRIPTION
@@ -13,7 +13,7 @@
Examples:
.RE
.RS
-.B ftp://ftp.novell.com/incoming
+.B ftp://ftp.server.com/incoming
.RE
.RS
.B file:///srv/ftp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/websca/docs.html
new/sca-appliance-broker-1.3.1/websca/docs.html
--- old/sca-appliance-broker-1.3/websca/docs.html 2017-07-07
18:13:37.017798743 +0200
+++ new/sca-appliance-broker-1.3.1/websca/docs.html 2021-03-12
23:47:06.756231781 +0100
@@ -116,7 +116,7 @@
<HR>
<H3><A NAME="update">SCA Appliance Updates</A></H3>
-<P>The SCA Appliance and its associated patterns are built in the OpenSUSE
Build Service project <A
HREF="https://build.opensuse.org/project/show/Novell:NTS:SCA";>Supportconfig
Analysis Appliance</A>. The appliance is linked to this OBS service making it
possible to update your SCA Appliance when new patterns or updates are
available. You do not need to reimage your server or VM. Patterns will
automatically be updated each night when <B>sdagent-patterns</B> is run, but
you can update the appliance and patterns manually. The appliance packages must
be manually updated since <B>sdagent-patterns</B> only updates the patterns.</P>
+<P>The SCA Appliance and its associated patterns are built in the OpenSUSE
Build Service project <A
HREF="https://build.opensuse.org/project/show/isv:SUSE:SupportTools:Factory";>Supportconfig
Analysis Appliance</A>. The appliance is linked to this OBS service making it
possible to update your SCA Appliance when new patterns or updates are
available. You do not need to reimage your server or VM. Patterns will
automatically be updated each night when <B>sdagent-patterns</B> is run, but
you can update the appliance and patterns manually. The appliance packages must
be manually updated since <B>sdagent-patterns</B> only updates the patterns.</P>
<P>Do the following to manually update the SCA Appliance Patterns</P>
<OL>
@@ -129,7 +129,7 @@
<LI>Login to the SCA Appliance console as root</LI>
<LI>Run <B>zypper --no-gpg-checks refresh</B> to refresh the update
repositories</LI>
<UL>
- <LI>The first time you refresh without --no-gpg-checks, you will be
prompted to reject or trust the Novell:NTS OBS Project key</LI>
+ <LI>The first time you refresh without --no-gpg-checks, you will be
prompted to reject or trust the isv:SUSE:SupportTools:Factory OBS Project
key</LI>
<LI>Select <B>a</B> to always trust the key</LI>
</UL>
<LI>Select <B><I>one</I></B> of the following:</LI>
@@ -196,8 +196,6 @@
<P>To update from the published update channels, run <B>zypper up
supportutils</B>.</P>
-<P>To update from the openSUSE Build Service (OBS), refer to "<A
HREF="http://www.novell.com/communities/node/2332/supportconfig-linux";>Supportconfig
for Linux</A>", Option A. This is the absolute current version.</P>
-
<HR>
<H3><A NAME="schang">Troubleshooting Supportconfig Hangs</A></H3>
<P>Sometimes supportconfig will hang. You can find out which command is
causing the hang or even attempt to by-pass the hang using the Ctrl-\ key.</P>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/websca/index.php
new/sca-appliance-broker-1.3.1/websca/index.php
--- old/sca-appliance-broker-1.3/websca/index.php 2017-07-07
18:13:37.021798739 +0200
+++ new/sca-appliance-broker-1.3.1/websca/index.php 2021-03-13
00:59:50.383140038 +0100
@@ -1,5 +1,5 @@
<?PHP include 'checklogin.php';?>
-<?PHP //echo "<!-- Modified: Date = 2014 Jun 09 -->\n"; ?>
+<?PHP //echo "<!-- Modified: Date = 2021 Mar 12 -->\n"; ?>
<HTML>
<HEAD>
<TITLE>SCA Reports</TITLE>
@@ -27,7 +27,6 @@
switch ($viewType) {
case 'n':
case 's':
- case 'o':
break;
default:
$viewType = $DefaultViewType;
@@ -43,7 +42,6 @@
case 'w':
case 'm':
case 'n':
- case 'o':
case 'g':
break;
default:
@@ -98,11 +96,6 @@
} else {
echo "<A
HREF=\"index.php?top=$Top&row=$rowStart&st=r&vt=n\">Normal</A>, ";
}
- if ( $viewType == 'o' ) {
- echo "<B>OES</B>, ";
- } else {
- echo "<A
HREF=\"index.php?top=$Top&row=$rowStart&st=o&vt=o\">OES</A>, ";
- }
if ( $viewType == 's' ) {
echo "<B>SR</B> ";
} else {
@@ -136,10 +129,6 @@
//echo "<!-- Sorting by: = Distribution -->\n";
$query="SELECT $DB_FIELDS FROM Archives WHERE
ArchiveState='Done' ORDER BY Distro ASC, ServerName ASC, PatternsCritical DESC
LIMIT " . $rowStart . "," . $Top;
break;
- case 'o':
- //echo "<!-- Sorting by: = OES -->\n";
- $query="SELECT $DB_FIELDS FROM Archives WHERE
ArchiveState='Done' ORDER BY OESDistro DESC, OESDistroSP DESC, ServerName ASC,
PatternsCritical DESC LIMIT " . $rowStart . "," . $Top;
- break;
case 'a':
//echo "<!-- Sorting by: = Architecture -->\n";
$query="SELECT $DB_FIELDS FROM Archives WHERE
ArchiveState='Done' ORDER BY Architecture ASC, ServerName ASC, PatternsCritical
DESC LIMIT " . $rowStart . "," . $Top;
@@ -231,13 +220,6 @@
} else {
echo "<TH ALIGN=\"left\"><A
HREF=\"index.php?top=$Top&row=$rowStart&vt=$viewType&st=d\">Distribution</A></TH>";
}
- if ( $viewType == 'o' ) {
- if ( $sortType == 'o' ) {
- echo "<TH ALIGN=\"left\">OES Distribution</TH>";
- } else {
- echo "<TH ALIGN=\"left\"><A
HREF=\"index.php?top=$Top&row=$rowStart&vt=$viewType&st=o\">OES
Distribution</A></TH>";
- }
- }
if ( $sortType == 'a' ) {
echo "<TH ALIGN=\"left\">Arch</TH>";
} else {
@@ -304,13 +286,6 @@
echo "<TD><A HREF=\"reportfull.php?aid=$ArchiveID\"
TARGET=\"$ServerName\" TITLE=\"SCA Report for $ServerName\">$ReportDate
$ReportTime</A></TD>";
echo "<TD>$ArchiveDate $ArchiveTime</TD>";
echo "<TD>$Distro SP$DistroSP</TD>";
- if ( $viewType == 'o' ) {
- if ( strlen($OESDistro) > 0 ) {
- echo "<TD>$OESDistro SP$OESDistroSP</TD>";
- } else {
- echo "<TD></TD>";
- }
- }
echo "<TD>$Architecture</TD>";
echo "<TD>$PatternsCritical</TD>";
echo "<TD>$PatternsWarning</TD>";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3/websca/reportfull.php
new/sca-appliance-broker-1.3.1/websca/reportfull.php
--- old/sca-appliance-broker-1.3/websca/reportfull.php 2017-07-07
18:13:37.037798723 +0200
+++ new/sca-appliance-broker-1.3.1/websca/reportfull.php 2021-03-12
23:48:08.550542689 +0100
@@ -1,4 +1,4 @@
-<?PHP //echo "<!-- Modified: Date = 2015 Jan 29 -->\n";
+<?PHP //echo "<!-- Modified: Date = 2021 Mar 12 -->\n";
$sver = '1.0.20br';
include 'checklogin.php';
ini_set('include_path', '/srv/www/htdocs/sca/');
@@ -252,15 +252,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-broker-1.3/websca/sca-config.php
new/sca-appliance-broker-1.3.1/websca/sca-config.php
--- old/sca-appliance-broker-1.3/websca/sca-config.php 2017-07-07
18:13:37.037798723 +0200
+++ new/sca-appliance-broker-1.3.1/websca/sca-config.php 2021-03-12
23:49:03.157049560 +0100
@@ -1,5 +1,5 @@
<?PHP
- //echo "<!-- Modified: Date = 2014 May 07 -->\n";
+ //echo "<!-- Modified: Date = 2021 Mar 12 -->\n";
$DB_USER = 'sdbroker';
$DB_PASS = "${DB_USER}_password";
$DB_NAME = 'ServerDiagnostics';
@@ -7,7 +7,7 @@
$ResourceRefresh = 300;
$StatsRefresh = 15;
$StatusRefresh = 2;
- $SRView = 0; // 0=NCC, 1=Novell
+ $SRView = 0; // 0=SCC, 1=None
//echo "<!-- Config: User = $DB_USER -->\n";
//echo "<!-- Config: Database = $DB_NAME -->\n";
