diff --git a/SOURCES/0000-lib-Seek-beginning-of-mountinfo-file.patch b/SOURCES/0000-lib-Seek-beginning-of-mountinfo-file.patch deleted file mode 100644 index 97b4523..0000000 --- a/SOURCES/0000-lib-Seek-beginning-of-mountinfo-file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c767c5b858c88aa9fad0ca3aa80e5fd18c6d830d Mon Sep 17 00:00:00 2001 -From: Matej Marusak -Date: Tue, 4 Dec 2018 09:38:32 +0100 -Subject: [PATCH 0/2] lib: Seek beginning of mountinfo file - -Signed-off-by: Matej Marusak -(cherry picked from commit c8afd2847f59278faac8d12c150db1d29f7ad622) ---- - src/lib/get_cmdline.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lib/get_cmdline.c b/src/lib/get_cmdline.c -index 83c2fb45..49d419d5 100644 ---- a/src/lib/get_cmdline.c -+++ b/src/lib/get_cmdline.c -@@ -905,6 +905,7 @@ int process_has_own_root_at(int pid_proc_fd) - close(mnt_fd); - return r; - } -+ fseek(fin, 0, SEEK_SET); - - r = get_mountinfo_for_mount_point(fin, &pid_root, "/"); - fclose(fin); -@@ -925,6 +926,7 @@ int process_has_own_root_at(int pid_proc_fd) - return r; - } - -+ fseek(fin, 0, SEEK_SET); - r = get_mountinfo_for_mount_point(fin, &system_root, "/"); - fclose(fin); - if (r) --- -2.21.0 - diff --git a/SOURCES/0001-testsuite-Correct-string-format.patch b/SOURCES/0001-testsuite-Correct-string-format.patch deleted file mode 100644 index 70fd2b7..0000000 --- a/SOURCES/0001-testsuite-Correct-string-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e8e69f0bf6f0bf067bc7f58f018a74c35d469342 Mon Sep 17 00:00:00 2001 -From: Matej Marusak -Date: Tue, 4 Dec 2018 11:47:16 +0100 -Subject: [PATCH 1/2] testsuite: Correct string format - -Signed-off-by: Matej Marusak -(cherry picked from commit 7b123846bc8baa3ff3a6ab8b4e1c5c062d666b5f) ---- - tests/reported_to.at | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/reported_to.at b/tests/reported_to.at -index ecf323d8..f95971f7 100644 ---- a/tests/reported_to.at -+++ b/tests/reported_to.at -@@ -221,7 +221,7 @@ bool parse_and_check(const char *reported_to, GList *expected) - - if(e->timestamp != c->timestamp) - { -- printf("Timestamps: '%lld' != '%lld'\n", e->timestamp, c->timestamp); -+ printf("Timestamps: '%ld' != '%ld'\n", e->timestamp, c->timestamp); - goto finish; - } - --- -2.21.0 - diff --git a/SOURCES/0002-lib-Explicitly-do-not-use-DST.patch b/SOURCES/0002-lib-Explicitly-do-not-use-DST.patch deleted file mode 100644 index 46bf669..0000000 --- a/SOURCES/0002-lib-Explicitly-do-not-use-DST.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a5fbbd2fca0c8cd2a3c0c9a898dca37addf4b2e0 Mon Sep 17 00:00:00 2001 -From: Matej Marusak -Date: Thu, 6 Dec 2018 11:59:56 +0100 -Subject: [PATCH 2/2] lib: Explicitly do not use DST - -DST = Daylight Saving Time -Value of this field is not set up by strptime and therefore value -of `tm_isdst` field is undefined. Bacause of this reason, output of -`mktime` may differ +-1 hour. - -Signed-off-by: Matej Marusak -(cherry picked from commit bd7b93d056d780df18b377f5c553611deeff2443) ---- - src/lib/iso_date_string.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/lib/iso_date_string.c b/src/lib/iso_date_string.c -index ab23f05b..cb887832 100644 ---- a/src/lib/iso_date_string.c -+++ b/src/lib/iso_date_string.c -@@ -61,6 +61,9 @@ int iso_date_string_parse(const char *date, time_t *pt) - return -EINVAL; - } - -+ // daylight saving time not in use -+ local.tm_isdst = 0; -+ - *pt = mktime(&local); - return 0; - } --- -2.21.0 - diff --git a/SOURCES/0004-replace-all-Fedora-URLs-by-corresponding-values-for-.patch b/SOURCES/0004-replace-all-Fedora-URLs-by-corresponding-values-for-.patch new file mode 100644 index 0000000..1cccb95 --- /dev/null +++ b/SOURCES/0004-replace-all-Fedora-URLs-by-corresponding-values-for-.patch @@ -0,0 +1,66 @@ +From dfc340b695d047018d38090e24a501f7b0c0dad1 Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Tue, 28 Aug 2018 15:42:33 +0200 +Subject: [PATCH] replace all Fedora URLs by corresponding values for RHEL + +Signed-off-by: Matej Habrnal +--- + src/plugins/report_EmergencyAnalysis.xml.in | 2 +- + src/plugins/report_uReport.xml.in | 2 +- + src/plugins/reporter-ureport.c | 2 +- + src/plugins/ureport.conf | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/report_EmergencyAnalysis.xml.in b/src/plugins/report_EmergencyAnalysis.xml.in +index 3fb2bd23..c00a734f 100644 +--- a/src/plugins/report_EmergencyAnalysis.xml.in ++++ b/src/plugins/report_EmergencyAnalysis.xml.in +@@ -15,7 +15,7 @@ + + + +