muninlite: update to Version 1.0.4 (#8877)

Signed-off-by: Andreas Oeldenberger <Andreas.Oeldenberger@gmail.com>
SVN-Revision: 25587

diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile
index f60b73787543a2369b1b3688e6bc3e5b9d7d207b..1a27cd050a1bdb588a8cf21292d0aba7495155c0 100644 (file)
--- a/admin/muninlite/Makefile
+++ b/admin/muninlite/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=muninlite
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=67fe45999fbd29f7d91fe342889e3dcb
+PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/admin/muninlite/patches/001-no_disks.patch b/admin/muninlite/patches/001-no_disks.patch
index d24e2303a4e72881d0164aca7107208d4626c840..bf9b2b1c5ee8c4a076389762b1bd679dc8768895 100644 (file)
--- a/admin/muninlite/patches/001-no_disks.patch
+++ b/admin/muninlite/patches/001-no_disks.patch
@@ -3,9 +3,9 @@
 @@ -1,7 +1,7 @@
  
  
--PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate
+-PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_
 -#PLUGINS=cpu if_ if_err_ load memory processes netstat uptime interrupts irqstats
-+#PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate
++#PLUGINS=df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_
 +PLUGINS=cpu if_ if_err_ load memory processes netstat uptime interrupts irqstats
  
  munin-node: plugins/* munin-node.conf

diff --git a/admin/muninlite/patches/002-hostname.patch b/admin/muninlite/patches/002-hostname.patch
index feb4308631d0814eb815ca555cc254a7f8878665..5d871683c90cdffc688eb6da980f2dc79c9695c2 100644 (file)
--- a/admin/muninlite/patches/002-hostname.patch
+++ b/admin/muninlite/patches/002-hostname.patch
@@ -1,6 +1,6 @@
 --- a/munin-node.in
 +++ b/munin-node.in
-@@ -93,7 +93,7 @@ PLUGINS=$RES
+@@ -113,7 +113,7 @@ PLUGINS=$RES
  
  # ===== MAIN LOOP =====
  FUNCTIONS="list nodes config fetch version quit"

diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile
index ddeedf068739e1ec71b0bae56e8e2388b35b8dd5..f6a896fd5ea0db15e886614f767200624d390408 100644 (file)
--- a/net/umurmur/Makefile
+++ b/net/umurmur/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umurmur
-PKG_VERSION:=0.2.5
+PKG_VERSION:=0.2.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/
-PKG_MD5SUM:=c31fd72c0ac563cf75961ae4e49909d7
+PKG_MD5SUM:=06dc224be5160e172574c9248682140b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -81,12 +81,12 @@ endef
 Package/umurmur-polarssl/install = $(Package/umurmur-openssl/install)
 
 ifeq ($(BUILD_VARIANT),openssl)
-  TARGET_CFLAGS += -DWRT_TARGET -I$(STAGING_DIR)/usr/include
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
   TARGET_LDFLAGS += -lcrypto -lssl
 endif
 
 ifeq ($(BUILD_VARIANT),polarssl)
-  TARGET_CFLAGS += -DUSE_POLARSSL -DWRT_TARGET -I$(STAGING_DIR)/usr/include
+  TARGET_CFLAGS += -DUSE_POLARSSL -I$(STAGING_DIR)/usr/include
   TARGET_LDFLAGS += -lpolarssl
 endif
 

diff --git a/net/umurmur/patches/001-fix-libconfig-include.patch b/net/umurmur/patches/001-fix-libconfig-include.patch
deleted file mode 100644 (file)
index 41d242b..0000000
--- a/net/umurmur/patches/001-fix-libconfig-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -32,11 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#ifdef WRT_TARGET
--#include <libconfig/libconfig.h>
--#else
- #include <libconfig.h>
--#endif
- 
- #include "types.h"
- #include "conf.h"