Attachment #150505 for bug #195920

View | Details | Raw Unified | Return to bug 195920
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	tcpdump
PORTVERSION=	4.6.2
CATEGORIES=	net ipv6
MASTER_SITES=	http://www.tcpdump.org/release/



GNU_CONFIGURE=		yes
USES=		gmake
USE_AUTOTOOLS=	autoconf

UNPRIV_USER?=	nobody
CHROOTDIR?=	/var/run/tcpdump

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

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>


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 \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (tcpdump-4.5.1.tar.gz) = 14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96	1	SHA256 (tcpdump-4.6.2.tar.gz) = 524ee4d8e83a6c663f6879004216a9a5bcb1c68b11920d653eb87b79d008e0b8
2	SIZE (tcpdump-4.5.1.tar.gz) = 1024455	2	SIZE (tcpdump-4.6.2.tar.gz) = 1105356

Line 0 Link Here

(-)files/patch-configure.in (+11 lines)
	1	--- configure.in.orig 2014-12-12 16:19:48.000000000 +0400
	2	+++ configure.in 2014-12-12 16:20:13.000000000 +0400
	3	@@ -206,7 +206,7 @@ AC_ARG_WITH(sandbox-capsicum, [ --with-s
	4	# All of them must be available in order to enable capsicum sandboxing.
	5	#
	6	if test ! -z "$with_sandbox-capsicum" && test "$with_sandbox-capsicum" != "no" ; then
	7	- AC_CHECK_FUNCS(cap_enter cap_rights_init cap_rights_limit cap_ioctls_limit openat,
	8	+ AC_CHECK_FUNCS(cap_enter cap_rights_limit cap_ioctls_limit openat,
	9	ac_lbl_capsicum_function_seen=yes,
	10	ac_lbl_capsicum_function_not_seen=yes)
	11	fi

Return to bug 195920

Lines 2-8 Link Here

(-)Makefile (-3 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tcpdump	4	PORTNAME= tcpdump
5	PORTVERSION= 4.5.1	5	PORTVERSION= 4.6.2
6	CATEGORIES= net ipv6	6	CATEGORIES= net ipv6
7	MASTER_SITES= http://www.tcpdump.org/release/	7	MASTER_SITES= http://www.tcpdump.org/release/
8		8
Lines 13-24 Link Here
13		13
14	GNU_CONFIGURE= yes	14	GNU_CONFIGURE= yes
15	USES= gmake	15	USES= gmake
		16	USE_AUTOTOOLS= autoconf
16		17
17	UNPRIV_USER?= nobody	18	UNPRIV_USER?= nobody
18	CHROOTDIR?= /var/run/tcpdump	19	CHROOTDIR?= /var/run/tcpdump
19		20
20	OPTIONS_DEFINE= CRYPTO IPV6 SMB SMI USER CHROOT	21	OPTIONS_DEFINE= CRYPTO IPV6 SMB SMI USER CHROOT CAPSICUM
21	OPTIONS_DEFAULT= CRYPTO IPV6 SMB SMI	22	OPTIONS_DEFAULT= CRYPTO IPV6 SMB SMI CAPSICUM
22		23
23	CRYPTO_DESC= Support IPSEC and TCPMD5	24	CRYPTO_DESC= Support IPSEC and TCPMD5
24	# This one is intentionally worded this way because the default	25	# This one is intentionally worded this way because the default
Lines 28-33 Link Here
28	SMI_DESC= Allow MIBs to be loaded on the fly	29	SMI_DESC= Allow MIBs to be loaded on the fly
29	USER_DESC= Drop privileges to nobody	30	USER_DESC= Drop privileges to nobody
30	CHROOT_DESC= Chroot to /var/run/tcpdump (set CHROOTDIR to change)	31	CHROOT_DESC= Chroot to /var/run/tcpdump (set CHROOTDIR to change)
		32	CAPSICUM_DESC= Sandbox tcpdump using capsicum if the kernel supports it
31		33
32	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
33		35
Lines 65-70 Link Here
65	CONFIGURE_ARGS+= --with-chroot=${CHROOTDIR}	67	CONFIGURE_ARGS+= --with-chroot=${CHROOTDIR}
66	.endif	68	.endif
67		69
		70	.if ${PORT_OPTIONS:MCAPSICUM}
		71	CONFIGURE_ARGS+= --with-sandbox-capsicum
		72	.endif
		73
68	.include <bsd.port.pre.mk>	74	.include <bsd.port.pre.mk>
69		75
70	PLIST_FILES= sbin/tcpdump \	76	PLIST_FILES= sbin/tcpdump \