www-servers/hinsightd: version bump 0.9.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alexandru Campeanu <tiotags1@gmail.com>

5 files changed, 95 insertions, 6 deletions

diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index 61940dc50..37be5d923 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1,2 @@
 DIST hin9-v0.9.0.tar.gz 65320 BLAKE2B c1348bc5afffa8804494f6ae228f54874d25cc5f40c17ee2a36f23104286f96f5d616cdc3e98de0854cf7d4b18165a2b70600b32f58024b679d213b2156c1f18 SHA512 60a1ff72d1abf57d8f764ebb77ab77f7069b40bfdbb5bb1c95324b366d1052378ffe36198112a595e08238622654a9c1e1d89679924883f8ff42b98ca7cf139e
+DIST hin9-v0.9.1.tar.gz 64851 BLAKE2B ca646af3b2a752f2b0ba2eec983f807d148b302a7a2db627117686dea3d16811829a1f89a3347708c775d8141372dd91ca46c79c32684b9366b703eb7018706e SHA512 175bbb25bd8be5052bcda96b709b33a996945c63f71249750ab11a46bafdb425818437023a882858e34692abc341d99141954ca31f6296383b26f617e76ac11a
diff --git a/www-servers/hinsightd/files/hinsightd-default-config.patch b/www-servers/hinsightd/files/hinsightd-default-config.patch
new file mode 100644
index 000000000..114be8fe2
--- /dev/null
+++ b/www-servers/hinsightd/files/hinsightd-default-config.patch
@@ -0,0 +1,12 @@
+diff --git a/workdir/main.lua b/workdir/main.lua
+index 4d516c6..08dd597 100644
+--- a/workdir/main.lua
++++ b/workdir/main.lua
+@@ -2,6 +2,7 @@
+ 
+ --redirect_log (logdir.."debug.log")
+ --redirect_log (NULL, "ffffffff")
++redirect_log (logdir.."debug.log")
+ 
+ function printf (...)
+   io.write (string.format (...))
diff --git a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
index 22925c1dc..c204eff35 100644
--- a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
+++ b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
@@ -1,5 +1,5 @@
 diff --git a/src/hin/conf.h b/src/hin/conf.h
-index c4f7f4c..29b9375 100644
+index c4f7f4c..23b0714 100644
 --- a/src/hin/conf.h
 +++ b/src/hin/conf.h
 @@ -2,9 +2,9 @@
@@ -21,8 +21,8 @@ index c4f7f4c..29b9375 100644
  #define HIN_HTTPD_MAX_DEFLATE_SIZE 0
 -#define HIN_HTTPD_POST_DIRECTORY "/tmp"
 -#define HIN_HTTPD_CACHE_DIRECTORY "/tmp"
-+#define HIN_HTTPD_POST_DIRECTORY "/var/tmp/hinsightd"
-+#define HIN_HTTPD_CACHE_DIRECTORY "/var/tmp/hinsightd"
++#define HIN_HTTPD_POST_DIRECTORY "/var/tmp/hinsightd/"
++#define HIN_HTTPD_CACHE_DIRECTORY "/var/tmp/hinsightd/"
  #define HIN_HTTPD_CACHE_CLEAN_ON_EXIT 1
  #define HIN_HTTPD_CACHE_TMPFILE 0
  #define HIN_HTTPD_CACHE_MAX_SIZE 64 * 1024 * 1024
diff --git a/www-servers/hinsightd/hinsightd-0.9.1.ebuild b/www-servers/hinsightd/hinsightd-0.9.1.ebuild
new file mode 100644
index 000000000..924a614e4
--- /dev/null
+++ b/www-servers/hinsightd/hinsightd-0.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit fcaps lua-single systemd cmake
+
+DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
+HOMEPAGE="https://gitlab.com/tiotags/hin9"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
+else
+	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
+	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+openssl"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/ninja
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-user/hinsightd
+	acct-group/hinsightd
+	sys-libs/liburing
+	sys-libs/zlib
+	openssl? ( dev-libs/openssl )
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/hinsightd-redefine-directories.patch"
+	"${FILESDIR}/hinsightd-default-config.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_OPENSSL=$(usex openssl)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	newbin "${BUILD_DIR}/hin9" hinsightd
+	newinitd "${FILESDIR}/init.d.sh" hinsightd
+	systemd_dounit "${FILESDIR}/hinsightd.service" # not tested
+
+	insinto /etc/hinsightd
+	newins "${S}/workdir/main.lua" hinsightd.lua
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate.d.sh hinsightd
+
+	keepdir /var/www/localhost/htdocs
+	keepdir /var/log/hinsightd
+	keepdir /var/tmp/hinsightd
+}
+
+pkg_postinst() {
+	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
+}
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index 9107371b8..924a614e4 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -11,17 +11,16 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
 else
-	KEYWORDS="~amd64"
 	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
 	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 
 IUSE="+openssl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -45,6 +44,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/hinsightd-redefine-directories.patch"
+	"${FILESDIR}/hinsightd-default-config.patch"
 )
 
 src_configure() {