aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ali Polatel <alip@exherbo.org> 2012-08-13 14:52:10 +0300
committerAvatar Ali Polatel <alip@exherbo.org> 2012-08-13 14:52:10 +0300
commit74db029d910bcb913a6caa8b8f2e5ddc231000cd (patch)
tree72f8f77e8ed626c262d5f017253a8df9c9b27833
parent369634fc8ea7663eee1b6b04e0b068ad3deb4e46 (diff)
downloadsydbox-74db029d910bcb913a6caa8b8f2e5ddc231000cd.tar.gz
sydbox-74db029d910bcb913a6caa8b8f2e5ddc231000cd.tar.xz
Revert "require pinktrace-0.2.0 or newer"
This reverts commit 369634fc8ea7663eee1b6b04e0b068ad3deb4e46.
-rw-r--r--configure.ac8
-rw-r--r--src/syd-syscall.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 53fc9ba..8158a7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,7 +340,7 @@ AC_ARG_ENABLE([gprof],
SYDBOX_PROFILE="no")
AC_MSG_RESULT([$SYDBOX_PROFILE])
if test x"$SYDBOX_PROFILE" = x"yes" ; then
- AX_CHECK_COMPILER_FLAGS([-pg],, AC_MSG_ERROR([your compiler does not support -pg flag]))
+ AX_CHECK_COMPILER_FLAGS([-pg],, AC_MSG_ERROR([your compiler doesn't support -pg flag]))
SYDBOX_CFLAGS="$SYDBOX_CFLAGS -pg"
LDFLAGS="$LDFLAGS -pg"
fi
@@ -361,7 +361,7 @@ dnl }}}
dnl {{{ Check for libraries
GLIB_REQUIRED=2.0
-PINKTRACE_REQUIRED=0.2.0
+PINKTRACE_REQUIRED=0.0.3
PKG_PROG_PKG_CONFIG([0.20.0])
PKG_CHECK_MODULES([glib], [glib-2.0 >= $GLIB_REQUIRED],,
@@ -376,7 +376,7 @@ old_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${pkg_cv_pinktrace_CFLAGS}"
AC_PREPROC_IFELSE([
#include <pinktrace/pink.h>
-#if !PINK_OS_LINUX
+#ifndef PINKTRACE_LINUX
#error nope
#endif
],
@@ -414,7 +414,7 @@ if test x"$WANT_IPV6" = x"yes" ; then
CPPFLAGS="${CPPFLAGS} ${pkg_cv_pinktrace_CFLAGS}"
AC_PREPROC_IFELSE([
#include <pinktrace/pink.h>
- #if !PINK_HAVE_IPV6
+ #if PINKTRACE_HAVE_IPV6 == 0
#error nope
#endif
],
diff --git a/src/syd-syscall.c b/src/syd-syscall.c
index cae273a..f13ce93 100644
--- a/src/syd-syscall.c
+++ b/src/syd-syscall.c
@@ -1549,7 +1549,7 @@ int syscall_handle(context_t *ctx, struct tchild *child)
case RS_DENY:
g_debug("denying access to system call %lu(%s)", sno, sname);
child->flags |= TCHILD_DENYSYSCALL;
- if (!pink_util_set_syscall(child->pid, child->bitness, PINK_SYSCALL_INVALID)) {
+ if (!pink_util_set_syscall(child->pid, child->bitness, PINKTRACE_INVALID_SYSCALL)) {
if (G_UNLIKELY(ESRCH != errno)) {
g_critical("failed to set system call: %s", g_strerror(errno));
g_printerr("failed to set system call: %s\n", g_strerror(errno));