svn commit: r360951 - in head/security: openvas-client openvas-client/files openvas-libnasl openvas-libnasl/files openvas-libraries openvas-libraries/files openvas-plugins openvas-plugins/files ope...
Tijl Coosemans
tijl at FreeBSD.org
Sun Jul 6 18:23:07 UTC 2014
Author: tijl
Date: Sun Jul 6 18:23:03 2014
New Revision: 360951
URL: http://svnweb.freebsd.org/changeset/ports/360951
QAT: https://qat.redports.org/buildarchive/r360951/
Log:
security/openvas-*:
- Add USES=libtool
- Eliminate security/openvas-libraries/Makefile.common
- Use /var instead of PREFIX/openvas
- Remove $FreeBSD$ from patches
security/openvas-client:
- Add missing dependencies
- Add NLS option
- Delete old patches
Deleted:
head/security/openvas-client/files/
head/security/openvas-libnasl/files/
head/security/openvas-libraries/Makefile.common
head/security/openvas-server/files/patch-configure
Modified:
head/security/openvas-client/Makefile
head/security/openvas-client/pkg-plist
head/security/openvas-libnasl/Makefile
head/security/openvas-libnasl/pkg-plist
head/security/openvas-libraries/Makefile
head/security/openvas-libraries/files/patch-configure (contents, props changed)
head/security/openvas-libraries/files/patch-libopenvas-Makefile (contents, props changed)
head/security/openvas-libraries/files/patch-libopenvas-pcap.c (contents, props changed)
head/security/openvas-libraries/files/patch-libopenvas_openvas__server.c (contents, props changed)
head/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in (contents, props changed)
head/security/openvas-libraries/pkg-plist
head/security/openvas-plugins/Makefile
head/security/openvas-plugins/files/patch-openvas-nvt-sync.in (contents, props changed)
head/security/openvas-server/Makefile
head/security/openvas-server/files/patch-openvasd-Makefile (contents, props changed)
head/security/openvas-server/pkg-plist
Modified: head/security/openvas-client/Makefile
==============================================================================
--- head/security/openvas-client/Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-client/Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,19 +3,48 @@
PORTNAME= openvas-client
PORTVERSION= 2.0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/595/
MAINTAINER= ports at FreeBSD.org
COMMENT= GUI client for OpenVAS
-GNU_CONFIGURE= yes
+LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
+ libgdc.so:${PORTSDIR}/graphics/gdchart \
+ libpng.so:${PORTSDIR}/graphics/png \
+ libopenvas.so:${PORTSDIR}/security/openvas-libraries
+
USES= gmake pkgconfig
USE_GNOME= gtk20
-
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --localstatedir=/var
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
MAKE_JOBS_UNSAFE=yes
-.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
+NLS_USES= gettext
+
+.include <bsd.port.options.mk>
+
+post-patch:
+ @${REINPLACE_CMD} \
+ -e 's,/usr/bin/gettext.sh,${LOCALBASE}/bin/gettext.sh,' \
+ -e 's,$$localstatedir/openvas/CA,$$localstatedir/lib/openvas/private/CA,' \
+ -e 's,$$sharedstatedir/openvas/CA,$$localstatedir/lib/openvas/CA,' \
+ -e 's,$$localstatedir/openvas/users,$$localstatedir/lib/openvas/users,' \
+ ${WRKSRC}/openvasclient-mkcert.in
+
+.if ${PORT_OPTIONS:MNLS}
+post-build:
+ @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+
+post-install:
+ @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endif
.include <bsd.port.mk>
Modified: head/security/openvas-client/pkg-plist
==============================================================================
--- head/security/openvas-client/pkg-plist Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-client/pkg-plist Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,4 +3,10 @@ bin/openvasclient-mkcert
lib/openvas/openvas-ssh-client-rpm-creator.sh
man/man1/OpenVAS-Client.1.gz
man/man1/openvasclient-mkcert.1.gz
+%%NLS%%share/locale/de/LC_MESSAGES/OpenVAS-Client.mo
+%%NLS%%share/locale/es/LC_MESSAGES/OpenVAS-Client.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/OpenVAS-Client.mo
+%%NLS%%share/locale/he/LC_MESSAGES/OpenVAS-Client.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/OpenVAS-Client.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/OpenVAS-Client.mo
@dirrmtry lib/openvas
Modified: head/security/openvas-libnasl/Makefile
==============================================================================
--- head/security/openvas-libnasl/Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libnasl/Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,7 +3,7 @@
PORTNAME= openvas-libnasl
PORTVERSION= 2.0.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/561/
@@ -19,11 +19,11 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/se
libtasn1.so:${PORTSDIR}/security/libtasn1
GNU_CONFIGURE= yes
+USES= bison iconv libtool pkgconfig
USE_LDCONFIG= yes
-USES= bison iconv pkgconfig
-.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
-
-LDFLAGS+= -lgcrypt
+CONFIGURE_ARGS= --localstatedir=/var
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib -lgcrypt
.include <bsd.port.mk>
Modified: head/security/openvas-libnasl/pkg-plist
==============================================================================
--- head/security/openvas-libnasl/pkg-plist Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libnasl/pkg-plist Sun Jul 6 18:23:03 2014 (r360951)
@@ -2,9 +2,8 @@ bin/openvas-libnasl-config
bin/openvas-nasl
include/openvas/nasl.h
lib/libopenvasnasl.a
-lib/libopenvasnasl.la
lib/libopenvasnasl.so
lib/libopenvasnasl.so.2
+lib/libopenvasnasl.so.2.0.1
man/man1/openvas-libnasl-config.1.gz
man/man1/openvas-nasl.1.gz
- at dirrmtry include/openvas
Modified: head/security/openvas-libraries/Makefile
==============================================================================
--- head/security/openvas-libraries/Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,7 +3,7 @@
PORTNAME= openvas-libraries
PORTVERSION= 2.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/600/
@@ -13,12 +13,14 @@ COMMENT= Libraries for OpenVAS
LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt
-USES= pkgconfig
GNU_CONFIGURE= yes
+USES= libtool pkgconfig
USE_LDCONFIG= yes
USE_GNOME= glib20
MAKE_JOBS_UNSAFE= yes
-.include "${.CURDIR}/Makefile.common"
+CONFIGURE_ARGS= --localstatedir=/var
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
Modified: head/security/openvas-libraries/files/patch-configure
==============================================================================
--- head/security/openvas-libraries/files/patch-configure Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/files/patch-configure Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,44 +1,5 @@
-
-$FreeBSD$
-
--- configure.orig
+++ configure
-@@ -8282,7 +8282,7 @@
- *) objformat=elf ;;
- esac
- fi
-- version_type=freebsd-$objformat
-+ version_type=freebsd-elf
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -12192,7 +12192,7 @@
- *) objformat=elf ;;
- esac
- fi
-- version_type=freebsd-$objformat
-+ version_type=freebsd-elf
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -14764,7 +14764,7 @@
- *) objformat=elf ;;
- esac
- fi
-- version_type=freebsd-$objformat
-+ version_type=freebsd-elf
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -17343,7 +17343,7 @@
- *) objformat=elf ;;
- esac
- fi
-- version_type=freebsd-$objformat
-+ version_type=freebsd-elf
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -19078,7 +19078,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
Modified: head/security/openvas-libraries/files/patch-libopenvas-Makefile
==============================================================================
--- head/security/openvas-libraries/files/patch-libopenvas-Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/files/patch-libopenvas-Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- libopenvas/Makefile.orig
+++ libopenvas/Makefile
@@ -48,7 +48,7 @@
Modified: head/security/openvas-libraries/files/patch-libopenvas-pcap.c
==============================================================================
--- head/security/openvas-libraries/files/patch-libopenvas-pcap.c Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/files/patch-libopenvas-pcap.c Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- libopenvas/pcap.c.orig
+++ libopenvas/pcap.c
@@ -16,9 +16,7 @@
Modified: head/security/openvas-libraries/files/patch-libopenvas_openvas__server.c
==============================================================================
--- head/security/openvas-libraries/files/patch-libopenvas_openvas__server.c Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/files/patch-libopenvas_openvas__server.c Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- libopenvas/openvas_server.c.orig
+++ libopenvas/openvas_server.c
@@ -32,6 +32,8 @@
Modified: head/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in
==============================================================================
--- head/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- openvas-libraries.tmpl.in.orig
+++ openvas-libraries.tmpl.in
@@ -61,7 +61,8 @@
Modified: head/security/openvas-libraries/pkg-plist
==============================================================================
--- head/security/openvas-libraries/pkg-plist Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-libraries/pkg-plist Sun Jul 6 18:23:03 2014 (r360951)
@@ -30,12 +30,12 @@ include/openvas/store.h
include/openvas/system.h
include/openvas/www_funcs.h
lib/libopenvas.a
-lib/libopenvas.la
lib/libopenvas.so
lib/libopenvas.so.2
+lib/libopenvas.so.2.0.3
lib/libopenvas_hg.a
-lib/libopenvas_hg.la
lib/libopenvas_hg.so
lib/libopenvas_hg.so.2
+lib/libopenvas_hg.so.2.0.3
man/man1/libopenvas-config.1.gz
@dirrm include/openvas
Modified: head/security/openvas-plugins/Makefile
==============================================================================
--- head/security/openvas-plugins/Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-plugins/Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,7 +3,7 @@
PORTNAME= openvas-plugins
PORTVERSION= 1.0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/588/
@@ -19,17 +19,13 @@ RUN_DEPENDS= openvasd:${PORTSDIR}/securi
${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils \
${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
-USES= pkgconfig
-GNU_CONFIGURE= yes
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
-CPPFLAGS+= "`${LIBNET_CONFIG} --cflags`"
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../openvas-libraries/Makefile.common"
-#.if ${ARCH} != "i386"
-#BROKEN= does not compile
-#.endif
+USES= libtool pkgconfig
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --localstatedir=/var
+CPPFLAGS+= "`${LIBNET_CONFIG} --cflags`" -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
@@ -37,4 +33,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
${WRKSRC}/plugins/3com_hub/Makefile
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/security/openvas-plugins/files/patch-openvas-nvt-sync.in
==============================================================================
--- head/security/openvas-plugins/files/patch-openvas-nvt-sync.in Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-plugins/files/patch-openvas-nvt-sync.in Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- openvas-nvt-sync.in.orig
+++ openvas-nvt-sync.in
@@ -1,4 +1,4 @@
Modified: head/security/openvas-server/Makefile
==============================================================================
--- head/security/openvas-server/Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-server/Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -3,7 +3,7 @@
PORTNAME= openvas-server
PORTVERSION= 2.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://wald.intevation.org/frs/download.php/593/
@@ -17,8 +17,10 @@ GNU_CONFIGURE= yes
USES= gettext pkgconfig
USE_RC_SUBR= openvasd
-.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
+CONFIGURE_ARGS= --localstatedir=/var
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib -lgcrypt
-LDFLAGS+= -lgcrypt
+PLIST_SUB= RESETPREFIX=${PREFIX}
.include <bsd.port.mk>
Modified: head/security/openvas-server/files/patch-openvasd-Makefile
==============================================================================
--- head/security/openvas-server/files/patch-openvasd-Makefile Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-server/files/patch-openvasd-Makefile Sun Jul 6 18:23:03 2014 (r360951)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- openvasd/Makefile.orig
+++ openvasd/Makefile
@@ -38,92 +38,92 @@
Modified: head/security/openvas-server/pkg-plist
==============================================================================
--- head/security/openvas-server/pkg-plist Sun Jul 6 18:14:57 2014 (r360950)
+++ head/security/openvas-server/pkg-plist Sun Jul 6 18:23:03 2014 (r360951)
@@ -16,26 +16,34 @@ man/man8/openvas-adduser.8.gz
man/man8/openvas-mkcert.8.gz
man/man8/openvas-rmuser.8.gz
man/man8/openvasd.8.gz
-openvas/lib/openvas/openvas-services
sbin/openvas-adduser
sbin/openvas-mkcert
sbin/openvas-rmuser
sbin/openvasd
- at dirrmtry openvas/run
- at dirrmtry openvas/log/openvas
- at dirrmtry openvas/log
- at dirrmtry openvas/lib/openvas/users
- at dirrmtry openvas/lib/openvas/tmp
- at dirrmtry openvas/lib/openvas/private/CA
- at dirrmtry openvas/lib/openvas/private
- at dirrmtry openvas/lib/openvas/logs
- at dirrmtry openvas/lib/openvas/jobs
- at dirrmtry openvas/lib/openvas/CA
- at dirrmtry openvas/lib/openvas
- at dirrmtry openvas/lib
- at dirrmtry openvas/cache/openvas
- at dirrmtry openvas/cache
- at dirrmtry openvas
- at dirrmtry include/openvas
+ at exec mkdir -p %D/etc/openvas
+ at exec install -d -m 700 %D/etc/openvas/gnupg
@dirrmtry etc/openvas/gnupg
@dirrmtry etc/openvas
+ at cwd /var
+ at exec mkdir -p %D/cache/openvas
+lib/openvas/openvas-services
+ at exec mkdir -p %D/lib/openvas/CA
+ at exec mkdir -p %D/lib/openvas/jobs
+ at exec mkdir -p %D/lib/openvas/logs
+ at exec install -d -m 700 %D/lib/openvas/private
+ at exec install -d -m 700 %D/lib/openvas/private/CA
+ at exec mkdir -p %D/lib/openvas/tmp
+ at exec mkdir -p %D/lib/openvas/users
+ at exec mkdir -p %D/log/openvas
+ at dirrmtry log/openvas
+ at dirrmtry lib/openvas/users
+ at dirrmtry lib/openvas/tmp
+ at dirrmtry lib/openvas/private/CA
+ at dirrmtry lib/openvas/private
+ at dirrmtry lib/openvas/logs
+ at dirrmtry lib/openvas/jobs
+ at dirrmtry lib/openvas/CA
+ at dirrmtry lib/openvas
+ at dirrmtry lib
+ at dirrmtry cache/openvas
+ at cwd %%RESETPREFIX%%
More information about the svn-ports-all
mailing list