From 28bc5fe52db5a68ba50a8f4da21285bffd7e0323 Mon Sep 17 00:00:00 2001 From: Pavel Šimerda Date: Jun 06 2014 16:30:47 +0000 Subject: add missing patch --- diff --git a/dnssec-trigger-0.12-nm-script.patch b/dnssec-trigger-0.12-nm-script.patch new file mode 100644 index 0000000..392318c --- /dev/null +++ b/dnssec-trigger-0.12-nm-script.patch @@ -0,0 +1,52 @@ +diff --git a/dnssec-trigger-script.in b/dnssec-trigger-script.in +index b572dd1..297e36a 100644 +--- a/dnssec-trigger-script.in ++++ b/dnssec-trigger-script.in +@@ -10,6 +10,8 @@ import os, sys, shutil, subprocess + import logging, logging.handlers + import socket, struct + ++ ++ + DEVNULL = open("/dev/null", "wb") + + log = logging.getLogger() +@@ -190,7 +192,7 @@ class UnboundZoneConfig: + if fields.pop(0) in ('forward', 'forward:'): + fields.pop(0) + secure = False +- if fields[0] == '+i': ++ if fields and fields[0] == '+i': + secure = True + fields.pop(0) + self.cache[name] = set(fields[3:]), secure +@@ -255,7 +257,7 @@ class Store: + line = line.strip() + if line: + self.cache.add(line) +- except FileNotFoundError: ++ except IOError: + pass + log.debug(self) + +@@ -309,7 +311,7 @@ class GlobalForwarders: + line = line.strip() + if line: + self.cache.add(line) +- except FileNotFoundError: ++ except IOError: + pass + + class Application: +@@ -335,7 +337,7 @@ class Application: + try: + with open("/etc/NetworkManager/NetworkManager.conf") as nm_config_file: + for line in nm_config_file: +- if line.strip == "dns=none": ++ if line.strip() in ("dns=none", "dns=unbound"): + return False + except IOError: + pass +-- +1.8.3.2 +