luci-0.9: merge r5530

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 5032b0127a619e1791ec57f59ced290255866dd4..95f74c72e05ec060483eb97212f38a0c79adfeab 100644 (file)
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,23 +11,23 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_BASEVER:=0.5.6-r6
+PKG_BASEVER:=0.5.6-r7
 PKG_RELEASE:=1
 
-PKG_HGREV:=438bd63a1ab8
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
-PKG_MD5SUM:=18cfb6afd823daa29dee8375223201d2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
-PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-PKG_VERSION:=$(PKG_BASEVER)+$(PKG_HGREV)+luci1
-
-#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_BASEVER).tar.bz2
-#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
-#PKG_MD5SUM:=57a365750457e13e2e1a5c7963b1d344
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_BASEVER)
-#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
-#PKG_VERSION:=$(PKG_BASEVER)+luci1
+#PKG_HGREV:=438bd63a1ab8
+#PKG_SOURCE:=$(PKG_HGREV).tar.gz
+#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
+#PKG_MD5SUM:=18cfb6afd823daa29dee8375223201d2
+#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
+#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+#PKG_VERSION:=$(PKG_BASEVER)+$(PKG_HGREV)+luci1
+
+PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_BASEVER).tar.bz2
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=dde8cb45a10f0cad2010ab2e8ad55146
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_BASEVER)
+PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+PKG_VERSION:=$(PKG_BASEVER)+luci1
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch b/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
index d27a5feea40b4adf11237a3d730eb05b33ce1a41..3c3dabd9ba6919f18bd46528ca2f9084eaa16765 100644 (file)
--- a/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
+++ b/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
@@ -966,7 +966,7 @@
  }
  
  /*
-@@ -399,7 +405,11 @@
+@@ -385,7 +391,11 @@
   * @return pointer to hello_neighbor
   */
  struct hello_neighbor *
@@ -978,7 +978,7 @@
  {
    struct hello_neighbor *h;
  
-@@ -421,7 +431,11 @@
+@@ -407,7 +417,11 @@
   * @return pointer to tc_mpr_addr
   */
  struct tc_mpr_addr *
@@ -990,7 +990,7 @@
  {
    struct tc_mpr_addr *t;
  
-@@ -443,7 +457,11 @@
+@@ -429,7 +443,11 @@
   * @return pointer to lq_hello_neighbor
   */
  struct lq_hello_neighbor *
@@ -1002,7 +1002,7 @@
  {
    struct lq_hello_neighbor *h;
  
-@@ -465,7 +483,11 @@
+@@ -451,7 +469,11 @@
   * @return pointer to link_entry
   */
  struct link_entry *
@@ -1024,7 +1024,7 @@
  #include "tc_set.h"
  #include "link_set.h"
  #include "olsr_spf.h"
-@@ -212,6 +213,7 @@
+@@ -228,6 +229,7 @@
  
    return buffer->buf;
  }
@@ -1042,7 +1042,7 @@
  #ifndef LQ_PLUGIN_DEFAULT_H_
  #define LQ_PLUGIN_DEFAULT_H_
  
-@@ -75,6 +76,7 @@
+@@ -57,6 +58,7 @@
  extern struct lq_handler lq_etx_float_handler;
  
  #endif /*LQ_PLUGIN_DEFAULT_H_ */
@@ -1060,7 +1060,7 @@
  #include "tc_set.h"
  #include "link_set.h"
  #include "lq_plugin.h"
-@@ -223,6 +224,7 @@
+@@ -239,6 +240,7 @@
    snprintf(buffer->buf, sizeof(buffer->buf), "%.3f", (float)(cost) / LQ_FPM_LINKCOST_MULTIPLIER);
    return buffer->buf;
  }
@@ -1078,7 +1078,7 @@
  #ifndef LQ_ETX_FPM_
  #define LQ_ETX_FPM_
  
-@@ -79,6 +80,7 @@
+@@ -61,6 +62,7 @@
  extern struct lq_handler lq_etx_fpm_handler;
  
  #endif /*LQ_ETX_FPM_ */
@@ -1497,7 +1497,7 @@
   * Local Variables:
 --- a/src/process_routes.c
 +++ b/src/process_routes.c
-@@ -159,6 +159,7 @@
+@@ -158,6 +158,7 @@
  static void
  olsr_delete_kernel_route(struct rt_entry *rt)
  {
@@ -1505,7 +1505,7 @@
    if (!olsr_cnf->host_emul) {
      int16_t error = olsr_cnf->ip_version == AF_INET ? olsr_delroute_function(rt) : olsr_delroute6_function(rt);
  
-@@ -170,6 +171,12 @@
+@@ -169,6 +170,12 @@
        olsr_syslog(OLSR_LOG_ERR, "Delete route %s: %s", routestr, err_msg);
      }
    }
@@ -1518,7 +1518,7 @@
  }
  
  /**
-@@ -181,6 +188,7 @@
+@@ -180,6 +187,7 @@
  olsr_add_kernel_route(struct rt_entry *rt)
  {
  
@@ -1526,7 +1526,7 @@
    if (!olsr_cnf->host_emul) {
      int16_t error = (olsr_cnf->ip_version == AF_INET) ? olsr_addroute_function(rt) : olsr_addroute6_function(rt);
  
-@@ -199,6 +207,14 @@
+@@ -198,6 +206,14 @@
        rt->rt_metric = rt->rt_best->rtp_metric;
      }
    }
@@ -1541,9 +1541,9 @@
  }
  
  /**
-@@ -388,9 +404,11 @@
-   /* route additions */
-   olsr_add_kernel_routes(&add_kernel_list);
+@@ -348,9 +364,11 @@
+   /* route changes */
+   olsr_chg_kernel_routes(&chg_kernel_list);
  
 -#if DEBUG
 +#ifndef SVEN_OLA_UNBLOAT