aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-05-03 02:31:39 +0800
committerpav <pav@FreeBSD.org>2004-05-03 02:31:39 +0800
commitbdc57133c4f2fd0f0795ac95b5b4047ab4b8e80b (patch)
treeba131d2f240ed45c087a7efc99da07253e3870fa
parent90c642aaeb41952ec6f2ee0f4d32fcc337d43580 (diff)
downloadfreebsd-ports-graphics-bdc57133c4f2fd0f0795ac95b5b4047ab4b8e80b.tar.gz
freebsd-ports-graphics-bdc57133c4f2fd0f0795ac95b5b4047ab4b8e80b.tar.zst
freebsd-ports-graphics-bdc57133c4f2fd0f0795ac95b5b4047ab4b8e80b.zip
- Unbreak on amd64: disable offending plugin
PR: ports/66051 Submitted by: Udo Schweigert <udo.schweigert@siemens.com>
-rw-r--r--security/nessus-plugins-devel/Makefile10
-rw-r--r--security/nessus-plugins-devel/files/extra-patch-3com-hub-amd6418
-rw-r--r--security/nessus-plugins-devel/pkg-plist2
3 files changed, 26 insertions, 4 deletions
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 9c752275521..0002c8fa6c8 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -17,8 +17,7 @@ DISTNAME= nessus-plugins-${PORTVERSION}
MAINTAINER= udo.schweigert@siemens.com
COMMENT= Plugins for Nessus, the security scanner
-BUILD_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel \
- libnet-config:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel
RUN_DEPENDS= ${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus-devel \
nmap:${PORTSDIR}/security/nmap \
wget:${PORTSDIR}/ftp/wget
@@ -35,7 +34,12 @@ MAN8= nessus-update-plugins.8
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
-BROKEN= "Does not compile on amd64 (libnet needs to provide a shared library)"
+PLIST_SUB+= AMD="@comment "
+pre-configure:
+ ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-3com-hub-amd64
+.else
+PLIST_SUB+= AMD=""
+BUILD_DEPENDS+= libnet-config:${PORTSDIR}/net/libnet
.endif
post-install:
diff --git a/security/nessus-plugins-devel/files/extra-patch-3com-hub-amd64 b/security/nessus-plugins-devel/files/extra-patch-3com-hub-amd64
new file mode 100644
index 00000000000..81eacf635f9
--- /dev/null
+++ b/security/nessus-plugins-devel/files/extra-patch-3com-hub-amd64
@@ -0,0 +1,18 @@
+--- plugins/make_world.orig Sun Jun 9 13:07:06 2002
++++ plugins/make_world Wed Apr 28 17:03:30 2004
+@@ -15,14 +15,7 @@
+ do if [ -d $i -a $i != CVS ]; then
+ if [ "$i" = "3com_hub" ];
+ then
+- libnet-config && {
+- cd $i
+- ${MAKE:-make} $MAKEFLAG $1
+- if [ $? -ne 0 ];then
+- BADPLUGINS="$BADPLUGINS $i"
+- fi
+- cd ..
+- }
++ BADPLUGINS="$BADPLUGINS $i";
+ else
+ cd $i
+ ${MAKE:-make} $MAKEFLAG $1
diff --git a/security/nessus-plugins-devel/pkg-plist b/security/nessus-plugins-devel/pkg-plist
index fb9195b82bd..e6dc3ebf337 100644
--- a/security/nessus-plugins-devel/pkg-plist
+++ b/security/nessus-plugins-devel/pkg-plist
@@ -2,7 +2,7 @@ bin/nessus-build
lib/nessus/plugins/12planet_chat_server_path_disclosure.nasl
lib/nessus/plugins/12planet_chat_server_plaintext_password.nasl
lib/nessus/plugins/3com_config_disclosure.nasl
-lib/nessus/plugins/3com_hub.nes
+%%AMD%%lib/nessus/plugins/3com_hub.nes
lib/nessus/plugins/3com_ras_crash.nasl
lib/nessus/plugins/3com_switches.nasl
lib/nessus/plugins/404_path_disclosure.nasl