| 1 |
commit: 1f3f6074b225770fe5c81aa127fbcc92c981d571 |
| 2 |
Author: Matthew Marlowe <mattm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 28 23:45:46 2018 +0000 |
| 4 |
Commit: Matthew Marlowe <mattm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 28 23:51:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f3f6074 |
| 7 |
|
| 8 |
net-analyzer/zabbix: Bump zabbix 3.4.15, 4.0.2, modulepath patch |
| 9 |
|
| 10 |
Signed-off-by: Matthew Marlowe <mattm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-analyzer/zabbix/Manifest | 3 ++- |
| 14 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd | 2 +- |
| 15 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy | 2 +- |
| 16 |
net-analyzer/zabbix/files/3.0/init.d/zabbix-server | 2 +- |
| 17 |
.../zabbix/files/4.0/patches/zbx401-modulepathfix.patch | 11 +++++++++++ |
| 18 |
.../zabbix/{zabbix-4.0.1.ebuild => zabbix-3.4.15.ebuild} | 11 ++++------- |
| 19 |
.../zabbix/{zabbix-4.0.1.ebuild => zabbix-4.0.2.ebuild} | 3 ++- |
| 20 |
7 files changed, 22 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest |
| 23 |
index d75d4ae0968..023f5e1e2b0 100644 |
| 24 |
--- a/net-analyzer/zabbix/Manifest |
| 25 |
+++ b/net-analyzer/zabbix/Manifest |
| 26 |
@@ -11,4 +11,5 @@ DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de |
| 27 |
DIST zabbix-3.4.12.tar.gz 17509251 BLAKE2B 158c7b3061059cc54a5988296404ed6670ca872fa8fa55f8de9708871ee03f163d0365420e23ef5df89a0a85e2f23d607952cf4fc02c974037555534ca164f08 SHA512 6707ff5a15d2c139775b4b5de32ceb4982c90aa4023af310ab9cb849895387984d32f59b7dc9fbaff8f317a630238437e4651ab8272b4535fb5fc3d88750e3ef |
| 28 |
DIST zabbix-3.4.13.tar.gz 17507365 BLAKE2B a5d1fa1a48df2ad66b844c2c85038a088ea5f7e3e67c2c3ab5f5d1ad695b3a31664d317e6a1cbf64d1f6a211304f50e5c38f5d973d4607f2caa202e1184420cf SHA512 4edcf6d9df0f100c639efa6bc18e67ed59819e719a2226593fd81212d4c2e46a19cb50501cca005246b4c01c4082a18e21c9049a99ac9df263180a3c24fa52f0 |
| 29 |
DIST zabbix-3.4.14.tar.gz 17476022 BLAKE2B 9fccdf69bb74379fccfe044d68da8ce458e04c4686ae70a2fed5523309196b13fb022daa00d47ae9eb97a0774942efd766858dfe94890e20f38808ef2a3e3d15 SHA512 597ae107c16578ec2b1a364f2b61a7a7423a1cf39d3b04289e2f91dc0f931e796b566cbd451b14e026c35302120b647d6d574952a453189b066fb06081f9bb83 |
| 30 |
-DIST zabbix-4.0.1.tar.gz 18005197 BLAKE2B 3da109715f2061a0104f471f9717947510da8d7a3215fe219d5870bbd8bb1cd769d586c04da3e0aa35a114565bd94911e3c4e62eb66de39af754911a9839d2e3 SHA512 431cb75c62c64e0907cccad6633fe07a66fbaaf8595ca33add6de98a3f79832dd87c23ddaffada796a67055cbdef6d2e5d9c6427498518080205d5ddcd5fbdca |
| 31 |
+DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f |
| 32 |
+DIST zabbix-4.0.2.tar.gz 18018925 BLAKE2B 8e532bad4d99817a2456d34b3b0b67424b81cd907b2b54329d263194b03ba679c265d78be347f3619ca34b1f4acc8862059c068b3d6b06086913f80f3065eff2 SHA512 40b8dd0a4ca9fd7214c7afab57517437097eaf49c943f8827fa637bffb7cc45e77568f002e18cf3fa61a50d5d24fe26520109ad1c6f0424b51325453c9fd0c76 |
| 33 |
|
| 34 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd |
| 35 |
old mode 100644 |
| 36 |
new mode 100755 |
| 37 |
index 2e5024ed2de..d803d4450ca |
| 38 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd |
| 39 |
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd |
| 40 |
@@ -1,5 +1,5 @@ |
| 41 |
#!/sbin/openrc-run |
| 42 |
-# Copyright 1999-2016 Gentoo Foundation |
| 43 |
+# Copyright 1999-2018 Gentoo Authors |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
pid_file="/run/zabbix/zabbix_agentd.pid" |
| 47 |
|
| 48 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy |
| 49 |
old mode 100644 |
| 50 |
new mode 100755 |
| 51 |
index 81dc78f08e3..6aa1793435c |
| 52 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy |
| 53 |
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy |
| 54 |
@@ -1,5 +1,5 @@ |
| 55 |
#!/sbin/openrc-run |
| 56 |
-# Copyright 1999-2016 Gentoo Foundation |
| 57 |
+# Copyright 1999-2018 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
pid_file="/run/zabbix/zabbix_proxy.pid" |
| 61 |
|
| 62 |
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server |
| 63 |
old mode 100644 |
| 64 |
new mode 100755 |
| 65 |
index a57a3100dd9..109c6545d45 |
| 66 |
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server |
| 67 |
+++ b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server |
| 68 |
@@ -1,5 +1,5 @@ |
| 69 |
#!/sbin/openrc-run |
| 70 |
-# Copyright 1999-2016 Gentoo Foundation |
| 71 |
+# Copyright 1999-2018 Gentoo Authors |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
pid_file="/run/zabbix/zabbix_server.pid" |
| 75 |
|
| 76 |
diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch |
| 77 |
new file mode 100644 |
| 78 |
index 00000000000..c0d1650fb85 |
| 79 |
--- /dev/null |
| 80 |
+++ b/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch |
| 81 |
@@ -0,0 +1,11 @@ |
| 82 |
+--- zabbix-4.0.1/configure 2018-10-29 10:36:05.000000000 -0700 |
| 83 |
++++ zfx/configure 2018-11-07 16:59:28.015968345 -0800 |
| 84 |
+@@ -12510,7 +12510,7 @@ |
| 85 |
+ CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs" |
| 86 |
+ CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys" |
| 87 |
+ |
| 88 |
+-LOAD_MODULE_PATH="${libdir}/modules" |
| 89 |
++LOAD_MODULE_PATH="${libdir}/zabbix" |
| 90 |
+ |
| 91 |
+ |
| 92 |
+ |
| 93 |
|
| 94 |
diff --git a/net-analyzer/zabbix/zabbix-4.0.1.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild |
| 95 |
similarity index 97% |
| 96 |
copy from net-analyzer/zabbix/zabbix-4.0.1.ebuild |
| 97 |
copy to net-analyzer/zabbix/zabbix-3.4.15.ebuild |
| 98 |
index f936b89f0dd..dd57544e3c4 100644 |
| 99 |
--- a/net-analyzer/zabbix/zabbix-4.0.1.ebuild |
| 100 |
+++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild |
| 101 |
@@ -15,7 +15,7 @@ SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" |
| 102 |
LICENSE="GPL-2" |
| 103 |
SLOT="0" |
| 104 |
WEBAPP_MANUAL_SLOT="yes" |
| 105 |
-KEYWORDS="" |
| 106 |
+KEYWORDS="~amd64 ~x86" |
| 107 |
IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" |
| 108 |
REQUIRED_USE="|| ( agent frontend proxy server ) |
| 109 |
proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) |
| 110 |
@@ -30,7 +30,7 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
| 111 |
) |
| 112 |
mysql? ( >=virtual/mysql-5.0.3 ) |
| 113 |
sqlite? ( >=dev-db/sqlite-3.3.5 ) |
| 114 |
- postgres? ( >=dev-db/postgresql-8.1:* ) |
| 115 |
+ postgres? ( dev-db/postgresql:* ) |
| 116 |
oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) |
| 117 |
xmpp? ( dev-libs/iksemel ) |
| 118 |
libxml2? ( dev-libs/libxml2 ) |
| 119 |
@@ -39,22 +39,19 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) |
| 120 |
ssh? ( net-libs/libssh2 ) |
| 121 |
java? ( virtual/jdk:* ) |
| 122 |
odbc? ( dev-db/unixODBC ) |
| 123 |
- server? ( sys-libs/zlib ) |
| 124 |
- proxy? ( sys-libs/zlib ) |
| 125 |
ssl? ( dev-libs/openssl:=[-bindist] )" |
| 126 |
|
| 127 |
RDEPEND="${COMMON_DEPEND} |
| 128 |
proxy? ( net-analyzer/fping[suid] ) |
| 129 |
server? ( net-analyzer/fping[suid] |
| 130 |
app-admin/webapp-config |
| 131 |
- dev-libs/libpcre |
| 132 |
dev-libs/libevent ) |
| 133 |
java? ( |
| 134 |
>=virtual/jre-1.4 |
| 135 |
dev-java/slf4j-api |
| 136 |
) |
| 137 |
frontend? ( |
| 138 |
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
| 139 |
+ >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] |
| 140 |
|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) |
| 141 |
mysql? ( dev-lang/php[mysqli] ) |
| 142 |
odbc? ( dev-lang/php[odbc] ) |
| 143 |
@@ -72,7 +69,7 @@ DEPEND="${COMMON_DEPEND} |
| 144 |
) |
| 145 |
mysql? ( >=virtual/mysql-5.0.3[static-libs] ) |
| 146 |
sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) |
| 147 |
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) |
| 148 |
+ postgres? ( dev-db/postgresql:*[static-libs] ) |
| 149 |
libxml2? ( dev-libs/libxml2[static-libs] ) |
| 150 |
curl? ( net-misc/curl[static-libs] ) |
| 151 |
ssh? ( net-libs/libssh2[static-libs] ) |
| 152 |
|
| 153 |
diff --git a/net-analyzer/zabbix/zabbix-4.0.1.ebuild b/net-analyzer/zabbix/zabbix-4.0.2.ebuild |
| 154 |
similarity index 99% |
| 155 |
rename from net-analyzer/zabbix/zabbix-4.0.1.ebuild |
| 156 |
rename to net-analyzer/zabbix/zabbix-4.0.2.ebuild |
| 157 |
index f936b89f0dd..0ed8678d8d9 100644 |
| 158 |
--- a/net-analyzer/zabbix/zabbix-4.0.1.ebuild |
| 159 |
+++ b/net-analyzer/zabbix/zabbix-4.0.2.ebuild |
| 160 |
@@ -118,7 +118,8 @@ java_prepare() { |
| 161 |
} |
| 162 |
|
| 163 |
src_prepare() { |
| 164 |
- default |
| 165 |
+ eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" |
| 166 |
+ eapply_user |
| 167 |
} |
| 168 |
|
| 169 |
src_configure() { |
Archives