I discovered an issue with my patch for compiling net/zabbix with SSH by
default. Namely, I didn't bump the REVISION, so openup automatically
reinstalled it. Below is an updated version of the patch, with a
REVISION bump. Also, portcheck reported an absolute path in
pkg/README-server, so I rectified that as well.
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 20 Oct 2017 18:31:00 -0000
@@ -5,6 +5,7 @@ COMMENT-server = network and application
COMMENT-web = network and application monitoring - web frontend
VERSION = 3.2.7
+REVISION = 1
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@@ -46,12 +47,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 +64,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: pkg/README-server
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/README-server,v
retrieving revision 1.11
diff -u -p -r1.11 README-server
--- pkg/README-server 17 Jul 2015 20:38:43 -0000 1.11
+++ pkg/README-server 20 Oct 2017 18:31:00 -0000
@@ -98,7 +98,7 @@ automatically created and initialized if
for obvious performance reasons, it is NOT encouraged to use the SQLite
backend for a server.
- # cd /usr/local/share/zabbix/schema/sqlite3
+ # cd ${TRUEPREFIX}/share/zabbix/schema/sqlite3
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < schema.sql"
The following steps are not required for setting up a Zabbix Proxy.
# su -m _zabbix -c "sqlite3 /var/db/zabbix/zabbix.db < images.sql"
───────────────────────────────
William Leuschner
[email protected]
On 10/6/2017 1:57 PM, William Leuschner wrote:
> ping
>
> ─────────────────
> William Leuschner
> [email protected]
>
> On 9/25/2017 1:17 PM, William Leuschner wrote:
>> Ah, that did it! Thank you for the pointers. The now-fixed patch is
>> below. Comments?
>> ───────────────────────────────
>> William Leuschner
>> [email protected]
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/net/zabbix/Makefile,v
>> retrieving revision 1.122
>> diff -u -p -r1.122 Makefile
>> --- Makefile 7 Jul 2016 18:47:32 -0000 1.122
>> +++ Makefile 22 Sep 2017 18:29:39 -0000
>> @@ -29,7 +29,7 @@ MODPHP_BUILDDEP = No
>>
>> MULTI_PACKAGES = -main -web
>> PSEUDO_FLAVORS = no_server
>> -FLAVORS = mysql pgsql sqlite3
>> +FLAVORS = mysql pgsql sqlite3 ssh
>>
>> SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
>>
>> @@ -77,7 +77,7 @@ FLAVOR = sqlite3
>> #if non-backend-related flavors are added, add them to
>> #the following line as ":L:Nflavor1:Nflavor2" so that
>> #they don't trigger a "Conflicting flavors" error.
>> -BACKEND = ${FLAVOR}
>> +BACKEND = ${FLAVOR:L:Nssh}
>> .if ${BACKEND} == "mysql"
>> MULTI_PACKAGES += -server
>> LIB_DEPENDS-server += databases/mariadb,-main
>> @@ -97,6 +97,13 @@ CONFIGURE_ARGS += --disable-server \
>> --disable-proxy
>> .else
>> ERRORS += "Fatal: Conflicting flavors: ${FLAVOR}";
>> +.endif
>> +
>> +# Include libssh if the ssh flavor is requested
>> +.if ${FLAVOR:Mssh}
>> +LIB_DEPENDS-server += security/libssh2
>> +WANTLIB-server += ssh2
>> +CONFIGURE_ARGS += --with-ssh2
>> .endif
>>
>> pre-configure:
>>
>> On 9/21/2017 5:24 PM, Nigel Taylor wrote:
>>>
>>> $ cd /usr/ports/mystuff/net/zabbix
>>> $ doas make configure
>>> $ cd /usr/ports/pobj/zabbix-3.2.7-mysql/zabbix-3.2.7
>>> $ ./configure --help | grep -i ssh
>>> If you want to use SSH2 based checks:
>>> --with-ssh2[=DIR] use SSH2 package [default=no], DIR is the SSH2
>>>
>>> I don't see a --with-ssh option
>>>
>>> that's
>>> LIB_DEPENDS-server += security/libssh2
>>> WANTLIB-server += ssh2
>>> CONFIGURE_ARGS += --with-ssh2
>>>
>>> You drop the lib on the WANTLIB, check the SHARED_LIBS in
>>> security/libssh{,2}
