- Update to farrokhi

PR:		137207
Submitted by:	farrokhi
Approved by:	maintainer timeout

7 files changed, 125 insertions, 151 deletions

diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index e2f41e942730..bcaaac24a2fb 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -6,26 +6,21 @@
 #
 
 PORTNAME=	openvas-server
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.2
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/407/
+MASTER_SITES=	http://wald.intevation.org/frs/download.php/593/
 
 MAINTAINER=	cherry@trombik.org
 COMMENT=	A security scanner: a fork of Nessus
 
-LIB_DEPENDS=	openvas.1:${PORTSDIR}/security/openvas-libraries \
-		openvasnasl.1:${PORTSDIR}/security/openvas-libnasl
+LIB_DEPENDS=	openvas.2:${PORTSDIR}/security/openvas-libraries \
+		openvasnasl.2:${PORTSDIR}/security/openvas-libnasl
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GNU_CONFIGURE=	yes
-# XXX openvas-mkcert uses gettext
 USE_GETTEXT=	yes
 USE_RC_SUBR=	openvasd
 
-MAN1=		openvas-check-signature.1 openvas-mkrand.1
+MAN1=		openvas-mkrand.1 openvas-mkcert-client.1 openvasd-config.1
 MAN8=		openvasd.8 openvas-adduser.8 openvas-rmuser.8 openvas-mkcert.8
 
 .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
diff --git a/security/openvas-server/distinfo b/security/openvas-server/distinfo
index fb669a79989b..60681786bb3d 100644
--- a/security/openvas-server/distinfo
+++ b/security/openvas-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvas-server-1.0.0.tar.gz) = fbea2077375a4dfc8e97cbdeec1cc0da
-SHA256 (openvas-server-1.0.0.tar.gz) = 72ee788c0e79934d3a8220a2acff80851324227093f91fc37564097a2e44b68b
-SIZE (openvas-server-1.0.0.tar.gz) = 289660
+MD5 (openvas-server-2.0.2.tar.gz) = 87d4727e9cba146c1e28003e30f2d5ee
+SHA256 (openvas-server-2.0.2.tar.gz) = 045144ecca53e70942657bf06b07bd306e579ef56d442eb307f5ed808aca7355
+SIZE (openvas-server-2.0.2.tar.gz) = 369699
diff --git a/security/openvas-server/files/openvasd.in b/security/openvas-server/files/openvasd.in
index f3773c741b1b..ab5db47cf775 100644
--- a/security/openvas-server/files/openvasd.in
+++ b/security/openvas-server/files/openvasd.in
@@ -9,6 +9,8 @@
 # KEYWORD: shutdown
 #
 
+prefix=%%PREFIX%%
+
 # Define these openvasd_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
@@ -17,16 +19,16 @@
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 [ -z "$openvasd_enable" ] && openvasd_enable="NO"	# Disable openvasd
-#openvasd_program="%%PREFIX%%/sbin/openvasd"	# Location of openvasd
+#openvasd_program="${prefix}/sbin/openvasd"	# Location of openvasd
 openvasd_flags="-D -q"				# Flags to openvasd program
 
 . %%RC_SUBR%%
 
 name="openvasd"
 rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/openvasd"
+command="${prefix}/sbin/openvasd"
 pidfile="/var/run/openvasd.pid"
-required_files="%%PREFIX%%/etc/openvas/openvasd.conf"
+required_files="${prefix}/etc/openvas/openvasd.conf"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/security/openvas-server/files/patch-configure b/security/openvas-server/files/patch-configure
index ab481ef258e6..20ef3d97e562 100644
--- a/security/openvas-server/files/patch-configure
+++ b/security/openvas-server/files/patch-configure
@@ -1,11 +1,14 @@
---- configure.orig	2008-04-27 14:15:10.000000000 +0900
-+++ configure	2008-04-27 14:15:27.000000000 +0900
-@@ -12073,7 +12073,7 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -12815,7 +12815,7 @@
  
  OPENVASD_CONFDIR='${sysconfdir}'
  OPENVASD_STATEDIR='${localstatedir}/lib/openvas'
 -OPENVASD_PIDDIR='${localstatedir}/run'
 +OPENVASD_PIDDIR='/var/run'
- OPENVASD_SHAREDSTATEDIR='${sharedstatedir}/lib/openvas'
+ OPENVASD_SHAREDSTATEDIR='${localstatedir}/lib/openvas'
  OPENVASD_DATADIR='${sysconfdir}/openvas'
  OPENVASD_LIBDIR='${libdir}/openvas'
diff --git a/security/openvas-server/files/patch-openvasd-Makefile b/security/openvas-server/files/patch-openvasd-Makefile
index 16266997267f..0a4114775e89 100644
--- a/security/openvas-server/files/patch-openvasd-Makefile
+++ b/security/openvas-server/files/patch-openvasd-Makefile
@@ -1,141 +1,127 @@
---- openvasd/Makefile.orig	2008-04-27 17:49:28.000000000 +0900
-+++ openvasd/Makefile	2008-04-27 17:50:41.000000000 +0900
-@@ -46,105 +46,105 @@
- 	@chmod +x cflags
- 
- openvasd : cflags $(OBJS)
+
+$FreeBSD$
+
+--- openvasd/Makefile.orig
++++ openvasd/Makefile
+@@ -38,92 +38,92 @@
+ all : openvasd
+ 
+ openvasd : $(OBJS)
 -	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(OBJS)  -o openvasd $(LIBS)
 +	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) $(OBJS)  -o openvasd $(LIBS)
  
- openvas-check-signature : cflags openvas-check-signature.o
--	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) openvas-check-signature.o  -o openvas-check-signature $(LIBS)
-+	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) openvas-check-signature.o  -o openvas-check-signature $(LIBS)
- 
- openvas-check-signature.o: openvas-check-signature.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c openvas-check-signature.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvas-check-signature.c 
- 
- users.o : cflags users.c users.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c users.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c users.c 
- 
- processes.o : cflags processes.c processes.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c processes.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c processes.c 
- 
- rules.o : cflags rules.c rules.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c rules.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c rules.c 
- 
- preferences.o : cflags preferences.c preferences.h 
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c preferences.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c preferences.c 
+ users.o : users.c users.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c users.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c users.c 
  
- pluginload.o : cflags pluginload.h pluginload.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginload.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginload.c 
+ processes.o : processes.c processes.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c processes.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c processes.c 
  
- openvasd.o : cflags openvasd.c 
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c openvasd.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvasd.c 
+ rules.o : rules.c rules.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c rules.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c rules.c 
  
- auth.o : cflags auth.c auth.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c auth.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c auth.c 
+ preferences.o : preferences.c preferences.h 
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c preferences.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c preferences.c 
  
- attack.o : cflags attack.c attack.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c attack.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c attack.c 
+ pluginload.o : pluginload.h pluginload.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginload.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginload.c 
  
- comm.o : cflags comm.c comm.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c comm.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c comm.c 
+ openvasd.o : openvasd.c 
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c openvasd.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvasd.c 
  
- utils.o : cflags utils.c utils.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c utils.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c utils.c 
+ auth.o : auth.c auth.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c auth.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c auth.c 
  
- log.o : cflags log.c log.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c log.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c log.c 
+ attack.o : attack.c attack.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c attack.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c attack.c 
  
- sighand.o : cflags sighand.c sighand.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c sighand.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c sighand.c 
+ comm.o : comm.c comm.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c comm.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c comm.c 
  
- ntp_10.o  : cflags ntp_10.c ntp_10.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c ntp_10.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_10.c 
+ utils.o : utils.c utils.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c utils.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c utils.c 
  
- ntp_11.o  : cflags ntp_11.c ntp_11.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c ntp_11.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_11.c 
+ log.o : log.c log.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c log.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c log.c 
  
- parser.o : cflags parser.c parser.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c parser.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c parser.c 
+ sighand.o : sighand.c sighand.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c sighand.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c sighand.c 
  
- piic.o : cflags piic.c piic.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c piic.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c piic.c 
+ ntp_11.o  : ntp_11.c ntp_11.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c ntp_11.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_11.c 
  
- nasl_plugins.o : cflags nasl_plugins.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c nasl_plugins.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nasl_plugins.c 
+ otp_1_0.o: otp_1_0.c otp_1_0.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c otp_1_0.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c otp_1_0.c
  
- nes_plugins.o : cflags nes_plugins.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c nes_plugins.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nes_plugins.c 
+ parser.o : parser.c parser.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c parser.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c parser.c 
  
- plugs_req.o : cflags plugs_req.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c plugs_req.c 
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_req.c 
+ piic.o : piic.c piic.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c piic.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c piic.c 
  
- save_tests.o : cflags save_tests.c save_tests.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c save_tests.c	
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_tests.c	
+ nasl_plugins.o : nasl_plugins.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c nasl_plugins.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nasl_plugins.c 
  
- save_kb.o : cflags save_kb.c save_kb.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_kb.c
+ nes_plugins.o : nes_plugins.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c nes_plugins.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nes_plugins.c 
  
- detached.o : cflags detached.c detached.h
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c detached.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c detached.c
+ oval_plugins.o : oval_plugins.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c oval_plugins.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c oval_plugins.c 
  
- pluginlaunch.o : cflags pluginlaunch.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginlaunch.c
+ plugs_req.o : plugs_req.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c plugs_req.c 
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_req.c 
  
- locks.o : cflags locks.c 
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c locks.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c locks.c
+ save_tests.o : save_tests.c save_tests.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_tests.c	
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_tests.c	
  
+ save_kb.o : save_kb.c save_kb.h
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_kb.c
  
- dirutils.o : cflags dirutils.c 
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c dirutils.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c dirutils.c
+ pluginlaunch.o : pluginlaunch.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginlaunch.c
  
+ locks.o : locks.c 
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c locks.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c locks.c
  
- plugs_hash.o : cflags plugs_hash.c 
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c plugs_hash.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_hash.c
  
- pluginupload.o : cflags pluginupload.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginupload.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginupload.c
+ plugs_hash.o : plugs_hash.c 
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c plugs_hash.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_hash.c
  
- pluginscheduler.o : cflags pluginscheduler.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginscheduler.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginscheduler.c
+ pluginscheduler.o : pluginscheduler.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginscheduler.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginscheduler.c
  
- hosts.o : cflags hosts.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c hosts.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c hosts.c
+ hosts.o : hosts.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c hosts.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c hosts.c
  
- shared_socket.o : cflags shared_socket.c
--	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c shared_socket.c
-+	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c shared_socket.c
+ shared_socket.o : shared_socket.c
+-	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c shared_socket.c
++	$(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c shared_socket.c
  clean :
- 	rm -f *.o openvasd openvas-check-signature *~ cflags
+ 	rm -f openvasd *.o *~
  
diff --git a/security/openvas-server/files/patch-openvasd-openvas-check-signature.c b/security/openvas-server/files/patch-openvasd-openvas-check-signature.c
deleted file mode 100644
index e9697938d210..000000000000
--- a/security/openvas-server/files/patch-openvasd-openvas-check-signature.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- openvasd/openvas-check-signature.c.orig	2008-04-27 00:56:59.000000000 +0900
-+++ openvasd/openvas-check-signature.c	2008-04-27 00:57:55.000000000 +0900
-@@ -43,7 +43,7 @@
- #include <includes.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
--
-+#include <getopt.h>
- 
- void
- print_tls_error(char *txt, int err)
diff --git a/security/openvas-server/pkg-plist b/security/openvas-server/pkg-plist
index 94be9bfef119..9ab6d4ffd887 100644
--- a/security/openvas-server/pkg-plist
+++ b/security/openvas-server/pkg-plist
@@ -1,13 +1,6 @@
-@comment $FreeBSD$
 bin/openvas-mkcert-client
-bin/openvasd-config
 bin/openvas-mkrand
-sbin/openvasd
-sbin/openvas-check-signature
-sbin/openvas-adduser
-sbin/openvas-rmuser
-sbin/openvas-mkcert
-openvas/lib/openvas/openvas-services
+bin/openvasd-config
 include/openvas/config.h
 include/openvas/includes.h
 include/openvas/nessusicmp.h
@@ -15,21 +8,27 @@ include/openvas/nessusip.h
 include/openvas/nessusraw.h
 include/openvas/nessustcp.h
 include/openvas/nessusudp.h
-include/openvas/openvas-devel.h
 include/openvas/threadcompat.h
+openvas/lib/openvas/openvas-services
+sbin/openvas-adduser
+sbin/openvas-mkcert
+sbin/openvas-rmuser
+sbin/openvasd
 @dirrmtry openvas/run
 @dirrmtry openvas/log/openvas
 @dirrmtry openvas/log
 @dirrmtry openvas/lib/openvas/users
 @dirrmtry openvas/lib/openvas/tmp
+@dirrmtry openvas/lib/openvas/private/CA
+@dirrmtry openvas/lib/openvas/private
 @dirrmtry openvas/lib/openvas/logs
 @dirrmtry openvas/lib/openvas/jobs
 @dirrmtry openvas/lib/openvas/CA
 @dirrmtry openvas/lib/openvas
 @dirrmtry openvas/lib
-@dirrmtry openvas/com/openvas/CA
-@dirrmtry openvas/com/openvas
-@dirrmtry openvas/com
+@dirrmtry openvas/cache/openvas
+@dirrmtry openvas/cache
 @dirrmtry openvas
+@dirrmtry include/openvas
 @dirrmtry etc/openvas/gnupg
 @dirrmtry etc/openvas