Date: Sat, 27 Jul 2013 13:30:53 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323785 - in head/security/unicornscan: . files Message-ID: <201307271330.r6RDUrgV090789@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Jul 27 13:30:52 2013 New Revision: 323785 URL: http://svnweb.freebsd.org/changeset/ports/323785 Log: - Fix parallel build (-jX) by calling make(1) correctly and fixing targets dependencies; respect CFLAGS in a better way - Define LICENSE (GPLv2) and remove it from portdocs - Unbreak the build against Clang (remove one inline statement) - Cleanup the port, pkg-message, and pkg-descr while here - Do not mention ancient versions of FreeBSD in pkg-message Reported by: pointyhat-west Added: head/security/unicornscan/files/pkg-message.in - copied, changed from r323677, head/security/unicornscan/pkg-message Deleted: head/security/unicornscan/pkg-message Modified: head/security/unicornscan/Makefile head/security/unicornscan/files/patch-Makefile head/security/unicornscan/files/patch-src::Makefile head/security/unicornscan/files/patch-src::Makefile.inc head/security/unicornscan/pkg-descr head/security/unicornscan/pkg-plist Modified: head/security/unicornscan/Makefile ============================================================================== --- head/security/unicornscan/Makefile Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/Makefile Sat Jul 27 13:30:52 2013 (r323785) @@ -1,9 +1,5 @@ -# New ports collection makefile for: unicornscan -# Date created: 4 October 2004 -# Whom: cykyc -# +# Created by: Jon Passki <cykyc@yahoo.com> # $FreeBSD$ -# PORTNAME= unicornscan PORTVERSION= 0.4.2 @@ -14,59 +10,63 @@ MASTER_SITES= http://www.unicornscan.org MAINTAINER= cykyc@yahoo.com COMMENT= Next-generation of udpscan plus a high-speed TCP scanner +LICENSE= GPLv2 + LIB_DEPENDS= net:${PORTSDIR}/net/libnet -USE_GMAKE= yes +USES= gmake MAKE_ENV= LIBNET_CONFIG="${LIBNET_CONFIG}" CFLAGS+= -DWITH_LONGOPTS - -MAN1= unicornscan.1 - -PKGMESSAGE= ${WRKDIR}/pkg-message - LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config -.include <bsd.port.pre.mk> +SUB_FILES= pkg-message + +MAN1= unicornscan.1 post-patch: -.for text in pkg-message - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - ${PKGDIR}/${text} >${WRKDIR}/${text} -.endfor @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \ ${WRKSRC}/src/scan_progs/Makefile ${WRKSRC}/src/tools/Makefile + @${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/etc|' \ + ${WRKSRC}/fconf/unicorn.conf +# Unbreak the build against Clang (it does not like one function being inline) + @${REINPLACE_CMD} -e 's|^inline void nop|void nop|' \ + ${WRKSRC}/src/unilib/tsc.c do-install: - ${MKDIR} ${PREFIX}/etc/unicornscan - ${MKDIR} ${PREFIX}/libexec/unicornscan/modules - ${MKDIR} ${PREFIX}/share/unicornscan - ${MKDIR} ${PREFIX}/var/unicornscan - ${INSTALL_PROGRAM} ${WRKSRC}/src/unicornscan ${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/tools/fantaip ${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/scan_progs/unisend ${PREFIX}/libexec/unicornscan - ${INSTALL_PROGRAM} ${WRKSRC}/src/scan_progs/unilisten ${PREFIX}/libexec/unicornscan - ${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/etc|' \ - ${WRKSRC}/fconf/unicorn.conf - for confs in ${WRKSRC}/fconf/*.conf; do\ - ${INSTALL_DATA} $$confs ${PREFIX}/etc/unicornscan/`basename $$confs`.sample ;\ + @${MKDIR} ${PREFIX}/etc/unicornscan + @${MKDIR} ${PREFIX}/libexec/unicornscan/modules + @${MKDIR} ${PREFIX}/share/unicornscan + @${MKDIR} ${PREFIX}/var/unicornscan + ${INSTALL_PROGRAM} ${WRKSRC}/src/unicornscan ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/tools/fantaip ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/scan_progs/unisend \ + ${PREFIX}/libexec/unicornscan + ${INSTALL_PROGRAM} ${WRKSRC}/src/scan_progs/unilisten \ + ${PREFIX}/libexec/unicornscan + for confs in ${WRKSRC}/fconf/*.conf; do \ + ${INSTALL_DATA} $$confs ${PREFIX}/etc/unicornscan/`basename $$confs`.sample ; \ done - ${INSTALL_DATA} ${WRKSRC}/fconf/port-numbers ${PREFIX}/share/unicornscan - for mods in ${WRKSRC}/src/payload_modules/*.so; do\ - ${INSTALL_PROGRAM} $$mods ${PREFIX}/libexec/unicornscan/modules/ ;\ + ${INSTALL_DATA} ${WRKSRC}/fconf/port-numbers \ + ${PREFIX}/share/unicornscan + for mods in ${WRKSRC}/src/payload_modules/*.so; do \ + ${INSTALL_PROGRAM} $$mods ${PREFIX}/libexec/unicornscan/modules/ ; \ done - for mods in ${WRKSRC}/src/report_modules/shlibs/*.so; do\ - ${INSTALL_PROGRAM} $$mods ${PREFIX}/libexec/unicornscan/modules/ ;\ + for mods in ${WRKSRC}/src/report_modules/shlibs/*.so; do \ + ${INSTALL_PROGRAM} $$mods ${PREFIX}/libexec/unicornscan/modules/ ; \ done - for pofs in p0f.fp p0fa.fp p0fr.fp; do\ - ${INSTALL_DATA} ${WRKSRC}/src/report_modules/p0f/$$pofs ${PREFIX}/share/unicornscan/ ;\ + for pofs in p0f.fp p0fa.fp p0fr.fp; do \ + ${INSTALL_DATA} ${WRKSRC}/src/report_modules/p0f/$$pofs ${PREFIX}/share/unicornscan/ ; \ done ${INSTALL_PROGRAM} ${WRKSRC}/src/report_modules/shlibs/libp0f.so \ - ${PREFIX}/libexec/unicornscan/modules/ - ${INSTALL_MAN} ${WRKSRC}/docs/unicornscan.1 ${PREFIX}/man/man1/ - for files in LICENSE README misc/UDP_PAYLOADS_NEEDED \ - TODO_BUGSTOFIX README.database; do\ - ${INSTALL_DATA} ${WRKSRC}/$$files ${PREFIX}/share/unicornscan/ ;\ + ${PREFIX}/libexec/unicornscan/modules + ${INSTALL_MAN} ${WRKSRC}/docs/unicornscan.1 ${MANPREFIX}/man/man1 +# XXX: shouldn't these files below be installed as PORTDOCS? + for files in README misc/UDP_PAYLOADS_NEEDED \ + TODO_BUGSTOFIX README.database; do \ + ${INSTALL_DATA} ${WRKSRC}/$$files ${MANPREFIX}/share/unicornscan/ ; \ done + @${ECHO_MSG} @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/unicornscan/files/patch-Makefile ============================================================================== --- head/security/unicornscan/files/patch-Makefile Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/files/patch-Makefile Sat Jul 27 13:30:52 2013 (r323785) @@ -1,8 +1,34 @@ ---- Makefile.orig Mon Oct 4 23:22:49 2004 -+++ Makefile Mon Oct 4 23:22:55 2004 -@@ -1,4 +1,4 @@ +--- Makefile.orig 2004-09-30 18:29:05.000000000 +0800 ++++ Makefile 2013-07-27 20:36:38.000000000 +0800 +@@ -1,19 +1,19 @@ -default: +- (cd libs && make) +- (cd src && make) +all default: - (cd libs && make) - (cd src && make) ++ $(MAKE) -C libs ++ $(MAKE) -C src + clean: +- (cd src && make clean) ++ $(MAKE) -C src clean + find . -name ".*.swp" -exec ls -alh {} \; + find . -name "*core*" -exec ls -lah {} \; + + distclean: clean + rm -f src/compile.h +- (cd libs && make clean) ++ $(MAKE) -C libs clean + + dist: distclean + find . -exec touch {} \; -print +- cd src/parse && make prepare ++ $(MAKE) -C src/parse prepare + ./tarup.sh + + install: default +@@ -23,4 +23,4 @@ + ./uninstall.sh /usr/local /var + + src/unicornscan: +- (cd src && make) ++ $(MAKE) -C src Modified: head/security/unicornscan/files/patch-src::Makefile ============================================================================== --- head/security/unicornscan/files/patch-src::Makefile Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/files/patch-src::Makefile Sat Jul 27 13:30:52 2013 (r323785) @@ -11,3 +11,65 @@ LIBDIRS=-L./unilib -L./scan_progs -L./parse -L../libs/fake/lib TARGETNAME=unicornscan +@@ -19,42 +19,42 @@ + ./compiledby.sh > compile.h + + unilib_d: +- (cd unilib && $(MAKE)) ++ $(MAKE) -C unilib + + parse_d: +- (cd parse && $(MAKE)) ++ $(MAKE) -C parse + +-scan_d: +- (cd scan_progs && $(MAKE)) ++scan_d: unilib_d parse_d ++ $(MAKE) -C scan_progs + + p_modules: +- (cd payload_modules && $(MAKE)) ++ $(MAKE) -C payload_modules + + db_module: +- (cd output_modules/database && $(MAKE)) ++ $(MAKE) -C output_modules/database + + p0f_module: +- (cd report_modules/p0f && $(MAKE)) ++ $(MAKE) -C report_modules/p0f + + udpstr_module: +- (cd report_modules/udpstr && $(MAKE)) ++ $(MAKE) -C report_modules/udpstr + +-tools_d: +- (cd tools && $(MAKE)) ++tools_d: unilib_d ++ $(MAKE) -C tools + + clean: + rm -f $(OBJS) $(TARGETNAME) myversion.h compile.h core core.* *.core +- cd unilib && $(MAKE) clean +- cd parse && $(MAKE) clean +- cd scan_progs && $(MAKE) clean +- cd output_modules/database && $(MAKE) clean +- cd report_modules/p0f && $(MAKE) clean +- cd report_modules/udpstr && $(MAKE) clean +- cd payload_modules && $(MAKE) clean +- cd tools && $(MAKE) clean ++ $(MAKE) -C unilib clean ++ $(MAKE) -C parse clean ++ $(MAKE) -C scan_progs clean ++ $(MAKE) -C output_modules/database clean ++ $(MAKE) -C report_modules/p0f clean ++ $(MAKE) -C report_modules/udpstr clean ++ $(MAKE) -C payload_modules clean ++ $(MAKE) -C tools clean + + install: default +- (cd .. && $(MAKE) install) ++ $(MAKE) -C .. install + + splint: myversion.h + splint -warnposix *.c -I. -I../libs/fake/include -D__linux__ > warnings Modified: head/security/unicornscan/files/patch-src::Makefile.inc ============================================================================== --- head/security/unicornscan/files/patch-src::Makefile.inc Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/files/patch-src::Makefile.inc Sat Jul 27 13:30:52 2013 (r323785) @@ -14,7 +14,7 @@ # its fine to do almost anything here, just dont remove the includes -MYCFLAGS=-O1 -ggdb -Wall -Wshadow -Wcast-align -Wcast-qual -Wchar-subscripts -Wno-deprecated-declarations -Wformat-security -Wimplicit -Wsign-compare -Wuninitialized -Wunused -Wwrite-strings -I. -rdynamic -I../libs/fake/include -I/usr/local/include -L/usr/local/lib -DPREFIX=\"$(PREFIX)\" -DLOCALSTATEDIR=\"$(LOCALSTATEDIR)\" -DTARGETNAME=\"$(TARGETNAME)\" -DSENDERNAME=\"$(SENDERNAME)\" -DLISTENERNAME=\"$(LISTENERNAME)\" -+MYCFLAGS:=$(CFLAGS) -O1 -ggdb -Wall -Wshadow -Wcast-align -Wcast-qual -Wchar-subscripts -Wno-deprecated-declarations -Wformat-security -Wimplicit -Wsign-compare -Wuninitialized -Wunused -Wwrite-strings -I. -rdynamic -I../libs/fake/include `$(LIBNET_CONFIG) --defines` `$(LIBNET_CONFIG) --cflags` -DPREFIX=\"$(PREFIX)\" -DLOCALSTATEDIR=\"$(LOCALSTATEDIR)\" -DTARGETNAME=\"$(TARGETNAME)\" -DSENDERNAME=\"$(SENDERNAME)\" -DLISTENERNAME=\"$(LISTENERNAME)\" ++MYCFLAGS:=$(CFLAGS) -Wall -Wshadow -Wcast-align -Wcast-qual -Wchar-subscripts -Wno-deprecated-declarations -Wformat-security -Wimplicit -Wsign-compare -Wuninitialized -Wunused -Wwrite-strings -I. -rdynamic -I../libs/fake/include `$(LIBNET_CONFIG) --defines` `$(LIBNET_CONFIG) --cflags` -DPREFIX=\"$(PREFIX)\" -DLOCALSTATEDIR=\"$(LOCALSTATEDIR)\" -DTARGETNAME=\"$(TARGETNAME)\" -DSENDERNAME=\"$(SENDERNAME)\" -DLISTENERNAME=\"$(LISTENERNAME)\" # sometimes you dont have a link to gmake, if your make _is_ gmake, you can use make then, but we need GNU make (for now) MAKE=gmake Copied and modified: head/security/unicornscan/files/pkg-message.in (from r323677, head/security/unicornscan/pkg-message) ============================================================================== --- head/security/unicornscan/pkg-message Thu Jul 25 23:23:47 2013 (r323677, copy source) +++ head/security/unicornscan/files/pkg-message.in Sat Jul 27 13:30:52 2013 (r323785) @@ -1,13 +1,7 @@ +Unicornscan has been successfully installed! -############################################## -unicornscan has been successfully installed! +Check the sample configuration files under -Check the sample configuration files in -%%PREFIX%%/etc/unicornscan -and rename or copy without the .sample suffix. - -Note that the long option parameters, which are -displayed by this ports man page and help menu, -are disabled on FreeBSD systems prior to 5.2. -############################################## + %%PREFIX%%/etc/unicornscan +and rename or copy without the .sample suffix. Modified: head/security/unicornscan/pkg-descr ============================================================================== --- head/security/unicornscan/pkg-descr Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/pkg-descr Sat Jul 27 13:30:52 2013 (r323785) @@ -1,6 +1,6 @@ -"Unicornscan is a new information gathering and correlation engine -built for and by members of the security research and testing -communities. It was designed to provide an engine that is Scalable, -Accurate, Flexible, and Efficient." +Unicornscan is a new information gathering and correlation engine built +for and by members of the security research and testing communities. It +was designed to provide an engine that is scalable, accurate, flexible, +and efficient. WWW: http://www.dyadsecurity.com/s_unicornscan.html Modified: head/security/unicornscan/pkg-plist ============================================================================== --- head/security/unicornscan/pkg-plist Sat Jul 27 13:25:14 2013 (r323784) +++ head/security/unicornscan/pkg-plist Sat Jul 27 13:30:52 2013 (r323785) @@ -11,7 +11,6 @@ libexec/unicornscan/modules/sip.so libexec/unicornscan/modules/upnp.so libexec/unicornscan/unilisten libexec/unicornscan/unisend -share/unicornscan/LICENSE share/unicornscan/README share/unicornscan/README.database share/unicornscan/TODO_BUGSTOFIX
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307271330.r6RDUrgV090789>