From owner-svn-ports-head@FreeBSD.ORG Mon Feb 3 14:07:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69F3E169; Mon, 3 Feb 2014 14:07:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A9361BCD; Mon, 3 Feb 2014 14:07:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13E7mmi005967; Mon, 3 Feb 2014 14:07:48 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13E7lFR005964; Mon, 3 Feb 2014 14:07:47 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402031407.s13E7lFR005964@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 3 Feb 2014 14:07:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342446 - in head/security/dsniff: . files X-SVN-Group: ports-head 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.17 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: Mon, 03 Feb 2014 14:07:48 -0000 Author: mat Date: Mon Feb 3 14:07:47 2014 New Revision: 342446 URL: http://svnweb.freebsd.org/changeset/ports/342446 QAT: https://qat.redports.org/buildarchive/r342446/ Log: - Convert to stage - Unmark as broken, it should be fixed on 8/9 and on 10 it'll build when net/libnids is fixed. Sponsored by: Absolight Modified: head/security/dsniff/Makefile head/security/dsniff/files/patch-Makefile.in head/security/dsniff/pkg-plist Modified: head/security/dsniff/Makefile ============================================================================== --- head/security/dsniff/Makefile Mon Feb 3 13:57:46 2014 (r342445) +++ head/security/dsniff/Makefile Mon Feb 3 14:07:47 2014 (r342446) @@ -11,9 +11,8 @@ MASTER_SITES= http://www.monkey.org/~dug MAINTAINER= sbz@FreeBSD.org COMMENT= Various sniffing utilities for penetration testing -BROKEN= Fails to build - -LICENSE= BSD +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libnet10/libnet.a:${PORTSDIR}/net/libnet10 \ ${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids @@ -24,10 +23,10 @@ WANT_GNOME= yes OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 +OPTIONS_SUB= yes -MAN8= arpspoof.8 ${PORTNAME}.8 macof.8 mailsnarf.8 tcpkill.8 \ - tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \ - sshmitm.8 webmitm.8 +X11_USE= xorg=x11,xmu +X11_CONFIGURE_WITH=x LIBNET_VERSION= 10 LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet${LIBNET_VERSION}-config @@ -37,9 +36,6 @@ LIBNET_INC= "`${LIBNET_CONFIG} --defines LIBNET_LIB= "-L${LOCALBASE}/include/libnet${LIBNET_VERSION} \ ${LOCALBASE}/lib/libnet${LIBNET_VERSION}/libnet.a" -NO_STAGE= yes -.include - # If net/libnids has been compiled with the GLIB2 option then this port needs # the corresponding library and additional linker flags. LIBNIDS_GLIB2?= @@ -51,15 +47,6 @@ LIBNIDS_GLIB2!= nm -u ${LOCALBASE}/lib/l USE_GNOME+= glib20 .endif -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xmu -PLIST_SUB+= X11='' -MAN8+= webspy.8 -.else -CONFIGURE_ARGS+=--without-x -PLIST_SUB+= X11='@comment ' -.endif - post-patch: @${REINPLACE_CMD} -Ee \ 's|libnet-config|${LIBNET_CONFIG:T}|; \ Modified: head/security/dsniff/files/patch-Makefile.in ============================================================================== --- head/security/dsniff/files/patch-Makefile.in Mon Feb 3 13:57:46 2014 (r342445) +++ head/security/dsniff/files/patch-Makefile.in Mon Feb 3 14:07:47 2014 (r342446) @@ -1,15 +1,23 @@ ---- ./Makefile.in.orig 2000-12-15 21:03:26.000000000 +0100 -+++ ./Makefile.in 2013-03-15 07:33:57.000000000 +0100 -@@ -26,7 +26,7 @@ +--- ./Makefile.in.orig 2000-12-15 20:03:26.000000000 +0000 ++++ ./Makefile.in 2014-02-03 13:13:21.000000000 +0000 +@@ -8,7 +8,6 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + +-install_prefix = + prefix = @prefix@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ +@@ -26,7 +25,7 @@ LNETLIB = @LNETLIB@ NIDSINC = @NIDSINC@ -NIDSLIB = @NIDSLIB@ -+NIDSLIB = @NIDSLIB@ `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0` ++NIDSLIB = @NIDSLIB@ `pkg-config --libs gthread-2.0` DBINC = @DBINC@ DBLIB = @DBLIB@ -@@ -37,9 +37,8 @@ +@@ -37,9 +36,8 @@ X11INC = @X_CFLAGS@ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@ @@ -21,7 +29,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -76,22 +75,23 @@ +@@ -76,22 +74,23 @@ .c.o: $(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c @@ -51,11 +59,37 @@ -libmissing.a: $(LIBOBJS) - ar -cr $@ $(LIBOBJS) - $(RANLIB) $@ -+filesnarf.c: nfs_prot.h ++filesnarf.c: nfs_prot.h nfs_prot.c dsniff: $(HDRS) $(SRCS) $(OBJS) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB) -@@ -153,7 +153,7 @@ +@@ -136,24 +135,24 @@ + $(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB) + + install: +- test -d $(install_prefix)$(sbindir) || \ +- $(INSTALL) -d $(install_prefix)$(sbindir) ++ test -d $(DESTDIR)$(sbindir) || \ ++ $(INSTALL) -d $(DESTDIR)$(sbindir) + for file in $(PROGS); do \ +- $(INSTALL_PROGRAM) -m 755 $$file $(install_prefix)$(sbindir); \ ++ $(INSTALL_PROGRAM) -m 755 $$file $(DESTDIR)$(sbindir); \ + done +- test -d $(install_prefix)$(libdir) || \ +- $(INSTALL) -d $(install_prefix)$(libdir) ++ test -d $(DESTDIR)$(libdir) || \ ++ $(INSTALL) -d $(DESTDIR)$(libdir) + for file in $(CONFIGS); do \ +- $(INSTALL_DATA) $$file $(install_prefix)$(libdir); \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(libdir); \ + done +- test -d $(install_prefix)$(mandir)/man8 || \ +- $(INSTALL) -d $(install_prefix)$(mandir)/man8 ++ test -d $(DESTDIR)$(mandir)/man8 || \ ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + for file in *.8; do \ +- $(INSTALL_DATA) $$file $(install_prefix)$(mandir)/man8; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man8; \ done clean: Modified: head/security/dsniff/pkg-plist ============================================================================== --- head/security/dsniff/pkg-plist Mon Feb 3 13:57:46 2014 (r342445) +++ head/security/dsniff/pkg-plist Mon Feb 3 14:07:47 2014 (r342446) @@ -14,3 +14,16 @@ sbin/tcpnice sbin/urlsnarf sbin/webmitm %%X11%%sbin/webspy +man/man8/arpspoof.8.gz +man/man8/dsniff.8.gz +man/man8/macof.8.gz +man/man8/mailsnarf.8.gz +man/man8/tcpkill.8.gz +man/man8/tcpnice.8.gz +man/man8/urlsnarf.8.gz +man/man8/filesnarf.8.gz +man/man8/dnsspoof.8.gz +man/man8/msgsnarf.8.gz +man/man8/sshmitm.8.gz +man/man8/webmitm.8.gz +%%X11%%man/man8/webspy.8.gz