diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2008-11-26 16:24:28 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2008-11-26 16:24:28 +0000 |
| commit | a430b5c189bb5a19d9d69765750e55efb035e33c (patch) | |
| tree | 0f166b503b8ef2e29629b9f528b1cfd704f2c76a /contrib | |
| parent | 4309506817979b8bf397590af45c99df0568e2ec (diff) | |
contrib/package: bump olsrd to hg rev cac1df64dcd5, should fix compat issues with older olsrd versions
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/package/olsrd-luci/Makefile | 20 | ||||
| -rw-r--r-- | contrib/package/olsrd-luci/patches/200-olsrd-dyngw-hna.patch | 14 |
2 files changed, 13 insertions, 21 deletions
diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index d6235987a..8e22a7448 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -11,13 +11,19 @@ include $(TOPDIR)/rules.mk PKG_BASENAME:=olsrd PKG_NAME:=$(PKG_BASENAME)-luci -PKG_VERSION:=0.5.6-r2 -PKG_RELEASE:=7 - -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:=64b439cde30f48764f02cdd8766aba40 +PKG_VERSION:=0.5.6-r2+hg1724 +PKG_RELEASE:=1 + +PKG_HGREV:=cac1df64dcd5 +PKG_SOURCE:=$(PKG_HGREV).tar.gz +PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive +PKG_MD5SUM:=95af2d8d6075f74d379b752fb8dda3de +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-0-5-6-$(PKG_HGREV) + +#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2 +#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 +#PKG_MD5SUM:=64b439cde30f48764f02cdd8766aba40 +#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/contrib/package/olsrd-luci/patches/200-olsrd-dyngw-hna.patch b/contrib/package/olsrd-luci/patches/200-olsrd-dyngw-hna.patch deleted file mode 100644 index 8b4e9c408..000000000 --- a/contrib/package/olsrd-luci/patches/200-olsrd-dyngw-hna.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urb olsrd-0.5.6.orig/lib/dyn_gw/src/olsrd_dyn_gw.c olsrd-0.5.6/lib/dyn_gw/src/olsrd_dyn_gw.c ---- olsrd-0.5.6.orig/lib/dyn_gw/src/olsrd_dyn_gw.c 2008-09-16 01:14:44.000000000 +0200 -+++ olsrd-0.5.6/lib/dyn_gw/src/olsrd_dyn_gw.c 2008-09-16 01:26:55.000000000 +0200 -@@ -191,8 +191,8 @@ - } - - //printf("GOT: %s(%08x)",inet_ntoa(foo_addr),foo_addr.s_addr); -- if (inet_pton(olsr_cnf->ip_version, s_netaddr, &temp_netmask) <= 0) { -- OLSR_PRINTF(0, "Illegal netmask \"%s\"", s_netaddr); -+ if (inet_pton(olsr_cnf->ip_version, s_mask, &temp_netmask) <= 0) { -+ OLSR_PRINTF(0, "Illegal netmask \"%s\"", s_mask); - return 1; - } - |