Attachment #208305 for bug #241235

Lines 1-11 Link Here

(-)net-mgmt/zabbix44-agent/Makefile (-2 / +2 lines)
1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>	1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zabbix42	4	PORTNAME= zabbix44
5	CATEGORIES= net-mgmt	5	CATEGORIES= net-mgmt
6	PKGNAMESUFFIX= -agent	6	PKGNAMESUFFIX= -agent
7		7
8	MASTERDIR= ${.CURDIR}/../zabbix42-server	8	MASTERDIR= ${.CURDIR}/../zabbix44-server
9	PLIST= ${PKGDIR}/pkg-plist.agent	9	PLIST= ${PKGDIR}/pkg-plist.agent
10		10
11	OPTIONS_DEFINE= CURL IPV6	11	OPTIONS_DEFINE= CURL IPV6

Lines 1-11 Link Here

(-)net-mgmt/zabbix44-frontend/Makefile (-2 / +2 lines)
1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>	1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zabbix42	4	PORTNAME= zabbix44
5	CATEGORIES= net-mgmt	5	CATEGORIES= net-mgmt
6	PKGNAMESUFFIX= -frontend	6	PKGNAMESUFFIX= -frontend
7		7
8	MASTERDIR= ${.CURDIR}/../zabbix42-server	8	MASTERDIR= ${.CURDIR}/../zabbix44-server
9		9
10	NO_BUILD= yes	10	NO_BUILD= yes
11	NO_ARCH= yes	11	NO_ARCH= yes

Lines 1-10 Link Here

(-)net-mgmt/zabbix44-java/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= zabbix42	3	PORTNAME= zabbix44
4	CATEGORIES= net-mgmt	4	CATEGORIES= net-mgmt
5	PKGNAMESUFFIX= -java	5	PKGNAMESUFFIX= -java
6		6
7	MASTERDIR= ${.CURDIR}/../zabbix42-server	7	MASTERDIR= ${.CURDIR}/../zabbix44-server
8	PLIST= ${PKGDIR}/pkg-plist.java	8	PLIST= ${PKGDIR}/pkg-plist.java
9		9
10	OPTIONS_DEFINE= IPV6	10	OPTIONS_DEFINE= IPV6

Lines 1-11 Link Here

(-)net-mgmt/zabbix44-proxy/Makefile (-2 / +2 lines)
1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>	1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zabbix42	4	PORTNAME= zabbix44
5	CATEGORIES= net-mgmt	5	CATEGORIES= net-mgmt
6	PKGNAMESUFFIX= -proxy	6	PKGNAMESUFFIX= -proxy
7		7
8	MASTERDIR= ${.CURDIR}/../zabbix42-server	8	MASTERDIR= ${.CURDIR}/../zabbix44-server
9		9
10	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE	10	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE
11		11




# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
# $FreeBSD$

PORTNAME=	zabbix44
PORTVERSION=	4.4.0
PORTREVISION?=	0
CATEGORIES=	net-mgmt
MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}

LIB_DEPENDS=	libpcre.so:devel/pcre

CONFLICTS=	zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \
		zabbix4[0-35-9]${PKGNAMESUFFIX} \
		zabbix[0-9]${PKGNAMESUFFIX}

ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}


CONFIGURE_ARGS+=	--with-net-snmp

OPTIONS_DEFINE=		IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC

OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB=		yes

FPING_DESC=		Build/install fping for ping checks
IPMI_DESC=		Support for IPMI checks
JABBER_DESC=		Support for Jabber media type
LDAP_DESC=		Support for LDAP server checks
NMAP_DESC=		Build/install nmap for o/s detection
SSH_DESC=		Support for SSH-based checks


IPMI_CONFIGURE_WITH=	openipmi
IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi

JABBER_CONFIGURE_WITH=	jabber
JABBER_LIB_DEPENDS=	libiksemel.so:textproc/iksemel

FPING_RUN_DEPENDS=	fping:net/fping


Lines 1-3 Link Here

(-)net-mgmt/zabbix44-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1570661295	1	TIMESTAMP = 1570889168
2	SHA256 (zabbix-4.2.7.tar.gz) = 9d9bdf1d858048d72811de04269a429aba257fac2e4b6e782d5a2b1d3a82f627	2	SHA256 (zabbix-4.4.0.tar.gz) = c47da70ea2379684ea6fad91092b819eda6e1955b215b9dd568c061143d78ca8
3	SIZE (zabbix-4.2.7.tar.gz) = 18286402	3	SIZE (zabbix-4.4.0.tar.gz) = 20689807




% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database

And follow the instructions:
https://www.zabbix.com/documentation/4.4/manual/appendix/install/db_scripts

Upgrade notes for 4.4.0:
https://www.zabbix.com/documentation/4.4/manual/installation/upgrade_notes_440

Upgrade procedure:
https://www.zabbix.com/documentation/4.4/manual/installation/upgrade/sources

Please see https://www.zabbix.com/ for detailed information about Zabbix.

Official Zabbix documentation:
https://www.zabbix.com/documentation/4.4/start

For Zabbix frontend "Welcome" screen. Enter the user name Admin with password
zabbix to log in as a Zabbix superuser.

(critical and security issues only). Zabbix Standard version release will result
in change of the second version number.

Stable release:         Zabbix 4.4
Release date:           Q3, 2019
End of Full Support:    Q1, 2020
End of Limited Support: Q2, 2020

Zabbix Life Cycle & Release Policy:
https://www.zabbix.com/life_cycle_and_release_policy
EOM
}
{
  type: upgrade
  maximum_version: "4.2.6"
  minimum_version: "4.2.4"
  message: <<EOM
A change in Zabbix 4.2.5 is causing trouble when stopping the agent, proxy, and
server daemons. If you are using the default rc script and facing this issue,
you'll need to send the kill signal to the daemon in order to stop it:

  # killall -9 zabbix_process_name

More details at:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239746
https://support.zabbix.com/browse/ZBX-16460
EOM
}
]

Return to bug 241235

Lines 1-8 Link Here

(-)net-mgmt/zabbix44-server/Makefile (-8 / +4 lines)
1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>	1	# Created by: Pakhom Golynga <pg@pakhom.spb.ru>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= zabbix42	4	PORTNAME= zabbix44
5	PORTVERSION= 4.2.7	5	PORTVERSION= 4.4.0
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
8	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}	8	MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
Lines 18-24 Link Here
18	LIB_DEPENDS= libpcre.so:devel/pcre	18	LIB_DEPENDS= libpcre.so:devel/pcre
19		19
20	CONFLICTS= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \	20	CONFLICTS= zabbix[0-35-9][0-9]${PKGNAMESUFFIX} \
21	zabbix4[0-13-9]${PKGNAMESUFFIX} \	21	zabbix4[0-35-9]${PKGNAMESUFFIX} \
22	zabbix[0-9]${PKGNAMESUFFIX}	22	zabbix[0-9]${PKGNAMESUFFIX}
23		23
24	ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}	24	ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}
Lines 68-81 Link Here
68		68
69	CONFIGURE_ARGS+= --with-net-snmp	69	CONFIGURE_ARGS+= --with-net-snmp
70		70
71	OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC	71	OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
72		72
73	OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL	73	OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
74	OPTIONS_SUB= yes	74	OPTIONS_SUB= yes
75		75
76	FPING_DESC= Build/install fping for ping checks	76	FPING_DESC= Build/install fping for ping checks
77	IPMI_DESC= Support for IPMI checks	77	IPMI_DESC= Support for IPMI checks
78	JABBER_DESC= Support for Jabber media type
79	LDAP_DESC= Support for LDAP server checks	78	LDAP_DESC= Support for LDAP server checks
80	NMAP_DESC= Build/install nmap for o/s detection	79	NMAP_DESC= Build/install nmap for o/s detection
81	SSH_DESC= Support for SSH-based checks	80	SSH_DESC= Support for SSH-based checks
Lines 102-110 Link Here
102		101
103	IPMI_CONFIGURE_WITH= openipmi	102	IPMI_CONFIGURE_WITH= openipmi
104	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi	103	IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi
105
106	JABBER_CONFIGURE_WITH= jabber
107	JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel
108		104
109	FPING_RUN_DEPENDS= fping:net/fping	105	FPING_RUN_DEPENDS= fping:net/fping
110		106

Lines 7-24 Link Here

(-)net-mgmt/zabbix44-server/files/pkg-message.in (-25 / +9 lines)
7	% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database	7	% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database
8		8
9	And follow the instructions:	9	And follow the instructions:
10	https://www.zabbix.com/documentation/4.2/manual/appendix/install/db_scripts	10	https://www.zabbix.com/documentation/4.4/manual/appendix/install/db_scripts
11		11
12	Upgrade notes for 4.2.0:	12	Upgrade notes for 4.4.0:
13	https://www.zabbix.com/documentation/4.2/manual/installation/upgrade_notes_420	13	https://www.zabbix.com/documentation/4.4/manual/installation/upgrade_notes_440
14		14
15	Upgrade procedure:	15	Upgrade procedure:
16	https://www.zabbix.com/documentation/4.2/manual/installation/upgrade/sources	16	https://www.zabbix.com/documentation/4.4/manual/installation/upgrade/sources
17		17
18	Please see https://www.zabbix.com/ for detailed information about Zabbix.	18	Please see https://www.zabbix.com/ for detailed information about Zabbix.
19		19
20	Official Zabbix documentation:	20	Official Zabbix documentation:
21	https://www.zabbix.com/documentation/4.2/start	21	https://www.zabbix.com/documentation/4.4/start
22		22
23	For Zabbix frontend "Welcome" screen. Enter the user name Admin with password	23	For Zabbix frontend "Welcome" screen. Enter the user name Admin with password
24	zabbix to log in as a Zabbix superuser.	24	zabbix to log in as a Zabbix superuser.
Lines 33-61 Link Here
33	(critical and security issues only). Zabbix Standard version release will result	33	(critical and security issues only). Zabbix Standard version release will result
34	in change of the second version number.	34	in change of the second version number.
35		35
36	Stable release: Zabbix 4.2	36	Stable release: Zabbix 4.4
37	Release date: 2 April, 2019	37	Release date: Q3, 2019
38	End of Full Support: 30 September, 2019	38	End of Full Support: Q1, 2020
39	End of Limited Support: 31 October, 2019	39	End of Limited Support: Q2, 2020
40		40
41	Zabbix Life Cycle & Release Policy:	41	Zabbix Life Cycle & Release Policy:
42	https://www.zabbix.com/life_cycle_and_release_policy	42	https://www.zabbix.com/life_cycle_and_release_policy
43	EOM
44	}
45	{
46	type: upgrade
47	maximum_version: "4.2.6"
48	minimum_version: "4.2.4"
49	message: <<EOM
50	A change in Zabbix 4.2.5 is causing trouble when stopping the agent, proxy, and
51	server daemons. If you are using the default rc script and facing this issue,
52	you'll need to send the kill signal to the daemon in order to stop it:
53
54	# killall -9 zabbix_process_name
55
56	More details at:
57	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239746
58	https://support.zabbix.com/browse/ZBX-16460
59	EOM	43	EOM
60	}	44	}
61	]	45	]

Lines 16-21 Link Here

(-)net-mgmt/zabbix44-server/pkg-plist.frontend (-14 / +51 lines)
16	%%WWWDIR%%/app/controllers/CControllerAcknowledgeEdit.php	16	%%WWWDIR%%/app/controllers/CControllerAcknowledgeEdit.php
17	%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php	17	%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php
18	%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php	18	%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php
		19	%%WWWDIR%%/app/controllers/CControllerAutoregEdit.php
		20	%%WWWDIR%%/app/controllers/CControllerAutoregUpdate.php
19	%%WWWDIR%%/app/controllers/CControllerDashboardAbstract.php	21	%%WWWDIR%%/app/controllers/CControllerDashboardAbstract.php
20	%%WWWDIR%%/app/controllers/CControllerDashboardDelete.php	22	%%WWWDIR%%/app/controllers/CControllerDashboardDelete.php
21	%%WWWDIR%%/app/controllers/CControllerDashboardList.php	23	%%WWWDIR%%/app/controllers/CControllerDashboardList.php
Lines 26-31 Link Here
26	%%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php	28	%%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php
27	%%WWWDIR%%/app/controllers/CControllerDashboardView.php	29	%%WWWDIR%%/app/controllers/CControllerDashboardView.php
28	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php	30	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php
		31	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetConfigure.php
29	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php	32	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php
30	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php	33	%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php
31	%%WWWDIR%%/app/controllers/CControllerDiscoveryView.php	34	%%WWWDIR%%/app/controllers/CControllerDiscoveryView.php
Lines 55-61 Link Here
55	%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php	58	%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php
56	%%WWWDIR%%/app/controllers/CControllerPopupServices.php	59	%%WWWDIR%%/app/controllers/CControllerPopupServices.php
57	%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php	60	%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php
58	%%WWWDIR%%/app/controllers/CControllerPopupTrigDescView.php
59	%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php	61	%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php
60	%%WWWDIR%%/app/controllers/CControllerPopupTriggerWizard.php	62	%%WWWDIR%%/app/controllers/CControllerPopupTriggerWizard.php
61	%%WWWDIR%%/app/controllers/CControllerProblemView.php	63	%%WWWDIR%%/app/controllers/CControllerProblemView.php
Lines 77-83 Link Here
77	%%WWWDIR%%/app/controllers/CControllerSearch.php	79	%%WWWDIR%%/app/controllers/CControllerSearch.php
78	%%WWWDIR%%/app/controllers/CControllerSystemWarning.php	80	%%WWWDIR%%/app/controllers/CControllerSystemWarning.php
79	%%WWWDIR%%/app/controllers/CControllerTimeSelectorUpdate.php	81	%%WWWDIR%%/app/controllers/CControllerTimeSelectorUpdate.php
80	%%WWWDIR%%/app/controllers/CControllerTrigDescUpdate.php	82	%%WWWDIR%%/app/controllers/CControllerUserCreate.php
		83	%%WWWDIR%%/app/controllers/CControllerUserDelete.php
		84	%%WWWDIR%%/app/controllers/CControllerUserEdit.php
		85	%%WWWDIR%%/app/controllers/CControllerUserEditGeneral.php
		86	%%WWWDIR%%/app/controllers/CControllerUserList.php
		87	%%WWWDIR%%/app/controllers/CControllerUserProfileEdit.php
		88	%%WWWDIR%%/app/controllers/CControllerUserProfileUpdate.php
		89	%%WWWDIR%%/app/controllers/CControllerUserUnblock.php
		90	%%WWWDIR%%/app/controllers/CControllerUserUpdate.php
		91	%%WWWDIR%%/app/controllers/CControllerUserUpdateGeneral.php