svn commit: r447984 - in head/net-mgmt/driftnet: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Tue Aug 15 13:18:30 UTC 2017
Author: ehaupt
Date: Tue Aug 15 13:18:28 2017
New Revision: 447984
URL: https://svnweb.freebsd.org/changeset/ports/447984
Log:
Update to 1.1.5
Added:
head/net-mgmt/driftnet/files/patch-src_connection.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_media_media.c (contents, props changed)
head/net-mgmt/driftnet/files/patch-src_pid.c (contents, props changed)
Deleted:
head/net-mgmt/driftnet/files/patch-Makefile.am
head/net-mgmt/driftnet/files/patch-configure.ac
head/net-mgmt/driftnet/files/patch-src_display_img.h
head/net-mgmt/driftnet/files/patch-src_display_png.c
Modified:
head/net-mgmt/driftnet/Makefile
head/net-mgmt/driftnet/distinfo
head/net-mgmt/driftnet/files/patch-src_display_gif.c
head/net-mgmt/driftnet/files/patch-src_layer2.c
head/net-mgmt/driftnet/files/patch-src_layer3.c
head/net-mgmt/driftnet/files/patch-src_media_image.c
Modified: head/net-mgmt/driftnet/Makefile
==============================================================================
--- head/net-mgmt/driftnet/Makefile Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/Makefile Tue Aug 15 13:18:28 2017 (r447984)
@@ -2,12 +2,8 @@
# $FreeBSD$
PORTNAME= driftnet
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.5
CATEGORIES= net-mgmt
-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
@@ -21,14 +17,15 @@ BUILD_DEPENDS= makedepend:devel/makedepend
GNU_CONFIGURE= yes
USES= autoreconf gettext-runtime gmake jpeg localbase:ldflags pkgconfig
-USE_CSTD= gnu89
+USE_GITHUB= yes
USE_GNOME= gtk20
USE_XORG= x11 xext xi
+GH_ACCOUNT= deiv
+GH_TAGNAME= upstream/${PORTVERSION}
+
PLIST_FILES= bin/driftnet man/man1/driftnet.1.gz
PORTDOCS= *
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALL_TARGET= install-strip
Modified: head/net-mgmt/driftnet/distinfo
==============================================================================
--- head/net-mgmt/driftnet/distinfo Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/distinfo Tue Aug 15 13:18:28 2017 (r447984)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484644152
-SHA256 (driftnet_1.0.orig.tar.gz) = b2e675ec4c8eec126198d4010880b579d728cf17e52106d7f40f0a135000eaa7
-SIZE (driftnet_1.0.orig.tar.gz) = 151184
+TIMESTAMP = 1502797595
+SHA256 (deiv-driftnet-1.1.5-upstream-1.1.5_GH0.tar.gz) = 270fc081965fb9fb2163a0cb511cce45398585a481a85c8a34e71f32fefcb86d
+SIZE (deiv-driftnet-1.1.5-upstream-1.1.5_GH0.tar.gz) = 166481
Added: head/net-mgmt/driftnet/files/patch-src_connection.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_connection.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -0,0 +1,13 @@
+--- src/connection.c.orig 2014-09-14 19:16:31 UTC
++++ src/connection.c
+@@ -19,6 +19,10 @@
+ #include <string.h>
+ #include <time.h>
+
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
++
+ #include "util.h"
+ #include "media.h"
+ #include "driftnet.h"
Modified: head/net-mgmt/driftnet/files/patch-src_display_gif.c
==============================================================================
--- head/net-mgmt/driftnet/files/patch-src_display_gif.c Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/files/patch-src_display_gif.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -1,15 +1,19 @@
---- src/display/gif.c.orig 2013-05-12 15:16:43 UTC
+--- src/display/gif.c.orig 2014-09-14 19:16:31 UTC
+++ src/display/gif.c
-@@ -22,7 +22,7 @@
- */
+@@ -25,12 +25,7 @@
int gif_load_hdr(img I) {
GifFileType *g;
+
+-/* GIFLIB_MAJOR is not defined until version 5 of libgif */
+-#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL);
+-#else
- g = I->us = DGifOpenFileHandle(fileno(I->fp));
-+ g = I->us = DGifOpenFileHandle(fileno(I->fp), NULL);
+-#endif
+
if (!I->us) {
I->err = IE_HDRFORMAT;
- return 0;
-@@ -38,7 +38,7 @@ int gif_load_hdr(img I) {
+@@ -47,7 +42,7 @@ int gif_load_hdr(img I) {
* Abort loading a GIF file after the header is done.
*/
int gif_abort_load(img I) {
@@ -18,7 +22,7 @@
return 1;
}
-@@ -116,7 +116,7 @@ int gif_load_img(img I) {
+@@ -125,7 +120,7 @@ int gif_load_img(img I) {
ret = 1;
fail:
Modified: head/net-mgmt/driftnet/files/patch-src_layer2.c
==============================================================================
--- head/net-mgmt/driftnet/files/patch-src_layer2.c Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/files/patch-src_layer2.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -1,30 +1,36 @@
---- src/layer2.c.orig 2013-05-12 15:16:43 UTC
+--- src/layer2.c.orig 2014-09-14 19:16:31 UTC
+++ src/layer2.c
-@@ -3,7 +3,10 @@
+@@ -9,7 +9,14 @@
+
#include <string.h>
- #include <assert.h>
--#include <netinet/ether.h>
-+//#include <netinet/ether.h>
++#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
++#else
+ #include <netinet/ether.h>
++#endif
++
#include <netinet/ip.h>
#include <netinet/ip6.h>
-@@ -12,6 +15,15 @@
- #include "log.h"
+@@ -19,6 +26,18 @@
+ #include "packetcapture.h" /* for datalink_info_t */
#include "layer2.h"
++#ifdef __FreeBSD__
+#define ETH_P_IP 0x0800
+#define ETH_P_IPV6 0x86DD
+#define ETH_ALEN 6
++#define ETH_P_ARP 0x0806
+struct ethhdr {
-+ unsigned char h_dest[ETH_ALEN];
-+ unsigned char h_source[ETH_ALEN];
-+ u_int16_t h_proto;
++ unsigned char h_dest[ETH_ALEN];
++ unsigned char h_source[ETH_ALEN];
++ u_int16_t h_proto;
+} __attribute__((packed));
++#endif
+
- int handle_link_layer(datalink_info_t *info, const u_char *pkt, uint8_t *nextproto,
- int *offsetnext)
- {
+ /* ETH_P_PAE is named ETHERTYPE_PAE in freebsd, define it */
+ #ifndef ETH_P_PAE
+ #define ETH_P_PAE 0x888E
Modified: head/net-mgmt/driftnet/files/patch-src_layer3.c
==============================================================================
--- head/net-mgmt/driftnet/files/patch-src_layer3.c Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/files/patch-src_layer3.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -1,15 +1,16 @@
---- src/layer3.c.orig 2013-05-12 15:16:43 UTC
+--- src/layer3.c.orig 2014-09-14 19:16:31 UTC
+++ src/layer3.c
-@@ -3,8 +3,12 @@
+@@ -10,6 +10,13 @@
#include <string.h>
#include <assert.h>
++#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
++#include <sys/socket.h>
++#endif
++
#include <netinet/ip.h>
#include <netinet/ip6.h>
-+#include <sys/socket.h>
- #include "log.h"
- #include "layer3.h"
Modified: head/net-mgmt/driftnet/files/patch-src_media_image.c
==============================================================================
--- head/net-mgmt/driftnet/files/patch-src_media_image.c Tue Aug 15 12:56:29 2017 (r447983)
+++ head/net-mgmt/driftnet/files/patch-src_media_image.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -1,6 +1,6 @@
---- src/media/image.c.orig 2013-05-12 15:16:43 UTC
+--- src/media/image.c.orig 2014-09-14 19:16:31 UTC
+++ src/media/image.c
-@@ -10,6 +10,7 @@
+@@ -16,6 +16,7 @@
#include <stdio.h>
#include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
#include <string.h>
Added: head/net-mgmt/driftnet/files/patch-src_media_media.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_media_media.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -0,0 +1,10 @@
+--- src/media/media.c.orig 2014-09-14 19:16:31 UTC
++++ src/media/media.c
+@@ -17,6 +17,7 @@
+ #include "compat.h"
+
+ #include <string.h>
++#include <sys/types.h>
+
+ #include "util.h"
+ #include "tmpdir.h"
Added: head/net-mgmt/driftnet/files/patch-src_pid.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/driftnet/files/patch-src_pid.c Tue Aug 15 13:18:28 2017 (r447984)
@@ -0,0 +1,13 @@
+--- src/pid.c.orig 2014-09-14 19:16:31 UTC
++++ src/pid.c
+@@ -14,7 +14,9 @@
+
+ #include "compat.h"
+
+-//#include <sys/stat.h>
++#ifdef __FreeBSD__
++#include <sys/stat.h>
++#endif
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <stdio.h>
More information about the svn-ports-all
mailing list