pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zabbix50: Cleanup



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Mon Sep 14 09:14:04 2020 +0000
Changeset:	bd2076122406f1435bb5f9ecca6234868f5cd287

Modified Files:
	zabbix50-proxy/options.mk
	zabbix50-server/DESCR
	zabbix50-server/options.mk
Added Files:
	zabbix50-server/TODO

Log Message:
zabbix50: Cleanup

- Add TODO
- Remove libssh (only libssh2 is supported)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bd2076122406f1435bb5f9ecca6234868f5cd287

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zabbix50-proxy/options.mk  |  9 ++-------
 zabbix50-server/DESCR      |  2 ++
 zabbix50-server/TODO       | 14 ++++++++++++++
 zabbix50-server/options.mk |  9 ++-------
 4 files changed, 20 insertions(+), 14 deletions(-)

diffs:
diff --git a/zabbix50-proxy/options.mk b/zabbix50-proxy/options.mk
index a47d7dbeae..2a73ad0059 100644
--- a/zabbix50-proxy/options.mk
+++ b/zabbix50-proxy/options.mk
@@ -1,10 +1,10 @@
 # $NetBSD: options.mk,v 1.1 2017/05/21 17:30:03 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix50-proxy
-PKG_SUPPORTED_OPTIONS+=		inet6 libssh libssh2 snmp
+PKG_SUPPORTED_OPTIONS+=		inet6 libssh2 snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	mysql pgsql sqlite3
-PKG_SUGGESTED_OPTIONS+=		libssh snmp pgsql
+PKG_SUGGESTED_OPTIONS+=		libssh2 snmp pgsql
 
 .if empty(MISSING_FEATURES:Minet6)
 PKG_SUGGESTED_OPTIONS+=		inet6
@@ -24,11 +24,6 @@ CONFIGURE_ARGS+=	--with-ssh2=${BUILDLINK_PREFIX.libssh2}
 .include "../../security/libssh2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibssh)
-CONFIGURE_ARGS+=	--with-ssh=${BUILDLINK_PREFIX.libssh}
-.include "../../security/libssh/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmysql)
 CONFIGURE_ARGS+=	--with-mysql
 .include "../../mk/mysql.buildlink3.mk"
diff --git a/zabbix50-server/DESCR b/zabbix50-server/DESCR
index 43094c0148..5b0609ac6b 100644
--- a/zabbix50-server/DESCR
+++ b/zabbix50-server/DESCR
@@ -8,3 +8,5 @@ of servers, virtual machines and network devices can be monitored
 simultaneously. Along with storing the data, visualization features are
 available (overviews, maps, graphs, screens, etc), as well as very flexible
 ways of analyzing the data for the purpose of alerting.
+
+This is an LTS release of Zabbix!
diff --git a/zabbix50-server/TODO b/zabbix50-server/TODO
new file mode 100644
index 0000000000..8785167059
--- /dev/null
+++ b/zabbix50-server/TODO
@@ -0,0 +1,14 @@
+To revive Zabbix packages, following process is proposed:
+
+- Packages sysutils/zabbix and sysutils/zabbix-frontend
+  will be kept on version 4.0 (LTS supported until october 2021)
+
+- Packages zabbix50-server et al., will contain 5.0 LTS release
+  and its updates.
+
+- In the future, zabbix52-server et al., will contain 5.2 standard
+  release and its updates. The same will apply for 5.4.
+
+- Once 6.0 LTS is out, zabbix60- packages will be created, obeying the
+  above mentioned schema.
+
diff --git a/zabbix50-server/options.mk b/zabbix50-server/options.mk
index f1966a8cbe..a4e8fc3725 100644
--- a/zabbix50-server/options.mk
+++ b/zabbix50-server/options.mk
@@ -1,10 +1,10 @@
 # $NetBSD: options.mk,v 1.1 2017/05/21 17:30:03 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.zabbix50-server
-PKG_SUPPORTED_OPTIONS+=		inet6 libssh libssh2 snmp
+PKG_SUPPORTED_OPTIONS+=		inet6 libssh2 snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	mysql pgsql
-PKG_SUGGESTED_OPTIONS+=		libssh snmp pgsql
+PKG_SUGGESTED_OPTIONS+=		libssh2 snmp pgsql
 
 .if empty(MISSING_FEATURES:Minet6)
 PKG_SUGGESTED_OPTIONS+=		inet6
@@ -23,11 +23,6 @@ CONFIGURE_ARGS+=	--with-ssh2=${BUILDLINK_PREFIX.libssh2}
 .include "../../security/libssh2/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibssh)
-CONFIGURE_ARGS+=	--with-ssh=${BUILDLINK_PREFIX.libssh}
-.include "../../security/libssh/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmysql)
 CONFIGURE_ARGS+=	--with-mysql
 .include "../../mk/mysql.buildlink3.mk"


Home | Main Index | Thread Index | Old Index