Attachment 150505 Details for Bug 195920 – Capsicum for tcpdump

[patch] Capsicum for tcpdump

port_tcpdump.diff (text/plain), 2.75 KB, created by logan on 2014-12-12 12:31:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: logan

Created: 2014-12-12 12:31:58 UTC

Size: 2.75 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374537)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tcpdump
>-PORTVERSION=	4.5.1
>+PORTVERSION=	4.6.2
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.tcpdump.org/release/
> 
>@@ -13,12 +13,13 @@
> 
> GNU_CONFIGURE=		yes
> USES=		gmake
>+USE_AUTOTOOLS=	autoconf
> 
> UNPRIV_USER?=	nobody
> CHROOTDIR?=	/var/run/tcpdump
> 
>-OPTIONS_DEFINE=	CRYPTO IPV6 SMB SMI USER CHROOT
>-OPTIONS_DEFAULT=	CRYPTO IPV6 SMB SMI
>+OPTIONS_DEFINE=	CRYPTO IPV6 SMB SMI USER CHROOT CAPSICUM
>+OPTIONS_DEFAULT=	CRYPTO IPV6 SMB SMI CAPSICUM
> 
> CRYPTO_DESC=	Support IPSEC and TCPMD5
> # This one is intentionally worded this way because the default
>@@ -28,6 +29,7 @@
> SMI_DESC=	Allow MIBs to be loaded on the fly
> USER_DESC=	Drop privileges to nobody
> CHROOT_DESC=	Chroot to /var/run/tcpdump (set CHROOTDIR to change)
>+CAPSICUM_DESC=  Sandbox tcpdump using capsicum if the kernel supports it
> 
> .include <bsd.port.options.mk>
> 
>@@ -65,6 +67,10 @@
> CONFIGURE_ARGS+=	--with-chroot=${CHROOTDIR}
> .endif
> 
>+.if ${PORT_OPTIONS:MCAPSICUM}
>+CONFIGURE_ARGS+=        --with-sandbox-capsicum
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> PLIST_FILES=	sbin/tcpdump \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 374537)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (tcpdump-4.5.1.tar.gz) = 14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96
>-SIZE (tcpdump-4.5.1.tar.gz) = 1024455
>+SHA256 (tcpdump-4.6.2.tar.gz) = 524ee4d8e83a6c663f6879004216a9a5bcb1c68b11920d653eb87b79d008e0b8
>+SIZE (tcpdump-4.6.2.tar.gz) = 1105356
>Index: files/patch-configure.in
>===================================================================
>--- files/patch-configure.in	(revision 0)
>+++ files/patch-configure.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.in.orig	2014-12-12 16:19:48.000000000 +0400
>++++ configure.in	2014-12-12 16:20:13.000000000 +0400
>+@@ -206,7 +206,7 @@ AC_ARG_WITH(sandbox-capsicum, [ --with-s
>+ # All of them must be available in order to enable capsicum sandboxing.
>+ #
>+ if test ! -z "$with_sandbox-capsicum" && test "$with_sandbox-capsicum" != "no" ; then
>+-	AC_CHECK_FUNCS(cap_enter cap_rights_init cap_rights_limit cap_ioctls_limit openat,
>++	AC_CHECK_FUNCS(cap_enter cap_rights_limit cap_ioctls_limit openat,
>+ 	    ac_lbl_capsicum_function_seen=yes,
>+ 	    ac_lbl_capsicum_function_not_seen=yes)
>+ fi
>
>Property changes on: files/patch-configure.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 195920: 150505