Hello community, here is the log from the commit of package ansilove for openSUSE:Factory checked in at 2020-07-06 16:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansilove (Old) and /work/SRC/openSUSE:Factory/.ansilove.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansilove" Mon Jul 6 16:32:16 2020 rev:6 rq:818939 version:4.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ansilove/ansilove.changes 2020-05-29 21:37:32.762680051 +0200 +++ /work/SRC/openSUSE:Factory/.ansilove.new.3060/ansilove.changes 2020-07-06 16:34:45.748170865 +0200 @@ -1,0 +2,13 @@ +Sun Jul 5 15:28:05 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 4.1.2 + * Define _GNU_SOURCE in CMakeLists.txt to avoid cluttering source + files + * No need to set HAVE_SECCOMP to 1, defining it is enough + * Remove some unneeded seccomp related includes + * Validate architectures for seccomp + * Add seccomp support on i386, tested on glibc and musl + * Remove extraneous underscore in #if defined check + * Use __NR_ instead of SYS_ prefix in #if defined checks + +------------------------------------------------------------------- Old: ---- ansilove-4.1.1.tar.gz New: ---- ansilove-4.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansilove.spec ++++++ --- /var/tmp/diff_new_pack.WZt1Vq/_old 2020-07-06 16:34:49.120181244 +0200 +++ /var/tmp/diff_new_pack.WZt1Vq/_new 2020-07-06 16:34:49.120181244 +0200 @@ -18,7 +18,7 @@ Name: ansilove -Version: 4.1.1 +Version: 4.1.2 Release: 0 Summary: ANSI and ASCII art to PNG converter License: BSD-2-Clause ++++++ ansilove-4.1.1.tar.gz -> ansilove-4.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/.travis.yml new/ansilove-4.1.2/.travis.yml --- old/ansilove-4.1.1/.travis.yml 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/.travis.yml 2020-07-04 21:38:11.000000000 +0200 @@ -35,7 +35,7 @@ coverity_scan: project: name: "ansilove/ansilove" - version: 4.1.1 + version: 4.1.2 description: "ANSi / ASCII art to PNG converter in C" notification_email: [email protected] build_command_prepend: cmake . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/CMakeLists.txt new/ansilove-4.1.2/CMakeLists.txt --- old/ansilove-4.1.1/CMakeLists.txt 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/CMakeLists.txt 2020-07-04 21:38:11.000000000 +0200 @@ -20,7 +20,7 @@ find_path(SECCOMP NAMES "linux/seccomp.h") if(SECCOMP) message(STATUS "Looking for seccomp - found") - add_definitions(-DHAVE_SECCOMP=1) + add_definitions(-DHAVE_SECCOMP) else() message(STATUS "Looking for seccomp - not found") endif() @@ -44,7 +44,7 @@ set (SRC ${SRC} compat/strtonum.c) endif() -add_definitions(-Wall -Wextra -std=c99 -pedantic) +add_definitions(-D_GNU_SOURCE -Wall -Wextra -std=c99 -pedantic) add_executable(ansilove ${SRC}) target_link_libraries(ansilove ${ANSILOVE_LIBRARIES} m) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/ChangeLog new/ansilove-4.1.2/ChangeLog --- old/ansilove-4.1.1/ChangeLog 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/ChangeLog 2020-07-04 21:38:11.000000000 +0200 @@ -1,3 +1,15 @@ +AnsiLove/C 4.1.2 (2020-07-04) + +- Define _GNU_SOURCE in CMakeLists.txt to avoid cluttering source files +- No need to set HAVE_SECCOMP to 1, defining it is enough +- Remove some unneeded seccomp related includes +- Validate architectures for seccomp +- Add seccomp support on i386, tested on glibc and musl +- Remove extraneous underscore in #if defined check +- Use __NR_ instead of SYS_ prefix in #if defined checks + + + AnsiLove/C 4.1.1 (2020-05-25) - Various documentation tweaks and improvements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/FILE_ID.DIZ new/ansilove-4.1.2/FILE_ID.DIZ --- old/ansilove-4.1.1/FILE_ID.DIZ 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/FILE_ID.DIZ 2020-07-04 21:38:11.000000000 +0200 @@ -17,7 +17,7 @@ - -----------//______|----------------- - : : | | - | Ansilove/C 4.1.1 | + | Ansilove/C 4.1.2 | | | | ANSi=>PNG converter & library | | | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/README.md new/ansilove-4.1.2/README.md --- old/ansilove-4.1.1/README.md 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/README.md 2020-07-04 21:38:11.000000000 +0200 @@ -283,7 +283,7 @@ [3]: https://www.ansilove.org [4]: https://github.com/ansilove/libansilove [5]: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/graphics/ansilove -[6]: http://pkgsrc.se/graphics/ansilove +[6]: https://pkgsrc.se/graphics/ansilove [7]: https://www.freshports.org/graphics/ansilove/ [8]: https://packages.debian.org/search?keywords=ansilove [9]: https://packages.ubuntu.com/search?keywords=ansilove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/ansilove.c new/ansilove-4.1.2/src/ansilove.c --- old/ansilove-4.1.1/src/ansilove.c 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/ansilove.c 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * ansilove.c - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -10,7 +10,6 @@ * See LICENSE file for details. */ -#define _GNU_SOURCE #include <sys/time.h> #include <ansilove.h> #include <err.h> @@ -24,9 +23,6 @@ #ifdef HAVE_SECCOMP #include <sys/prctl.h> -#include <sys/syscall.h> -#include <linux/audit.h> -#include <linux/filter.h> #include <linux/seccomp.h> #include "seccomp.h" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/config.h new/ansilove-4.1.2/src/config.h --- old/ansilove-4.1.1/src/config.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/config.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * config.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -16,7 +16,7 @@ #include <stdint.h> /* configuration defines */ -#define VERSION "4.1.1" +#define VERSION "4.1.2" enum { FONTS = 38, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/fonts.h new/ansilove-4.1.2/src/fonts.h --- old/ansilove-4.1.1/src/fonts.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/fonts.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * fonts.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/sauce.c new/ansilove-4.1.2/src/sauce.c --- old/ansilove-4.1.1/src/sauce.c 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/sauce.c 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * sauce.c - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus @@ -10,8 +10,6 @@ * See LICENSE file for details. */ -#define _XOPEN_SOURCE 700 - #include <stdint.h> #include <stdlib.h> #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/sauce.h new/ansilove-4.1.2/src/sauce.h --- old/ansilove-4.1.1/src/sauce.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/sauce.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * sauce.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/seccomp.h new/ansilove-4.1.2/src/seccomp.h --- old/ansilove-4.1.1/src/seccomp.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/seccomp.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * seccomp.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2019-2020, Frederic Cambus @@ -21,25 +21,51 @@ #include <linux/filter.h> #include <linux/seccomp.h> +#if defined(__i386__) +#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 +#elif defined(__x86_64__) +#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 +#elif defined(__aarch64__) +#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 +#else +#error "Seccomp is only supported on i386, amd64, and arm64 architectures." +#endif + #define ANSILOVE_SYSCALL_ALLOW(syscall) \ BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, __NR_##syscall, 0, 1), \ BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) static struct sock_filter filter[] = { + /* Validate architecture */ + BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, arch)), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL), + + /* Load syscall */ BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)), ANSILOVE_SYSCALL_ALLOW(brk), + ANSILOVE_SYSCALL_ALLOW(clock_gettime), /* i386 glibc */ ANSILOVE_SYSCALL_ALLOW(close), ANSILOVE_SYSCALL_ALLOW(exit_group), ANSILOVE_SYSCALL_ALLOW(fstat), +#if defined(__NR_fstat64) + ANSILOVE_SYSCALL_ALLOW(fstat64), /* i386 glibc */ +#endif ANSILOVE_SYSCALL_ALLOW(ioctl), ANSILOVE_SYSCALL_ALLOW(lseek), -#if defined(SYS_open) +#if defined(__NR__llseek) + ANSILOVE_SYSCALL_ALLOW(_llseek), /* i386 glibc */ +#endif +#if defined(__NR_open) ANSILOVE_SYSCALL_ALLOW(open), #endif ANSILOVE_SYSCALL_ALLOW(openat), ANSILOVE_SYSCALL_ALLOW(madvise), ANSILOVE_SYSCALL_ALLOW(mmap), +#if defined(__NR_mmap2) + ANSILOVE_SYSCALL_ALLOW(mmap2), /* i386 glibc */ +#endif ANSILOVE_SYSCALL_ALLOW(mremap), ANSILOVE_SYSCALL_ALLOW(munmap), ANSILOVE_SYSCALL_ALLOW(read), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/strtolower.c new/ansilove-4.1.2/src/strtolower.c --- old/ansilove-4.1.1/src/strtolower.c 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/strtolower.c 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * strtolower.c - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/strtolower.h new/ansilove-4.1.2/src/strtolower.h --- old/ansilove-4.1.1/src/strtolower.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/strtolower.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * strtolower.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/types.c new/ansilove-4.1.2/src/types.c --- old/ansilove-4.1.1/src/types.c 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/types.c 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * types.c - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansilove-4.1.1/src/types.h new/ansilove-4.1.2/src/types.h --- old/ansilove-4.1.1/src/types.h 2020-05-25 18:51:05.000000000 +0200 +++ new/ansilove-4.1.2/src/types.h 2020-07-04 21:38:11.000000000 +0200 @@ -1,6 +1,6 @@ /* * types.h - * Ansilove 4.1.1 + * Ansilove 4.1.2 * https://www.ansilove.org * * Copyright (c) 2011-2020 Stefan Vogt, Brian Cassidy, and Frederic Cambus
