[sos] New upstream release
Bryn Reeves
bmr at fedoraproject.org
Mon Jun 10 18:06:58 UTC 2013
commit 2ba3b08fa5d92b4657b02602da9b0b75fd66bb9e
Author: Bryn M. Reeves <bmr at redhat.com>
Date: Mon Jun 10 18:41:50 2013 +0100
New upstream release
Add sos-3.0.tar.gz to sources and lookaside cache
Update spec file for 3.0 changes
.gitignore | 1 +
sos-2.2-bz704383-fix-lvm-data-collection.patch | 22 --
....2-bz709491-add-vmmemctl-to-vmware-plugin.patch | 18 -
sos-bz582259.patch | 34 --
sos-bz584253.patch | 47 ---
sos-bz585942.patch | 59 ----
sos-bz600813-collect-repolist-by-default.patch | 27 --
sos-bz622407-cluster-el6-fixes.patch | 351 --------------------
sos-bz622527-add-anacrontab.patch | 10 -
sos-bz622528-redhat-release-6-fixes.patch | 20 --
sos-bz622784-filesys-no-print-regex-debug.patch | 11 -
sos-bz622784-parted-dumpe2fs-s390.patch | 31 --
sos-bz624162-add-sssd.patch | 33 --
sos-bz659467-startup-drop-LC_ALL.patch | 12 -
sos-bz673244-add-infiniband-plugin.patch | 36 --
sos-bz675559-devicemapper-collect-ls-tree.patch | 11 -
sos-bz676522-collect-etc-dhcp.patch | 9 -
sos-bz676656-add-iscsi-target-plugin.patch | 33 --
sos-bz678665-collect-entitlement-certs.patch | 27 --
sos-bz679433-filesys-add-lsblk-output.patch | 11 -
sos-bz682124-add-nslcd-conf-to-ldap-plugin.patch | 23 --
sos-bz683219-truncate-large-files.patch | 26 --
sos-bz683404-fix-autofs-LC_ALL-usage.patch | 12 -
sos-bz689387-use-sha256-in-fips-mode.patch | 82 -----
sos-bz691477-fix-lsusb-and-add-t-and-v.patch | 14 -
sos-bz691477-support-new-usbutils.patch | 29 --
...neral-collect-etc-init-and-fix-whitespace.patch | 30 --
sos-bz697899-collect-brctl-output.patch | 36 --
sos-bz713449-dont-strip-command-output.patch | 12 -
sos-bz714293-collect-etc-rhsm.patch | 11 -
...ipv6-neighbour-table-to-networking-plugin.patch | 11 -
sos-bz726360-qpidd-extend.patch | 52 ---
sos-bz726427-add-ethtool-acg.patch | 13 -
sos-bz729455-collect-basic-cgroups-data.patch | 31 --
sos-bz730641-fix-prox-net.patch | 12 -
sos-bz736718-fix-hardware-plugin-paths.patch | 12 -
sos-bz736718-fix-hardware.py-exec.patch | 12 -
sos-bz739080-collect-stderr.patch | 21 --
sos-bz749262-fix-sat-proxy-package-detection.patch | 39 ---
sos-bz749279-fix-rhn-el6-tomcat.patch | 19 -
sos-bz749919-add-modprobe-dot-d.patch | 11 -
sos-bz750607-forbid-more-pki-paths.patch | 11 -
sos-bz751273-fix-brctl-showstp.patch | 12 -
sos-bz752549-add-gluster-module.patch | 99 ------
sos-bz752549-gluster-forbid-more-pem-paths.patch | 11 -
sos-bz752666-cloudforms-debug.patch | 31 --
sos-bz760424-gather-cpufreq-info.patch | 11 -
sos-bz760995-fence_virt-conf.patch | 11 -
sos-bz766583-allow-nonroot-symlinks.patch | 260 ---------------
sos-bz767827-fix-rpm-qa-for-long-pkg-name.patch | 12 -
...bz771393-improve-report-name-sanitization.patch | 42 ---
...501-fix-rsyslog-collection-and-size-limit.patch | 30 --
sos-bz782339-unbreak-logging.patch | 182 ----------
sos-bz782589-fix-symlink-target-collection.patch | 14 -
sos-bz784061-gluster-sunrpc.patch | 34 --
sos-bz784862-collect-proc-irq.patch | 11 -
sos-bz784874-collect-proc-cgroups.patch | 11 -
sos-bz789096-kernel_realtime.patch | 51 ---
sos-bz790402-obscure-anaconda-ks-passwords.patch | 21 --
sos-bz810702-hw-collect-mcelog.patch | 11 -
sos-bz812395-ipa-updates.patch | 108 ------
sos-bz814474-libvirt-wildcard-logs.patch | 9 -
sos-bz822442-collect-etc-swift-in-gluster.patch | 13 -
sos.spec | 243 ++++++--------
sources | 2 +-
65 files changed, 97 insertions(+), 2454 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21330b1..23ce7a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sos-2.2.tar.gz
+/sos-3.0.tar.gz
diff --git a/sos.spec b/sos.spec
index 0d7fe73..6281395 100644
--- a/sos.spec
+++ b/sos.spec
@@ -2,10 +2,10 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
-Version: 2.2
-Release: 31%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Group: Applications/System
-Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
+Source0: https://people.redhat.com/breeves/sos/releases/sos-3.0.tar.gz
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
@@ -13,75 +13,10 @@ Url: http://fedorahosted.org/sos
BuildRequires: python-devel
BuildRequires: gettext
Requires: libxml2-python
+Requires: rpm-python
Requires: tar
Requires: bzip2
Requires: xz
-Requires: rpm-python
-Provides: sysreport = 1.4.3-13
-Obsoletes: sysreport
-
-Patch0: sos-bz582259.patch
-Patch1: sos-bz584253.patch
-Patch2: sos-bz585942.patch
-Patch3: sos-bz622527-add-anacrontab.patch
-Patch4: sos-bz622528-redhat-release-6-fixes.patch
-Patch5: sos-bz622784-parted-dumpe2fs-s390.patch
-Patch6: sos-bz624162-add-sssd.patch
-Patch7: sos-bz622407-cluster-el6-fixes.patch
-Patch8: sos-bz678665-collect-entitlement-certs.patch
-Patch9: sos-bz659467-startup-drop-LC_ALL.patch
-Patch10: sos-bz676522-collect-etc-dhcp.patch
-Patch11: sos-bz675559-devicemapper-collect-ls-tree.patch
-Patch12: sos-bz679433-filesys-add-lsblk-output.patch
-Patch13: sos-bz622784-filesys-no-print-regex-debug.patch
-Patch14: sos-bz689387-use-sha256-in-fips-mode.patch
-Patch15: sos-bz600813-collect-repolist-by-default.patch
-Patch16: sos-bz673244-add-infiniband-plugin.patch
-patch17: sos-bz676656-add-iscsi-target-plugin.patch
-Patch18: sos-bz682124-add-nslcd-conf-to-ldap-plugin.patch
-Patch19: sos-bz683404-fix-autofs-LC_ALL-usage.patch
-Patch20: sos-bz691477-fix-lsusb-and-add-t-and-v.patch
-Patch21: sos-bz726360-qpidd-extend.patch
-Patch22: sos-bz726427-add-ethtool-acg.patch
-Patch23: sos-2.2-bz704383-fix-lvm-data-collection.patch
-Patch24: sos-2.2-bz709491-add-vmmemctl-to-vmware-plugin.patch
-Patch25: sos-bz694813-general-collect-etc-init-and-fix-whitespace.patch
-Patch26: sos-bz713449-dont-strip-command-output.patch
-Patch27: sos-bz721163-add-ipv6-neighbour-table-to-networking-plugin.patch
-Patch28: sos-bz729455-collect-basic-cgroups-data.patch
-Patch29: sos-bz714293-collect-etc-rhsm.patch
-Patch30: sos-bz683219-truncate-large-files.patch
-Patch31: sos-bz697899-collect-brctl-output.patch
-Patch32: sos-bz736718-fix-hardware-plugin-paths.patch
-Patch33: sos-bz736718-fix-hardware.py-exec.patch
-Patch34: sos-bz691477-support-new-usbutils.patch
-Patch35: sos-bz750607-forbid-more-pki-paths.patch
-Patch36: sos-bz760995-fence_virt-conf.patch
-Patch37: sos-bz730641-fix-prox-net.patch
-Patch38: sos-bz760424-gather-cpufreq-info.patch
-Patch39: sos-bz751273-fix-brctl-showstp.patch
-Patch40: sos-bz749919-add-modprobe-dot-d.patch
-Patch41: sos-bz782589-fix-symlink-target-collection.patch
-Patch42: sos-bz749262-fix-sat-proxy-package-detection.patch
-Patch43: sos-bz739080-collect-stderr.patch
-Patch44: sos-bz784874-collect-proc-cgroups.patch
-Patch45: sos-bz784862-collect-proc-irq.patch
-Patch46: sos-bz767827-fix-rpm-qa-for-long-pkg-name.patch
-Patch47: sos-bz766583-allow-nonroot-symlinks.patch
-Patch48: sos-bz771501-fix-rsyslog-collection-and-size-limit.patch
-Patch49: sos-bz749279-fix-rhn-el6-tomcat.patch
-Patch50: sos-bz790402-obscure-anaconda-ks-passwords.patch
-Patch51: sos-bz784061-gluster-sunrpc.patch
-Patch52: sos-bz752666-cloudforms-debug.patch
-Patch53: sos-bz782339-unbreak-logging.patch
-Patch54: sos-bz771393-improve-report-name-sanitization.patch
-Patch55: sos-bz789096-kernel_realtime.patch
-Patch56: sos-bz752549-add-gluster-module.patch
-Patch57: sos-bz752549-gluster-forbid-more-pem-paths.patch
-Patch58: sos-bz814474-libvirt-wildcard-logs.patch
-Patch59: sos-bz810702-hw-collect-mcelog.patch
-Patch60: sos-bz822442-collect-etc-swift-in-gluster.patch
-Patch61: sos-bz812395-ipa-updates.patch
%description
Sos is a set of tools that gathers information about system
@@ -91,69 +26,6 @@ support technicians and developers.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
%build
make
@@ -173,45 +45,120 @@ rm -rf ${RPM_BUILD_ROOT}
%{python_sitelib}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
-%doc README TODO LICENSE ChangeLog doc/*
+%doc AUTHORS README.md LICENSE
%config(noreplace) %{_sysconfdir}/sos.conf
%changelog
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed May 23 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-29.el6
+* Mon Jun 10 2013 Bryn M. Reeves <bmr at redhat.com> = 3.0-1
+- New upstream release
+
+* Thu May 23 2013 Bryn M. Reeves <bmr at redhat.com> = 2.2-39
+- Always invoke tar with '-f-' option
+ Resolves: bz966602
+
+* Mon Jan 21 2013 Bryn M. Reeves <bmr at redhat.com> = 2.2-38
+- Fix interactive mode regression when --ticket unspecified
+ Resolves: bz822113
+
+* Fri Jan 18 2013 Bryn M. Reeves <bmr at redhat.com> = 2.2-37
+- Fix propagation of --ticket parameter in interactive mode
+ Resolves: bz822113
+
+* Thu Jan 17 2013 Bryn M. Reeves <bmr at redhat.com> = 2.2-36
+- Revert OpenStack patch
+ Resolves: bz840057
+
+* Wed Jan 9 2013 Bryn M. Reeves <bmr at redhat.com> = 2.2-35
+- Report --name and --ticket values as defaults
+ Resolves: bz822113
+- Fix device-mapper command execution logging
+ Resolves: bz824378
+- Fix data collection and rename PostreSQL module to pgsql
+ Resolves: bz852049
+
+* Fri Oct 19 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-34
+- Add support for content delivery hosts to RHUI module
+ Resolves: bz821323
+
+* Thu Oct 18 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-33
+- Add Red Hat Update Infrastructure module
+ Resolves: bz821323
+- Collect /proc/iomem in hardware module
+ Resolves: bz840975
+- Collect subscription-manager output in general module
+ Resolves: bz825968
+- Collect rhsm log files in general module
+ Resolves: bz826312
+- Fix exception in gluster module on non-gluster systems
+ Resolves: bz849546
+- Fix exception in psql module when dbname is not given
+ Resolves: bz852049
+
+* Wed Oct 17 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-32
+- Collect /proc/pagetypeinfo in memory module
+ Resolves: bz809727
+- Strip trailing newline from command output
+ Resolves: bz850433
+- Add sanlock module
+ Resolves: bz850779
+- Do not collect archived accounting files in psacct module
+ Resolves: bz850542
+- Call spacewalk-debug from rhn module to collect satellite data
+ Resolves: bz859142
+
+* Mon Oct 15 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-31
+- Avoid calling volume status when collecting gluster statedumps
+ Resolves: bz849546
+- Use a default report name if --name is empty
+ Resolves: bz822113
+- Quote tilde characters passed to shell in RPM module
+ Resolves: bz821005
+- Collect KDC and named configuration in ipa module
+ Resolves: bz825149
+- Sanitize hostname characters before using as report path
+ Resolves: bz822174
+- Collect /etc/multipath in device-mapper module
+ Resolves: bz817093
+- New plug-in for PostgreSQL
+ Resolves: bz852049
+- Add OpenStack module
+ Resolves: bz840057
+- Avoid deprecated sysctls in /proc/sys/net
+ Resolves: bz834594
+- Fix error logging when calling external programs
+ Resolves: bz824378
+- Use ip instead of ifconfig to generate network interface lists
+ Resolves: bz833170
+
+* Wed May 23 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-29
- Collect the swift configuration directory in gluster module
Resolves: bz822442
- Update IPA module and related plug-ins
Resolves: bz812395
-* Fri May 18 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-28.el6
+* Fri May 18 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-28
- Collect mcelog files in the hardware module
Resolves: bz810702
-* Wed May 02 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-27.el6
+* Wed May 02 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-27
- Add nfs statedump collection to gluster module
Resolves: bz752549
-* Tue May 01 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-26.el6
+* Tue May 01 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-26
- Use wildcard to match possible libvirt log paths
Resolves: bz814474
-* Mon Apr 23 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-25.el6
+* Mon Apr 23 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-25
- Add forbidden paths for new location of gluster private keys
Resolves: bz752549
-* Fri Mar 9 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-24.el6
+* Fri Mar 9 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-24
- Fix katello and aeolus command string syntax
Resolves: bz752666
- Remove stray hunk from gluster module patch
Resolves: bz784061
-* Thu Mar 8 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-22.el6
+* Thu Mar 8 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-22
- Correct aeolus debug invocation in CloudForms module
Resolves: bz752666
- Update gluster module for gluster-3.3
@@ -221,7 +168,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Add support for collecting gluster configuration and logs
Resolves: bz752549
-* Wed Mar 7 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-19.el6
+* Wed Mar 7 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-19
- Collect additional diagnostic information for realtime systems
Resolves: bz789096
- Improve sanitization of RHN user and case number in report name
@@ -233,7 +180,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Add support for Subscription Asset Manager diagnostics
Resolves: bz752670
-* Tue Mar 6 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-18.el6
+* Tue Mar 6 2012 Bryn M. Reeves <bmr at redhat.com> = 2.2-18
- Collect fence_virt.conf in cluster module
Resolves: bz760995
- Fix collection of /proc/net directory tree
diff --git a/sources b/sources
index a876920..2df3930 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14a1c1e96dac3e8d25064c8435a5e0ec sos-2.2.tar.gz
+9963fc9934596ffd0adb585f8858a68c sos-3.0.tar.gz
More information about the scm-commits
mailing list