firejail: update to 0.9.80.
This commit is contained in:
@@ -1,83 +0,0 @@
|
||||
--- a/src/libtrace/libtrace.c
|
||||
+++ b/src/libtrace/libtrace.c
|
||||
@@ -447,7 +447,7 @@
|
||||
return rv;
|
||||
}
|
||||
|
||||
-#ifndef stat64
|
||||
+#ifdef HAVE_STAT64
|
||||
typedef int (*orig_stat64_t)(const char *pathname, struct stat64 *statbuf);
|
||||
static orig_stat64_t orig_stat64 = NULL;
|
||||
int stat64(const char *pathname, struct stat64 *statbuf) {
|
||||
@@ -472,7 +472,7 @@
|
||||
return rv;
|
||||
}
|
||||
|
||||
-#ifndef lstat64
|
||||
+#ifdef HAVE_STAT64
|
||||
typedef int (*orig_lstat64_t)(const char *pathname, struct stat64 *statbuf);
|
||||
static orig_lstat64_t orig_lstat64 = NULL;
|
||||
int lstat64(const char *pathname, struct stat64 *statbuf) {
|
||||
--- a/src/libtracelog/libtracelog.c
|
||||
+++ b/src/libtracelog/libtracelog.c
|
||||
@@ -565,7 +565,7 @@
|
||||
return rv;
|
||||
}
|
||||
|
||||
-#ifndef stat64
|
||||
+#ifdef HAVE_STAT64
|
||||
typedef int (*orig_stat64_t)(const char *pathname, struct stat64 *buf);
|
||||
static orig_stat64_t orig_stat64 = NULL;
|
||||
int stat64(const char *pathname, struct stat64 *buf) {
|
||||
@@ -601,7 +601,7 @@
|
||||
return rv;
|
||||
}
|
||||
|
||||
-#ifndef lstat64
|
||||
+#ifdef HAVE_STAT64
|
||||
typedef int (*orig_lstat64_t)(const char *pathname, struct stat64 *buf);
|
||||
static orig_lstat64_t orig_lstat64 = NULL;
|
||||
int lstat64(const char *pathname, struct stat64 *buf) {
|
||||
--- a/config.mk.in
|
||||
+++ b/config.mk.in
|
||||
@@ -22,6 +22,8 @@
|
||||
localstatedir=@localstatedir@
|
||||
sysconfdir=@sysconfdir@
|
||||
|
||||
+HAVE_STAT64=@HAVE_STAT64@
|
||||
+
|
||||
# Misc flags
|
||||
BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
|
||||
HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
|
||||
@@ -99,7 +101,7 @@
|
||||
-fstack-protector-all \
|
||||
-DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/$(TARNAME)"' \
|
||||
-DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \
|
||||
- -DVARDIR='"$(localstatedir)/lib/$(TARNAME)"'
|
||||
+ -DVARDIR='"$(localstatedir)/lib/$(TARNAME)"' $(HAVE_STAT64)
|
||||
|
||||
PROG_CFLAGS = \
|
||||
$(COMMON_CFLAGS) \
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -298,6 +298,10 @@
|
||||
AC_CHECK_HEADER([linux/seccomp.h], [],
|
||||
[AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])])
|
||||
|
||||
+AC_SUBST([HAVE_STAT64])
|
||||
+AC_CHECK_FUNC(stat64, [
|
||||
+ HAVE_STAT64="-DHAVE_STAT64"],)
|
||||
+
|
||||
# set sysconfdir
|
||||
if test "$prefix" = /usr; then
|
||||
test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc"
|
||||
--- a/src/fbwrap/main.c
|
||||
+++ b/src/fbwrap/main.c
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <linux/prctl.h>
|
||||
#include <sys/prctl.h>
|
||||
#include <signal.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Template file for 'firejail'
|
||||
pkgname=firejail
|
||||
version=0.9.78
|
||||
version=0.9.80
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-apparmor"
|
||||
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
|
||||
homepage="https://firejail.wordpress.com"
|
||||
changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES"
|
||||
distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz"
|
||||
checksum=6cdac8aa6b27e2d917abe28dd9248d090bab8a4946a6b7485d3751beb02bc67b
|
||||
checksum=1397bba6774a6361171c72464ddcdcfbc36d44fa413ecc9a1d56092f8da58825
|
||||
conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default"
|
||||
|
||||
nocross=yes
|
||||
|
||||
Reference in New Issue
Block a user