From nobody Tue Jan 10 19:18:15 2023 X-Original-To: dev-commits-ports-all@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 4Ns0vr0QZ1z2p2JQ; Tue, 10 Jan 2023 19:18:16 +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 4Ns0vq73CBz4HqB; Tue, 10 Jan 2023 19:18:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673378296; 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=dhFSid9ILeouwxfPaZj4tg78BDv+Al8ymd9dO5MOkkg=; b=hQTUEo5QjRA96UaQOYGIrg99z6glJr/QtVlszXrnTeznf5kdP7l3gcp3dqOqI0mXx/4Jsp MNGPBa+d/8Z0f1heB+Uc+iEvDTGdJaH61IOi0C2+gwnP5MJ4USQ/0rKWiCLAYspK92MDSy jbbWY+uCIZoIwpjOnku5M4OoU/Vs2nJ30l3VyuJVLPJlyfNpQJKyLd4KMIddAmIiSbV1R0 Kc8NvgugM1yHHuwAidGh1IOu3KyqoLIRzEV5vbwL1uhIjbvHOLVCePsaXl3IyasCMtUDu/ RqqzZQtDo6gREsxWt3HQcbfJlGbb3sp0NUrr1oRx90fUb5CpL8JKjtDktpgAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673378296; 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=dhFSid9ILeouwxfPaZj4tg78BDv+Al8ymd9dO5MOkkg=; b=WLuv/QkYjNWTVz3RT85seSQ3JVRZZ+ObOyPy+S0JnDXawPmvcDFeNigrU2+kmOhFXva4Yp JhcZuG8Qi5qAAah0xORWkRrYx3xLTlSH7E2U/O2G5m+eMZm/TaezjJubcdNtTD9hSG9kIT QSu6kstL3PtHu37Ioni9XZKNQlEdn+kBDYgbHif1sqMBy9J+goUbKXjPAfV59+KapQtkgn zYKaAtngfiVe65CopGnuFtBhmNv+7jRmpRBymh8fdompbmQOdM1jKxVs+e1z3gPvUU3woD db1Zlf5PldYBBYDL3pHVfFLka0CO8ReKdRC0s4U96+fKpKMAxdUUJg0aQxItcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673378296; a=rsa-sha256; cv=none; b=DHoSL5G1tGCnwWM1TA4N8ES7FEmDIGwPz5W1iURWi78nYPY0mUWSHc3WHXt+8z0FKFFwl1 KtSPXCJ50L7X+qYwow1JmuRaBe4t6SFRQ0gJBkuflOfRtYBLMxyT31NaZwxI2YcVtZwXji /cevAfQNolBMJeTFo48ulzGRBaBQv1GVMZef/L1TTpoSXKtyRQI20VGdElCStFzQT6Kv5T Afub9/pd9OPaJVInhkOldxVAzJj53H9TjLmKAuqMtvzDqJd9nzJaY+m0AcWjz67MOVtBR2 /1HZn1MgVKTfaWycEfrHeGhCjywKH0pYX6RF5GgkpjfT0gVXccZzDQhUWPYDVw== 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 4Ns0vq5qJczKN2; Tue, 10 Jan 2023 19:18:15 +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 30AJIFJk053476; Tue, 10 Jan 2023 19:18:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AJIFgM053475; Tue, 10 Jan 2023 19:18:15 GMT (envelope-from git) Date: Tue, 10 Jan 2023 19:18:15 GMT Message-Id: <202301101918.30AJIFgM053475@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: e7682c8251ec - main - sysutils/zrepl: various improvements List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7682c8251ec3098e6562374c4a43d748e03e8d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7682c8251ec3098e6562374c4a43d748e03e8d6 commit e7682c8251ec3098e6562374c4a43d748e03e8d6 Author: Dries Michiels AuthorDate: 2023-01-09 22:03:28 +0000 Commit: Dries Michiels CommitDate: 2023-01-10 19:18:13 +0000 sysutils/zrepl: various improvements * Drop unneeded FreeBSD check, this was tracked down to a version check not being fully removed. Only the version check was removed but the FreeBSD check remained unnecessarily. * Limit the syslog sample to zrepl log messages, other daemons use local0 as facility too. * Switch to uses:ncurses --- sysutils/zrepl/Makefile | 18 ++---------------- sysutils/zrepl/files/syslog.conf | 1 + sysutils/zrepl/files/zrepl.in | 3 ++- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile index 340a6ac098d0..ed56db478494 100644 --- a/sysutils/zrepl/Makefile +++ b/sysutils/zrepl/Makefile @@ -1,6 +1,7 @@ PORTNAME= zrepl DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= driesm@FreeBSD.org @@ -10,7 +11,7 @@ WWW= https://zrepl.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:modules +USES= go:modules ncurses USE_RC_SUBR= zrepl GO_MODULE= github.com/${PORTNAME}/${PORTNAME} @@ -27,21 +28,6 @@ MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.5,1:textproc/py-sphin MANPAGES_USES= gmake python:build,3.6+ MANPAGES_PLIST_FILES= man/man1/zrepl.1.gz -.include - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079 -USES+= ncurses -.else -USES+= ncurses:port -CFLAGS+= -I${LOCALBASE}/include/ncurses -.endif - -.if ${OPSYS} == "FreeBSD" -SUB_LIST+= DAEMON_LOGGING="-S -l \$${zrepl_facility} -s \$${zrepl_priority} -T \$${name}" -.else -SUB_LIST+= DAEMON_LOGGING="" -.endif - post-build-MANPAGES-on: @${MAKE_CMD} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man diff --git a/sysutils/zrepl/files/syslog.conf b/sysutils/zrepl/files/syslog.conf index 1cf0a16406e0..c825c409d5a6 100644 --- a/sysutils/zrepl/files/syslog.conf +++ b/sysutils/zrepl/files/syslog.conf @@ -3,4 +3,5 @@ # # SELECTOR ACTION # FACILITY.[!<=>]LEVEL +!zrepl local0.info /var/log/zrepl.log diff --git a/sysutils/zrepl/files/zrepl.in b/sysutils/zrepl/files/zrepl.in index 095a43f0d610..6a2510f80572 100644 --- a/sysutils/zrepl/files/zrepl.in +++ b/sysutils/zrepl/files/zrepl.in @@ -43,7 +43,8 @@ load_rc_config $name pidfile="/var/run/zrepl.pid" command="/usr/sbin/daemon" procname="%%PREFIX%%/bin/zrepl" -command_args="-p ${pidfile} %%DAEMON_LOGGING%% ${procname} ${zrepl_options} daemon" +command_args="-p ${pidfile} -S -l ${zrepl_facility} -s ${zrepl_priority} -T ${name} \ + ${procname} ${zrepl_options} daemon" start_precmd="zrepl_precmd" stop_postcmd="zrepl_postcmd"