Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0c5c2d9022 | ||
|
|
932ab8a598 | ||
|
|
9c81be1de2 | ||
|
|
6677b9143a |
26 changed files with 2178 additions and 1089 deletions
|
|
@ -1,100 +0,0 @@
|
|||
From bc3149ba31c063d334dd95a21c4214cef11f46da Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Wed, 22 Mar 2017 14:10:04 +0100
|
||||
Subject: [PATCH] augeas: trim spaces on eol, around value separator
|
||||
|
||||
Resolves abrt/libreport#474
|
||||
Related to rhbz#1434414
|
||||
---
|
||||
augeas/libreport.aug | 19 ++++++++++++-------
|
||||
augeas/test_libreport.aug | 20 ++++++++++++++++++++
|
||||
2 files changed, 32 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/augeas/libreport.aug b/augeas/libreport.aug
|
||||
index 483eeaf..46ffb73 100644
|
||||
--- a/augeas/libreport.aug
|
||||
+++ b/augeas/libreport.aug
|
||||
@@ -2,19 +2,24 @@ module Libreport =
|
||||
autoload xfm
|
||||
|
||||
(* Define useful primitives *)
|
||||
- let value_sep = del / ?= ?/ " = "
|
||||
- let value_to_eol = store /([^ \t\n].*[^ \t\n]|[^ \t\n]?)/
|
||||
- let eol = del /\n/ "\n"
|
||||
- let ident = /[a-zA-Z][a-zA-Z_]+/
|
||||
+ let val_sep = del /[ \t]*=[ \t]*/ " = "
|
||||
+ let val = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/
|
||||
+ let eol = del /\n/ "\n"
|
||||
+ let whitespace_eol = del /[ \t]*\n/ "\n"
|
||||
+ let ident = /[a-zA-Z][a-zA-Z_]+/
|
||||
|
||||
(* Define comment *)
|
||||
- let comment = [ label "#comment" . del /#[ \t]*/ "# " . value_to_eol . eol ]
|
||||
+ let commented_line = [ label "#comment" . del /#[ \t]*/ "# " . val . eol ]
|
||||
+ let empty_comment = [ label "#comment" . value "" . del /#[ \t]*/ "# " . eol ]
|
||||
+ let comment = commented_line | empty_comment
|
||||
|
||||
(* Define empty *)
|
||||
- let empty = [ del /[ \t]*\n/ "\n" ]
|
||||
+ let empty = [ del /[ \t]*\n/ "\n" ]
|
||||
|
||||
(* Define option *)
|
||||
- let option = [ del /[ \t]*/ "" . key ident . value_sep . value_to_eol . eol ]
|
||||
+ let option_val = [ del /[ \t]*/ "" . key ident . val_sep . val . whitespace_eol ]
|
||||
+ let option_no_val = [ value "" . del /[ \t]*/ "" . key ident . val_sep . eol ]
|
||||
+ let option = option_val | option_no_val
|
||||
|
||||
(* Define lens *)
|
||||
let lns = ( comment | empty | option )*
|
||||
diff --git a/augeas/test_libreport.aug b/augeas/test_libreport.aug
|
||||
index 116e97c..3dfbfa6 100644
|
||||
--- a/augeas/test_libreport.aug
|
||||
+++ b/augeas/test_libreport.aug
|
||||
@@ -16,6 +16,8 @@ Password =
|
||||
# bugs in selinux-policy component.
|
||||
# (If you need to add more, the syntax is: \"component[,component...]\")
|
||||
#
|
||||
+#
|
||||
+#
|
||||
DontMatchComponents = selinux-policy
|
||||
|
||||
# for more info about these settings see: https://github.com/abrt/abrt/wiki/FAQ#creating-private-bugzilla-tickets
|
||||
@@ -25,6 +27,14 @@ PrivateGroups=private
|
||||
Whitespace_two=start
|
||||
Whitespace_three =start
|
||||
Whitespace_four= start
|
||||
+
|
||||
+AssignmentWhitespace_a =what
|
||||
+ AssignmentWhitespace_b = an
|
||||
+AssignmentWhitespace_c= original
|
||||
+ AssignmentWhitespace_d = idea
|
||||
+
|
||||
+EOLWhitespace_a = nice
|
||||
+EOLWhitespace_b = nice
|
||||
"
|
||||
|
||||
test Libreport.lns get conf =
|
||||
@@ -44,6 +54,8 @@ PrivateGroups=private
|
||||
{ "#comment" = "bugs in selinux-policy component." }
|
||||
{ "#comment" = "(If you need to add more, the syntax is: \"component[,component...]\")" }
|
||||
{ "#comment" = "" }
|
||||
+ { "#comment" = "" }
|
||||
+ { "#comment" = "" }
|
||||
{ "DontMatchComponents" = "selinux-policy" }
|
||||
{}
|
||||
{ "#comment" = "for more info about these settings see: https://github.com/abrt/abrt/wiki/FAQ#creating-private-bugzilla-tickets" }
|
||||
@@ -53,3 +65,11 @@ PrivateGroups=private
|
||||
{ "Whitespace_two" = "start" }
|
||||
{ "Whitespace_three" = "start" }
|
||||
{ "Whitespace_four" = "start" }
|
||||
+ {}
|
||||
+ { "AssignmentWhitespace_a" = "what" }
|
||||
+ { "AssignmentWhitespace_b" = "an" }
|
||||
+ { "AssignmentWhitespace_c" = "original" }
|
||||
+ { "AssignmentWhitespace_d" = "idea" }
|
||||
+ {}
|
||||
+ { "EOLWhitespace_a" = "nice" }
|
||||
+ { "EOLWhitespace_b" = "nice" }
|
||||
--
|
||||
2.9.3
|
||||
|
||||
27
0001-makefile-fix-make-release.patch
Normal file
27
0001-makefile-fix-make-release.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
From 6ead0462968aa5ef798c8455e0ce30c8efbaad4d Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Thu, 2 Nov 2017 09:27:04 +0100
|
||||
Subject: [PATCH 01/22] makefile: fix make release
|
||||
|
||||
make release-* commands failed to update changelog in spec when it
|
||||
contained more than one "changelog" string
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f7f9c1a6..9ad827c6 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -74,7 +74,7 @@ release:
|
||||
maint/pull-translations; \
|
||||
echo "* $$(LANG='en_US.UTF-8' date +'%a %b %d %Y') $$(git config --get user.name) <$$(git config --get user.email)> $$NEW_VER-1" | sort > /tmp/changelog.tmp; \
|
||||
git log --oneline $$OLD_VER..HEAD | awk '{$$1=""; if (a[$$0]++ == 0) print "-" $$0} END {print ""}' | grep -v -e "- Merge" -e "- testsuite:" -e "- make:" >> /tmp/changelog.tmp; \
|
||||
- sed "$$(grep -n changelog libreport.spec.in | cut -f1 -d:)"'r /tmp/changelog.tmp' -i libreport.spec.in; \
|
||||
+ sed "$$(grep -n %changelog libreport.spec.in | cut -f1 -d: | head -1)"'r /tmp/changelog.tmp' -i libreport.spec.in; \
|
||||
sed -e "s/^## \[Unreleased\]/## [Unreleased]\n\n## [$$NEW_VER] - $$(date +'%F')/" \
|
||||
-e "s/^\[Unreleased\]: \(https:\/\/.*\/compare\)\(\/.*\)\.\.\.HEAD/[Unreleased]: \1\/$$NEW_VER...HEAD\n[$$NEW_VER]: \1\2...$$NEW_VER/" \
|
||||
-i CHANGELOG.md; \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
From f2fbf556597b1c8d132d3d0fbeeae5d12fad0f44 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 10:17:58 +0100
|
||||
Subject: [PATCH 02/22] reporter-bugzilla: ask concrete bz when requiring login
|
||||
|
||||
previous message:
|
||||
"Please enter your Bugzilla login:"
|
||||
now:
|
||||
"Please enter your %s login:"
|
||||
where %s is configured BugzillaURL, so by default:
|
||||
"Please enter your https://bugzilla.redhat.com login:"
|
||||
|
||||
Related to rhbz#1229439
|
||||
---
|
||||
src/plugins/reporter-bugzilla.c | 16 +++++++++++-----
|
||||
1 file changed, 11 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
|
||||
index 514fb659..67ac4d11 100644
|
||||
--- a/src/plugins/reporter-bugzilla.c
|
||||
+++ b/src/plugins/reporter-bugzilla.c
|
||||
@@ -216,11 +216,15 @@ void login(struct abrt_xmlrpc *client, struct bugzilla_struct *rhbz)
|
||||
log_warning(_("Logging into Bugzilla at %s"), rhbz->b_bugzilla_url);
|
||||
while (!rhbz_login(client, rhbz->b_login, rhbz->b_password))
|
||||
{
|
||||
+ char *question;
|
||||
+
|
||||
free(rhbz->b_login);
|
||||
- rhbz->b_login = ask_bz_login(_("Invalid password or login. Please enter your Bugzilla login:"));
|
||||
+ question = xasprintf(_("Invalid password or login. Please enter your %s login:"), rhbz->b_bugzilla_url);
|
||||
+ rhbz->b_login = ask_bz_login(question);
|
||||
+ free(question);
|
||||
|
||||
free(rhbz->b_password);
|
||||
- char *question = xasprintf(_("Invalid password or login. Please enter the password for '%s':"), rhbz->b_login);
|
||||
+ question = xasprintf(_("Invalid password or login. Please enter the password for '%s':"), rhbz->b_login);
|
||||
rhbz->b_password = ask_bz_password(question);
|
||||
free(question);
|
||||
}
|
||||
@@ -451,7 +455,9 @@ int main(int argc, char **argv)
|
||||
if (rhbz.b_login[0] == '\0')
|
||||
{
|
||||
free(rhbz.b_login);
|
||||
- rhbz.b_login = ask_bz_login(_("Login is not provided by configuration. Please enter your Bugzilla login:"));
|
||||
+ char *question = xasprintf(_("Login is not provided by configuration. Please enter your %s login:"), rhbz.b_bugzilla_url);
|
||||
+ rhbz.b_login = ask_bz_login(question);
|
||||
+ free(question);
|
||||
}
|
||||
|
||||
if (rhbz.b_password[0] == '\0')
|
||||
@@ -546,8 +552,8 @@ int main(int argc, char **argv)
|
||||
|
||||
if (reported_to && reported_to->url)
|
||||
{
|
||||
- char *msg = xasprintf("This problem was already reported to Bugzilla (see '%s')."
|
||||
- " Do you still want to create a new bug?",
|
||||
+ char *msg = xasprintf(_("This problem was already reported to Bugzilla (see '%s')."
|
||||
+ " Do you still want to create a new bug?"),
|
||||
reported_to->url);
|
||||
int yes = ask_yes_no(msg);
|
||||
free(msg);
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
From f97b21d1e1d4bff4e667991997dd78fec3b95159 Mon Sep 17 00:00:00 2001
|
||||
From: Matej Habrnal <mhabrnal@redhat.com>
|
||||
Date: Tue, 14 Mar 2017 12:55:25 +0100
|
||||
Subject: [PATCH] reporter-s-journal: add journal default entries
|
||||
|
||||
This commit adds 3 new fields into journal logs. All of them are in the
|
||||
NONE dump.
|
||||
|
||||
The new fields are:
|
||||
PROBLEM_DIR - Represents absolute file system path of problem directory.
|
||||
The full path is needed because that is the way with which are
|
||||
problems identified in DBus Problems2API.
|
||||
PROBLEM_UUID - Represents uuid
|
||||
PROBLEM_DUPHASH - Represents duphash
|
||||
|
||||
These new fields were needed for ABRT in Cockpit for connecting problems
|
||||
with journal entries. All three are needed, because the problem directory
|
||||
might be removed at the time of reading journal but a dupe can be
|
||||
present there and the dupe can be identified based on DUPHASH or UUID.
|
||||
|
||||
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
||||
---
|
||||
src/plugins/reporter-systemd-journal.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/reporter-systemd-journal.c b/src/plugins/reporter-systemd-journal.c
|
||||
index 8df5ac7..957002b 100644
|
||||
--- a/src/plugins/reporter-systemd-journal.c
|
||||
+++ b/src/plugins/reporter-systemd-journal.c
|
||||
@@ -102,6 +102,7 @@ static void msg_content_free(msg_content_t *msg_c)
|
||||
#define BINARY_NAME "binary"
|
||||
#define SYSLOG_ID "SYSLOG_IDENTIFIER"
|
||||
#define MESSAGE_ID "MESSAGE_ID"
|
||||
+#define DUMPDIR_PATH "DIR"
|
||||
|
||||
enum {
|
||||
DUMP_NONE = 1 << 0,
|
||||
@@ -122,6 +123,9 @@ static const char *const fields_default[] = {
|
||||
FILENAME_EXCEPTION_TYPE ,
|
||||
FILENAME_REASON ,
|
||||
FILENAME_CRASH_FUNCTION ,
|
||||
+ DUMPDIR_PATH ,
|
||||
+ FILENAME_UUID ,
|
||||
+ FILENAME_DUPHASH ,
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -302,6 +306,12 @@ int main(int argc, char **argv)
|
||||
if (binary_name)
|
||||
problem_data_add_text_noteditable(problem_data, BINARY_NAME, binary_name);
|
||||
|
||||
+ /* add problem dir path into problem data */
|
||||
+ char *abspath = realpath(dump_dir_name, NULL);
|
||||
+ if (abspath)
|
||||
+ problem_data_add_text_noteditable(problem_data, DUMPDIR_PATH, abspath);
|
||||
+ free(abspath);
|
||||
+
|
||||
/* crash_function element is neeeded by systemd journal messages, save ??, if it doesn't exist */
|
||||
const char *crash_function = problem_data_get_content_or_NULL(problem_data, FILENAME_CRASH_FUNCTION);
|
||||
if (!crash_function)
|
||||
--
|
||||
2.9.3
|
||||
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
From 7df9283b307c11134faf1135a6ced3839e8e0d20 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 14 Nov 2017 16:13:58 +0100
|
||||
Subject: [PATCH 03/22] reporter-bugzilla: read configuration from user's home
|
||||
|
||||
Problem was, that /etc/libreport/plugins/bugzilla.conf has read
|
||||
permissions set also for others and passwords are stored there as
|
||||
plain text.
|
||||
|
||||
As solution, bugzilla.conf can be newly placed in users home:
|
||||
$HOME/.config/libreport/bugzilla.conf
|
||||
where users can safely store their credentials, also credentials provided
|
||||
on first run of reporter-bugzilla are stored there.
|
||||
|
||||
Added warning to /etc/libreport/plugins/bugzilla.conf for system admin
|
||||
to be aware that file is readable by everyone and should not contain
|
||||
confidential credentials.
|
||||
|
||||
Related to rhbz#1008994, rhbz#1008977
|
||||
---
|
||||
src/include/internal_libreport.h | 3 +++
|
||||
src/plugins/bugzilla.conf | 5 +++++
|
||||
src/plugins/reporter-bugzilla.c | 8 ++++++++
|
||||
3 files changed, 16 insertions(+)
|
||||
|
||||
diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
|
||||
index 1df4cba3..b3c7584b 100644
|
||||
--- a/src/include/internal_libreport.h
|
||||
+++ b/src/include/internal_libreport.h
|
||||
@@ -89,6 +89,9 @@ int vdprintf(int d, const char *format, va_list ap);
|
||||
#define CREATE_PRIVATE_TICKET "ABRT_CREATE_PRIVATE_TICKET"
|
||||
#define STOP_ON_NOT_REPORTABLE "ABRT_STOP_ON_NOT_REPORTABLE"
|
||||
|
||||
+/* path of user's local config, path is relative to user's home */
|
||||
+#define USER_HOME_CONFIG_PATH "/.config/libreport"
|
||||
+
|
||||
/* Pull in entire public libreport API */
|
||||
#include "global_configuration.h"
|
||||
#include "dump_dir.h"
|
||||
diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
|
||||
index faa3ab2e..a7727392 100644
|
||||
--- a/src/plugins/bugzilla.conf
|
||||
+++ b/src/plugins/bugzilla.conf
|
||||
@@ -1,7 +1,12 @@
|
||||
+# NOTE this file is readable by everyone, do NOT store here sensitive data,
|
||||
+# for such cases should be used config file in user's home,
|
||||
+# i.e.: $HOME/.config/libreport/bugzilla.conf
|
||||
+
|
||||
# Bugzilla URL, defaults to BUG_REPORT_URL from /etc/os-release
|
||||
# BugzillaURL = https://bugzilla.example.com/
|
||||
# yes means that ssl certificates will be checked
|
||||
SSLVerify = yes
|
||||
+
|
||||
# your login has to exist, if you don't have any, please create one
|
||||
Login =
|
||||
# your password
|
||||
diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
|
||||
index 67ac4d11..1571b752 100644
|
||||
--- a/src/plugins/reporter-bugzilla.c
|
||||
+++ b/src/plugins/reporter-bugzilla.c
|
||||
@@ -214,6 +214,7 @@ static
|
||||
void login(struct abrt_xmlrpc *client, struct bugzilla_struct *rhbz)
|
||||
{
|
||||
log_warning(_("Logging into Bugzilla at %s"), rhbz->b_bugzilla_url);
|
||||
+
|
||||
while (!rhbz_login(client, rhbz->b_login, rhbz->b_password))
|
||||
{
|
||||
char *question;
|
||||
@@ -281,9 +282,11 @@ int main(int argc, char **argv)
|
||||
"\nfiled. The default value is 'ABRT Server'"
|
||||
"\n"
|
||||
"\nIf not specified, CONFFILE defaults to "CONF_DIR"/plugins/bugzilla.conf"
|
||||
+ "\nand user's local ~"USER_HOME_CONFIG_PATH"/bugzilla.conf."
|
||||
"\nIts lines should have 'PARAM = VALUE' format."
|
||||
"\nRecognized string parameters: BugzillaURL, Login, Password, OSRelease."
|
||||
"\nRecognized boolean parameter (VALUE should be 1/0, yes/no): SSLVerify."
|
||||
+ "\nUser's local configuration overrides the system wide configuration."
|
||||
"\nParameters can be overridden via $Bugzilla_PARAM environment variables."
|
||||
"\n"
|
||||
"\nFMTFILE and FMTFILE2 default to "CONF_DIR"/plugins/bugzilla_format.conf"
|
||||
@@ -357,7 +360,12 @@ int main(int argc, char **argv)
|
||||
|
||||
{
|
||||
if (!conf_file)
|
||||
+ {
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/bugzilla.conf");
|
||||
+ char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/bugzilla.conf", getenv("HOME"));
|
||||
+ conf_file = g_list_append(conf_file, local_conf);
|
||||
+ free(local_conf);
|
||||
+ }
|
||||
while (conf_file)
|
||||
{
|
||||
char *fn = (char *)conf_file->data;
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From d2b5f09e2757f2585eb1003fdf6db43e58013c19 Mon Sep 17 00:00:00 2001
|
||||
From: Matej Marusak <mmarusak@redhat.com>
|
||||
Date: Tue, 21 Mar 2017 09:04:38 +0100
|
||||
Subject: [PATCH] reporter-s-journal: add count to default logs
|
||||
|
||||
Field count is available only in FULL dump. There are however two good
|
||||
reasons why to include this in NONE dump.
|
||||
|
||||
1. It is quite useful to know if this problem occurred first time or is it
|
||||
problem that happens a lot.
|
||||
|
||||
2. We need it for cockpit integration. If the problem happened more times it
|
||||
will have multiple logs. By comparing count in the log and real count, we can
|
||||
know, if this is the last log of the problem. (timestamps do not work ideally
|
||||
for this, since the time of problem does not equal to the time of the
|
||||
log - there is some delay)
|
||||
|
||||
Signed-off-by: Matej Marusak <mmarusak@redhat.com>
|
||||
---
|
||||
src/plugins/reporter-systemd-journal.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/plugins/reporter-systemd-journal.c b/src/plugins/reporter-systemd-journal.c
|
||||
index 957002b..d12296e 100644
|
||||
--- a/src/plugins/reporter-systemd-journal.c
|
||||
+++ b/src/plugins/reporter-systemd-journal.c
|
||||
@@ -126,6 +126,7 @@ static const char *const fields_default[] = {
|
||||
DUMPDIR_PATH ,
|
||||
FILENAME_UUID ,
|
||||
FILENAME_DUPHASH ,
|
||||
+ FILENAME_COUNT ,
|
||||
NULL
|
||||
};
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
115
0004-reporter-rhtsupport-read-configuration-from-user-s-h.patch
Normal file
115
0004-reporter-rhtsupport-read-configuration-from-user-s-h.patch
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
From cf09831f97308534a6d66a5cd1e99ec5ea646226 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 17:05:49 +0100
|
||||
Subject: [PATCH 04/22] reporter-rhtsupport: read configuration from user's
|
||||
home
|
||||
|
||||
Problem was, that /etc/libreport/plugins/rhtsupport.conf has read
|
||||
permissions set also for others and passwords are stored there as
|
||||
plain text.
|
||||
|
||||
As solution, rhtsupport.conf can be newly placed in users home:
|
||||
$HOME/.config/libreport/rhtsupport.conf
|
||||
where users can safely store their credentials, also credentials provided
|
||||
on first run of reporter-rhtsupport are stored there.
|
||||
|
||||
Added warning to /etc/libreport/plugins/rhtsupport.conf for system admin
|
||||
to be aware that file is readable by everyone and should not contain
|
||||
confidential credentials.
|
||||
|
||||
Related to rhbz#1008994, rhbz#1008977
|
||||
---
|
||||
src/lib/ureport.c | 6 +++++-
|
||||
src/plugins/report.c | 4 ++--
|
||||
src/plugins/reporter-rhtsupport.c | 10 +++++++++-
|
||||
src/plugins/rhtsupport.conf | 4 ++++
|
||||
4 files changed, 20 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
||||
index 9e8bbd6a..a595015c 100644
|
||||
--- a/src/lib/ureport.c
|
||||
+++ b/src/lib/ureport.c
|
||||
@@ -245,8 +245,12 @@ ureport_server_config_load_basic_auth(struct ureport_server_config *config,
|
||||
{
|
||||
settings = new_map_string();
|
||||
|
||||
- if (!load_plugin_conf_file("rhtsupport.conf", settings, /*skip key w/o values:*/ false))
|
||||
+ char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/rhtsupport.conf", getenv("HOME"));
|
||||
+
|
||||
+ if (!load_plugin_conf_file("rhtsupport.conf", settings, /*skip key w/o values:*/ false) &&
|
||||
+ !load_conf_file(local_conf, settings, /*skip key w/o values:*/ false))
|
||||
error_msg_and_die("Could not get RHTSupport credentials");
|
||||
+ free(local_conf);
|
||||
|
||||
username = get_map_string_item_or_NULL(settings, "Login");
|
||||
password = get_map_string_item_or_NULL(settings, "Password");
|
||||
diff --git a/src/plugins/report.c b/src/plugins/report.c
|
||||
index e6e976bf..3a5d52ca 100644
|
||||
--- a/src/plugins/report.c
|
||||
+++ b/src/plugins/report.c
|
||||
@@ -43,8 +43,8 @@ int main(int argc, char **argv)
|
||||
"first one invokes upload to RHTSupport and second - to Bugzilla.\n"
|
||||
"\n"
|
||||
"Configuration (such as login data) can be supplied via files\n"
|
||||
- CONF_DIR"/plugins/bugzilla.conf and\n"
|
||||
- CONF_DIR"/plugins/rhtsupport.conf,\n"
|
||||
+ CONF_DIR"/plugins/bugzilla.conf and $HOME"USER_HOME_CONFIG_PATH"/bugzilla.conf and\n"
|
||||
+ CONF_DIR"/plugins/rhtsupport.conf and $HOME"USER_HOME_CONFIG_PATH"/rhtsupport.conf,\n"
|
||||
"or via environment variables - read documentation of\n"
|
||||
"reporter-bugzilla and reporter-rhtsupport tools."
|
||||
);
|
||||
diff --git a/src/plugins/reporter-rhtsupport.c b/src/plugins/reporter-rhtsupport.c
|
||||
index 0ab06618..6ea92523 100644
|
||||
--- a/src/plugins/reporter-rhtsupport.c
|
||||
+++ b/src/plugins/reporter-rhtsupport.c
|
||||
@@ -509,10 +509,12 @@ int main(int argc, char **argv)
|
||||
"Reports a problem to RHTSupport.\n"
|
||||
"\n"
|
||||
"If not specified, CONFFILE defaults to "CONF_DIR"/plugins/rhtsupport.conf\n"
|
||||
+ "and user's local ~"USER_HOME_CONFIG_PATH"/rhtsupport.conf.\n"
|
||||
"Its lines should have 'PARAM = VALUE' format.\n"
|
||||
"Recognized string parameters: URL, Login, Password, BigFileURL.\n"
|
||||
"Recognized numeric parameter: BigSizeMB.\n"
|
||||
"Recognized boolean parameter (VALUE should be 1/0, yes/no): SSLVerify.\n"
|
||||
+ "User's local configuration overrides the system wide configuration.\n"
|
||||
"Parameters can be overridden via $RHTSupport_PARAM environment variables.\n"
|
||||
"\n"
|
||||
"Option -t uploads FILEs to the already created case on RHTSupport site.\n"
|
||||
@@ -521,7 +523,7 @@ int main(int argc, char **argv)
|
||||
"to enter case ID to which you want to upload the FILEs.\n"
|
||||
"\n"
|
||||
"Option -tCASE uploads FILEs to the case CASE on RHTSupport site.\n"
|
||||
- "-d DIR is ignored."
|
||||
+ "-d DIR is ignored.\n"
|
||||
"\n"
|
||||
"Option -u sends ABRT crash statistics data (uReport) before creating a new case.\n"
|
||||
"uReport configuration is loaded from UR_CONFFILE which defaults to\n"
|
||||
@@ -559,7 +561,13 @@ int main(int argc, char **argv)
|
||||
/* Parse config, extract necessary params */
|
||||
map_string_t *settings = new_map_string();
|
||||
if (!conf_file)
|
||||
+ {
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/rhtsupport.conf");
|
||||
+ char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/rhtsupport.conf", getenv("HOME"));
|
||||
+ conf_file = g_list_append(conf_file, local_conf);
|
||||
+ free(local_conf);
|
||||
+
|
||||
+ }
|
||||
while (conf_file)
|
||||
{
|
||||
const char *fn = (char *)conf_file->data;
|
||||
diff --git a/src/plugins/rhtsupport.conf b/src/plugins/rhtsupport.conf
|
||||
index 325be92d..91baa90a 100644
|
||||
--- a/src/plugins/rhtsupport.conf
|
||||
+++ b/src/plugins/rhtsupport.conf
|
||||
@@ -1,3 +1,7 @@
|
||||
+# NOTE this file is readable by everyone, do NOT store here sensitive data,
|
||||
+# for such cases should be used config file in user's home,
|
||||
+# i.e.: $HOME/.config/libreport/rhtsupport.conf
|
||||
+
|
||||
# Uncomment and specify these parameters if you want to use
|
||||
# reporter-rhtsupport and/or "report --target strata" tools
|
||||
# outside of libreport's GUI (i.e. from command line
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
From 80f063738ec40e2f6354e4f58b2d59a53d33eeb4 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 17:16:54 +0100
|
||||
Subject: [PATCH 05/22] reporter-mantisbt: read configuration from user's home
|
||||
|
||||
mantisbt.conf can be placed also in $HOME/.config/libreport/mantisbt.conf
|
||||
for security reasons
|
||||
---
|
||||
src/plugins/centos_report_event.conf | 4 ----
|
||||
src/plugins/mantisbt.conf | 4 ++++
|
||||
src/plugins/reporter-mantisbt.c | 7 +++++++
|
||||
3 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/centos_report_event.conf b/src/plugins/centos_report_event.conf
|
||||
index 8cf2a502..eb634b91 100644
|
||||
--- a/src/plugins/centos_report_event.conf
|
||||
+++ b/src/plugins/centos_report_event.conf
|
||||
@@ -10,14 +10,12 @@ EVENT=report_CentOSBugTracker type=vmcore
|
||||
EVENT=report_CentOSBugTracker type=Python component!=anaconda
|
||||
test -f component || abrt-action-save-package-data
|
||||
reporter-mantisbt \
|
||||
- -c /etc/libreport/plugins/mantisbt.conf \
|
||||
-F /etc/libreport/plugins/mantisbt_format.conf \
|
||||
-A /etc/libreport/plugins/mantisbt_formatdup.conf
|
||||
|
||||
EVENT=report_CentOSBugTracker type=Python3 component!=anaconda
|
||||
test -f component || abrt-action-save-package-data
|
||||
reporter-mantisbt \
|
||||
- -c /etc/libreport/plugins/mantisbt.conf \
|
||||
-F /etc/libreport/plugins/mantisbt_format.conf \
|
||||
-A /etc/libreport/plugins/mantisbt_formatdup.conf
|
||||
|
||||
@@ -31,12 +29,10 @@ EVENT=report_CentOSBugTracker type=CCpp duphash!=
|
||||
test -f "/etc/libreport/plugins/mantisbt_formatdup_$component.conf" \
|
||||
&& formatdup="mantisbt_formatdup_$component.conf"
|
||||
reporter-mantisbt \
|
||||
- -c /etc/libreport/plugins/mantisbt.conf \
|
||||
-F "/etc/libreport/plugins/$format" \
|
||||
-A "/etc/libreport/plugins/$formatdup"
|
||||
|
||||
EVENT=report_CentOSBugTracker analyzer=libreport
|
||||
reporter-mantisbt \
|
||||
- -c /etc/libreport/plugins/mantisbt.conf \
|
||||
-F /etc/libreport/plugins/mantisbt_format_analyzer_libreport.conf \
|
||||
-A /etc/libreport/plugins/mantisbt_formatdup_analyzer_libreport.conf
|
||||
diff --git a/src/plugins/mantisbt.conf b/src/plugins/mantisbt.conf
|
||||
index 025b9101..24f7f48e 100644
|
||||
--- a/src/plugins/mantisbt.conf
|
||||
+++ b/src/plugins/mantisbt.conf
|
||||
@@ -1,3 +1,7 @@
|
||||
+# NOTE this file is readable by everyone, do NOT store here sensitive data,
|
||||
+# for such cases should be used config file in user's home,
|
||||
+# i.e.: $HOME/.config/libreport/mantisbt.conf
|
||||
+
|
||||
# MantisBT URL
|
||||
MantisbtURL = http://localhost/mantisbt/
|
||||
# yes means that ssl certificates will be checked
|
||||
diff --git a/src/plugins/reporter-mantisbt.c b/src/plugins/reporter-mantisbt.c
|
||||
index e8afa7db..bef7a45e 100644
|
||||
--- a/src/plugins/reporter-mantisbt.c
|
||||
+++ b/src/plugins/reporter-mantisbt.c
|
||||
@@ -244,9 +244,11 @@ int main(int argc, char **argv)
|
||||
"\nfiled. The default value is 'ABRT Server'"
|
||||
"\n"
|
||||
"\nIf not specified, CONFFILE defaults to "CONF_DIR"/plugins/mantisbt.conf"
|
||||
+ "\nand user's local ~"USER_HOME_CONFIG_PATH"/mantisbt.conf."
|
||||
"\nIts lines should have 'PARAM = VALUE' format."
|
||||
"\nRecognized string parameters: MantisbtURL, Login, Password, Project, ProjectVersion."
|
||||
"\nRecognized boolean parameter (VALUE should be 1/0, yes/no): SSLVerify, CreatePrivate."
|
||||
+ "\nUser's local configuration overrides the system wide configuration."
|
||||
"\nParameters can be overridden via $Mantisbt_PARAM environment variables."
|
||||
"\n"
|
||||
"\nFMTFILE default to "CONF_DIR"/plugins/mantisbt_format.conf."
|
||||
@@ -300,7 +302,12 @@ int main(int argc, char **argv)
|
||||
|
||||
{
|
||||
if (!conf_file)
|
||||
+ {
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/mantisbt.conf");
|
||||
+ char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/mantisbt.conf", getenv("HOME"));
|
||||
+ conf_file = g_list_append(conf_file, local_conf);
|
||||
+ free(local_conf);
|
||||
+ }
|
||||
while (conf_file)
|
||||
{
|
||||
char *fn = (char *)conf_file->data;
|
||||
--
|
||||
2.14.3
|
||||
|
||||
104
0006-doc-update-to-contain-newly-added-user-s-local-confi.patch
Normal file
104
0006-doc-update-to-contain-newly-added-user-s-local-confi.patch
Normal file
|
|
@ -0,0 +1,104 @@
|
|||
From c8a11eb8a66e6cd0650411304572500fabb77b07 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 17:18:07 +0100
|
||||
Subject: [PATCH 06/22] doc: update to contain newly added user's local config
|
||||
|
||||
---
|
||||
doc/reporter-bugzilla.txt | 7 ++++++-
|
||||
doc/reporter-mantisbt.txt | 5 +++++
|
||||
doc/reporter-rhtsupport.txt | 7 ++++++-
|
||||
doc/reporter-ureport.txt | 3 ++-
|
||||
4 files changed, 19 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/doc/reporter-bugzilla.txt b/doc/reporter-bugzilla.txt
|
||||
index 2d769802..2aee41e1 100644
|
||||
--- a/doc/reporter-bugzilla.txt
|
||||
+++ b/doc/reporter-bugzilla.txt
|
||||
@@ -52,8 +52,10 @@ filed. The default value is 'ABRT Server'"
|
||||
|
||||
Configuration file
|
||||
~~~~~~~~~~~~~~~~~~
|
||||
-If not specified, CONFFILE defaults to /etc/libreport/plugins/bugzilla.conf.
|
||||
+If not specified, CONFFILE defaults to /etc/libreport/plugins/bugzilla.conf
|
||||
+and to user's local ~/.config/libreport/bugzilla.conf.
|
||||
Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
|
||||
+User's local configuration overrides the system wide configuration.
|
||||
|
||||
'Login'::
|
||||
Login to Bugzilla account.
|
||||
@@ -214,6 +216,9 @@ FILES
|
||||
/etc/libreport/plugins/bugzilla.conf::
|
||||
Configuration file.
|
||||
|
||||
+~/.config/libreport/bugzilla.conf::
|
||||
+ User's local configuration file.
|
||||
+
|
||||
/etc/libreport/plugins/bugzilla_format.conf::
|
||||
Configure formating for reporting.
|
||||
|
||||
diff --git a/doc/reporter-mantisbt.txt b/doc/reporter-mantisbt.txt
|
||||
index 92255b08..074aa4e9 100644
|
||||
--- a/doc/reporter-mantisbt.txt
|
||||
+++ b/doc/reporter-mantisbt.txt
|
||||
@@ -47,7 +47,9 @@ filed. The default value is 'ABRT Server'"
|
||||
Configuration file
|
||||
~~~~~~~~~~~~~~~~~~
|
||||
If not specified, CONFFILE defaults to /etc/libreport/plugins/mantisbt.conf.
|
||||
+and to user's local ~/.config/libreport/mantisbt.conf.
|
||||
Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
|
||||
+User's local configuration overrides the system wide configuration.
|
||||
|
||||
'Login'::
|
||||
Login to MantisBT account.
|
||||
@@ -204,6 +206,9 @@ FILES
|
||||
/etc/libreport/plugins/mantisbt.conf::
|
||||
Configuration file.
|
||||
|
||||
+~/.config/libreport/mantisbt.conf::
|
||||
+ User's local configuration file.
|
||||
+
|
||||
/etc/libreport/plugins/mantisbt_format.conf::
|
||||
Configure formating for reporting.
|
||||
|
||||
diff --git a/doc/reporter-rhtsupport.txt b/doc/reporter-rhtsupport.txt
|
||||
index 2e779bc9..e52a1525 100644
|
||||
--- a/doc/reporter-rhtsupport.txt
|
||||
+++ b/doc/reporter-rhtsupport.txt
|
||||
@@ -24,7 +24,9 @@ creating a new case.
|
||||
The URL to new case is printed to stdout and recorded in 'reported_to'
|
||||
element in DIR.
|
||||
|
||||
-If not specified, CONFFILE defaults to /etc/libreport/plugins/rhtsupport.conf.
|
||||
+If not specified, CONFFILE defaults to /etc/libreport/plugins/rhtsupport.conf
|
||||
+and to user's local ~/.config/libreport/rhtsupport.conf.
|
||||
+User's local configuration overrides the system wide configuration.
|
||||
|
||||
Option -t uploads FILEs to the already created case on RHTSupport site.
|
||||
The case ID is retrieved from directory specified by -d DIR.
|
||||
@@ -99,6 +101,9 @@ FILES
|
||||
/etc/libreport/plugins/rhtsupport.conf::
|
||||
Configuration file.
|
||||
|
||||
+~/.config/libreport/rhtsupport.conf::
|
||||
+ User's local configuration file.
|
||||
+
|
||||
SEE ALSO
|
||||
--------
|
||||
abrt_event.conf(5), rhtsupport.conf(5), rhtsupport_event.conf(5)
|
||||
diff --git a/doc/reporter-ureport.txt b/doc/reporter-ureport.txt
|
||||
index ced48b01..7deb9117 100644
|
||||
--- a/doc/reporter-ureport.txt
|
||||
+++ b/doc/reporter-ureport.txt
|
||||
@@ -52,7 +52,8 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
|
||||
Possible values are::
|
||||
|
||||
'rhts-credentials';;
|
||||
- Uses Login= and Password= values from /etc/libreport/plugins/rhtsupport.conf.
|
||||
+ Uses Login= and Password= values from /etc/libreport/plugins/rhtsupport.conf and
|
||||
+ user's local ~/.config/libreport/rhtsupport.conf.
|
||||
|
||||
'<user_name>:<password>';;
|
||||
Manually supply credentials.
|
||||
--
|
||||
2.14.3
|
||||
|
||||
24
0007-augeas-include-local-config-path.patch
Normal file
24
0007-augeas-include-local-config-path.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From e084cc0f6df7ee8d9e43592120f818755fc2d144 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 5 Dec 2017 17:19:43 +0100
|
||||
Subject: [PATCH 07/22] augeas: include local config path
|
||||
|
||||
---
|
||||
augeas/libreport.aug | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/augeas/libreport.aug b/augeas/libreport.aug
|
||||
index dd4252e6..7e89faca 100644
|
||||
--- a/augeas/libreport.aug
|
||||
+++ b/augeas/libreport.aug
|
||||
@@ -29,6 +29,7 @@ module Libreport =
|
||||
. (incl (Sys.getenv("HOME") . "/.config/abrt/settings/*"))
|
||||
. (incl (Sys.getenv("XDG_CACHE_HOME") . "/abrt/events/*"))
|
||||
. (incl (Sys.getenv("HOME") . "/.cache/abrt/events/*"))
|
||||
+ . (incl (Sys.getenv("HOME") . "/.config/libreport/*"))
|
||||
. (excl "/etc/libreport/plugins/bugzilla_format*")
|
||||
. (excl "/etc/libreport/plugins/mantisbt_format*")
|
||||
. (excl "/etc/libreport/plugins/catalog*")
|
||||
--
|
||||
2.14.3
|
||||
|
||||
48
0008-spec-fix-unowned-directories.patch
Normal file
48
0008-spec-fix-unowned-directories.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From aabecaa542bc4c5a7b230441690600981f6021bf Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kutlak <mkutlak@redhat.com>
|
||||
Date: Thu, 7 Dec 2017 11:02:12 +0100
|
||||
Subject: [PATCH 08/22] spec: fix unowned directories
|
||||
|
||||
Unistalling python{2,3}-libreport, libreport-filesystem leaves behind these directories in the system.
|
||||
|
||||
Resolves #514
|
||||
|
||||
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
||||
---
|
||||
libreport.spec.in | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 9589c8f0..056586e2 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -472,6 +472,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%dir %{_sysconfdir}/%{name}/events.d/
|
||||
%dir %{_sysconfdir}/%{name}/events/
|
||||
%dir %{_sysconfdir}/%{name}/workflows.d/
|
||||
+%dir %{_datadir}/%{name}/
|
||||
+%dir %{_datadir}/%{name}/conf.d/
|
||||
+%dir %{_datadir}/%{name}/conf.d/plugins/
|
||||
%dir %{_datadir}/%{name}/events/
|
||||
%dir %{_datadir}/%{name}/workflows/
|
||||
%dir %{_sysconfdir}/%{name}/plugins/
|
||||
@@ -515,12 +518,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_libdir}/pkgconfig/libreport-web.pc
|
||||
|
||||
%files -n python2-libreport
|
||||
-%{python_sitearch}/report/*
|
||||
-%{python_sitearch}/reportclient/*
|
||||
+%{python_sitearch}/report/
|
||||
+%{python_sitearch}/reportclient/
|
||||
|
||||
%files -n python3-libreport
|
||||
-%{python3_sitearch}/report/*
|
||||
-%{python3_sitearch}/reportclient/*
|
||||
+%{python3_sitearch}/report/
|
||||
+%{python3_sitearch}/reportclient/
|
||||
|
||||
%files cli
|
||||
%{_bindir}/report-cli
|
||||
--
|
||||
2.14.3
|
||||
|
||||
73
0009-reporter-mailx-rely-on-configured-email.patch
Normal file
73
0009-reporter-mailx-rely-on-configured-email.patch
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
From 1394000e8d06f37509bb7120fbe9231a89cb46c0 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Fri, 8 Dec 2017 16:58:13 +0100
|
||||
Subject: [PATCH 09/22] reporter-mailx: rely on configured email
|
||||
|
||||
As a side effect of the fix of rhbz#1093375, the users loosed the control
|
||||
over their reporter-mailx via configuration file:
|
||||
/etc/libreport/plugins/mailx.conf
|
||||
|
||||
This fix retains this option for the user, but still solves
|
||||
rhbz#1093375.
|
||||
|
||||
Related to rhbz#1523689, rhbz#1093375.
|
||||
---
|
||||
src/plugins/mailx.conf | 8 ++++----
|
||||
src/plugins/mailx_event.conf | 8 --------
|
||||
src/plugins/reporter-mailx.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/mailx.conf b/src/plugins/mailx.conf
|
||||
index 3b23583a..7c8fcae2 100644
|
||||
--- a/src/plugins/mailx.conf
|
||||
+++ b/src/plugins/mailx.conf
|
||||
@@ -4,9 +4,9 @@
|
||||
# and you don't want to specify parameters in every tool invocation.
|
||||
#
|
||||
# String parameters:
|
||||
-# Subject=
|
||||
-# EmailFrom=
|
||||
-# EmailTo=
|
||||
-#
|
||||
+Subject="[abrt] a crash has been detected"
|
||||
+EmailFrom="ABRT Daemon <DoNotReply>"
|
||||
+EmailTo="root@localhost"
|
||||
+
|
||||
# Boolean parameter:
|
||||
# SendBinaryData=yes/no
|
||||
diff --git a/src/plugins/mailx_event.conf b/src/plugins/mailx_event.conf
|
||||
index c138b89f..16068352 100644
|
||||
--- a/src/plugins/mailx_event.conf
|
||||
+++ b/src/plugins/mailx_event.conf
|
||||
@@ -1,15 +1,7 @@
|
||||
EVENT=notify
|
||||
- # do not rely on the default config nor on the config file
|
||||
- Mailx_Subject="[abrt] a crash has been detected" \
|
||||
- Mailx_EmailFrom="ABRT Daemon <DoNotReply>" \
|
||||
- Mailx_EmailTo="root@localhost" \
|
||||
reporter-mailx --notify-only
|
||||
|
||||
EVENT=notify-dup
|
||||
- # do not rely on the default config nor on the config file
|
||||
- Mailx_Subject="[abrt] a crash has been detected again" \
|
||||
- Mailx_EmailFrom="ABRT Daemon <DoNotReply>" \
|
||||
- Mailx_EmailTo="root@localhost" \
|
||||
reporter-mailx --notify-only
|
||||
|
||||
EVENT=report_Mailx reporter-mailx
|
||||
diff --git a/src/plugins/reporter-mailx.c b/src/plugins/reporter-mailx.c
|
||||
index 05fa1e52..2c88836f 100644
|
||||
--- a/src/plugins/reporter-mailx.c
|
||||
+++ b/src/plugins/reporter-mailx.c
|
||||
@@ -112,7 +112,7 @@ static void create_and_send_email(
|
||||
|
||||
char* env;
|
||||
env = getenv("Mailx_EmailFrom");
|
||||
- char *email_from = (env ? xstrdup(env) : xstrdup(get_map_string_item_or_NULL(settings, "EmailFrom")) ? : ask_email_address("sender", "user@localhost"));
|
||||
+ char *email_from = (env ? xstrdup(env) : xstrdup(get_map_string_item_or_NULL(settings, "EmailFrom")) ? : ask_email_address("sender", "ABRT Daemon <DoNotReply>"));
|
||||
env = getenv("Mailx_EmailTo");
|
||||
char *email_to = (env ? xstrdup(env) : xstrdup(get_map_string_item_or_NULL(settings, "EmailTo")) ? : ask_email_address("receiver", "root@localhost"));
|
||||
env = getenv("Mailx_SendBinaryData");
|
||||
--
|
||||
2.14.3
|
||||
|
||||
101
0010-reporter-bugzilla-mantisbt-rhtsupport-fix-free.patch
Normal file
101
0010-reporter-bugzilla-mantisbt-rhtsupport-fix-free.patch
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
From 288ddc7af962ace63990a3a95c9616e693b4f411 Mon Sep 17 00:00:00 2001
|
||||
From: Julius Milan <jmilan@redhat.com>
|
||||
Date: Tue, 2 Jan 2018 17:20:33 +0100
|
||||
Subject: [PATCH 10/22] reporter-{bugzilla,mantisbt,rhtsupport}: fix free
|
||||
|
||||
There was an incorrect free of string local_conf right after addition to
|
||||
the list conf_file, which caused that presence of the pointed string in
|
||||
the memory was undeterministic. As a result, local config was sometimes
|
||||
used and sometimes not.
|
||||
---
|
||||
src/plugins/reporter-bugzilla.c | 6 ++++--
|
||||
src/plugins/reporter-mantisbt.c | 5 +++--
|
||||
src/plugins/reporter-rhtsupport.c | 6 ++++--
|
||||
3 files changed, 11 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
|
||||
index 1571b752..2922e8ac 100644
|
||||
--- a/src/plugins/reporter-bugzilla.c
|
||||
+++ b/src/plugins/reporter-bugzilla.c
|
||||
@@ -359,12 +359,12 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
{
|
||||
+ char *local_conf = NULL;
|
||||
if (!conf_file)
|
||||
{
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/bugzilla.conf");
|
||||
- char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/bugzilla.conf", getenv("HOME"));
|
||||
+ local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/bugzilla.conf", getenv("HOME"));
|
||||
conf_file = g_list_append(conf_file, local_conf);
|
||||
- free(local_conf);
|
||||
}
|
||||
while (conf_file)
|
||||
{
|
||||
@@ -374,6 +374,8 @@ int main(int argc, char **argv)
|
||||
log_debug("Loaded '%s'", fn);
|
||||
conf_file = g_list_delete_link(conf_file, conf_file);
|
||||
}
|
||||
+ free(local_conf);
|
||||
+
|
||||
set_settings(&rhbz, settings);
|
||||
/* WRONG! set_settings() does not copy the strings, it merely sets up pointers
|
||||
* to settings[] dictionary:
|
||||
diff --git a/src/plugins/reporter-mantisbt.c b/src/plugins/reporter-mantisbt.c
|
||||
index bef7a45e..c2b0d0b4 100644
|
||||
--- a/src/plugins/reporter-mantisbt.c
|
||||
+++ b/src/plugins/reporter-mantisbt.c
|
||||
@@ -301,12 +301,12 @@ int main(int argc, char **argv)
|
||||
map_string_t *settings = new_map_string();
|
||||
|
||||
{
|
||||
+ char *local_conf = NULL;
|
||||
if (!conf_file)
|
||||
{
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/mantisbt.conf");
|
||||
- char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/mantisbt.conf", getenv("HOME"));
|
||||
+ local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/mantisbt.conf", getenv("HOME"));
|
||||
conf_file = g_list_append(conf_file, local_conf);
|
||||
- free(local_conf);
|
||||
}
|
||||
while (conf_file)
|
||||
{
|
||||
@@ -316,6 +316,7 @@ int main(int argc, char **argv)
|
||||
log_debug("Loaded '%s'", fn);
|
||||
conf_file = g_list_delete_link(conf_file, conf_file);
|
||||
}
|
||||
+ free(local_conf);
|
||||
|
||||
struct dump_dir *dd = NULL;
|
||||
if (abrt_hash == NULL)
|
||||
diff --git a/src/plugins/reporter-rhtsupport.c b/src/plugins/reporter-rhtsupport.c
|
||||
index 6ea92523..d11b4bd0 100644
|
||||
--- a/src/plugins/reporter-rhtsupport.c
|
||||
+++ b/src/plugins/reporter-rhtsupport.c
|
||||
@@ -560,12 +560,12 @@ int main(int argc, char **argv)
|
||||
|
||||
/* Parse config, extract necessary params */
|
||||
map_string_t *settings = new_map_string();
|
||||
+ char *local_conf = NULL;
|
||||
if (!conf_file)
|
||||
{
|
||||
conf_file = g_list_append(conf_file, (char*) CONF_DIR"/plugins/rhtsupport.conf");
|
||||
- char *local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/rhtsupport.conf", getenv("HOME"));
|
||||
+ local_conf = xasprintf("%s"USER_HOME_CONFIG_PATH"/rhtsupport.conf", getenv("HOME"));
|
||||
conf_file = g_list_append(conf_file, local_conf);
|
||||
- free(local_conf);
|
||||
|
||||
}
|
||||
while (conf_file)
|
||||
@@ -576,6 +576,8 @@ int main(int argc, char **argv)
|
||||
log_debug("Loaded '%s'", fn);
|
||||
conf_file = g_list_remove(conf_file, fn);
|
||||
}
|
||||
+ free(local_conf);
|
||||
+
|
||||
char *url = get_param_string("URL" , settings, "https://api.access.redhat.com/rs");
|
||||
char *login = get_param_string("Login" , settings, "");
|
||||
char *password = get_param_string("Password" , settings, "");
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From 26baccf32610d94944faa7eb29a8f530ddd3e2db Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:01:26 +0100
|
||||
Subject: [PATCH 11/22] This package uses names with ambiguous `python-` prefix
|
||||
in requirements.
|
||||
|
||||
According to [Fedora Packaging guidelines for Python](https://fedoraproject.org/wiki/Packaging:Python#Dependencies), packages must use names with either `python2-` or `python3-` prefix in requirements where available.
|
||||
We are aiming to rename `python-*` dependencies to `python2-*`, so we can later switch the `python-*` namespace to Python 3.
|
||||
|
||||
This PR is part of [Fedora's Switch to Python 3 effort](https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3).
|
||||
|
||||
Note that, although this PR was created automatically, we will respond to any comments or issues which you might find with it. We will keep the PR open for review for a week, and if there's no feedback we'll merge it.
|
||||
The local mock build passed, for Koji scratch build please see simple-koji-ci result.
|
||||
|
||||
*This PR was opened automatically, for source code see [here](https://pagure.io/python-fixrequires)*
|
||||
|
||||
This commit have been migrated from src.fedoraproject.org
|
||||
---
|
||||
libreport.spec.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 056586e2..ae69d65f 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -26,7 +26,7 @@ BuildRequires: %{dbus_devel}
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
-BuildRequires: python-devel
|
||||
+BuildRequires: python2-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libxml2-devel
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 4833e53ab69811559855a725069315b04ba7246d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:06:05 +0100
|
||||
Subject: [PATCH 12/22] remove rhel6 specific items and accomodate to rhel7+
|
||||
|
||||
---
|
||||
libreport.spec.in | 12 +-----------
|
||||
1 file changed, 1 insertion(+), 11 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index ae69d65f..63f5114a 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -41,7 +41,7 @@ BuildRequires: libproxy-devel
|
||||
BuildRequires: satyr-devel >= 0.24
|
||||
BuildRequires: glib2-devel >= %{glib_ver}
|
||||
|
||||
-%if 0%{?fedora} >= 24
|
||||
+%if 0%{?fedora} >= 24 || 0%{?rhel} > 7
|
||||
# A test case uses zh_CN locale to verify XML event translations
|
||||
BuildRequires: glibc-all-langpacks
|
||||
%endif
|
||||
@@ -96,11 +96,6 @@ Development headers for libreport-web
|
||||
Summary: Python bindings for report-libs
|
||||
Requires: libreport = %{version}-%{release}
|
||||
Requires: python2-dnf
|
||||
-# in report the rhtsupport is in the main package, so we need to install it too
|
||||
-# report is only in RHEL6, we do not need to carry the dependency to newer RHELs
|
||||
-%if 0%{?rhel} == 6
|
||||
-Requires: libreport-plugin-rhtsupport = %{version}-%{release}
|
||||
-%endif
|
||||
%{?python_provide:%python_provide python2-libreport}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
@@ -330,12 +325,7 @@ CFLAGS="%{optflags} -Werror" %configure \
|
||||
%if %{without bugzilla}
|
||||
--without-bugzilla \
|
||||
%endif
|
||||
-%if 0%{?rhel} == 6
|
||||
- --with-defaultdumpdirmode=0640 \
|
||||
- --disable-userownsdumpdir \
|
||||
-%else
|
||||
--enable-doxygen-docs \
|
||||
-%endif
|
||||
--disable-silent-rules
|
||||
|
||||
make %{?_smp_mflags}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
23
0013-macro-python_sitearch-is-always-defined-on-rhel7.patch
Normal file
23
0013-macro-python_sitearch-is-always-defined-on-rhel7.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
From d38ef3a3a93c1b4b623b40945fec73aff51ce0cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:07:29 +0100
|
||||
Subject: [PATCH 13/22] macro python_sitearch is always defined on rhel7+
|
||||
|
||||
---
|
||||
libreport.spec.in | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 63f5114a..bccaa78c 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -1,6 +1,3 @@
|
||||
-# platform-dependent
|
||||
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
-
|
||||
%if 0%{?suse_version}
|
||||
%bcond_with bugzilla
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
51
0014-use-usr-sbin.patch
Normal file
51
0014-use-usr-sbin.patch
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
From 801b3ec7f6e8c4f932796786e5dd8fa8a72817b8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:10:59 +0100
|
||||
Subject: [PATCH 14/22] use /usr/sbin/
|
||||
|
||||
everything rhel7+ has been moved to /usr
|
||||
---
|
||||
libreport.spec.in | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index bccaa78c..aceffa83 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -413,16 +413,16 @@ make check|| {
|
||||
}
|
||||
|
||||
%post gtk
|
||||
-/sbin/ldconfig
|
||||
+/usr/sbin/ldconfig
|
||||
# update icon cache
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
-%post -p /sbin/ldconfig
|
||||
+%post -p /usr/sbin/ldconfig
|
||||
|
||||
-%postun -p /sbin/ldconfig
|
||||
+%postun -p /usr/sbin/ldconfig
|
||||
|
||||
%postun gtk
|
||||
-/sbin/ldconfig
|
||||
+/usr/sbin/ldconfig
|
||||
if [ $1 -eq 0 ] ; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
@@ -432,10 +432,10 @@ fi
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
|
||||
-%post web -p /sbin/ldconfig
|
||||
+%post web -p /usr/sbin/ldconfig
|
||||
|
||||
|
||||
-%postun web -p /sbin/ldconfig
|
||||
+%postun web -p /usr/sbin/ldconfig
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc README.md
|
||||
--
|
||||
2.14.3
|
||||
|
||||
24
0015-move-defattr-which-match-the-defaults.patch
Normal file
24
0015-move-defattr-which-match-the-defaults.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From ed12ae25790361aac42427983f78896cef0f16e9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:11:38 +0100
|
||||
Subject: [PATCH 15/22] move defattr which match the defaults
|
||||
|
||||
---
|
||||
libreport.spec.in | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index aceffa83..35daae72 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -552,7 +552,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_mandir}/man*/reporter-print.*
|
||||
|
||||
%files plugin-systemd-journal
|
||||
-%defattr(-,root,root,-)
|
||||
%{_bindir}/reporter-systemd-journal
|
||||
%{_mandir}/man*/reporter-systemd-journal.*
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
||||
34
0016-do-not-expand-macro-in-changelog.patch
Normal file
34
0016-do-not-expand-macro-in-changelog.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
From 14adfc002f06a595f9fb112f9c2afc074ebaffc7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 10 Jan 2018 09:13:18 +0100
|
||||
Subject: [PATCH 16/22] do not expand macro in changelog
|
||||
|
||||
---
|
||||
libreport.spec.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 35daae72..970e772f 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -816,7 +816,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
- build: add gettext-devel to sysdeps
|
||||
- dd: add check for validity of new file FD
|
||||
- build: configure tree for debugging by default
|
||||
-- spec: use %buildroot macro
|
||||
+- spec: use %%buildroot macro
|
||||
- spec: remove defattr which match the defaults
|
||||
- spec: do not clean buildroot
|
||||
- spec: remove Groups
|
||||
@@ -876,7 +876,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
* Fri Apr 08 2016 Matej Habrnal <mhabrnal@redhat.com> 2.7.0-1
|
||||
- ignored words: update ignored words
|
||||
- mailx: introduce debug parameter -D
|
||||
-- mailx: mail formatting: add comment right after %oneline
|
||||
+- mailx: mail formatting: add comment right after %%oneline
|
||||
- mailx: use problem report api to define an emais' content
|
||||
- lib: remove unused function make_description_bz
|
||||
- augeas: trim spaces before key value
|
||||
--
|
||||
2.14.3
|
||||
|
||||
157
0017-reporter-rhtsupport-Remove-dependency-on-redhat-acce.patch
Normal file
157
0017-reporter-rhtsupport-Remove-dependency-on-redhat-acce.patch
Normal file
|
|
@ -0,0 +1,157 @@
|
|||
From 8fddcea966d381ffb3003dbde088e6fdafe57c04 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kutlak <mkutlak@redhat.com>
|
||||
Date: Thu, 11 Jan 2018 15:51:19 +0100
|
||||
Subject: [PATCH 17/22] reporter-rhtsupport: Remove dependency on
|
||||
redhat-access-insights
|
||||
|
||||
The package is going away/will no longer include the certificate.
|
||||
|
||||
Libreport will package the certificate directly.
|
||||
|
||||
Related to #1524481
|
||||
|
||||
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
||||
---
|
||||
configure.ac | 11 +++++
|
||||
libreport.spec.in | 9 ++--
|
||||
src/lib/ureport.c | 2 +-
|
||||
src/plugins/Makefile.am | 6 +++
|
||||
src/plugins/cert-api.access.redhat.com.pem | 74 ++++++++++++++++++++++++++++++
|
||||
5 files changed, 98 insertions(+), 4 deletions(-)
|
||||
create mode 100644 src/plugins/cert-api.access.redhat.com.pem
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 73ebe3a9..5717248a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -172,6 +172,17 @@ do
|
||||
done
|
||||
fi dnl end NO_MANTISBT
|
||||
|
||||
+dnl enable import of certificate for rhtsupport plugin
|
||||
+AC_ARG_ENABLE([import-rhtsupport-cert],
|
||||
+AS_HELP_STRING([--enable-import-rhtsupport-cert],
|
||||
+ [import certificate needed for rhtsupport plugin (default is NO)]),
|
||||
+[], [enable_import_rhtsupport_cert="no"])
|
||||
+
|
||||
+AS_IF([test "x$enable_import_rhtsupport_cert" != "xno"],
|
||||
+AM_CONDITIONAL(ENABLE_IMPORT_RHTSUPPORT_CERT, true),
|
||||
+AM_CONDITIONAL(ENABLE_IMPORT_RHTSUPPORT_CERT, false))
|
||||
+
|
||||
+
|
||||
AC_ARG_WITH(python2,
|
||||
AS_HELP_STRING([--with-python2],[use python2 (default is YES)]),
|
||||
LIBREPORT_PARSE_WITH([python2]))
|
||||
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
||||
index a595015c..6f1c05a3 100644
|
||||
--- a/src/lib/ureport.c
|
||||
+++ b/src/lib/ureport.c
|
||||
@@ -40,7 +40,7 @@
|
||||
* macro for cert name. Cert path can be easily modified for example by reading
|
||||
* an environment variable LIBREPORT_DEBUG_AUTHORITY_CERT_DIR_PATH
|
||||
*/
|
||||
-#define CERT_AUTHORITY_CERT_PATH "/etc/redhat-access-insights"
|
||||
+#define CERT_AUTHORITY_CERT_PATH "/etc/libreport"
|
||||
#define CERT_AUTHORITY_CERT_NAME "cert-api.access.redhat.com.pem"
|
||||
|
||||
static char *
|
||||
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
||||
index f73e7dce..b228602a 100644
|
||||
--- a/src/plugins/Makefile.am
|
||||
+++ b/src/plugins/Makefile.am
|
||||
@@ -28,6 +28,12 @@ pluginsconfdir = $(PLUGINS_CONF_DIR)
|
||||
|
||||
reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
|
||||
|
||||
+if ENABLE_IMPORT_RHTSUPPORT_CERT
|
||||
+libreportconfdir = $(CONF_DIR)
|
||||
+dist_libreportconf_DATA = \
|
||||
+ cert-api.access.redhat.com.pem
|
||||
+endif
|
||||
+
|
||||
reporters_plugin_conf =
|
||||
reporters_plugin_format_conf =
|
||||
if BUILD_BUGZILLA
|
||||
diff --git a/src/plugins/cert-api.access.redhat.com.pem b/src/plugins/cert-api.access.redhat.com.pem
|
||||
new file mode 100644
|
||||
index 00000000..20ef8c00
|
||||
--- /dev/null
|
||||
+++ b/src/plugins/cert-api.access.redhat.com.pem
|
||||
@@ -0,0 +1,74 @@
|
||||
+-----BEGIN CERTIFICATE-----
|
||||
+MIIHZDCCBUygAwIBAgIJAOb+QiglyeZeMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
|
||||
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
|
||||
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
|
||||
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
|
||||
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTAwMzE3MTkwMDQ0WhcNMzAw
|
||||
+MzEyMTkwMDQ0WjCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9s
|
||||
+aW5hMRAwDgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgw
|
||||
+FgYDVQQLDA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1h
|
||||
+c3RlciBDQTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tMIIC
|
||||
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2Z+mW7OYcBcGxWS+RSKG2GJ2
|
||||
+csMXiGGfEp36vKVsIvypmNS60SkicKENMYREalbdSjrgfXxPJygZWsVWJ5lHPfBV
|
||||
+o3WkFrFHTIXd/R6LxnaHD1m8Cx3GwEeuSlE/ASjc1ePtMnsHH7xqZ9wdl85b1C8O
|
||||
+scgO7fwuM192kvv/veI/BogIqUQugtG6szXpV8dp4ml029LXFoNIy2lfFoa2wKYw
|
||||
+MiUHwtYgAz7TDY63e8qGhd5PoqTv9XKQogo2ze9sF9y/npZjliNy5qf6bFE+24oW
|
||||
+E8pGsp3zqz8h5mvw4v+tfIx5uj7dwjDteFrrWD1tcT7UmNrBDWXjKMG81zchq3h4
|
||||
+etgF0iwMHEuYuixiJWNzKrLNVQbDmcLGNOvyJfq60tM8AUAd72OUQzivBegnWMit
|
||||
+CLcT5viCT1AIkYXt7l5zc/duQWLeAAR2FmpZFylSukknzzeiZpPclRziYTboDYHq
|
||||
+revM97eER1xsfoSYp4mJkBHfdlqMnf3CWPcNgru8NbEPeUGMI6+C0YvknPlqDDtU
|
||||
+ojfl4qNdf6nWL+YNXpR1YGKgWGWgTU6uaG8Sc6qGfAoLHh6oGwbuz102j84OgjAJ
|
||||
+DGv/S86svmZWSqZ5UoJOIEqFYrONcOSgztZ5tU+gP4fwRIkTRbTEWSgudVREOXhs
|
||||
+bfN1YGP7HYvS0OiBKZUCAwEAAaOCAX0wggF5MB0GA1UdDgQWBBSIS6ZFxEbsj9bP
|
||||
+pvYazyY8kMx/FzCB5QYDVR0jBIHdMIHagBSIS6ZFxEbsj9bPpvYazyY8kMx/F6GB
|
||||
+tqSBszCBsDELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAw
|
||||
+DgYDVQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRgwFgYDVQQL
|
||||
+DA9SZWQgSGF0IE5ldHdvcmsxHjAcBgNVBAMMFUVudGl0bGVtZW50IE1hc3RlciBD
|
||||
+QTEkMCIGCSqGSIb3DQEJARYVY2Etc3VwcG9ydEByZWRoYXQuY29tggkA5v5CKCXJ
|
||||
+5l4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgEG
|
||||
+MCAGA1UdEQQZMBeBFWNhLXN1cHBvcnRAcmVkaGF0LmNvbTAgBgNVHRIEGTAXgRVj
|
||||
+YS1zdXBwb3J0QHJlZGhhdC5jb20wDQYJKoZIhvcNAQEFBQADggIBAJ1hEdNBDTRr
|
||||
+6kI6W6stoogSUwjuiWPDY8DptwGhdpyIfbCoxvBR7F52DlwyXOpCunogfKMRklnE
|
||||
+gH1Wt66RYkgNuJcenKHAhR5xgSLoPCOVF9rDjMunyyBuxjIbctM21R7BswVpsEIE
|
||||
+OpV5nlJ6wkHsrn0/E+Zk5UJdCzM+Fp4hqHtEn/c97nvRspQcpWeDg6oUvaJSZTGM
|
||||
+8yFpzR90X8ZO4rOgpoERukvYutUfJUzZuDyS3LLc6ysamemH93rZXr52zc4B+C9G
|
||||
+Em8zemDgIPaH42ce3C3TdVysiq/yk+ir7pxW8toeavFv75l1UojFSjND+Q2AlNQn
|
||||
+pYkmRznbD5TZ3yDuPFQG2xYKnMPACepGgKZPyErtOIljQKCdgcvb9EqNdZaJFz1+
|
||||
+/iWKYBL077Y0CKwb+HGIDeYdzrYxbEd95YuVU0aStnf2Yii2tLcpQtK9cC2+DXjL
|
||||
+Yf3kQs4xzH4ZejhG9wzv8PGXOS8wHYnfVNA3+fclDEQ1mEBKWHHmenGI6QKZUP8f
|
||||
+g0SQ3PNRnSZu8R+rhABOEuVFIBRlaYijg2Pxe0NgL9FlHsNyRfo6EUrB2QFRKACW
|
||||
+3Mo6pZyDjQt7O8J7l9B9IIURoJ1niwygf7VSJTMl2w3fFleNJlZTGgdXw0V+5g+9
|
||||
+Kg6Ay0rrsi4nw1JHue2GvdjdfVOaWSWC
|
||||
+-----END CERTIFICATE-----
|
||||
+-----BEGIN CERTIFICATE-----
|
||||
+MIIFfTCCA2WgAwIBAgIJAJGKz8qFAAADMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
|
||||
+VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp
|
||||
+Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0
|
||||
+d29yazEeMBwGA1UEAwwVRW50aXRsZW1lbnQgTWFzdGVyIENBMSQwIgYJKoZIhvcN
|
||||
+AQkBFhVjYS1zdXBwb3J0QHJlZGhhdC5jb20wHhcNMTUwNTA1MTMwMzQ4WhcNMjUw
|
||||
+NTAyMTMwMzQ4WjCBiTELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5PUlRIIENBUk9M
|
||||
+SU5BMRAwDgYDVQQHEwdSYWxlaWdoMRAwDgYDVQQKEwdSZWQgSGF0MRgwFgYDVQQL
|
||||
+Ew9SZWQgSGF0IE5ldHdvcmsxIzAhBgNVBAMTGmNlcnQtYXBpLmFjY2Vzcy5yZWRo
|
||||
+YXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9hTNMtZMa7Kg
|
||||
+Jlux6pnuUinP0Rv0aiiPFr7qNHFore4loGrPlpzUvQbUByy3xm7lhf4R4qbINCls
|
||||
+veWg6HDidvQr174RXb5YLMXuBrYAiPWQTrRRLNuvXFHKzREghRWTv48IXTIDEo0G
|
||||
+fZJUO+myY2RfwqugZKic5dR6ZakHSSpQO70O6H5R0eHlKa13k4eEpG2fVY/xqFto
|
||||
+WkfZyEmSacZpqxp7gIjZqreLc4MFwpiVjGFrK3Jk+Px1Z6J94LTLx2SxrYzWIeUs
|
||||
+5j+lceQOvpV4/pkClnRCW1pkCKTccjFKQkpNPGwdIusRXUGl9IYc20Fa/7g9iUQc
|
||||
+5fXu9EAzfwIDAQABo4G+MIG7MAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
|
||||
+MAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcDATA5BglghkgBhvhCAQ0E
|
||||
+LBYqTWFuYWdlZCBieSBSZWQgSGF0IChjYS1zdXBwb3J0QHJlZGhhdC5jb20pMB0G
|
||||
+A1UdDgQWBBRfgCjd8aXf0U4VX8DKTVIn+paGBzAfBgNVHSMEGDAWgBSIS6ZFxEbs
|
||||
+j9bPpvYazyY8kMx/FzANBgkqhkiG9w0BAQUFAAOCAgEAlC+r6UEEp5BUkI0Rj2T+
|
||||
+1PH7oUCaGQeQoyVbGddz/WUcBk/lMMtyCEoxU+3tTwNWmCWWjYXtjoL9MlSAC/q+
|
||||
+NZfBi1iq0uuSus9JI/Uu8aRhoxTK56qGRed/JNixOHEmFn891cahIPpF0exWwtYD
|
||||
+ThwXo7Z6PI7t8EMKdSrGTOowp58yho8xYFL/Z7JmjL55Pf85GIrdiniNZd4i178J
|
||||
+07R9zsiLvdXq9mT33iJwkm+uhO+FA9d8OE3ji21pBbGUAQSWOdkemvUCsy8zANW9
|
||||
+fT+dBrMr5Buk7eaBBJ2PxECNiWLCRQJWmyff1O5zMT0daS2lBdEGUNhBZ0hnX13Q
|
||||
+kabUp0bxRrNRq+WkomP7onZhfZS6SjKm0UmwoV6o3V1ED6y7muQNRmgDpA5PcbvO
|
||||
+gl7OexNL4zcpyfMdAmTYf5yTRSvB42Yg5hVfuzPEnOIqupwES3mWkEHRlqbMUkHw
|
||||
+qIQAxIwQqZd5PdPpElQ/6j/ZT9DwW/I6zgndX2rsS0oGYcwFTkSj0/rKKkC13hk7
|
||||
+LchXMZu5ckdustM79U6OZIBairrJaL2OpR08un2nwIjgEGqhVFYc44UK1VpkE8mr
|
||||
+qvqJS6OHVlTlKcEDnhVkPS3i5qjuS/PtSq0CwH8bzYKFJayLDY/z36Zv6PdttzmU
|
||||
+Yb1NSDcJejHJ80pMINutyYQ=
|
||||
+-----END CERTIFICATE-----
|
||||
--
|
||||
2.14.3
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From 3059c9fe871c8f1779588e2763d4ed8e9ce4f61d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
|
||||
Date: Wed, 31 Jan 2018 10:14:49 +0100
|
||||
Subject: [PATCH 18/22] ldconfig and gtk-update-icon-cache is not needed in
|
||||
rawhide
|
||||
|
||||
see https://pagure.io/packaging-committee/issue/736
|
||||
---
|
||||
libreport.spec.in | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 970e772f..b6302414 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -412,6 +412,9 @@ make check|| {
|
||||
exit 1
|
||||
}
|
||||
|
||||
+%if 0%{?fedora} > 27
|
||||
+# ldconfig and gtk-update-icon-cache is not needed
|
||||
+%else
|
||||
%post gtk
|
||||
/usr/sbin/ldconfig
|
||||
# update icon cache
|
||||
@@ -431,11 +434,10 @@ fi
|
||||
%posttrans gtk
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
-
|
||||
%post web -p /usr/sbin/ldconfig
|
||||
|
||||
-
|
||||
%postun web -p /usr/sbin/ldconfig
|
||||
+%endif
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc README.md
|
||||
--
|
||||
2.14.3
|
||||
|
||||
26
0019-ureport-remove-json-c-is_error-usage.patch
Normal file
26
0019-ureport-remove-json-c-is_error-usage.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From e5a8fb6dfe5276fbd55235298bb3fd008b62d0ae Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Russell <bkylerussell@gmail.com>
|
||||
Date: Wed, 7 Feb 2018 16:01:11 -0500
|
||||
Subject: [PATCH 19/22] ureport: remove json-c is_error() usage
|
||||
|
||||
This macro has been deprecated and removed from json-c/bits.h.
|
||||
---
|
||||
src/lib/ureport.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
||||
index 6f1c05a3..c32c948a 100644
|
||||
--- a/src/lib/ureport.c
|
||||
+++ b/src/lib/ureport.c
|
||||
@@ -613,7 +613,7 @@ ureport_server_response_from_reply(post_state_t *post_state,
|
||||
|
||||
json_object *const json = json_tokener_parse(post_state->body);
|
||||
|
||||
- if (is_error(json))
|
||||
+ if (json == NULL)
|
||||
{
|
||||
error_msg(_("Unable to parse response from ureport server at '%s'"), config->ur_url);
|
||||
log_notice("%s", post_state->body);
|
||||
--
|
||||
2.14.3
|
||||
|
||||
56
0020-Revert-use-usr-sbin.patch
Normal file
56
0020-Revert-use-usr-sbin.patch
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
From a8a1121df0ab0fff04755f50cd85e30595ec8381 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kutlak <mkutlak@redhat.com>
|
||||
Date: Mon, 26 Mar 2018 16:44:26 +0200
|
||||
Subject: [PATCH 20/22] Revert "use /usr/sbin/"
|
||||
|
||||
This reverts commit 801b3ec7f6e8c4f932796786e5dd8fa8a72817b8.
|
||||
|
||||
Reverting because ldconfig is still in /sbin.
|
||||
|
||||
See https://bugzilla.redhat.com/show_bug.cgi?id=1063607
|
||||
---
|
||||
libreport.spec.in | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libreport.spec.in b/libreport.spec.in
|
||||
index 0ddb7d27..1ba007cc 100644
|
||||
--- a/libreport.spec.in
|
||||
+++ b/libreport.spec.in
|
||||
@@ -416,16 +416,16 @@ make check|| {
|
||||
# ldconfig and gtk-update-icon-cache is not needed
|
||||
%else
|
||||
%post gtk
|
||||
-/usr/sbin/ldconfig
|
||||
+/sbin/ldconfig
|
||||
# update icon cache
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
-%post -p /usr/sbin/ldconfig
|
||||
+%post -p /sbin/ldconfig
|
||||
|
||||
-%postun -p /usr/sbin/ldconfig
|
||||
+%postun -p /sbin/ldconfig
|
||||
|
||||
%postun gtk
|
||||
-/usr/sbin/ldconfig
|
||||
+/sbin/ldconfig
|
||||
if [ $1 -eq 0 ] ; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
@@ -434,9 +434,11 @@ fi
|
||||
%posttrans gtk
|
||||
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
-%post web -p /usr/sbin/ldconfig
|
||||
|
||||
-%postun web -p /usr/sbin/ldconfig
|
||||
+%post web -p /sbin/ldconfig
|
||||
+
|
||||
+
|
||||
+%postun web -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -f %{name}.lang
|
||||
--
|
||||
2.14.3
|
||||
|
||||
797
0021-Translation-updates.patch
Normal file
797
0021-Translation-updates.patch
Normal file
|
|
@ -0,0 +1,797 @@
|
|||
From 05ab224c2faf1b9e4777af159a9b65f7e5c28918 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kutlak <mkutlak@redhat.com>
|
||||
Date: Tue, 27 Mar 2018 17:10:22 +0200
|
||||
Subject: [PATCH 21/22] Translation updates
|
||||
|
||||
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
||||
---
|
||||
po/ca.po | 26 +++++-------
|
||||
po/cs.po | 7 ++--
|
||||
po/da.po | 137 +++++++++++++++++++++++++++++++++------------------------------
|
||||
po/de.po | 4 +-
|
||||
po/ta.po | 39 ++++++++++++------
|
||||
5 files changed, 113 insertions(+), 100 deletions(-)
|
||||
|
||||
diff --git a/po/ca.po b/po/ca.po
|
||||
index f6ede694..5af9c199 100644
|
||||
--- a/po/ca.po
|
||||
+++ b/po/ca.po
|
||||
@@ -9,6 +9,7 @@
|
||||
# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015. #zanata
|
||||
# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2016. #zanata
|
||||
# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017. #zanata
|
||||
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
@@ -17,7 +18,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"PO-Revision-Date: 2017-08-22 11:33-0400\n"
|
||||
+"PO-Revision-Date: 2018-02-24 11:09-0500\n"
|
||||
"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
|
||||
"Language-Team: Catalan (http://www.transifex.com/projects/p/libreport/"
|
||||
"language/ca/)\n"
|
||||
@@ -111,7 +112,7 @@ msgstr "# Executable"
|
||||
|
||||
#: ../src/cli/cli-report.c:161
|
||||
msgid "# Kernel version"
|
||||
-msgstr "# Versió del nucli del sistema operatiu"
|
||||
+msgstr "# Versió del kernel"
|
||||
|
||||
#: ../src/cli/cli-report.c:162
|
||||
msgid "# Package"
|
||||
@@ -643,7 +644,7 @@ msgid ""
|
||||
"passwords. The uploaded data are stored in a protected storage and only a "
|
||||
"limited number of persons can read them.</i>"
|
||||
msgstr ""
|
||||
-"Si esteu segurs que aquest problema no ha estat provocat per problemes a la "
|
||||
+"Si esteu segur que aquest problema no ha estat provocat per problemes a la "
|
||||
"xarxa ni per una configuració no vàlida i voleu ajudar-nos, feu clic al botó "
|
||||
"de pujar i proporcioneu totes les dades del problema per una anàlisi "
|
||||
"profunda.\n"
|
||||
@@ -1904,7 +1905,7 @@ msgstr "S'estan afegint els adjunts a l'error de programari %i"
|
||||
#, c-format
|
||||
msgid "Closing bug %i as duplicate of bug %i"
|
||||
msgstr ""
|
||||
-"S'està tancatnt l'error de programari %i com a duplicat de l'error de "
|
||||
+"S'està tancant l'error de programari %i com a duplicat de l'error de "
|
||||
"programari %i"
|
||||
|
||||
#: ../src/plugins/reporter-bugzilla.c:780
|
||||
@@ -1959,8 +1960,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"& [-v] [-c FITXERCONF]... -d DIR\n"
|
||||
"\n"
|
||||
-"Informa dels oops del nucli del sistema operatiu al lloc kerneloops.org (o "
|
||||
-"similar).\n"
|
||||
+"Informa dels oops del kernel al lloc kerneloops.org (o similar).\n"
|
||||
"\n"
|
||||
"Els fitxers amb els noms llistats a $EXCLUDE_FROM_REPORT no estan inclosos\n"
|
||||
"a l'arxiu tar.\n"
|
||||
@@ -2612,7 +2612,7 @@ msgstr "Kerneloops.org"
|
||||
|
||||
#: ../src/plugins/report_Kerneloops.xml.in.h:2
|
||||
msgid "Send to kernel oops tracker"
|
||||
-msgstr "Envia-ho a un rastrejador oops del nucli del sistema operatiu"
|
||||
+msgstr "Envia-ho a un rastrejador oops del kernel"
|
||||
|
||||
#: ../src/plugins/report_Kerneloops.xml.in.h:3
|
||||
msgid "Kerneloops URL"
|
||||
@@ -3379,9 +3379,7 @@ msgstr ""
|
||||
|
||||
#: ../src/workflows/workflow_CentOSVmcore.xml.in.h:2
|
||||
msgid "Process the kernel crash using the CentOS infrastructure"
|
||||
-msgstr ""
|
||||
-"Processa la pana del nucli del sistema operatiu mitjançant la "
|
||||
-"infraestructura de CentOS"
|
||||
+msgstr "Processa la pana del kernel mitjançant la infraestructura de CentOS"
|
||||
|
||||
#: ../src/workflows/workflow_CentOSXorg.xml.in.h:2
|
||||
msgid "Process the X Server problem using the CentOS infrastructure"
|
||||
@@ -3420,9 +3418,7 @@ msgstr ""
|
||||
|
||||
#: ../src/workflows/workflow_FedoraVmcore.xml.in.h:2
|
||||
msgid "Process the kernel crash using the Fedora infrastructure"
|
||||
-msgstr ""
|
||||
-"Processa la pana del nucli del sistema operatiu mitjançant la "
|
||||
-"infraestructura de Fedora"
|
||||
+msgstr "Processa la pana del kernel mitjançant la infraestructura de Fedora"
|
||||
|
||||
#: ../src/workflows/workflow_FedoraXorg.xml.in.h:2
|
||||
msgid "Process the X Server problem using the Fedora infrastructure"
|
||||
@@ -3541,9 +3537,7 @@ msgstr ""
|
||||
|
||||
#: ../src/workflows/workflow_RHELBugzillaVmcore.xml.in.h:2
|
||||
msgid "Process the kernel crash using the Red Hat infrastructure"
|
||||
-msgstr ""
|
||||
-"Processa la pana del nucli del sistema operatiu mitjançant la "
|
||||
-"infraestructura de Red Hat"
|
||||
+msgstr "Processa la pana del kernel mitjançant la infraestructura de Red Hat"
|
||||
|
||||
#: ../src/workflows/workflow_RHELBugzillaXorg.xml.in.h:2
|
||||
msgid "Process the X Server problem using the Red Hat infrastructure"
|
||||
diff --git a/po/cs.po b/po/cs.po
|
||||
index 1f482a03..9df4dbd9 100644
|
||||
--- a/po/cs.po
|
||||
+++ b/po/cs.po
|
||||
@@ -14,6 +14,7 @@
|
||||
# Daniel Rusek <mail@asciiwolf.com>, 2017. #zanata
|
||||
# Miroslav Suchý <msuchy@redhat.com>, 2017. #zanata
|
||||
# Zdenek <chmelarz@gmail.com>, 2017. #zanata
|
||||
+# Zdenek <chmelarz@gmail.com>, 2018. #zanata
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
@@ -22,8 +23,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"PO-Revision-Date: 2017-08-07 10:36-0400\n"
|
||||
-"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
|
||||
+"PO-Revision-Date: 2018-02-20 04:46-0500\n"
|
||||
+"Last-Translator: Zdenek <chmelarz@gmail.com>\n"
|
||||
"Language-Team: Czech (http://www.transifex.com/projects/p/libreport/language/"
|
||||
"cs/)\n"
|
||||
"Language: cs\n"
|
||||
@@ -982,7 +983,7 @@ msgstr ""
|
||||
|
||||
#: ../src/include/internal_libreport.h:1228
|
||||
msgid "Be verbose"
|
||||
-msgstr "Více upovídaný"
|
||||
+msgstr "Podrobnější výstup"
|
||||
|
||||
#: ../src/include/internal_libreport.h:1229
|
||||
#: ../src/plugins/reporter-bugzilla.c:295
|
||||
diff --git a/po/da.po b/po/da.po
|
||||
index 28e0a235..e2bffb61 100644
|
||||
--- a/po/da.po
|
||||
+++ b/po/da.po
|
||||
@@ -3,6 +3,7 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
#
|
||||
# Translators:
|
||||
+# scootergrisen <scootergrisen@gmail.com>, 2018. #zanata
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
@@ -11,7 +12,7 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"PO-Revision-Date: 2015-01-08 06:51-0500\n"
|
||||
+"PO-Revision-Date: 2018-01-30 03:31-0500\n"
|
||||
"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
"Language-Team: Danish (http://www.transifex.com/projects/p/libreport/"
|
||||
"language/da/)\n"
|
||||
@@ -26,44 +27,48 @@ msgid ""
|
||||
" or: & [-vspy] -d PROBLEM_DIR\n"
|
||||
" or: & [-vspy] -x PROBLEM_DIR"
|
||||
msgstr ""
|
||||
+"& [-vsp] -L[PRÆFIKS] [PROBLEMMAPPE]\n"
|
||||
+" eller: & [-vspy] -e BEGIVENHED PROBLEMMAPPE\n"
|
||||
+" eller: & [-vspy] -d PROBLEMMAPPE\n"
|
||||
+" eller: & [-vspy] -x PROBLEMMAPPE"
|
||||
|
||||
#. short_name long_name value parameter_name help
|
||||
#: ../src/cli/cli.c:86
|
||||
msgid "List possible events [which start with PREFIX]"
|
||||
-msgstr ""
|
||||
+msgstr "Oplist mulige begivenheder [som starter med PRÆFIKS]"
|
||||
|
||||
#: ../src/cli/cli.c:87 ../src/gui-wizard-gtk/main.c:172
|
||||
msgid "Run only these events"
|
||||
-msgstr ""
|
||||
+msgstr "Kør kun disse begivenheder"
|
||||
|
||||
#: ../src/cli/cli.c:88 ../src/gui-wizard-gtk/main.c:171
|
||||
msgid "Remove PROBLEM_DIR after reporting"
|
||||
-msgstr ""
|
||||
+msgstr "Fjern PROBLEMMAPPE efter rapportering"
|
||||
|
||||
#: ../src/cli/cli.c:89 ../src/gui-wizard-gtk/main.c:173
|
||||
msgid "Expert mode"
|
||||
-msgstr ""
|
||||
+msgstr "Eksperttilstand"
|
||||
|
||||
#: ../src/cli/cli.c:90 ../src/report-newt/report-newt.c:395
|
||||
msgid "Display version and exit"
|
||||
-msgstr ""
|
||||
+msgstr "Vis version og afslut"
|
||||
|
||||
#: ../src/cli/cli.c:91
|
||||
msgid "Noninteractive: don't ask questions, assume 'yes'"
|
||||
-msgstr ""
|
||||
+msgstr "Ikke interaktiv: stil ikke spørgsmål, antag 'ja'"
|
||||
|
||||
#: ../src/cli/cli.c:93
|
||||
msgid "Log to syslog"
|
||||
-msgstr "Skriv til syslog"
|
||||
+msgstr "Log til syslog"
|
||||
|
||||
#: ../src/cli/cli.c:94 ../src/gui-wizard-gtk/main.c:170
|
||||
msgid "Add program names to log"
|
||||
-msgstr "Føj programnavne til log"
|
||||
+msgstr "Tilføj programnavne til log"
|
||||
|
||||
#: ../src/cli/cli-report.c:132
|
||||
#, c-format
|
||||
msgid "# This field is read only\n"
|
||||
-msgstr "# Dette felt er skrivebeskyttet\n"
|
||||
+msgstr "# Feltet er skrivebeskyttet\n"
|
||||
|
||||
#: ../src/cli/cli-report.c:152
|
||||
msgid "# Describe the circumstances of this crash below"
|
||||
@@ -107,7 +112,7 @@ msgstr "# Pakke"
|
||||
|
||||
#: ../src/cli/cli-report.c:163
|
||||
msgid "# Reason of crash"
|
||||
-msgstr "# Grund til nedbrud"
|
||||
+msgstr "# Årsagen til nedbrudet"
|
||||
|
||||
#: ../src/cli/cli-report.c:170
|
||||
msgid "# os-release configuration file from root dir"
|
||||
@@ -123,7 +128,7 @@ msgstr ""
|
||||
|
||||
#: ../src/cli/cli-report.c:188
|
||||
msgid "# Release string of the operating system"
|
||||
-msgstr "# Operativsystemets udgivelsesstreng"
|
||||
+msgstr "# Styresystemets udgivelsesstreng"
|
||||
|
||||
#: ../src/cli/cli-report.c:319
|
||||
msgid "Cannot run vi: $TERM, $VISUAL and $EDITOR are not set"
|
||||
@@ -345,24 +350,24 @@ msgstr ""
|
||||
#.
|
||||
#: ../src/gtk-helpers/ask_dialogs.c:87
|
||||
msgid "_No"
|
||||
-msgstr ""
|
||||
+msgstr "_Nej"
|
||||
|
||||
#: ../src/gtk-helpers/ask_dialogs.c:88
|
||||
msgid "_Yes"
|
||||
-msgstr ""
|
||||
+msgstr "_Ja"
|
||||
|
||||
#: ../src/gtk-helpers/ask_dialogs.c:94
|
||||
msgid "Don't ask me again"
|
||||
-msgstr ""
|
||||
+msgstr "Spørg mig ikke igen"
|
||||
|
||||
#. if event has no xml description
|
||||
#: ../src/gtk-helpers/config_dialog.c:182
|
||||
msgid "No description available"
|
||||
-msgstr ""
|
||||
+msgstr "Ingen beskrivelse tilgængelig"
|
||||
|
||||
#: ../src/gtk-helpers/config_dialog.c:345
|
||||
msgid "Configuration"
|
||||
-msgstr ""
|
||||
+msgstr "Konfiguration"
|
||||
|
||||
#. we can't use this, because we want the workflows first and hashtable
|
||||
#. * doesn't return the items in the order they were added
|
||||
@@ -378,15 +383,15 @@ msgstr ""
|
||||
#: ../src/gtk-helpers/config_dialog.c:369
|
||||
#: ../src/gtk-helpers/config_dialog.c:433
|
||||
msgid "Events"
|
||||
-msgstr ""
|
||||
+msgstr "Begivenheder"
|
||||
|
||||
#: ../src/gtk-helpers/config_dialog.c:373
|
||||
msgid "C_onfigure"
|
||||
-msgstr ""
|
||||
+msgstr "_Konfigurer"
|
||||
|
||||
#: ../src/gtk-helpers/config_dialog.c:375 ../src/gui-wizard-gtk/wizard.c:3702
|
||||
msgid "_Close"
|
||||
-msgstr ""
|
||||
+msgstr "_Luk"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:144
|
||||
msgid "Show password"
|
||||
@@ -394,15 +399,15 @@ msgstr "Vis adgangskode"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:275
|
||||
msgid "Don't store passwords"
|
||||
-msgstr ""
|
||||
+msgstr "Gem ikke adgangskoder"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:285
|
||||
msgid "Basic"
|
||||
-msgstr ""
|
||||
+msgstr "Grundlæggende"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:293
|
||||
msgid "Advanced"
|
||||
-msgstr ""
|
||||
+msgstr "Avanceret"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:309
|
||||
msgid "Secret Service is not available, your settings won't be saved!"
|
||||
@@ -412,12 +417,12 @@ msgstr ""
|
||||
#: ../src/gtk-helpers/workflow_config_dialog.c:94
|
||||
#: ../src/gui-wizard-gtk/wizard.c:783 ../src/gui-wizard-gtk/wizard.c:3302
|
||||
msgid "_Cancel"
|
||||
-msgstr ""
|
||||
+msgstr "_Annuller"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:351
|
||||
#: ../src/gtk-helpers/workflow_config_dialog.c:96
|
||||
msgid "_OK"
|
||||
-msgstr ""
|
||||
+msgstr "_OK"
|
||||
|
||||
#: ../src/gtk-helpers/secrets.c:171
|
||||
#, c-format
|
||||
@@ -464,19 +469,19 @@ msgstr ""
|
||||
|
||||
#: ../src/gtk-helpers/problem_details_dialog.c:30
|
||||
msgid "Problem details"
|
||||
-msgstr ""
|
||||
+msgstr "Probelmdetaljer"
|
||||
|
||||
#: ../src/gtk-helpers/problem_details_dialog.c:33
|
||||
msgid "OK"
|
||||
-msgstr ""
|
||||
+msgstr "OK"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:107
|
||||
msgid "Preferences"
|
||||
-msgstr ""
|
||||
+msgstr "Præferencer"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:110
|
||||
msgid "Quit"
|
||||
-msgstr ""
|
||||
+msgstr "Afslut"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:154
|
||||
msgid ""
|
||||
@@ -498,11 +503,11 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:774
|
||||
msgid "View/edit a text file"
|
||||
-msgstr ""
|
||||
+msgstr "Vis/rediger en tekstfil"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:782
|
||||
msgid "_Save"
|
||||
-msgstr ""
|
||||
+msgstr "_Gem"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1004
|
||||
msgid ""
|
||||
@@ -513,12 +518,12 @@ msgstr ""
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1046
|
||||
#, c-format
|
||||
msgid "(requires: %s)"
|
||||
-msgstr ""
|
||||
+msgstr "(kræver: %s)"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1060
|
||||
#, c-format
|
||||
msgid "(not needed, data already exist: %s)"
|
||||
-msgstr ""
|
||||
+msgstr "(behøves ikke, data findes allerede: %s)"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1159
|
||||
msgid ""
|
||||
@@ -557,7 +562,7 @@ msgstr "%llu byte, %u filer"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1703
|
||||
msgid "Processing was canceled"
|
||||
-msgstr ""
|
||||
+msgstr "Behandling blev annulleret"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1914
|
||||
msgid ""
|
||||
@@ -648,12 +653,12 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3303
|
||||
msgid "_Open"
|
||||
-msgstr ""
|
||||
+msgstr "_Åbn"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3325
|
||||
#, c-format
|
||||
msgid "'%s' is not an ordinary file"
|
||||
-msgstr ""
|
||||
+msgstr "'%s' er ikke en almindelig fil"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3339
|
||||
msgid "You are trying to copy a file onto itself"
|
||||
@@ -662,7 +667,7 @@ msgstr ""
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3346
|
||||
#, c-format
|
||||
msgid "Can't copy '%s': %s"
|
||||
-msgstr ""
|
||||
+msgstr "Kan ikke kopiere '%s': %s"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3361
|
||||
#, c-format
|
||||
@@ -683,7 +688,7 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3544
|
||||
msgid "Include"
|
||||
-msgstr ""
|
||||
+msgstr "Inkluder"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3555
|
||||
msgid "Name"
|
||||
@@ -695,7 +700,7 @@ msgstr "Værdi"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3599
|
||||
msgid "Problem description"
|
||||
-msgstr ""
|
||||
+msgstr "Problembeskrivelse"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3600
|
||||
msgid "Select how to report this problem"
|
||||
@@ -723,7 +728,7 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3704
|
||||
msgid "_Stop"
|
||||
-msgstr ""
|
||||
+msgstr "_Stop"
|
||||
|
||||
#. else gtk_widget_hide won't work
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3707
|
||||
@@ -733,7 +738,7 @@ msgstr ""
|
||||
#. else gtk_widget_hide won't work
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3710
|
||||
msgid "Repeat"
|
||||
-msgstr ""
|
||||
+msgstr "Gentag"
|
||||
|
||||
#. else gtk_widget_hide won't work
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3712
|
||||
@@ -790,15 +795,15 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:6
|
||||
msgid "file"
|
||||
-msgstr ""
|
||||
+msgstr "fil"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:7
|
||||
msgid "data"
|
||||
-msgstr ""
|
||||
+msgstr "data"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:8
|
||||
msgid "Search"
|
||||
-msgstr ""
|
||||
+msgstr "Søg"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:9
|
||||
msgid ""
|
||||
@@ -878,7 +883,7 @@ msgstr ""
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:25
|
||||
msgid "Show log"
|
||||
-msgstr ""
|
||||
+msgstr "Vis log"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.glade.h:26
|
||||
msgid "Reporting has finished. You can close this window now."
|
||||
@@ -893,7 +898,7 @@ msgstr ""
|
||||
|
||||
#: ../src/include/internal_libreport.h:1228
|
||||
msgid "Be verbose"
|
||||
-msgstr ""
|
||||
+msgstr "Vær uddybende"
|
||||
|
||||
#: ../src/include/internal_libreport.h:1229
|
||||
#: ../src/plugins/reporter-bugzilla.c:295
|
||||
@@ -902,12 +907,12 @@ msgstr ""
|
||||
#: ../src/plugins/reporter-systemd-journal.c:245
|
||||
#: ../src/plugins/reporter-upload.c:186 ../src/plugins/reporter-mantisbt.c:283
|
||||
msgid "Problem directory"
|
||||
-msgstr ""
|
||||
+msgstr "Problemmappe"
|
||||
|
||||
#: ../src/lib/abrt_sock.c:160
|
||||
#, c-format
|
||||
msgid "Can't delete: '%s'"
|
||||
-msgstr ""
|
||||
+msgstr "Kan ikke slette: '%s'"
|
||||
|
||||
#: ../src/lib/abrt_sock.c:196
|
||||
msgid "locked by another process"
|
||||
@@ -924,7 +929,7 @@ msgstr ""
|
||||
#: ../src/lib/abrt_sock.c:217
|
||||
#, c-format
|
||||
msgid "Can't delete '%s': %s"
|
||||
-msgstr ""
|
||||
+msgstr "Kan ikke slette '%s': %s"
|
||||
|
||||
#: ../src/lib/client.c:55 ../src/lib/client.c:87 ../src/lib/client.c:144
|
||||
msgid "y"
|
||||
@@ -1166,15 +1171,15 @@ msgstr ""
|
||||
|
||||
#: ../src/lib/make_descr.c:149 ../src/lib/make_descr.c:160
|
||||
msgid "Reported:"
|
||||
-msgstr ""
|
||||
+msgstr "Rapporteret:"
|
||||
|
||||
#: ../src/lib/make_descr.c:149
|
||||
msgid "cannot be reported"
|
||||
-msgstr ""
|
||||
+msgstr "kan ikke rapporteres"
|
||||
|
||||
#: ../src/lib/parse_options.c:63
|
||||
msgid "Usage: "
|
||||
-msgstr ""
|
||||
+msgstr "Anvendelse: "
|
||||
|
||||
#: ../src/lib/problem_data.c:252
|
||||
#, c-format
|
||||
@@ -1220,7 +1225,7 @@ msgstr ""
|
||||
#: ../src/lib/run_event.c:880
|
||||
#, c-format
|
||||
msgid "('%s' exited with %u)\n"
|
||||
-msgstr ""
|
||||
+msgstr "('%s' afsluttede med %u)\n"
|
||||
|
||||
#: ../src/plugins/abrt_rh_support.c:356
|
||||
#, c-format
|
||||
@@ -1264,7 +1269,7 @@ msgstr ""
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:1
|
||||
msgid "Bugzilla"
|
||||
-msgstr ""
|
||||
+msgstr "Bugzilla"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:2
|
||||
msgid "Report to Bugzilla bug tracker"
|
||||
@@ -1274,7 +1279,7 @@ msgstr ""
|
||||
#: ../src/plugins/report_CentOSBugTracker.xml.in.h:3
|
||||
#: ../src/plugins/report_Uploader.xml.in.h:6
|
||||
msgid "User name"
|
||||
-msgstr ""
|
||||
+msgstr "Brugernavn"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:4
|
||||
msgid "Bugzilla account user name"
|
||||
@@ -1291,7 +1296,7 @@ msgstr ""
|
||||
#: ../src/plugins/report_RHTSupport.xml.in.h:5
|
||||
#: ../src/plugins/report_Uploader.xml.in.h:8
|
||||
msgid "Password"
|
||||
-msgstr ""
|
||||
+msgstr "Adgangskode"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:7
|
||||
msgid "Bugzilla account password"
|
||||
@@ -1310,7 +1315,7 @@ msgstr ""
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:10
|
||||
msgid "Groups"
|
||||
-msgstr ""
|
||||
+msgstr "Grupper"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:11
|
||||
msgid ""
|
||||
@@ -1320,7 +1325,7 @@ msgstr ""
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:12
|
||||
msgid "Bugzilla URL"
|
||||
-msgstr ""
|
||||
+msgstr "Bugzilla-URL"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:13
|
||||
msgid "Address of Bugzilla server"
|
||||
@@ -1331,7 +1336,7 @@ msgstr ""
|
||||
#: ../src/plugins/report_RHTSupport.xml.in.h:11
|
||||
#: ../src/plugins/report_uReport.xml.in.h:9
|
||||
msgid "Verify SSL"
|
||||
-msgstr ""
|
||||
+msgstr "Bekræft SSL"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:15
|
||||
#: ../src/plugins/report_CentOSBugTracker.xml.in.h:13
|
||||
@@ -1342,7 +1347,7 @@ msgstr ""
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:16
|
||||
msgid "Bugzilla product"
|
||||
-msgstr ""
|
||||
+msgstr "Bugzilla-produkt"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:17
|
||||
msgid ""
|
||||
@@ -1388,7 +1393,7 @@ msgstr ""
|
||||
#: ../src/plugins/report_uReport.xml.in.h:13
|
||||
#: ../src/plugins/report_EmergencyAnalysis.xml.in.h:6
|
||||
msgid "HTTPS Proxy"
|
||||
-msgstr ""
|
||||
+msgstr "HTTPS-proxy"
|
||||
|
||||
#: ../src/plugins/report_Bugzilla.xml.in.h:23
|
||||
#: ../src/plugins/report_CentOSBugTracker.xml.in.h:21
|
||||
@@ -2842,24 +2847,24 @@ msgstr ""
|
||||
#: ../src/report-newt/report-newt.c:169 ../src/report-newt/report-newt.c:259
|
||||
#: ../src/report-newt/report-newt.c:337 ../src/report-newt/report-newt.c:354
|
||||
msgid "Ok"
|
||||
-msgstr ""
|
||||
+msgstr "OK"
|
||||
|
||||
#: ../src/report-newt/report-newt.c:68 ../src/report-newt/report-newt.c:146
|
||||
msgid "Cancel"
|
||||
-msgstr ""
|
||||
+msgstr "Annuller"
|
||||
|
||||
#: ../src/report-newt/report-newt.c:169 ../src/report-newt/report-newt.c:337
|
||||
msgid "Error"
|
||||
-msgstr ""
|
||||
+msgstr "Fejl"
|
||||
|
||||
#: ../src/report-newt/report-newt.c:256
|
||||
msgid "Reporting"
|
||||
-msgstr ""
|
||||
+msgstr "Rapportering"
|
||||
|
||||
#: ../src/report-newt/report-newt.c:276
|
||||
#, c-format
|
||||
msgid "--- Running %s ---"
|
||||
-msgstr ""
|
||||
+msgstr "--- Kører %s ---"
|
||||
|
||||
#: ../src/report-newt/report-newt.c:354
|
||||
msgid "No reporters available"
|
||||
diff --git a/po/de.po b/po/de.po
|
||||
index ff679d4e..1c4942a8 100644
|
||||
--- a/po/de.po
|
||||
+++ b/po/de.po
|
||||
@@ -13,10 +13,10 @@
|
||||
# Roman Spirgi <rspirgi@gmail.com>, 2011
|
||||
# DerDerwish <ruehlema@informatik.uni-luebeck.de>, 2011
|
||||
# noxin <transifex.com@davidmainzer.com>, 2014
|
||||
-# Roman Spirgi <rspirgi@gmail.com>, 2015. #zanata
|
||||
+# Roman Spirgi <bigant@fedoraproject.org>, 2015. #zanata
|
||||
# Georg Hasibether <georg@hasibether.at>, 2016. #zanata
|
||||
# Lisa Stemmler <lstemmle@redhat.com>, 2016. #zanata
|
||||
-# Roman Spirgi <rspirgi@gmail.com>, 2016. #zanata
|
||||
+# Roman Spirgi <bigant@fedoraproject.org>, 2016. #zanata
|
||||
# Florian H. <postfuerflo@gmail.com>, 2017. #zanata
|
||||
# Miroslav Suchý <msuchy@redhat.com>, 2017. #zanata
|
||||
# Tobias Weise <tobias.weise@web.de>, 2017. #zanata
|
||||
diff --git a/po/ta.po b/po/ta.po
|
||||
index fcda6fb5..8e8d921f 100644
|
||||
--- a/po/ta.po
|
||||
+++ b/po/ta.po
|
||||
@@ -8,6 +8,7 @@
|
||||
# I Felix <ifelix@redhat.com>, 2011
|
||||
# shkumar <shkumar@redhat.com>, 2014
|
||||
# shkumar <shkumar@redhat.com>, 2014
|
||||
+# Kirthanaa Indumathi <kiaa497@gmail.com>, 2018. #zanata
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
@@ -16,8 +17,8 @@ msgstr ""
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"PO-Revision-Date: 2015-01-08 07:02-0500\n"
|
||||
-"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
|
||||
+"PO-Revision-Date: 2018-03-14 09:38-0400\n"
|
||||
+"Last-Translator: Kirthanaa Indumathi <kiaa497@gmail.com>\n"
|
||||
"Language-Team: Tamil (http://www.transifex.com/projects/p/libreport/language/"
|
||||
"ta/)\n"
|
||||
"Language: ta\n"
|
||||
@@ -308,7 +309,7 @@ msgstr "{0} நீக்குகிறது"
|
||||
#: ../src/client-python/reportclient/debuginfo.py:413
|
||||
#, python-brace-format
|
||||
msgid "Can't remove {0}, probably contains an error log"
|
||||
-msgstr ""
|
||||
+msgstr "{0} ஐ நீக்க முடியாது, அநேகமாய் ஒரு பிழை பதிவை கொண்டுள்ளது"
|
||||
|
||||
#: ../src/client-python/reportclient/dnfdebuginfo.py:89
|
||||
msgid "Error reading repository configuration: '{0!s}'"
|
||||
@@ -420,7 +421,7 @@ msgstr "கடவுச்சொற்களை சேமிக்க வேண
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:285
|
||||
msgid "Basic"
|
||||
-msgstr ""
|
||||
+msgstr "அடிப்படை விவரங்கள்"
|
||||
|
||||
#: ../src/gtk-helpers/event_config_dialog.c:293
|
||||
msgid "Advanced"
|
||||
@@ -492,19 +493,19 @@ msgstr ""
|
||||
|
||||
#: ../src/gtk-helpers/problem_details_dialog.c:30
|
||||
msgid "Problem details"
|
||||
-msgstr ""
|
||||
+msgstr "பிரச்சனை விவரங்கள்"
|
||||
|
||||
#: ../src/gtk-helpers/problem_details_dialog.c:33
|
||||
msgid "OK"
|
||||
-msgstr ""
|
||||
+msgstr "சரி"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:107
|
||||
msgid "Preferences"
|
||||
-msgstr ""
|
||||
+msgstr "முன்னுரிமைகள்"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:110
|
||||
msgid "Quit"
|
||||
-msgstr ""
|
||||
+msgstr "வெளியேறு"
|
||||
|
||||
#: ../src/gui-wizard-gtk/main.c:154
|
||||
msgid ""
|
||||
@@ -562,16 +563,23 @@ msgid ""
|
||||
"please provide a comprehensive description of the problem you have "
|
||||
"encountered."
|
||||
msgstr ""
|
||||
+"அறியப்பட்ட சிக்கல் இல்லாமல் அது விபத்துக்குள்ளானது என்பதால், அதைக் கண்டறிய "
|
||||
+"கடினமாக இருக்கலாம். நீங்கள் சந்தித்த பிரச்சினையின் விரிவான விளக்கத்தை "
|
||||
+"அளிக்கவும்."
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1166
|
||||
msgid ""
|
||||
"Please provide a short description of the problem and please include the "
|
||||
"steps you have used to reproduce the problem."
|
||||
msgstr ""
|
||||
+"பிரச்சனைக்கு ஒரு சிறிய விளக்கத்தை வழங்கவும், தயவுசெய்து பிரச்சனை "
|
||||
+"இனப்பெருக்கம் செய்ய நீங்கள் பயன்படுத்திய வழிமுறைகளை சேர்க்கவும்."
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1173
|
||||
msgid "Please provide the steps you have used to reproduce the problem."
|
||||
msgstr ""
|
||||
+"தயவுசெய்து பிரச்சனை இனப்பெருக்கம் செய்ய நீங்கள் பயன்படுத்திய வழிமுறைகளை "
|
||||
+"சேர்க்கவும்."
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1295
|
||||
msgid "(click here to view/edit)"
|
||||
@@ -603,6 +611,11 @@ msgid ""
|
||||
"\t▫ <b>corrupted problem data</b>\n"
|
||||
"\t▫ <b>invalid configuration</b>"
|
||||
msgstr ""
|
||||
+"சிக்கலைச் செயல்படுத்த முடியவில்லை. இதற்கு பல காரணங்கள் இருக்கலாம் ஆனால் "
|
||||
+"மூன்று பொதுவானவை இவை\n"
|
||||
+"நெட்வொர்க் இணைப்பு சிக்கல்கள்\n"
|
||||
+"சிதைந்த சிக்கல் தரவு\n"
|
||||
+"தவறான உள்ளமைவு"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:1923
|
||||
msgid ""
|
||||
@@ -670,7 +683,7 @@ msgstr ""
|
||||
#: ../src/gui-wizard-gtk/wizard.c:2852
|
||||
#, c-format
|
||||
msgid "Failed to save file '%s'"
|
||||
-msgstr ""
|
||||
+msgstr "'%s' கோப்பைச் சேமிக்க முடியவில்லை "
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3035
|
||||
#, c-format
|
||||
@@ -714,15 +727,15 @@ msgstr "உருப்படி '%s' ஏற்கனவே உள்ளது
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3525
|
||||
msgid "I have experienced this problem for the first time"
|
||||
-msgstr ""
|
||||
+msgstr "நான் முதன்முறையாக இந்த சிக்கலை அனுபவித்திருக்கிறேன்"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3528
|
||||
msgid "I can reproduce this problem"
|
||||
-msgstr ""
|
||||
+msgstr "நான் இந்த பிரச்சனையை மீண்டும் ஏற்படுத்த முடியும்"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3531
|
||||
msgid "This problem occurs repeatedly"
|
||||
-msgstr ""
|
||||
+msgstr "இந்த பிரச்சனை மீண்டும் மீண்டும் நிகழ்கிறது"
|
||||
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3544
|
||||
msgid "Include"
|
||||
@@ -776,7 +789,7 @@ msgstr "பகுப்பாய்வுக்காக பதிவேற்
|
||||
#. else gtk_widget_hide won't work
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3710
|
||||
msgid "Repeat"
|
||||
-msgstr ""
|
||||
+msgstr "மீண்டும் முயற்சி செய்யவும்"
|
||||
|
||||
#. else gtk_widget_hide won't work
|
||||
#: ../src/gui-wizard-gtk/wizard.c:3712
|
||||
--
|
||||
2.14.3
|
||||
|
||||
1028
libreport.spec
1028
libreport.spec
File diff suppressed because it is too large
Load diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libreport-2.9.1.tar.gz) = 2cffb44fd8da625a9a0613f91ce3d485fe21b0a1f5932f6d6bfbdb4d41337f95c49f525556596aeef2fc3737015151d43250f287dc624f97469f087ff9213bde
|
||||
SHA512 (libreport-2.9.3.tar.gz) = f4cdf6a0ffb18db224f47391e0e8ac26491ac105051ec511e575b10a1ffbbbaa2290827ad27cc622ece5d5291141cf1083dce0d3b778657d309aa8d5d8799473
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue