From owner-svn-ports-head@freebsd.org Wed Dec 20 19:20:21 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82ADCE9E48C; Wed, 20 Dec 2017 19:20:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CF1E7D5D1; Wed, 20 Dec 2017 19:20:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBKJKKlo087830; Wed, 20 Dec 2017 19:20:20 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBKJKKvm087828; Wed, 20 Dec 2017 19:20:20 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201712201920.vBKJKKvm087828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 20 Dec 2017 19:20:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456844 - in head/security/dsniff: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/security/dsniff: . files X-SVN-Commit-Revision: 456844 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Dec 2017 19:20:21 -0000 Author: mat Date: Wed Dec 20 19:20:20 2017 New Revision: 456844 URL: https://svnweb.freebsd.org/changeset/ports/456844 Log: Fix build on 11 and 12. While there, sort the Makefile. Sponsored by: Absolight Modified: head/security/dsniff/Makefile (contents, props changed) head/security/dsniff/files/patch-pcaputil.c (contents, props changed) Modified: head/security/dsniff/Makefile ============================================================================== --- head/security/dsniff/Makefile Wed Dec 20 19:08:52 2017 (r456843) +++ head/security/dsniff/Makefile Wed Dec 20 19:20:20 2017 (r456844) @@ -14,18 +14,16 @@ COMMENT= Various sniffing utilities for penetration te LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libnet.so:net/libnet BUILD_DEPENDS= ${LOCALBASE}/lib/libnids.a:net/libnids +LIB_DEPENDS= libnet.so:net/libnet -BROKEN_FreeBSD_12= fails to compile: pcaputil.c: '/usr/include/pcap-int.h' file not found -BROKEN_FreeBSD_11= fails to compile: pcaputil.c: '/usr/include/pcap-int.h' file not found +USES= gettext pkgconfig ssl +USE_GNOME= glib20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libnet=${LOCALBASE} DESTDIRNAME= install_prefix -USES= gettext pkgconfig ssl -USE_GNOME= glib20 -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/(.*)..$/\1/} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/..$//} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 Modified: head/security/dsniff/files/patch-pcaputil.c ============================================================================== --- head/security/dsniff/files/patch-pcaputil.c Wed Dec 20 19:08:52 2017 (r456843) +++ head/security/dsniff/files/patch-pcaputil.c Wed Dec 20 19:20:20 2017 (r456844) @@ -1,15 +1,36 @@ ---- ./pcaputil.c.orig 2001-03-15 09:33:04.000000000 +0100 -+++ ./pcaputil.c 2014-07-22 13:20:14.000000000 +0200 -@@ -16,9 +16,10 @@ - #include +--- pcaputil.c.orig 2001-03-15 08:33:04 UTC ++++ pcaputil.c +@@ -17,20 +17,9 @@ #include #include --#include -+#include -+#include - #ifdef BSD + #include +-#ifdef BSD -#include -+#include - #endif +-#endif #include "pcaputil.h" + +-#ifdef BSD +-static int +-bpf_immediate(int fd, int on) +-{ +- return (ioctl(fd, BIOCIMMEDIATE, &on)); +-} +-#endif +- + int + pcap_dloff(pcap_t *pd) + { +@@ -87,12 +76,6 @@ pcap_init(char *intf, char *filter, int + pcap_perror(pd, "pcap_compile"); + return (NULL); + } +-#ifdef BSD +- if (bpf_immediate(pd->fd, 1) < 0) { +- perror("ioctl"); +- return (NULL); +- } +-#endif + return (pd); + } +