svn commit: r456844 - in head/security/dsniff: . files

[Mathieu Arnold]

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 <stdlib.h>
+--- pcaputil.c.orig	2001-03-15 08:33:04 UTC
++++ pcaputil.c
+@@ -17,20 +17,9 @@
  #include <string.h>
  #include <err.h>
--#include <pcap.h>
-+#include <net/bpf.h>
-+#include </usr/include/pcap.h>
- #ifdef BSD
+ #include <pcap.h>
+-#ifdef BSD
 -#include <pcap-int.h>
-+#include </usr/include/pcap-int.h>
- #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);
+ }
+