Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[5646] branches/1.0
|
From: <dha...@us...> - 2012-08-28 16:25:06
|
Revision: 5646
http://astlinux.svn.sourceforge.net/astlinux/?rev=5646&view=rev
Author: dhartman
Date: 2012-08-28 16:25:00 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
update zabbix to 2.0.2; add menuconfig option for zabbix_proxy, disabled by default
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/zabbix/Config.in
branches/1.0/package/zabbix/zabbix-configure.patch
branches/1.0/package/zabbix/zabbix.mk
Removed Paths:
-------------
branches/1.0/package/zabbix/zabbix-configure-long-long.patch
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/astlinux.config 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:18 2012
+# Buildroot 2011.08-svn5644-dirty Configuration
+# Tue Aug 28 11:23:58 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -421,6 +421,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
+# BR2_PACKAGE_ZABBIX_PROXY is not set
#
# Interpreter languages and scripting
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/astlinux18.config 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:20 2012
+# Buildroot 2011.08-svn5644-dirty Configuration
+# Tue Aug 28 11:23:20 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -415,6 +415,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
+# BR2_PACKAGE_ZABBIX_PROXY is not set
#
# Interpreter languages and scripting
Modified: branches/1.0/package/zabbix/Config.in
===================================================================
--- branches/1.0/package/zabbix/Config.in 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/Config.in 2012-08-28 16:25:00 UTC (rev 5646)
@@ -5,3 +5,13 @@
Zabbix agent to be used with Zabbix Monitoring Solution
http://www.zabbix.com
+
+config BR2_PACKAGE_ZABBIX_PROXY
+ bool "zabbix_proxy"
+ depends on BR2_PACKAGE_ZABBIX
+ default n
+ help
+ Zabbix proxy to be used with Zabbix Monitoring Solution
+
+ http://www.zabbix.com
+
Deleted: branches/1.0/package/zabbix/zabbix-configure-long-long.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure-long-long.patch 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix-configure-long-long.patch 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,13 +0,0 @@
---- zabbix-1.8.8/configure.in.orig 2011-10-21 14:29:24.000000000 -0500
-+++ zabbix-1.8.8/configure.in 2011-10-21 14:30:34.000000000 -0500
-@@ -886,7 +886,9 @@
- ],
- AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
- AC_MSG_RESULT(yes),
--AC_MSG_RESULT(no))
-+AC_MSG_RESULT(no),
-+AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
-+AC_MSG_RESULT(yes))
-
- dnl option -rdynamic is needed for readable backtraces
- AC_MSG_CHECKING(for -rdynamic linking option)
Modified: branches/1.0/package/zabbix/zabbix-configure.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure.patch 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix-configure.patch 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,20 +1,12 @@
-*** zabbix-1.8.8/configure.orig 2011-10-21 12:40:33.840598621 -0500
---- zabbix-1.8.8/configure 2011-10-21 12:41:11.622596475 -0500
-***************
-*** 6791,6798 ****
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-- as_fn_error $? "cannot run test program while cross compiling
-- See \`config.log' for more details" "$LINENO" 5 ; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
---- 6791,6797 ----
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+ }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+--- zabbix-2.0.2/configure.orig 2012-08-28 09:37:42.195997578 -0500
++++ zabbix-2.0.2/configure 2012-08-28 09:40:27.803997480 -0500
+@@ -6982,8 +6982,7 @@
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++}
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix.mk 2012-08-28 16:25:00 UTC (rev 5646)
@@ -4,13 +4,18 @@
#
#############################################################
-ZABBIX_VERSION = 1.8.10
+ZABBIX_VERSION = 2.0.2
ZABBIX_SOURCE = zabbix-$(ZABBIX_VERSION).tar.gz
ZABBIX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/zabbix
ZABBIX_CONF_OPT = \
- --enable-agent --enable-proxy
+ --enable-agent
+ifeq ($(strip $(BR2_PACKAGE_ZABBIX_PROXY)),Y)
+ZABBIX_CONF_OPT+= \
+ --enable-proxy
+endif
+
ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
ZABBIX_CONF_OPT+= \
--with-libcurl="$(STAGING_DIR)/usr/bin/curl-config"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
