Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sca-patterns-base for openSUSE:Factory checked in at 2023-09-01 14:19:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sca-patterns-base (Old) and /work/SRC/openSUSE:Factory/.sca-patterns-base.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sca-patterns-base" Fri Sep 1 14:19:32 2023 rev:10 rq:1108321 version:1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sca-patterns-base/sca-patterns-base.changes 2022-10-28 19:30:46.167004166 +0200 +++ /work/SRC/openSUSE:Factory/.sca-patterns-base.new.1766/sca-patterns-base.changes 2023-09-01 14:20:19.362613033 +0200 @@ -1,0 +2,10 @@ +Thu Aug 31 16:05:05 UTC 2023 - jason.record@suse.com + +- Changes to version 1.5.2 + + Fixed SUSE.getRpmInfo to find the correct rpm.txt section (bsc#1210908) + + Changes to python/SUSE.py version 1.0.1 + - Changed name from getScInfo to getSCInfo + - Fixed getSCInfo error on basic-environment.txt (bsc#1205826) + - Updated SLES version constants + +------------------------------------------------------------------- Old: ---- sca-patterns-base-1.5.1.tar.gz New: ---- sca-patterns-base-1.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sca-patterns-base.spec ++++++ --- /var/tmp/diff_new_pack.dpRAa3/_old 2023-09-01 14:20:20.306646726 +0200 +++ /var/tmp/diff_new_pack.dpRAa3/_new 2023-09-01 14:20:20.310646868 +0200 @@ -1,7 +1,7 @@ # # spec file for package sca-patterns-base # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define patgrp root Name: sca-patterns-base -Version: 1.5.1 +Version: 1.5.2 Release: 0 Summary: Supportconfig Analysis Pattern Base Libraries License: GPL-2.0-only ++++++ sca-patterns-base-1.5.1.tar.gz -> sca-patterns-base-1.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.5.1/libraries/bash/SUSE.rc new/sca-patterns-base-1.5.2/libraries/bash/SUSE.rc --- old/sca-patterns-base-1.5.1/libraries/bash/SUSE.rc 2021-08-16 23:18:14.137905168 +0200 +++ new/sca-patterns-base-1.5.2/libraries/bash/SUSE.rc 2023-08-17 00:37:35.315177939 +0200 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (C) 2014-2021 SUSE LINUX Products GmbH +# Copyright (C) 2014-2023 SUSE LINUX Products GmbH ############################################################################## # # This program is free software; you can redistribute it and/or modify @@ -17,11 +17,11 @@ # Authors/Contributors: # Jason Record <jason.record@suse.com> # -# Last Modified Date: 2021 Aug 16 +# Last Modified Date: 2023 Jun 06 # ############################################################################## # Library: SUSE.rc -# Version: 0.1.6 +# Version: 0.1.7 # Requires: Core.rc # Description: Provides global variables for SLE kernel versions and base # information functions. @@ -77,7 +77,7 @@ declare -r SLE15SP1='4.12.14-195.1' declare -r SLE15SP2='5.3.18-22.2' declare -r SLE15SP3='5.3.18-57.3' -declare -r SLE15SP4='5.994' #Update to actual version when/if applicable +declare -r SLE15SP4='5.14.21-150400.22.1' declare -r SLE15SP5='5.995' #Update to actual version when/if applicable @@ -179,7 +179,7 @@ printDebug '> getRpmInfo' "$RPM_INFO_NAME" local TMP='' - getSection 'rpm.txt' '{NAME}' 1 + getSection 'rpm.txt' '[0-9]{DISTRIBUTION}' 1 LINE=$(echo "$CONTENT" | egrep "^${RPM_INFO_NAME}[[:space:]]") RPM_INFO_COUNT=$(echo "$LINE" | wc -l) if (( RPM_INFO_COUNT > 1 )) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.5.1/libraries/perl/SDP/SUSE.pm new/sca-patterns-base-1.5.2/libraries/perl/SDP/SUSE.pm --- old/sca-patterns-base-1.5.1/libraries/perl/SDP/SUSE.pm 2021-08-16 23:18:15.753865110 +0200 +++ new/sca-patterns-base-1.5.2/libraries/perl/SDP/SUSE.pm 2023-08-17 00:37:35.315177939 +0200 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (C) 2014-2021 SUSE LINUX Products GmbH +# Copyright (C) 2014-2023 SUSE LINUX Products GmbH ############################################################################## # # This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ # # Authors/Contributors: # Jason Record <jason.record@suse.com> -# Modified: 2021 Aug 16 +# Modified: 2023 Jun 06 # # ############################################################################## @@ -92,7 +92,7 @@ use constant SLE15SP1 => '4.12.14-195.1'; use constant SLE15SP2 => '5.3.18-22.2'; use constant SLE15SP3 => '5.3.18-57.3'; -use constant SLE15SP4 => '5.994'; #Update to actual version when/if applicable +use constant SLE15SP4 => '5.14.21-150400.22.1'; use constant SLE15SP5 => '5.995'; #Update to actual version when/if applicable @@ -1640,7 +1640,7 @@ # get vendor and version my $HEADER_LINES = 2; my @CONTENT = (); - my $SECTION = '{NAME}'; + my $SECTION = '[0-9]{DISTRIBUTION}'; my $LINE = 0; if ( SDP::Core::getSection($FILE_OPEN, $SECTION, \@CONTENT) ) { foreach $_ (@CONTENT) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sca-patterns-base-1.5.1/libraries/python/SUSE.py new/sca-patterns-base-1.5.2/libraries/python/SUSE.py --- old/sca-patterns-base-1.5.1/libraries/python/SUSE.py 2022-10-26 21:13:42.551899311 +0200 +++ new/sca-patterns-base-1.5.2/libraries/python/SUSE.py 2023-08-17 00:37:35.315177939 +0200 @@ -4,7 +4,7 @@ Library of functions for creating python patterns specific to SUSE """ ############################################################################## -# Copyright (C) 2013-2022 SUSE LLC +# Copyright (C) 2013-2023 SUSE LLC ############################################################################## # # This program is free software; you can redistribute it and/or modify @@ -23,7 +23,8 @@ # Jason Record (jason.record@suse.com) # David Hamner (ke7oxh@gmail.com) # -# Modified: 2022 Oct 26 +# Modified: 2023 Jun 06 +# Version: 1.0.2 # ############################################################################## @@ -54,7 +55,6 @@ SLE11SP2 = '3.0.13-0.27' SLE11SP3 = '3.0.76-0.11.1' SLE11SP4 = '3.0.101-0.63.1' -SLE11SP5 = '3.1' #Update to actual version when/if applicable SLE12GA = '3.12.28-4' SLE12SP0 = '3.12.28-4' SLE12SP1 = '3.12.49-11.1' @@ -67,10 +67,9 @@ SLE15SP1 = '4.12.14-195.1' SLE15SP2 = '5.3.18-22.2' SLE15SP3 = '5.3.18-57.3' -SLE15SP4 = '5.994' #Update to actual version when/if applicable +SLE15SP4 = '5.14.21-150400.22.1' SLE15SP5 = '5.995' #Update to actual version when/if applicable - def packageInstalled(PackageName): """ The PackageName is installed on the server @@ -113,7 +112,7 @@ """ rpmInfo = {} fileOpen = "rpm.txt" - section = "{NAME}" + section = "[0-9]{DISTRIBUTION}" content = {} tmpContent = {} #get name version and vendor @@ -710,7 +709,7 @@ return SERVER_DICTIONARY -def getScInfo(): +def getSCInfo(): """ Gets information about the supportconfig archive itself @@ -746,12 +745,11 @@ scInfo['cmdline'] = content[line].split(':')[-1].strip() elif "Using Options" in content[line]: scInfo['config'] = content[line].split(':')[-1].strip() - supportFile = open(Core.path + "basic-environment.txt", 'r') + supportFile = open(Core.path + "/basic-environment.txt", 'r') supportFile.readline() supportFile.readline() scInfo['version'] = supportFile.readline().split(':')[-1].strip() scInfo['scriptDate'] = supportFile.readline().split(':')[-1].strip() -# print "getScInfo: scInfo = " + str(scInfo) return scInfo def securityAnnouncementPackageCheck(NAME, MAIN, LTSS, SEVERITY, TAG, PACKAGES):