Add upstream patch to honour CONFIG_DIR

3 files changed, 21 insertions, 75 deletions

diff --git a/debian/patches/knot-honor-CONFIG_DIR.patch b/debian/patches/knot-honor-CONFIG_DIR.patch
new file mode 100644
index 0000000..835e17d
--- /dev/null
+++ b/debian/patches/knot-honor-CONFIG_DIR.patch
@@ -0,0 +1,20 @@
+From 432027f7cd31be315d267e073e1034c9737fc419 Mon Sep 17 00:00:00 2001
+From: Jan Vcelak <jan.vcelak@nic.cz>
+Date: Mon, 15 Jul 2013 14:14:49 +0200
+Subject: [PATCH] config: fix default configuration file load path
+
+---
+ src/knot/conf/conf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- knot.orig/src/knot/conf/conf.c
++++ knot/src/knot/conf/conf.c
+@@ -37,7 +37,7 @@
+ 
+ /*! \brief Default config paths. */
+ static const char *DEFAULT_CONFIG[] = {
+-	SYSCONFDIR "/" "knot.conf",
++	CONFIG_DIR "/" "knot.conf",
+ };
+ 
+ #define DEFAULT_CONF_COUNT 1 /*!< \brief Number of default config paths. */
diff --git a/debian/patches/run-as-knot.knot.patch b/debian/patches/run-as-knot.knot.patch
deleted file mode 100644
index 1cf760f..0000000
--- a/debian/patches/run-as-knot.knot.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- knot.orig/samples/knot.sample.conf.in
-+++ knot/samples/knot.sample.conf.in
-@@ -6,19 +6,67 @@
- #
- 
- system {
-+  # Identity of the server (see RFC 4892).
-   identity "@package@ @version@";
-+
-+  # User for running server
-+  # May also specify user.group (e.g. knot.knot)
-+  user knot.knot;
-+
-+  # Working directory of the server
-+  # Used to store compiled zones and PID file
-+  # default: ${sharedstatedir}/knot, configured with --with-storage
-+  storage "/var/lib/knot";
-+
-+  # Directory for storing run-time data
-+  # default: ${localstatedir}/run/knot, configured with --with-rundir
-+  rundir "/run/knot";
- }
- 
- interfaces {
--  my-iface { address 127.0.0.1@53533; }
-+  ipv4 {
-+    address 127.0.0.1;
-+    port 53;
-+  }
-+#  ipv6 {
-+#    address ::1;
-+#    port 53;
-+#  }
-+}
-+
-+control {
-+  # Specifies interface, syntax is exactly the same as in 'interfaces' section
-+  # Default: $(run_dir)/knot.sock
-+  listen-on "knot.sock";
-+
-+  # As an alternative, you can use an IPv4/v6 address and port
-+  # listen-on { address 127.0.0.1@5533; }
-+
-+  # Specifies ACL list for remote control
-+  # Same syntax as for ACLs in zones
-+  # List of remotes or groups delimited by comma
-+  # Notice: keep in mind that ACLs bear no effect with UNIX sockets
-+  # allow server0, admins;
- }
- 
- zones {
--  example.com {
--    file "@sysconfdir@/example.com.zone";
--  }
-+#  example.com {
-+#    file "@sysconfdir@/example.com.zone";
-+#  }
- }
- 
- log {
--  syslog { any info, notice, warning, error; }
-+  syslog {
-+    # log errors of any category
-+    any error;    # for <category> and <severity> see above
-+    # log also warnings and notices from category 'zone'
-+    zone warning, notice;
-+    # log info from server
-+    server info;
-+  }
-+
-+  # Log fatal, warnings and errors to stderr
-+  stderr {
-+    any error, warning;
-+  }
- }
diff --git a/debian/patches/series b/debian/patches/series
index e2d6de4..35deaa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+knot-honor-CONFIG_DIR.patch
 run-as-knot.knot.patch