Re: [PR PATCH] [Updated] pinktrace, sydbox: use python 3

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages py3/sydbox
https://github.com/void-linux/void-packages/pull/46302

pinktrace, sydbox: use python 3
- pinktrace: use python3
- sydbox: update to 2.2.0.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

cc maintainer @thypon


A patch file from https://github.com/void-linux/void-packages/pull/46302.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-py3/sydbox-46302.patch --]
[-- Type: text/x-diff, Size: 4250 bytes --]

From 662746913e0284de77cf63314641584eb1801610 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 17:52:31 -0400
Subject: [PATCH 1/2] pinktrace: use python3

---
 srcpkgs/pinktrace/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index e02aad5e533de..77ca143b27083 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -1,20 +1,21 @@
 # Template file for 'pinktrace'
 pkgname=pinktrace
 version=1.0.0
-revision=1
+revision=2
 # arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
 archs="x86_64* aarch64* i686* ppc*"
 build_style=gnu-configure
 configure_args="--enable-python"
-make_build_args="PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7"
-hostmakedepends="automake pkg-config libtool python"
-makedepends="python-devel"
-short_desc="A ptrace() wrapper library"
+make_build_args="PYTHON_CFLAGS=-I${XBPS_CROSS_BASE}/${py3_inc}"
+hostmakedepends="automake pkg-config libtool python3"
+makedepends="python3-devel"
+short_desc="Ptrace() wrapper library"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="http://dev.exherbo.org/~alip/pinktrace/"
-distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=a963359c3a66d31f8ac5b75cdc41ff0c4886df48609338771a2016c712b2f48a
+homepage="https://gitlab.exherbo.org/sydbox/pinktrace-1"
+distfiles="https://gitlab.exherbo.org/sydbox/pinktrace-1/-/archive/v${version}/pinktrace-1-v${version}.tar.gz"
+checksum=1f6675be8d023863546c125a695a1e5b0e0f9a9d72949794ae6fac35db1f41c6
+make_check=no
 
 pre_configure() {
 	./autogen.sh

From 28358577d1885c881c286657d832aedf32b8fe6b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 27 Sep 2023 19:00:45 -0400
Subject: [PATCH 2/2] sydbox: update to 2.2.0.

---
 srcpkgs/sydbox/patches/missing-include.patch | 11 +++++++++
 srcpkgs/sydbox/template                      | 24 ++++++++------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/sydbox/patches/missing-include.patch

diff --git a/srcpkgs/sydbox/patches/missing-include.patch b/srcpkgs/sydbox/patches/missing-include.patch
new file mode 100644
index 0000000000000..30becb75b14f9
--- /dev/null
+++ b/srcpkgs/sydbox/patches/missing-include.patch
@@ -0,0 +1,11 @@
+--- a/src/syscall-filter.c
++++ b/src/syscall-filter.c
+@@ -172,7 +172,7 @@
+ 	SCMP_SYS(epoll_ctl),
+ 	SCMP_SYS(epoll_ctl_old),
+ 	SCMP_SYS(epoll_pwait),
+-#ifdef __SNR_epoll_pwait2
++#ifdef __NR_epoll_pwait2
+ 	SCMP_SYS(epoll_pwait2),
+ #endif
+ 	SCMP_SYS(epoll_wait),
diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index b3fe4643fbbdb..2ab945bef8bfb 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,25 +1,19 @@
 # Template file for 'sydbox'
 pkgname=sydbox
-version=1.2.1
+version=2.2.0
 revision=1
 build_style=gnu-configure
-hostmakedepends="automake pkg-config libtool pinktrace-devel"
-makedepends="pinktrace-devel"
+hostmakedepends="automake pkg-config libtool"
+makedepends="pinktrace-devel libseccomp-devel"
 short_desc="Utility for ptrace() sandboxing"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
-homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
-distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=50a17c3639ec46ce1c9a70844b6e01888264e396d5da607aab2f20a1f204ca04
-python_version=2 #unverified
-
-# https://github.com/sydbox/pinktrace/blob/main/pinktrace/abi.h
-# implemented for x86_64 and i386 in sydbox, but pinktrace does
-# not seem to have i386, so only enable for x86_64
-case "$XBPS_TARGET_MACHINE" in
-	x86_64*) configure_args+=" --enable-seccomp" ;;
-	*) configure_args+=" --disable-seccomp" ;;
-esac
+homepage="https://sydbox.exherbolinux.org"
+distfiles="https://gitlab.exherbo.org/sydbox/sydbox-1/-/archive/v${version}/sydbox-1-v${version}.tar.gz"
+checksum=681e44816f2780f9b45a2ef601acc4174bc8336277ea6b9015aad8213b93e3c0
+# needs perlful grep which breaks masterdir
+make_check=no
+nocross="unable to properly check if seccomp is supported"
 
 pre_configure() {
 	./autogen.sh