8 files changed, 122 insertions, 156 deletions

diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index 6b57f07fa34a..35072e9daa3f 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	openvas-libraries
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/419/
+MASTER_SITES=	http://wald.intevation.org/frs/download.php/600/
 
 MAINTAINER=	cherry@trombik.org
 COMMENT=	Libraries for OpenVAS
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_GNOME=	glib20 pkgconfig
 
 MAN1=		libopenvas-config.1
 
diff --git a/security/openvas-libraries/Makefile.common b/security/openvas-libraries/Makefile.common
index cefbe79f307c..8741e0850c9b 100644
--- a/security/openvas-libraries/Makefile.common
+++ b/security/openvas-libraries/Makefile.common
@@ -1,3 +1,8 @@
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include \
-					--localstatedir=${PREFIX}/openvas \
-					--sharedstatedir=${PREFIX}/openvas/com
+CONFIGURE_ARGS+=--includedir=${PREFIX}/include \
+		--libdir=${PREFIX}/lib \
+		--localstatedir=${PREFIX}/openvas \
+		--sharedstatedir=${PREFIX}/openvas/com
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${PREFIX}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/security/openvas-libraries/distinfo b/security/openvas-libraries/distinfo
index 28b3c7abb215..c3e8d8065680 100644
--- a/security/openvas-libraries/distinfo
+++ b/security/openvas-libraries/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvas-libraries-1.0.1.tar.gz) = 59eff43239e05bed77f2b3e789e0110b
-SHA256 (openvas-libraries-1.0.1.tar.gz) = 6d423d82d6e71e519df79596d30fad6ffefd480ed8a0dd7282fb5b749cee72e3
-SIZE (openvas-libraries-1.0.1.tar.gz) = 312409
+MD5 (openvas-libraries-2.0.3.tar.gz) = 9df63a63c1ea134e0218d7a8f2ffd288
+SHA256 (openvas-libraries-2.0.3.tar.gz) = 9847e99b92bf2269c5157c69799de127fadcb83af19bfb7320c1c91036a6cc62
+SIZE (openvas-libraries-2.0.3.tar.gz) = 482097
diff --git a/security/openvas-libraries/files/patch-configure b/security/openvas-libraries/files/patch-configure
index 79b71384e91b..9d3eeaff0cd2 100644
--- a/security/openvas-libraries/files/patch-configure
+++ b/security/openvas-libraries/files/patch-configure
@@ -1,16 +1,63 @@
---- configure.orig	2008-03-27 03:57:28.000000000 +0900
-+++ configure	2008-06-06 09:42:17.000000000 +0900
-@@ -6343,7 +6343,8 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -8282,7 +8282,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
 -  version_type=freebsd-$objformat
-+  # recent FreeBSD only supports elf. objformat was removed from FreeBSD 7
 +  version_type=freebsd-elf
    case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-@@ -8136,7 +8137,7 @@
+       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
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $LIBS"
++LIBS="$LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19134,7 +19134,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
+ echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
+ if test $ac_cv_lib_resolv_dn_expand = yes; then
+-  LIBS="-lresolv $LIBS"
++  LIBS="$LIBS"
+ else
+   { echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
+ echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6; }
+@@ -19142,7 +19142,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +66,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8192,7 +8193,7 @@
+@@ -19198,7 +19198,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
  echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }
  if test $ac_cv_lib_resolv___dn_expand = yes; then
@@ -28,7 +75,7 @@
  else
    { { echo "$as_me:$LINENO: error: you need to install resolve library with development files" >&5
  echo "$as_me: error: you need to install resolve library with development files" >&2;}
-@@ -8290,11 +8291,11 @@
+@@ -19298,11 +19298,11 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -42,7 +89,7 @@
    ;
    return 0;
  }
-@@ -12909,7 +12910,7 @@
+@@ -23773,7 +23773,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/security/openvas-libraries/files/patch-libopenvas-Makefile b/security/openvas-libraries/files/patch-libopenvas-Makefile
index de0a529417c6..eb83a9533b24 100644
--- a/security/openvas-libraries/files/patch-libopenvas-Makefile
+++ b/security/openvas-libraries/files/patch-libopenvas-Makefile
@@ -1,105 +1,14 @@
-honor CPPFLAGS and CFLAGS
 
---- libopenvas/Makefile.orig	2008-04-27 17:29:09.000000000 +0900
-+++ libopenvas/Makefile	2008-04-27 17:29:32.000000000 +0900
-@@ -46,76 +46,76 @@
- 
- 
- getopt.o : getopt.c
--	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt.c
-+	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt.c
- 
- getopt1.o : getopt1.c
--	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt1.c
-+	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt1.c
- 
- plugutils.o : plugutils.c
--	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
-+	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c plugutils.c
- 
- resolve.o : resolve.c resolve.h
--	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
-+	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c resolve.c
- 
- share_fd.o : share_fd.c 
--	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
-+	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c share_fd.c
- 
- system.o : system.c system_internal.h
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c 
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c system.c 
- 
- arglists.o : arglists.c 
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c arglists.c
- 
- network.o : network.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c network.c
- 
- scanners_utils.o : scanners_utils.c scanners_utils.h
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c scanners_utils.c
- 
- ftp_funcs.o : ftp_funcs.c ftp_funcs.h
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ftp_funcs.c
- www_funcs.o : www_funcs.c 
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c www_funcs.c
- 	
- pcap.o : pcap.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c pcap.c
- 
- hlst.o : hlst.c hlst.h
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c hlst.c
- 
- ptycall.o : ptycall.c 
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ptycall.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ptycall.c
- 
- harglists.o : harglists.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c harglists.c
- 
- ids_send.o : ids_send.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c 
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ids_send.c 
- 
- bpf_share.o: bpf_share.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c bpf_share.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c bpf_share.c
- 
- rand.o: rand.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c rand.c
- 
- popen.o: popen.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c popen.c
- 
- services.o: services.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
- 
- services1.o: services1.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
- 
- proctitle.o: proctitle.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c proctitle.c
- 
- store.o: store.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
- 	
- 	
- kb.o: kb.c
--	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
-+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c kb.c
- 
+$FreeBSD$
+
+--- libopenvas/Makefile.orig
++++ libopenvas/Makefile
+@@ -48,7 +48,7 @@
+ CFLAGS+=-g -Wall
+ INCLUDE = $(include) $(GLIB_CFLAGS) $(DEFS) -I../libopenvascommon
+ CIPHER = -I../$(CIPHER_SUBDIR)
+-COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS)
++COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
+ all : libopenvas.la
  
- libopenvas.la: $(OBJS)
diff --git a/security/openvas-libraries/files/patch-libopenvas-pcap.c b/security/openvas-libraries/files/patch-libopenvas-pcap.c
index 8bad6e2015ce..d2ebf31eb47a 100644
--- a/security/openvas-libraries/files/patch-libopenvas-pcap.c
+++ b/security/openvas-libraries/files/patch-libopenvas-pcap.c
@@ -1,5 +1,8 @@
---- libopenvas/pcap.c.orig	2008-03-21 06:25:01.000000000 +0900
-+++ libopenvas/pcap.c	2008-04-26 23:47:15.000000000 +0900
+
+$FreeBSD$
+
+--- libopenvas/pcap.c.orig
++++ libopenvas/pcap.c
 @@ -16,9 +16,7 @@
   * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
@@ -7,10 +10,10 @@
 -#include <resolv.h>
  #include <pcap.h>
 -#include <net/if.h>
+ #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <sys/ioctl.h>
- #include <netdb.h>
-@@ -28,6 +26,10 @@
+@@ -29,6 +27,10 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
diff --git a/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in b/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in
index bae7561c6aa4..64dceb4ea472 100644
--- a/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in
+++ b/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in
@@ -1,14 +1,15 @@
-honor CPPFLAGS and LDFLAGS
---- openvas-libraries.tmpl.in.orig	2008-03-21 06:00:30.000000000 +0900
-+++ openvas-libraries.tmpl.in	2008-04-27 17:27:45.000000000 +0900
-@@ -62,8 +62,9 @@
+
+$FreeBSD$
+
+--- openvas-libraries.tmpl.in.orig
++++ openvas-libraries.tmpl.in
+@@ -61,7 +61,8 @@
  DEBUG_SSL = @debug_ssl@
  
  # Some defines you may want to modify
+-DEFS=@DEFS@ $(DEBUG_SSL) $(DEBUG)
 +CPPFLAGS=@CPPFLAGS@
- DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
--LDFLAGS=
-+LDFLAGS=@LDFLAGS@
++DEFS=@DEFS@ $(CFLAGS) $(CPPFLAGS)
+ LDFLAGS=@LDFLAGS@
  
  # Your C compiler
- CC=@CC@
diff --git a/security/openvas-libraries/pkg-plist b/security/openvas-libraries/pkg-plist
index 2823a913e5dc..9993ae60c0bf 100644
--- a/security/openvas-libraries/pkg-plist
+++ b/security/openvas-libraries/pkg-plist
@@ -1,25 +1,22 @@
-@comment $FreeBSD$
 bin/libopenvas-config
-lib/libopenvas.so.1
-lib/libopenvas.so
-lib/libopenvas.la
-lib/libopenvas.a
-lib/libopenvas_hg.so.1
-lib/libopenvas_hg.so
-lib/libopenvas_hg.la
-lib/libopenvas_hg.a
-
-include/openvas/hosts_gatherer.h
-include/openvas/hg_utils.h
-include/openvas/libopenvas.h
-include/openvas/libvers.h
-include/openvas/getopt.h
 include/openvas/arglists.h
 include/openvas/bpf_share.h
+include/openvas/certificate.h
 include/openvas/ftp_funcs.h
 include/openvas/harglists.h
+include/openvas/hash_table_file.h
+include/openvas/hg_utils.h
+include/openvas/hosts_gatherer.h
 include/openvas/kb.h
+include/openvas/libopenvas.h
+include/openvas/libvers.h
 include/openvas/network.h
+include/openvas/ntp.h
+include/openvas/nvti.h
+include/openvas/openvas_auth.h
+include/openvas/openvas_logging.h
+include/openvas/openvas_server.h
+include/openvas/openvas_ssh_login.h
 include/openvas/pcap_openvas.h
 include/openvas/plugutils.h
 include/openvas/popen.h
@@ -32,5 +29,12 @@ include/openvas/share_fd.h
 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_hg.a
+lib/libopenvas_hg.la
+lib/libopenvas_hg.so
+lib/libopenvas_hg.so.2
 @dirrm include/openvas