ports/56262: [maintainer] net/zabbix 1.0beta10 is out
Sergey Akifyev
asa at gascom.ru
Mon Sep 1 09:40:20 UTC 2003
The following reply was made to PR ports/56262; it has been noted by GNATS.
From: Sergey Akifyev <asa at gascom.ru>
To: freebsd-gnats-submit at FreeBSD.org
Cc:
Subject: Re: ports/56262: [maintainer] net/zabbix 1.0beta10 is out
Date: Mon, 1 Sep 2003 13:38:39 +0400
Kirill Ponomarew noticed, that my patch adds junk .orig files to port
directory. Following version fixes this.
diff -ruN zabbix.orig/Makefile zabbix/Makefile
--- zabbix.orig/Makefile Mon Sep 1 12:15:03 2003
+++ zabbix/Makefile Mon Sep 1 12:15:08 2003
@@ -2,37 +2,35 @@
# Date created: Jun 18 2003
# Whom: Sergey Akifyev <asa at gascom.
ru>
#
-# $FreeBSD: ports/net/zabbix/Makefile,v 1.1 2003/08/30 08:06:39 edwin
Exp $
+# $FreeBSD$
#
PORTNAME= zabbix
-PORTVERSION= 1.0b7
+PORTVERSION= 1.0b10
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
-DISTNAME= ${PORTNAME}-1.0beta7
+MASTER_SITE_SUBDIR=${PORTVERSION:S|b|beta|}
+DISTNAME= ${PORTNAME}-${PORTVERSION:S|b|beta|}
MAINTAINER= asa at gascom.ru
COMMENT= Very advanced network monitoring system
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
-CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS= --prefix=${PREFIX}
-
.ifdef(ZABBIX_AGENT_ONLY)
PKGNAMESUFFIX= -agent
PLIST= ${MASTERDIR}/pkg-plist.agent
PKGMESSAGE= nonexistent
.else
-CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
-LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4 \
+CONFIGURE_ARGS= --with-mysql --with-net-snmp
+
+LIB_DEPENDS= netsnmp.5:${PORTSDIR}/net/net-snmp \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-BUILD_DEPENDS+= mysql:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS+= safe_mysqld:${PORTSDIR}/databases/mysql323-server
+BUILD_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client
+RUN_DEPENDS= safe_mysqld:${PORTSDIR}/databases/mysql323-server
.endif
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include
+
ZABBIX_BINARIES=zabbix_agent zabbix_agentd zabbix_sender
ZABBIX_CONFIGS= zabbix_agent.conf zabbix_agentd.conf
.ifndef(ZABBIX_AGENT_ONLY)
@@ -57,6 +55,7 @@
${PREFIX}/share/zabbix/create
${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix
${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create
+ ${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix
${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \
${PREFIX}/share/zabbix/create
${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \
diff -ruN zabbix.orig/distinfo zabbix/distinfo
--- zabbix.orig/distinfo Mon Sep 1 12:15:03 2003
+++ zabbix/distinfo Mon Sep 1 12:15:08 2003
@@ -1 +1 @@
-MD5 (zabbix-1.0beta7.tar.gz) = 07545fbbbd8c85936a89aaabd8842f7e
+MD5 (zabbix-1.0beta10.tar.gz) = 6d1fd1c4e8166ceffa730060583d4014
diff -ruN zabbix.orig/files/patch-src-zabbix_sucker-Makefile.in zabbix/
files/patch-src-zabbix_sucker-Makefile.in
--- zabbix.orig/files/patch-src-zabbix_sucker-Makefile.in Mon Sep
1 12:15:03 2003
+++ zabbix/files/patch-src-zabbix_sucker-Makefile.in Mon Sep 1
12:15:08 2003
@@ -3,10 +3,10 @@
@@ -1,7 +1,7 @@
# Build rules
--INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@
--LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@
+-INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @SNMP_INCLUDE@
+-LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ @SNMP_LFLAGS@
+INCLUDE = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ -I/usr/local/include
-+LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ -L/usr/local/lib -
lsnmp
++LIBS = @LIBS@ @MYSQL_LFLAGS@ @PGSQL_LFLAGS@ -L/usr/local/lib -
lnetsnmp
all:
diff -ruN zabbix.orig/pkg-install zabbix/pkg-install
--- zabbix.orig/pkg-install Mon Sep 1 12:15:03 2003
+++ zabbix/pkg-install Mon Sep 1 12:15:08 2003
@@ -2,43 +2,44 @@
# Script was taken from mysql323-server port, and modified
# to suit zabbix needs
+[ -n "${PACKAGE_BUILDING}" ] && exit 0
+
+[ "${2}" = "POST-INSTALL" ] && exit 0
+
PATH=/bin:/usr/sbin
-case $2 in
-POST-INSTALL)
- USER=zabbix
- GROUP=${USER}
- UID=112
- GID=${UID}
+USER=zabbix
+GROUP=${USER}
+UID=112
+GID=${UID}
- if pw group show "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will
use it."
+if pw group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+else
+ if pw groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
else
- if pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
fi
+fi
- if pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will
use it."
- if pw usermod ${USER} -d /nonexistent
- then
- echo "Changed home directory of \"${USER}\"
to /nonexistent"
- else
- echo "Changing home directory of \"${USER}\" to /
nonexistent failed..."
- exit 1
- fi
+if pw user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ if pw usermod ${USER} -d /nonexistent
+ then
+ echo "Changed home directory of \"${USER}\" to /
nonexistent"
+ else
+ echo "Changing home directory of \"${USER}\" to /
nonexistent failed..."
+ exit 1
+ fi
+else
+ if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d /nonexistent -s /sbin/nologin -c "Zabbix Sandbox"
+ then
+ echo "Added user \"${USER}\"."
else
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d /nonexistent -s /sbin/nologin -c "MySQL
Daemon"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
fi
-esac
+fi
diff -ruN zabbix.orig/pkg-plist zabbix/pkg-plist
--- zabbix.orig/pkg-plist Mon Sep 1 12:15:03 2003
+++ zabbix/pkg-plist Mon Sep 1 12:15:08 2003
@@ -11,7 +11,7 @@
bin/zabbix_suckerd
bin/zabbix_trapper
bin/zabbix_trapperd
- at dirrm etc/zabbix
+share/zabbix/php/audio/disaster_on.wav
share/zabbix/php/audio/warning_off.wav
share/zabbix/php/audio/warning_on.wav
share/zabbix/php/about.php
@@ -24,6 +24,7 @@
share/zabbix/php/chart4.php
share/zabbix/php/chart5.php
share/zabbix/php/chart_diff.php
+share/zabbix/php/chart_sla.php
share/zabbix/php/charts.php
share/zabbix/php/compare.php
share/zabbix/php/config.php
@@ -43,6 +44,10 @@
share/zabbix/php/queue.php
share/zabbix/php/report1.php
share/zabbix/php/report2.php
+share/zabbix/php/report3.php
+share/zabbix/php/screenconf.php
+share/zabbix/php/screenedit.php
+share/zabbix/php/screens.php
share/zabbix/php/services.php
share/zabbix/php/srv_status.php
share/zabbix/php/sysmap.php
@@ -67,6 +72,41 @@
share/zabbix/create/mysql/schema.sql
share/zabbix/create/postgresql/schema.sql
share/zabbix/create/dbsetup.sh
+share/zabbix/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
+share/zabbix/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
+share/zabbix/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
+share/zabbix/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
+share/zabbix/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
+ at dirrm etc/zabbix
@dirrm share/zabbix/php/audio
@dirrm share/zabbix/php/images/sysmaps
@dirrm share/zabbix/php/images
@@ -76,6 +116,58 @@
@dirrm share/zabbix/create/mysql
@dirrm share/zabbix/create/postgresql
@dirrm share/zabbix/create
+ at dirrm share/zabbix/dbpatches/1.0alpha10_to_1.0alpha11/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha10_to_1.0alpha11
+ at dirrm share/zabbix/dbpatches/1.0alpha11_to_1.0alpha12/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha11_to_1.0alpha12
+ at dirrm share/zabbix/dbpatches/1.0alpha12_to_1.0beta1/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha12_to_1.0beta1/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha12_to_1.0beta1
+ at dirrm share/zabbix/dbpatches/1.0alpha3_to_1.0alpha4/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha3_to_1.0alpha4
+ at dirrm share/zabbix/dbpatches/1.0alpha4_to_1.0alpha5/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha4_to_1.0alpha5
+ at dirrm share/zabbix/dbpatches/1.0alpha6_to_1.0alpha7/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha6_to_1.0alpha7
+ at dirrm share/zabbix/dbpatches/1.0alpha7_to_1.0alpha8/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha7_to_1.0alpha8
+ at dirrm share/zabbix/dbpatches/1.0alpha8_to_1.0alpha9/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha8_to_1.0alpha9
+ at dirrm share/zabbix/dbpatches/1.0alpha9_to_1.0alpha10/mysql
+ at dirrm share/zabbix/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
+ at dirrm share/zabbix/dbpatches/1.0alpha9_to_1.0alpha10
+ at dirrm share/zabbix/dbpatches/1.0beta2_to_1.0beta3/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta2_to_1.0beta3/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta2_to_1.0beta3
+ at dirrm share/zabbix/dbpatches/1.0beta3_to_1.0beta4/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta3_to_1.0beta4/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta3_to_1.0beta4
+ at dirrm share/zabbix/dbpatches/1.0beta4_to_1.0beta5/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta4_to_1.0beta5/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta4_to_1.0beta5
+ at dirrm share/zabbix/dbpatches/1.0beta5_to_1.0beta6/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta5_to_1.0beta6/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta5_to_1.0beta6
+ at dirrm share/zabbix/dbpatches/1.0beta6_to_1.0beta7/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta6_to_1.0beta7/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta6_to_1.0beta7
+ at dirrm share/zabbix/dbpatches/1.0beta7_to_1.0beta8/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta7_to_1.0beta8/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta7_to_1.0beta8
+ at dirrm share/zabbix/dbpatches/1.0beta8_to_1.0beta9/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta8_to_1.0beta9/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta8_to_1.0beta9
+ at dirrm share/zabbix/dbpatches/1.0beta9_to_1.0beta10/mysql
+ at dirrm share/zabbix/dbpatches/1.0beta9_to_1.0beta10/postgresql
+ at dirrm share/zabbix/dbpatches/1.0beta9_to_1.0beta10
+ at dirrm share/zabbix/dbpatches
@dirrm share/zabbix
@exec ln -sf %D/etc/zabbix /etc/zabbix
@unexec rm /etc/zabbix
diff -ruN zabbix.orig/pkg-plist.agent zabbix/pkg-plist.agent
--- zabbix.orig/pkg-plist.agent Mon Sep 1 12:15:03 2003
+++ zabbix/pkg-plist.agent Mon Sep 1 12:15:08 2003
@@ -3,7 +3,6 @@
bin/zabbix_sender
etc/zabbix/zabbix_agent.conf.sample
etc/zabbix/zabbix_agentd.conf.sample
-etc/rc.d/zabbix-agent.sh.sample
@dirrm /etc/zabbix
@exec ln -sf %D/etc/zabbix /etc/zabbix
@unexec rm /etc/zabbix
More information about the freebsd-ports-bugs
mailing list