From nobody Fri Apr 08 17:10:06 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 499E518463BF; Fri, 8 Apr 2022 17:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZl9q0jCYz3Lpk; Fri, 8 Apr 2022 17:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649437807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKq4IiGcVlkXIUJrqkDxWreP7VEp5cnEtrilC4uiR9k=; b=gbd3ToKXahWL+z55YYpAhZxBXcSGmcecTjpI3f9+UWk01edbO7J/4DGpwl5zMUzB7fYruv Hx3HkWBrn4kiB/kWLP8jQlcJTxI4ldGeqh4khkhz3p/e98TF1KG5vY967Kp8FE4+rj5OUp +F+68ljh4bhK4Y44lV8hwsom1nHxup2EMrAJhTT0JtdPXLV7Vl3nEAcC8wDheuOu4yyNBm aZLZVamPCDmW74zKpYtOOElhwi+GZ2b2Tq61Kk0OlKIEj0VmjOpPN4MLelqrVKbfN6iXCO ZItZC6SfQRxzQComEPjmPcOLCqPIbPduFtcGvjzkncaoMruT8K99TqWgaPj8pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9410E96; Fri, 8 Apr 2022 17:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 238HA6ZH067219; Fri, 8 Apr 2022 17:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238HA6lE067216; Fri, 8 Apr 2022 17:10:06 GMT (envelope-from git) Date: Fri, 8 Apr 2022 17:10:06 GMT Message-Id: <202204081710.238HA6lE067216@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: b7b4ae443f9c - main - devel/clixon: Update to 5.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7b4ae443f9cabe10c475c63eb52c63fe8e80f69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649437807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKq4IiGcVlkXIUJrqkDxWreP7VEp5cnEtrilC4uiR9k=; b=yXgknODn4SwSZ1NSzXMcLMZbCftPIxwqL50uasanZ9zLd35Nws1sW7soAJuBwUSGrgmtd0 fGfV+c/mIFMWK1Bnf+Z//ZuVuAWZcHhTdTcUDHe+qpGL9GHz6zJa0uvag7tW41Qj428M3C 6vmWbO6FBwzLXTT2Dro7Bwn8QIbiC7vTdubiBPK1Cyofe3ofTvJkpsANvB0VEF4G6kIXGg sikBKzMGUx1uBauN/GwN1i4/Nleuc+Fu6TwKVnsTDTMfUR+SrHx7GeRG3wkNyP+81eeTmf 4CVO+fUaxO/IKgMwH7jlXzjaD2CSl0ettEu8qvgO5JUI5ea2qUsFuYgly5CyGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649437807; a=rsa-sha256; cv=none; b=xV3aBNMyXZm3FP7TUBxXZdwTfThUfBiYx843VCgn9oZYTafZbkMR9Uo7AW+AjTNAXtl90h UOqMMeschAhwKBz1Iri3zmF78HHSOjam82Qt31ud+iQ8j0v/4Nt4fqdFxk5nqaGOTN3pb0 tHkVidIVl4Rkq4Y/xwgM7gu4cZYyIDPZ2PVBv00mWdA6vzRDn5ldhVYLrd2kNKw1n7YnfV sSG2k0JwiUuUyqXMpNdg8bhkjhFyWQAN0WH3z7sWhXsi8BPACRGpyG7hOJ+D0dCNfb/YmE xDVFThMo7b/DF1691tkUoX6tOIMnQTjMBKguoFmJa3z1bE97IjG+zc/z7KGftw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7b4ae443f9cabe10c475c63eb52c63fe8e80f69 commit b7b4ae443f9cabe10c475c63eb52c63fe8e80f69 Author: Renato Botelho AuthorDate: 2022-04-08 11:44:10 +0000 Commit: Renato Botelho CommitDate: 2022-04-08 17:09:59 +0000 devel/clixon: Update to 5.6.0 Added new OPTIONS to let users to enable/disable restconf and if enabled, chose between embedded one or fcgi Approved by: Dave Cornejo (maintainer) Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/clixon/Makefile | 40 +++++++++++++++++++++++++++---------- devel/clixon/distinfo | 6 +++--- devel/clixon/pkg-plist | 54 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 68 insertions(+), 32 deletions(-) diff --git a/devel/clixon/Makefile b/devel/clixon/Makefile index a734c0f7347e..d26a8a07df23 100644 --- a/devel/clixon/Makefile +++ b/devel/clixon/Makefile @@ -1,5 +1,5 @@ PORTNAME= clixon -PORTVERSION= 4.8.0 +PORTVERSION= 5.6.0 CATEGORIES= devel MAINTAINER= dcornejo@netgate.com @@ -8,27 +8,45 @@ COMMENT= YANG-based toolchain including CLI, NETCONF and RESTCONF interfaces LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libcligen.so:devel/cligen \ - libfcgi.so:www/fcgi -BUILD_DEPENDS= cligen>=4.8.0:devel/cligen +#LIB_DEPENDS= libfcgi.so:www/fcgi +BUILD_DEPENDS= cligen>=5.6.0:devel/cligen \ + nghttp2>=0:www/nghttp2 +RUN_DEPENDS= cligen>=5.6.0:devel/cligen \ + nghttp2>=0:www/nghttp2 -USES= autoreconf bison compiler:c11 gmake +USES= bison compiler:c11 gmake -USE_LDCONFIG= yes USE_GITHUB= yes - GH_ACCOUNT= clicon -MAKE_ARGS= wwwdir=${PREFIX}/sbin \ - wwwuser=${WWWOWN} -GROUPS= clixon -USERS= clixon +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ --with-cligen=${LOCALBASE} CONFIGURE_ENV= YACC="bison -y" +MAKE_ARGS= wwwdir=${PREFIX}/sbin \ + wwwuser=${WWWOWN} SUB_FILES= pkg-message +USERS= clixon +GROUPS= clixon + +OPTIONS_DEFAULT= NATIVE +OPTIONS_SINGLE= RESTCONF +OPTIONS_SINGLE_RESTCONF= NATIVE FCGI OFF +OPTIONS_SUB= yes + +FCGI_DESC= FCGI interface for stand-alone web rev-proxy (eg nginx) +NATIVE_DESC= Use embedded web server +OFF_DESC= Disable restconf + +FCGI_LIB_DEPENDS= libfcgi.so:www/fcgi +FCGI_CONFIGURE_ON= --with-restconf=fcgi +NATIVE_BUILD_DEPENDS= nghttp2>=0:www/nghttp2 +NATIVE_RUN_DEPENDS= nghttp2>=0:www/nghttp2 +NATIVE_CONFIGURE_ON= --with-restconf=native +OFF_CONFIGURE_ON= --without-restconf + .include diff --git a/devel/clixon/distinfo b/devel/clixon/distinfo index bc9b7a790764..a5974f692919 100644 --- a/devel/clixon/distinfo +++ b/devel/clixon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606784428 -SHA256 (clicon-clixon-4.8.0_GH0.tar.gz) = 9691e1387af144e30df730c420097b12edaae87b8fcd54183160b26ac6fd07e9 -SIZE (clicon-clixon-4.8.0_GH0.tar.gz) = 1187697 +TIMESTAMP = 1649416117 +SHA256 (clicon-clixon-5.6.0_GH0.tar.gz) = 19d1847a49ffb947b492c4e535704492aabd670cc7cc431f99aeb075c79e8f59 +SIZE (clicon-clixon-5.6.0_GH0.tar.gz) = 1410229 diff --git a/devel/clixon/pkg-plist b/devel/clixon/pkg-plist index a6830fd3bb72..8d9d55700c70 100644 --- a/devel/clixon/pkg-plist +++ b/devel/clixon/pkg-plist @@ -1,14 +1,20 @@ bin/clixon_cli bin/clixon_netconf %%ETCDIR%%/clixonrc +include/clixon/cli_autocli.h +include/clixon/cli_generate.h include/clixon/clixon.h include/clixon/clixon_backend.h +include/clixon/clixon_backend_commit.h include/clixon/clixon_backend_handle.h +include/clixon/clixon_backend_plugin.h include/clixon/clixon_backend_transaction.h include/clixon/clixon_cli.h include/clixon/clixon_cli_api.h +include/clixon/clixon_client.h include/clixon/clixon_data.h include/clixon/clixon_datastore.h +include/clixon/clixon_dispatcher.h include/clixon/clixon_err.h include/clixon/clixon_err_string.h include/clixon/clixon_event.h @@ -20,15 +26,16 @@ include/clixon/clixon_log.h include/clixon/clixon_nacm.h include/clixon/clixon_netconf.h include/clixon/clixon_netconf_lib.h +include/clixon/clixon_netns.h include/clixon/clixon_options.h include/clixon/clixon_path.h include/clixon/clixon_plugin.h +include/clixon/clixon_proc.h include/clixon/clixon_proto.h include/clixon/clixon_proto_client.h include/clixon/clixon_queue.h include/clixon/clixon_regex.h -include/clixon/clixon_restconf.h -include/clixon/clixon_sha1.h +%%NO_OFF%%include/clixon/clixon_restconf.h include/clixon/clixon_sig.h include/clixon/clixon_stream.h include/clixon/clixon_string.h @@ -45,37 +52,48 @@ include/clixon/clixon_xml_vec.h include/clixon/clixon_xpath.h include/clixon/clixon_xpath_ctx.h include/clixon/clixon_xpath_optimize.h +include/clixon/clixon_xpath_yang.h include/clixon/clixon_yang.h include/clixon/clixon_yang_module.h include/clixon/clixon_yang_parse_lib.h include/clixon/clixon_yang_type.h lib/libclixon.so -lib/libclixon.so.4 -lib/libclixon.so.4.8 +lib/libclixon.so.5 +lib/libclixon.so.5.6 lib/libclixon_backend.so -lib/libclixon_backend.so.4 -lib/libclixon_backend.so.4.8 +lib/libclixon_backend.so.5 +lib/libclixon_backend.so.5.6 lib/libclixon_cli.so -lib/libclixon_cli.so.4 -lib/libclixon_cli.so.4.8 +lib/libclixon_cli.so.5 +lib/libclixon_cli.so.5.6 lib/libclixon_netconf.so -lib/libclixon_netconf.so.4 -lib/libclixon_netconf.so.4.8 -lib/libclixon_restconf.so -lib/libclixon_restconf.so.4 -lib/libclixon_restconf.so.4.8 +lib/libclixon_netconf.so.5 +lib/libclixon_netconf.so.5.6 +%%NO_OFF%%lib/libclixon_restconf.so +%%NO_OFF%%lib/libclixon_restconf.so.5 +%%NO_OFF%%lib/libclixon_restconf.so.5.6 sbin/clixon_backend -sbin/clixon_restconf -%%DATADIR%%/clixon-config@2020-10-01.yang -%%DATADIR%%/clixon-lib@2020-04-23.yang +%%NO_OFF%%sbin/clixon_restconf +%%DATADIR%%/clixon-autocli@2022-02-11.yang +%%DATADIR%%/clixon-config@2022-02-11.yang +%%DATADIR%%/clixon-lib@2021-12-05.yang +%%DATADIR%%/clixon-restconf@2021-05-20.yang %%DATADIR%%/clixon-rfc5277@2008-07-01.yang %%DATADIR%%/clixon-xml-changelog@2019-03-21.yang -%%DATADIR%%/ietf-inet-types@2013-07-15.yang +%%DATADIR%%/ietf-datastores@2018-02-14.yang +%%DATADIR%%/ietf-inet-types@2021-02-22.yang +%%DATADIR%%/ietf-list-pagination-nc@2021-10-25.yang +%%DATADIR%%/ietf-list-pagination@2021-10-25.yang %%DATADIR%%/ietf-netconf-acm@2018-02-14.yang +%%DATADIR%%/ietf-netconf-nmda@2019-01-07.yang +%%DATADIR%%/ietf-netconf-with-defaults@2011-06-01.yang %%DATADIR%%/ietf-netconf@2011-06-01.yang +%%DATADIR%%/ietf-origin@2018-02-14.yang %%DATADIR%%/ietf-restconf-monitoring@2017-01-26.yang %%DATADIR%%/ietf-restconf@2017-01-26.yang -%%DATADIR%%/ietf-yang-library@2016-06-21.yang +%%DATADIR%%/ietf-yang-library@2019-01-04.yang +%%DATADIR%%/ietf-yang-metadata@2016-08-05.yang +%%DATADIR%%/ietf-yang-patch@2017-02-22.yang %%DATADIR%%/ietf-yang-types@2013-07-15.yang @dir lib/clixon/plugins/backend @dir lib/clixon/plugins/cli