From ae9bcb01fabb088ffa4a70c3373b14e500ae31a5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 22 2019 23:10:56 +0000 Subject: import sassist-0.8.5-2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd22f3a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/sassist-0.8.5.tar.gz diff --git a/.sassist.metadata b/.sassist.metadata new file mode 100644 index 0000000..f85fab3 --- /dev/null +++ b/.sassist.metadata @@ -0,0 +1 @@ +4991908bcdb0ba48fff7371748f846f280c3c6a8 SOURCES/sassist-0.8.5.tar.gz 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 new file mode 100644 index 0000000..80190e8 --- /dev/null +++ b/SPECS/sassist.spec @@ -0,0 +1,88 @@ +Name: sassist +Version: 0.8.5 +Release: 2%{?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 + +Patch0: sassist-7256a6a35.patch + +BuildRequires: systemd + +%if 0%{?suse_version} +Requires: supportutils +%else +Requires: sos +%endif +Requires: freeipmi +Requires: zip + +BuildArch: noarch +%{?systemd_requires} + +%description +Dell SupportAssist log collector for Linux. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 + +%build + +%install +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_unitdir} + +install -p -m755 src/sassist.sh %{buildroot}%{_bindir} +install -p -m644 src/systemd/sassist.service %{buildroot}%{_unitdir} +install -p -m644 src/systemd/sassist-collect.service %{buildroot}%{_unitdir} +install -p -m644 src/systemd/run-media-iDRAC_NATOSC.mount %{buildroot}%{_unitdir} + +%files +%license COPYING +%{_bindir}/sassist.sh +%{_unitdir}/sassist.service +%{_unitdir}/sassist-collect.service +%{_unitdir}/run-media-iDRAC_NATOSC.mount + +%post +%systemd_post sassist.service + +%preun +%systemd_preun sassist.service + +%postun +%systemd_postun_with_restart sassist.service + +%changelog +* Fri May 24 2019 Neil Horman - 0.8.5-2 +- Fix failure on socket files (bz 1712451) + +* Thu Nov 01 2018 Charles Rose - 0.8.5-1 +- Retain all content in zip file. Created Makefile. + +* Fri Oct 19 2018 Charles Rose - 0.8.4-1 +- PrivateTmp, better error handling, sos plugin changes + +* Fri Aug 24 2018 Charles Rose - 0.8.3-1 +- move mount point, enable all sos plugins, some cleanup + +* Mon Jun 18 2018 Charles Rose - 0.8.2-1 +- incorporate spec file suggestions from Robert-André Mauchin + +* Thu Jun 14 2018 Charles Rose - 0.8.2 +- guess paths for log collectors. fix error handling. + +* Thu Jun 14 2018 Charles Rose - 0.8.1 +- add dependency on zip. fix temp dir creation bug + +* Mon Apr 02 2018 Charles Rose - 0.8.0 +- add support for supportconfig + +* Mon Apr 02 2018 Charles Rose - 0.7.1 +- support multi-distro + +* Mon Aug 28 2017 Charles Rose - 0.7.0-1 +- first RPM release