diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/package/olsrd-luci/Makefile | 20 | ||||
| -rwxr-xr-x | contrib/package/olsrd-luci/files/etc/init.d/olsrd | 2 | ||||
| -rw-r--r-- | contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch | 12 |
3 files changed, 23 insertions, 11 deletions
diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index a9e0f40c3..c94249ca3 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -11,19 +11,19 @@ include $(TOPDIR)/rules.mk PKG_BASENAME:=olsrd PKG_NAME:=$(PKG_BASENAME)-luci -PKG_VERSION:=0.5.6-r3 +PKG_VERSION:=0.5.6-r3+hg2127 PKG_RELEASE:=1 -#PKG_HGREV:=913b11abf7f1 -#PKG_SOURCE:=$(PKG_HGREV).tar.gz -#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive -#PKG_MD5SUM:=7cbdbefe66441b70f9b7aec88abb804a -#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_HGREV) +PKG_HGREV:=913b11abf7f1 +PKG_SOURCE:=$(PKG_HGREV).tar.gz +PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive +PKG_MD5SUM:=7cbdbefe66441b70f9b7aec88abb804a +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_HGREV) -PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 -PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION) +#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2 +#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 +#PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2 +#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/contrib/package/olsrd-luci/files/etc/init.d/olsrd b/contrib/package/olsrd-luci/files/etc/init.d/olsrd index aa2950acd..b90c3b993 100755 --- a/contrib/package/olsrd-luci/files/etc/init.d/olsrd +++ b/contrib/package/olsrd-luci/files/etc/init.d/olsrd @@ -7,7 +7,7 @@ BIN=/usr/sbin/olsrd CONF=/var/etc/olsrd.conf PID=/var/run/olsrd.pid -OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 IpVersion=4 AllowNoInt:bool=1 Pollrate=0.025 TcRedundancy=2 MprCoverage=3 LinkQualityFishEye=1 LinkQualityWinSize=100 LinkQualityDijkstraLimit=0+9.0 LinkQualityLevel=2 UseHysteresis:bool=0 FIBMetric=flat ClearScreen:bool=1 Willingness=3 LinkQualityAging=0.1 LinkQualityAlgorithm=etx_fpm' +OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 IpVersion=4 AllowNoInt:bool=1 Pollrate=0.025 TcRedundancy=2 MprCoverage=3 LinkQualityFishEye=1 LinkQualityDijkstraLimit=0+9.0 FIBMetric=flat ClearScreen:bool=1 Willingness=3 LinkQualityAging=0.1 LinkQualityAlgorithm=etx_fpm' OLSRD_IPCCONNECT_SCHEMA='ignore:internal Host:list Net:list2' OLSRD_LOADPLUGIN_SCHEMA='ignore:internal library:internal Host:list Net:list2 Ping:list redistribute:list NonOlsrIf:list name:list lat lon latlon_infile HNA:list2 hosts:list2' OLSRD_INTERFACE_SCHEMA='ignore:internal interface:internal AutoDetectChanges:bool Ip4Broadcast HelloInterval=2.0 HelloValidityTime=40.0 TcInterval=5.0 TcValidityTime=100.0 MidInterval=18.0 MidValidityTime=324.0 HnaInterval=18.0 HnaValidityTime=108.0' diff --git a/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch b/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch new file mode 100644 index 000000000..6c8bff26d --- /dev/null +++ b/contrib/package/olsrd-luci/patches/010-olsrd-ip6addr.patch @@ -0,0 +1,12 @@ +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; + } |