diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile deleted file mode 100644 index c81766fd8..000000000 --- a/admin/muninlite/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=muninlite -PKG_VERSION:=1.0.4 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=a8cc86f0cc536a6c22dc298f4ed55339 - -include $(INCLUDE_DIR)/package.mk - -define Package/muninlite - SECTION:=admin - CATEGORY:=Administration - DEPENDS:=+xinetd - TITLE:=Munin node implemented in shell - URL:=http://sourceforge.net/projects/muninlite/ -endef - -define Package/muninlite/Default/description - Munin node implemented in shell. - Munin is a monitoring system for Unix networks. -endef - -define Package/muninlite/install - $(INSTALL_DIR) $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/munin-node $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/xinetd.d - $(INSTALL_DATA) ./files/etc/xinetd.d/munin $(1)/etc/xinetd.d/ -endef - -define Package/muninlite/conffiles -/etc/xinetd.d/munin -endef - -define Build/Configure -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) -endef - -$(eval $(call BuildPackage,muninlite)) diff --git a/admin/muninlite/files/etc/xinetd.d/munin b/admin/muninlite/files/etc/xinetd.d/munin deleted file mode 100644 index 012d71b9f..000000000 --- a/admin/muninlite/files/etc/xinetd.d/munin +++ /dev/null @@ -1,10 +0,0 @@ -service munin -{ - socket_type = stream - protocol = tcp - wait = no - user = root - group = root - server = /usr/sbin/munin-node - disable = no -} diff --git a/admin/muninlite/patches/001-no_disks.patch b/admin/muninlite/patches/001-no_disks.patch deleted file mode 100644 index bf9b2b1c5..000000000 --- a/admin/muninlite/patches/001-no_disks.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - - --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 plugindir_ -+PLUGINS=cpu if_ if_err_ load memory processes netstat uptime interrupts irqstats - - munin-node: plugins/* munin-node.conf - @VERSION=$$(cat VERSION); \ diff --git a/admin/muninlite/patches/002-hostname.patch b/admin/muninlite/patches/002-hostname.patch deleted file mode 100644 index 5d871683c..000000000 --- a/admin/muninlite/patches/002-hostname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/munin-node.in -+++ b/munin-node.in -@@ -113,7 +113,7 @@ PLUGINS=$RES - - # ===== MAIN LOOP ===== - FUNCTIONS="list nodes config fetch version quit" --HOSTNAME=$(hostname -f 2>/dev/null || hostname) -+HOSTNAME=$(/sbin/uci get "system.@system[0].hostname" 2>/dev/null || cat /proc/sys/kernel/hostname) - echo "# munin node at $HOSTNAME" - while read arg0 arg1 - do diff --git a/admin/muninlite/patches/100-fix-no-ethtool.patch b/admin/muninlite/patches/100-fix-no-ethtool.patch deleted file mode 100644 index 88f7e3056..000000000 --- a/admin/muninlite/patches/100-fix-no-ethtool.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/plugins/if_ -+++ b/plugins/if_ -@@ -15,10 +15,14 @@ config_if() { - echo "up.min 0" - echo "up.negative down" - echo "up.cdef up,8,*" -- if ethtool $1 | grep -q Speed; then -- MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\ -f2) * 1000000)) -- echo "up.max $MAX" -- echo "down.max $MAX" -+ if [ -n "$(which ethtool)" ]; then -+ if [ -x "$(which ethtool)" ]; then -+ if ethtool $1 | grep -q Speed; then -+ MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\ -f2) * 1000000)) -+ echo "up.max $MAX" -+ echo "down.max $MAX" -+ fi -+ fi - fi - } - fetch_if() { diff --git a/admin/muninlite/patches/200-add-tap-dev.patch b/admin/muninlite/patches/200-add-tap-dev.patch deleted file mode 100644 index fa46ce6b3..000000000 --- a/admin/muninlite/patches/200-add-tap-dev.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/munin-node.in -+++ b/munin-node.in -@@ -72,7 +72,7 @@ RES="" - for PLUG in $PLUGINS - do - if [ "$PLUG" = "if_" ]; then -- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); -+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - do - INTERRES=$(echo $INTER | sed 's/\./VLAN/') - RES="$RES if_$INTERRES" -@@ -80,7 +80,7 @@ do - eval "config_if_${INTERRES}() { config_if $INTER $@; };" - done - elif [ "$PLUG" = "if_err_" ]; then -- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); -+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - do - INTERRES=$(echo $INTER | sed 's/\./VLAN/') - RES="$RES if_err_$INTERRES" diff --git a/admin/muninlite/patches/210-add-bridge-devs.patch b/admin/muninlite/patches/210-add-bridge-devs.patch deleted file mode 100644 index 1a76e971d..000000000 --- a/admin/muninlite/patches/210-add-bridge-devs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/munin-node.in -+++ b/munin-node.in -@@ -72,17 +72,17 @@ RES="" - for PLUG in $PLUGINS - do - if [ "$PLUG" = "if_" ]; then -- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); -+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - do -- INTERRES=$(echo $INTER | sed 's/\./VLAN/') -+ INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/') - RES="$RES if_$INTERRES" - eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };" - eval "config_if_${INTERRES}() { config_if $INTER $@; };" - done - elif [ "$PLUG" = "if_err_" ]; then -- for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); -+ for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g'); - do -- INTERRES=$(echo $INTER | sed 's/\./VLAN/') -+ INTERRES=$(echo $INTER | sed -e 's/\./VLAN/' -e 's/\-/_/') - RES="$RES if_err_$INTERRES" - eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };" - eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };"