merge of '08199c52a592fe71e2675200cf618a439d710884'

     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'

10 files changed, 94 insertions, 426 deletions

diff --git a/packages/olsrd/files/0.4.9-httpinfo-makefile.diff b/packages/olsrd/files/0.4.9-httpinfo-makefile.diff
deleted file mode 100644
index d4058f5b30..0000000000
--- a/packages/olsrd/files/0.4.9-httpinfo-makefile.diff
+++ /dev/null
@@ -1,296 +0,0 @@
---- olsrd-0.4.9/lib/httpinfo/Makefile.orig	2005-03-31 19:11:52.000000000 +0200
-+++ olsrd-0.4.9/lib/httpinfo/Makefile	2005-04-25 13:42:11.000000000 +0200
-@@ -1,103 +1,223 @@
--#######################################
--# HTTPINFO PLUGIN BY ANDREAS TØNNESEN #
--#######################################
-+# The olsr.org Optimized Link-State Routing daemon(olsrd)
-+# Copyright (c) 2004, Andreas Tønnesen(andreto@olsr.org)
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without 
-+# modification, are permitted provided that the following conditions 
-+# are met:
-+#
-+# * Redistributions of source code must retain the above copyright 
-+#   notice, this list of conditions and the following disclaimer.
-+# * Redistributions in binary form must reproduce the above copyright 
-+#   notice, this list of conditions and the following disclaimer in 
-+#   the documentation and/or other materials provided with the 
-+#   distribution.
-+# * Neither the name of olsr.org, olsrd nor the names of its 
-+#   contributors may be used to endorse or promote products derived 
-+#   from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-+# POSSIBILITY OF SUCH DAMAGE.
-+#
-+# Visit http://www.olsr.org for more information.
-+#
-+# If you find this software useful feel free to make a donation
-+# to the project. For more information see the website or contact
-+# the copyright holders.
-+#
-+# $Id: Makefile,v 1.20 2005/04/25 11:36:23 br1 Exp $
- 
-+PLUGIN_NAME =	olsrd_httpinfo
-+PLUGIN_VER =	0.1
- 
- CC ?= gcc
- STRIP ?= strip
--LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
--PLUGINFLAGS =  -fPIC -DOLSR_PLUGIN -I../../src
-+
-+# default CFLAGS and LDFLAGS, used if not externally set
-+
-+# used for compilation: yes
-+# used for dependency file generation: no
-+
-+CFLAGS_SET =	-g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes
-+LDFLAGS_SET =	-g
-+
-+# always appended to default or externally set CFLAGS and LDFLAGS
-+
-+# used for compilation: yes
-+# used for dependency file generation: yes
-+
-+CFLAGS_ADD =	-DOLSR_PLUGIN -I../../src
-+LDFLAGS_ADD =	-Wall -shared -Wl,--version-script=version-script.txt
-+
-+# same as CFLAGS_ADD, but not used for dependency file generation
-+
-+# used for compilation: yes
-+# used for dependency file generation: no
-+
-+CFLAGS_ADD2 =	# nothing
-+
-+DEPFILE =	.depend
-+
-+SRCS =		$(wildcard src/*.c)
-+OBJS =		$(patsubst %.c,%.o,$(SRCS))
-+HDRS =		$(wildcard src/*.c)
-+
-+ifndef OS
-+all:		help
-+install:	help
-+clean:		help
-+endif
- 
- ifeq ($(OS), linux)
--NAME ?= olsrd_httpinfo.so.0.1
--NAMEFLAGS ?= -Wl,-soname,$(NAME)
--CFLAGS ?= -g -O2 -fPIC -DOLSR_PLUGIN -Dlinux -Wall -Wmissing-prototypes -Wstrict-prototypes
--LDFLAGS ?= -g -fPIC -shared
-+
-+NAME ?=		$(PLUGIN_NAME).so.$(PLUGIN_VER)
-+
-+CFLAGS_ADD +=	-Dlinux
-+CFLAGS_ADD2 +=	-fPIC
-+LDFLAGS_ADD +=	-fPIC -Wl,-soname,$(NAME)
-+
-+CFLAGS_SET +=	# nothing
-+LDFLAGS_SET +=	# nothing
-+
- LIBS ?= -lc -lm
--INSTALL_LIB = 	install -D -m 755 $(NAME) $(LIBDIR)/$(NAME);\
-+
-+LIBDIR ?=	$(INSTALL_PREFIX)/usr/lib
-+
-+INSTALL_LIB =	install -D -m 755 $(NAME) $(LIBDIR)/$(NAME); \
- 		/sbin/ldconfig -n $(LIBDIR)
--all:		plugin
--install:        install_olsrd
--else
--ifeq ($(OS), win32)
--NAME ?= olsrd_httpinfo.dll
--NAMEFLAGS ?= -o $(NAME)
--CFLAGS ?= -g -O2 -fPIC -DWIN32 -mno-cygwin -I../../src/win32 -Wall -Wmissing-prototypes -Wstrict-prototypes
--LDFLAGS ?= -mno-cygwin -shared
--LIBS ?= -lws2_32
--COMPATOBJ = ../../src/win32/compat.o
--INSTALL_LIB = 	cp $(NAME) ../..
--all:		plugin
--install:        install_olsrd
-+
-+EXTRA_OBJS =	# nothing
-+
-+MAKEDEPEND = 	makedepend -f $(DEPFILE) $(CFLAGS_ADD) -Y $(INCLUDES) \
-+		$(SRCS) >/dev/null 2>&1
-+
-+all:		all2
-+install:	install2
-+clean:		clean2
-+
- else
- ifeq ($(OS), fbsd)
--NAME ?= olsrd_httpinfo.so.0.1
--NAMEFLAGS ?= -Wl,-soname,$(NAME)
--CFLAGS ?= -g -O2 -fPIC -Wall -Wmissing-prototypes -Wstrict-prototypes
--LDFLAGS ?= -g -fPIC -shared
-+
-+NAME ?=		$(PLUGIN_NAME).so.$(PLUGIN_VER)
-+
-+CFLAGS_ADD +=	# nothing
-+CFLAGS_ADD2 +=	-fPIC
-+LDFLAGS_ADD +=	-fPIC -Wl,-soname,$(NAME)
-+
-+CFLAGS_SET +=	# nothing
-+LDFLAGS_SET +=	# nothing
-+
- LIBS ?= -lc -lm
--INSTALL_LIB = 	install -m 755 $(NAME) $(LIBDIR)/$(NAME);\
-+
-+LIBDIR ?=	$(INSTALL_PREFIX)/usr/lib
-+
-+INSTALL_LIB =	install -m 755 $(NAME) $(LIBDIR)/$(NAME); \
- 		/sbin/ldconfig
--all:		plugin
--install:        install_olsrd
-+
-+EXTRA_OBJS =	# nothing
-+
-+MAKEDEPEND = 	makedepend -f $(DEPFILE) $(CFLAGS_ADD) $(INCLUDES) $(SRCS)
-+
-+all:		all2
-+install:	install2
-+clean:		clean2
-+
- else
-+ifeq ($(OS), win32)
-+
-+NAME ?=		$(PLUGIN_NAME).dll
-+
-+CFLAGS_ADD +=	-mno-cygwin -I../../src/win32 -DWIN32
-+CFLAGS_ADD2 +=	# nothing
-+LDFLAGS_ADD +=	-mno-cygwin -Wl,-soname,$(NAME)
-+
-+CFLAGS_SET +=	# nothing
-+LDFLAGS_SET +=	# nothing
-+
-+LIBS ?=		-lws2_32
-+
-+INSTALL_LIB =	cp $(NAME) ../..
-+
-+EXTRA_OBJS =	../../src/win32/compat.o
-+
-+MAKEDEPEND = 	makedepend -f $(DEPFILE) $(CFLAGS_ADD) $(INCLUDES) $(SRCS)
-+
-+all:		all2
-+install:	install2
-+clean:		clean2
-+
-+else
-+
- all: 	help
--install:help
-+install:	help
-+clean:		help
-+
- endif
- endif
- endif
- 
-+EXTRA_OBJS += ../../src/cfgparser/cfgfile_gen.o
-+
- ifneq ($(ADMIN_INTERFACE), )
- 	@echo 'WARNING - BUILDING WITH ADMIN INTERFACE!'
--CFLAGS += -DADMIN_INTERFACE
-+CFLAGS_ADD += -DADMIN_INTERFACE
- endif
- 
--CFLAGS += $(PLUGINFLAGS)
--
--#Sourcefiles
--SRCS=	src/olsrd_plugin.c src/olsrd_httpinfo.c src/admin_interface.c \
--	../../src/cfgparser/cfgfile_gen.c
--
--#Objectfiles
--OBJS=	src/olsrd_plugin.o src/olsrd_httpinfo.o src/admin_interface.o \
--	../../src/cfgparser/cfgfile_gen.o
-+CFLAGS ?=	$(CFLAGS_SET)
-+LDFLAGS ?=	$(LDFLAGS_SET)
- 
--#Headerfiles
--HDRS=	src/olsrd_plugin.h src/olsrd_httpinfo.h \
--	src/gfx.h src/html.h src/admin_interface.h src/admin_html.h
-+CFLAGS		+= $(CFLAGS_ADD) $(CFLAGS_ADD2)
-+LDFLAGS		+= $(LDFLAGS_ADD)
- 
-+all2:		$(NAME)
- 
--plugin: $(OBJS)
--	$(CC) $(LDFLAGS) $(NAMEFLAGS) \
--	-Wl,--version-script=version-script.txt \
--	-o $(NAME) $(OBJS) $(COMPATOBJ) $(LIBS)
-+$(NAME):	$(OBJS) $(EXTRA_OBJS)
-+		$(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(EXTRA_OBJS) $(LIBS)
- 
--
--install_olsrd:
-+install2:	$(NAME)
- 	$(STRIP) $(NAME)
- 	$(INSTALL_LIB)
- 
-+clean2:
-+		rm -f $(OBJS) $(NAME) $(DEPFILE)
-+
-+$(DEPFILE):	$(SRCS) $(HDRS)
-+ifdef MAKEDEPEND
-+		echo "# Generated automatically. DO NOT EDIT." >$(DEPFILE)
-+		$(MAKEDEPEND)
-+endif
-+
- help:
- 	@echo
--	@echo '***** olsr.org HTTP plugin Make ****'
--	@echo ' You must provide a valid target OS '
--	@echo ' by setting the OS variable! Valid  '
--	@echo ' target OSes are:                   '
--	@echo ' ---------------------------------  '
--	@echo ' linux - GNU/Linux                  '
--	@echo ' win32 - MS Windows                 '
--	@echo ' fbsd  - FreeBSD                    '
--	@echo ' ---------------------------------  '
--	@echo ' Example - build for windows:       '
--	@echo ' make OS=win32                      '
--	@echo '************************************'
-+		@echo '                     * * * *  olsr.org Plugin Make  * * * *'
-+		@echo
-+		@echo '  Plugin: $(PLUGIN_NAME), version $(PLUGIN_VER)'
-+		@echo
-+		@echo '  You must provide a valid target OS by setting the OS variable.'
-+		@echo
-+		@echo '  Valid settings are:'
-+		@echo
-+		@echo '    linux - GNU/Linux'
-+		@echo '    win32 - Microsoft Windows'
-+		@echo '    fbsd  - FreeBSD'
-+		@echo
-+		@echo '  Example - Build on Windows:'
-+		@echo
-+		@echo '    make OS=win32'
-+		@echo
-+		@echo '  Example - Build and install on Linux:'
-+		@echo
-+		@echo '    make OS=linux install            '
- 	@echo
- 
--clean:
--	rm -f $(OBJS) $(NAME)
--
--src/olsrd_plugin.o: $(HDRS)
--
--src/olsrd_httpinfo.o: $(HDRS)
--
--src/admin_interface.o: $(HDRS)
-+sinclude $(DEPFILE)
diff --git a/packages/olsrd/files/lib.diff b/packages/olsrd/files/lib.diff
deleted file mode 100644
index f3935cc53d..0000000000
--- a/packages/olsrd/files/lib.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nurb olsrd-0.4.7/Makefile olsrd-0.4.7.ver/Makefile
---- olsrd-0.4.7/Makefile	2004-09-07 18:10:24.000000000 +0200
-+++ olsrd-0.4.7.ver/Makefile	2004-11-05 13:12:34.253350872 +0100
-@@ -57,7 +57,7 @@
- 
- libs: 
- 	for i in lib/*; do \
--		$(MAKE) -C $$i; \
-+		$(MAKE) LDFLAGS+=-Wl,--version-script=../../version.txt -C $$i; \
- 	done; 
- 
- clean_libs: 
-diff -Nurb olsrd-0.4.7/version.txt olsrd-0.4.7.ver/version.txt
---- olsrd-0.4.7/version.txt	1970-01-01 01:00:00.000000000 +0100
-+++ olsrd-0.4.7.ver/version.txt	2004-11-05 13:10:24.731041256 +0100
-@@ -0,0 +1,7 @@
-+VERS_1.0 {
-+   global:
-+        plugin_interface_version;
-+        plugin_io;
-+        register_olsr_data;
-+   local: *;
-+};
diff --git a/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch b/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch
new file mode 100644
index 0000000000..c08a49524c
--- /dev/null
+++ b/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch
@@ -0,0 +1,47 @@
+Index: olsrd-a5b9cf969979/Makefile
+===================================================================
+--- olsrd-a5b9cf969979.orig/Makefile	2008-02-06 19:32:49.000000000 +0100
++++ olsrd-a5b9cf969979/Makefile	2008-06-23 15:33:35.000000000 +0200
+@@ -95,9 +95,8 @@
+ install: install_olsrd
+ 
+ install_bin:
+-		mkdir -p $(SBINDIR)
+-		install -m 755 $(EXENAME) $(SBINDIR)
+-		$(STRIP) $(SBINDIR)/$(EXENAME)
++		mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
++		install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
+ 
+ install_olsrd:	install_bin
+ 		@echo ========= C O N F I G U R A T I O N - F I L E ============
+@@ -109,16 +108,15 @@
+ 		@echo per default.
+ 		@echo can be found at files/olsrd.conf.default.lq
+ 		@echo ==========================================================
+-		mkdir -p $(ETCDIR)
+-		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
++		mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
+ 		@echo -------------------------------------------
+ 		@echo Edit $(CFGFILE) before running olsrd!!
+ 		@echo -------------------------------------------
+ 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
+-		mkdir -p $(MANDIR)/man8/
+-		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
+-		mkdir -p $(MANDIR)/man5/
+-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
++		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
++		cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/$(EXENAME).8.gz
++		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
++		cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/$(CFGNAME).5.gz
+ 
+ tags:
+ 		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
+@@ -140,7 +138,7 @@
+ 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
+ 
+ libs_install install_libs:
+-		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
++		$(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
+ 
+ httpinfo:
+ 		$(MAKECMD) -C lib/httpinfo clean
diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
index 990d8a1678..7fd25c23dd 100644
--- a/packages/olsrd/olsrd.inc
+++ b/packages/olsrd/olsrd.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "OLSR mesh routing daemon"
 HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
 	file://init \
 	file://olsrd.conf"
 
@@ -15,28 +15,56 @@ inherit update-rc.d
 
 INITSCRIPT_NAME = "olsrd"
 INITSCRIPT_PARAMS = "defaults"
-EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
-
+EXTRA_OEMAKE = "MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
 
 do_configure() {
 	oe_runmake OS=linux clean
 }
 
 do_compile() {
-        oe_runmake 
+  oe_runmake OS=linux clean
+  touch .depend
+  touch src/cfgparser/.depend
+  oe_runmake OS=linux all libs
 }
 
 do_install () {
 	oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo install install_libs
+
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
 	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
 }
 
+PACKAGES =+ "\
+  olsrd-plugin-dyngw \
+  olsrd-plugin-dyngw-plain \
+  olsrd-plugin-httpinfo \
+  olsrd-plugin-nameservice \
+  olsrd-plugin-quagga \
+  olsrd-plugin-tas \
+  olsrd-plugin-pgraph \
+  olsrd-plugin-bmf \
+  olsrd-plugin-txtinfo \
+  olsrd-plugin-arprefresh \
+  olsrd-plugin-secure \
+  olsrd-plugin-dotdraw \
+  olsrd-plugin-mini \
+  "
 
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}/*.so.*"
-
-RDEPENDS_${PN} = "olsrd-libs"
+FILES_olsrd-plugin-dyngw = "${libdir}/${PN}_dyn_gw.so.*"
+FILES_olsrd-plugin-dyngw-plain = "${libdir}/${PN}_dyn_gw_plain.so.*"
+FILES_olsrd-plugin-httpinfo = "${libdir}/${PN}_httpinfo.so.*"
+FILES_olsrd-plugin-nameservice = "${libdir}/${PN}_nameservice.so.*"
+FILES_olsrd-plugin-quagga = "${libdir}/${PN}_quagga.so.*"
+FILES_olsrd-plugin-tas = "${libdir}/${PN}_tas.so.*"
+FILES_olsrd-plugin-pgraph = "${libdir}/${PN}_pgraph.so.*"
+FILES_olsrd-plugin-bmf = "${libdir}/${PN}_bmf.so.*"
+FILES_olsrd-plugin-txtinfo = "${libdir}/${PN}_txtinfo.so.*"
+FILES_olsrd-plugin-arprefresh = "${libdir}/${PN}_arprefresh.so.*"
+FILES_olsrd-plugin-dotdraw = "${libdir}/${PN}_dot_draw.so.*"
+FILES_olsrd-plugin-secure = "${libdir}/${PN}_secure.so.*"
+FILES_olsrd-plugin-mini = "${libdir}/${PN}_mini.so.*"
 
 CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
+
diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb
deleted file mode 100644
index 9722ca7d8d..0000000000
--- a/packages/olsrd/olsrd_0.4.10.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require olsrd.inc
-PR = "r1"
diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsrd/olsrd_0.4.8.bb
deleted file mode 100644
index 98a6344fb7..0000000000
--- a/packages/olsrd/olsrd_0.4.8.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
-	file://init \
-	file://olsrd.conf"
-
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
-S = "${WORKDIR}/olsrd-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-
-do_compile() {
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux all libs
-}
-
-do_install () {
-	oe_runmake INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd
-	install -m 644 ${WORKDIR}/olsrd.conf ${D}${sysconfdir}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb
deleted file mode 100644
index 1f186f4bbb..0000000000
--- a/packages/olsrd/olsrd_0.4.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require olsrd.inc
-PR = "r2"
-
-SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
-
-do_compile() {
-	oe_runmake OS=linux clean
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux all libs
-}
diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsrd/olsrd_0.5.3.bb
index 5bc448a126..1af0f257fd 100644
--- a/packages/olsrd/olsrd_0.5.3.bb
+++ b/packages/olsrd/olsrd_0.5.3.bb
@@ -1,14 +1,6 @@
 require olsrd.inc
-PR = "r0"
 
-SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \
-        file://init \
-        file://olsrd.conf \
-        file://unbreak-makefile.patch;patch=1"
+PR = "r1"
+
+SRC_URI += "file://unbreak-makefile.patch;patch=1"
 
-do_compile() {
-	oe_runmake OS=linux clean
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux all libs
-}
diff --git a/packages/olsrd/olsrd_0.5.5.bb b/packages/olsrd/olsrd_0.5.5.bb
new file mode 100644
index 0000000000..d87197481e
--- /dev/null
+++ b/packages/olsrd/olsrd_0.5.5.bb
@@ -0,0 +1,7 @@
+require olsrd.inc
+PR = "r0"
+
+# Oddity in the 0.5.5 source tarball.
+S = "${WORKDIR}/olsrd-a5b9cf969979"
+
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;patch=1"
diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb
deleted file mode 100644
index a6d2ff7657..0000000000
--- a/packages/olsrd/olsrd_cvs.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-SRCDATE = "20051020"
-PV = "0.4.9+cvs${SRCDATE}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI="cvs://anonymous@olsrd.cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \
-	file://init \
-	file://olsrd.conf"
-
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
-S = "${WORKDIR}/olsrd-current"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-
-do_compile() {
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux clean all libs
-}
-
-do_install () {
-	oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd
-	install -m 644 ${WORKDIR}/olsrd.conf ${D}${sysconfdir}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"