Bug 209892 - net-mgmt/zabbix24 (server/agent/proxy) Fix PID
Summary: net-mgmt/zabbix24 (server/agent/proxy) Fix PID
Status: Closed Overcome By Events
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Torsten Zuehlsdorff
URL:
Keywords:
: 209154 (view as bug list)
Depends on:
Blocks:
 
Reported: 2016-05-31 14:24 UTC by pg
Modified: 2017-05-30 07:31 UTC (History)
4 users (show)

See Also:


Attachments
patch to fix PID issue (9.51 KB, patch)
2016-05-31 14:24 UTC, pg
pg: maintainer-approval+
Details | Diff
patch to fix PID issue (10.32 KB, patch)
2016-06-18 09:49 UTC, pg
pg: maintainer-approval+
Details | Diff
patch to fix PID issue (11.10 KB, patch)
2016-08-11 23:10 UTC, pg
pg: maintainer-approval+
Details | Diff
patch to fix PID issue (11.11 KB, patch)
2016-08-11 23:17 UTC, pg
pg: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description pg 2016-05-31 14:24:42 UTC
Created attachment 170868 [details]
patch to fix PID issue

- Fix default path to PID 
- Fix rc.d scripts to correct use PID file
Comment 1 Bartek Rutkowski freebsd_committer freebsd_triage 2016-06-03 13:17:41 UTC
*** Bug 209154 has been marked as a duplicate of this bug. ***
Comment 2 pg 2016-06-18 09:49:53 UTC
Created attachment 171541 [details]
patch to fix PID issue

- Fix default path to PID 
- Fix rc.d scripts to correct use PID file
Comment 3 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2016-08-09 13:42:23 UTC
The patch did not apply cleanly:

$ svn patch zabbix24-209892.patch
U         zabbix24-server/Makefile
A         zabbix24-server/files/patch-src-zabbix_agent_zabbix_agentd.c
A         zabbix24-server/files/patch-src-zabbix_proxy_proxy.c
A         zabbix24-server/files/patch-src-zabbix_server_server.c
U         zabbix24-server/files/zabbix_agentd.in
C         zabbix24-server/files/zabbix_proxy.in
>         Abschnitt @@ -48,6 +54,4 @@ mit Versatz  angewandt1
>         Abschnitt @@ -24,21 +24,27 @@ zurückgewiesen
U         zabbix24-server/files/zabbix_server.in

Can you please check this?
Comment 4 pg 2016-08-11 23:10:49 UTC
Created attachment 173558 [details]
patch to fix PID issue

- Fix default path to PID 
- Fix rc.d scripts to correct use PID file
- Fix MYSQL_USE -> USES+= mysql
- Fix PGSQL_USES -> USES+= pgsql
- Fix SQLITE_USES -> USES+= sqlite
- Change default options
- Fix CONFLICTS
Comment 5 pg 2016-08-11 23:17:56 UTC
Created attachment 173559 [details]
patch to fix PID issue
Comment 6 Danilo Egea Gondolfo freebsd_committer freebsd_triage 2017-02-14 14:13:11 UTC
Any update about this?
Comment 7 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2017-02-22 14:45:12 UTC
I will have a look at the patch this week!
Comment 8 Torsten Zuehlsdorff freebsd_committer freebsd_triage 2017-03-01 13:50:40 UTC
I'm sorry, but the patch did not apply:

$ svn patch  zabbix24-209892.patch
C         zabbix24-server/Makefile
>         Abschnitt @@ -60,7 +58,6 @@ mit Versatz - angewandt1
>         Abschnitt @@ -72,7 +69,7 @@ mit Versatz - angewandt1
>         Abschnitt @@ -91,13 +88,13 @@ mit Versatz - angewandt1
>         Abschnitt @@ -144,6 +141,21 @@ mit Versatz - angewandt1
>         Abschnitt @@ -14,15 +14,13 @@ zurückgewiesen
A         zabbix24-server/files/patch-src-zabbix_agent_zabbix_agentd.c
A         zabbix24-server/files/patch-src-zabbix_proxy_proxy.c
A         zabbix24-server/files/patch-src-zabbix_server_server.c
U         zabbix24-server/files/zabbix_agentd.in
U         zabbix24-server/files/zabbix_proxy.in
U         zabbix24-server/files/zabbix_server.in

This part could not be applied:

$ cat Makefile.svnpatch.rej 
--- zabbix24-server/Makefile
+++ zabbix24-server/Makefile
@@ -14,15 +14,13 @@
 
 LICENSE=       GPLv2
 
-CONFLICTS=     ${PKGBASE}-1.[0-8]*
+LIB_DEPENDS=   libnetsnmp.so:net-mgmt/net-snmp
+
+CONFLICTS=     zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
 
 IGNORE_WITH_PHP=       52
 IGNORE_WITH_MYSQL=     41
 
-.if ${PKGNAMESUFFIX} != "-agent"
-CONFLICTS+=    ${PORTNAME}-1.[0-8]*
-.endif
-
 ZABBIX_BUILD=  ${PKGNAMESUFFIX:S/^-//}
 
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings

Also the patches are not created with "make makepatch":

$ portlint -C
WARN: Makefile: [0]: possible direct use of command "cp" found. use ${CP} instead.
WARN: Makefile: possible use of absolute pathname "/etc/zabbix".
WARN: /usr/ports/net-mgmt/zabbix24-server/files/patch-src-zabbix_agent_zabbix_agentd.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /usr/ports/net-mgmt/zabbix24-server/files/patch-src-zabbix_proxy_proxy.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
WARN: /usr/ports/net-mgmt/zabbix24-server/files/patch-src-zabbix_server_server.c: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.
FATAL: Makefile.svnpatch.rej: for safety, be sure to cleanup backup files before committing the port.

For the last 2 patches i already recreated them by hand, but it would be very helpful, if you can do this when updating the patch.
Comment 9 pg 2017-05-30 07:31:08 UTC
net-mgmt/zabbix24-(agent|frontend|proxy|server) was removed (PR 219563)