From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B48891382C5 for ; Mon, 26 Apr 2021 09:40:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE098E0898; Mon, 26 Apr 2021 09:40:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2469E0898 for ; Mon, 26 Apr 2021 09:40:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 966AB3410D4 for ; Mon, 26 Apr 2021 09:40:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24031478 for ; Mon, 26 Apr 2021 09:40:21 +0000 (UTC) From: "Alexandru Campeanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandru Campeanu" Message-ID: <1619429943.ae65a194038ff27752b13602466ffef599002c09.tiotags1@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/, www-servers/hinsightd/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: www-servers/hinsightd/files/init.d.sh www-servers/hinsightd/hinsightd-9999.ebuild www-servers/hinsightd/metadata.xml X-VCS-Directories: www-servers/hinsightd/files/ www-servers/hinsightd/ X-VCS-Committer: tiotags1 X-VCS-Committer-Name: Alexandru Campeanu X-VCS-Revision: ae65a194038ff27752b13602466ffef599002c09 X-VCS-Branch: dev Date: Mon, 26 Apr 2021 09:40:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16d5ce62-8c92-48b4-9ea9-7a83357c80f0 X-Archives-Hash: 17b306f23dab26d5add4c1b3db9e67f4 commit: ae65a194038ff27752b13602466ffef599002c09 Author: tiotags gmail com> AuthorDate: Mon Apr 26 09:39:03 2021 +0000 Commit: Alexandru Campeanu gmail com> CommitDate: Mon Apr 26 09:39:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae65a194 www-servers/hinsightd: switched to cmake Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/files/init.d.sh | 2 +- www-servers/hinsightd/hinsightd-9999.ebuild | 30 ++++++++++++++++++----------- www-servers/hinsightd/metadata.xml | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/www-servers/hinsightd/files/init.d.sh b/www-servers/hinsightd/files/init.d.sh index 9146de844..bc05ab5c9 100644 --- a/www-servers/hinsightd/files/init.d.sh +++ b/www-servers/hinsightd/files/init.d.sh @@ -14,7 +14,7 @@ RUN_USER="hinsightd" extra_commands="checkconfig reload" command=$RUN_FILE -command_args="--config $CFG_FILE --logdir $LOG_DIR --cwd $CWD_DIR --pidfile $PID_FILE --tmpdir $TMP_DIR" +command_args="--config $CFG_FILE --logdir $LOG_DIR/ --cwd $CWD_DIR/ --pidfile $PID_FILE --tmpdir $TMP_DIR" pidfile="$PID_FILE" command_args_background="--daemonize" command_user="$RUN_USER:$RUN_USER" diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild index 8ae886a39..9107371b8 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -5,21 +5,30 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit git-r3 fcaps lua-single systemd +inherit fcaps lua-single systemd cmake DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9" -EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz" + S="${WORKDIR}/hin9-v${PV}" +fi LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="" #+openssl +IUSE="+openssl" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" dev-util/ninja + dev-util/cmake virtual/pkgconfig " @@ -29,7 +38,7 @@ RDEPEND=" acct-group/hinsightd sys-libs/liburing sys-libs/zlib - dev-libs/openssl + openssl? ( dev-libs/openssl ) " DEPEND="${RDEPEND}" @@ -38,16 +47,15 @@ PATCHES=( "${FILESDIR}/hinsightd-redefine-directories.patch" ) -#src_configure() { -#} - -src_compile() { - cd build - ninja || die +src_configure() { + local mycmakeargs=( + -DUSE_OPENSSL=$(usex openssl) + ) + cmake_src_configure } src_install() { - newbin "${S}/build/hin9" hinsightd + newbin "${BUILD_DIR}/hin9" hinsightd newinitd "${FILESDIR}/init.d.sh" hinsightd systemd_dounit "${FILESDIR}/hinsightd.service" # not tested diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index f494a4303..f06968fc0 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -17,6 +17,6 @@ Full debug information can be toggled per request and outputted to console or a log file. - + Enable tls encryption with openssl