Index: head/devel/kore/Makefile =================================================================== --- head/devel/kore/Makefile (revision 486327) +++ head/devel/kore/Makefile (revision 486328) @@ -1,90 +1,89 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= kore -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 3.2.0 CATEGORIES= devel www MASTER_SITES= https://kore.io/releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Web application framework for writing web APIs in C LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to compile: cc1: error: -Werror=c11-extensions: No option -Wc11-extensions FLAVORS= default notls notls_PKGNAMESUFFIX= -notls USES= compiler gmake ssl CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} -I${OPENSSLINC} CFLAGS_clang= -Wno-error=c11-extensions # 12.0 + -pedantic LDFLAGS+= -L${OPENSSLLIB} DATADIR= ${PREFIX}/share/kore${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/kore${PKGNAMESUFFIX} PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} OPTIONS_DEFINE= DEBUG EXAMPLES HTTP JSONRPC PGSQL PYTHON TASKS TLS OPTIONS_DEFAULT= HTTP JSONRPC PGSQL PYTHON TASKS TLS .if ${FLAVOR:U} == notls OPTIONS_EXCLUDE= TLS .endif OPTIONS_SUB= yes HTTP_DESC= Build with HTTP support JSONRPC_DESC= Build with JSON-RPC support TASKS_DESC= Build with tasks support DEBUG_MAKE_ARGS= DEBUG=1 PORTEXAMPLES= * JSONRPC_IMPLIES= HTTP JSONRPC_LIB_DEPENDS= libyajl.so:devel/yajl JSONRPC_MAKE_ARGS= JSONRPC=1 HTTP_MAKE_ARGS_OFF= NOHTTP=1 PGSQL_IMPLIES= HTTP PGSQL_MAKE_ARGS= PGSQL=1 PGSQL_USES= pgsql PYTHON_BINARY_ALIAS= python3-config=${PYTHON_CMD}-config PYTHON_MAKE_ARGS= PYTHON=1 PYTHON_USES= gettext-runtime python:3.6+ TASKS_MAKE_ARGS= TASKS=1 TLS_MAKE_ARGS_OFF= NOTLS=1 post-patch: # Disable kore's own optimizations flags, make sure the correct paths # are set when LOCALBASE is not /usr/local @${REINPLACE_CMD} -e 's|CFLAGS+=-O|#|g' \ -e 's|/usr/local/|${LOCALBASE}/|g' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%SUFFIX%%|${PKGNAMESUFFIX}|g' \ -e 's|%%OPENSSLINC%%|${OPENSSLINC}|g' \ ${WRKSRC}/src/cli.c ${WRKSRC}/src/utils.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/kore ${STAGEDIR}${PREFIX}/bin/kore${PKGNAMESUFFIX} ${INSTALL_PROGRAM} ${WRKSRC}/kodev/kodev ${STAGEDIR}${PREFIX}/bin/kodev${PKGNAMESUFFIX} @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/kore.features ${STAGEDIR}${DATADIR}/features @${MKDIR} ${STAGEDIR}${PREFIX}/include/kore${PKGNAMESUFFIX} @cd ${WRKSRC}/include && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/include/kore${PKGNAMESUFFIX} @${MKDIR} ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/share/man/kodev.1 \ ${STAGEDIR}${PREFIX}/man/man1/kodev${PKGNAMESUFFIX}.1 do-install-EXAMPLES-on: @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} @cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/kore/distinfo =================================================================== --- head/devel/kore/distinfo (revision 486327) +++ head/devel/kore/distinfo (revision 486328) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531988034 -SHA256 (kore-3.1.0.tar.gz) = 3f78fb03262046ffa036a7e112dbcbc45fbfca509a949b42f87a55da409f6595 -SIZE (kore-3.1.0.tar.gz) = 989917 +TIMESTAMP = 1543654920 +SHA256 (kore-3.2.0.tar.gz) = 24b7a0e0d7f07e1f5a60984feedd37c1aa19a9a5e2c97cccce061b689f8345f8 +SIZE (kore-3.2.0.tar.gz) = 998602 Index: head/devel/kore/files/patch-src_domain.c =================================================================== --- head/devel/kore/files/patch-src_domain.c (revision 486327) +++ head/devel/kore/files/patch-src_domain.c (nonexistent) @@ -1,65 +0,0 @@ -From f87624a459342de33ff58619901da96749fad057 Mon Sep 17 00:00:00 2001 -From: Joris Vink -Date: Mon, 1 Oct 2018 10:36:33 +0200 -Subject: [PATCH] Add missing KORE_NO_TLS guards. - -Fixes NOTLS=1 builds on openssl 1.1.1 ---- - src/domain.c | 4 ++++ - 1 file changed, 4 insertions(+) - -With some additional changes to fix build with OpenSSL 1.0.1u on -FreeBSD 10.4. - ---- src/domain.c.orig 2018-07-18 14:25:49 UTC -+++ src/domain.c -@@ -125,6 +125,7 @@ kore_domain_init(void) - { - TAILQ_INIT(&domains); - -+#if !defined(KORE_NO_TLS) - #if !defined(LIBRESSL_VERSION_TEXT) && OPENSSL_VERSION_NUMBER >= 0x10100000L - if (keymgr_rsa_meth == NULL) { - if ((keymgr_rsa_meth = RSA_meth_new("kore RSA keymgr method", -@@ -143,6 +144,7 @@ kore_domain_init(void) - - EC_KEY_METHOD_set_sign(keymgr_ec_meth, NULL, NULL, keymgr_ecdsa_sign); - #endif -+#endif - } - - void -@@ -155,6 +157,7 @@ kore_domain_cleanup(void) - kore_domain_free(dom); - } - -+#if !defined(KORE_NO_TLS) - #if !defined(LIBRESSL_VERSION_TEXT) && OPENSSL_VERSION_NUMBER >= 0x10100000L - if (keymgr_rsa_meth != NULL) { - RSA_meth_free(keymgr_rsa_meth); -@@ -166,6 +169,7 @@ kore_domain_cleanup(void) - keymgr_ec_meth = NULL; - } - #endif -+#endif - } - - int -@@ -774,7 +778,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 +788,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 Property changes on: head/devel/kore/files/patch-src_domain.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property