[dnssec-trigger/f17] * Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1 - Updated to 0.11 - http Hotspot detec

[Paul Wouters]

commit 8dfd10d265ab443d7c25435c93c456cd3b37a4b8
Author: Paul Wouters <paul at libreswan.org>
Date:   Fri Jun 15 17:57:25 2012 -0400

    * Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1
    - Updated to 0.11
    - http Hotspot detection via fedoraproject.org/static/hotspot.html
    - http Hotspot Login page via uses hotspot-nocache.fedoraproject.org
    
    Conflicts:
    	dnssec-trigger.spec

 .gitignore          |    1 +
 dnssec-trigger.conf |   27 +++++++++++++++++++++++++--
 dnssec-trigger.spec |   15 ++++++++++-----
 sources             |    1 +
 4 files changed, 37 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0f0d1d..b7a7a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /dnssec-trigger-0.9.tar.gz
 /dnssec-trigger-0.10.tar.gz
+/dnssec-trigger-0.11.tar.gz
diff --git a/dnssec-trigger.conf b/dnssec-trigger.conf
index b728884..b7ee8f2 100644
--- a/dnssec-trigger.conf
+++ b/dnssec-trigger.conf
@@ -1,5 +1,4 @@
-# config for dnssec-trigger 0.9.
-# this is a comment. there must be one statement per line.
+# Fedora/EPEL version of dnssec-trigger.conf
 
 # logging detail, 0=only errors, 1=operations, 2=detail, 3,4 debug detail.
 # verbosity: 1
@@ -30,6 +29,15 @@ pidfile: "/var/run/dnssec-triggerd.pid"
 # the search path from DHCP is not picked up, it could be used to misdirect.
 # search: ""
 
+# the command to run to open login pages on hot spots, a web browser.
+# empty string runs no command.
+# login-command: "xdg-open"
+
+# the url to open to get hot spot login, it gets overridden by the hotspot.
+# login-location: "http://www.nlnetlabs.nl/projects/dnssec-trigger"
+# should to be a ttl=0 entry
+login-location: "http://hotspot-nocache.fedoraproject.org/"
+
 # do not perform actions (unbound-control or resolv.conf), for a dry-run.
 # noaction: no
 
@@ -43,6 +51,21 @@ server-cert-file: "/etc/dnssec-trigger/dnssec_trigger_server.pem"
 control-key-file: "/etc/dnssec-trigger/dnssec_trigger_control.key"
 control-cert-file: "/etc/dnssec-trigger/dnssec_trigger_control.pem"
 
+# check for updates, download and ask to install them (for Windows, OSX).
+# check-updates: no
+
+# webservers that are probed to see if internet access is possible.
+# They serve a simple static page over HTTP port 80.  It probes a random url:
+# after a space is the content expected on the page, (the page can contain
+# whitespace before and after this code).  Without urls it skips http probes.
+
+# provided by NLnetLabs
+# It is provided on a best effort basis, with no service guarantee.
+# url: "http://ster.nlnetlabs.nl/hotspot.txt OK"
+
+# provided by FedoraProject
+url: "http://fedoraproject.org/static/hotspot.txt OK"
+
 # fallback open DNSSEC resolvers that run on TCP port 80 and TCP port 443.
 # the ssl443 adds an ssl server IP, if you specify a hash it is checked, put
 # the following on one line: ssl443:<space><IP><space><HASHoutput>
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index f559142..8eefdc9 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,7 +1,7 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
-Version: 0.10
-Release: 4%{?dist}
+Version: 0.11
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
 Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
@@ -9,7 +9,7 @@ Source1:dnssec-triggerd.service
 Source2: dnssec-triggerd-keygen.service
 Source3: dnssec-trigger.conf
 Requires(postun): initscripts
-Requires: ldns >= 1.6.10, NetworkManager, unbound
+Requires: ldns >= 1.6.10, NetworkManager, unbound, xdg-utils
 Requires(pre): shadow-utils
 BuildRequires: desktop-file-utils systemd-units, openssl-devel, ldns-devel
 BuildRequires: gtk2-devel, NetworkManager-devel
@@ -94,8 +94,13 @@ fi
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %changelog
-* Fri Mar 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
-- Bump for EVR
+* Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 0.11-1
+- Updated to 0.11
+- http Hotspot detection via fedoraproject.org/static/hotspot.html
+- http Hotspot Login page via uses hotspot-nocache.fedoraproject.org
+
+* Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-4
+- Require: unbound
 
 * Thu Feb 23 2012 Paul Wouters <pwouters at redhat.com> - 0.10-1
 - The NM hook lacked /usr/sbin in path, resulting in empty
diff --git a/sources b/sources
index 2450a48..d06c834 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 7c4b5b9e0060b47da6e08cfbe64e3563  dnssec-trigger-0.9.tar.gz
 c978126c1a5f40a6022e459e30c87550  dnssec-trigger-0.10.tar.gz
+7efb79cb5813b1fab10c4a9518810431  dnssec-trigger-0.11.tar.gz