diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-07-06 18:23:03 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-07-06 18:23:03 +0000 |
commit | c9a77027114809a7c916c7f17091d4f9593599ae (patch) | |
tree | 02c2dc6ea8cf949afa0f06367750fe771cbd0948 | |
parent | c47e201eb2a141e3654665e5932ade4cb3b98075 (diff) |
security/openvas-*:
- Add USES=libtool
- Eliminate security/openvas-libraries/Makefile.common
- Use /var instead of PREFIX/openvas
- Remove $FreeBSD$ from patches
security/openvas-client:
- Add missing dependencies
- Add NLS option
- Delete old patches
Notes
Notes:
svn path=/head/; revision=360951
22 files changed, 89 insertions, 202 deletions
diff --git a/security/openvas-client/Makefile b/security/openvas-client/Makefile index 65ab7ca611ef..05bca023c21e 100644 --- a/security/openvas-client/Makefile +++ b/security/openvas-client/Makefile @@ -3,19 +3,48 @@ PORTNAME= openvas-client PORTVERSION= 2.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/595/ MAINTAINER= ports@FreeBSD.org COMMENT= GUI client for OpenVAS -GNU_CONFIGURE= yes +LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ + libgdc.so:${PORTSDIR}/graphics/gdchart \ + libpng.so:${PORTSDIR}/graphics/png \ + libopenvas.so:${PORTSDIR}/security/openvas-libraries + USES= gmake pkgconfig USE_GNOME= gtk20 - +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE=yes -.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USES= gettext + +.include <bsd.port.options.mk> + +post-patch: + @${REINPLACE_CMD} \ + -e 's,/usr/bin/gettext.sh,${LOCALBASE}/bin/gettext.sh,' \ + -e 's,$$localstatedir/openvas/CA,$$localstatedir/lib/openvas/private/CA,' \ + -e 's,$$sharedstatedir/openvas/CA,$$localstatedir/lib/openvas/CA,' \ + -e 's,$$localstatedir/openvas/users,$$localstatedir/lib/openvas/users,' \ + ${WRKSRC}/openvasclient-mkcert.in + +.if ${PORT_OPTIONS:MNLS} +post-build: + @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) + +post-install: + @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ + ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) +.endif .include <bsd.port.mk> diff --git a/security/openvas-client/files/patch-nessus-Makefile b/security/openvas-client/files/patch-nessus-Makefile deleted file mode 100644 index 451d5541af03..000000000000 --- a/security/openvas-client/files/patch-nessus-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- nessus/Makefile.orig 2008-04-27 10:55:40.000000000 +0900 -+++ nessus/Makefile 2008-04-27 10:56:19.000000000 +0900 -@@ -12,7 +12,7 @@ - NESSUSCLIENT=OpenVAS-Client - - # Add some specific Windows compile options for Cygwin --SYSTEM:=$(shell uname -o) -+SYSTEM:=$(shell uname -s) - ifeq ($(SYSTEM), Cygwin) - CFLAGS+=-mms-bitfields - LDFLAGS+=-mwindows diff --git a/security/openvas-client/files/patch-nessus.tmpl.in b/security/openvas-client/files/patch-nessus.tmpl.in deleted file mode 100644 index 5a98a4249bb8..000000000000 --- a/security/openvas-client/files/patch-nessus.tmpl.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- nessus.tmpl.in.orig -+++ nessus.tmpl.in -@@ -38,7 +38,7 @@ - make_bindir=${rootdir}/bin - libsdir=${rootdir}/libs - top_builddir = @PWDD@ --include= -I. -I$(rootdir)/include -+include= -I. -I$(rootdir)/include -I$(includedir) - INSTALL=@INSTALL@ - INSTALL_DIR=@INSTALL_DIR@ - installuser=@installuser@ diff --git a/security/openvas-client/files/patch-src-gui-Makefile b/security/openvas-client/files/patch-src-gui-Makefile deleted file mode 100644 index eedd6b297675..000000000000 --- a/security/openvas-client/files/patch-src-gui-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/Makefile.orig 2008-04-27 10:56:55.000000000 +0900 -+++ src/gui/Makefile 2008-04-27 10:57:17.000000000 +0900 -@@ -42,7 +42,7 @@ - CFLAGS+=-Wall - - # Add some specific Windows compile options for Cygwin --SYSTEM:=$(shell uname -o) -+SYSTEM:=$(shell uname -s) - ifeq ($(SYSTEM), Cygwin) - CFLAGS+=-mms-bitfields - LDFLAGS+=-mwindows diff --git a/security/openvas-client/pkg-plist b/security/openvas-client/pkg-plist index 8945f163c2c5..03f36410ba87 100644 --- a/security/openvas-client/pkg-plist +++ b/security/openvas-client/pkg-plist @@ -3,4 +3,10 @@ bin/openvasclient-mkcert lib/openvas/openvas-ssh-client-rpm-creator.sh man/man1/OpenVAS-Client.1.gz man/man1/openvasclient-mkcert.1.gz +%%NLS%%share/locale/de/LC_MESSAGES/OpenVAS-Client.mo +%%NLS%%share/locale/es/LC_MESSAGES/OpenVAS-Client.mo +%%NLS%%share/locale/fr/LC_MESSAGES/OpenVAS-Client.mo +%%NLS%%share/locale/he/LC_MESSAGES/OpenVAS-Client.mo +%%NLS%%share/locale/hr/LC_MESSAGES/OpenVAS-Client.mo +%%NLS%%share/locale/sv/LC_MESSAGES/OpenVAS-Client.mo @dirrmtry lib/openvas diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile index 778c75d7e058..20c9fb4c79ea 100644 --- a/security/openvas-libnasl/Makefile +++ b/security/openvas-libnasl/Makefile @@ -3,7 +3,7 @@ PORTNAME= openvas-libnasl PORTVERSION= 2.0.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/561/ @@ -19,11 +19,11 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libtasn1.so:${PORTSDIR}/security/libtasn1 GNU_CONFIGURE= yes +USES= bison iconv libtool pkgconfig USE_LDCONFIG= yes -USES= bison iconv pkgconfig -.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" - -LDFLAGS+= -lgcrypt +CONFIGURE_ARGS= --localstatedir=/var +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lgcrypt .include <bsd.port.mk> diff --git a/security/openvas-libnasl/files/patch-configure b/security/openvas-libnasl/files/patch-configure deleted file mode 100644 index a5f2b80264d3..000000000000 --- a/security/openvas-libnasl/files/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ - -$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}${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/pkg-plist b/security/openvas-libnasl/pkg-plist index ef81680c9306..945f548b335e 100644 --- a/security/openvas-libnasl/pkg-plist +++ b/security/openvas-libnasl/pkg-plist @@ -2,9 +2,8 @@ bin/openvas-libnasl-config bin/openvas-nasl include/openvas/nasl.h lib/libopenvasnasl.a -lib/libopenvasnasl.la lib/libopenvasnasl.so lib/libopenvasnasl.so.2 +lib/libopenvasnasl.so.2.0.1 man/man1/openvas-libnasl-config.1.gz man/man1/openvas-nasl.1.gz -@dirrmtry include/openvas diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile index c1f8bbdd0c27..3b3ce7699b0c 100644 --- a/security/openvas-libraries/Makefile +++ b/security/openvas-libraries/Makefile @@ -3,7 +3,7 @@ PORTNAME= openvas-libraries PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/600/ @@ -13,12 +13,14 @@ COMMENT= Libraries for OpenVAS LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt -USES= pkgconfig GNU_CONFIGURE= yes +USES= libtool pkgconfig USE_LDCONFIG= yes USE_GNOME= glib20 MAKE_JOBS_UNSAFE= yes -.include "${.CURDIR}/Makefile.common" +CONFIGURE_ARGS= --localstatedir=/var +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/security/openvas-libraries/Makefile.common b/security/openvas-libraries/Makefile.common deleted file mode 100644 index a88c4b9c1c33..000000000000 --- a/security/openvas-libraries/Makefile.common +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/security/openvas-libraries/files/patch-configure b/security/openvas-libraries/files/patch-configure index 9d3eeaff0cd2..41f704d7de17 100644 --- a/security/openvas-libraries/files/patch-configure +++ b/security/openvas-libraries/files/patch-configure @@ -1,44 +1,5 @@ - -$FreeBSD$ - --- configure.orig +++ configure -@@ -8282,7 +8282,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}' -@@ -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 diff --git a/security/openvas-libraries/files/patch-libopenvas-Makefile b/security/openvas-libraries/files/patch-libopenvas-Makefile index eb83a9533b24..dd9895d7ac0f 100644 --- a/security/openvas-libraries/files/patch-libopenvas-Makefile +++ b/security/openvas-libraries/files/patch-libopenvas-Makefile @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- libopenvas/Makefile.orig +++ libopenvas/Makefile @@ -48,7 +48,7 @@ diff --git a/security/openvas-libraries/files/patch-libopenvas-pcap.c b/security/openvas-libraries/files/patch-libopenvas-pcap.c index d2ebf31eb47a..517bbf708323 100644 --- a/security/openvas-libraries/files/patch-libopenvas-pcap.c +++ b/security/openvas-libraries/files/patch-libopenvas-pcap.c @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- libopenvas/pcap.c.orig +++ libopenvas/pcap.c @@ -16,9 +16,7 @@ diff --git a/security/openvas-libraries/files/patch-libopenvas_openvas__server.c b/security/openvas-libraries/files/patch-libopenvas_openvas__server.c index 0074258ceb50..72161800563a 100644 --- a/security/openvas-libraries/files/patch-libopenvas_openvas__server.c +++ b/security/openvas-libraries/files/patch-libopenvas_openvas__server.c @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- libopenvas/openvas_server.c.orig +++ libopenvas/openvas_server.c @@ -32,6 +32,8 @@ diff --git a/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in b/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in index 64dceb4ea472..f25b596dfab6 100644 --- a/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in +++ b/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- openvas-libraries.tmpl.in.orig +++ openvas-libraries.tmpl.in @@ -61,7 +61,8 @@ diff --git a/security/openvas-libraries/pkg-plist b/security/openvas-libraries/pkg-plist index 402d09b23c28..1dce85b8c57a 100644 --- a/security/openvas-libraries/pkg-plist +++ b/security/openvas-libraries/pkg-plist @@ -30,12 +30,12 @@ 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.so.2.0.3 lib/libopenvas_hg.a -lib/libopenvas_hg.la lib/libopenvas_hg.so lib/libopenvas_hg.so.2 +lib/libopenvas_hg.so.2.0.3 man/man1/libopenvas-config.1.gz @dirrm include/openvas diff --git a/security/openvas-plugins/Makefile b/security/openvas-plugins/Makefile index 494cde72612d..9cee0bb41307 100644 --- a/security/openvas-plugins/Makefile +++ b/security/openvas-plugins/Makefile @@ -3,7 +3,7 @@ PORTNAME= openvas-plugins PORTVERSION= 1.0.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/588/ @@ -19,17 +19,13 @@ RUN_DEPENDS= openvasd:${PORTSDIR}/security/openvas-server \ ${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils \ ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync -USES= pkgconfig -GNU_CONFIGURE= yes LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config -CPPFLAGS+= "`${LIBNET_CONFIG} --cflags`" - -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../openvas-libraries/Makefile.common" -#.if ${ARCH} != "i386" -#BROKEN= does not compile -#.endif +USES= libtool pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var +CPPFLAGS+= "`${LIBNET_CONFIG} --cflags`" -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \ @@ -37,4 +33,4 @@ post-patch: @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \ ${WRKSRC}/plugins/3com_hub/Makefile -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/openvas-plugins/files/patch-openvas-nvt-sync.in b/security/openvas-plugins/files/patch-openvas-nvt-sync.in index 72b97b01c2bd..854593d428fc 100644 --- a/security/openvas-plugins/files/patch-openvas-nvt-sync.in +++ b/security/openvas-plugins/files/patch-openvas-nvt-sync.in @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- openvas-nvt-sync.in.orig +++ openvas-nvt-sync.in @@ -1,4 +1,4 @@ diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile index 2d10b5ce4c9a..625fce3493f0 100644 --- a/security/openvas-server/Makefile +++ b/security/openvas-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= openvas-server PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://wald.intevation.org/frs/download.php/593/ @@ -17,8 +17,10 @@ GNU_CONFIGURE= yes USES= gettext pkgconfig USE_RC_SUBR= openvasd -.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common" +CONFIGURE_ARGS= --localstatedir=/var +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lgcrypt -LDFLAGS+= -lgcrypt +PLIST_SUB= RESETPREFIX=${PREFIX} .include <bsd.port.mk> diff --git a/security/openvas-server/files/patch-configure b/security/openvas-server/files/patch-configure deleted file mode 100644 index 20ef3d97e562..000000000000 --- a/security/openvas-server/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ - -$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='${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 0a4114775e89..b796405c8afd 100644 --- a/security/openvas-server/files/patch-openvasd-Makefile +++ b/security/openvas-server/files/patch-openvasd-Makefile @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- openvasd/Makefile.orig +++ openvasd/Makefile @@ -38,92 +38,92 @@ diff --git a/security/openvas-server/pkg-plist b/security/openvas-server/pkg-plist index 288d832bfc67..f5e7f8df580a 100644 --- a/security/openvas-server/pkg-plist +++ b/security/openvas-server/pkg-plist @@ -16,26 +16,34 @@ man/man8/openvas-adduser.8.gz man/man8/openvas-mkcert.8.gz man/man8/openvas-rmuser.8.gz man/man8/openvasd.8.gz -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/cache/openvas -@dirrmtry openvas/cache -@dirrmtry openvas -@dirrmtry include/openvas +@exec mkdir -p %D/etc/openvas +@exec install -d -m 700 %D/etc/openvas/gnupg @dirrmtry etc/openvas/gnupg @dirrmtry etc/openvas +@cwd /var +@exec mkdir -p %D/cache/openvas +lib/openvas/openvas-services +@exec mkdir -p %D/lib/openvas/CA +@exec mkdir -p %D/lib/openvas/jobs +@exec mkdir -p %D/lib/openvas/logs +@exec install -d -m 700 %D/lib/openvas/private +@exec install -d -m 700 %D/lib/openvas/private/CA +@exec mkdir -p %D/lib/openvas/tmp +@exec mkdir -p %D/lib/openvas/users +@exec mkdir -p %D/log/openvas +@dirrmtry log/openvas +@dirrmtry lib/openvas/users +@dirrmtry lib/openvas/tmp +@dirrmtry lib/openvas/private/CA +@dirrmtry lib/openvas/private +@dirrmtry lib/openvas/logs +@dirrmtry lib/openvas/jobs +@dirrmtry lib/openvas/CA +@dirrmtry lib/openvas +@dirrmtry lib +@dirrmtry cache/openvas +@cwd %%RESETPREFIX%% |