diff -Nru sosreport-3.9/debian/changelog sosreport-3.9/debian/changelog --- sosreport-3.9/debian/changelog 2020-03-25 02:40:21.000000000 +0000 +++ sosreport-3.9/debian/changelog 2020-04-29 14:04:05.000000000 +0000 @@ -1,3 +1,20 @@ +sosreport (3.9-1ubuntu0.18.04.3) bionic; urgency=medium + + * d/p/0003-lshw-command.patch: (LP: #1871494) + - Add `lshw` command to hardware plugin + + [Eric Desrochers] + * d/p/0004-lds-substitute-oidc-conf.patch: + - landscape substitute oidc conf + in service file (LP: #1874526) + + [Eric Desrochers] + * d/tests/{control,simple.sh}: (LP: #1865212) + - Add testsuite "simple.sh". A port of the travis tests to bash + provided by upstream. + + -- Heather Lemon Wed, 29 Apr 2020 14:04:05 +0000 + sosreport (3.9-1ubuntu0.18.04.2) bionic; urgency=medium * d/p/002-lxd-drop-db-collection-and-introduce-lxd-buginfo.patch diff -Nru sosreport-3.9/debian/patches/0003-lshw-command.patch sosreport-3.9/debian/patches/0003-lshw-command.patch --- sosreport-3.9/debian/patches/0003-lshw-command.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.9/debian/patches/0003-lshw-command.patch 2020-04-29 14:02:48.000000000 +0000 @@ -0,0 +1,25 @@ +From 2dd5cd45a8381fa36ea99c85b526f9d79e526d91 Mon Sep 17 00:00:00 2001 +From: Jose Castillo +Date: Wed, 1 Apr 2020 18:50:57 +0200 +Subject: [hardware] Add output of lshw + This plugin adds the output of the command + lshw, and its output complements what we + already collect with dmidecode. + +Signed-off-by: Jose Castillo +Origin: upstream, https://github.com/sosreport/sos/commit/2dd5cd45a8381fa36ea99c85b526f9d79e526d91 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1871494 +--- + sos/plugins/hardware.py | 1 + + 1 file changed, 1 insertion(+) + +--- a/sos/plugins/hardware.py ++++ b/sos/plugins/hardware.py +@@ -29,6 +29,7 @@ + ]) + + self.add_cmd_output("dmidecode", root_symlink="dmidecode") ++ self.add_cmd_output("lshw") + + + # vim: set et ts=4 sw=4 : diff -Nru sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch --- sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.9/debian/patches/0004-lds-substitute-oidc-conf.patch 2020-04-29 14:02:48.000000000 +0000 @@ -0,0 +1,55 @@ +Description: [landscape] Substitute oidc conf in service file + Substitute sensitive informations about oidc + found in landscape service configuration file. + + From release 19.10, Landscape can use OpenID-Connect + (OIDC) to authenticate users. To enable OpenID-Connect + support, please add oidc-issuer, oidc-client-id and + oidc-client-secret to /etc/landscape/service.conf in + the [landscape] section. + + Reference: + https://docs.ubuntu.com/landscape/en/onprem-auth#openid-connect-support + + Resolves: #2023 +Author: Eric Desrochers +Origin: upstream, https://github.com/sosreport/sos/pull/2025/commits/0c4d821e26e1206a0b99f427b572931ba2fd9bb5 +Bug: https://github.com/sosreport/sos/issues/2023 +Bug-Ubuntu: https://launchpad.net/bugs/1874526 +Index: sosreport-3.9/sos/plugins/landscape.py +=================================================================== +--- sosreport-3.9.orig/sos/plugins/landscape.py ++++ sosreport-3.9/sos/plugins/landscape.py +@@ -57,6 +57,16 @@ class Landscape(Plugin, UbuntuPlugin): + r"secret-token = [********]" + ) + self.do_file_sub( ++ "/etc/landscape/service.conf", ++ r"oidc-client-secret = (.*)", ++ r"oidc-client-secret = [********]" ++ ) ++ self.do_file_sub( ++ "/etc/landscape/service.conf", ++ r"oidc-client-id = (.*)", ++ r"oidc-client-id = [********]" ++ ) ++ self.do_file_sub( + "/etc/landscape/service.conf.old", + r"password = (.*)", + r"password = [********]" +@@ -71,5 +81,15 @@ class Landscape(Plugin, UbuntuPlugin): + r"secret-token = (.*)", + r"secret-token = [********]" + ) ++ self.do_file_sub( ++ "/etc/landscape/service.conf.old", ++ r"oidc-client-secret = (.*)", ++ r"oidc-client-secret = [********]" ++ ) ++ self.do_file_sub( ++ "/etc/landscape/service.conf.old", ++ r"oidc-client-id = (.*)", ++ r"oidc-client-id = [********]" ++ ) + + # vim: set et ts=4 sw=4 : diff -Nru sosreport-3.9/debian/patches/series sosreport-3.9/debian/patches/series --- sosreport-3.9/debian/patches/series 2020-03-25 02:40:21.000000000 +0000 +++ sosreport-3.9/debian/patches/series 2020-04-29 14:02:48.000000000 +0000 @@ -1,2 +1,4 @@ 0001-unittest-py3-fix.patch 002-lxd-drop-db-collection-and-introduce-lxd-buginfo.patch +0003-lshw-command.patch +0004-lds-substitute-oidc-conf.patch diff -Nru sosreport-3.9/debian/tests/control sosreport-3.9/debian/tests/control --- sosreport-3.9/debian/tests/control 2020-02-16 01:34:34.000000000 +0000 +++ sosreport-3.9/debian/tests/control 2020-04-29 14:02:48.000000000 +0000 @@ -5,3 +5,7 @@ Tests: sos-run.py Depends: sosreport Restrictions: needs-root, allow-stderr + +Tests: simple.sh +Depends: sosreport +Restrictions: needs-root, allow-stderr diff -Nru sosreport-3.9/debian/tests/simple.sh sosreport-3.9/debian/tests/simple.sh --- sosreport-3.9/debian/tests/simple.sh 1970-01-01 00:00:00.000000000 +0000 +++ sosreport-3.9/debian/tests/simple.sh 2020-04-29 14:02:48.000000000 +0000 @@ -0,0 +1,110 @@ +# This file is part of the sos project: https://github.com/sosreport/sos +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions of +# version 2 of the GNU General Public License. +# +# See the LICENSE file in the source distribution for further information. +#/bin/bash +# A quick port of the travis tests to bash, requires root +# TODO +# * look into using a framework.. +# * why --dry-run fails? +# * why --experimental fails? +# * make it better validate archives and contents + +PYTHON=${1:-/usr/bin/python3} +SOSPATH=${2:-./sosreport} + +NUMOFFAILURES=0 + +run_expecting_sucess () { + #$1 - is command options + #$2 - kind of check to do, so far only extract + FAIL=false + # Make sure clean + rm -f stderr stdout /tmp/sosreport*.tar.* + rm -rf /tmp/sosreport_test/ + + echo "######### RUNNING $1 #########" + $PYTHON $SOSPATH $1 2> stderr 1> stdout + + if [ $? -eq 0 ]; then + echo "### Success" + else + echo "!!! FAILED !!!" + FAIL=true + fi + + if [ -s stderr ]; then + FAIL=true + echo "!!! FAILED !!!" + echo "### start stderr" + cat stderr + echo "### end stderr" + fi + + echo "### start stdout" + cat stdout + echo "### end stdout" + + if [ "extract" = "$2" ]; then + echo "### start extraction" + rm -f /tmp/sosreport*md5 + mkdir /tmp/sosreport_test/ + tar xfa /tmp/sosreport*.tar* -C /tmp/sosreport_test --strip-components=1 + if [ -s /tmp/sosreport_test/sos_logs/*errors.txt ]; then + FAIL=true + echo "!!! FAILED !!!" + echo "#### *errors.txt output" + ls -alh /tmp/sosreport_test/sos_logs/ + cat /tmp/sosreport_test/sos_logs/*errors.txt + fi + echo "### stop extraction" + fi + + echo "######### DONE WITH $1 #########" + + if $FAIL; then + NUMOFFAILURES=$(($NUMOFFAILURES + 1)) + return 1 + else + return 0 + fi +} + +# If /etc/sos.conf doesn't exist let's just make it.. +if [ -f /etc/sos.conf ]; then + echo "/etc/sos.conf already exists" +else + echo "Creating /etc/sos.conf" + touch /etc/sos.conf +fi + +# Runs not generating sosreports +run_expecting_sucess " -l" +run_expecting_sucess " --list-presets" +run_expecting_sucess " --list-profiles" + +# Test generating sosreports, 3 (new) options at a time +# Trying to do --batch (1 label/archive/report/verbosity change) (other changes) +run_expecting_sucess " --batch --build --no-env-vars " # Only --build test +run_expecting_sucess " --batch --no-report -o hardware " extract +run_expecting_sucess " --batch --label TEST -a -c never" extract +run_expecting_sucess " --batch --debug --log-size 0 -c always" extract +run_expecting_sucess " --batch -z xz --log-size 1" extract +run_expecting_sucess " --batch -z gzip" extract +run_expecting_sucess " --batch -z bzip2 -t 1 -n hardware" extract +run_expecting_sucess " --batch --quiet -e opencl -k kernel.with-timer" extract +run_expecting_sucess " --batch --case-id 10101 --all-logs --since=20191007" extract +run_expecting_sucess " --batch --verbose --no-postproc" extract + +if [ $NUMOFFAILURES -gt 0 ]; then + echo "FAILED $NUMOFFAILURES" + exit 1 +else + echo "Everything worked!" + exit 0 +fi + +# vim: set et ts=4 sw=4 :