Your message dated Mon, 20 Feb 2012 21:18:06 +0000
with message-id <[email protected]>
and subject line Bug#658561: fixed in olsrd 0.6.2-2
has caused the Debian Bug report #658561,
regarding hard code
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
658561: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658561
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: olsrd
Version: 0.6.2-1
Severity: minor
Tags: patch
The attach patch changes both the olsrd binary and the documentation to
point to the Debian-standard location for the config file:
/etc/olsrd/olsrd.conf. That means if you run just 'olsrd' from the
terminal, it will find its Debian-installed conf file.
This patch assumes the patches in bug #658560 are already applied:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658560
It could be easily modified to be applied directly to 0.6.2-1.
From 5b923c1efa849ce651040dfd65743a7c9f7558f6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <[email protected]>
Date: Fri, 3 Feb 2012 22:12:28 -0500
Subject: [PATCH 1/1] hardcode conf file to /etc/olsrd/olsrd.conf and update
docs
---
.../290-hardcode-etc-olsrd-olsrd-conf.patch | 161 ++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
3 files changed, 163 insertions(+), 1 deletions(-)
create mode 100644 debian/patches/290-hardcode-etc-olsrd-olsrd-conf.patch
diff --git a/debian/patches/290-hardcode-etc-olsrd-olsrd-conf.patch b/debian/patches/290-hardcode-etc-olsrd-olsrd-conf.patch
new file mode 100644
index 0000000..ecb6f68
--- /dev/null
+++ b/debian/patches/290-hardcode-etc-olsrd-olsrd-conf.patch
@@ -0,0 +1,161 @@
+diff --git a/Makefile.inc b/Makefile.inc
+index 34af527..17027b6 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -57,7 +57,7 @@ DOCDIR ?= $(SHAREDIR)/doc
+ MANDIR ?= $(SHAREDIR)/man
+ EXENAME ?= olsrd
+ CFGNAME ?= $(EXENAME).conf
+-CFGFILE ?= $(ETCDIR)/$(CFGNAME)
++CFGFILE ?= $(ETCDIR)/$(EXENAME)/$(CFGNAME)
+
+ CPPFLAGS = -Isrc
+ ifneq ($(TOPDIR),.)
+diff --git a/lib/arprefresh/README_ARPREFRESH b/lib/arprefresh/README_ARPREFRESH
+index 8308d51..16fdc3c 100644
+--- a/lib/arprefresh/README_ARPREFRESH
++++ b/lib/arprefresh/README_ARPREFRESH
+@@ -21,7 +21,7 @@ None.
+ SAMPLE CONFIG
+ ---------------------------------------------------------------------
+
+-add in /etc/olsrd.conf:
++add in /etc/olsrd/olsrd.conf:
+
+ LoadPlugin "arprefresh.so.0.1"
+ {
+diff --git a/lib/bmf/README_BMF b/lib/bmf/README_BMF
+index ec313da..efcc4b2 100644
+--- a/lib/bmf/README_BMF
++++ b/lib/bmf/README_BMF
+@@ -44,7 +44,7 @@ Set permissions, e.g.:
+
+ chmod 0700 /dev/net/tun
+
+-To configure BMF in OLSR, you must edit the file /etc/olsrd.conf
++To configure BMF in OLSR, you must edit the file /etc/olsrd/olsrd.conf
+ to load the BMF plugin. For example, add the following lines:
+
+ LoadPlugin "olsrd_bmf.so.1.7.0"
+@@ -184,7 +184,7 @@ the forwarding towards non-OLSR enabled hosts are omitted):
+ -------------------------
+
+ All configuration of BMF is done via the "LoadPlugin" section in
+-the /etc/olsrd.conf file.
++the /etc/olsrd/olsrd.conf file.
+
+ The following gives an overview of all plugin parameters that can be
+ configured. Unless otherwise stated, settings may differ for each node in the
+@@ -348,7 +348,7 @@ non-OLSR interfaces.
+ If you have network interfaces on which OLSR is *not* running, but you *do*
+ want to forward multicast and local-broadcast IP packets, specify these
+ interfaces one by one as "NonOlsrIf" parameters in the BMF plugin section
+-of /etc/olsrd.conf. For example:
++of /etc/olsrd/olsrd.conf. For example:
+
+ LoadPlugin "olsrd_bmf.so.1.7.0"
+ {
+@@ -368,7 +368,7 @@ as an OLSR-enabled interface.
+ In a typical interworking configuration there is a network of OLSR hosts
+ in which one host acts as a gateway to a fixed infrastructure network.
+ Usually that host will be advertising a default route via the HNA
+-mechanism, e.g. by adding the following lines to its /etc/olsrd.conf
++mechanism, e.g. by adding the following lines to its /etc/olsrd/olsrd.conf
+ file:
+
+ Hna4
+@@ -405,7 +405,7 @@ add the following line /etc/mrouted.conf :
+
+ Finally, mrouted does not accept interfaces with prefix length 32.
+ Therefore, override the default IP address and prefix length of
+-the BMF network interface, by editing the /etc/olsrd.conf file.
++the BMF network interface, by editing the /etc/olsrd/olsrd.conf file.
+ For example:
+
+ LoadPlugin "olsrd_bmf.so.1.7.0"
+diff --git a/lib/mini/README_MINI b/lib/mini/README_MINI
+index 625f994..ff47b3f 100644
+--- a/lib/mini/README_MINI
++++ b/lib/mini/README_MINI
+@@ -24,7 +24,7 @@ PlParam "test" "anything"
+ SAMPLE CONFIG
+ ---------------------------------------------------------------------
+
+-add in /etc/olsrd.conf:
++add in /etc/olsrd/olsrd.conf:
+
+ LoadPlugin "olsrd_mini.so.0.1"
+ {
+diff --git a/lib/nameservice/README_NAMESERVICE b/lib/nameservice/README_NAMESERVICE
+index 59f3c69..b27eb59 100644
+--- a/lib/nameservice/README_NAMESERVICE
++++ b/lib/nameservice/README_NAMESERVICE
+@@ -142,7 +142,7 @@ PlParam "macs-change-script" "/path/to/script"
+ SAMPLE CONFIG
+ ---------------------------------------------------------------------
+
+-add in /etc/olsrd.conf:
++add in /etc/olsrd/olsrd.conf:
+
+ LoadPlugin "olsrd_nameservice.so.0.2"
+ {
+diff --git a/lib/pgraph/README_PGRAPH b/lib/pgraph/README_PGRAPH
+index bc73f69..57b40e7 100644
+--- a/lib/pgraph/README_PGRAPH
++++ b/lib/pgraph/README_PGRAPH
+@@ -39,7 +39,7 @@ Usage:
+ run "make" and "make install"
+ This will create the "olsrd_pgraph.so.1.1" file and install it.
+
+- 3) Modify the "/etc/olsrd.conf" file of the system you wish to
++ 3) Modify the "/etc/olsrd/olsrd.conf" file of the system you wish to
+ monitor from to load the plugin.
+ Add the line: "LoadPlugin "olsrd_pgraph.so.1.1" {}"
+
+@@ -51,7 +51,7 @@ Usage:
+ # By default only localhost will be able to connect to the IPC
+ # system of the olsrd process so if you are not going to be
+ # running pgraph locally, modify the "Host" variable of the
+- # "IpcConnect" structure in the "/etc/olsrd.conf" file to
++ # "IpcConnect" structure in the "/etc/olsrd/olsrd.conf" file to
+ # reflect the IP address of the host you will be connecting from.
+
+ 5) Start olsrd and make sure that the plugin has loaded correctly.
+diff --git a/lib/quagga/README_QUAGGA b/lib/quagga/README_QUAGGA
+index 8e44f8d..c8efeaf 100644
+--- a/lib/quagga/README_QUAGGA
++++ b/lib/quagga/README_QUAGGA
+@@ -55,7 +55,7 @@ PlParam "Version" "<version>"
+ SAMPLE CONFIG
+ ---------------------------------------------------------------------
+
+-add in /usr/local/etc/olsrd.conf:
++add in /etc/olsrd/olsrd.conf:
+
+ LoadPlugin "olsrd_quagga.so.0.2.2"
+ {
+diff --git a/lib/watchdog/README_WATCHDOG b/lib/watchdog/README_WATCHDOG
+index f5eac1d..8397cb2 100644
+--- a/lib/watchdog/README_WATCHDOG
++++ b/lib/watchdog/README_WATCHDOG
+@@ -21,7 +21,7 @@ PlParam "interval" "5"
+ SAMPLE CONFIG
+ ---------------------------------------------------------------------
+
+-add in /etc/olsrd.conf:
++add in /etc/olsrd/olsrd.conf:
+
+ LoadPlugin "olsrd_watchdog.so.0.1"
+ {
+diff --git a/make/Makefile.linux b/make/Makefile.linux
+index 3fb19b9..03e1527 100644
+--- a/make/Makefile.linux
++++ b/make/Makefile.linux
+@@ -10,6 +10,7 @@ SRCS += $(wildcard src/linux/*.c src/unix/*.c)
+ HDRS += $(wildcard src/linux/*.h src/unix/*.h)
+
+ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROUTING
++CPPFLAGS += -DOLSRD_GLOBAL_CONF_FILE=\"$(CFGFILE)\"
+ LIBS +=
+
+ PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so
diff --git a/debian/patches/series b/debian/patches/series
index 5493688..8ae3563 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
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
+290-hardcode-etc-olsrd-olsrd-conf.patch
diff --git a/debian/rules b/debian/rules
index a67cfa8..1bc481e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_install:
$(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
+ rm $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf
cp $(CURDIR)/debian/olsrd.conf $(CURDIR)/debian/olsrd/etc/olsrd/olsrd.conf
cp $(CURDIR)/debian/olsrd-default $(CURDIR)/debian/olsrd/etc/default/olsrd
--
1.7.5.4
--- End Message ---
--- Begin Message ---
Source: olsrd
Source-Version: 0.6.2-2
We believe that the bug you reported is fixed in the latest version of
olsrd, which is due to be installed in the Debian FTP archive:
olsrd-gui_0.6.2-2_i386.deb
to main/o/olsrd/olsrd-gui_0.6.2-2_i386.deb
olsrd-plugins_0.6.2-2_i386.deb
to main/o/olsrd/olsrd-plugins_0.6.2-2_i386.deb
olsrd_0.6.2-2.debian.tar.gz
to main/o/olsrd/olsrd_0.6.2-2.debian.tar.gz
olsrd_0.6.2-2.dsc
to main/o/olsrd/olsrd_0.6.2-2.dsc
olsrd_0.6.2-2_i386.deb
to main/o/olsrd/olsrd_0.6.2-2_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Roland Stigge <[email protected]> (supplier of updated olsrd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 19 Feb 2012 16:14:34 +0100
Source: olsrd
Binary: olsrd olsrd-plugins olsrd-gui
Architecture: source i386
Version: 0.6.2-2
Distribution: unstable
Urgency: low
Maintainer: Roland Stigge <[email protected]>
Changed-By: Roland Stigge <[email protected]>
Description:
olsrd - optimized link-state routing daemon (unik-olsrd)
olsrd-gui - GTK GUI to control and get info about olsrd
olsrd-plugins - various plugins to enhance olsrd
Closes: 658329 658330 658557 658559 658560 658561
Changes:
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!
Checksums-Sha1:
b5e19c642106802828cecebc4902592157893e34 1280 olsrd_0.6.2-2.dsc
d864aca0c89acd53fdc725395369281969dd13c0 18147 olsrd_0.6.2-2.debian.tar.gz
380c2435a5064177d5b5a132a05e8caa71dd9bed 235692 olsrd_0.6.2-2_i386.deb
df6a112b140d2f73781ad41c29f1c222efdf8a94 265044 olsrd-plugins_0.6.2-2_i386.deb
7ed92d7caf36160e5775f9f716545e8209302d48 81330 olsrd-gui_0.6.2-2_i386.deb
Checksums-Sha256:
31bf71ed082de73d41ed56e7f148b0d8710d59e7a4afd1d6cb172c77327cabb7 1280
olsrd_0.6.2-2.dsc
e5c5510d2781a1947f517b0c275073e32cc77179967fbd8e22aed9a95c35588b 18147
olsrd_0.6.2-2.debian.tar.gz
1a92a3c924e38c2a433c4857e1296f23372390c81dc75965b793cd1120447979 235692
olsrd_0.6.2-2_i386.deb
e02cbb574deb64c476eab2f1acfa0f6c4d062e15e2ddc9bcea4a0eabc0705c16 265044
olsrd-plugins_0.6.2-2_i386.deb
6ff20473e578b789914951ef770d417356fc73b488875ec781d81a84dc1165ee 81330
olsrd-gui_0.6.2-2_i386.deb
Files:
e605aa15f55c83e85d15a8e2aa43655d 1280 net extra olsrd_0.6.2-2.dsc
c510600416409238c4b8b5ab0f4f5e1a 18147 net extra olsrd_0.6.2-2.debian.tar.gz
26b48965b961850f8c5b4d39210f532e 235692 net extra olsrd_0.6.2-2_i386.deb
fc6461ca004eaf61518f5e21f167fb17 265044 net extra
olsrd-plugins_0.6.2-2_i386.deb
9b39650f6d5de6d6f07895d6e4efecde 81330 net extra olsrd-gui_0.6.2-2_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iD8DBQFPQRVMcaH/YBv43g8RAj/5AKDlwH1kRK4096cb+fvRaQZKMmKeLQCfcwDt
YQVLm8nJhd6h0TaXI5pHeic=
=a+Ny
-----END PGP SIGNATURE-----
--- End Message ---
