Date: Fri, 25 Oct 2019 12:46:19 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515608 - in head/net/kea: . files Message-ID: <201910251246.x9PCkJC2028014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Fri Oct 25 12:46:19 2019 New Revision: 515608 URL: https://svnweb.freebsd.org/changeset/ports/515608 Log: net/kea: Pet portlint, rclint Also, add patch to support colorized output for `keactl status`. PR: 241349 Submitted by: Jose Luis Duran <jlduran@gmail.com> Approved by: Andrey Pevnev <apevnev@me.com> (maintainer) Added: head/net/kea/files/patch-src_bin_keactrl_keactrl.in (contents, props changed) Modified: head/net/kea/Makefile head/net/kea/files/kea.in head/net/kea/files/patch-Makefile.am head/net/kea/files/patch-src-bin-keactrl-Makefile.am head/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am head/net/kea/pkg-plist Modified: head/net/kea/Makefile ============================================================================== --- head/net/kea/Makefile Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/Makefile Fri Oct 25 12:46:19 2019 (r515608) @@ -2,7 +2,7 @@ PORTNAME= kea PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ISC/kea/${ISCVERSION} DISTNAME= ${PORTNAME}-${ISCVERSION} @@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \ libboost_system.so:devel/boost-libs +USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe + # ISC releases things like 1.4.0-P1, which our versioning doesn't like ISCVERSION= 1.6.0 @@ -25,7 +27,6 @@ CPE_VERSION= ${ISCVERSION:C/-.*//} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif -USES= autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes Modified: head/net/kea/files/kea.in ============================================================================== --- head/net/kea/files/kea.in Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/files/kea.in Fri Oct 25 12:46:19 2019 (r515608) @@ -3,7 +3,7 @@ # # PROVIDE: kea # REQUIRE: netif routing -# KEYWORD: nojail +# KEYWORD: nojail shutdown # # Add the following to /etc/rc.conf[.local] to enable this service @@ -13,28 +13,20 @@ . /etc/rc.subr -name="kea" -rcvar="${name}_enable" -command="%%PREFIX%%/sbin/keactrl" -required_files="%%PREFIX%%/etc/${name}/keactrl.conf" -extra_commands="reload" -start_precmd="kea_start_precmd" -stop_cmd="kea_cmd stop" -status_cmd="kea_cmd status" -reload_cmd="kea_cmd reload" +name=kea +desc="Kea DHCP Server" +rcvar=kea_enable -kea_start_precmd() -{ +load_rc_config $name - command_args="start" -} +kea_enable=${kea_enable:-"NO"} -kea_cmd() -{ +command="%%PREFIX%%/sbin/keactrl" +required_files="%%PREFIX%%/etc/${name}/keactrl.conf" +extra_commands=reload +start_precmd=command_args=start +stop_cmd="$command stop" +status_cmd="$command status" +reload_cmd="$command reload" - $command $1 -} - -load_rc_config $name -: ${kea_enable="NO"} run_rc_command "$1" Modified: head/net/kea/files/patch-Makefile.am ============================================================================== --- head/net/kea/files/patch-Makefile.am Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/files/patch-Makefile.am Fri Oct 25 12:46:19 2019 (r515608) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2019-09-07 13:19:16.709194000 -0500 -+++ Makefile.am 2019-09-07 13:20:04.760926000 -0500 -@@ -154,7 +154,6 @@ +--- Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ Makefile.am +@@ -154,7 +154,6 @@ docs: # These steps are necessary during installation install-exec-hook: mkdir -p $(DESTDIR)${localstatedir}/log/ Modified: head/net/kea/files/patch-src-bin-keactrl-Makefile.am ============================================================================== --- head/net/kea/files/patch-src-bin-keactrl-Makefile.am Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/files/patch-src-bin-keactrl-Makefile.am Fri Oct 25 12:46:19 2019 (r515608) @@ -1,6 +1,6 @@ ---- src/bin/keactrl/Makefile.am.orig 2019-09-07 12:46:25.279164000 -0500 -+++ src/bin/keactrl/Makefile.am 2019-09-07 12:46:32.455324000 -0500 -@@ -62,7 +62,7 @@ +--- src/bin/keactrl/Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ src/bin/keactrl/Makefile.am +@@ -62,7 +62,7 @@ install-data-local: $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \ fi; \ if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \ Modified: head/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am ============================================================================== --- head/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/files/patch-src-lib-dhcpsrv-Makefile.am Fri Oct 25 12:46:19 2019 (r515608) @@ -1,6 +1,6 @@ ---- src/lib/dhcpsrv/Makefile.am.orig 2019-09-07 13:00:43.923225000 -0500 -+++ src/lib/dhcpsrv/Makefile.am 2019-09-07 13:02:13.215945000 -0500 -@@ -4,7 +4,7 @@ +--- src/lib/dhcpsrv/Makefile.am.orig 2019-10-25 12:41:08 UTC ++++ src/lib/dhcpsrv/Makefile.am +@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks # DATA_DIR is the directory where to put default CSV files and the DHCPv6 # server ID file (i.e. the file where the server finds its DUID at startup). Added: head/net/kea/files/patch-src_bin_keactrl_keactrl.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/kea/files/patch-src_bin_keactrl_keactrl.in Fri Oct 25 12:46:19 2019 (r515608) @@ -0,0 +1,13 @@ +--- src/bin/keactrl/keactrl.in.orig 2019-10-19 21:50:45 UTC ++++ src/bin/keactrl/keactrl.in +@@ -517,8 +517,8 @@ ${args}" 1 + + status) + if [ -t 1 ]; then +- inactive="\e[91minactive\e[0m" +- active="\e[92mactive\e[0m" ++ inactive="\033[91minactive\033[0m" ++ active="\033[92mactive\033[0m" + else + inactive="inactive" + active="active" Modified: head/net/kea/pkg-plist ============================================================================== --- head/net/kea/pkg-plist Fri Oct 25 12:30:19 2019 (r515607) +++ head/net/kea/pkg-plist Fri Oct 25 12:46:19 2019 (r515608) @@ -1,3 +1,8 @@ +@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample +@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample +@sample %%ETCDIR%%/kea-dhcp4.conf.sample +@sample %%ETCDIR%%/kea-dhcp6.conf.sample +@sample %%ETCDIR%%/keactrl.conf.sample include/kea/asiodns/asiodns_messages.h include/kea/asiodns/io_fetch.h include/kea/asiodns/logger.h @@ -517,10 +522,5 @@ sbin/keactrl %%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh %%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh %%DATADIR%%/scripts/pgsql/wipe_data.sh -@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample -@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample -@sample %%ETCDIR%%/kea-dhcp4.conf.sample -@sample %%ETCDIR%%/kea-dhcp6.conf.sample -@sample %%ETCDIR%%/keactrl.conf.sample @dir /var/db/kea @dir /var/run/kea
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910251246.x9PCkJC2028014>