Date: Sat, 15 Dec 2012 03:08:13 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308931 - in head/security/skipfish: . files Message-ID: <201212150308.qBF38DR5030085@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sat Dec 15 03:08:12 2012 New Revision: 308931 URL: http://svnweb.freebsd.org/changeset/ports/308931 Log: - Update to 2.10b Added: head/security/skipfish/files/patch-src__http_client.c (contents, props changed) Modified: head/security/skipfish/Makefile (contents, props changed) head/security/skipfish/distinfo (contents, props changed) head/security/skipfish/files/patch-Makefile (contents, props changed) head/security/skipfish/files/patch-report.c (contents, props changed) head/security/skipfish/files/patch-sfscandiff (contents, props changed) head/security/skipfish/pkg-plist (contents, props changed) Modified: head/security/skipfish/Makefile ============================================================================== --- head/security/skipfish/Makefile Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/Makefile Sat Dec 15 03:08:12 2012 (r308931) @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= skipfish -PORTVERSION= 2.07b +PORTVERSION= 2.10b CATEGORIES= security www MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} EXTRACT_SUFX= .tgz @@ -16,8 +16,10 @@ COMMENT= A fully automated, active web a LICENSE= AL2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn +LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn \ + pcre:${PORTSDIR}/devel/pcre +USE_GMAKE= yes SUB_FILES= pkg-message MAN1= skipfish.1 @@ -30,12 +32,12 @@ PORTDOCS= README COPYING ChangeLog post-patch: @${REINPLACE_CMD} -e 's:"skipfish.wl":"${DATADIR}/dictionaries/complete.wl":' \ - -e 's:"assets":"${DATADIR}/assets":' ${WRKSRC}/config.h + -e 's:"assets":"${DATADIR}/assets":' ${WRKSRC}/src/config.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/skipfish ${PREFIX}/bin/skipfish - ${INSTALL_SCRIPT} ${WRKSRC}/sfscandiff ${PREFIX}/bin/sfscandiff - ${INSTALL_MAN} ${WRKSRC}/skipfish.1 ${PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/tools/sfscandiff ${PREFIX}/bin/sfscandiff + ${INSTALL_MAN} ${WRKSRC}/doc/skipfish.1 ${PREFIX}/man/man1 (cd ${WRKSRC}/assets/ && ${COPYTREE_SHARE} . ${DATADIR}/assets/) (cd ${WRKSRC}/dictionaries/ && ${COPYTREE_SHARE} . ${DATADIR}/dictionaries/) .if !defined(NOPORTDOCS) Modified: head/security/skipfish/distinfo ============================================================================== --- head/security/skipfish/distinfo Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/distinfo Sat Dec 15 03:08:12 2012 (r308931) @@ -1,2 +1,2 @@ -SHA256 (skipfish-2.07b.tgz) = eecfe8ecfd3dde191bae3dd31efde5d4c0d35fa5898d83865a4644031ae37d82 -SIZE (skipfish-2.07b.tgz) = 213582 +SHA256 (skipfish-2.10b.tgz) = 1a4fbc9d013f1f9b970946ea7228d943266127b7f4100c994ad26c82c5352a9e +SIZE (skipfish-2.10b.tgz) = 244528 Modified: head/security/skipfish/files/patch-Makefile ============================================================================== --- head/security/skipfish/files/patch-Makefile Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/files/patch-Makefile Sat Dec 15 03:08:12 2012 (r308931) @@ -1,31 +1,33 @@ ---- ./Makefile.orig 2011-06-29 20:02:06.000000000 -0400 -+++ ./Makefile 2011-06-29 20:02:49.000000000 -0400 -@@ -26,12 +26,13 @@ - INCFILES = alloc-inl.h string-inl.h debug.h types.h http_client.h \ - database.h crawler.h analysis.h config.h report.h +--- ./Makefile.orig 2012-12-07 10:14:00.000000000 -0500 ++++ ./Makefile 2012-12-07 10:15:06.000000000 -0500 +@@ -33,13 +33,14 @@ + OBJFILES = $(patsubst %,$(SRCDIR)/%,$(SFILES)) + INCFILES = $(patsubst %,$(SRCDIR)/%,$(IFILES)) -CFLAGS_GEN = -Wall -funsigned-char -g -ggdb -I/usr/local/include/ \ +- -I/opt/local/include/ $(CFLAGS) -DVERSION=\"$(VERSION)\" +_LOCALBASE ?= ${LOCALBASE} +CFLAGS_GEN = -Wall -funsigned-char -g -ggdb -I$(LOCALBASE)/include/ \ - -I/opt/local/include/ $(CFLAGS) -DVERSION=\"$(VERSION)\" - CFLAGS_DBG = -DLOG_STDERR=1 -DDEBUG_ALLOCATOR=1 $(CFLAGS_GEN) - CFLAGS_OPT = -O3 -Wno-format $(CFLAGS_GEN) ++ $(CFLAGS) -DVERSION=\"$(VERSION)\" + CFLAGS_DBG = -DLOG_STDERR=1 -DDEBUG_ALLOCATOR=1 \ + $(CFLAGS_GEN) + CFLAGS_OPT = -O3 -Wno-format $(CFLAGS_GEN) -LDFLAGS += -L/usr/local/lib/ -L/opt/local/lib -+LDFLAGS += -L$(LOCALBASE)/lib/ - LIBS += -lcrypto -lssl -lidn -lz ++LDFLAGS += -L$(LOCALBASE)/lib + LIBS += -lcrypto -lssl -lidn -lz -lpcre all: $(PROGNAME) -@@ -39,12 +40,6 @@ - $(PROGNAME): $(PROGNAME).c $(OBJFILES) $(INCFILES) - $(CC) $(LDFLAGS) $(PROGNAME).c -o $(PROGNAME) $(CFLAGS_OPT) \ - $(OBJFILES) $(LIBS) +@@ -47,12 +48,6 @@ + $(PROGNAME): $(SRCDIR)/$(PROGNAME).c $(OBJFILES) $(INCFILES) + $(CC) $(LDFLAGS) $(SRCDIR)/$(PROGNAME).c -o $(PROGNAME) \ + $(CFLAGS_OPT) $(OBJFILES) $(LIBS) - @echo -- @echo "See dictionaries/README-FIRST to pick a dictionary for the tool." +- @echo "See doc/dictionaries.txt to pick a dictionary for the tool." - @echo - @echo "Having problems with your scans? Be sure to visit:" - @echo "http://code.google.com/p/skipfish/wiki/KnownIssues" - @echo - debug: $(PROGNAME).c $(OBJFILES) $(INCFILES) - $(CC) $(LDFLAGS) $(PROGNAME).c -o $(PROGNAME) $(CFLAGS_DBG) \ + debug: $(SRCDIR)/$(PROGNAME).c $(OBJFILES) $(INCFILES) + $(CC) $(LDFLAGS) $(SRCDIR)/$(PROGNAME).c -o $(PROGNAME) \ Modified: head/security/skipfish/files/patch-report.c ============================================================================== --- head/security/skipfish/files/patch-report.c Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/files/patch-report.c Sat Dec 15 03:08:12 2012 (r308931) @@ -1,6 +1,6 @@ ---- ./report.c.orig 2010-04-09 00:36:30.000000000 +0200 -+++ ./report.c 2010-04-11 19:05:39.000000000 +0200 -@@ -741,7 +741,7 @@ +--- ./src/report.c.orig 2012-09-24 11:55:23.000000000 -0400 ++++ ./src/report.c 2012-09-24 11:55:32.000000000 -0400 +@@ -799,7 +799,7 @@ static void copy_static_code(u8* out_dir) { struct dirent** d; ca_out_dir = out_dir; Modified: head/security/skipfish/files/patch-sfscandiff ============================================================================== --- head/security/skipfish/files/patch-sfscandiff Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/files/patch-sfscandiff Sat Dec 15 03:08:12 2012 (r308931) @@ -1,5 +1,5 @@ ---- ./sfscandiff.orig 2011-06-29 20:06:17.000000000 -0400 -+++ ./sfscandiff 2011-06-29 20:06:20.000000000 -0400 +--- ./tools/sfscandiff.orig 2011-06-29 20:06:17.000000000 -0400 ++++ ./tools/sfscandiff 2011-06-29 20:06:20.000000000 -0400 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh Added: head/security/skipfish/files/patch-src__http_client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/skipfish/files/patch-src__http_client.c Sat Dec 15 03:08:12 2012 (r308931) @@ -0,0 +1,10 @@ +--- ./src/http_client.c.orig 2012-09-24 12:05:51.000000000 -0400 ++++ ./src/http_client.c 2012-09-24 12:05:58.000000000 -0400 +@@ -44,6 +44,7 @@ + #include "alloc-inl.h" + #include "string-inl.h" + #include "database.h" ++#include "config.h" + + #include "http_client.h" + Modified: head/security/skipfish/pkg-plist ============================================================================== --- head/security/skipfish/pkg-plist Sat Dec 15 02:52:22 2012 (r308930) +++ head/security/skipfish/pkg-plist Sat Dec 15 03:08:12 2012 (r308931) @@ -24,7 +24,6 @@ bin/sfscandiff %%DATADIR%%/assets/p_unknown.png %%DATADIR%%/assets/p_value.png %%DATADIR%%/assets/sf_name.png -%%DATADIR%%/dictionaries/README-FIRST %%DATADIR%%/dictionaries/complete.wl %%DATADIR%%/dictionaries/medium.wl %%DATADIR%%/dictionaries/extensions-only.wl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212150308.qBF38DR5030085>