From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zabbix: update to 6.2.2.
Date: Tue, 06 Sep 2022 15:23:12 +0200 [thread overview]
Message-ID: <20220906132312.4JmrjtM4KbVEl8Gc01z7nn450VQM0CXqc19AH468Q0I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38982@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages update/zabbix
https://github.com/void-linux/void-packages/pull/38982
zabbix: update to 6.2.2.
~~I'll have to look into an easy way to test if this is working~~
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/zabbix-38982.patch --]
[-- Type: text/x-diff, Size: 3032 bytes --]
From f2999735a50eda68097940cd642472692d5edcc4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 30 Aug 2022 08:30:05 -0400
Subject: [PATCH] zabbix: update to 6.2.2.
---
srcpkgs/zabbix/template | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 5db05d0d5d45..aa2615c12dc4 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,24 +1,22 @@
# Template file for 'zabbix'
pkgname=zabbix
-version=4.4.10
-revision=5
+version=6.2.2
+revision=1
build_style=gnu-configure
configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
--with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent
- --enable-proxy"
+ --enable-proxy --with-libpcre2"
hostmakedepends="automake libtool pkg-config which"
makedepends="gnutls-devel libcurl-devel libxml2-devel libevent-devel
- libmariadbclient-devel net-snmp-devel pcre-devel"
+ libmariadbclient-devel net-snmp-devel pcre2-devel"
depends="fping mariadb"
short_desc="IT Infrastructure components availability and performance monitoring"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.zabbix.com"
changelog="https://www.zabbix.com/rn/rn${version}"
-distfiles="https://cdn.zabbix.com/zabbix/sources/oldstable/${version%.*}/zabbix-${version}.tar.gz
- https://cdn.zabbix.com/zabbix/sources/stable/${version%.*}/zabbix-${version}.tar.gz"
-checksum="2de09bd41ccb2534a0e12ca45c0e7da3896d95f0c4f9f7815477123a3d692c8f
- 2de09bd41ccb2534a0e12ca45c0e7da3896d95f0c4f9f7815477123a3d692c8f"
+distfiles="https://cdn.zabbix.com/zabbix/sources/stable/${version%.*}/zabbix-${version}.tar.gz"
+checksum=f0e7a9abb0f65d700f531253b91c31165077a9c94769cc8d238a423ada852773
conf_files="/etc/zabbix_server.conf"
system_accounts="_zabbix_server"
system_groups="_zabbix_server"
@@ -42,7 +40,7 @@ post_install() {
vinstall database/mysql/images.sql 755 usr/share/zabbix/mysql
vmkdir usr/share/webapps/zabbix
- cp -a frontends/php/* "${DESTDIR}/usr/share/webapps/zabbix"
+ cp -a ui/* "${DESTDIR}/usr/share/webapps/zabbix"
for file in server proxy; do
vsed -i ${DESTDIR}/etc/zabbix_${file}.conf \
@@ -97,9 +95,17 @@ zabbix-proxy_package() {
}
zabbix-frontend-php_package() {
- depends="zabbix php-gd php-mysql"
+ depends="zabbix php8.1-gd php8.1-mysql"
short_desc="Zabbix Networking Monitoring PHP Frontend"
+ conf_files="/etc/webapps/zabbix/zabbix.conf.php /etc/webapps/zabbix/maintenance.inc.php"
pkg_install() {
vmove usr/share/webapps
+ vinstall ${PKGDESTDIR}/usr/share/webapps/zabbix/conf/zabbix.conf.php.example \
+ 644 etc/webapps/zabbix zabbix.conf.php
+ ln -sf /etc/webapps/zabbix/zabbix.conf.php ${PKGDESTDIR}/usr/share/webapps/zabbix/conf
+
+ mv ${PKGDESTDIR}/usr/share/webapps/zabbix/conf/maintenance.inc.php \
+ ${PKGDESTDIR}/etc/webapps/zabbix
+ ln -sf /etc/webapps/zabbix/maintenance.inc.php ${PKGDESTDIR}/usr/share/webapps/zabbix/conf
}
}
next prev parent reply other threads:[~2022-09-06 13:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 13:10 [PR PATCH] " TinfoilSubmarine
2022-08-30 13:16 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-31 17:11 ` TinfoilSubmarine
2022-08-31 17:15 ` TinfoilSubmarine
2022-09-06 13:23 ` TinfoilSubmarine [this message]
2022-09-07 16:03 ` TinfoilSubmarine
2022-09-22 7:00 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220906132312.4JmrjtM4KbVEl8Gc01z7nn450VQM0CXqc19AH468Q0I@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).