From bdf52921bda5ef60b289b8366302ef3226971006 Mon Sep 17 00:00:00 2001 From: Navid Sheikhol-Eslami Date: Thu, 13 Dec 2007 10:37:05 +0000 Subject: [PATCH] *** empty log message *** --- .cvsignore | 2 +- rhsupport.pub | Bin 0 -> 925 bytes sos.spec | 154 +++++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 4 files changed, 147 insertions(+), 11 deletions(-) create mode 100644 rhsupport.pub diff --git a/.cvsignore b/.cvsignore index c8fd733..eb8ac04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sos-1.6.tar.gz +sos-1.8.tar.gz diff --git a/rhsupport.pub b/rhsupport.pub new file mode 100644 index 0000000000000000000000000000000000000000..e16079dbcb9eb8c0ecda950a14213369f9201ce7 GIT binary patch literal 925 zcmV;O17iG{0ipy)1{A~*1OS;09#TTRP^~)4m;fNXHZyFf^n;D6;g(@bl(7=tXHU#R-J^q za}(XSCTFD3FA`wQ1O7R5ncrkgf65oi5$b6Ul}X4Kod(=RS-_Z+Sqp_LTWgTc9q2sU zN1r*_xBRLW7TkVJVIS%gvbL5H%xIT{!=Calwk5!RwDNJEF&#QqSw(usp;nLBBpMC1 z9`z6}R%q*j63UNbtmteewXblYbSKi%xLAgQAFfL}BMo({td;}+SA;L?Ky^cc85uMN zZ4%8GN9O;ljo&2YA4hrOXJa@sr8O%Xb|O(;XubJMghOLDQyCIU{a=kOhuLK{qrbka zwf>0w_nflSB)wz=P1~D2m&XG7637y2;GVg8^%tH*>t5oGi zc)}(6TCkomKHo{Xv^i2`WFSakbRbi8aBy#ObRZ~GZ&M&eZewzJaCB*JZXio#c_|<~ zb9HcVZ*p`%a%E&_VRSBIZ*4w^U<4Bp0stTd0!IcE!~z>51`7!Y2Ll2G6#@tY1Qr4V z0RkQY0vCV)3JDNJ!*r@qUI1fQzyO>Nvlro?&7TIKP)*1%*u~P|yteQFoD5>BU2h$u zr2#>G;fWpj1{73gm|5WRH!MXyl>eR zx$e;9^?(bs<35mI?N|OBQr14;O5;_;JI^%@5IX?tYyQEUjpFd#>OP#{l`p9-6;}W? zF@e>IwSTeKad@ZF5bOr?HVpJFd>JFUeXMyp)X;>E=t7MD4fgrFx1*xep(e9fBxCSZK#;+9>71jnUmncy$}68&1F zwY$#m_NyTEze~*#kMKii1iKLO8h57hLqUCIrXrWPaP+8^XDuz{CEJYQ@nxjel88wJ7!d*h2?YX21{A~s8w>yn2@plYbgEHa z0AplT0HBJz4T)gpa*Cv5WgGkjfC`d7R0#l}gO)H{`#tO9!wqQT*^s=TW1@>qxC^3l literal 0 HcmV?d00001 diff --git a/sos.spec b/sos.spec index 0ebd816..c579ec1 100644 --- a/sos.spec +++ b/sos.spec @@ -1,25 +1,30 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define name sos -%define version 1.6 -%define release 5 -%define topdir build/rpm-%{name}-%{version} +%define version 1.8 +%define release 0 + +%define _localedir %_datadir/locale Summary: A set of tools to gather troubleshooting information from a system Name: %{name} Version: %{version} Release: %{release}%{?dist} +Group: Application/Tools # The source for this package was pulled from upstream's svn. Use the # following commands to generate the tarball: -# svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-6 sos-1.6 -# tar -czvf sos-1.6.tar.gz sos-1.6 +# svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-7 sos-1.7 +# tar -czvf sos-1.7.tar.gz sos-1.7 Source0: %{name}-%{version}.tar.gz +Source1: rhsupport.pub License: GPL -Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -Url: http://sos.108.redhat.com/ +Url: https://hosted.fedoraproject.org/projects/sos BuildRequires: python-devel +Requires: libxml2-python +Provides: sysreport = 1.4.3-13 +Obsoletes: sysreport %description Sos is a set of tools that gathers information about system @@ -35,7 +40,9 @@ python setup.py build %install rm -rf ${RPM_BUILD_ROOT} +install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT +ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport %clean rm -rf ${RPM_BUILD_ROOT} @@ -43,11 +50,140 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %{_sbindir}/sosreport +/usr/share/sos/rhsupport.pub +/usr/bin/rh-upload-core +/usr/sbin/sysreport +/usr/sbin/sysreport.legacy +/usr/share/sysreport %{python_sitelib}/sos/ %{_mandir}/man1/sosreport.1* -%doc README TODO LICENSE ChangeLog +%{_localedir}/*/LC_MESSAGES/sos.mo +%doc README README.rh-upload-core TODO LICENSE ChangeLog +%config /etc/sos.conf %changelog +* Wed Nov 21 2007 Navid Sheikhol-Eslami - 1.8-0 +- Resolves: bz368261 sosGetCommandOutput() does not block on hung processes +- Resolves: bz361861 work-around missing traceback.format_exc() in RHEL4 +- Resolves: bz394781 device-mapper: use /sbin/lvm_dump to collect dm related info +- Resolves: bz386691 unattended --batch option +- Resolves: bz371251 sos could hang when accessing /sys/hypervisor/uuid +- selinux: always collect sestatus +- added many languages +- added --debug option which causes exceptions not to be trapped +- updated to sysreport-1.4.3-13.el5 +- ftp upload to dropbox with --upload +- cluster: major rewrite to support different versions of RHEL +- cluster: check rg_test for errors +- minor changes in various plug-ins (yum, networking, process, kernel) +- fixed some exceptions in threads which were not properly trapped +- veritas: don't run rpm -qa every time +- using rpm's python bindings instead of external binary +- corrected autofs and ldap plugin that were failing when debug option was not found in config file. +- implemented built-in checkdebug() that uses self.files and self.packages to make the decision +- missing binaries are properly detected now. +- better doExitCode handling +- fixed problem with rpm module intercepting SIGINT +- error when user specifies an invalid plugin or plugin option +- named: fixed indentation +- replaced isOptionEnabled() with getOption() +- tune2fs and fdisk were not always run against the correct devices/mountpoint +- added gpg key to package +- updated README with new svn repo and contributors +- updated manpage +- better signal handling +- caching of rpm -q outputs +- report filename includes rhnUsername if available +- report encryption via gpg and support pubkey +- autofs: removed redundant files +- filesys: better handling of removable devices +- added sosReadFile() returns a file's contents +- return after looping inside a directory +- collect udevinfo for each block device +- simply collect output of fdisk -l in one go +- handle sysreport invocation properly (warn if shell is interactive, otherwise spawn sysreport.legacy) +- progress bar don't show 100% until finished() is called +- Resolves: bz238778 added lspci -t +- now runs on RHEL3 as well (python 2.2) +- replaced commonPrefix() with faster code +- filesys: one fdisk -l for all +- selinux: collect fixfilex check output +- devicemapper: collect udevinfo for all block devices +- cluster: validate node names according to RFC 2181 +- systemtap: cleaned up and added checkenabled() method +- added kdump plugin +- added collection of /etc/inittab +- Resolves: bz332151 apply regex to case number in sysreport for RHEL4 +- Resolves: bz332211 apply regex to case number in sysreport for RHEL5 +- Resolves: bz400111 sos incorrectly reports cluster data in SMP machine + +* Wed Aug 13 2007 Navid Sheikhol-Eslami - 1.7-8 +- added README.rh-upload-core + +* Mon Aug 13 2007 Navid Sheikhol-Eslami - 1.7-7 +- Resolves: bz251927 SOS errata needs to be respin to match 4.6 code base +- added extras/rh-upload-core script from David Mair + +* Mon Aug 9 2007 Navid Sheikhol-Eslami - 1.7-6 +- more language fixes +- added arabic, italian and french +- package prepared for release +- included sysreport as sysreport.legacy + +* Mon Aug 9 2007 Navid Sheikhol-Eslami - 1.7-5 +- package obsoletes sysreport and creates a link pointing to sosreport +- added some commands in cluster and process plugins +- fixed html output (wrong links to cmds, thanks streeter) +- process: back down sleep if D state doesn't change +- Resolves: bz241277 Yum Plugin for sos +- Resolves: bz247520 Spelling mistake in sosreport output +- Resolves: bz247531 Feature: plugin to gather initial ramdisk scripts +- Resolves: bz248252 sos to support language localization +- Resolves: bz241282 Make SOS for RHEL 4 + +* Mon Aug 1 2007 Navid Sheikhol-Eslami - 1.7-4 +- catch KeyboardInterrupt when entering sosreport name +- added color output for increased readability +- list was sorted twice, removing latter .sort() + +* Mon Jul 31 2007 Navid Sheikhol-Eslami - 1.7-3 +- added preliminary problem diagnosis support +- better i18n initialization +- better user messages +- more progressbar fixes +- catch and log python exceptions in report +- use python native commands to create symlinks +- limit concurrent running threads + +* Mon Jul 28 2007 Navid Sheikhol-Eslami - 1.7-2 +- initial language localization support +- added italian translation + +* Mon Jul 16 2007 Navid Sheikhol-Eslami - 1.7-1 +- split up command outputs in sub-directories (sos_command/plugin/command instead of sos_command/plugin.command) +- fixed doExitCode() calling thread.wait() instead of join() +- curses menu is disabled by default +- multithreading is enabled by default +- major progressbar changes (now has ETA) +- multithreading fixes +- plugins class descriptions shortened to fix better in --list-plugins +- rpm -Va in plugins/rpm.py sets eta_weight to 200 (plugin 200 longer than other plugins, for ETA calculation) +- beautified command output filenames in makeCommandFilename() + +* Mon Jul 12 2007 Navid Sheikhol-Eslami - 1.7-0 +- curses menu disabled by default (enable with -c) +- sosreport output friendlier to the user (and similar to sysreport) +- smarter plugin listing which also shows options and disable/enabled plugins +- require root permissions only for actual sosreport generation +- fix in -k where option value was treated as string instead of int +- made progressbar wider (60 chars) +- selinux plugin is enabled only if selinux is also enabled on the system +- made some errors less verbose to the user +- made sosreport not copy files pointed by symbolic links (same as sysreport, we don't need /usr/bin/X or /sbin/ifup) +- copy links as links (cp -P) +- added plugin get_description() that returns a short decription for the plugin +- guess sosreport name from system's name + * Mon Jul 5 2007 Navid Sheikhol-Eslami - 1.6-5 - Yet more fixes to make package Fedora compliant. @@ -64,7 +200,7 @@ rm -rf ${RPM_BUILD_ROOT} - Beautified output of --list-plugins. - GPL licence is now included in the package. - added python-devel requirement for building package -- fixed incompatibility with python from RHEL4 +- Resolves: bz241282 fixed incompatibility with python from RHEL4 * Fri May 25 2007 Steve Conklin - 1.5-1 - Bumped version diff --git a/sources b/sources index 6e5edcb..7007522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb195dd86f020159eb1da86cf48bb3f2 sos-1.6.tar.gz +fc839be48e8eb5b294e3c64cf0b8e65e sos-1.8.tar.gz