Date: Mon, 7 Jul 2014 10:29:18 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361049 - in head/security: nessus nessus-libnasl nessus-libnasl/files nessus-libraries nessus-libraries/files nessus-plugins Message-ID: <201407071029.s67ATIfS095220@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Mon Jul 7 10:29:17 2014 New Revision: 361049 URL: http://svnweb.freebsd.org/changeset/ports/361049 QAT: https://qat.redports.org/buildarchive/r361049/ Log: - Convert security/nessus-* to USES=libtool and bump dependent ports - Use @sample in security/nessus Added: head/security/nessus-libnasl/files/patch-nasl-Makefile - copied, changed from r361032, head/security/nessus-libnasl/files/patch-libtool Deleted: head/security/nessus-libnasl/files/patch-libtool head/security/nessus-libraries/files/patch-ab head/security/nessus-libraries/files/patch-libtool Modified: head/security/nessus-libnasl/Makefile head/security/nessus-libnasl/pkg-plist head/security/nessus-libraries/Makefile head/security/nessus-libraries/pkg-plist head/security/nessus-plugins/Makefile head/security/nessus/Makefile head/security/nessus/pkg-plist Modified: head/security/nessus-libnasl/Makefile ============================================================================== --- head/security/nessus-libnasl/Makefile Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus-libnasl/Makefile Mon Jul 7 10:29:17 2014 (r361049) @@ -3,7 +3,7 @@ PORTNAME= nessus-libnasl PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \ @@ -20,10 +20,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libnessus.so:${PORTSDIR}/security/nessus-libraries -WRKSRC= ${WRKDIR}/libnasl -USE_AUTOTOOLS= libtool -USES= bison GNU_CONFIGURE= yes +USES= bison libtool USE_LDCONFIG= YES +WRKSRC= ${WRKDIR}/libnasl .include <bsd.port.mk> Copied and modified: head/security/nessus-libnasl/files/patch-nasl-Makefile (from r361032, head/security/nessus-libnasl/files/patch-libtool) ============================================================================== --- head/security/nessus-libnasl/files/patch-libtool Mon Jul 7 07:01:53 2014 (r361032, copy source) +++ head/security/nessus-libnasl/files/patch-nasl-Makefile Mon Jul 7 10:29:17 2014 (r361049) @@ -1,12 +1,7 @@ --- nasl/Makefile.orig 2005-02-10 17:03:51.000000000 +0100 +++ nasl/Makefile 2012-01-29 10:29:13.000000000 +0100 -@@ -88,10 +88,11 @@ - nasl_server.c \ - nasl_debug.c - --COMPILE = $(LIBTOOL) $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -+COMPILE = $(LIBTOOL) --mode compile $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -+LINK = $(LIBTOOL) --mode link $(CC) $(CFLAGS) $(NESSUS_INCLUDE) +@@ -91,7 +91,7 @@ + COMPILE = $(LIBTOOL) $(CC) $(CFLAGS) $(NESSUS_INCLUDE) all : cflags libnasl.la nasl -.c.o: @@ -14,12 +9,3 @@ $(COMPILE) -c $< cflags : @echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags -@@ -101,7 +102,7 @@ - $(CC) $(CFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) - - libnasl.la : cflags $(OBJS) -- $(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \ -+ $(LINK) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \ - -version-info ${PACKAGE_VERSION} - - install : libnasl.la nasl Modified: head/security/nessus-libnasl/pkg-plist ============================================================================== --- head/security/nessus-libnasl/pkg-plist Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus-libnasl/pkg-plist Mon Jul 7 10:29:17 2014 (r361049) @@ -2,9 +2,9 @@ bin/nasl bin/nasl-config include/nessus/nasl.h lib/libnasl.a -lib/libnasl.la lib/libnasl.so -lib/libnasl.so.4 +lib/libnasl.so.2 +lib/libnasl.so.2.2.9 man/man1/nasl.1.gz man/man1/nasl-config.1.gz var/nessus/nessus_org.pem Modified: head/security/nessus-libraries/Makefile ============================================================================== --- head/security/nessus-libraries/Makefile Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus-libraries/Makefile Mon Jul 7 10:29:17 2014 (r361049) @@ -6,7 +6,7 @@ PORTNAME= nessus-libraries PORTVERSION= 2.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \ @@ -20,14 +20,14 @@ COMMENT= Libraries for Nessus, the secur LICENSE= LGPL20 -WRKSRC= ${WRKDIR}/nessus-libraries -USES= bison -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-cipher .if defined(WITH_NESSUS_BPF_SHARE) CONFIGURE_ARGS+= --enable-bpf-sharing .endif +USES= bison libtool USE_LDCONFIG= YES +WRKSRC= ${WRKDIR}/nessus-libraries .if ! defined(NESSUS_CLIENT_ONLY) pre-everything:: Modified: head/security/nessus-libraries/pkg-plist ============================================================================== --- head/security/nessus-libraries/pkg-plist Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus-libraries/pkg-plist Mon Jul 7 10:29:17 2014 (r361049) @@ -7,17 +7,17 @@ include/nessus/pcap-namedb.h include/nessus/pcap.h include/nessus/net/bpf.h lib/libhosts_gatherer.a -lib/libhosts_gatherer.la lib/libhosts_gatherer.so -lib/libhosts_gatherer.so.4 +lib/libhosts_gatherer.so.2 +lib/libhosts_gatherer.so.2.2.9 lib/libnessus.a -lib/libnessus.la lib/libnessus.so -lib/libnessus.so.4 +lib/libnessus.so.2 +lib/libnessus.so.2.2.9 lib/libpcap-nessus.a -lib/libpcap-nessus.la lib/libpcap-nessus.so -lib/libpcap-nessus.so.4 +lib/libpcap-nessus.so.2 +lib/libpcap-nessus.so.2.2.9 man/man1/nessus-config.1.gz sbin/uninstall-nessus @dirrm include/nessus/net Modified: head/security/nessus-plugins/Makefile ============================================================================== --- head/security/nessus-plugins/Makefile Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus-plugins/Makefile Mon Jul 7 10:29:17 2014 (r361049) @@ -3,7 +3,7 @@ PORTNAME= nessus-plugins PORTVERSION= 2.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \ @@ -11,6 +11,7 @@ MASTER_SITES= ftp://ftp.nessus.org/pub/n ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/ DISTNAME= nessus-plugins-GPL-${PORTVERSION} +DIST_SUBDIR= nessus MAINTAINER= udo.schweigert@siemens.com COMMENT= Plugins for Nessus, the security scanner @@ -19,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ness RUN_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \ nmap:${PORTSDIR}/security/nmap -DIST_SUBDIR= nessus +USES= libtool WRKSRC= ${WRKDIR}/nessus-plugins GNU_CONFIGURE= yes Modified: head/security/nessus/Makefile ============================================================================== --- head/security/nessus/Makefile Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus/Makefile Mon Jul 7 10:29:17 2014 (r361049) @@ -3,7 +3,7 @@ PORTNAME= nessus PORTVERSION= 2.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \ ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \ @@ -35,8 +35,8 @@ WRKSRC= ${WRKDIR}/nessus-core post-install: ${INSTALL_DATA} ${WRKDIR}/nessusd.conf \ - ${STAGEDIR}${ETCDIR}/nessusd.conf.dist + ${STAGEDIR}${ETCDIR}/nessusd.conf.sample ${INSTALL_DATA} ${FILESDIR}/nessusd.rules \ - ${STAGEDIR}${ETCDIR}/nessusd.rules.dist + ${STAGEDIR}${ETCDIR}/nessusd.rules.sample .include <bsd.port.mk> Modified: head/security/nessus/pkg-plist ============================================================================== --- head/security/nessus/pkg-plist Mon Jul 7 10:29:12 2014 (r361048) +++ head/security/nessus/pkg-plist Mon Jul 7 10:29:17 2014 (r361049) @@ -2,12 +2,8 @@ bin/nessus bin/nessus-fetch bin/nessus-mkcert-client bin/nessus-mkrand -@unexec if cmp -s %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; then rm -f %D/etc/nessus/nessusd.conf 2> /dev/null; fi || true -@unexec if cmp -s %D/etc/nessus/nessusd.rules.dist %D/etc/nessus/nessusd.rules; then rm -f %D/etc/nessus/nessusd.rules 2> /dev/null; fi || true -etc/nessus/nessusd.conf.dist -etc/nessus/nessusd.rules.dist -@exec if [ ! -f %D/etc/nessus/nessusd.conf ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi -@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.rules.dist %D/etc/nessus/nessusd.rules; fi +@sample etc/nessus/nessusd.conf.sample +@sample etc/nessus/nessusd.rules.sample include/nessus/config.h include/nessus/includes.h include/nessus/nessus-devel.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407071029.s67ATIfS095220>