Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports tcpdump from 2017Q4 for security fixes #545

Merged
merged 1 commit into from
Jan 15, 2018
Merged

Backports tcpdump from 2017Q4 for security fixes #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions net/tcpdump/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.42.4.1 2017/02/12 13:40:36 spz Exp $
# $NetBSD: Makefile,v 1.47 2017/09/08 11:10:41 wiz Exp $

DISTNAME= tcpdump-4.9.0
DISTNAME= tcpdump-4.9.2
CATEGORIES= net
MASTER_SITES= http://www.tcpdump.org/release/

Expand All @@ -12,8 +12,16 @@ LICENSE= modified-bsd
GNU_CONFIGURE= yes
CONFIGURE_ARGS.Darwin+= --disable-universal

BUILD_DEFS+= VARBASE
OWN_DIRS= ${VARBASE}/tcpdump
PKG_GROUPS= _tcpdump
PKG_USERS= _tcpdump:_tcpdump

# drop privileges when running
CONFIGURE_ARGS+= --with-user=_tcpdump
CONFIGURE_ARGS+= --with-chroot=${VARBASE}/tcpdump

.include "options.mk"

.include "../../net/libpcap/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
10 changes: 5 additions & 5 deletions net/tcpdump/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.24.4.1 2017/02/12 13:40:36 spz Exp $
$NetBSD: distinfo,v 1.26 2017/09/08 11:10:41 wiz Exp $

SHA1 (tcpdump-4.9.0.tar.gz) = 2c4193685edb1040506a9ec0f15cd85825085697
RMD160 (tcpdump-4.9.0.tar.gz) = fd558121691cacd4ea1412ef422792a1aca525e1
SHA512 (tcpdump-4.9.0.tar.gz) = e98d73ae706d42e96b4069e196cf17af892eb97935664eebd08779b55b4da858bc1732d714efd16924f862aad0ba5550ceb2213c68414ed48907c46456c9fc82
Size (tcpdump-4.9.0.tar.gz) = 1260309 bytes
SHA1 (tcpdump-4.9.2.tar.gz) = f7dccebe94c3d07ac8744d43297ea2b98b35a13f
RMD160 (tcpdump-4.9.2.tar.gz) = 966b95adee5c405dc7e631f73b43ced849ee1e80
SHA512 (tcpdump-4.9.2.tar.gz) = e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
Size (tcpdump-4.9.2.tar.gz) = 2298386 bytes
SHA1 (patch-ah) = 75dbc11440b32349014919ac04a628d8d4d8c45c
12 changes: 3 additions & 9 deletions net/tcpdump/options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
# $NetBSD: options.mk,v 1.3 2012/06/12 15:46:01 wiz Exp $
# $NetBSD: options.mk,v 1.4 2017/09/08 11:10:41 wiz Exp $

PKG_OPTIONS_VAR= PKG_OPTIONS.tcpdump
PKG_SUPPORTED_OPTIONS= inet6 ssl libsmi
PKG_SUGGESTED_OPTIONS= inet6 ssl
PKG_SUPPORTED_OPTIONS= ssl libsmi
PKG_SUGGESTED_OPTIONS= ssl

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif

.if !empty(PKG_OPTIONS:Mssl)
USE_OLD_DES_API= yes
.include "../../security/openssl/buildlink3.mk"
Expand Down