Add missing patches
This commit is contained in:
parent
192790dac0
commit
f8a3584fc3
|
@ -0,0 +1,17 @@
|
|||
Description: Disable test-poll test in libmissing on kfreebsd
|
||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
||||
Last-Update: 2017-06-22
|
||||
|
||||
--- libprelude-3.1.0/libmissing/tests/test-poll.c 2016-09-15 02:49:10.775000884 -0400
|
||||
+++ libprelude-3.1.0/libmissing/tests/test-poll.c 2017-06-25 12:18:46.997120157 -0400
|
||||
@@ -370,6 +370,10 @@
|
||||
{
|
||||
int result;
|
||||
|
||||
+#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
|
||||
+ exit(77);
|
||||
+#endif
|
||||
+
|
||||
#ifdef INTERACTIVE
|
||||
printf ("Please press Enter\n");
|
||||
test (test_tty, "TTY");
|
|
@ -0,0 +1,20 @@
|
|||
Description: Fix test-rwlock1 when --as-needed is the default.
|
||||
Author: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
|
||||
Forwarded: no
|
||||
Last-Update: 2018-07-25
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
--- a/libmissing/tests/test-rwlock1.c
|
||||
+++ b/libmissing/tests/test-rwlock1.c
|
||||
@@ -54,7 +54,10 @@
|
||||
|
||||
#define SUCCEED() exit (0)
|
||||
#define FAILURE() exit (1)
|
||||
-#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d\n", n), abort ())
|
||||
+/* The pointless reference to errno below is to ensure that the test binary
|
||||
+ * gets a DT_NEEDED for libpthread even if the link is done with --as-needed
|
||||
+ * (which is the default in Ubuntu) */
|
||||
+#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d errno %d\n", n, errno), abort ())
|
||||
|
||||
/* The main thread creates the waiting writer and the requesting reader threads
|
||||
in the default way; this guarantees that they have the same priority.
|
|
@ -0,0 +1,28 @@
|
|||
Description: Fix libprelude-error compilation on hurd-i386
|
||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
||||
Last-Update: 2017-06-22
|
||||
Forwarded: https://www.prelude-siem.org/issues/893
|
||||
|
||||
--- libprelude-3.1.0/src/libprelude-error/mkerrcodes.awk 2016-09-15 02:49:10.806000884 -0400
|
||||
+++ libprelude-3.1.0/src/libprelude-error/mkerrcodes.awk 2017-06-24 10:17:40.419430220 -0400
|
||||
@@ -62,7 +62,7 @@
|
||||
/^#/ { next; }
|
||||
|
||||
header {
|
||||
- if ($0 ~ /^[ \t]*[0-9]+/)
|
||||
+ if ($0 ~ /^[ \t]*[0-9]+/ || $0 ~ /^[ \t]*[(].*[)][ \tA-Za-z_0-9]*$/)
|
||||
{
|
||||
header = 0;
|
||||
|
||||
@@ -84,7 +84,10 @@
|
||||
if (/^$/)
|
||||
next;
|
||||
|
||||
- print " { " $1 ", \"" $2 "\" },";
|
||||
+ nfbak=$NF;
|
||||
+ $NF="";
|
||||
+
|
||||
+ print " { " $0 ", \"" nfbak "\" },";
|
||||
}
|
||||
|
||||
END {
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
Name: libprelude
|
||||
Version: 5.1.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Secure Connections between all Sensors and the Prelude Manager
|
||||
# Prelude is GPL-2.0+
|
||||
# libmissing is LGPL-2.1+
|
||||
|
@ -30,6 +30,9 @@ Patch6: libprelude-5.1.0-fix_awk_error.patch
|
|||
Patch7: libprelude-5.1.0-fix_py38.patch
|
||||
Patch8: libprelude-5.1.0-fix_gtkdoc_1.32.patch
|
||||
Patch9: libprelude-5.1.0-linking.patch
|
||||
Patch10: libprelude-5.1.0-fix_libprelude-error_on_gnu.patch
|
||||
Patch11: libprelude-5.1.0-disable_test-poll_on_kfreebsd.patch
|
||||
Patch12: libprelude-5.1.0-fix-test_rwlock1.patch
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: bison
|
||||
|
@ -226,7 +229,10 @@ find %{buildroot} -name '.packlist' -delete
|
|||
%doc AUTHORS ChangeLog README NEWS
|
||||
|
||||
%changelog
|
||||
* Fri Nov 09 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.1-1
|
||||
* Sun Nov 10 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.1-2
|
||||
- Add missing patches
|
||||
|
||||
* Fri Nov 08 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.1-1
|
||||
- Bump version 5.1.1
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-7
|
||||
|
|
Loading…
Reference in New Issue