From 505e228a96ed530f6bf49d2664bb8aea33e4a398 Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Mar 18 2016 15:14:31 +0000 Subject: New upstream release 1.15 --- diff --git a/.gitignore b/.gitignore index 3fc0221..d09a505 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /retrace-server-1.12.tar.gz /retrace-server-1.13.tar.gz /retrace-server-1.14.tar.gz +/retrace-server-1.15.tar.gz diff --git a/0001-Allow-disabling-particular-tasks-in-the-manager.patch b/0001-Allow-disabling-particular-tasks-in-the-manager.patch deleted file mode 100644 index fa23840..0000000 --- a/0001-Allow-disabling-particular-tasks-in-the-manager.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 757976faf59bc2caad63102c1b17463933c1b7fa Mon Sep 17 00:00:00 2001 -From: Jakub Filak -Date: Fri, 19 Feb 2016 06:51:32 +0100 -Subject: [PATCH] Allow disabling particular tasks in the manager - -Userspace core support is still a bit problematic, so it is not a good -idea to offer this type of tasks to users in the manager. - -I decided to move the task forms to separate files because I wanted to -avoid the need to escape strings in Python code. - -Signed-off-by: Jakub Filak ---- - src/Makefile.am | 2 ++ - src/config/retrace-server.conf | 7 +++++++ - src/manager.wsgi | 13 +++++++++++++ - src/manager.xhtml | 31 ++----------------------------- - src/manager_usrcore_task_form.xhtml | 17 +++++++++++++++++ - src/manager_vmcore_task_form.xhtml | 13 +++++++++++++ - 6 files changed, 54 insertions(+), 29 deletions(-) - create mode 100644 src/manager_usrcore_task_form.xhtml - create mode 100644 src/manager_vmcore_task_form.xhtml - -diff --git a/src/Makefile.am b/src/Makefile.am -index dfd3f53..043c416 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -39,6 +39,8 @@ interface_PYTHON = backtrace.wsgi \ - - interface_DATA = index.xhtml \ - manager.xhtml \ -+ manager_vmcore_task_form.xhtml \ -+ manager_usrcore_task_form.xhtml \ - managertask.xhtml \ - stats.xhtml - # interfacedir should probably be $$(pkgdatadir)/retrace -diff --git a/src/config/retrace-server.conf b/src/config/retrace-server.conf -index 28991a7..8eab59f 100644 ---- a/src/config/retrace-server.conf -+++ b/src/config/retrace-server.conf -@@ -22,6 +22,12 @@ AllowExternalDir = 0 - # Allow to create tasks owned by task manager (security risk) - AllowTaskManager = 0 - -+# Allow to create VMCore tasks in the task manager -+AllowVMCoreTask = 1 -+ -+# Allow to create Userspace core tasks in the task manager -+AllowUsrCoreTask = 1 -+ - # If white list is disabled, anyone can delete tasks - TaskManagerAuthDelete = 0 - -@@ -143,6 +149,7 @@ EmailNotify = 0 - # Who sends the e-mail notifications - EmailNotifyFrom = retrace@localhost - -+ - [archhosts] - i386 = - x86_64 = -diff --git a/src/manager.wsgi b/src/manager.wsgi -index 93ead9d..59d1372 100644 ---- a/src/manager.wsgi -+++ b/src/manager.wsgi -@@ -602,6 +602,18 @@ def application(environ, start_response): - - custom_url = "%s/__custom__" % match.group(1) - -+ vmcore_form = "" -+ if CONFIG["AllowVMCoreTask"]: -+ with open("/usr/share/retrace-server/manager_vmcore_task_form.xhtml") as f: -+ vmcore_form = f.read(1 << 20) # 1MB -+ output = output.replace("{vmcore_task_form}", vmcore_form) -+ -+ usrcore_form = "" -+ if CONFIG["AllowUsrCoreTask"]: -+ with open("/usr/share/retrace-server/manager_usrcore_task_form.xhtml") as f: -+ usrcore_form = f.read(1 << 20) # 1MB -+ output = output.replace("{usrcore_task_form}", usrcore_form) -+ - output = output.replace("{title}", title) - output = output.replace("{sitename}", sitename) - output = output.replace("{available_str}", available_str) -@@ -619,4 +631,5 @@ def application(environ, start_response): - output = output.replace("{running}", "\n ".join(running)) - output = output.replace("{finished}", "\n ".join(finished)) - -+ - return response(start_response, "200 OK", output, [("Content-Type", "text/html")]) -diff --git a/src/manager.xhtml b/src/manager.xhtml -index 041f994..5c3f231 100644 ---- a/src/manager.xhtml -+++ b/src/manager.xhtml -@@ -182,35 +182,8 @@ - - - --

vmcore

--
--
-- Kernel version (e.g. 2.6.32-287.el6.x86_64, empty to autodetect): -- Be more verbose in case of error --
--
-- Custom core location: -- -- --
Any URL that wget can download or a local path (file:///foo/bar or just /foo/bar)
--
--
--

coredump

--
--
--

All of these three fields override contents of package, executable and os_release files contained in the coredump archive. If you're uploading you have just the bare (compressed) coredump, you must specify these.

-- Be more verbose in case of error
-- Package (e.g. coreutils-8.22-11.el7):
-- Executable (e.g. /usr/bin/sleep):
-- OS Release (e.g. Red Hat Enterprise Linux Workstation release 7.0 (Maipo)): --
--
-- Custom core location: -- -- --
Any URL that wget can download or a local path (file:///foo/bar or just /foo/bar)
--
--
-+{vmcore_task_form} -+{usrcore_task_form} -
-
-
-diff --git a/src/manager_usrcore_task_form.xhtml b/src/manager_usrcore_task_form.xhtml -new file mode 100644 -index 0000000..c210600 ---- /dev/null -+++ b/src/manager_usrcore_task_form.xhtml -@@ -0,0 +1,17 @@ -+

userspace core

-+
-+
-+

All of these three fields override contents of package, executable and os_release files contained in the coredump archive. If you're uploading you have just the bare (compressed) coredump, you must specify these.

-+ Be more verbose in case of error
-+ Package (e.g. coreutils-8.22-11.el7):
-+ Executable (e.g. /usr/bin/sleep):
-+ OS Release (e.g. Red Hat Enterprise Linux Workstation release 7.0 (Maipo)): -+
-+
-+ Custom core location: -+ -+ -+
Any URL that wget can download or a local path (file:///foo/bar or just /foo/bar)
-+
-+
-+ -diff --git a/src/manager_vmcore_task_form.xhtml b/src/manager_vmcore_task_form.xhtml -new file mode 100644 -index 0000000..2307b3b ---- /dev/null -+++ b/src/manager_vmcore_task_form.xhtml -@@ -0,0 +1,13 @@ -+

vmcore

-+
-+
-+ Kernel version (e.g. 2.6.32-287.el6.x86_64, empty to autodetect): -+ Be more verbose in case of error -+
-+
-+ Custom core location: -+ -+ -+
Any URL that wget can download or a local path (file:///foo/bar or just /foo/bar)
-+
-+
--- -2.7.1 - diff --git a/0002-Add-VMCoreTask-and-UsrCoreTask-to-config.patch b/0002-Add-VMCoreTask-and-UsrCoreTask-to-config.patch deleted file mode 100644 index 05c318d..0000000 --- a/0002-Add-VMCoreTask-and-UsrCoreTask-to-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 48e93c23eca3800f0053d262b62e7b2f3f2f512a Mon Sep 17 00:00:00 2001 -From: Patrik Helia -Date: Fri, 19 Feb 2016 11:10:11 +0100 -Subject: [PATCH] Add VMCoreTask and UsrCoreTask to config - -/manager page returned error 500 because VMCoreTask and UsrCoreTask missed in config variable - -Signed-off-by: Patrik Helia ---- - src/lib/retrace.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lib/retrace.py b/src/lib/retrace.py -index 8664788..9031ea9 100644 ---- a/src/lib/retrace.py -+++ b/src/lib/retrace.py -@@ -157,6 +157,8 @@ CONFIG = { - "AllowExternalDir": False, - "AllowInteractive": False, - "AllowTaskManager": False, -+ "AllowVMCoreTask" : False, -+ "AllowUsrCoreTask" : False, - "TaskManagerAuthDelete": False, - "TaskManagerDeleteUsers": [], - "UseFTPTasks": False, --- -2.7.1 - diff --git a/retrace-server.spec b/retrace-server.spec index 7057b44..2ec12b5 100644 --- a/retrace-server.spec +++ b/retrace-server.spec @@ -2,16 +2,14 @@ Summary: Application for remote coredump analysis Name: retrace-server -Version: 1.14 -Release: 2%{?dist} +Version: 1.15 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz # git format-patch -N -M --topo-order %%{version} -Patch0001: 0001-Allow-disabling-particular-tasks-in-the-manager.patch -Patch0002: 0002-Add-VMCoreTask-and-UsrCoreTask-to-config.patch BuildArch: noarch @@ -54,8 +52,6 @@ generation service over a network using HTTP protocol. %prep %setup -q -%patch0001 -p1 -%patch0002 -p1 %build autoreconf @@ -140,6 +136,20 @@ fi %doc COPYING INSTALL README TODO %changelog +* Fri Mar 18 2016 Jakub Filak - 1.15-1 +- Correct paths to Fedora development releases +- Fix small problem with strip_vmcore calling prepare_debuginfo +- Avoid calling prepare_debuginfo from retrace-server-interact after kernel version detection +- Move prepare_debuginfo and strip_vmcore inside RetraceTask +- Add vmlinux file inside RetraceTask +- Fix bt_filter missing last task/PID read if the last line was not blank +- Update the release information to be dynamic based off of plugins +- Including a Red Hat Enterprise Linux plugin +- Mock logging into retrace task's dir +- Enforce uniform mode bits for almost all RetraceTask files +- Fix incorrect group permissions when writing RetraceServer files especially with interactive mode +- Fix retrace-server-worker --restart backtrace due to unwriteable retrace_log + * Fri Feb 19 2016 Jakub Filak - 1.14-2 - Introduce AllowVMCoreTask and AllowUserCoreTask configuration options diff --git a/sources b/sources index 006cc3a..391b6f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07974c49eaf0c29aa24d4ebafdb37934 retrace-server-1.14.tar.gz +99d7591cc4e6f267997715e4f8994856 retrace-server-1.15.tar.gz