diff --git a/SOURCES/sassist-7256a6a35.patch b/SOURCES/sassist-7256a6a35.patch new file mode 100644 index 0000000..6496a4e --- /dev/null +++ b/SOURCES/sassist-7256a6a35.patch @@ -0,0 +1,22 @@ +commit 7256a6a35eeefd0ca6992eabd6283aadc7dfd4eb +Author: Charles Rose +Date: Mon Feb 18 16:34:16 2019 -0500 + + script: zip fails with sockets + + zip fails when archive contains socket files. sosreport removes + them anyway. If sosreport supported 'zip' compression, this would + have not been an issue. + +diff --git a/src/sassist.sh b/src/sassist.sh +index be07d0e..49fb65c 100755 +--- a/src/sassist.sh ++++ b/src/sassist.sh +@@ -67,6 +67,7 @@ do_sosreport() + --tmp-dir ${TMP_DIR} --build --quiet \ + --name ${SVCTAG} || return 1 + ++ find ${TMP_DIR} -type s -exec rm -f '{}' \; + $(cd ${TMP_DIR}/sosreport-* && zip -y -q -r ${OUTFILE_F} . ) + } + diff --git a/SPECS/sassist.spec b/SPECS/sassist.spec index 4ad62c9..45c9732 100644 --- a/SPECS/sassist.spec +++ b/SPECS/sassist.spec @@ -1,12 +1,14 @@ Name: sassist Version: 0.8.5 -Release: 1%{?dist} +Release: 1.3%{?dist} Summary: Dell SupportAssist log collector License: MIT URL: http://www.dell.com/en-us/work/learn/supportassist Source0: https://github.com/dell/sassist/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: sassist-7256a6a35.patch + BuildRequires: systemd %if 0%{?suse_version} @@ -25,6 +27,7 @@ Dell SupportAssist log collector for Linux. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build @@ -54,6 +57,12 @@ install -p -m644 src/systemd/run-media-iDRAC_NATOSC.mount %{buildroot}%{_unitdir %systemd_postun_with_restart sassist.service %changelog +* Thu Apr 11 2019 Neil Horman - 0.8.5.1-1.3 +- release bump to tag this properly + +* Thu Apr 11 2019 Neil Horman - 0.8.5.1-1.1 +- Fix zstream socket file bug (bz 1692451) + * Thu Nov 01 2018 Charles Rose - 0.8.5-1 - Retain all content in zip file. Created Makefile.