[hamradio-commits] [dump1090] 02/02: re-add blacklist for modprobe (no idea what happened there). update docs reflecting the neutering of the http server

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit 1ab4036b71c515a86178a36d413724cfd7fe32d0
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Wed Oct 22 16:06:04 2014 -0400

    re-add blacklist for modprobe (no idea what happened there).  update docs reflecting the neutering of the http server
---
 debian/README.Debian                                   | 4 ++--
 debian/changelog                                       | 6 ++++++
 debian/dump1090-blacklist.conf                         | 6 ++++++
 debian/dump1090.install                                | 1 +
 debian/patches/05-disable-local-file-http-access.patch | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 3a0ffb4..92f1717 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -15,5 +15,5 @@ instructions for building that binary.
 
  * dump1090(1)
 
-The web interface includes remotely hosted JavaScript files that 
-provide the interface to Google Maps.
+The internal web server has been largely disabled.  To use the web
+interface see the notes in /usr/share/doc/dump1090/README.http.
diff --git a/debian/changelog b/debian/changelog
index 14c8c16..1ba8d30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dump1090 (1.09.1007.14+dfsg-5) unstable; urgency=high
+
+  * Add modprobe.d blacklist to prevent kernel DVB-T drivers from loading.
+
+ -- Matthew Ernisse <mernisse at ub3rgeek.net>  Wed, 22 Oct 2014 15:46:23 -0400
+
 dump1090 (1.09.1007.14+dfsg-4) unstable; urgency=medium
 
   * Apply PR#33 from upstream.  This fixes a segfault and possible file
diff --git a/debian/dump1090-blacklist.conf b/debian/dump1090-blacklist.conf
new file mode 100644
index 0000000..7d847c1
--- /dev/null
+++ b/debian/dump1090-blacklist.conf
@@ -0,0 +1,6 @@
+# dump1090-blacklist.conf
+# dump1090 needs direct access to the DVB-T stick so the kernel modules
+# must be prevented from loading.
+
+blacklist rtl2830
+blacklist dvb_usb_rtl28xxu
diff --git a/debian/dump1090.install b/debian/dump1090.install
index 1605271..b894ea9 100644
--- a/debian/dump1090.install
+++ b/debian/dump1090.install
@@ -1,5 +1,6 @@
 dump1090 /usr/sbin
 view1090 /usr/bin
+debian/dump1090-blacklist.conf /etc/modprobe.d
 public_html/config.js /usr/share/dump1090/public_html
 public_html/extension.js /usr/share/dump1090/public_html
 public_html/gmap.html /usr/share/dump1090/public_html
diff --git a/debian/patches/05-disable-local-file-http-access.patch b/debian/patches/05-disable-local-file-http-access.patch
index f6a0944..840a781 100644
--- a/debian/patches/05-disable-local-file-http-access.patch
+++ b/debian/patches/05-disable-local-file-http-access.patch
@@ -1,4 +1,5 @@
 Description: Disable local file serving from the internal HTTP server.
+ This patch relies somewhat on the 02-http-buffer.patch being applied.
 Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
 Forwarded: no
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git