Merge gwck branch.

packages/gwck-qmp/Makefile

+# gwck-qmp openwrt package
+#
+# Copyright (C) 2011 Simó Albert i Beltran
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Version 0.1.20111107.1.0
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gwck-qmp
+
+PKG_SOURCE_PROTO:=git
+
+PKG_SOURCE_URL:=git://qmp.cat/gwck.git
+PKG_REV:=9133f42ffc40d34e04a48c2a7fa07a024cff5b36
+PKG_VERSION:=r2011110701
+
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gwck-qmp
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Routing and Redirection
+  TITLE:=Check gateway and control bmx6 tunnels.
+  URL:=http://qmp.net/projects/gwck
+  MAINTAINER:=Simó Albert i Beltran <sim6@graciasensefils.net>
+  MENU:=1
+  DEPENDS:=+fping +bmx6-qmp
+endef
+
+define Package/gwck-qmp/description
+gwck is a tool to check gateway connectivity and perform actions in consequence.
+This package runs gwck to control bmx6 tunnels.
+endef
+
+define Build/Compile
+endef
+
+define Package/gwck-qmp/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/gwck $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/gwck $(1)/etc/gwck/module
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/usr/bin/gwck $(1)/usr/bin/gwck
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/gwck_conf $(1)/etc/gwck/gwck_conf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/gwck_conf_qmp $(1)/etc/gwck/gwck_conf_qmp
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/gwck_conf_qmp_ipv4 $(1)/etc/gwck/gwck_conf_qmp_ipv4
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/gwck_conf_qmp_ipv6 $(1)/etc/gwck/gwck_conf_qmp_ipv6
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/module/specific_routes $(1)/etc/gwck/module/specific_routes
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/gwck/module/bmx6 $(1)/etc/gwck/module/bmx6
+endef
+
+
+define Package/gwck-qmp/conffiles
+/etc/gwck/gwck_conf
+/etc/gwck/gwck_conf_qmp
+/etc/gwck/gwck_conf_qmp_ipv4
+/etc/gwck/gwck_conf_qmp_ipv6
+endef
+
+$(eval $(call BuildPackage,gwck-qmp))

packages/gwck-qmp/files/etc/init.d/gwck

+#!/bin/sh /etc/rc.common
+#
+# gwck qmp init script
+#
+# Copyright (C) 2011 Simó Albert i Beltran
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Version 0.1.20111107.0
+
+START=99
+
+BIN=/usr/bin/gwck
+
+start()
+{
+	$BIN -l -f /etc/gwck/gwck_conf_qmp > /dev/null 2> /dev/null &
+}
+
+stop()
+{
+	$BIN -k
+}
+
+restart()
+{
+	stop
+	start
+}

packages/qmp-small-node/Makefile

@@ -58,7 +58,8 @@ define Package/qmp-small-node
 	+kmod-tun \
 	+kmod-madwifi \
 	+kmod-ath9k \
-	+kmod-ath5k
+	+kmod-ath5k \
+	+gwck-qmp
 
 endef
 

packages/qmp-small-node/files/etc/uci-defaults/qmp_banner

@@ -3,7 +3,7 @@
 cat /etc/qmp/qmp.banner >> /etc/banner
 echo "Versio ratafia 1.0 (Sat Oct 29 2011) ---------------" >> /etc/banner
 echo "Ratafia Recipe: http://en.wikipedia.org/wiki/Ratafia" >> /etc/banner
-[ $BRANCH ] && [ $REV ] && echo "Version: http://qmp.cat/project/qmp/repository/show?branch=$BRANCH&rev=$REV" >> /etc/banner
+[ $BRANCH ] && [ $REV ] && echo "Version: http://qmp.cat/projects/qmp/repository/show?branch=$BRANCH&rev=$REV" >> /etc/banner
 echo "----------------------------------------------------" >> /etc/banner
 
 

packages/qmp-tinyproxy/files/index.html

@@ -31,10 +31,10 @@ Principalment amb dues finalitats:
 Amb el suport de:
 <table width=100%>
 <tr>
-<td><a href="http://{splashhost}{splashcontinue}http://qmp.cat" title="Quick Mesh Project"><img src="http://{splashhost}/qmp.png" /></a></td>
-<td><a href="http://{splashhost}{splashcontinue}http://www.domini.cat/" title="Punt CAT"><img src="http://{splashhost}/puntcat.png" /></a></td>
-<td><a href="http://{splashhost}{splashcontinue}http://graciasensefils.net/" title="GraciaSenseFils"><img src="http://{splashhost}/gsf.png" /></a></td>
-<td><a href="http://{splashhost}{splashcontinue}http://guifi.net/" title="Guifi.net"><img src="http://{splashhost}/guifinet.jpg" /></a></td>
+<td><a href="http://{splashhost}{splashcontinue}http://qmp.cat" title="Quick Mesh Project"><img src="http://{splashhost}/qmp.png" border="0"/></a></td>
+<td><a href="http://{splashhost}{splashcontinue}http://www.domini.cat/" title="Punt CAT"><img src="http://{splashhost}/puntcat.png" border="0"/></a></td>
+<td><a href="http://{splashhost}{splashcontinue}http://graciasensefils.net/" title="GraciaSenseFils"><img src="http://{splashhost}/gsf.png" border="0"/></a></td>
+<td><a href="http://{splashhost}{splashcontinue}http://guifi.net/" title="Guifi.net"><img src="http://{splashhost}/guifinet.jpg" border="0"/></a></td>
 </tr>
 </table>