Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2018-04-11 14:02:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trinity (Old) and /work/SRC/openSUSE:Factory/.trinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trinity" Wed Apr 11 14:02:54 2018 rev:51 rq:595312 version:1.9+git.20180402 Changes: -------- --- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2018-03-11 15:26:09.673256693 +0100 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2018-04-11 14:05:01.440227099 +0200 @@ -1,0 +2,13 @@ +Tue Apr 10 12:29:57 UTC 2018 - mplus...@suse.com + +- Update to version 1.9+git.20180402: + * Fix pthread undefined references + * short-circuit log handle discovery if logging disabled + * mlock: move MLOCK_ONFAULT to compat.h + * memfd: fix build with glibc 2.27 +- Drop no longer needed patches: + * memfd-do-not-redefine-memfd_create.patch + * mlock-move-MLOCK_ONFAULT-to-compat.h.patch +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- memfd-do-not-redefine-memfd_create.patch mlock-move-MLOCK_ONFAULT-to-compat.h.patch trinity-1.9+git.20180228.tar.xz New: ---- trinity-1.9+git.20180402.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.o9CGDZ/_old 2018-04-11 14:05:02.392192698 +0200 +++ /var/tmp/diff_new_pack.o9CGDZ/_new 2018-04-11 14:05:02.392192698 +0200 @@ -16,17 +16,15 @@ # -%define version_unconverted 1.9+git.20180228 +%define version_unconverted 1.9+git.20180402 Name: trinity -Version: 1.9+git.20180228 +Version: 1.9+git.20180402 Release: 0 Summary: A Linux System call fuzz tester -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Other -Url: http://codemonkey.org.uk/projects/trinity/ +URL: http://codemonkey.org.uk/projects/trinity/ Source0: %{name}-%{version}.tar.xz -Patch0: memfd-do-not-redefine-memfd_create.patch -Patch1: mlock-move-MLOCK_ONFAULT-to-compat.h.patch ExcludeArch: %ix86 %arm %description @@ -37,8 +35,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build export CFLAGS="%{optflags}" @@ -52,9 +48,9 @@ %{buildroot}%{_mandir}/man1/trinity.1 %files -%defattr(-,root,root) -%doc README COPYING +%license COPYING +%doc README %{_bindir}/trinity -%{_mandir}/man1/trinity.1%{ext_man} +%{_mandir}/man1/trinity.1%{?ext_man} %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.o9CGDZ/_old 2018-04-11 14:05:02.444190819 +0200 +++ /var/tmp/diff_new_pack.o9CGDZ/_new 2018-04-11 14:05:02.448190675 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kernelslacker/trinity</param> - <param name="changesrevision">c07cd60f942e2b4b96bd9a401d3129760a6ac308</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">43e56140a547c82aacbcfbb77f36ba2dd211a938</param></service></servicedata> \ No newline at end of file ++++++ trinity-1.9+git.20180228.tar.xz -> trinity-1.9+git.20180402.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/configure new/trinity-1.9+git.20180402/configure --- old/trinity-1.9+git.20180228/configure 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/configure 2018-04-02 19:56:53.000000000 +0200 @@ -289,6 +289,29 @@ fi ############################################################################################# +# Does glibc provide memfd_create() syscall wrapper +# +echo -n "[*] Checking if glibc provides memfd_create.. " +rm -f "$TMP" || exit 1 + +cat >"$TMP.c" << EOF +#include <sys/mman.h> + +void main() +{ + memfd_create(); +} +EOF + +${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log" +if [ ! -x "$TMP" ]; then + echo $RED "[NO]" $COL_RESET +else + echo $GREEN "[YES]" $COL_RESET + echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH +fi + +############################################################################################# check_header linux/caif/caif_socket.h USE_CAIF check_header linux/fsmap.h USE_FSMAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/fds/memfd.c new/trinity-1.9+git.20180402/fds/memfd.c --- old/trinity-1.9+git.20180228/fds/memfd.c 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/fds/memfd.c 2018-04-02 19:56:53.000000000 +0200 @@ -5,6 +5,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/mman.h> #include "fd.h" #include "memfd.h" @@ -16,6 +17,7 @@ #include "trinity.h" #include "udp.h" +#ifndef USE_MEMFD_CREATE static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag) { #ifdef SYS_memfd_create @@ -24,6 +26,7 @@ return -ENOSYS; #endif } +#endif static void memfd_destructor(struct object *obj) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/include/compat.h new/trinity-1.9+git.20180402/include/compat.h --- old/trinity-1.9+git.20180228/include/compat.h 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/include/compat.h 2018-04-02 19:56:53.000000000 +0200 @@ -1186,6 +1186,11 @@ #define POLL_BUSY_LOOP 0x8000 #endif +/* asm/mman.h */ +#ifndef MLOCK_ONFAULT +#define MLOCK_ONFAULT 0x01 +#endif + /* linux/nvme_ioctl.h */ #ifndef NVME_IOCTL_RESET #define NVME_IOCTL_RESET _IO('N', 0x44) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/output.c new/trinity-1.9+git.20180402/output.c --- old/trinity-1.9+git.20180228/output.c 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/output.c 2018-04-02 19:56:53.000000000 +0200 @@ -114,6 +114,9 @@ fflush(stdout); } + if (logging == LOGGING_DISABLED) + return; + log_handle = find_logfile_handle(); if (log_handle != NULL) { fprintf(log_handle, "%s", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/server/Makefile new/trinity-1.9+git.20180402/server/Makefile --- old/trinity-1.9+git.20180228/server/Makefile 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/server/Makefile 2018-04-02 19:56:53.000000000 +0200 @@ -29,7 +29,7 @@ # Sometimes useful for debugging. more useful with clang than gcc. #CFLAGS += -fsanitize=address -LDFLAGS = -lpthread +LDFLAGS = -pthread V = @ Q = $(V:1=) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.9+git.20180228/syscalls/mlock.c new/trinity-1.9+git.20180402/syscalls/mlock.c --- old/trinity-1.9+git.20180228/syscalls/mlock.c 2018-03-01 05:54:30.000000000 +0100 +++ new/trinity-1.9+git.20180402/syscalls/mlock.c 2018-04-02 19:56:53.000000000 +0200 @@ -7,6 +7,7 @@ #include "sanitise.h" #include "syscall.h" #include "trinity.h" +#include "compat.h" static void sanitise_mlock(__unused__ struct syscallrecord *rec) { @@ -27,8 +28,6 @@ * SYSCALL_DEFINE3(mlock2, unsigned long, start, size_t, len, int, flags) */ -#define MLOCK_ONFAULT 0x01 - struct syscallentry syscall_mlock2 = { .name = "mlock2", .num_args = 2,
