diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/olsrd/patches | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/olsrd/patches')
| -rw-r--r-- | package/olsrd/patches/patch-Makefile | 6 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-make_Makefile_linux | 6 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-src_unix_ifnet_c | 13 |
3 files changed, 19 insertions, 6 deletions
diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile index bfbc2e26f..1e0318707 100644 --- a/package/olsrd/patches/patch-Makefile +++ b/package/olsrd/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- olsrd-0.5.6-r2.orig/Makefile 2008-10-03 14:45:06.000000000 +0200 -+++ olsrd-0.5.6-r2/Makefile 2009-06-13 14:02:52.000000000 +0200 -@@ -143,7 +143,7 @@ rpm: +--- olsrd-0.6.0.orig/Makefile 2010-05-13 12:52:55.000000000 +0200 ++++ olsrd-0.6.0/Makefile 2010-10-10 14:34:11.000000000 +0200 +@@ -144,7 +144,7 @@ rpm: # This is quite ugly but at least it works ifeq ($(OS),linux) diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux index 5099a3d83..d3ca1cdee 100644 --- a/package/olsrd/patches/patch-make_Makefile_linux +++ b/package/olsrd/patches/patch-make_Makefile_linux @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- olsrd-0.5.6-r2.orig/make/Makefile.linux 2008-10-03 14:45:07.000000000 +0200 -+++ olsrd-0.5.6-r2/make/Makefile.linux 2009-06-13 14:10:25.000000000 +0200 +--- olsrd-0.6.0.orig/make/Makefile.linux 2010-03-31 19:03:53.000000000 +0200 ++++ olsrd-0.6.0/make/Makefile.linux 2010-10-10 14:34:11.000000000 +0200 @@ -4,7 +4,7 @@ ARCH := $(shell uname -m) @@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ SRCS += $(wildcard src/linux/*.c src/unix/*.c) HDRS += $(wildcard src/linux/*.h src/unix/*.h) -@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux +@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU LIBS += PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) diff --git a/package/olsrd/patches/patch-src_unix_ifnet_c b/package/olsrd/patches/patch-src_unix_ifnet_c new file mode 100644 index 000000000..67705012b --- /dev/null +++ b/package/olsrd/patches/patch-src_unix_ifnet_c @@ -0,0 +1,13 @@ +--- olsrd-0.6.0.orig/src/unix/ifnet.c 2010-04-22 17:11:11.000000000 +0200 ++++ olsrd-0.6.0/src/unix/ifnet.c 2010-10-10 14:34:54.000000000 +0200 +@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb + struct ifreq ifr; + union olsr_ip_addr null_addr; + size_t name_size; +-#ifdef linux + int precedence = IPTOS_PREC(olsr_cnf->tos); + int tos_bits = IPTOS_TOS(olsr_cnf->tos); +-#endif + + if (iface->host_emul) + return -1; |