diff options
| -rw-r--r-- | contrib/package/olsrd-luci/Makefile | 8 | ||||
| -rw-r--r-- | contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch | 12 | ||||
| -rw-r--r-- | contrib/package/olsrd-luci/patches/011-olsrd-ip6addr-2.patch | 20 |
3 files changed, 4 insertions, 36 deletions
diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index b793b3811..de85d8ab5 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 Freifunk Leipzig +# Copyright (C) 2008-2009 Freifunk Leipzig # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,13 +11,13 @@ include $(TOPDIR)/rules.mk PKG_BASENAME:=olsrd PKG_NAME:=$(PKG_BASENAME)-luci -PKG_VERSION:=0.5.6-r3+hg2127 +PKG_VERSION:=0.5.6-r3+hg2131 PKG_RELEASE:=2 -PKG_HGREV:=913b11abf7f1 +PKG_HGREV:=26d021f68c49 PKG_SOURCE:=$(PKG_HGREV).tar.gz PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive -PKG_MD5SUM:=7cbdbefe66441b70f9b7aec88abb804a +PKG_MD5SUM:=db07cbbdff1c97ff4045cd4f5716be2e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_HGREV) #PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2 diff --git a/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch b/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch deleted file mode 100644 index 6c8bff26d..000000000 --- a/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN olsrd-913b11abf7f1.orig/src/linux/net.c olsrd-913b11abf7f1/src/linux/net.c ---- olsrd-913b11abf7f1.orig/src/linux/net.c 2008-12-27 10:41:08.000000000 +0100 -+++ olsrd-913b11abf7f1/src/linux/net.c 2008-12-28 22:05:51.000000000 +0100 -@@ -678,7 +678,7 @@ - OLSR_PRINTF(4, "Found addr: %s:%s:%s:%s:%s:%s:%s:%s\n", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); -- inet_pton(AF_INET6, addr6, saddr6); -+ inet_pton(AF_INET6, addr6, &saddr6->sin6_addr); - rv = 1; - break; - } diff --git a/contrib/package/olsrd-luci/patches/011-olsrd-ip6addr-2.patch b/contrib/package/olsrd-luci/patches/011-olsrd-ip6addr-2.patch deleted file mode 100644 index 6df24ba78..000000000 --- a/contrib/package/olsrd-luci/patches/011-olsrd-ip6addr-2.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urb olsrd-913b11abf7f1.orig/src/unix/ifnet.c olsrd-913b11abf7f1/src/unix/ifnet.c ---- olsrd-913b11abf7f1.orig/src/unix/ifnet.c 2008-12-29 17:41:41.000000000 +0100 -+++ olsrd-913b11abf7f1/src/unix/ifnet.c 2008-12-29 17:43:53.000000000 +0100 -@@ -214,13 +214,13 @@ - } - - #ifdef DEBUG -- OLSR_PRINTF(3, "\tAddress: %s\n", ip6_to_string(&buf, &tmp_saddr6.sin6_addr)); -+ OLSR_PRINTF(3, "\tAddress: %s\n", ip6_to_string(&buf, &tmp_saddr6)); - #endif - - if (ip6equal(&tmp_saddr6.sin6_addr, &ifp->int6_addr.sin6_addr)) { - OLSR_PRINTF(1, "New IP address for %s:\n", ifr.ifr_name); -- OLSR_PRINTF(1, "\tOld: %s\n", ip6_to_string(&buf, &ifp->int6_addr.sin6_addr)); -- OLSR_PRINTF(1, "\tNew: %s\n", ip6_to_string(&buf, &tmp_saddr6.sin6_addr)); -+ OLSR_PRINTF(1, "\tOld: %s\n", ip6_to_string(&buf, &ifp->int6_addr)); -+ OLSR_PRINTF(1, "\tNew: %s\n", ip6_to_string(&buf, &tmp_saddr6)); - - /* Check main addr */ - if (ip6equal(&olsr_cnf->main_addr.v6, &tmp_saddr6.sin6_addr)) { |