commit: f3a0eb44418435dd9ed2cff6948963a66d9f66c5
Author: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Wed Apr 20 18:38:36 2022 +0000
Commit: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
CommitDate: Wed Apr 20 19:01:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3a0eb44
www-servers/hinsightd: add 0.9.14, drop 0.9.11
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
www-servers/hinsightd/Manifest | 2 +-
...11_p20210831.ebuild => hinsightd-0.9.14.ebuild} | 28 +++++++++++-----------
www-servers/hinsightd/hinsightd-9999.ebuild | 4 ----
3 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index b98a7186b..f30779379 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1 @@
-DIST hin9-f04d7703f6cdbd2e33f8a7289d80a01dba5e970f.tar.gz 93515 BLAKE2B
7b2369f58042c78cd9a4633f36837b9841dc04f802df93bf2274782a46621cc1d7dfc6340a977ec42d7b0cb9abb8ebc68ebcad15950a64df2c772b457974c89a
SHA512
4bea1785f0ad83ffcf5437456e7f1c11e879dfa037fa89ca892a0d4d920bc7495ee68dc72d31025ebc977bcca48ca7e88194fe13e8884ebe2ce8e5d0b2f54cde
+DIST hin9-v0.9.14.tar.gz 104520 BLAKE2B
2926450af8cd10cd12c06cf157d8815167f1c83baed543821e201947445ca02ccba12a96aa456c555d9bae31da469175680fa565ba786fef27ceb9629f0cbd52
SHA512
b2f473024570738717d16fc5be86ad91bbf79cf1886e1f61ea55fb64769bf8410943a1ae71585411053c70907ab1c4e7556135383a9d4048f516349b11ac952f
diff --git a/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild
b/www-servers/hinsightd/hinsightd-0.9.14.ebuild
similarity index 76%
rename from www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild
rename to www-servers/hinsightd/hinsightd-0.9.14.ebuild
index 9d8876529..1d5a41be8 100644
--- a/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.14.ebuild
@@ -1,7 +1,7 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
@@ -12,22 +12,16 @@ HOMEPAGE="https://gitlab.com/tiotags/hin9";
LICENSE="BSD"
SLOT="0"
-mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f"
-
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git";
-elif [[ ! -z "$mycommit" ]]; then
-
SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz";
- S="${WORKDIR}/hin9-${mycommit}"
- KEYWORDS="~amd64"
else
SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz";
S="${WORKDIR}/hin9-v${PV}"
KEYWORDS="~amd64"
fi
-IUSE="+openssl"
+IUSE="+openssl cgi +fcgi +rproxy +ffcall"
REQUIRED_USE="${LUA_REQUIRED_USE}"
BDEPEND="
@@ -43,6 +37,7 @@ RDEPEND="
sys-libs/zlib
virtual/libcrypt
openssl? ( dev-libs/openssl )
+ ffcall? ( dev-libs/ffcall )
"
DEPEND="${RDEPEND}"
@@ -51,16 +46,23 @@ PATCHES=(
"${FILESDIR}/${PN}-defines-v4.patch"
)
+FILECAPS=(
+ cap_net_bind_service usr/sbin/${PN}
+)
+
src_configure() {
local mycmakeargs=(
-DUSE_OPENSSL=$(usex openssl)
+ -DUSE_CGI=$(usex cgi)
+ -DUSE_FCGI=$(usex fcgi)
+ -DUSE_RPROXY=$(usex rproxy)
+ -DUSE_FFCALL=$(usex ffcall)
)
cmake_src_configure
}
src_install() {
- newsbin "${BUILD_DIR}/hin9" $PN
- newbin "${BUILD_DIR}/hin9_pid_helper" ${PN}_pid_helper
+ cmake_src_install
newinitd "${S}/external/packaging/$PN.initd.sh" $PN
newconfd "${S}/external/packaging/$PN.confd.sh" $PN
systemd_dounit "${FILESDIR}/$PN.service" # not tested
@@ -69,17 +71,15 @@ src_install() {
insinto /etc/$PN
doins "${S}/workdir/main.lua"
doins "${S}/workdir/lib.lua"
- doins "${S}/workdir/default_config.lua"
+ doins -r "${S}/workdir/config/"
# logrotate
insinto /etc/logrotate.d
newins "${S}/external/packaging/$PN.logrotate.sh" $PN
-
- keepdir /var/www/localhost
}
pkg_postinst() {
- fcaps CAP_NET_BIND_SERVICE /usr/sbin/$PN
+ fcaps_pkg_postinst
if kernel_is lt 5 7; then
ewarn ""
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild
b/www-servers/hinsightd/hinsightd-9999.ebuild
index f160cba68..1d5a41be8 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -15,10 +15,6 @@ SLOT="0"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git";
-elif [[ ! -z "$mycommit" ]]; then
-
SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz";
- S="${WORKDIR}/hin9-${mycommit}"
- KEYWORDS="~amd64"
else
SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz";
S="${WORKDIR}/hin9-v${PV}"
