1 |
commit: 277fa0de9d1165e3c4086015ea20126882e55015 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 30 08:44:11 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 30 08:44:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277fa0de |
7 |
|
8 |
net-analyzer/zabbix: removed odbc from server/proxy restrictions |
9 |
|
10 |
Closes: https://bugs.gentoo.org/785205 |
11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild | 4 ++-- |
15 |
net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild | 4 ++-- |
16 |
net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild | 4 ++-- |
17 |
net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild | 4 ++-- |
18 |
net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild | 4 ++-- |
19 |
net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild | 4 ++-- |
20 |
net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild | 4 ++-- |
21 |
7 files changed, 14 insertions(+), 14 deletions(-) |
22 |
|
23 |
diff --git a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild |
24 |
index 3cfb30a0ed8..b75edaacbce 100644 |
25 |
--- a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild |
26 |
+++ b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild |
27 |
@@ -18,8 +18,8 @@ WEBAPP_MANUAL_SLOT="yes" |
28 |
KEYWORDS="amd64 x86" |
29 |
IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
30 |
REQUIRED_USE="|| ( agent frontend proxy server ) |
31 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
32 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
33 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
34 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
35 |
static? ( !oracle !snmp )" |
36 |
|
37 |
COMMON_DEPEND=" |
38 |
|
39 |
diff --git a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild |
40 |
index 321e1e6f6d8..7f94d05cbee 100644 |
41 |
--- a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild |
42 |
+++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild |
43 |
@@ -18,8 +18,8 @@ WEBAPP_MANUAL_SLOT="yes" |
44 |
KEYWORDS="~amd64 ~x86" |
45 |
IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
46 |
REQUIRED_USE="|| ( agent frontend proxy server ) |
47 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
48 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
49 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
50 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
51 |
static? ( !oracle !snmp )" |
52 |
|
53 |
COMMON_DEPEND=" |
54 |
|
55 |
diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild |
56 |
index 7a329ff5b8b..6a86fdbaa3e 100644 |
57 |
--- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild |
58 |
+++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild |
59 |
@@ -249,8 +249,8 @@ WEBAPP_MANUAL_SLOT="yes" |
60 |
KEYWORDS="~amd64 ~x86" |
61 |
IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
62 |
REQUIRED_USE="|| ( agent agent2 frontend proxy server ) |
63 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
64 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
65 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
66 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
67 |
static? ( !oracle !snmp )" |
68 |
|
69 |
COMMON_DEPEND=" |
70 |
|
71 |
diff --git a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild |
72 |
index fc80e61bdea..3b5650bd50c 100644 |
73 |
--- a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild |
74 |
+++ b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild |
75 |
@@ -18,8 +18,8 @@ WEBAPP_MANUAL_SLOT="yes" |
76 |
KEYWORDS="amd64 x86" |
77 |
IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
78 |
REQUIRED_USE="|| ( agent frontend proxy server ) |
79 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
80 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
81 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
82 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
83 |
static? ( !oracle !snmp )" |
84 |
|
85 |
COMMON_DEPEND=" |
86 |
|
87 |
diff --git a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild |
88 |
index fc80e61bdea..3b5650bd50c 100644 |
89 |
--- a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild |
90 |
+++ b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild |
91 |
@@ -18,8 +18,8 @@ WEBAPP_MANUAL_SLOT="yes" |
92 |
KEYWORDS="amd64 x86" |
93 |
IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
94 |
REQUIRED_USE="|| ( agent frontend proxy server ) |
95 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
96 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
97 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
98 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
99 |
static? ( !oracle !snmp )" |
100 |
|
101 |
COMMON_DEPEND=" |
102 |
|
103 |
diff --git a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild |
104 |
index 0abc5c33063..58ad7537823 100644 |
105 |
--- a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild |
106 |
+++ b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild |
107 |
@@ -258,8 +258,8 @@ WEBAPP_MANUAL_SLOT="yes" |
108 |
KEYWORDS="~amd64 ~x86" |
109 |
IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
110 |
REQUIRED_USE="|| ( agent agent2 frontend proxy server ) |
111 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
112 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
113 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
114 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
115 |
static? ( !oracle !snmp )" |
116 |
|
117 |
COMMON_DEPEND=" |
118 |
|
119 |
diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild |
120 |
index 359d8dd9cdd..a014fd21741 100644 |
121 |
--- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild |
122 |
+++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild |
123 |
@@ -274,8 +274,8 @@ WEBAPP_MANUAL_SLOT="yes" |
124 |
KEYWORDS="~amd64 ~x86" |
125 |
IUSE="+agent +agent2 java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
126 |
REQUIRED_USE="|| ( agent agent2 frontend proxy server ) |
127 |
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
128 |
- server? ( ^^ ( mysql oracle postgres odbc ) ) |
129 |
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) ) |
130 |
+ server? ( ^^ ( mysql oracle postgres ) ) |
131 |
static? ( !oracle !snmp )" |
132 |
|
133 |
COMMON_DEPEND=" |