diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile index 58796f3f5b11..4295fb3d5042 100644 --- a/net/gspoof/Makefile +++ b/net/gspoof/Makefile @@ -7,8 +7,7 @@ # PORTNAME= gspoof -PORTVERSION= 2.1.1 -PORTREVISION= 1 +PORTVERSION= 3.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,19 +17,23 @@ COMMENT= Console/GTK+ TCP/IP Packets Forger BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel -WRKSRC= ${WRKDIR}/${PORTNAME} - -USE_GETOPT_LONG= yes -USE_GNOME= gtk12 +USE_GNOME= gnometarget gtk20 USE_REINPLACE= yes -MAKE_ARGS= CC="${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" -ALL_TARGET= gtk +USE_GMAKE= yes +GNU_CONFIGURE= yes post-patch: - @${REINPLACE_CMD} -e "s|gtk-config|\$${GTK_CONFIG}|g" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local/lib|${LOCALBASE}/lib|g ; \ + s|/usr/local/include|${LOCALBASE}/include|g ; \ + s|-Wall -O2|$${CFLAGS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-Wall -O2|@CFLAGS@|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g ; \ + s|/usr/share|${X11BASE}/share|g' ${WRKSRC}/gtk.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gspoof ${PREFIX}/bin + @${MKDIR} ${DATADIR}/pixmap + ${INSTALL_DATA} ${WRKSRC}/pixmap/icon.png ${DATADIR}/pixmap .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/net/gspoof/distinfo b/net/gspoof/distinfo index 0b701e818207..45bec1dd5d3a 100644 --- a/net/gspoof/distinfo +++ b/net/gspoof/distinfo @@ -1 +1 @@ -MD5 (gspoof-2.1.1.tar.gz) = ac3a448d51eab10c8eda42fba925398a +MD5 (gspoof-3.0.tar.gz) = fb7de0bfc1353d8edc4f1825b2013959 diff --git a/net/gspoof/files/patch-callback.c b/net/gspoof/files/patch-callback.c deleted file mode 100644 index d1c9e09981de..000000000000 --- a/net/gspoof/files/patch-callback.c +++ /dev/null @@ -1,24 +0,0 @@ ---- callbacks.c.orig Wed Sep 25 04:19:53 2002 -+++ callbacks.c Wed May 7 03:40:18 2003 -@@ -194,13 +194,21 @@ - return; - } - -+#ifdef __FreeBSD__ -+ if (atoi (gtk_entry_get_text (GTK_ENTRY(tcp_seq_txt))) > 4294970000 || atoi (gtk_entry_get_text (GTK_ENTRY(tcp_seq_txt))) < 0) -+#else - if (atoll (gtk_entry_get_text (GTK_ENTRY(tcp_seq_txt))) > 4294970000 || atoi (gtk_entry_get_text (GTK_ENTRY(tcp_seq_txt))) < 0) -+#endif - { - info ("Error: sequence number is not valid, it must be between 0 and 2^32-1\n"); - return; - } - -+#ifdef __FreeBSD__ -+ if (atoi (gtk_entry_get_text (GTK_ENTRY(tcp_ack_txt))) > 4294970000 || atoi (gtk_entry_get_text (GTK_ENTRY(tcp_ack_txt))) < 0) -+#else - if (atoll (gtk_entry_get_text (GTK_ENTRY(tcp_ack_txt))) > 4294970000 || atoi (gtk_entry_get_text (GTK_ENTRY(tcp_ack_txt))) < 0) -+#endif - { - info ("Error: acknowledgement number is not valid, it must be between 0 and 2^32-1\n"); - return; diff --git a/net/gspoof/files/patch-console.c b/net/gspoof/files/patch-console.c index 79b02c981e84..9a185e566b36 100644 --- a/net/gspoof/files/patch-console.c +++ b/net/gspoof/files/patch-console.c @@ -1,23 +1,23 @@ ---- console.c.orig Wed Sep 25 04:20:25 2002 -+++ console.c Wed May 7 03:42:30 2003 -@@ -333,7 +333,11 @@ +--- console.c.orig Sat Aug 30 00:16:50 2003 ++++ console.c Sat Aug 30 15:56:23 2003 +@@ -335,7 +335,11 @@ fgets(value, 20, stdin); seq = atol(value); } +#ifdef __FreeBSD__ -+ while (atoi(value) < 0 || atoi(value) > 4294970000); ++ while (atoi(value) < 0 || strtoll(value, NULL, 10) > 4294970000); +#else while (atoi(value) < 0 || atoll(value) > 4294970000); +#endif } else if (!strcmp ("3.5", cmd)) { -@@ -343,7 +347,11 @@ +@@ -345,7 +349,11 @@ fgets(value, 20, stdin); ack = atol(value); } +#ifdef __FreeBSD__ -+ while (atoi(value) < 0 || atoi(value) > 4294970000); ++ while (atoi(value) < 0 || strtoll(value, NULL, 10) > 4294970000); +#else while (atoi(value) < 0 || atoll(value) > 4294970000); +#endif diff --git a/net/gspoof/files/patch-gfuncts.c b/net/gspoof/files/patch-gfuncts.c new file mode 100644 index 000000000000..9a782c39b04e --- /dev/null +++ b/net/gspoof/files/patch-gfuncts.c @@ -0,0 +1,27 @@ +--- gfuncts.c.orig Sat Aug 30 00:16:50 2003 ++++ gfuncts.c Sat Aug 30 15:58:09 2003 +@@ -382,14 +382,24 @@ + info ("Invalid destination port value\n"); + return -1; + } ++#ifdef __FreeBSD__ ++ if (strtoll(gtk_entry_get_text(GTK_ENTRY(seq_entry)), NULL, 10)<0 || ++ strtoll(gtk_entry_get_text(GTK_ENTRY(seq_entry)), NULL, 10)>4294970000) ++#else + if (atoll(gtk_entry_get_text(GTK_ENTRY(seq_entry)))<0 || + atoll(gtk_entry_get_text(GTK_ENTRY(seq_entry)))>4294970000) ++#endif + { + info ("Invalid sequence number value\n"); + return -1; + } ++#ifdef __FreeBSD__ ++ if (strtoll(gtk_entry_get_text(GTK_ENTRY(ack_entry)), NULL, 10)<0 || ++ strtoll(gtk_entry_get_text(GTK_ENTRY(ack_entry)), NULL, 10)>4294970000) ++#else + if (atoll(gtk_entry_get_text(GTK_ENTRY(ack_entry)))<0 || + atoll(gtk_entry_get_text(GTK_ENTRY(ack_entry)))>4294970000) ++#endif + { + info ("Invalid acknowledgment value\n"); + return -1; diff --git a/net/gspoof/pkg-descr b/net/gspoof/pkg-descr index cf30f0614b7a..c304863801f3 100644 --- a/net/gspoof/pkg-descr +++ b/net/gspoof/pkg-descr @@ -1,3 +1,6 @@ -Gspoof is a GTK+ program written in C language which makes easier and accurate -the building and the sending of TCP packet with a data-payload or not. It's -possible to modify TCP/IP fields also Ethernet header working to Link Level. +Gspoof is a GTK+ program written in C language which makes easier +and accurate the building and the sending of TCP packet with a +data-payload or not. It's possible to modify TCP/IP fields also +Ethernet header working to Link Level. + +WWW: http://gspoof.sourceforge.net/ diff --git a/net/gspoof/pkg-plist b/net/gspoof/pkg-plist index 4e521e96b689..ad08bad9da57 100644 --- a/net/gspoof/pkg-plist +++ b/net/gspoof/pkg-plist @@ -1,3 +1,6 @@ bin/gspoof -%%PORTDOCS%%share/doc/gspoof/README -%%PORTDOCS%%@dirrm share/doc/gspoof +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/pixmap/icon.png +@dirrm %%DATADIR%%/pixmap +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%