Hello community,

here is the log from the commit of package trinity for openSUSE:Factory checked 
in at 2019-11-18 20:11:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trinity (Old)
 and      /work/SRC/openSUSE:Factory/.trinity.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "trinity"

Mon Nov 18 20:11:17 2019 rev:59 rq:749253 version:1.9+git.20190801

Changes:
--------
--- /work/SRC/openSUSE:Factory/trinity/trinity.changes  2019-08-28 
18:37:44.609260112 +0200
+++ /work/SRC/openSUSE:Factory/.trinity.new.26869/trinity.changes       
2019-11-18 20:11:33.085556501 +0100
@@ -1,0 +2,6 @@
+Mon Nov 18 09:13:22 UTC 2019 - Jiri Slaby <[email protected]>
+
+- add 0001-modify_ldt-include-linux-types.h-before-ASSEMBLY-1.patch and
+  0001-syscalls-remove-arch_prctl-from-x86_32.patch to fix build
+
+-------------------------------------------------------------------

New:
----
  0001-modify_ldt-include-linux-types.h-before-ASSEMBLY-1.patch
  0001-syscalls-remove-arch_prctl-from-x86_32.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ trinity.spec ++++++
--- /var/tmp/diff_new_pack.qHhQms/_old  2019-11-18 20:11:34.341555861 +0100
+++ /var/tmp/diff_new_pack.qHhQms/_new  2019-11-18 20:11:34.365555848 +0100
@@ -25,6 +25,8 @@
 Group:          Development/Tools/Other
 URL:            http://codemonkey.org.uk/projects/trinity/
 Source0:        %{name}-%{version}.tar.xz
+Patch0:         0001-modify_ldt-include-linux-types.h-before-ASSEMBLY-1.patch
+Patch1:         0001-syscalls-remove-arch_prctl-from-x86_32.patch
 
 %description
 The basic idea is fairly simple. As 'fuzz testing' suggests, we call syscalls
@@ -33,7 +35,7 @@
 Trinity differs is that the arguments it passes are not purely random.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 export CFLAGS="%{optflags}"

++++++ 0001-modify_ldt-include-linux-types.h-before-ASSEMBLY-1.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Mon, 18 Nov 2019 10:07:40 +0100
Subject: modify_ldt: include linux/types.h before ASSEMBLY == 1
Patch-mainline: submitted 2019/11/18
References: build fix

Otherwise we see a lot of:
In file included from /usr/include/bits/statx.h:30,
                 from /usr/include/sys/stat.h:446,
                 from include/files.h:3,
                 from include/shm.h:6,
                 from syscalls/x86/modify_ldt.c:12:
/usr/include/linux/stat.h:57:2: error: unknown type name '__s64'
   57 |  __s64 tv_sec;
      |  ^~~~~
/usr/include/linux/stat.h:58:2: error: unknown type name '__u32'
   58 |  __u32 tv_nsec;
      |  ^~~~~

Signed-off-by: Jiri Slaby <[email protected]>
---
 syscalls/x86/modify_ldt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syscalls/x86/modify_ldt.c b/syscalls/x86/modify_ldt.c
index f2eaf065df94..0221561a5a45 100644
--- a/syscalls/x86/modify_ldt.c
+++ b/syscalls/x86/modify_ldt.c
@@ -6,6 +6,7 @@
  */
 #include <stdlib.h>
 #include <sys/types.h>
+#include <linux/types.h> /* before __ASSEMBLY__ == 1 */
 #define __ASSEMBLY__ 1
 #include <asm/ldt.h>
 #include "sanitise.h"
-- 
2.24.0

++++++ 0001-syscalls-remove-arch_prctl-from-x86_32.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Mon, 18 Nov 2019 10:17:06 +0100
Subject: syscalls: remove arch_prctl from x86_32
Patch-mainline: submitted 2019/11/18
References: build fix

It's not defined there:
/usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: 
tables.o:(.data.rel+0x600): undefined reference to `syscall_arch_prctl'

Signed-off-by: Jiri Slaby <[email protected]>
---
 include/syscalls-i386.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/syscalls-i386.h b/include/syscalls-i386.h
index 844ef68b27f9..1d365ed7367f 100644
--- a/include/syscalls-i386.h
+++ b/include/syscalls-i386.h
@@ -395,7 +395,6 @@ struct syscalltable syscalls_i386[] = {
        { .entry = &syscall_pkey_alloc },
        { .entry = &syscall_pkey_free },
        { .entry = &syscall_statx },
-       { .entry = &syscall_arch_prctl },
        { .entry = &syscall_io_pgetevents },
        { .entry = &syscall_rseq },
        { .entry = &syscall_semget },
-- 
2.24.0


Reply via email to