diff --git a/Makefile.am b/Makefile.am index d64e06b233246664b8615156b223bedfe1bbbd09..e7a97e16ec38299cd1f19fb3da7e2dd67888aa5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libtap src tests samples doc man patches +SUBDIRS = libtap src tests samples doc man AM_DISTCHECK_CONFIGURE_FLAGS = \ --disable-code-coverage diff --git a/configure.ac b/configure.ac index 19f780a8c6365cfce0f98f73992b86e6cf2ca015..6a658d6f41b44e7f39a0570dd0d356ffd1b72a23 100644 --- a/configure.ac +++ b/configure.ac @@ -429,7 +429,6 @@ AC_CONFIG_FILES([Makefile doc/Makefile man/Makefile samples/Makefile - patches/Makefile libtap/Makefile src/Makefile tests/Makefile diff --git a/patches/Makefile.am b/patches/Makefile.am deleted file mode 100644 index 87c384e27786c099b5063866b1bceca1dc22b834..0000000000000000000000000000000000000000 --- a/patches/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = strptime_susv3.patch diff --git a/patches/strptime_susv3.patch b/patches/strptime_susv3.patch deleted file mode 100644 index fc14b91d5da23cebe5d300dfeff4ff5cfb32a505..0000000000000000000000000000000000000000 --- a/patches/strptime_susv3.patch +++ /dev/null @@ -1,21 +0,0 @@ -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; - } -