Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2016-01-05 21:55:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trinity (Old) and /work/SRC/openSUSE:Factory/.trinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trinity" Changes: -------- --- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2015-12-24 12:16:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2016-01-05 21:55:46.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 4 10:36:03 UTC 2016 - [email protected] + +- Update to 20151230 +- add 0001-compat.h-add-more-macros.patch +- add 0002-Makefile-fix-build-with-older-glibc.patch + +------------------------------------------------------------------- Old: ---- trinity-20151221.tar.xz New: ---- 0001-compat.h-add-more-macros.patch 0002-Makefile-fix-build-with-older-glibc.patch trinity-20151230.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.x4N79n/_old 2016-01-05 21:55:47.000000000 +0100 +++ /var/tmp/diff_new_pack.x4N79n/_new 2016-01-05 21:55:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package trinity # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: trinity -Version: 20151221 +Version: 20151230 Release: 0 Summary: A Linux System call fuzz tester License: GPL-2.0 Group: Development/Tools/Other Url: http://codemonkey.org.uk/projects/trinity/ Source0: %{name}-%{version}.tar.xz +Patch0: 0001-compat.h-add-more-macros.patch +Patch1: 0002-Makefile-fix-build-with-older-glibc.patch BuildRequires: gcc BuildRequires: make BuildRequires: xz @@ -37,6 +39,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" ++++++ 0001-compat.h-add-more-macros.patch ++++++ >From 33f71bba1cc1d2f7eb7eab26b106b9f6c4bb5e24 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 4 Jan 2016 12:00:59 +0100 Subject: [PATCH v2 1/2] compat.h: add more macros Some more RTNLGRP macros are not defined on SLE11 yet. [v2]: NVME_IOCTL_RESET is not defined on openSUSE 42.1. Include compat.h in ioctls/nvme.c. So define them in compat.h. Signed-off-by: Jiri Slaby <[email protected]> --- include/compat.h | 17 +++++++++++++++++ ioctls/nvme.c | 1 + 2 files changed, 18 insertions(+) diff --git a/include/compat.h b/include/compat.h index fda51b529b4d..65e5e3c3cc08 100644 --- a/include/compat.h +++ b/include/compat.h @@ -268,6 +268,18 @@ enum { #ifndef NETLINK_SOCK_DIAG #define NETLINK_SOCK_DIAG 4 #endif +#ifndef RTNLGRP_DCB +#define RTNLGRP_DCB 23 +#endif +#ifndef RTNLGRP_IPV4_NETCONF +#define RTNLGRP_IPV4_NETCONF 24 +#endif +#ifndef RTNLGRP_IPV6_NETCONF +#define RTNLGRP_IPV6_NETCONF 25 +#endif +#ifndef RTNLGRP_MDB +#define RTNLGRP_MDB 26 +#endif #ifndef RTNLGRP_MPLS_ROUTE #define RTNLGRP_MPLS_ROUTE 27 #endif @@ -1055,3 +1067,8 @@ struct kvm_get_htab_fd { #ifndef POLL_BUSY_LOOP #define POLL_BUSY_LOOP 0x8000 #endif + +/* linux/nvme_ioctl.h */ +#ifndef NVME_IOCTL_RESET +#define NVME_IOCTL_RESET _IO('N', 0x44) +#endif diff --git a/ioctls/nvme.c b/ioctls/nvme.c index 406ec6bc2254..2cc9f1f9d366 100644 --- a/ioctls/nvme.c +++ b/ioctls/nvme.c @@ -3,6 +3,7 @@ #include <linux/ioctl.h> #include <linux/nvme.h> +#include "compat.h" #include "utils.h" #include "ioctls.h" -- 2.6.4 ++++++ 0002-Makefile-fix-build-with-older-glibc.patch ++++++ >From b491d06befcf091fd60037d1fdc448f3ca59e874 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Mon, 4 Jan 2016 12:02:20 +0100 Subject: [PATCH v2 2/2] Makefile: fix build with older glibc man 2 clock_gettime says: Link with -lrt (only for glibc versions before 2.17). If we do not do that, we get: post-mortem.c:61: undefined reference to `clock_gettime' syscall.o: In function `__do_syscall': syscall.c:121: undefined reference to `clock_gettime' watchdog.o: In function `is_child_making_progress': watchdog.c:317: undefined reference to `clock_gettime' So introduce (standard) LDLIBS into Makefile and add -lrt there. Signed-off-by: Jiri Slaby <[email protected]> --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0cdcf4be0ae0..a70c5bd958a5 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,9 @@ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes # needed for show_backtrace() to work correctly. LDFLAGS += -rdynamic +# glibc versions before 2.17 for clock_gettime +LDLIBS += -lrt + # gcc only. ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1) CFLAGS += -Wlogical-op @@ -96,7 +99,7 @@ DEPDIR= .deps -include $(SRCS:%.c=$(DEPDIR)/%.d) trinity: version test $(OBJS) $(HEADERS) - $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS) $(LDLIBS) @mkdir -p tmp df = $(DEPDIR)/$(*D)/$(*F) -- 2.6.4 ++++++ trinity-20151221.tar.xz -> trinity-20151230.tar.xz ++++++ ++++ 2045 lines of diff (skipped)
