opentechinstitute · dismantl · Sep 6, 2013
diff --git a/Makefile b/Makefile
@@ -181,6 +181,8 @@ rpm:
 # This is quite ugly but at least it works
 ifeq ($(OS),linux)
 SUBDIRS = arprefresh bmf dnssd dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns mdp mini nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog
+NO_CO_SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns mini nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog
+CO_SUBDIRS = dnssd mdp
 else
 ifeq ($(OS),win32)
 SUBDIRS := dot_draw httpinfo jsoninfo mini pgraph secure txtinfo
@@ -202,6 +204,12 @@ libs_clean clean_libs:
 libs_install install_libs:
 		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
 
+no_co_libs_install install_no_co_libs:
+		$(MAKECMDPREFIX)set -e;for dir in $(NO_CO_SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
+
+co_libs_install install_co_libs:
+		$(MAKECMDPREFIX)set -e;for dir in $(CO_SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
+
 libs_uninstall uninstall_libs:
 		$(MAKECMDPREFIX)set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
 		rmdir -p --ignore-fail-on-non-empty $(LIBDIR)

diff --git a/debian/.gitignore b/debian/.gitignore
diff --git a/debian/README.Debian b/debian/README.Debian
@@ -48,6 +48,7 @@ explained in detail in /usr/share/doc/olsrd-plugins:
 The following plugins are not included in the olsrd-plugins binary package:
 
 - quagga	- quagga plugin
+- tas		- (not at all) tiny application server, no useful apps exist
 - powerinfo	- displays /proc/apm on 127.0.0.1:8888
 - pgraph	- obsoleted by httpinfo and dot-draw
 - mini		- minimal example plugin, useful as a howto for writing plugins

diff --git a/debian/changelog b/debian/changelog
@@ -1,23 +1,133 @@
-olsrd (0.6.1-1) UNRELEASED; urgency=low
+olsrd (0.6.5.4-1) experimental; urgency=low
 
+  * Added Commotion plugins: dnssd, mdp
+
+ -- Dan Staples <danstaples@opentechinstitute.org>  Fri, 06 Sep 2013 09:58:00 -0400
+
+olsrd (0.6.5.2-1~) experimental; urgency=low
+
+  * New upstream release
+  * remove patches that have been included or obsoleted upstream
+  * update build process based on upstream changes
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Mon, 01 Apr 2013 22:39:25 -0700
+
+olsrd (0.6.3-6) unstable; urgency=low
+
+  * include upstream fix for brokenness on amd64 (Closes: #704025)
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Wed, 27 Mar 2013 14:46:23 -0700
+
+olsrd (0.6.3-5) unstable; urgency=low
+
+  * fixed build system so all hardening flags are applied
+  * fixed some lintian warnings
+  * make tas plugin build against Debian's lua rather than the lua sources
+    that are included in the olsrd orig tarball
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Fri, 05 Oct 2012 17:38:02 -0400
+
+olsrd (0.6.3-4) unstable; urgency=low
+
+  * debian/rules: Drop OS=linux from the make call, fixing FTBFS on !linux,
+    thanks to Evgeni Golov (Closes: #679761)
+
+ -- Roland Stigge <stigge@antcom.de>  Fri, 06 Jul 2012 18:58:27 +0200
+
+olsrd (0.6.3-3) unstable; urgency=low
+
+  * update broken jsoninfo plugin with patches from upstream git
+  * updated default config based on settings from funkfeuer and
+    commotionwireless.net
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Sat, 30 Jun 2012 09:57:55 -0400
+
+olsrd (0.6.3-2) unstable; urgency=low
+
+  * Re-upload to unstable
+
+ -- Roland Stigge <stigge@antcom.de>  Sun, 24 Jun 2012 18:00:24 +0200
+
+olsrd (0.6.3-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control: Standards-Version: 3.9.3
+
+ -- Roland Stigge <stigge@antcom.de>  Fri, 08 Jun 2012 12:30:36 +0200
+
+olsrd (0.6.2-2) unstable; urgency=low
+
+  * debian/control: Build-Depends: debhelper (>= 9) (Closes: #658330)
+  * Integrated patches by Hans-Christoph Steiner:
+    - Added olsrd-gui (Closes: #658329)
+    - debian/control: Recommends: olsrd-plugins (Closes: #658557)
+    - Fix *.d clean problem (Closes: #658559)
+    - Added olsr_switch (Closes: #658560)
+    - Fix conffile location to /etc/olsrd/olsrd.conf (Closes: #658561)
+
+    Thanks Hans-Christoph!
+
+ -- Roland Stigge <stigge@antcom.de>  Sun, 19 Feb 2012 16:14:34 +0100
+
+olsrd (0.6.2-1) unstable; urgency=low
+
+  * New upstream release (repackaged and cleaned from debian/ dir)
+  * Adjusted patches to upstream tarball
+  * Removing obsolete options LinkQualityDijkstraLimit and LinkQualityWinSize
+    from default configuration file (Closes: #652690)
+
+ -- Roland Stigge <stigge@antcom.de>  Sun, 01 Jan 2012 23:20:20 +0100
+
+olsrd (0.6.1-5) unstable; urgency=low
+
+  * dh style debian/rules
+  * debian/compat: 9, exports dpkg-buildflags (Closes: #643472)
+
+ -- Roland Stigge <stigge@antcom.de>  Sun, 02 Oct 2011 14:59:17 +0200
+
+olsrd (0.6.1-4) unstable; urgency=low
+
+  * Added debian/watch
+
+ -- Roland Stigge <stigge@antcom.de>  Mon, 01 Aug 2011 21:54:18 +0200
+
+olsrd (0.6.1-3) unstable; urgency=low
+
+  * Added armv7l to arch list for -fPIC in make/Makefile.linux
+    (Closes: #636205)
+
+ -- Roland Stigge <stigge@antcom.de>  Mon, 01 Aug 2011 21:23:31 +0200
+
+olsrd (0.6.1-2) unstable; urgency=low
+
+  * Add patch to upstream to add mips and mips64 to -fPIC arch list
+    (fixes FTBFS on mips*)
+
+ -- Roland Stigge <stigge@antcom.de>  Sat, 07 May 2011 13:11:27 +0200
+
+olsrd (0.6.1-1) unstable; urgency=low
+
+  [ Holger Levsen ]
   * New upstream version with quite some fixes and new features, see upstream
     changelog for details. Quoting from there:
      Change in version number system. No more -rcX for release candidates and
      -rX for bugfix releases. In future bugfix releases or updates of plugins
      will increase the third digit of the version string while feature 
      releases will increase the first and/or the second one.
-   Removed the following patches from series trying to make it build again:
-   - 100-debug_level.patch
-   - 240-plugin-install-targets.patch
-   - 260-quagga-plugin-detect-protocol-version.patch
-   - 270-make-kfbsd.patch
-
-  THIS IS WORK IN PROGRESS and needs checking whether those patches are still
-  needed. Also 0.6.1 is out.
-
-  * Update package description, OLSR is no experimental protocol anymore. 
-
- -- Holger Levsen <holger@debian.org>  Fri, 21 May 2010 23:47:52 +0200
+  * Update package description, OLSR is no experimental protocol anymore.
+
+  [ Roland Stigge ]
+  * New maintainer (Closes: #612277)
+  * Adjusted debian patches to work with 0.6.1
+  * debian/control:
+    - Standards-Version: 3.9.2
+    - Build-Depends: debhelper (>=8)
+  * Debian source format: 3.0 (quilt)
+  * Included remaining plugins
+  * New upstream version works with newer kernels (Closes: #605296)
+  * New upstream version fixes memory leak (Closes: #605295)
+
+ -- Roland Stigge <stigge@antcom.de>  Tue, 03 May 2011 15:30:56 +0200
 
 olsrd (0.5.6-r8-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
@@ -1,16 +1,26 @@
 Source: olsrd
 Section: net
 Priority: extra
-Maintainer: Holger Levsen <holger@debian.org>
-Build-Depends: debhelper (>= 5), quilt, bison, flex
-Standards-Version: 3.8.3
+Maintainer: Dan Staples <danstaples@opentechinstitute.org>
+Uploaders: Dan Staples <danstaples@opentechinstitute.org>
+Build-Depends: debhelper (>= 9),
+               bison,
+               flex,
+               pkg-config,
+               libgtk2.0-dev,
+               python-gtk2-dev,
+               liblua50-dev,
+               serval-dna,
+               libldns-dev
+Standards-Version: 3.9.4
 Homepage: http://olsr.org/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/olsrd/
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/olsrd/
 
 Package: olsrd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: olsrd-plugins, olsrd-commotion-plugins
 Description: optimized link-state routing daemon (unik-olsrd)
  unik-olsrd is an implementation of the Optimized Link State Routing protocol 
  for Mobile Ad-Hoc networks(MANET). The protocol is described in RFC3626. It 
@@ -38,3 +48,41 @@ Description: various plugins to enhance olsrd
   * bmf           - basic multicast forwarding
   * quagga        - import external routes from quagga
   * txtinfo       - display information about the OSLR node
+ .
+ The following plugins are also included, even though experimental and demo
+ plugins:
+ .
+  * pgraph        - performance graph
+  * watchdog      - detection of olsrd freeze
+  * tas           - tiny application server
+  * mini          - minimal example plugin (demo)
+  * dyn_gw_plain  - dyn_gw without ping/libthread
+  * arprefresh    - optimize kernel arp cache from olsr UDP sniffing
+  * mdnsp         - multicast DNS via OLSR mesh network
+  * p2pd          - distribute P2P Discovery messages
+
+Package: olsrd-commotion-plugins
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, olsrd (= ${binary:Version}), libldns1, serval-dna
+Description: Commotion plugins to enhance olsrd
+ olsrd is an implementation of the Optimized Link State Routing protocol
+ for Mobile Ad-Hoc networks(MANET)
+ .
+ The following plugins are available:
+ .
+  * dnssd         - DNS Service Discovery (enhanced p2pd)
+  * mdp           - Serval MDP Secure
+ .
+
+Package: olsrd-gui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, olsrd (= ${binary:Version})
+Description: GTK GUI to control and get info about olsrd
+ olsrd-gui is a GTK GUI for controlling and getting information from a running
+ olsrd, a daemon for OLSR mesh networking.  It uses IPC to talk to olsrd, so
+ /etc/olsrd/olsrd.conf must enable IPC connections for olsrd-gui to work.
+ .
+ OLSR operates as a table driven, proactive protocol, i.e., it exchanges 
+ topology information with other nodes of the network regularly. It is 
+ developed to work independently from other protocols. Likewise, OLSR makes no
+ assumptions about the underlying link-layer.
diff --git a/debian/copyright b/debian/copyright
@@ -109,6 +109,30 @@ Licence: GPL-2+
  | This special exception was added by the Free Software Foundation in
  | version 2.2 of Bison.  
 
+Files: lib/tas/src/lua/* lib/tas/lua_licence.txt
+Copyright: © 1994-2004 Tecgraf, PUC-Rio
+Licence: other-BSD
+ |* Copyright (C) 1994-2004 Tecgraf, PUC-Rio.  All rights reserved.
+ |
+ | Permission is hereby granted, free of charge, to any person obtaining
+ | a copy of this software and associated documentation files (the
+ | "Software"), to deal in the Software without restriction, including
+ | without limitation the rights to use, copy, modify, merge, publish,
+ | distribute, sublicense, and/or sell copies of the Software, and to
+ | permit persons to whom the Software is furnished to do so, subject to
+ | the following conditions:
+ |
+ | The above copyright notice and this permission notice shall be
+ | included in all copies or substantial portions of the Software.
+ |
+ | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ | MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ | IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ | CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ | TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ | SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 Files: lib/quagga/src/quagga.h lib/quagga/src/olsrd_plugin.c lib/quagga.c
 Copyright: © 2006 Immo 'FaUl' Wehrenberg <immo@chaostreff-dortmund.de>
 Licence: GPL-2+

diff --git a/debian/mdp.keyring b/debian/mdp.keyring
diff --git a/debian/olsrd-adhoc-setup.1 b/debian/olsrd-adhoc-setup.1
@@ -0,0 +1,36 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH olsrd-adhoc-setup 1 "2012"
+.SH NAME
+olsrd-adhoc-setup \- setup the wifi interface for meshing with olsrd
+.SH SYNOPSIS
+.B olsrd-adhoc-setup
+[
+.B "wifi interface"
+]
+[
+.B "channel"
+]
+[
+.B "SSID"
+]
+[
+.B "BSSID"
+]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B olsrd-adhoc-setup
+command.  In order to run
+.B olsrd
+to connect to a mesh network, the wifi interface needs to first
+be setup in adhoc mode with the correct settings and a usable IP address
+in order for your
+.B olsrd
+to start talking to the rest of the mesh.  This script automates that process.
+.
+.PP
+.SH SEE ALSO
+.BR olsrd (8),
+.BR olsrd-conf (5).
+.br
+.SH AUTHOR
+olsrd-adhoc-setup was written by Hans-Christoph Steiner <hans@eds.org>
diff --git a/debian/olsrd-commotion-plugins.dirs b/debian/olsrd-commotion-plugins.dirs
@@ -0,0 +1 @@
+usr/lib/olsrd
diff --git a/debian/olsrd-commotion-plugins.docs b/debian/olsrd-commotion-plugins.docs
@@ -0,0 +1,2 @@
+lib/dnssd/README
+lib/mdp/README_MDP
diff --git a/debian/olsrd-commotion-plugins.install b/debian/olsrd-commotion-plugins.install
@@ -0,0 +1 @@
+debian/mdp.keyring /etc/commotion/keys.d/mdp.keyring
diff --git a/debian/olsrd-default b/debian/olsrd-default
@@ -3,22 +3,46 @@
 # installed at /etc/default/olsrd by the maintainer scripts
 
 #
-# This is a POSIX shell fragment
+# Uncomment the next line run olsrd automatically at startup
 #
+#START_OLSRD="YES"
 
 #
-# uncomment the next line run olsrd automatically at startup
+# Uncomment the next line to force-configure the wifi interface to be setup
+# for ad-hoc mode using the /usr/sbin/olsrd-adhoc-setup script whenever olsrd
+# is started.
 #
-#START_OLSRD="YES"
+#SETUP_ADHOC="YES"
 
 #
 # debuglevel from 1 (=quiet) to 9 (=max debug)
 # for running from init.d 0 is recommended
 #
 DEBUGLEVEL=0
 
+#
+# Specify the network interfaces that olsrd will run on, this will most likely
+# be your wifi interface.
+#
+MESH_IF=wlan0
+
+#
+# The wifi channel to setup using olsrd-adhoc-setup
+#
+channel=5
+
+#
+# The SSID for the mesh network to connect to using olsrd-adhoc-setup
+#
+ssid=commotionwireless.net
+
+#
+# The BSSID for the mesh network to connect to using olsrd-adhoc-setup
+#
+bssid=02:ca:ff:ee:ba:be
+
 #
 # "command-line options"
 #
-DAEMON_OPTS="-f /etc/olsrd/olsrd.conf -d $DEBUGLEVEL"
+DAEMON_OPTS="-i $MESH_IF -d $DEBUGLEVEL"