From owner-svn-ports-head@freebsd.org Mon Jan 18 15:42:02 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 101F34EE650; Mon, 18 Jan 2021 15:42:02 +0000 (UTC) (envelope-from amdmi3@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 4DKGHY73WRz4Z3B; Mon, 18 Jan 2021 15:42:01 +0000 (UTC) (envelope-from amdmi3@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 E515616919; Mon, 18 Jan 2021 15:42:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10IFg1j6000762; Mon, 18 Jan 2021 15:42:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10IFg1eL000760; Mon, 18 Jan 2021 15:42:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202101181542.10IFg1eL000760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 18 Jan 2021 15:42:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561921 - in head/security/i2pd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/security/i2pd: . files X-SVN-Commit-Revision: 561921 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 15:42:02 -0000 Author: amdmi3 Date: Mon Jan 18 15:42:01 2021 New Revision: 561921 URL: https://svnweb.freebsd.org/changeset/ports/561921 Log: Revert 561829, this is not a correct solution PR: 252159 Modified: head/security/i2pd/Makefile head/security/i2pd/files/i2pd.in Modified: head/security/i2pd/Makefile ============================================================================== --- head/security/i2pd/Makefile Mon Jan 18 14:32:22 2021 (r561920) +++ head/security/i2pd/Makefile Mon Jan 18 15:42:01 2021 (r561921) @@ -3,7 +3,7 @@ PORTNAME= i2pd PORTVERSION= 2.33.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net-p2p MAINTAINER= amdmi3@FreeBSD.org Modified: head/security/i2pd/files/i2pd.in ============================================================================== --- head/security/i2pd/files/i2pd.in Mon Jan 18 14:32:22 2021 (r561920) +++ head/security/i2pd/files/i2pd.in Mon Jan 18 15:42:01 2021 (r561921) @@ -9,12 +9,6 @@ # # i2pd_enable="YES" # -# By default, it writes logs to /var/log/i2pd/i2pd.log not using syslogd. -# You may change log file name with i2pd_logfile variable in /etc/rc.conf, or -# if you prefer it send logs to syslogd then add the following to /etc/rc.conf: -# -# i2pd_logfile="syslog:warn" # for flags: --log syslog --loglevel warn -# . /etc/rc.subr @@ -28,18 +22,12 @@ load_rc_config ${name} : ${i2pd_group="%%GROUP%%"} : ${i2pd_pidfile="/var/run/${name}/${name}.pid"} : ${i2pd_datadir="/var/db/${name}"} +: ${i2pd_logfile="/var/log/${name}/${name}.log"} -case "$i2pd_logfile" in - syslog) log="--log syslog" ;; - syslog:*) log="--log syslog --loglevel ${i2pd_logfile#syslog:}" ;; - *) : ${i2pd_logfile="/var/log/${name}/${name}.log"} - log="--log file --logfile ${i2pd_logfile}" ;; -esac - required_dirs=${i2pd_datadir} pidfile=${i2pd_pidfile} command="%%PREFIX%%/bin/${name}" -command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --daemon $log" +command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --log file --logfile ${i2pd_logfile} --daemon" extra_commands="reload" reload_cmd="pkill -1 -F ${i2pd_pidfile} -x i2pd"