From f14ee492ceb241c441546a7e7142425dde9ba6af Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 17 Aug 2009 22:46:16 +0000 Subject: [PATCH] - Update to 2.0.1 PR: 137209 Submitted by: farrokhi --- security/openvas-libnasl/Makefile | 9 ++-- security/openvas-libnasl/distinfo | 6 +-- security/openvas-libnasl/files/patch-Makefile | 11 ----- .../openvas-libnasl/files/patch-configure | 45 +++++++++++++++---- .../files/patch-nasl__nasl_signature.c | 11 ----- security/openvas-libnasl/pkg-plist | 13 +++--- 6 files changed, 50 insertions(+), 45 deletions(-) delete mode 100644 security/openvas-libnasl/files/patch-Makefile delete mode 100644 security/openvas-libnasl/files/patch-nasl__nasl_signature.c diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile index 4d5e4db77a1a..9d6ff87374b9 100644 --- a/security/openvas-libnasl/Makefile +++ b/security/openvas-libnasl/Makefile @@ -6,10 +6,9 @@ # PORTNAME= openvas-libnasl -PORTVERSION= 1.0.0 -PORTREVISION= 4 +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@trombik.org COMMENT= NASL libraries for OpenVAS @@ -18,8 +17,8 @@ LIB_DEPENDS= gcrypt.16:${PORTSDIR}/security/libgcrypt \ gnutls.40:${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 \ + openvas.2:${PORTSDIR}/security/openvas-libraries \ + openvas_hg.2:${PORTSDIR}/security/openvas-libraries \ tasn1.4:${PORTSDIR}/security/libtasn1 GNU_CONFIGURE= yes diff --git a/security/openvas-libnasl/distinfo b/security/openvas-libnasl/distinfo index 7813fd5ac91b..113f50603de2 100644 --- a/security/openvas-libnasl/distinfo +++ b/security/openvas-libnasl/distinfo @@ -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 --git a/security/openvas-libnasl/files/patch-Makefile b/security/openvas-libnasl/files/patch-Makefile deleted file mode 100644 index 44eb63df5c5f..000000000000 --- a/security/openvas-libnasl/files/patch-Makefile +++ /dev/null @@ -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 --git a/security/openvas-libnasl/files/patch-configure b/security/openvas-libnasl/files/patch-configure index cbf67bba1ca7..a5f2b80264d3 100644 --- a/security/openvas-libnasl/files/patch-configure +++ b/security/openvas-libnasl/files/patch-configure @@ -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 --git a/security/openvas-libnasl/files/patch-nasl__nasl_signature.c b/security/openvas-libnasl/files/patch-nasl__nasl_signature.c deleted file mode 100644 index c8bd3cff8cca..000000000000 --- a/security/openvas-libnasl/files/patch-nasl__nasl_signature.c +++ /dev/null @@ -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 --git a/security/openvas-libnasl/pkg-plist b/security/openvas-libnasl/pkg-plist index 1329aea95082..9209a9b2e7c8 100644 --- a/security/openvas-libnasl/pkg-plist +++ b/security/openvas-libnasl/pkg-plist @@ -1,9 +1,8 @@ -@comment $FreeBSD$ -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 -@dirrmtry openvas +lib/libopenvasnasl.a +lib/libopenvasnasl.la +lib/libopenvasnasl.so +lib/libopenvasnasl.so.2 +@dirrmtry include/openvas