Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2016-02-05 00:31:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-05 21:55:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2016-02-05 00:31:34.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 2 08:29:58 UTC 2016 - [email protected] + +- Update to 20160131 +- remove 0001-compat.h-add-more-macros.patch (upstream) +- remove 0002-Makefile-fix-build-with-older-glibc.patch (upstream) +- add 0001-net-protocols.c-fix-build-on-old-machines.patch + +------------------------------------------------------------------- Old: ---- 0001-compat.h-add-more-macros.patch 0002-Makefile-fix-build-with-older-glibc.patch trinity-20151230.tar.xz New: ---- 0001-net-protocols.c-fix-build-on-old-machines.patch trinity-20160131.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.jS8BYo/_old 2016-02-05 00:31:35.000000000 +0100 +++ /var/tmp/diff_new_pack.jS8BYo/_new 2016-02-05 00:31:35.000000000 +0100 @@ -17,16 +17,29 @@ Name: trinity -Version: 20151230 +Version: 20160131 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 +Patch0: 0001-net-protocols.c-fix-build-on-old-machines.patch +# SLE11-SP*, for -std=gnu11 +%if 0%{suse_version} == 1110 + +%if 0%{?product_libs_gcc_ver} == 48 +#SP4 +%define gcc_minor 8 +%else +#SP3 +%define gcc_minor 7 +%endif + +BuildRequires: gcc4%{gcc_minor} +%else BuildRequires: gcc +%endif BuildRequires: make BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,9 +53,11 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build +%if 0%{suse_version} == 1110 +export CC=gcc-4.%{gcc_minor} +%endif export CFLAGS="%{optflags}" ./configure.sh make %{?_smp_mflags} V=1 ++++++ 0001-net-protocols.c-fix-build-on-old-machines.patch ++++++ From: Jiri Slaby <[email protected]> Date: Tue, 2 Feb 2016 10:10:04 +0100 Subject: net/protocols.c: fix build on old machines Patch-mainline: no * include compat.h for PF_* constants * use PF_NFC only if it can fit into the list * use PF_ALG only if USE_IF_ALG is defined Signed-off-by: Jiri Slaby <[email protected]> --- net/protocols.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/protocols.c b/net/protocols.c index b8ae822ea2cf..febe0fd44781 100644 --- a/net/protocols.c +++ b/net/protocols.c @@ -1,6 +1,7 @@ #include <sys/socket.h> #include "config.h" #include "net.h" +#include "compat.h" const struct protoptr net_protocols[PF_MAX] = { [PF_UNIX] = { .proto = &proto_unix }, @@ -29,7 +30,9 @@ const struct protoptr net_protocols[PF_MAX] = { #ifdef USE_CAIF [PF_CAIF] = { .proto = &proto_caif }, #endif +#if PF_NFC < PF_MAX [PF_NFC] = { .proto = &proto_nfc }, +#endif #ifdef USE_NETROM [PF_NETROM] = { .proto = &proto_netrom }, #endif @@ -43,5 +46,7 @@ const struct protoptr net_protocols[PF_MAX] = { [PF_PPPOX] = { .proto = &proto_pppol2tp }, [PF_IUCV] = { .proto = &proto_iucv }, [PF_RXRPC] = { .proto = &proto_rxrpc }, +#ifdef USE_IF_ALG [PF_ALG] = { .proto = &proto_alg }, +#endif }; -- 2.7.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jS8BYo/_old 2016-02-05 00:31:35.000000000 +0100 +++ /var/tmp/diff_new_pack.jS8BYo/_new 2016-02-05 00:31:35.000000000 +0100 @@ -3,7 +3,7 @@ <param name="url">git://github.com/kernelslacker/trinity</param> <param name="scm">git</param> <param name="filename">trinity</param> - <param name="versionformat">%ad</param> + <param name="versionformat">%cd</param> </service> <service mode="localonly" name="recompress"> <param name="file">*.tar</param> ++++++ trinity-20151230.tar.xz -> trinity-20160131.tar.xz ++++++ ++++ 6138 lines of diff (skipped)
