svn commit: r431738 - in head/net-mgmt/driftnet: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Tue Jan 17 13:12:43 UTC 2017
Author: ehaupt
Date: Tue Jan 17 13:12:41 2017
New Revision: 431738
URL: https://svnweb.freebsd.org/changeset/ports/431738
Log:
Update to 1.0
Added:
head/net-mgmt/driftnet/files/patch-Makefile.in (contents, props changed)
head/net-mgmt/driftnet/files/patch-configure.ac (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_display_gif.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_display_img.h (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_display_png.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_layer2.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_layer3.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_media_image.c (contents, props changed)
Deleted:
head/net-mgmt/driftnet/files/patch-Makefile
head/net-mgmt/driftnet/files/patch-driftnet.c
head/net-mgmt/driftnet/files/patch-gif.c
Modified:
head/net-mgmt/driftnet/Makefile
head/net-mgmt/driftnet/distinfo
Modified: head/net-mgmt/driftnet/Makefile
==============================================================================
--- head/net-mgmt/driftnet/Makefile Tue Jan 17 12:44:42 2017 (r431737)
+++ head/net-mgmt/driftnet/Makefile Tue Jan 17 13:12:41 2017 (r431738)
@@ -2,30 +2,32 @@
# $FreeBSD$
PORTNAME= driftnet
-PORTVERSION= 0.1.6
-PORTREVISION= 12
+PORTVERSION= 1.0
CATEGORIES= net-mgmt
-MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ \
- http://www.vanheusden.com/mirrors/
+MASTER_SITES= http://ftp.openbsd.org/pub/OpenBSD/distfiles/ \
+ LOCAL/ehaupt
+DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ehaupt at FreeBSD.org
COMMENT= Tool to grab images out of (your) TCP connections
-LICENSE= GPLv2
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libgif.so:graphics/giflib
+LIB_DEPENDS= libgif.so:graphics/giflib \
+ libpng16.so:graphics/png
BUILD_DEPENDS= makedepend:devel/makedepend
-USES= gettext-runtime gmake jpeg
-USE_GNOME= gtk12
+GNU_CONFIGURE= yes
+USES= compiler:gcc-c++11-lib gettext-runtime gmake jpeg localbase:ldflags pkgconfig
+USE_GNOME= gtk20
USE_XORG= x11 xext xi
-ALL_TARGET= default
PLIST_FILES= bin/driftnet man/man1/driftnet.1.gz
+PORTDOCS= *
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${STAGEDIR}${MANPREFIX}/man/man1
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+INSTALL_TARGET= install-strip
.include <bsd.port.mk>
Modified: head/net-mgmt/driftnet/distinfo
==============================================================================
--- head/net-mgmt/driftnet/distinfo Tue Jan 17 12:44:42 2017 (r431737)
+++ head/net-mgmt/driftnet/distinfo Tue Jan 17 13:12:41 2017 (r431738)
@@ -1,2 +1,3 @@
-SHA256 (driftnet-0.1.6.tar.gz) = dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
-SIZE (driftnet-0.1.6.tar.gz) = 36989
+TIMESTAMP = 1484644152
+SHA256 (driftnet_1.0.orig.tar.gz) = b2e675ec4c8eec126198d4010880b579d728cf17e52106d7f40f0a135000eaa7
+SIZE (driftnet_1.0.orig.tar.gz) = 151184
Added: head/net-mgmt/driftnet/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-Makefile.in Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,20 @@
+--- Makefile.in.orig 2013-05-12 16:33:18 UTC
++++ Makefile.in
+@@ -258,7 +258,7 @@ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+ dist_doc_DATA = README TODO
+ EXTRA_DIST = driftnet.1.in CHANGES CREDITS
+-MANPAGE = driftnet.1.gz
++MANPAGE = driftnet.1
+ MAN1DIR = $(DESTDIR)$(mandir)/man1/
+ all: all-recursive
+
+@@ -773,7 +773,7 @@ clean-local:
+ rm -f $(MANPAGE)
+
+ install-data-local: driftnet.1.in
+- cat $(srcdir)/driftnet.1.in | sed s/@*VERSION@*/$(VERSION)/ | GZIP=$(GZIP_ENV) gzip > $(MANPAGE)
++ cat $(srcdir)/driftnet.1.in | sed s/@*VERSION@*/$(VERSION)/ > $(MANPAGE)
+ $(MKDIR_P) $(MAN1DIR)
+ $(INSTALL_DATA) $(MANPAGE) $(MAN1DIR) || exit $$?
+
Added: head/net-mgmt/driftnet/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-configure.ac Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2013-05-12 15:16:43 UTC
++++ configure.ac
+@@ -24,11 +24,6 @@ AC_ARG_ENABLE([debug],
+ ,
+ [enable_debug=yes])
+
+-if test "x$enable_debug" = xyes; then
+- CFLAGS="-O2 -g -DDEBUG"
+-else
+- CFLAGS="-O2 -DNDEBUG"
+-fi
+ #AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+
+ #
Added: head/net-mgmt/driftnet/files/patch-src_display_gif.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_display_gif.c Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,29 @@
+--- src/display/gif.c.orig 2013-05-12 15:16:43 UTC
++++ src/display/gif.c
+@@ -22,7 +22,7 @@
+ */
+ int gif_load_hdr(img I) {
+ GifFileType *g;
+- g = I->us = DGifOpenFileHandle(fileno(I->fp));
++ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL);
+ if (!I->us) {
+ I->err = IE_HDRFORMAT;
+ return 0;
+@@ -38,7 +38,7 @@ int gif_load_hdr(img I) {
+ * Abort loading a GIF file after the header is done.
+ */
+ int gif_abort_load(img I) {
+- DGifCloseFile((GifFileType*)I->us);
++ DGifCloseFile((GifFileType*)I->us, NULL);
+ return 1;
+ }
+
+@@ -116,7 +116,7 @@ int gif_load_img(img I) {
+ ret = 1;
+ fail:
+
+- DGifCloseFile(g);
++ DGifCloseFile(g, NULL);
+
+ return ret;
+ }
Added: head/net-mgmt/driftnet/files/patch-src_display_img.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_display_img.h Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,26 @@
+--- src/display/img.h.orig 2013-05-12 15:22:44 UTC
++++ src/display/img.h
+@@ -19,11 +19,13 @@
+
+ #include <stdio.h>
+
++#include <sys/endian.h>
++
+ typedef uint8_t chan;
+ typedef uint32_t pel;
+
+ /* Yuk. GDKRGB expects data in a specific ordering. */
+-#if defined(DRIFTNET_LITTLE_ENDIAN)
++#if defined(LITTLE_ENDIAN)
+ # define PEL(r, g, b) ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16)))
+ # define PELA(r, g, b, a) ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16) | ((chan)(a) << 24)))
+
+@@ -31,7 +33,7 @@ typedef uint32_t pel;
+ # define GETG(p) ((chan)(((p) & (pel)0x0000ff00) >> 8))
+ # define GETB(p) ((chan)(((p) & (pel)0x00ff0000) >> 16))
+ # define GETA(p) ((chan)(((p) & (pel)0xff000000) >> 24))
+-#elif defined(DRIFTNET_BIG_ENDIAN)
++#elif defined(BIG_ENDIAN)
+ # define PEL(r, g, b) ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
+ # define PELA(r, g, b, a) ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))
+
Added: head/net-mgmt/driftnet/files/patch-src_display_png.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_display_png.c Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,14 @@
+--- src/display/png.c.orig 2013-05-12 15:16:43 UTC
++++ src/display/png.c
+@@ -132,9 +132,9 @@ int png_load_img(img I) {
+ /* Convert greyscale images to 8-bit RGB */
+ if (color_type == PNG_COLOR_TYPE_GRAY ||
+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+- if (bit_depth < 8) {
++ /* if (bit_depth < 8) {
+ png_set_gray_1_2_4_to_8(png_ptr);
+- }
++ } */
+ png_set_gray_to_rgb(png_ptr);
+ }
+
Added: head/net-mgmt/driftnet/files/patch-src_layer2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_layer2.c Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,30 @@
+--- src/layer2.c.orig 2013-05-12 15:16:43 UTC
++++ src/layer2.c
+@@ -3,7 +3,10 @@
+ #include <string.h>
+ #include <assert.h>
+
+-#include <netinet/ether.h>
++//#include <netinet/ether.h>
++#include <sys/types.h>
++#include <netinet/in_systm.h>
++#include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip6.h>
+
+@@ -12,6 +15,15 @@
+ #include "log.h"
+ #include "layer2.h"
+
++#define ETH_P_IP 0x0800
++#define ETH_P_IPV6 0x86DD
++#define ETH_ALEN 6
++struct ethhdr {
++ unsigned char h_dest[ETH_ALEN];
++ unsigned char h_source[ETH_ALEN];
++ u_int16_t h_proto;
++} __attribute__((packed));
++
+ int handle_link_layer(datalink_info_t *info, const u_char *pkt, uint8_t *nextproto,
+ int *offsetnext)
+ {
Added: head/net-mgmt/driftnet/files/patch-src_layer3.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_layer3.c Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,15 @@
+--- src/layer3.c.orig 2013-05-12 15:16:43 UTC
++++ src/layer3.c
+@@ -3,8 +3,12 @@
+ #include <string.h>
+ #include <assert.h>
+
++#include <sys/types.h>
++#include <netinet/in_systm.h>
++#include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip6.h>
++#include <sys/socket.h>
+
+ #include "log.h"
+ #include "layer3.h"
Added: head/net-mgmt/driftnet/files/patch-src_media_image.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_media_image.c Tue Jan 17 13:12:41 2017 (r431738)
@@ -0,0 +1,10 @@
+--- src/media/image.c.orig 2013-05-12 15:16:43 UTC
++++ src/media/image.c
+@@ -10,6 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
+ #include <string.h>
++#include <sys/types.h>
+
+ #include <netinet/in.h> /* ntohl */
+
More information about the svn-ports-head
mailing list