Skip to content

pinktrace, sydbox: use python 3 #46302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
classabbyamp merged 2 commits into from
Oct 9, 2023
Merged

pinktrace, sydbox: use python 3 #46302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de8d60a
pinktrace: use python3
classabbyamp Sep 27, 2023
3824bd5
sydbox: update to 2.2.0.
classabbyamp Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions srcpkgs/pinktrace/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 11 additions & 0 deletions srcpkgs/sydbox/patches/missing-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
24 changes: 9 additions & 15 deletions srcpkgs/sydbox/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down