ports/137209: [update] security/openvas-libnasl to 2.0.1

Tue Jul 28 13:00:11 UTC 2009

>Number:         137209
>Category:       ports
>Synopsis:       [update] security/openvas-libnasl to 2.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 28 13:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Babak Farrokhi
>Release:        7.2-STABLE
>Organization:
>Environment:
FreeBSD devbox 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 24 13:39:32 IRDT 2009     root at devbox:/usr/obj/usr/src/sys/SERVER  i386
>Description:
- update security/openvas-libnasl 1.0.0 -> 2.0.1

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN openvas-libnasl.orig/Makefile openvas-libnasl/Makefile

--- openvas-libnasl.orig/Makefile	2009-07-15 21:17:43.000000000 +0430
+++ openvas-libnasl/Makefile	2009-07-14 10:56:42.000000000 +0430
@@ -2,14 +2,13 @@
 # Date created:		2008-04-27
 # Whom:			Tomoyuki Sakurai <cherry at trombik.org>
 #
-# $FreeBSD: ports/security/openvas-libnasl/Makefile,v 1.6 2009/07/15 16:47:43 wxs Exp $
+# $FreeBSD: ports/security/openvas-libnasl/Makefile,v 1.5 2009/01/18 17:04:08 novel Exp $
 #
 
 PORTNAME=	openvas-libnasl
-PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTVERSION=	2.0.1
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/406/
+MASTER_SITES=	http://wald.intevation.org/frs/download.php/561/
 
 MAINTAINER=	cherry at trombik.org
 COMMENT=	NASL libraries for OpenVAS
@@ -17,9 +16,9 @@
 LIB_DEPENDS=	gcrypt.16:${PORTSDIR}/security/libgcrypt \
 		gnutls.26:${PORTSDIR}/security/gnutls \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error \
-		gpgme.18:${PORTSDIR}/security/gpgme \
-		openvas.1:${PORTSDIR}/security/openvas-libraries \
-		openvas_hg.1:${PORTSDIR}/security/openvas-libraries \
+		gpgme.17:${PORTSDIR}/security/gpgme \
+		openvas.2:${.CURDIR}/../openvas-libraries \
+		openvas_hg.2:${.CURDIR}/../openvas-libraries \
 		tasn1.4:${PORTSDIR}/security/libtasn1
 
 GNU_CONFIGURE=	yes
@@ -29,6 +28,6 @@
 
 MAN1=		openvas-libnasl-config.1 openvas-nasl.1
 
-.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
+.include "${.CURDIR}/../openvas-libraries/Makefile.common"
 
 .include <bsd.port.mk>
diff -ruN openvas-libnasl.orig/distinfo openvas-libnasl/distinfo
--- openvas-libnasl.orig/distinfo	2008-06-04 17:44:01.000000000 +0430
+++ openvas-libnasl/distinfo	2009-07-12 22:13:56.000000000 +0430
@@ -1,3 +1,3 @@
-MD5 (openvas-libnasl-1.0.0.tar.gz) = 786a7e81f0bbcfedf2594ff731f5a7fc
-SHA256 (openvas-libnasl-1.0.0.tar.gz) = 85a70f418aa54b14220bab825897a93fcce7e850ce8d5a5cc5edfb9131089e06
-SIZE (openvas-libnasl-1.0.0.tar.gz) = 416197
+MD5 (openvas-libnasl-2.0.1.tar.gz) = 658c730b902a04f2e2d057a303c2e6f3
+SHA256 (openvas-libnasl-2.0.1.tar.gz) = 6e8312f273869648b61409c47f4aa445dffba211556c477163087124443c60dd
+SIZE (openvas-libnasl-2.0.1.tar.gz) = 530116
diff -ruN openvas-libnasl.orig/files/patch-Makefile openvas-libnasl/files/patch-Makefile
--- openvas-libnasl.orig/files/patch-Makefile	2008-06-04 17:44:01.000000000 +0430
+++ openvas-libnasl/files/patch-Makefile	1970-01-01 03:30:00.000000000 +0330
@@ -1,11 +0,0 @@
---- Makefile.orig	2008-04-27 13:27:21.000000000 +0900
-+++ Makefile	2008-04-27 13:28:00.000000000 +0900
-@@ -41,7 +41,7 @@
- 	$(INSTALL) -c -m 0644 doc/openvas-libnasl-config.1 ${mandir}/man1
- 	$(INSTALL) -c -m 0644 doc/openvas-nasl.1 ${mandir}/man1
- 	$(INSTALL) -c -m 0644 doc/openvas-libnasl-config.1 ${mandir}/man1
--	test -d ${localstatedir}/openvas || $(INSTALL_DIR) -m 755 ${localstatedir}/openvas
-+	test -d ${localstatedir} || $(INSTALL_DIR) -m 755 ${localstatedir}
- 
- 
- 	@echo
diff -ruN openvas-libnasl.orig/files/patch-configure openvas-libnasl/files/patch-configure
--- openvas-libnasl.orig/files/patch-configure	2008-06-08 17:50:14.000000000 +0430
+++ openvas-libnasl/files/patch-configure	2009-07-12 22:13:56.000000000 +0430
@@ -1,12 +1,41 @@
-remove obsolete objformat
---- configure.orig	2008-06-06 11:23:51.000000000 +0900
-+++ configure	2008-06-06 11:24:15.000000000 +0900
-@@ -6339,7 +6339,7 @@
- 
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -7990,7 +7990,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
 -  version_type=freebsd-$objformat
 +  version_type=freebsd-elf
    case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -11900,7 +11900,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}'
+@@ -14472,7 +14472,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}'
+@@ -17051,7 +17051,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}'
diff -ruN openvas-libnasl.orig/files/patch-nasl__nasl_signature.c openvas-libnasl/files/patch-nasl__nasl_signature.c
--- openvas-libnasl.orig/files/patch-nasl__nasl_signature.c	2009-07-15 21:17:43.000000000 +0430
+++ openvas-libnasl/files/patch-nasl__nasl_signature.c	1970-01-01 03:30:00.000000000 +0330
@@ -1,11 +0,0 @@
---- ./nasl/nasl_signature.c.orig	2009-07-01 23:08:30.000000000 -0400
-+++ ./nasl/nasl_signature.c	2009-07-01 23:09:42.000000000 -0400
-@@ -131,6 +131,8 @@
-   gpgme_data_t sig = NULL, text = NULL;
-   char * gpghome = determine_gpghome();
- 
-+  gpgme_check_version (NULL);
-+
-   err = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP);
-   if (err)
-     {
diff -ruN openvas-libnasl.orig/pkg-plist openvas-libnasl/pkg-plist
--- openvas-libnasl.orig/pkg-plist	2008-06-04 17:44:01.000000000 +0430
+++ openvas-libnasl/pkg-plist	2009-07-14 11:08:45.000000000 +0430
@@ -1,9 +1,9 @@
- at comment $FreeBSD: ports/security/openvas-libnasl/pkg-plist,v 1.1 2008/06/04 13:14:01 edwin Exp $
-bin/openvas-nasl
 bin/openvas-libnasl-config
-lib/libopenvasnasl.so.1
-lib/libopenvasnasl.so
-lib/libopenvasnasl.la
-lib/libopenvasnasl.a
+bin/openvas-nasl
 include/openvas/nasl.h
- at dirrmtry openvas
+lib/libopenvasnasl.a
+lib/libopenvasnasl.la
+lib/libopenvasnasl.so
+lib/libopenvasnasl.so.2
+ at dirrmtry include/openvas
+


>Release-Note:
>Audit-Trail:
>Unformatted:

