First patch in a series of olsr cleanups

olsr 0.3.1: Move to obsolete/olsr
olsrd 0.4.8, 0.4.9, 0.4.10: Move to obsolete/olsr
olsrd cvs: Moved to obsolete/olsr

9 files changed, 415 insertions, 0 deletions

diff --git a/packages/obsolete/olsr/.mtn2git_empty b/packages/obsolete/olsr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/olsr/.mtn2git_empty
diff --git a/packages/obsolete/olsr/files/.mtn2git_empty b/packages/obsolete/olsr/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/olsr/files/.mtn2git_empty
diff --git a/packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff b/packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff
new file mode 100644
index 0000000000..d4058f5b30
--- /dev/null
+++ b/packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff
@@ -0,0 +1,296 @@
+--- 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/obsolete/olsr/files/lib.diff b/packages/obsolete/olsr/files/lib.diff
new file mode 100644
index 0000000000..f3935cc53d
--- /dev/null
+++ b/packages/obsolete/olsr/files/lib.diff
@@ -0,0 +1,23 @@
+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/obsolete/olsr/olsr_0.3-1.bb b/packages/obsolete/olsr/olsr_0.3-1.bb
new file mode 100644
index 0000000000..276e7b489d
--- /dev/null
+++ b/packages/obsolete/olsr/olsr_0.3-1.bb
@@ -0,0 +1,8 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DESCRIPTION = "OLSR - routing protocol for wireless network"
+PRIORITY = "optional"
+
+SRC_URI = "ftp://ftp.tcweb.org/pub/tom/olsr-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/obsolete/olsr/olsrd_0.4.10.bb b/packages/obsolete/olsr/olsrd_0.4.10.bb
new file mode 100644
index 0000000000..9722ca7d8d
--- /dev/null
+++ b/packages/obsolete/olsr/olsrd_0.4.10.bb
@@ -0,0 +1,2 @@
+require olsrd.inc
+PR = "r1"
diff --git a/packages/obsolete/olsr/olsrd_0.4.8.bb b/packages/obsolete/olsr/olsrd_0.4.8.bb
new file mode 100644
index 0000000000..c2b9c825b6
--- /dev/null
+++ b/packages/obsolete/olsr/olsrd_0.4.8.bb
@@ -0,0 +1,36 @@
+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"
+
+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"
+
+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/obsolete/olsr/olsrd_0.4.9.bb b/packages/obsolete/olsr/olsrd_0.4.9.bb
new file mode 100644
index 0000000000..1f186f4bbb
--- /dev/null
+++ b/packages/obsolete/olsr/olsrd_0.4.9.bb
@@ -0,0 +1,11 @@
+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/obsolete/olsr/olsrd_cvs.bb b/packages/obsolete/olsr/olsrd_cvs.bb
new file mode 100644
index 0000000000..a6d2ff7657
--- /dev/null
+++ b/packages/obsolete/olsr/olsrd_cvs.bb
@@ -0,0 +1,39 @@
+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"