Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Matej Habrnal
c4735a58d5 New version 2.10.7
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
2018-02-26 15:46:30 +01:00
Matej Habrnal
bcf6f2279b New version 2.10.6
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
2018-02-21 16:55:05 +01:00
Julius Milan
fa1f789e67 New version 2.10.5
Signed-off-by: Julius Milan <jmilan@redhat.com>
2017-11-03 08:55:06 +01:00
Martin Kutlak
e0d4436c01 Drop GPG check patch for unsigned packages
Resolves#1449718

Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
2017-09-27 10:36:36 +02:00
Martin Kutlak
be6c94e4f1 Fix log renaming to log_warning
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
2017-08-30 15:01:07 +02:00
Matej Habrnal
e3520fa484 New version 2.10.4
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
2017-08-28 13:11:42 +02:00
5 changed files with 141 additions and 126 deletions

4
.gitignore vendored
View file

@ -55,3 +55,7 @@ abrt-1.1.13.tar.gz
/abrt-2.10.1.tar.gz /abrt-2.10.1.tar.gz
/abrt-2.10.2.tar.gz /abrt-2.10.2.tar.gz
/abrt-2.10.3.tar.gz /abrt-2.10.3.tar.gz
/abrt-2.10.4.tar.gz
/abrt-2.10.5.tar.gz
/abrt-2.10.6.tar.gz
/abrt-2.10.7.tar.gz

View file

@ -1,54 +0,0 @@
From c01551e6e9fd293a3f40e481afe8c28e786fe632 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 11 Aug 2017 13:24:26 +0300
Subject: [PATCH] Quick hack to fix build with rpm >= 4.14
1) rpm >= 4.14 no longer has rpmCheckTerminate() call, it cleans up
automatically on exit(). Note that "needing" rpmCheckTerminate()
means the code is buggy: it does not properly track and free
rpmdb iterators and/or rpmts handles.
2) pgpPubkeyFingerprint() now returns the actual fingerprint, the
key ID which it previously returned is now retrieved by
pgpPubkeyKeyID()
If compatibility to older versions is needed, these will need
configure checks, left as an excercise for someone more familiar
with the abrt codebase.
---
src/daemon/rpm.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c
index 36b36a91..011e44ca 100644
--- a/src/daemon/rpm.c
+++ b/src/daemon/rpm.c
@@ -76,11 +76,14 @@ void rpm_destroy()
rpmFreeMacros(NULL);
rpmFreeRpmrc();
+/* rpm >= 4.14 handles this automatically on exit */
+#if 0
/* RPM doc says "clean up any open iterators and databases".
* Observed to eliminate these Berkeley DB warnings:
* "BDB2053 Freeing read locks for locker 0x1e0: 28718/139661746636736"
*/
rpmdbCheckTerminate(1);
+#endif
#endif
list_free_with_free(list_fingerprints);
@@ -100,7 +103,11 @@ void rpm_load_gpgkey(const char* filename)
}
uint8_t keyID[8];
+#if 0
if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0)
+#else
+ if (pgpPubkeyKeyID(pkt, pklen, keyID) == 0)
+#endif
{
char *fingerprint = pgpHexStr(keyID, sizeof(keyID));
if (fingerprint != NULL)
--
2.14.0

181
abrt.spec
View file

@ -54,13 +54,13 @@
%define docdirversion -%{version} %define docdirversion -%{version}
%endif %endif
%define libreport_ver 2.9.1 %define libreport_ver 2.9.3
%define satyr_ver 0.22 %define satyr_ver 0.24
Summary: Automatic bug detection and reporting tool Summary: Automatic bug detection and reporting tool
Name: abrt Name: abrt
Version: 2.10.3 Version: 2.10.7
Release: 6%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: https://abrt.readthedocs.org/ URL: https://abrt.readthedocs.org/
@ -69,12 +69,6 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta
# git format-patch %%{Version} --topo-order -N -M; # git format-patch %%{Version} --topo-order -N -M;
# i=1; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done # i=1; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done
# don't remove this patch, packages in rawhide are not signed!
Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch
# Hacks for RPM 4.14 support
Patch1: 0001-Quick-hack-to-fix-build-with-rpm-4.14.patch
# '%%autosetup -S git' -> git # '%%autosetup -S git' -> git
BuildRequires: git BuildRequires: git
@ -85,7 +79,7 @@ BuildRequires: rpm-devel >= 4.6
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
#why? BuildRequires: file-devel #why? BuildRequires: file-devel
BuildRequires: python-devel BuildRequires: python2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
@ -116,7 +110,7 @@ Requires: systemd-units
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-python3 = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release}
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: python3-augeas Requires: python3-augeas
Requires: python3-dbus Requires: python3-dbus
@ -259,7 +253,7 @@ Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: abrt-addon-kerneloops Requires: abrt-addon-kerneloops
Requires: kexec-tools Requires: kexec-tools
Requires: abrt-python3 Requires: python3-abrt
Requires: python3-augeas Requires: python3-augeas
%description addon-vmcore %description addon-vmcore
@ -290,30 +284,52 @@ Provides: libreport-plugin-bodhi = %{version}-%{release}
%description plugin-bodhi %description plugin-bodhi
Search for a new updates in bodhi server. Search for a new updates in bodhi server.
%package addon-python %package -n python2-abrt-addon
Summary: %{name}'s addon for catching and analyzing Python exceptions Summary: %{name}'s addon for catching and analyzing Python exceptions
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: python
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: systemd-python Requires: systemd-python
Requires: abrt-python Requires: python2-abrt
# Remove before F30
Provides: abrt-addon-python = %{version}-%{release}
Provides: abrt-addon-python%{?_isa} = %{version}-%{release}
Obsoletes: abrt-addon-python < %{version}-%{release}
%description addon-python %description -n python2-abrt-addon
This package contains python hook and python analyzer plugin for handling This package contains python hook and python analyzer plugin for handling
uncaught exception in python programs. uncaught exception in python programs.
%package addon-python3 %package -n python2-abrt-container-addon
Summary: %{name}'s container addon for catching Python 2 exceptions
Conflicts: python2-abrt-addon
%description -n python2-abrt-container-addon
This package contains python 2 hook and handling uncaught exception in python 2
programs in container.
%package -n python3-abrt-addon
Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Summary: %{name}'s addon for catching and analyzing Python 3 exceptions
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: python3
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: python3-systemd Requires: python3-systemd
Requires: abrt-python3 Requires: python3-abrt
# Remove before F30
Provides: abrt-addon-python3 = %{version}-%{release}
Provides: abrt-addon-python3%{?_isa} = %{version}-%{release}
Obsoletes: abrt-addon-python3 < %{version}-%{release}
%description addon-python3 %description -n python3-abrt-addon
This package contains python 3 hook and python analyzer plugin for handling This package contains python 3 hook and python analyzer plugin for handling
uncaught exception in python 3 programs. uncaught exception in python 3 programs.
%package -n python3-abrt-container-addon
Summary: %{name}'s container addon for catching Python 3 exceptions
Conflicts: python3-abrt-addon
%description -n python3-abrt-container-addon
This package contains python 3 hook and handling uncaught exception in python 3
programs in container.
%package plugin-sosreport %package plugin-sosreport
Summary: %{name}'s plugin for building automatic sosreports Summary: %{name}'s plugin for building automatic sosreports
Requires: sos Requires: sos
@ -350,7 +366,7 @@ Requires: %{name} = %{version}-%{release}
Requires: libreport-cli >= %{libreport_ver} Requires: libreport-cli >= %{libreport_ver}
Requires: abrt-libs = %{version}-%{release} Requires: abrt-libs = %{version}-%{release}
Requires: abrt-dbus Requires: abrt-dbus
Requires: abrt-python Requires: python2-abrt
Requires: abrt-addon-ccpp Requires: abrt-addon-ccpp
Requires: python-argh Requires: python-argh
Requires: python2-argcomplete Requires: python2-argcomplete
@ -371,7 +387,7 @@ Requires: abrt-addon-pstoreoops
Requires: abrt-addon-vmcore Requires: abrt-addon-vmcore
%endif %endif
Requires: abrt-addon-ccpp Requires: abrt-addon-ccpp
Requires: abrt-addon-python3 Requires: python3-abrt-addon
Requires: abrt-addon-xorg Requires: abrt-addon-xorg
%if 0%{?rhel} %if 0%{?rhel}
Requires: libreport-rhel >= %{libreport_ver} Requires: libreport-rhel >= %{libreport_ver}
@ -405,7 +421,7 @@ Requires: abrt-addon-pstoreoops
Requires: abrt-addon-vmcore Requires: abrt-addon-vmcore
%endif %endif
Requires: abrt-addon-ccpp Requires: abrt-addon-ccpp
Requires: abrt-addon-python3 Requires: python3-abrt-addon
Requires: abrt-addon-xorg Requires: abrt-addon-xorg
# Default config of addon-ccpp requires gdb # Default config of addon-ccpp requires gdb
BuildRequires: gdb-headless BuildRequires: gdb-headless
@ -455,7 +471,7 @@ ABRT DBus service which provides org.freedesktop.problems API on dbus and
uses PolicyKit to authorize to access the problem data. uses PolicyKit to authorize to access the problem data.
%package python %package -n python2-abrt
Summary: ABRT Python API Summary: ABRT Python API
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -463,26 +479,35 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release}
Requires: dbus-python Requires: dbus-python
Requires: libreport-python Requires: libreport-python
Requires: python2-gobject-base
%{?python_provide:%python_provide python2-abrt}
# Remove before F30
Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
BuildRequires: python-nose BuildRequires: python-nose
BuildRequires: python-sphinx BuildRequires: python-sphinx
BuildRequires: libreport-python BuildRequires: libreport-python
%description python %description -n python2-abrt
High-level API for querying, creating and manipulating High-level API for querying, creating and manipulating
problems handled by ABRT in Python. problems handled by ABRT in Python.
%package python-doc %package -n python2-abrt-doc
Summary: ABRT Python API Documentation Summary: ABRT Python API Documentation
Group: Documentation Group: Documentation
BuildArch: noarch BuildArch: noarch
BuildRequires: python2-devel BuildRequires: python2-devel
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-python = %{version}-%{release} Requires: python2-abrt = %{version}-%{release}
# Remove before F30
Provides: %{name}-python-doc = %{version}-%{release}
Obsoletes: %{name}-python-doc < %{version}-%{release}
%description python-doc %description -n python2-abrt-doc
Examples and documentation for ABRT Python API. Examples and documentation for ABRT Python API.
%package python3 %package -n python3-abrt
Summary: ABRT Python 3 API Summary: ABRT Python 3 API
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -490,23 +515,32 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-dbus = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release}
Requires: python3-dbus Requires: python3-dbus
Requires: libreport-python3 Requires: libreport-python3
%{?python_provide:%python_provide python3-abrt}
# Remove before F30
Provides: %{name}-python3 = %{version}-%{release}
Provides: %{name}-python3%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python3 < %{version}-%{release}
Requires: python3-gobject-base
BuildRequires: python3-nose BuildRequires: python3-nose
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
BuildRequires: libreport-python3 BuildRequires: libreport-python3
%description python3 %description -n python3-abrt
High-level API for querying, creating and manipulating High-level API for querying, creating and manipulating
problems handled by ABRT in Python 3. problems handled by ABRT in Python 3.
%package python3-doc %package -n python3-abrt-doc
Summary: ABRT Python API Documentation Summary: ABRT Python API Documentation
Group: Documentation Group: Documentation
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-python3 = %{version}-%{release} Requires: python3-%{name} = %{version}-%{release}
# Remove before F30
Provides: %{name}-python3-doc = %{version}-%{release}
Obsoletes: %{name}-python3-doc < %{version}-%{release}
%description python3-doc %description -n python3-abrt-doc
Examples and documentation for ABRT Python 3 API. Examples and documentation for ABRT Python 3 API.
%package console-notification %package console-notification
@ -613,10 +647,10 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di
%systemd_post abrt-xorg.service %systemd_post abrt-xorg.service
%journal_catalog_update %journal_catalog_update
%post addon-python %post -n python2-abrt-addon
%journal_catalog_update %journal_catalog_update
%post addon-python3 %post -n python3-abrt-addon
%journal_catalog_update %journal_catalog_update
%if %{?have_kexec_tools} == 1 %if %{?have_kexec_tools} == 1
@ -1037,7 +1071,7 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-harvest-pstoreoops.1*
%{_mandir}/man1/abrt-merge-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1*
%files addon-python %files -n python2-abrt-addon
%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf
%{_datadir}/%{name}/conf.d/plugins/python.conf %{_datadir}/%{name}/conf.d/plugins/python.conf
%{_mandir}/man5/abrt-python.conf.5* %{_mandir}/man5/abrt-python.conf.5*
@ -1046,10 +1080,15 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_journalcatalogdir}/abrt_python.catalog %{_journalcatalogdir}/abrt_python.catalog
%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf
%{_mandir}/man5/python_event.conf.5* %{_mandir}/man5/python_event.conf.5*
%{python_sitearch}/abrt*.py*
%{python_sitearch}/abrt.pth %{python_sitearch}/abrt.pth
%{python_sitearch}/abrt_exception_handler.*
%files addon-python3 %files -n python2-abrt-container-addon
%{python_sitearch}/abrt_container.pth
%{python_sitearch}/abrt_exception_handler_container.*
%attr(6755, root, root) %{_libexecdir}/abrt-container-logger-python2
%files -n python3-abrt-addon
%config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf
%{_datadir}/%{name}/conf.d/plugins/python3.conf %{_datadir}/%{name}/conf.d/plugins/python3.conf
%{_mandir}/man5/abrt-python3.conf.5* %{_mandir}/man5/abrt-python3.conf.5*
@ -1057,8 +1096,15 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_journalcatalogdir}/abrt_python3.catalog %{_journalcatalogdir}/abrt_python3.catalog
%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf
%{_mandir}/man5/python3_event.conf.5* %{_mandir}/man5/python3_event.conf.5*
%{python3_sitearch}/abrt* %{python3_sitearch}/abrt3.pth
%{python3_sitearch}/__pycache__/abrt* %{python3_sitearch}/abrt_exception_handler3.py
%{python3_sitearch}/__pycache__/abrt_exception_handler3.*
%files -n python3-abrt-container-addon
%{python3_sitearch}/abrt3_container.pth
%{python3_sitearch}/abrt_exception_handler3_container.py
%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.*
%attr(6755, root, root) %{_libexecdir}/abrt-container-logger
%files plugin-sosreport %files plugin-sosreport
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -1130,24 +1176,69 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css
%config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf
%files python %files -n python2-abrt
%{python_sitearch}/problem/ %{python_sitearch}/problem/
%{_mandir}/man5/abrt-python.5* %{_mandir}/man5/abrt-python.5*
%files python-doc %files -n python2-abrt-doc
%{python_sitelib}/problem_examples %{python_sitelib}/problem_examples
%files python3 %files -n python3-abrt
%{python3_sitearch}/problem/ %{python3_sitearch}/problem/
%{_mandir}/man5/abrt-python3.5* %{_mandir}/man5/abrt-python3.5*
%files python3-doc %files -n python3-abrt-doc
%{python3_sitelib}/problem_examples %{python3_sitelib}/problem_examples
%files console-notification %files console-notification
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
%changelog %changelog
* Mon Feb 26 2018 Matej Habrnal <mhabrnal@redhat.com> 2.10.7-1
- Translation updates
- hooks: introduce docker hook for Python2
* Mon Feb 19 2018 Matej Habrnal <mhabrnal@redhat.com> 2.10.6-2
- Translation updates
- hooks: introduce docker hook for Python3
- a-h-event: Do not deduplicate different containers
* Thu Nov 02 2017 Julius Milan <jmilan@redhat.com> 2.10.5-1
- Translation updates
- a-action-ureport: add option 'ProcessUnpackaged'
- spec: change dependency on python{2,3}-gobject
- applet: Additional changes to allow optional polkit
- doc: remove obsolete doxygen tags
- dbus: Additional changes to allow optional polkit
- cli-ng: Explicitly state python version in shebangs
- spec: rename python binary packages
- a-d-journal-core: Save mountinfo from journal
- a-d-journal-core: Save container cmdline
- logging: rename omitted log() to log_warning()
* Wed Sep 27 2017 Martin Kutlak <mkutlak@redhat.com> 2.10.4-3
- Drop GPG check patch for unsigned packages
* Wed Aug 30 2017 Martin Kutlak <mkutlak@redhat.com> 2.10.4-2
- logging: rename omitted log() to log_warning()
* Mon Aug 28 2017 Matej Habrnal <mhabrnal@redhat.com> 2.10.4-1
- Translation updates
- logging: rename log() to log_warning()
- Quick hack to fix build with rpm >= 4.14
- cli,dbus: Allow polkit to be optional at build time
- spec: add dependency for python{3}-gobject
- a-d-journal-core: fix bad condition in creating reason msg
- a-d-journal-core: use pid of crashed process in dumpdir name
- changelog: update CHANGELOG.md
* Wed Aug 16 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.10.3-7
- Python 2 binary package renamed to python2-abrt
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
- Python 3 binary package renamed to python3-abrt
- Add-on packages renamed to python[23]-abrt-addon
- Documentation packages renamed to python[23]-abrt-doc
* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.10.3-6 * Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.10.3-6
- Rebuilt after RPM update (№ 3) - Rebuilt after RPM update (№ 3)

View file

@ -1,26 +0,0 @@
From 1ef034096efe367af85f568bc982af969124003b Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Mon, 10 Feb 2014 09:39:07 +0100
Subject: [PATCH] disable OpenGPGCheck in Fedora Rawhide
Packages in Fedora Rawhide are not signed.
---
src/daemon/abrt-action-save-package-data.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/daemon/abrt-action-save-package-data.conf b/src/daemon/abrt-action-save-package-data.conf
index 3d35bb6..e3f724a 100644
--- a/src/daemon/abrt-action-save-package-data.conf
+++ b/src/daemon/abrt-action-save-package-data.conf
@@ -3,7 +3,7 @@
# Product Signing (GPG) Keys:
# https://access.redhat.com/security/team/key
#
-OpenGPGCheck = yes
+OpenGPGCheck = no
# Blacklisted packages
#
--
1.8.3.1

View file

@ -1 +1 @@
SHA512 (abrt-2.10.3.tar.gz) = dac86703c60f1b56b8cfa7b2e400f5165a0ee9bd457667dec71981f9475b35552c80d5c5864de22414d83f4ce8ea29300d299f36e7fe4eb77a80112d6a1852ab SHA512 (abrt-2.10.7.tar.gz) = 3db4ee8554906137c8ecbdf9c64e310fbfb2673a4c5df6211750616ba65156c3c133fc04c4b93c277f80e3cee0078de3773884273d4a80b5b64de9d599e3c780