From owner-svn-ports-all@freebsd.org Thu Jul 19 09:06:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 708D41029045; Thu, 19 Jul 2018 09:06:58 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 12856864A3; Thu, 19 Jul 2018 09:06:58 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E176B27195; Thu, 19 Jul 2018 09:06:57 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6J96vOE094538; Thu, 19 Jul 2018 09:06:57 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6J96vZ7094532; Thu, 19 Jul 2018 09:06:57 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807190906.w6J96vZ7094532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 19 Jul 2018 09:06:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474940 - in head/devel/kore: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/devel/kore: . files X-SVN-Commit-Revision: 474940 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2018 09:06:58 -0000 Author: tobik Date: Thu Jul 19 09:06:56 2018 New Revision: 474940 URL: https://svnweb.freebsd.org/changeset/ports/474940 Log: devel/kore: Update to 3.1.0 Changes: https://www.kore.io/releases/3.1.0#changelog Added: head/devel/kore/files/patch-src_domain.c (contents, props changed) Modified: head/devel/kore/Makefile head/devel/kore/distinfo head/devel/kore/files/patch-src_cli.c Modified: head/devel/kore/Makefile ============================================================================== --- head/devel/kore/Makefile Thu Jul 19 08:30:14 2018 (r474939) +++ head/devel/kore/Makefile Thu Jul 19 09:06:56 2018 (r474940) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kore -PORTVERSION= 3.0.0 +PORTVERSION= 3.1.0 CATEGORIES= devel www MASTER_SITES= https://kore.io/releases/ Modified: head/devel/kore/distinfo ============================================================================== --- head/devel/kore/distinfo Thu Jul 19 08:30:14 2018 (r474939) +++ head/devel/kore/distinfo Thu Jul 19 09:06:56 2018 (r474940) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531153725 -SHA256 (kore-3.0.0.tar.gz) = aa6822f70a8a839fc881c8684a0289e082ec34471eda3bbca9a1ca53d2c5164a -SIZE (kore-3.0.0.tar.gz) = 985007 +TIMESTAMP = 1531988034 +SHA256 (kore-3.1.0.tar.gz) = 3f78fb03262046ffa036a7e112dbcbc45fbfca509a949b42f87a55da409f6595 +SIZE (kore-3.1.0.tar.gz) = 989917 Modified: head/devel/kore/files/patch-src_cli.c ============================================================================== --- head/devel/kore/files/patch-src_cli.c Thu Jul 19 08:30:14 2018 (r474939) +++ head/devel/kore/files/patch-src_cli.c Thu Jul 19 09:06:56 2018 (r474940) @@ -1,39 +1,12 @@ ---- src/cli.c.orig 2018-07-09 12:06:06 UTC +--- src/cli.c.orig 2018-07-18 14:25:49 UTC +++ src/cli.c -@@ -795,7 +795,7 @@ cli_info(int argc, char **argv) - printf("kore source \t %s\n", bopt->kore_source); - } else { - cli_kore_features(bopt, &features, &len); -- printf("kore binary \t %s/bin/kore\n", PREFIX); -+ printf("kore binary \t %s/bin/kore%%SUFFIX%%\n", PREFIX); - printf("kore features\t %.*s\n", (int)len, features); - free(features); - } -@@ -1532,7 +1532,7 @@ cli_run_kore(void) - (void)cli_vasprintf(&cmd, "./%s", appl); - } else { - flags = "-fnrc"; -- (void)cli_vasprintf(&cmd, "%s/bin/kore", PREFIX); -+ (void)cli_vasprintf(&cmd, "%s/bin/kore%%SUFFIX%%", PREFIX); - (void)cli_vasprintf(&cpath, "conf/%s.conf", appl); - } - -@@ -1833,6 +1833,9 @@ cli_build_flags_common(struct buildopt *bopt, struct c +@@ -1838,6 +1838,9 @@ cli_build_flags_common(struct buildopt *bopt, struct c else cli_buf_appendf(buf, "-I%s/include ", bopt->kore_source); + -+ cli_buf_appendf(buf, "-I%%OPENSSLINC%% "); -+ cli_buf_appendf(buf, "-I%s/include/kore%%SUFFIX%% ", PREFIX); ++ cli_buf_appendf(buf, "-I/usr/local/include "); ++ cli_buf_appendf(buf, "-I%s/include/kore ", PREFIX); #if defined(__MACH__) /* Add default openssl include path from homebrew / ports under OSX. */ cli_buf_appendf(buf, "-I/opt/local/include "); -@@ -1991,7 +1994,7 @@ cli_kore_features(struct buildopt *bopt, char **out, s - if (bopt->single_binary) { - (void)cli_vasprintf(&path, ".objs/features"); - } else { -- (void)cli_vasprintf(&path, "%s/share/kore/features", PREFIX); -+ (void)cli_vasprintf(&path, "%s/share/kore%%SUFFIX%%/features", PREFIX); - } - - cli_file_open(path, O_RDONLY, &fd); Added: head/devel/kore/files/patch-src_domain.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kore/files/patch-src_domain.c Thu Jul 19 09:06:56 2018 (r474940) @@ -0,0 +1,22 @@ +Remove when FreeBSD 10.4 is EOL. + +--- src/domain.c.orig 2018-07-19 08:34:48 UTC ++++ src/domain.c +@@ -774,7 +774,7 @@ domain_load_certificate_chain(SSL_CTX *ctx, const void + if (SSL_CTX_use_certificate(ctx, x) == 0) + fatal("SSL_CTX_use_certificate: %s", ssl_errno_s); + +-#if defined(LIBRESSL_VERSION_TEXT) ++#if defined(LIBRESSL_VERSION_TEXT) || OPENSSL_VERSION_NUMBER <= 0x1000115fL + sk_X509_pop_free(ctx->extra_certs, X509_free); + ctx->extra_certs = NULL; + #else +@@ -784,7 +784,7 @@ domain_load_certificate_chain(SSL_CTX *ctx, const void + ERR_clear_error(); + while ((ca = PEM_read_bio_X509(in, NULL, NULL, NULL)) != NULL) { + /* ca its reference count won't be increased. */ +-#if defined(LIBRESSL_VERSION_TEXT) ++#if defined(LIBRESSL_VERSION_TEXT) || OPENSSL_VERSION_NUMBER <= 0x1000115fL + if (SSL_CTX_add_extra_chain_cert(ctx, ca) == 0) + fatal("SSL_CTX_add_extra_chain_cert: %s", ssl_errno_s); + #else