Attached are the updated patches, which include patches ;)
From 12d5a6687770ed9107f58f9efce7911a72de2769 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <[email protected]> Date: Thu, 2 Feb 2012 13:24:15 -0500 Subject: [PATCH 01/11] patches to build gui/linux-gtk properly
--- ...ign-olsr_ip_addr-to-olsr-definition-of-it.patch | 33 ++++++++++++++++++++ debian/patches/280-fix-linux-gtk-build.patch | 28 +++++++++++++++++ debian/patches/series | 2 + 3 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 debian/patches/270-gui-linux-gtk-align-olsr_ip_addr-to-olsr-definition-of-it.patch create mode 100644 debian/patches/280-fix-linux-gtk-build.patch diff --git a/debian/patches/270-gui-linux-gtk-align-olsr_ip_addr-to-olsr-definition-of-it.patch b/debian/patches/270-gui-linux-gtk-align-olsr_ip_addr-to-olsr-definition-of-it.patch new file mode 100644 index 0000000..d210289 --- /dev/null +++ b/debian/patches/270-gui-linux-gtk-align-olsr_ip_addr-to-olsr-definition-of-it.patch @@ -0,0 +1,33 @@ +Author: Ferry Huberts <[email protected]> +Date: Tue Dec 6 16:51:10 2011 +0100 +Description: align olsr_ip_addr to olsr definition of it +Forwarded: already included upstream +Last-Update: <2011-12-06> +Applied-Upstream: 8745ca2f91db8b0bb761e1380493b16b7a1c192a + +diff --git a/gui/linux-gtk/src/ipc.c b/gui/linux-gtk/src/ipc.c +index c93646a..d1867e0 100644 +--- a/gui/linux-gtk/src/ipc.c ++++ b/gui/linux-gtk/src/ipc.c +@@ -586,7 +586,7 @@ ip_to_string(union olsr_ip_addr *addr) + struct in_addr in; + + if (ipversion == AF_INET) { +- in.s_addr = addr->v4; ++ in = addr->v4; + ret = inet_ntoa(in); + } else { + /* IPv6 */ +diff --git a/gui/linux-gtk/src/olsr_protocol.h b/gui/linux-gtk/src/olsr_protocol.h +index a458a7c..ef084a5 100644 +--- a/gui/linux-gtk/src/olsr_protocol.h ++++ b/gui/linux-gtk/src/olsr_protocol.h +@@ -60,7 +60,7 @@ typedef int32_t olsr_32_t; + #include <netinet/in.h> + + union olsr_ip_addr { +- olsr_u32_t v4; ++ struct in_addr v4; + struct in6_addr v6; + }; + diff --git a/debian/patches/280-fix-linux-gtk-build.patch b/debian/patches/280-fix-linux-gtk-build.patch new file mode 100644 index 0000000..e31d683 --- /dev/null +++ b/debian/patches/280-fix-linux-gtk-build.patch @@ -0,0 +1,28 @@ +Author: Hans-Christoph Steiner <[email protected]> +Date: Tue Jan 31 14:02:53 2012 -0500 +Description: fix linux-gtk build + fix gui/linux-gtk build on Debian/Ubuntu by using standard LDFLAGS & LIBS vars +Forwarded: yes, in the bug tracker + +index f843293..19d713b 100644 +--- a/gui/linux-gtk/Makefile ++++ b/gui/linux-gtk/Makefile +@@ -1,7 +1,8 @@ + CC ?= gcc + + CFLAGS += -Wall `pkg-config --cflags gtk+-2.0` +-LFLAGS= `pkg-config --libs gtk+-2.0` ++LDFLAGS += ++LIBS := `pkg-config --libs gtk+-2.0` -lm + + OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \ + src/packet.o src/nodes.o src/routes.o +@@ -9,7 +10,7 @@ OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \ + all: olsrd-gui + + olsrd-gui: $(OBJS) +- $(CC) $(LFLAGS) -o $@ $(OBJS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + clean: + rm -f $(OBJS) diff --git a/debian/patches/series b/debian/patches/series index da94b51..5493688 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ 111-build-mips-and-armhf.patch 230-usr-lib-olsrd.patch 260-quagga-plugin-detect-protocol-version.patch +270-gui-linux-gtk-align-olsr_ip_addr-to-olsr-definition-of-it.patch +280-fix-linux-gtk-build.patch -- 1.7.5.4
From ecd94cdba0c2898d25a9504d8e4122a33435d722 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <[email protected]> Date: Thu, 2 Feb 2012 13:25:58 -0500 Subject: [PATCH 02/11] add gui/linux-gtk to the auto_build, auto_clean, and auto_install targets --- debian/rules | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/debian/rules b/debian/rules index 72761c4..8d528b4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,14 +9,18 @@ override_dh_auto_build: $(MAKE) $(MAKE) libs + $(MAKE) -C gui/linux-gtk override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) uberclean + $(MAKE) -C $(CURDIR)/gui/linux-gtk clean + rm -f $(CURDIR)/gui/linux-gtk/olsrd-gui rm -f $(CURDIR)/lib/*/src/*.o $(CURDIR)/lib/*/*.so.?.? override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd install STRIP=: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd-plugins libs_install STRIP=: + $(MAKE) -C gui/linux-gtk DESTDIR=$(CURDIR)/debian/olsrd-gui install # provide better default config rm $(CURDIR)/debian/olsrd/etc/olsrd.conf cp $(CURDIR)/debian/olsrd.conf $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf -- 1.7.5.4
From c26de820973a4c62c06c5257a5efa4589d1f97ae Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <[email protected]> Date: Thu, 2 Feb 2012 13:56:42 -0500 Subject: [PATCH 03/11] added olsrd-gui sub-package and set needed Build-Depends --- debian/control | 20 +++++++++++++++++++- debian/olsrd-gui.docs | 1 + debian/rules | 4 ++++ 3 files changed, 24 insertions(+), 1 deletions(-) create mode 100644 debian/olsrd-gui.docs diff --git a/debian/control b/debian/control index b380295..8bcf381 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,12 @@ Source: olsrd Section: net Priority: extra Maintainer: Roland Stigge <[email protected]> -Build-Depends: debhelper (>= 8), bison, flex +Build-Depends: debhelper (>= 8), + bison, + flex, + pkg-config, + libgtk2.0-dev, + python-gtk2-dev Standards-Version: 3.9.2 Homepage: http://olsr.org/ Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/olsrd/ @@ -50,3 +55,16 @@ Description: various plugins to enhance olsrd * arprefresh - optimize kernel arp cache from olsr UDP sniffing * mdnsp - multicast DNS via OLSR mesh network * p2pd - distribute P2P Discovery messages + +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/olsrd-gui.docs b/debian/olsrd-gui.docs new file mode 100644 index 0000000..8224622 --- /dev/null +++ b/debian/olsrd-gui.docs @@ -0,0 +1 @@ +gui/linux-gtk/README diff --git a/debian/rules b/debian/rules index 8d528b4..f04824c 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,10 @@ override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd install STRIP=: $(MAKE) DESTDIR=$(CURDIR)/debian/olsrd-plugins libs_install STRIP=: $(MAKE) -C gui/linux-gtk DESTDIR=$(CURDIR)/debian/olsrd-gui install + install -d $(CURDIR)/debian/olsrd-gui/usr/share/doc/olsrd-gui/ + install -p -m0644 gui/linux-gtk/CHANGELOG \ + $(CURDIR)/debian/olsrd-gui/usr/share/doc/olsrd-gui/changelog + gzip -9 $(CURDIR)/debian/olsrd-gui/usr/share/doc/olsrd-gui/changelog # provide better default config rm $(CURDIR)/debian/olsrd/etc/olsrd.conf cp $(CURDIR)/debian/olsrd.conf $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf -- 1.7.5.4
From 84aaa305a3f35b33e8fb332cbebcb421ba25c897 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner <[email protected]> Date: Fri, 3 Feb 2012 13:21:22 -0500 Subject: [PATCH 04/11] add basic manpage for olsrd-gui --- debian/olsrd-gui.1 | 23 +++++++++++++++++++++++ debian/olsrd-gui.manpages | 1 + 2 files changed, 24 insertions(+), 0 deletions(-) create mode 100644 debian/olsrd-gui.1 create mode 100644 debian/olsrd-gui.manpages diff --git a/debian/olsrd-gui.1 b/debian/olsrd-gui.1 new file mode 100644 index 0000000..5250fbb --- /dev/null +++ b/debian/olsrd-gui.1 @@ -0,0 +1,23 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH olsrd-gui 1 "2012" +.SH NAME +olsrd-gui \- control and view status of olsrd routing daemon +.SH SYNOPSIS +.B olsrd-gui +[ +.B "host-or-IP" +] +.SH DESCRIPTION +This manual page documents briefly the +.B olsrd-gui +command. It connects to a running olsrd over an IPC connection +configured in +.B /etc/olsrd/olsrd.conf +. +.PP +.SH SEE ALSO +.BR olsrd (8), +.BR olsrd-conf (5). +.br +.SH AUTHOR +olsrd-gui was written by Andreas Tonnesen <[email protected]>. diff --git a/debian/olsrd-gui.manpages b/debian/olsrd-gui.manpages new file mode 100644 index 0000000..b9e2d8e --- /dev/null +++ b/debian/olsrd-gui.manpages @@ -0,0 +1 @@ +debian/olsrd-gui.1 -- 1.7.5.4
