Attachment 186363 Details for Bug 222317 – patch for all zabbix versions

[patch] patch for all zabbix versions

zabbix-conflicts-glob.patch (text/plain), 2.99 KB, created by Franco Fichtner on 2017-09-14 04:32:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2017-09-14 04:32:27 UTC

Size: 2.99 KB

patch

obsolete

>From 9aad9a488ad84c13cfe078ca655be859b59bad47 Mon Sep 17 00:00:00 2001
>From: Franco Fichtner <franco@opnsense.org>
>Date: Tue, 12 Sep 2017 20:20:58 +0200
>Subject: [PATCH] net-mgmt/zabbix*-server: fix globbing
>
>---
> net-mgmt/zabbix2-server/Makefile  | 3 ++-
> net-mgmt/zabbix22-server/Makefile | 4 +++-
> net-mgmt/zabbix3-server/Makefile  | 3 ++-
> net-mgmt/zabbix32-server/Makefile | 4 +++-
> net-mgmt/zabbix34-server/Makefile | 4 +++-
> 5 files changed, 13 insertions(+), 5 deletions(-)
>
>diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
>index 1244ebd8e0..aa6cf7d849 100644
>--- a/net-mgmt/zabbix2-server/Makefile
>+++ b/net-mgmt/zabbix2-server/Makefile
>@@ -17,7 +17,8 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
> 		libpkg.so:ports-mgmt/pkg
> 
>-CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-13-9]${PKGNAMESUFFIX}
>+CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX} \
>+		zabbix[0-13-9]${PKGNAMESUFFIX}
> 
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
>diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
>index b7015ea6b1..1702d46f95 100644
>--- a/net-mgmt/zabbix22-server/Makefile
>+++ b/net-mgmt/zabbix22-server/Makefile
>@@ -16,7 +16,9 @@ LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
> 
>-CONFLICTS=	zabbix[0-13-9][0-13-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX}
>+CONFLICTS=	zabbix[0-13-9][0-9]${PKGNAMESUFFIX} \
>+		zabbix2[0-13-9]${PKGNAMESUFFIX}
>+		zabbix[0-9]${PKGNAMESUFFIX}
> 
> ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
> 
>diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
>index d29dfa6531..954c40e538 100644
>--- a/net-mgmt/zabbix3-server/Makefile
>+++ b/net-mgmt/zabbix3-server/Makefile
>@@ -14,7 +14,8 @@ COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-24-9]${PKGNAMESUFFIX}
>+CONFLICTS=	zabbix[0-9][0-9]${PKGNAMESUFFIX} \
>+		zabbix[0-24-9]${PKGNAMESUFFIX}
> 
> IGNORE_WITH_MYSQL=	41
> 
>diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile
>index abc5f54ec5..b7aa276535 100644
>--- a/net-mgmt/zabbix32-server/Makefile
>+++ b/net-mgmt/zabbix32-server/Makefile
>@@ -14,7 +14,9 @@ COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	zabbix[0-24-9][0-13-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX}
>+CONFLICTS=	zabbix[0-24-9][0-9]${PKGNAMESUFFIX} \
>+		zabbix3[0-13-9]${PKGNAMESUFFIX} \
>+		zabbix[0-9]${PKGNAMESUFFIX}
> 
> IGNORE_WITH_MYSQL=	41
> 
>diff --git a/net-mgmt/zabbix34-server/Makefile b/net-mgmt/zabbix34-server/Makefile
>index 97404068d0..b9555290ef 100644
>--- a/net-mgmt/zabbix34-server/Makefile
>+++ b/net-mgmt/zabbix34-server/Makefile
>@@ -17,7 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-CONFLICTS=	zabbix[0-24-9][0-35-9]${PKGNAMESUFFIX} zabbix[0-9]${PKGNAMESUFFIX}
>+CONFLICTS=	zabbix[0-24-9][0-9]${PKGNAMESUFFIX} \
>+		zabbix3[0-35-9]${PKGNAMESUFFIX} \
>+		zabbix[0-9]${PKGNAMESUFFIX}
> 
> IGNORE_WITH_MYSQL=	41
>

Flags:

franco: maintainer-approval?

Actions: View | Diff

Attachments on bug 222317: 186363