aboutsummaryrefslogtreecommitdiffstats
path: root/www/cgichk
diff options
context:
space:
mode:
authortabthorpe <tabthorpe@FreeBSD.org>2007-11-09 00:25:39 +0800
committertabthorpe <tabthorpe@FreeBSD.org>2007-11-09 00:25:39 +0800
commit039654d24210b3b41d4b0481845d61c476e375c1 (patch)
tree6b24b32575cc20bf8a2ce4782fc0d00e637b456b /www/cgichk
parent840541a274c5db4895d3f161a15895ab37087184 (diff)
downloadfreebsd-ports-gnome-039654d24210b3b41d4b0481845d61c476e375c1.tar.gz
freebsd-ports-gnome-039654d24210b3b41d4b0481845d61c476e375c1.tar.zst
freebsd-ports-gnome-039654d24210b3b41d4b0481845d61c476e375c1.zip
- Unbreak gcc42
- Update MASTER_SITES with SF macro - Bump PORTREVISION PR: ports/117925 Submitted by: Philippe Audeoud <jadawin tuxaco.net> Approved by: portmgr (erwin)
Diffstat (limited to 'www/cgichk')
-rw-r--r--www/cgichk/Makefile12
-rw-r--r--www/cgichk/files/patch-cgichk.h7
-rw-r--r--www/cgichk/files/patch-misc.c20
-rw-r--r--www/cgichk/files/patch-net.c26
4 files changed, 53 insertions, 12 deletions
diff --git a/www/cgichk/Makefile b/www/cgichk/Makefile
index 8230e1e172f9..b251f554984b 100644
--- a/www/cgichk/Makefile
+++ b/www/cgichk/Makefile
@@ -7,9 +7,9 @@
PORTNAME= cgichk
PORTVERSION= 2.60
+PORTREVISION= 1
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -18,12 +18,6 @@ COMMENT= A web site vulnerability scanner
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= cgichk
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-
post-patch:
${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile
${REINPLACE_CMD} -e \
@@ -37,4 +31,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/cgichk/files/patch-cgichk.h b/www/cgichk/files/patch-cgichk.h
index 6223def2179d..413b64e5d80d 100644
--- a/www/cgichk/files/patch-cgichk.h
+++ b/www/cgichk/files/patch-cgichk.h
@@ -1,9 +1,10 @@
---- cgichk.h.orig Wed Feb 5 00:36:57 2003
-+++ cgichk.h Wed Feb 5 00:37:05 2003
-@@ -19,6 +19,7 @@
+--- cgichk.h.orig 2007-11-08 12:58:24.000000000 +0000
++++ cgichk.h 2007-11-08 12:58:46.000000000 +0000
+@@ -19,6 +19,8 @@
#include <stdio.h>
#include <stdlib.h>
++#include <string.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/www/cgichk/files/patch-misc.c b/www/cgichk/files/patch-misc.c
new file mode 100644
index 000000000000..017434a31470
--- /dev/null
+++ b/www/cgichk/files/patch-misc.c
@@ -0,0 +1,20 @@
+--- misc.c.orig 2007-11-08 13:41:34.000000000 +0000
++++ misc.c 2007-11-08 13:43:22.000000000 +0000
+@@ -92,7 +92,7 @@
+ hasport = 1;
+
+ if (t = (char *)index(u, '/')) // does host have path?
+- (char *)haspath = 1;
++ haspath = 1;
+
+ if (hasport)
+ t = (char *)index(u, ':');
+@@ -209,7 +209,7 @@
+ return str;
+ }
+ /*----------------------------------------------------------------*/
+-char *strnstr(const char *HAYSTACK, const char *NEEDLE)
++char *cgichk_strnstr(const char *HAYSTACK, const char *NEEDLE)
+ {
+ char *h, *n, *res;
+
diff --git a/www/cgichk/files/patch-net.c b/www/cgichk/files/patch-net.c
new file mode 100644
index 000000000000..e95660ad092f
--- /dev/null
+++ b/www/cgichk/files/patch-net.c
@@ -0,0 +1,26 @@
+--- net.c.orig 2007-11-08 13:24:24.000000000 +0000
++++ net.c 2007-11-08 13:27:30.000000000 +0000
+@@ -150,10 +150,10 @@
+ {
+ if (parms.no_false_200_search == FALSE)
+ {
+- if (strnstr(httpbuff, "file not found") ||
+- strnstr(httpbuff, "error 404") ||
+- strnstr(httpbuff, "document has moved") ||
+- strnstr(httpbuff, "page you have requested") ) // Wise?
++ if (cgichk_strnstr(httpbuff, "file not found") ||
++ cgichk_strnstr(httpbuff, "error 404") ||
++ cgichk_strnstr(httpbuff, "document has moved") ||
++ cgichk_strnstr(httpbuff, "page you have requested") ) // Wise?
+ {
+ err = HTTP_NOEXIST;
+ }
+@@ -161,7 +161,7 @@
+ // If user spcified an additional string to search for, check for that too.
+ if (parms.alt_fake_404_string)
+ {
+- if (strnstr(httpbuff, parms.alt_fake_404_string))
++ if (cgichk_strnstr(httpbuff, parms.alt_fake_404_string))
+ {
+ err = HTTP_NOEXIST;
+ }