The following diff updates zabbix to 3.2.9 including libssh2.
Tested on amd64 with -pgsql
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.128
diff -u -p -r1.128 Makefile
--- Makefile 26 Jul 2017 17:54:44 -0000 1.128
+++ Makefile 28 Oct 2017 16:27:01 -0000
@@ -4,7 +4,7 @@ COMMENT-main = network and application
COMMENT-server = network and application monitoring - server
COMMENT-web = network and application monitoring - web frontend
-VERSION = 3.2.7
+VERSION = 3.2.9
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -46,12 +46,13 @@ RUN_DEPENDS-main =
LIB_DEPENDS-server = ${LIB_DEPENDS} \
textproc/libxml \
net/net-snmp \
- textproc/iksemel
+ textproc/iksemel \
+ security/libssh2
RUN_DEPENDS-server = net/fping
# we want the _zabbix user&group as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
- xml2
+ xml2 ssh2
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-server \
@@ -62,7 +63,8 @@ CONFIGURE_ARGS = --enable-server \
--with-libxml2 \
--with-net-snmp \
--with-ldap \
- --with-jabber="${LOCALBASE}"
+ --with-jabber="${LOCALBASE}" \
+ --with-ssh2
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
ac_cv_search___res_query=no
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo 26 Jul 2017 17:54:44 -0000 1.39
+++ distinfo 28 Oct 2017 16:27:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (zabbix-3.2.7.tar.gz) = PqDCmb1pvHKBdxKHQPBHa8Giwd5DgzDfW72PX8YJBxI=
-SIZE (zabbix-3.2.7.tar.gz) = 16016367
+SHA256 (zabbix-3.2.9.tar.gz) = WIQgd0ZrxOFEGoTY32LDyMtIvCVSoki+UVWg5DbAnt8=
+SIZE (zabbix-3.2.9.tar.gz) = 16098846
Index: pkg/PLIST-web
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST-web
--- pkg/PLIST-web 26 Jul 2017 17:54:44 -0000 1.30
+++ pkg/PLIST-web 28 Oct 2017 16:27:01 -0000
@@ -493,6 +493,7 @@ zabbix/include/classes/validators/CColor
zabbix/include/classes/validators/CDecimalStringValidator.php
zabbix/include/classes/validators/CDecimalValidator.php
zabbix/include/classes/validators/CFunctionValidator.php
+zabbix/include/classes/validators/CHtmlUrlValidator.php
zabbix/include/classes/validators/CIPRangeValidator.php
zabbix/include/classes/validators/CIPValidator.php
zabbix/include/classes/validators/CIdValidator.php
@@ -881,7 +882,6 @@ zabbix/popup.php
zabbix/popup_httpstep.php
zabbix/popup_media.php
zabbix/popup_trexpr.php
-zabbix/popup_usrgrp.php
zabbix/profile.php
zabbix/queue.php
zabbix/report2.php
On Fri, Oct 13, 2017 at 04:54:35PM +0000, William Leuschner wrote:
> I originally added a flavor because I though that was the standard way
> of doing things. However, I completely agree that libssh2 is small and
> self-contained enough to build in by default. Plus, it would be nice for
> OpenBSD's port of Zabbix to "just work" with respect to SSH checks.
>
> Patch below to include libssh by default:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/zabbix/Makefile,v
> retrieving revision 1.127
> diff -u -p -r1.127 Makefile
> --- Makefile 8 Jan 2017 19:24:53 -0000 1.127
> +++ Makefile 13 Oct 2017 16:47:27 -0000
> @@ -46,12 +46,13 @@ RUN_DEPENDS-main =
> LIB_DEPENDS-server = ${LIB_DEPENDS} \
> textproc/libxml \
> net/net-snmp \
> - textproc/iksemel
> + textproc/iksemel \
> + security/libssh2
> RUN_DEPENDS-server = net/fping
> # we want the _zabbix user&group as well as README-main
> RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
> WANTLIB-server = ${WANTLIB} crypto ssl z netsnmp iksemel pthread \
> - xml2
> + xml2 ssh2
>
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS = --enable-server \
> @@ -62,7 +63,8 @@ CONFIGURE_ARGS = --enable-server \
> --with-libxml2 \
> --with-net-snmp \
> --with-ldap \
> - --with-jabber="${LOCALBASE}"
> + --with-jabber="${LOCALBASE}" \
> + --with-ssh2
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" \
> ac_cv_search___res_query=no
>
>
> ?????????????????????????????????????????????????????????????????????????????????????????????
> William Leuschner
> wel2...@rit.edu
>
> On 10/13/2017 4:23 AM, Stuart Henderson wrote:
> > On 2017/10/13 07:11, Antoine Jacoutot wrote:
> >> Is it worth adding yet another FLAVOR to this port? Can't we enable it by
> >> default?
> >
> > +1, libssh2 is self-contained and small.
> >
>
--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51
http://www.wrapped.cx
