+++ /dev/null
-From 4f4e59c7529888339fe2337dc893984eb7833d01 Mon Sep 17 00:00:00 2001
-From: netblue30 <netblue30@yahoo.com>
-Date: Wed, 2 Nov 2016 09:17:19 -0400
-Subject: [PATCH] /etc/resolv.conf overwrite
-
----
- RELNOTES | 7 ++++++-
- configure.ac | 2 +-
- src/firejail/main.c | 8 ++++++++
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/RELNOTES b/RELNOTES
-index 4b5b662..0957292 100644
---- a/RELNOTES
-+++ b/RELNOTES
-@@ -1,4 +1,9 @@
--firejail (0.9.38.3) baseline; urgency=low
-+firejail (0.9.38.5) baseline; urgency=low
-+ * this is a development release
-+ * security: overwrite /etc/resolv.conf found by Martin Carpenter
-+ -- netblue30 <netblue30@yahoo.com> Mon, 2 Nov 2016 10:00:00 -0500
-+
-+firejail (0.9.38.4) baseline; urgency=low
- * CVE-2016-7545 submitted by Aleksey Manevich
- * bugfixes
- -- netblue30 <netblue30@yahoo.com> Mon, 10 Oct 2016 10:00:00 -0500
-diff --git a/configure.ac b/configure.ac
-index 718cfd3..edd528d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.68])
--AC_INIT(firejail, 0.9.38.4, netblue30@yahoo.com, , http://firejail.wordpress.com)
-+AC_INIT(firejail, 0.9.38.5, netblue30@yahoo.com, , http://firejail.wordpress.com)
- AC_CONFIG_SRCDIR([src/firejail/main.c])
- #AC_CONFIG_HEADERS([config.h])
-
-diff --git a/src/firejail/main.c b/src/firejail/main.c
-index 9e2aec4..9c1b73e 100644
---- a/src/firejail/main.c
-+++ b/src/firejail/main.c
-@@ -903,6 +903,14 @@ int main(int argc, char **argv) {
- return 1;
- }
-
-+ // don't allow "--chroot=/"
-+ char *rpath = realpath(cfg.chrootdir, NULL);
-+ if (rpath == NULL || strcmp(rpath, "/") == 0) {
-+ fprintf(stderr, "Error: invalid chroot directory\n");
-+ exit(1);
-+ }
-+ free(rpath);
-+
- // check chroot directory structure
- if (fs_check_chroot_dir(cfg.chrootdir)) {
- fprintf(stderr, "Error: invalid chroot\n");
---
-2.11.0
-
+++ /dev/null
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it. Update the files
-to include it explicitly.
----
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
---- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
-
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
---
-2.7.4
-
+++ /dev/null
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+seccomp"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- epatch "${FILESDIR}"/${P}-0001-etc-resolv.conf-overwrite.patch
- find -name Makefile.in -exec sed -i -r \
- -e '/CFLAGS/s: (-O2|-ggdb) : :g' \
- -e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
- econf $(use_enable seccomp)
-}