# The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git
#
PKG_NAME:=alfred
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=0
-PKG_MD5SUM:=b8ab5677ed73d817b02b0e4fae10357a
+PKG_MD5SUM:=053cb5d9e7ca9384598e82944343dea2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
--- /dev/null
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=babel-pinger
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/
+PKG_MD5SUM:=40d4931986913f5f8d9b5b70abf6fda5
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/babel-pinger
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=Babel-pinger
+ URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
+ MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
+ DEPENDS:=+librt
+endef
+
+define Package/babel-pinger/description
+ Babel-pinger is a hack to export a default route into Babel for people
+ using DHCP to configure their routers rather than speaking to their
+ upstream provider with a proper routing protocol.
+endef
+
+MAKE_FLAGS+= \
+ CFLAGS="$(TARGET_CFLAGS)" \
+
+define Package/babel-pinger/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/babel-pinger $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,babel-pinger))
PKG_NAME:=batctl
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=1
-PKG_MD5SUM:=7d2b8c129424c014d020c4b1a2add31b
+PKG_MD5SUM:=f3a14565699313258ee6ba3de783eb0a
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
PKG_NAME:=batman-adv
-PKG_VERSION:=2014.3.0
+PKG_VERSION:=2014.4.0
PKG_RELEASE:=1
-PKG_MD5SUM:=e9ee1d42ff4b0254699c779668054bed
+PKG_MD5SUM:=b1518e84ce530883d224c6ca4c673ce8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
include $(TOPDIR)/rules.mk
PKG_NAME:=bird
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.5
PKG_RELEASE:=1
PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=eb7e00b9c1d102ddfcbc19d9cb168511
+PKG_MD5SUM:=a8e5e0a9129ce30fe6102c593bafb763
PKG_BUILD_DEPENDS:=libncurses libreadline
PKG_LICENSE:=GPL-2.0
#
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2014 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:=mcproxy
-PKG_SOURCE_VERSION:=6638aa9aabd2ccdde8915b61a8e0fb995b1f91a3
-PKG_VERSION:=2014-05-31-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=b7bd2d0809a0d1f177181c361b9a6c83e193b79a
+PKG_VERSION:=2014-12-31-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
define Package/mcproxy/conffiles
/etc/mcproxy.conf
+/etc/config/mcproxy
endef
define Package/mcproxy/install
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc/mcproxy.conf
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_CONF) ./files/mcproxy.config $(1)/etc/config/mcproxy
$(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_CONF) ./files/mcproxy.conf $(1)/etc
$(INSTALL_BIN) ./files/mcproxy.init $(1)/etc/init.d/mcproxy
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/mcproxy-bin $(1)/usr/sbin/mcproxy
##-- mcproxy configuration script --##
######################################
-# Erase or comment out the following line when configured
-disable;
-
# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)
protocol IGMPv3;
+###########################################
+
# Proxy Instance: upstream ==> downstream
-pinstance proxy1: eth1 ==> "eth0.1";
-#pinstance proxy2: "eth0.2" ==> "br-lan";
-#pinstance proxy3: eth0 ==> eth1 eth2;
+pinstance A: ap a1 ==> ap a2;
+pinstance B: bp b1 ==> bp b2;
+
+###########################################
+
+# Tables
+table allways {
+ (*|*)
+};
+
+table piA_peering_ifs {
+ ap(*|*)
+};
+
+table piA_upstreams {
+ a1(*|*)
+};
+
+table piB_peering_ifs {
+ bp(*|*)
+};
+
+table piB_upstreams {
+ b1(*|*)
+};
+
+###########################################
+
+# Instance Behaviour
+pinstance A upstream * in rulematching mutex 10; #or 25ms (u4)
+#pinstance A upstream * out rulematching all; #default
+
+pinstance A upstream ap out blacklist table allways; #(u1)
+#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3)
+
+pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1)
+#pinstance A upstream a1 in whitelist table {(*|*)}; #default
+
+pinstance A downstream ap in blacklist table allways; #(d1)
+pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4)
+
+#pinstance A downstream a2 in whitelist table {(*|*)}; #default
+#pinstance A downstream a2 out whitelist table {(*|*)}; #default
+
+pinstance B upstream * in rulematching mutex 10; #or 25ms (u4)
+#pinstance B upstream * out rulematching all; #default
+
+pinstance B upstream bp out blacklist table allways; #(u1)
+#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3)
+
+pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1)
+#pinstance b upstream b1 in whitelist table {(*|*)}; #default
+
+pinstance B downstream bp in blacklist table allways; #(d1)
+pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4)
+
+#pinstance B downstream b2 in whitelist table {(*|*)}; #default
+#pinstance B downstream b2 out whitelist table {(*|*)}; #default
--- /dev/null
+# Use your own MCProxy config file
+config mcproxy 'mcproxy_file'
+ option disabled '1'
+ option respawn '1'
+ option file '/etc/mcproxy.conf'
+
+# Use OpenWrt UCI config
+config mcproxy 'mcproxy'
+ option disabled '1'
+ option respawn '1'
+ option protocol 'IGMPv3'
+
+###########################################
+
+# Simple configuration examples
+
+config instance
+ option disabled '1'
+ option name 'proxy1'
+ list upstream 'eth1'
+ list downstream 'eth0.2'
+
+config instance
+ option disabled '1'
+ option name 'proxy2'
+ list upstream 'eth0.2'
+ list downstream 'eth0.4'
+ list downstream 'br-lan'
+
+config instance
+ option disabled '1'
+ option name 'proxy3'
+ list upstream 'eth1.2'
+ list upstream 'eth1.4'
+ list downstream 'eth0.1'
+
+###########################################
+
+# Advanced configuration example
+
+config instance
+ option name 'A'
+ list upstream 'ap'
+ list upstream 'a1'
+ list downstream 'ap'
+ list downstream 'a2'
+
+config instance
+ option name 'B'
+ list upstream 'bp'
+ list upstream 'b1'
+ list downstream 'bp'
+ list downstream 'b2'
+
+config table
+ option name 'allways'
+ list entries '(*|*)'
+
+config table
+ option name 'piA_peering_ifs'
+ list entries 'ap(*|*)'
+
+config table
+ option name 'piA_upstreams'
+ list entries 'a1(*|*)'
+
+config table
+ option name 'piB_peering_ifs'
+ list entries 'bp(*|*)'
+
+config table
+ option name 'piB_upstreams'
+ list entries 'b1(*|*)'
+
+config behaviour
+ option instance 'A'
+ option section 'upstream'
+ option interface '*'
+ option direction 'in'
+ option rulematching 'mutex 10'
+
+config behaviour
+ option disabled '1'
+ option instance 'A'
+ option section 'upstream'
+ option interface '*'
+ option direction 'out'
+ option rulematching 'all'
+
+config behaviour
+ option instance 'A'
+ option section 'upstream'
+ option interface 'ap'
+ option direction 'out'
+ option table 'allways'
+
+config behaviour
+ option disabled '1'
+ option instance 'A'
+ option section 'upstream'
+ option interface 'ap'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option instance 'A'
+ option section 'upstream'
+ option interface 'a1'
+ option direction 'out'
+ option table 'piA_peering_ifs'
+
+config behaviour
+ option disabled '1'
+ option instance 'A'
+ option section 'upstream'
+ option interface 'a1'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option instance 'A'
+ option section 'downstream'
+ option interface 'ap'
+ option direction 'in'
+ option table 'allways'
+
+config behaviour
+ option instance 'A'
+ option section 'downstream'
+ option interface 'ap'
+ option direction 'out'
+ option table 'piA_upstreams'
+
+config behaviour
+ option disabled '1'
+ option instance 'A'
+ option section 'downstream'
+ option interface 'a2'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option disabled '1'
+ option instance 'A'
+ option section 'downstream'
+ option interface 'a2'
+ option direction 'out'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option instance 'B'
+ option section 'upstream'
+ option interface '*'
+ option direction 'in'
+ option rulematching 'mutex 10'
+
+config behaviour
+ option disabled '1'
+ option instance 'B'
+ option section 'upstream'
+ option interface '*'
+ option direction 'out'
+ option rulematching 'all'
+
+config behaviour
+ option instance 'B'
+ option section 'upstream'
+ option interface 'bp'
+ option direction 'out'
+ option table 'allways'
+
+config behaviour
+ option disabled '1'
+ option instance 'B'
+ option section 'upstream'
+ option interface 'bp'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option instance 'B'
+ option section 'upstream'
+ option interface 'b1'
+ option direction 'out'
+ option table 'piB_peering_ifs'
+
+config behaviour
+ option disabled '1'
+ option instance 'B'
+ option section 'upstream'
+ option interface 'b1'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option instance 'B'
+ option section 'downstream'
+ option interface 'bp'
+ option direction 'in'
+ option table 'allways'
+
+config behaviour
+ option instance 'B'
+ option section 'downstream'
+ option interface 'bp'
+ option direction 'out'
+ option table 'piB_upstreams'
+
+config behaviour
+ option disabled '1'
+ option instance 'B'
+ option section 'downstream'
+ option interface 'b2'
+ option direction 'in'
+ option whitelist '1'
+ option table '{(*|*)}'
+
+config behaviour
+ option disabled '1'
+ option instance 'B'
+ option section 'downstream'
+ option interface 'b2'
+ option direction 'out'
+ option whitelist '1'
+ option table '{(*|*)}'
#!/bin/sh /etc/rc.common
+# Copyright (C) 2014 OpenWrt.org
START=50
USE_PROCD=1
-start_service() {
+# mcproxy_list_iface <var> <section> <option>
+mcproxy_list_iface() {
+ local val
+ local len
+ local _buffer
+ local c=1
+
+ config_get len "$2" "${3}_LENGTH"
+ [ -z "$len" ] && return 0
+ while [ $c -le "$len" ]; do
+ config_get val "$2" "${3}_ITEM$c"
+ append _buffer "\"${val}\""
+ c="$(($c + 1))"
+ done
+
+ export "${1}=${_buffer}";
+}
+
+mcproxy_handle_instances() {
+ local instance="$1"
+ local conf_file="$2"
+ local disabled
+ local pre=""
+ local name
+ local upstream
+ local downstream
+
+ config_get_bool disabled "$instance" 'disabled' '0'
+ config_get name "$instance" "name" "$instance"
+ mcproxy_list_iface upstream "$instance" "upstream"
+ mcproxy_list_iface downstream "$instance" "downstream"
+
+ if [ $disabled -eq 1 ]; then
+ pre="# "
+ fi
+
+ if [ ! -z $upstream ] && [ ! -z $downstream ]; then
+ echo -e "${pre}pinstance ${name}: ${upstream} ==> ${downstream};\n" >> $conf_file
+ fi
+}
+
+# mcproxy_list_table <var> <section> <option>
+mcproxy_list_table() {
+ local val
+ local len
+ local _buffer
+ local c=1
+
+ config_get len "$2" "${3}_LENGTH"
+ [ -z "$len" ] && return 0
+ while [ $c -le "$len" ]; do
+ config_get val "$2" "${3}_ITEM$c"
+ append _buffer "\t${val}\n"
+ c="$(($c + 1))"
+ done
+
+ export "${1}=${_buffer}";
+}
+
+mcproxy_handle_tables() {
+ local table="$1"
+ local conf_file="$2"
+ local table_name
+ local table_entries
+
+ config_get table_name "$table" "name" ""
+ mcproxy_list_table table_entries "$table" "entries"
+
+ if [ ! -z $name ] && [ ! -z $table ]; then
+ echo -e "table $table_name {\n" >> $conf_file
+ echo -e "$table_entries\n" >> $conf_file
+ echo -e "};\n" >> $conf_file
+ fi
+}
+
+mcproxy_handle_behaviour() {
+ local behaviour="$1"
+ local conf_file="$2"
+ local disabled
+ local pre=""
+ local instance
+ local section
+ local interface
+ local direction
+ local rulematching
+ local table
+
+ config_get_bool disabled "$behaviour" 'disabled' '0'
+ config_get instance "$behaviour" "instance"
+ config_get section "$behaviour" "section" "upstream"
+ config_get interface "$behaviour" "interface" "*"
+ config_get direction "$behaviour" "direction" "in"
+ config_get rulematching "$behaviour" "rulematching"
+ config_get table "$behaviour" "table"
+
+ if [ -z $instance ]; then
+ return 1
+ fi
+
+ local rule_table
+ if [ ! -z $rulematching ]; then
+ rule_table="rulematching $rulematching"
+ elif [ ! -z $table ]; then
+ local whitelist
+ local list
+
+ config_get_bool whitelist "$behaviour" 'whitelist' '0'
+ if [ $whitelist -eq 1 ]; then
+ list="whitelist"
+ else
+ list="blacklist"
+ fi
+
+ rule_table="$list table $table"
+ else
+ rule_table="rulematching all"
+ fi
+
+ if [ $disabled -eq 1 ]; then
+ pre="# "
+ fi
+
+ echo -e "${pre}pinstance $instance $section $interface $direction $rule_table;\n" >> $conf_file
+}
+
+start_instance() {
+ local cfg="$1"
+ local aux
+ local conf_file
+
+ config_get_bool aux "$cfg" 'disabled' '0'
+ [ "$aux" = 1 ] && return 1
+
+ config_get conf_file "$cfg" "file"
+ if [ ! -n "$conf_file" ]; then
+ conf_file="/var/etc/mcproxy_${cfg}.conf"
+
+ local protocol
+ config_get protocol "$cfg" "protocol" "IGMPv3"
+ echo -e "protocol ${protocol};\n" > $conf_file
+
+ config_foreach mcproxy_handle_instances instance $conf_file
+ config_foreach mcproxy_handle_tables table $conf_file
+ config_foreach mcproxy_handle_behaviour behaviour $conf_file
+ fi
+
procd_open_instance
procd_set_param command /usr/sbin/mcproxy
- procd_append_param command -f /etc/mcproxy.conf
+ procd_append_param command -f $conf_file
+
+ config_get_bool aux "$cfg" 'respawn' '0'
+ [ "$aux" = 1 ] && procd_set_param respawn
- procd_set_param respawn
procd_close_instance
}
+
+service_triggers() {
+ procd_add_reload_trigger "mcproxy"
+}
+
+start_service() {
+ config_load mcproxy
+ config_foreach start_instance mcproxy
+}
--- /dev/null
+--- a/mcproxy/src/utils/mc_socket.cpp
++++ b/mcproxy/src/utils/mc_socket.cpp
+@@ -38,6 +38,8 @@
+ #include <unistd.h>
+
+ #ifdef __UCLIBC__
++#define IP_MULTICAST_ALL 49
++
+ #include "sourcefilter.cpp"
+ #endif /* __UCLIBC__ */
+
include $(TOPDIR)/rules.mk
PKG_NAME:=minimalist-pcproxy
-PKG_SOURCE_VERSION:=9e41b6b698ff719960299711707785ffa0b250ab
-PKG_VERSION:=2014-09-02-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_SOURCE_VERSION:=2d6d1b0b0a3b79a9b4a9b0a7606a84600a967bcb
+PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://github.com/fingon/minimalist-pcproxy.git
include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd
-PKG_VERSION:=1.9
+PKG_VERSION:=1.9.20141209
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://miniupnp.free.fr/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=9151502f84f130b0ef1245ac938c33f9
+PKG_MD5SUM:=e9e53869bb725e931cae74b20d4a39be
PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
PKG_LICENSE:=BSD-3-Clause
#!/bin/sh
-if [ ! /etc/init.d/miniupnpd enabled ]
-then
- exit 0
-fi
+/etc/init.d/miniupnpd enabled || exit 0
. /lib/functions/service.sh
#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
START=95
STOP=15
+++ /dev/null
-From 27d4d10a3ed3a4d87941247ed73bcb67c68b2bb9 Mon Sep 17 00:00:00 2001
-From: Thomas Bernard <miniupnp@free.fr>
-Date: Thu, 30 Oct 2014 20:37:35 +0100
-Subject: [PATCH] miniupnpd.c: fix PCP third party mode (in IPv4)
-
-fixes problem introduced in commit 16389fda3c5313bffc83fb6594f5bb5872e37e5e
----
- miniupnpd.c | 38 +++++++++++++++++++++++++++-----------
- 1 file changed, 27 insertions(+), 11 deletions(-)
-
-diff --git a/miniupnpd.c b/miniupnpd.c
-index 6468075..06bcae2 100644
---- a/miniupnpd.c
-+++ b/miniupnpd.c
-@@ -2133,30 +2133,46 @@ main(int argc, char * * argv)
- msg_buff, sizeof(msg_buff));
- if (len < 1)
- continue;
-+#ifdef ENABLE_PCP
-+ if (msg_buff[0]==0) { /* version equals to 0 -> means NAT-PMP */
-+ /* Check if the packet is coming from a LAN to enforce RFC6886 :
-+ * The NAT gateway MUST NOT accept mapping requests destined to the NAT
-+ * gateway's external IP address or received on its external network
-+ * interface. Only packets received on the internal interface(s) with a
-+ * destination address matching the internal address(es) of the NAT
-+ * gateway should be allowed. */
-+ /* TODO : move to ProcessIncomingNATPMPPacket() ? */
-+ lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
-+ if(lan_addr == NULL) {
-+ char sender_str[64];
-+ sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
-+ syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
-+ sender_str);
-+ continue;
-+ }
-+ ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
-+ &senderaddr);
-+ } else { /* everything else can be PCP */
-+ ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
-+ (struct sockaddr *)&senderaddr, NULL);
-+ }
-+
-+#else
- /* Check if the packet is coming from a LAN to enforce RFC6886 :
- * The NAT gateway MUST NOT accept mapping requests destined to the NAT
- * gateway's external IP address or received on its external network
- * interface. Only packets received on the internal interface(s) with a
- * destination address matching the internal address(es) of the NAT
- * gateway should be allowed. */
-+ /* TODO : move to ProcessIncomingNATPMPPacket() ? */
- lan_addr = get_lan_for_peer((struct sockaddr *)&senderaddr);
- if(lan_addr == NULL) {
- char sender_str[64];
- sockaddr_to_string((struct sockaddr *)&senderaddr, sender_str, sizeof(sender_str));
-- syslog(LOG_WARNING, "NAT-PMP/PCP packet sender %s not from a LAN, ignoring",
-+ syslog(LOG_WARNING, "NAT-PMP packet sender %s not from a LAN, ignoring",
- sender_str);
- continue;
- }
--#ifdef ENABLE_PCP
-- if (msg_buff[0]==0) { /* version equals to 0 -> means NAT-PMP */
-- ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len,
-- &senderaddr);
-- } else { /* everything else can be PCP */
-- ProcessIncomingPCPPacket(snatpmp[i], msg_buff, len,
-- (struct sockaddr *)&senderaddr, NULL);
-- }
--
--#else
- ProcessIncomingNATPMPPacket(snatpmp[i], msg_buff, len, &senderaddr);
- #endif
- }
---
-2.1.0
-
include $(TOPDIR)/rules.mk
PKG_NAME:=ohybridproxy
-PKG_SOURCE_VERSION:=ab6559bd5df88967e08478ab486b307c1b7eb759
-PKG_VERSION:=2014-09-29-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=f2ba152799c481471ddc0213b3f98b1c143d97a3
+PKG_VERSION:=2015-01-12-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
include $(TOPDIR)/rules.mk
PKG_NAME:=olsrd
-PKG_VERSION:=0.6.7.1
-PKG_RELEASE:=5
+PKG_VERSION:=0.6.8
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
-PKG_MD5SUM:=d4411d4ed94b399a3778b8036dee1214
+PKG_MD5SUM:=feabdd611391dcb30af5795e834cc258
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=BSD-3-Clause
validate_olsrd_option() {
local str="$1"
- [ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z./|:_-]*}" ] && return 1
+ [ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z.%/|:_-]*}" ] && return 1
return 0
}
PKG_NAME:=quagga
PKG_VERSION:=0.99.22.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MD5SUM:=03ef24a448be47beba80efa2152f8a28
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--- /dev/null
+--- a/vtysh/vtysh.c
++++ b/vtysh/vtysh.c
+@@ -2211,9 +2211,9 @@
+ vtysh_readline_init (void)
+ {
+ /* readline related settings. */
+- rl_bind_key ('?', (Function *) vtysh_rl_describe);
++ rl_bind_key ('?', (rl_command_func_t *) vtysh_rl_describe);
+ rl_completion_entry_function = vtysh_completion_entry_function;
+- rl_attempted_completion_function = (CPPFunction *)new_completion;
++ rl_attempted_completion_function = (rl_completion_func_t *) new_completion;
+ /* do not append space after completion. It will be appended
+ * in new_completion() function explicitly. */
+ rl_completion_append_character = '\0';
+
projects / feed / routing.git / commitdiff