diff --git a/security/zkt/Makefile b/security/zkt/Makefile index 166b547ac2e..88e199be0f1 100644 --- a/security/zkt/Makefile +++ b/security/zkt/Makefile @@ -1,8 +1,7 @@ COMMENT= DNSsec Zone Key Tool -DISTNAME= zkt-1.1.4 +DISTNAME= zkt-1.1.6 CATEGORIES= security -REVISION= 4 # also https://github.com/hzuleger/ZKT http://www.zonekeytool.de/ HOMEPAGE= https://www.hznet.de/dns/zkt/ diff --git a/security/zkt/distinfo b/security/zkt/distinfo index eb5d2239152..237b487e000 100644 --- a/security/zkt/distinfo +++ b/security/zkt/distinfo @@ -1,2 +1,2 @@ -SHA256 (zkt-1.1.4.tar.gz) = cEBlpHKhwgnEfm0NAAOzQ0yqEBwaXQhEaIlkP8q6fMc= -SIZE (zkt-1.1.4.tar.gz) = 382629 +SHA256 (zkt-1.1.6.tar.gz) = 8EzRwhTz/IKOr6ArRyB5jHBPv7dnvbtYczmfahtXtqU= +SIZE (zkt-1.1.6.tar.gz) = 408892 diff --git a/security/zkt/patches/patch-dki_c b/security/zkt/patches/patch-dki_c deleted file mode 100644 index d087e5a30cc..00000000000 --- a/security/zkt/patches/patch-dki_c +++ /dev/null @@ -1,39 +0,0 @@ -patch away use of -r, previously used to set the path to a /dev/random-like file, -but not supported in dnssec-keygen after BIND 9.12 - -Index: dki.c ---- dki.c.orig -+++ dki.c -@@ -242,7 +242,6 @@ dki_t *dki_new (const char *dir, const char *name, int - { - char cmdline[511+1]; - char fname[254+1]; -- char randfile[254+1]; - FILE *fp; - int len; - char *flag = ""; -@@ -252,20 +251,16 @@ dki_t *dki_new (const char *dir, const char *name, int - if ( ksk ) - flag = "-f KSK"; - -- randfile[0] = '\0'; -- if ( rfile && *rfile ) -- snprintf (randfile, sizeof (randfile), "-r %.250s ", rfile); -- - #if defined(BIND_VERSION) && BIND_VERSION < 90902 - if ( algo == DK_ALGO_RSA || algo == DK_ALGO_RSASHA1 || algo == DK_ALGO_RSASHA256 || algo == DK_ALGO_RSASHA512 ) - expflag = "-e "; - #endif - if ( dir && *dir ) -- snprintf (cmdline, sizeof (cmdline), "cd %s ; %s %s%s%s-n ZONE -a %s -b %d %s %s 2>&1", -- dir, KEYGENCMD, KEYGEN_COMPMODE, randfile, expflag, dki_algo2str(algo), bitsize, flag, name); -+ snprintf (cmdline, sizeof (cmdline), "cd %s ; %s %s%s-n ZONE -a %s -b %d %s %s 2>&1", -+ dir, KEYGENCMD, KEYGEN_COMPMODE, expflag, dki_algo2str(algo), bitsize, flag, name); - else -- snprintf (cmdline, sizeof (cmdline), "%s %s%s%s-n ZONE -a %s -b %d %s %s 2>&1", -- KEYGENCMD, KEYGEN_COMPMODE, randfile, expflag, dki_algo2str(algo), bitsize, flag, name); -+ snprintf (cmdline, sizeof (cmdline), "%s %s%s-n ZONE -a %s -b %d %s %s 2>&1", -+ KEYGENCMD, KEYGEN_COMPMODE, expflag, dki_algo2str(algo), bitsize, flag, name); - - dbg_msg (cmdline); - diff --git a/security/zkt/patches/patch-zconf_c b/security/zkt/patches/patch-zconf_c deleted file mode 100644 index 9ce81af3c23..00000000000 --- a/security/zkt/patches/patch-zconf_c +++ /dev/null @@ -1,14 +0,0 @@ -Index: zconf.c ---- zconf.c.orig -+++ zconf.c -@@ -746,9 +746,7 @@ zconf_t *dupconfig (const zconf_t *conf) - *****************************************************************/ - zconf_t *freeconfig (zconf_t *conf) - { -- if (conf != NULL); -- free (conf); -- -+ free (conf); - return (zconf_t *)NULL; - } -