cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added Knot DNS server with utilities version 1.5.0-rc2.

Browse Source 
Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
This commit is contained in:
Daniel Salzman
2014-06-19 10:54:01 +02:00
parent 7257e863d7
commit fd2af5030f
6 changed files with 287 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/knot/patches/01_strptime_susv3.patch
+21
View File
@@ -0,0 +1,21 @@
diff --git a/src/libknot/dnssec/key.c b/src/libknot/dnssec/key.c
index 7dc0540..3e351bb 100644
--- a/src/libknot/dnssec/key.c
+++ b/src/libknot/dnssec/key.c
@@ -260,7 +260,15 @@ static int key_param_time(const void *save_to, char *value)
struct tm parsed = { 0 };
- if (!strptime(value, "%Y%m%d%H%M%S", &parsed)) {
+ if (strlen(value) != 14) {
+ return KNOT_EINVAL;
+ }
+
+ char *v = value;
+ char buf[32] = "";
+ int ret = sprintf(buf, "%.4s %.2s %.2s %.2s %.2s %.2s",
+ v, v + 4, v + 6, v + 8, v + 10, v + 12);
+ if (ret != 19 || !strptime(buf, "%Y %m %d %H %M %S", &parsed)) {
return KNOT_EINVAL;
}
net/knot/patches/02_knot.conf.patch
+28
View File
@@ -0,0 +1,28 @@
diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in
index 956e8a9..a068e67 100644
--- a/samples/knot.sample.conf.in
+++ b/samples/knot.sample.conf.in
@@ -14,7 +14,7 @@ system {
# User for running server
# May also specify user.group (e.g. knot.knot)
- user knot.knot;
+ user root.root;
# Directory for storing run-time data
# e.g. PID file and control sockets
@@ -63,11 +63,11 @@ zones {
# storage "@storage_dir@";
#
# Example master zone
-# example.com {
-# file "@config_dir@/example.com.zone";
+ example.com {
+ file "example.com.zone";
# xfr-out slave0;
# notify-out slave0;
-# }
+ }
#
# Example slave zone
# example.net {
net/knot/patches/03_zscanner_tests.patch
+41
View File
@@ -0,0 +1,41 @@
diff --git a/src/zscanner/tests/TESTS b/src/zscanner/tests/TESTS
index c88aef1..4e2148f 100644
--- a/src/zscanner/tests/TESTS
+++ b/src/zscanner/tests/TESTS
@@ -18,10 +18,8 @@
05-2_TTL
05-3_TTL
05-4_TTL
-06-0_INCLUDE
06-1_INCLUDE
06-2_INCLUDE
-06-3_INCLUDE
06-4_INCLUDE
06-5_INCLUDE
06-6_INCLUDE
diff --git a/src/zscanner/tests/unittests.in b/src/zscanner/tests/unittests.in
index 846f351..272856c 100644
--- a/src/zscanner/tests/unittests.in
+++ b/src/zscanner/tests/unittests.in
@@ -1,9 +1,9 @@
#!/bin/sh
-SOURCE=@top_srcdir@/src/zscanner/tests
-BUILD=@top_builddir@/src/zscanner/tests
+SOURCE="."
+BUILD="."
-. @top_srcdir@/libtap/tap/libtap.sh
+. ../tap/libtap.sh
cd "$BUILD"
@@ -11,7 +11,7 @@ TMPDIR=$(test_tmpdir)
TESTS_DIR="$SOURCE"/data
ZSCANNER_TOOL="$BUILD"/zscanner-tool
-plan 68
+plan 66
mkdir -p "$TMPDIR"/includes/
for a in 1 2 3 4 5 6; do