[Astlinux-commits] SF.net SVN: astlinux:[5223] branches/1.0/package/zabbix

[<dha...@us...>]

Revision: 5223
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5223&view=rev
Author:   dhartman
Date:     2011-10-21 18:21:41 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
update to zabbix--still needs a little work

Modified Paths:
--------------
    branches/1.0/package/zabbix/zabbix-configure.patch
    branches/1.0/package/zabbix/zabbix.mk

Removed Paths:
-------------
    branches/1.0/package/zabbix/zabbix-getloadave.patch

Modified: branches/1.0/package/zabbix/zabbix-configure.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure.patch	2011-10-20 16:12:19 UTC (rev 5222)
+++ branches/1.0/package/zabbix/zabbix-configure.patch	2011-10-21 18:21:41 UTC (rev 5223)
@@ -1,11 +1,20 @@
---- zabbix-1.4.5/configure	2008-03-26 03:12:39.000000000 -0500
-+++ zabbix-1.4.5/configure-zab	2008-04-04 09:56:25.000000000 -0500
-@@ -4788,7 +4788,7 @@ if test "$cross_compiling" = yes; then
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
+*** 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 >conftest.$ac_ext <<_ACEOF
- 
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  /* end confdefs.h.  */

Deleted: branches/1.0/package/zabbix/zabbix-getloadave.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-getloadave.patch	2011-10-20 16:12:19 UTC (rev 5222)
+++ branches/1.0/package/zabbix/zabbix-getloadave.patch	2011-10-21 18:21:41 UTC (rev 5223)
@@ -1,47 +0,0 @@
---- zabbix-1.4.5/src/libs/zbxsysinfo/linux/cpu.c.orig	2008-03-26 03:12:32.000000000 -0500
-+++ zabbix-1.4.5/src/libs/zbxsysinfo/linux/cpu.c	2008-08-27 21:52:32.000000000 -0500
-@@ -22,6 +22,44 @@
- #include "sysinfo.h"
- #include "stats.h"
- 
-+/* uclibc and dietlibc do not have this junk -ReneR */
-+#if defined (__UCLIBC__) || defined (__dietlibc__)
-+static int getloadavg (double loadavg[], int nelem)
-+{
-+  int fd;
-+
-+  fd = open ("/proc/loadavg", O_RDONLY);
-+  if (fd < 0)
-+    return -1;
-+  else
-+    {
-+      char buf[65], *p;
-+      ssize_t nread;
-+      int i;
-+
-+      nread = read (fd, buf, sizeof buf - 1);
-+      close (fd);
-+      if (nread <= 0)
-+       return -1;
-+      buf[nread - 1] = '\0';
-+
-+      if (nelem > 3)
-+       nelem = 3;
-+      p = buf;
-+      for (i = 0; i < nelem; ++i)
-+       {
-+         char *endp;
-+         loadavg[i] = strtod (p, &endp);
-+         if (endp == p)
-+           return -1;
-+         p = endp;
-+       }
-+
-+      return i;
-+    }
-+}
-+#endif
-+
- int	SYSTEM_CPU_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
- {
- 	char	mode[128];

Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk	2011-10-20 16:12:19 UTC (rev 5222)
+++ branches/1.0/package/zabbix/zabbix.mk	2011-10-21 18:21:41 UTC (rev 5223)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ZABBIX_VERSION = 1.6.8
+ZABBIX_VERSION = 1.8.8
 ZABBIX_SOURCE = zabbix-$(ZABBIX_VERSION).tar.gz
 ZABBIX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/zabbix
 
@@ -22,7 +22,6 @@
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-gtk-doc \
 		$(ZABBIX_CONF_OPT) \
         )
 endef

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.