aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracm <acm@FreeBSD.org>2017-08-04 06:25:52 +0800
committeracm <acm@FreeBSD.org>2017-08-04 06:25:52 +0800
commit7e143f0a95b6ea48547c68cf84d84789022951db (patch)
tree9a69946f4067a2529149e9af5c8f227859d7e673
parent9eece0b9018c03ee0038af7426a40497fb931bca (diff)
downloadfreebsd-ports-gnome-7e143f0a95b6ea48547c68cf84d84789022951db.tar.gz
freebsd-ports-gnome-7e143f0a95b6ea48547c68cf84d84789022951db.tar.zst
freebsd-ports-gnome-7e143f0a95b6ea48547c68cf84d84789022951db.zip
- Update to 1.4.5
- Take maintainership - Prepare to import OpenVAS 9 ports
-rw-r--r--security/openvas8-cli/Makefile19
-rw-r--r--security/openvas8-cli/distinfo5
-rw-r--r--security/openvas8-cli/files/patch-CMakeLists.txt9
-rw-r--r--security/openvas8-cli/files/patch-doc-CMakeLists.txt10
-rw-r--r--security/openvas8-cli/pkg-plist2
5 files changed, 22 insertions, 23 deletions
diff --git a/security/openvas8-cli/Makefile b/security/openvas8-cli/Makefile
index 986e32dfeedf..f5a0fcde0f61 100644
--- a/security/openvas8-cli/Makefile
+++ b/security/openvas8-cli/Makefile
@@ -1,25 +1,30 @@
# $FreeBSD$
-PORTNAME= openvas-cli
-PORTVERSION= 1.4.3
-PORTREVISION= 2
+PORTNAME?= openvas8-cli
+PORTVERSION?= 1.4.5
CATEGORIES= security
-MASTER_SITES= http://wald.intevation.org/frs/download.php/2209/
+MASTER_SITES?= http://wald.intevation.org/frs/download.php/2397/
+DISTNAME= ${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
+DIST_SUBDIR= openvas${OPENVAS_VER}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= OpenVAS command-line interface and Nagios plugin
+MAINTAINER= acm@FreeBSD.org
+COMMENT?= OpenVAS 8 command-line interface and Nagios plugin
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgnutls.so:security/gnutls \
- libopenvas_base.so:security/openvas-libraries
+ libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries
+
+CONFLICTS?= ${PORTNAME:S/${OPENVAS_VER}/9/}-*
CFLAGS+= -Wno-missing-field-initializers
USES= cmake:outsource gnome pkgconfig shebangfix
SHEBANG_FILES= dialog/omp-dialog
USE_GNOME= glib20 libxslt:run
+OPENVAS_VER?= 8
+
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
${MV} ${STAGEDIR}${PREFIX}/bin/check_omp \
diff --git a/security/openvas8-cli/distinfo b/security/openvas8-cli/distinfo
index a74c34e1a0d6..619de7e07209 100644
--- a/security/openvas8-cli/distinfo
+++ b/security/openvas8-cli/distinfo
@@ -1,2 +1,3 @@
-SHA256 (openvas-cli-1.4.3.tar.gz) = 69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978
-SIZE (openvas-cli-1.4.3.tar.gz) = 108228
+TIMESTAMP = 1501783452
+SHA256 (openvas8/openvas-cli-1.4.5.tar.gz) = 55d9beaee0161686c452805428af50c1d6e07835621297afbca789f45a1e86a4
+SIZE (openvas8/openvas-cli-1.4.5.tar.gz) = 113958
diff --git a/security/openvas8-cli/files/patch-CMakeLists.txt b/security/openvas8-cli/files/patch-CMakeLists.txt
index 64e832a2017c..0476f72549ed 100644
--- a/security/openvas8-cli/files/patch-CMakeLists.txt
+++ b/security/openvas8-cli/files/patch-CMakeLists.txt
@@ -9,12 +9,3 @@
endif (NOT LOCALSTATEDIR)
if (NOT DATADIR)
-@@ -202,7 +202,7 @@ configure_file (VERSION.in VERSION)
- if (MINGW)
- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2")
- else (MINGW)
-- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
-+ set (HARDENING_FLAGS "-Wformat -Wformat-security -Wl,-z,relro -Wl,-z,now")
- endif (MINGW)
-
- set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
diff --git a/security/openvas8-cli/files/patch-doc-CMakeLists.txt b/security/openvas8-cli/files/patch-doc-CMakeLists.txt
index 25bd557c952b..f940c303de17 100644
--- a/security/openvas8-cli/files/patch-doc-CMakeLists.txt
+++ b/security/openvas8-cli/files/patch-doc-CMakeLists.txt
@@ -1,8 +1,8 @@
---- doc/CMakeLists.txt.orig 2015-10-12 12:46:59 UTC
-+++ doc/CMakeLists.txt
-@@ -97,4 +97,4 @@ else (XMLMANTOHTML_EXECUTABLE)
+--- doc/CMakeLists.txt 2016-07-21 01:33:19.000000000 -0500
++++ doc/CMakeLists.txt 2017-08-03 11:48:48.150617000 -0500
+@@ -131,4 +131,4 @@
endif (XMLMANTOHTML_EXECUTABLE)
- install (FILES omp.8
+ install (FILES omp.8 check_omp.8 omp-dialog.8
- DESTINATION ${DATADIR}/man/man8 )
-+ DESTINATION man/man8 )
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8 )
diff --git a/security/openvas8-cli/pkg-plist b/security/openvas8-cli/pkg-plist
index daaf7e3996cf..90ffc0c24d52 100644
--- a/security/openvas8-cli/pkg-plist
+++ b/security/openvas8-cli/pkg-plist
@@ -1,4 +1,6 @@
bin/omp
bin/omp-dialog
libexec/nagios/check_omp
+man/man8/check_omp.8.gz
+man/man8/omp-dialog.8.gz
man/man8/omp.8.gz