[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: bca5a0d519b13dbe7098aca0cd6343c829368def Author: Alexandru Campeanu gmail com> AuthorDate: Fri Nov 18 16:03:48 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Fri Nov 18 16:03:48 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bca5a0d5 www-servers/hinsightd: add 0.9.17, drop old, fix pkgcheck warnings Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest| 2 +- .../hinsightd/{hinsightd-0.9.16.ebuild => hinsightd-0.9.17.ebuild}| 4 ++-- www-servers/hinsightd/hinsightd-.ebuild | 4 ++-- www-servers/hinsightd/metadata.xml| 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 43b5b9b6f..1b5c10abd 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.16.tar.gz 121567 BLAKE2B 418856248b7ed36542be06dda342b4abc2ae971f4097c669239806b8df8dfc4a24a9fd80aa45c4bd1b77146f60a51e239b1d3fb69c6cfc59c3b1e83ea8578a0c SHA512 22dc98187d8ed0a4930225f977a9ba19ded516f5c05a96768d93f04b9433a227648b4a89a88d357b8f60d27093b389d6d70f1cf67c1b436498ca18b10b8c6fd9 +DIST hin9-v0.9.17.tar.bz2 93892 BLAKE2B 0c873d5ca3cbcb00c6b5498ee599dcb2644d84e6c03a1cc4529abbcc47640a3996edd7efd4356a6fdd221e76318215e2a29812176324088cdd6942e602e44ce5 SHA512 eeb6f7636867d1fff072594dfbca8942ef8ebe09bc3c7eb903381c17da9364d6961a3d0cfa4aa1dd4ab02bcea7934a06c1022a549902bc1a32b5f5cd25a8be65 diff --git a/www-servers/hinsightd/hinsightd-0.9.16.ebuild b/www-servers/hinsightd/hinsightd-0.9.17.ebuild similarity index 98% rename from www-servers/hinsightd/hinsightd-0.9.16.ebuild rename to www-servers/hinsightd/hinsightd-0.9.17.ebuild index 2f6e9c8e9..a56cbfc9a 100644 --- a/www-servers/hinsightd/hinsightd-0.9.16.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.17.ebuild @@ -16,10 +16,10 @@ if [[ ${PV} == ** ]]; 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"; + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.bz2"; S="${WORKDIR}/hin9-${mycommit}" else - SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.bz2"; S="${WORKDIR}/hin9-v${PV}" fi diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 2f6e9c8e9..a56cbfc9a 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -16,10 +16,10 @@ if [[ ${PV} == ** ]]; 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"; + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.bz2"; S="${WORKDIR}/hin9-${mycommit}" else - SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.bz2"; S="${WORKDIR}/hin9-v${PV}" fi diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 6b7dca518..cb7d4e1ea 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -8,6 +8,7 @@ https://gitlab.com/tiotags/hin9/-/blob/master/docs/changes.md https://gitlab.com/tiotags/hin9/-/issues + tiotags/hin9 hinsightd is a http/1.1 webserver with a focus on simple code and
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: a1793afafdd4afafb9bf92f121908432aef6ec7d Author: Alexandru Campeanu gmail com> AuthorDate: Tue Nov 1 14:49:00 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue Nov 1 14:49:00 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1793afa www-servers/hinsightd: add 0.9.16, drop 0.9.15_p20220828 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../{hinsightd-0.9.15_p20220828.ebuild => hinsightd-0.9.16.ebuild} | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index a5e73193f..43b5b9b6f 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-4843c07f40c4ed6ea7b5945b73fa999fb7881564.tar.gz 116931 BLAKE2B c2d2af2b14e465b38dd7c19d0eece7b745b2686ab786b2f6266ac70fd5a94fca2d7da37b672fffcfcdfac9b8940d47089adf04b81a9542e0e52d6d324afc62c8 SHA512 26ec3e1468ba354af4d0a5eb0540fdb80810713700f63ce1fb32c68682b3a39463bc950eee8b1dd7ca103d5623ce3f385b925cc7408a23bdda802adddbb3e2cc +DIST hin9-v0.9.16.tar.gz 121567 BLAKE2B 418856248b7ed36542be06dda342b4abc2ae971f4097c669239806b8df8dfc4a24a9fd80aa45c4bd1b77146f60a51e239b1d3fb69c6cfc59c3b1e83ea8578a0c SHA512 22dc98187d8ed0a4930225f977a9ba19ded516f5c05a96768d93f04b9433a227648b4a89a88d357b8f60d27093b389d6d70f1cf67c1b436498ca18b10b8c6fd9 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild b/www-servers/hinsightd/hinsightd-0.9.16.ebuild similarity index 97% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild rename to www-servers/hinsightd/hinsightd-0.9.16.ebuild index b53621153..2f6e9c8e9 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.16.ebuild @@ -12,8 +12,6 @@ HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" -mycommit="4843c07f40c4ed6ea7b5945b73fa999fb7881564" - if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git";
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: a2c960b186abc6367771ab6f01792d96e4c553d7 Author: Alexandru Campeanu gmail com> AuthorDate: Sun Aug 28 09:26:36 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Sun Aug 28 09:26:36 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a2c960b1 www-servers/hinsightd: add 0.9.15_p20220828, drop old Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 3 +- .../hinsightd/hinsightd-0.9.15_p20220822.ebuild| 104 - ...26.ebuild => hinsightd-0.9.15_p20220828.ebuild} | 2 +- 3 files changed, 2 insertions(+), 107 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 9d5f3af9b..a5e73193f 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,2 +1 @@ -DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000 -DIST hin9-60ff105ba76746ac8f669616ed3658f7c03c3ab3.tar.gz 116619 BLAKE2B 9ec584cc31c853f210e3c4b9306e675fb2501c99239b86fc8b5d925532fba8402b40b9ff43eebafec70457f67f11174e36a7c49aa59483606e19ebdf936e SHA512 e4e6e62b618e0fa845d94a723b4723e230fa03415ad4831bddc0a99f8c262fdca495a8ea6bdb7019e3a97bcf03554fae6f09a2a673e2f3db3e535c5fdc490f4e +DIST hin9-4843c07f40c4ed6ea7b5945b73fa999fb7881564.tar.gz 116931 BLAKE2B c2d2af2b14e465b38dd7c19d0eece7b745b2686ab786b2f6266ac70fd5a94fca2d7da37b672fffcfcdfac9b8940d47089adf04b81a9542e0e52d6d324afc62c8 SHA512 26ec3e1468ba354af4d0a5eb0540fdb80810713700f63ce1fb32c68682b3a39463bc950eee8b1dd7ca103d5623ce3f385b925cc7408a23bdda802adddbb3e2cc diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild deleted file mode 100644 index e4f9da342..0 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit fcaps lua-single systemd meson linux-info - -DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" -HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; -LICENSE="BSD" -SLOT="0" - -mycommit="0c584cbe00c2227d4cb29675e8e2da2c6bd57371" - -if [[ ${PV} == ** ]]; 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}" -else - SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; - S="${WORKDIR}/hin9-v${PV}" -fi - -if [[ ${PV} != ** ]]; then - KEYWORDS="~amd64" -fi - -IUSE="+ssl cgi +fcgi +rproxy +ffcall" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -BDEPEND=" - dev-util/meson - virtual/pkgconfig -" - -RDEPEND=" - ${LUA_DEPS} - acct-user/hinsightd - acct-group/hinsightd - sys-libs/liburing - sys-libs/zlib - virtual/libcrypt - ssl? ( dev-libs/openssl ) - ffcall? ( dev-libs/ffcall ) -" - -DEPEND="${RDEPEND}" - -FILECAPS=( - cap_net_bind_service usr/sbin/${PN} -) - -pkg_setup() { - linux-info_pkg_setup; - lua-single_pkg_setup -} - -src_configure() { - version=$(ver_cut 1-2 $(lua_get_version)) - if [ "$version" == "2.1" ]; then - version="jit" - fi - local emesonargs=( - $(meson_use ssl openssl) - $(meson_use cgi) - $(meson_use fcgi) - $(meson_use rproxy) - $(meson_use ffcall) - -Dforce-lua-version=$version - ) - meson_src_configure -} - -src_install() { - meson_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 - - # config - insinto /etc/$PN - doins "${S}/workdir/main.lua" - doins "${S}/workdir/lib.lua" - doins -r "${S}/workdir/config/" - - # logrotate - insinto /etc/logrotate.d - newins "${S}/external/packaging/$PN.logrotate.sh" $PN -} - -pkg_postinst() { - fcaps_pkg_postinst - - if kernel_is lt 5 7; then - ewarn "" - ewarn "hinsightd requires io_uring and kernel ~5.6.0" - ewarn "" - fi -} diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220828.ebuild similarity index 97% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild rename to w
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: a714e34286de0c8cae9cf4445f4403a5b791d56f Author: Alexandru Campeanu gmail com> AuthorDate: Sat Aug 27 06:50:47 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Sat Aug 27 06:55:44 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a714e342 www-servers/hinsightd: fixed qa issues Signed-off-by: Alexandru Campeanu gmail.com> .../hinsightd/hinsightd-0.9.15_p20220826.ebuild| 18 +- www-servers/hinsightd/hinsightd-.ebuild| 18 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild index e4732875c..4417c15a7 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild @@ -17,7 +17,7 @@ mycommit="60ff105ba76746ac8f669616ed3658f7c03c3ab3" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; -elif [[ ! -z "$mycommit" ]]; then +elif [[ ! -z "${mycommit}" ]]; then SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; S="${WORKDIR}/hin9-${mycommit}" else @@ -55,13 +55,13 @@ FILECAPS=( ) pkg_setup() { - linux-info_pkg_setup; + linux-info_pkg_setup lua-single_pkg_setup } src_configure() { version=$(ver_cut 1-2 $(lua_get_version)) - if [ "$version" == "2.1" ]; then + if [[ "${version}" == "2.1" ]]; then version="jit" fi local emesonargs=( @@ -70,7 +70,7 @@ src_configure() { $(meson_use fcgi) $(meson_use rproxy) $(meson_use ffcall) - -Dforce-lua-version=$version + -Dforce-lua-version=${version} ) meson_src_configure } @@ -78,19 +78,19 @@ src_configure() { src_install() { meson_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 + newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN} + newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" # not tested # config - insinto /etc/$PN + insinto /etc/${PN} doins "${S}/workdir/main.lua" doins "${S}/workdir/lib.lua" doins -r "${S}/workdir/config/" # logrotate insinto /etc/logrotate.d - newins "${S}/external/packaging/$PN.logrotate.sh" $PN + newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN} } pkg_postinst() { diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 60ce5a5ee..2f6e9c8e9 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -15,7 +15,7 @@ SLOT="0" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; -elif [[ ! -z "$mycommit" ]]; then +elif [[ ! -z "${mycommit}" ]]; then SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; S="${WORKDIR}/hin9-${mycommit}" else @@ -53,13 +53,13 @@ FILECAPS=( ) pkg_setup() { - linux-info_pkg_setup; + linux-info_pkg_setup lua-single_pkg_setup } src_configure() { version=$(ver_cut 1-2 $(lua_get_version)) - if [ "$version" == "2.1" ]; then + if [[ "${version}" == "2.1" ]]; then version="jit" fi local emesonargs=( @@ -68,7 +68,7 @@ src_configure() { $(meson_use fcgi) $(meson_use rproxy) $(meson_use ffcall) - -Dforce-lua-version=$version + -Dforce-lua-version=${version} ) meson_src_configure } @@ -76,19 +76,19 @@ src_configure() { src_install() { meson_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 + newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN} + newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN} + systemd_dounit "${FILESDIR}/${PN}.service" # not tested # config - insinto /etc/$PN + insinto /etc/${PN} doins "${S}/workdir/main.lua" doins "${S}/workdir/lib.lua" doins -r "${S}/workdir/config/" # logrotate insinto /etc/logrotate.d - newins "${S}/external/packaging/$PN.logrotate.sh" $PN + newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN} } pkg_postinst() {
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: fb693d546eed37211f64b428a7244912d26d7c63 Author: Alexandru Campeanu gmail com> AuthorDate: Fri Aug 26 10:11:43 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Fri Aug 26 10:14:09 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb693d54 www-servers/hinsightd: add 0.9.15_p20220826, drop old Closes: https://bugs.gentoo.org/866458 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/files/hinsightd-defines-v4.patch | 18 ...17.ebuild => hinsightd-0.9.15_p20220826.ebuild} | 33 ++ www-servers/hinsightd/hinsightd-.ebuild| 2 +- 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index ee98956b4..9d5f3af9b 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,2 +1,2 @@ DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000 -DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8 +DIST hin9-60ff105ba76746ac8f669616ed3658f7c03c3ab3.tar.gz 116619 BLAKE2B 9ec584cc31c853f210e3c4b9306e675fb2501c99239b86fc8b5d925532fba8402b40b9ff43eebafec70457f67f11174e36a7c49aa59483606e19ebdf936e SHA512 e4e6e62b618e0fa845d94a723b4723e230fa03415ad4831bddc0a99f8c262fdca495a8ea6bdb7019e3a97bcf03554fae6f09a2a673e2f3db3e535c5fdc490f4e diff --git a/www-servers/hinsightd/files/hinsightd-defines-v4.patch b/www-servers/hinsightd/files/hinsightd-defines-v4.patch deleted file mode 100644 index bd0a2b563..0 --- a/www-servers/hinsightd/files/hinsightd-defines-v4.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/hin/conf.h b/src/hin/conf.h -index 9edb801..1deefd5 100644 a/src/hin/conf.h -+++ b/src/hin/conf.h -@@ -2,10 +2,10 @@ - #ifndef HIN_CONF_H - #define HIN_CONF_H - --#define HIN_CONF_PATH "workdir/main.lua" --#define HIN_LOGDIR_PATH "workdir/logs/" -+#define HIN_CONF_PATH "/etc/hinsightd/main.lua" -+#define HIN_LOGDIR_PATH "/var/log/hinsightd/" - #define HIN_WORKDIR_PATH "./" --#define HIN_TEMP_PATH "/tmp/" -+#define HIN_TEMP_PATH "/var/tmp/hinsightd/" - #define HIN_DEBUG_MASK 0x20007 - - #define HIN_URING_QUEUE_DEPTH 256 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild similarity index 77% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild rename to www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild index 427d8a07b..e4732875c 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild @@ -5,14 +5,14 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit fcaps lua-single systemd cmake linux-info +inherit fcaps lua-single systemd meson linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" -mycommit="af60390e3ade1e617ef76c5ab778934acd76a16e" +mycommit="60ff105ba76746ac8f669616ed3658f7c03c3ab3" if [[ ${PV} == ** ]]; then inherit git-r3 @@ -33,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -54,19 +54,30 @@ FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) +pkg_setup() { + linux-info_pkg_setup; + lua-single_pkg_setup +} + src_configure() { - local mycmakeargs=( - -DUSE_OPENSSL=$(usex ssl) - -DUSE_CGI=$(usex cgi) - -DUSE_FCGI=$(usex fcgi) - -DUSE_RPROXY=$(usex rproxy) - -DUSE_FFCALL=$(usex ffcall) + version=$(ver_cut 1-2 $(lua_get_version)) + if [ "$version" == "2.1" ]; then + version="jit" + fi + local emesonargs=( + $(meson_use ssl openssl) + $(meson_use cgi) + $(meson_use fcgi) + $(meson_use rproxy) + $(meson_use ffcall) + -Dforce-lua-version=$version ) - cmake_src_configure + meson_src_configure } src_install() { - cmake_src_install + meson_src_install + newinitd "${S}/external/packaging/$PN.initd.sh" $PN newconfd "${S}/external/packaging/$PN.confd.sh" $PN system
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: d0291ceb4f29cc77764bf3590d8e5eb198cbc0e5 Author: Alexandru Campeanu gmail com> AuthorDate: Wed Aug 24 18:41:30 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Aug 24 18:51:45 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0291ceb www-servers/hinsightd: fixed qa issues Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild | 4 ++-- www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild | 4 ++-- www-servers/hinsightd/hinsightd-.ebuild | 4 ++-- www-servers/hinsightd/metadata.xml | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild index 9b3b7b355..427d8a07b 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild @@ -18,8 +18,8 @@ if [[ ${PV} == ** ]]; 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}" + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; + S="${WORKDIR}/hin9-${mycommit}" else SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; S="${WORKDIR}/hin9-v${PV}" diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild index d5510534f..e4f9da342 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild @@ -18,8 +18,8 @@ if [[ ${PV} == ** ]]; 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}" + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; + S="${WORKDIR}/hin9-${mycommit}" else SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; S="${WORKDIR}/hin9-v${PV}" diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index bb4f22005..9b9d8695b 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -16,8 +16,8 @@ if [[ ${PV} == ** ]]; 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}" + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; + S="${WORKDIR}/hin9-${mycommit}" else SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; S="${WORKDIR}/hin9-v${PV}" diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index db9315164..6b7dca518 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -17,7 +17,6 @@ customizable config file using lua. - Enable tls encryption with openssl Enable old/slow cgi support (legacy should not be used) Enable fast cgi support Enable reverse proxying support
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 77ee3b850d6821231da9f44003346033ebd5b94a Author: Alexandru Campeanu gmail com> AuthorDate: Mon Aug 22 17:20:44 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Aug 22 17:20:44 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77ee3b85 www-servers/hinsightd: added 0.9.15_p20220822 switched to meson Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + ...99.ebuild => hinsightd-0.9.15_p20220822.ebuild} | 33 +++--- www-servers/hinsightd/hinsightd-.ebuild| 31 +--- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index ff67c26cb..ee98956b4 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1,2 @@ +DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000 DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8 diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild similarity index 77% copy from www-servers/hinsightd/hinsightd-.ebuild copy to www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild index 0a2fda199..d5510534f 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild @@ -5,13 +5,15 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit fcaps lua-single systemd cmake linux-info +inherit fcaps lua-single systemd meson linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" +mycommit="0c584cbe00c2227d4cb29675e8e2da2c6bd57371" + if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; @@ -31,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -52,19 +54,30 @@ FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) +pkg_setup() { + linux-info_pkg_setup; + lua-single_pkg_setup +} + src_configure() { - local mycmakeargs=( - -DUSE_OPENSSL=$(usex ssl) - -DUSE_CGI=$(usex cgi) - -DUSE_FCGI=$(usex fcgi) - -DUSE_RPROXY=$(usex rproxy) - -DUSE_FFCALL=$(usex ffcall) + version=$(ver_cut 1-2 $(lua_get_version)) + if [ "$version" == "2.1" ]; then + version="jit" + fi + local emesonargs=( + $(meson_use ssl openssl) + $(meson_use cgi) + $(meson_use fcgi) + $(meson_use rproxy) + $(meson_use ffcall) + -Dforce-lua-version=$version ) - cmake_src_configure + meson_src_configure } src_install() { - cmake_src_install + meson_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 diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 0a2fda199..bb4f22005 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit fcaps lua-single systemd cmake linux-info +inherit fcaps lua-single systemd meson linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; @@ -31,7 +31,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -52,19 +52,30 @@ FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) +pkg_setup() { + linux-info_pkg_setup; + lua-single_pkg_setup +} + src_configure() { - local mycmakeargs=( - -DUSE_OPENSSL=$(usex ssl) - -DUSE_CGI=$(usex cgi) - -DUSE_FCGI=$(usex fcgi) - -DUSE_RPROXY=$(usex rproxy) - -DUSE_FFCALL=$(usex ffcall) + version=$(ver_cut 1-2 $(lua_get_version)) + if [ "$version" == "2.1" ]; then + version=
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 8d0812319889737df48249a50d9458e55b87e14d Author: Alexandru Campeanu gmail com> AuthorDate: Wed Aug 17 07:58:39 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Aug 17 07:58:39 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d081231 www-servers/hinsightd: add 0.9.15_p20220817, drop old Closes: https://bugs.gentoo.org/show_bug.cgi?id=864313 Closes: https://bugs.gentoo.org/show_bug.cgi?id=864322 Closes: https://bugs.gentoo.org/show_bug.cgi?id=864325 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- ...sightd-0.9.15_p20220804.ebuild => hinsightd-0.9.15_p20220817.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 69237118d..ff67c26cb 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-f9d179bbc31244f00c715eeff8ede72b1c5f77d2.tar.gz 114926 BLAKE2B 5501e5e26dd8fd8172297f703141c12646841eada1f452d89eb57ce5e6a3d9a8dc691cc485022e374a2df14f79e3c6c99da17e61d55a8aa5c3c920edd0459748 SHA512 72dec3fca67b70fdc335e8c6b5647d1e4eb05b080c62e5a97c8572c36c1371fccb17a49ae3af9425717910ea0d4594357764e2bc1b0b02414287f9eda6dde7b1 +DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild similarity index 97% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild rename to www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild index 1d0c32656..9b3b7b355 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" -mycommit="f9d179bbc31244f00c715eeff8ede72b1c5f77d2" +mycommit="af60390e3ade1e617ef76c5ab778934acd76a16e" if [[ ${PV} == ** ]]; then inherit git-r3
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: e1ae85013cf8263b18948d8abf4da32a21612c9c Author: Alexandru Campeanu gmail com> AuthorDate: Thu Aug 4 09:49:38 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Aug 4 09:49:38 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e1ae8501 www-servers/hinsightd: add 0.9.15_p20220804, drop old Closes: https://bugs.gentoo.org/863059 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- ...sightd-0.9.15_p20220727.ebuild => hinsightd-0.9.15_p20220804.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 575193850..69237118d 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-7cb278f9359a39050d254f29d361010723f2d7c1.tar.gz 114997 BLAKE2B ab66f059b20d0193a8fb2e106a8f19bb5b1e8a98bfedf74cfdd17ab46c7fcbe3a3c117ee4cd0c16a6437fa1bd87dd8b30f8f2407086cc37d2caf81b3be36abcf SHA512 be61fa439d9c8033f7f103799b14a39f773c80f33acdb5ca50b3f53b0b54ea272e45d7da1c2f5e18f00ffd8342705148a7d6217a555db77bf102a5ed4ef7e523 +DIST hin9-f9d179bbc31244f00c715eeff8ede72b1c5f77d2.tar.gz 114926 BLAKE2B 5501e5e26dd8fd8172297f703141c12646841eada1f452d89eb57ce5e6a3d9a8dc691cc485022e374a2df14f79e3c6c99da17e61d55a8aa5c3c920edd0459748 SHA512 72dec3fca67b70fdc335e8c6b5647d1e4eb05b080c62e5a97c8572c36c1371fccb17a49ae3af9425717910ea0d4594357764e2bc1b0b02414287f9eda6dde7b1 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild similarity index 97% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild rename to www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild index f62e4a0c1..1d0c32656 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220804.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" -mycommit="7cb278f9359a39050d254f29d361010723f2d7c1" +mycommit="f9d179bbc31244f00c715eeff8ede72b1c5f77d2" if [[ ${PV} == ** ]]; then inherit git-r3
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 5c1cac99d855b425654b9f72dc56a4c343195905 Author: Alexandru Campeanu gmail com> AuthorDate: Wed Jul 27 16:12:45 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Jul 27 16:12:45 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5c1cac99 www-servers/hinsightd: add 0.9.15_p20220727, drop old Closes: https://bugs.gentoo.org/show_bug.cgi?id=840047 Closes: https://bugs.gentoo.org/show_bug.cgi?id=860846 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- ...14.ebuild => hinsightd-0.9.15_p20220727.ebuild} | 22 +- www-servers/hinsightd/hinsightd-.ebuild| 6 ++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index f30779379..575193850 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.14.tar.gz 104520 BLAKE2B 2926450af8cd10cd12c06cf157d8815167f1c83baed543821e201947445ca02ccba12a96aa456c555d9bae31da469175680fa565ba786fef27ceb9629f0cbd52 SHA512 b2f473024570738717d16fc5be86ad91bbf79cf1886e1f61ea55fb64769bf8410943a1ae71585411053c70907ab1c4e7556135383a9d4048f516349b11ac952f +DIST hin9-7cb278f9359a39050d254f29d361010723f2d7c1.tar.gz 114997 BLAKE2B ab66f059b20d0193a8fb2e106a8f19bb5b1e8a98bfedf74cfdd17ab46c7fcbe3a3c117ee4cd0c16a6437fa1bd87dd8b30f8f2407086cc37d2caf81b3be36abcf SHA512 be61fa439d9c8033f7f103799b14a39f773c80f33acdb5ca50b3f53b0b54ea272e45d7da1c2f5e18f00ffd8342705148a7d6217a555db77bf102a5ed4ef7e523 diff --git a/www-servers/hinsightd/hinsightd-0.9.14.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild similarity index 78% rename from www-servers/hinsightd/hinsightd-0.9.14.ebuild rename to www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild index 1d5a41be8..f62e4a0c1 100644 --- a/www-servers/hinsightd/hinsightd-0.9.14.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220727.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,20 +8,28 @@ LUA_COMPAT=( lua5-{1..4} luajit ) inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" -HOMEPAGE="https://gitlab.com/tiotags/hin9"; +HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" +mycommit="7cb278f9359a39050d254f29d361010723f2d7c1" + if [[ ${PV} == ** ]]; 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}" else SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; S="${WORKDIR}/hin9-v${PV}" +fi + +if [[ ${PV} != ** ]]; then KEYWORDS="~amd64" fi -IUSE="+openssl cgi +fcgi +rproxy +ffcall" +IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" @@ -36,23 +44,19 @@ RDEPEND=" sys-libs/liburing sys-libs/zlib virtual/libcrypt - openssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl ) ffcall? ( dev-libs/ffcall ) " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-defines-v4.patch" -) - FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) src_configure() { local mycmakeargs=( - -DUSE_OPENSSL=$(usex openssl) + -DUSE_OPENSSL=$(usex ssl) -DUSE_CGI=$(usex cgi) -DUSE_FCGI=$(usex fcgi) -DUSE_RPROXY=$(usex rproxy) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index d750ebe79..0a2fda199 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -15,9 +15,15 @@ SLOT="0" if [[ ${PV} == ** ]]; 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}" else SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; S="${WORKDIR}/hin9-v${PV}" +fi + +if [[ ${PV} != ** ]]; then KEYWORDS="~amd64" fi
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 2b52c5130e8cacdb047f05cc5f34ba56ab38732e Author: Alexandru Campeanu gmail com> AuthorDate: Tue Apr 26 10:05:50 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue Apr 26 10:05:50 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2b52c513 www-servers/hinsightd: update HOMEPAGE Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-.ebuild | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 1d5a41be8..d750ebe79 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ LUA_COMPAT=( lua5-{1..4} luajit ) inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" -HOMEPAGE="https://gitlab.com/tiotags/hin9"; +HOMEPAGE="https://tiotags.gitlab.io/hinsightd"; LICENSE="BSD" SLOT="0" @@ -21,7 +21,7 @@ else KEYWORDS="~amd64" fi -IUSE="+openssl cgi +fcgi +rproxy +ffcall" +IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" @@ -36,23 +36,19 @@ RDEPEND=" sys-libs/liburing sys-libs/zlib virtual/libcrypt - openssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl ) ffcall? ( dev-libs/ffcall ) " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-defines-v4.patch" -) - FILECAPS=( cap_net_bind_service usr/sbin/${PN} ) src_configure() { local mycmakeargs=( - -DUSE_OPENSSL=$(usex openssl) + -DUSE_OPENSSL=$(usex ssl) -DUSE_CGI=$(usex cgi) -DUSE_FCGI=$(usex fcgi) -DUSE_RPROXY=$(usex rproxy)
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: f3a0eb44418435dd9ed2cff6948963a66d9f66c5 Author: Alexandru Campeanu gmail com> AuthorDate: Wed Apr 20 18:38:36 2022 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Apr 20 19:01:44 2022 + 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 gmail.com> www-servers/hinsightd/Manifest | 2 +- ...11_p20210831.ebuild => hinsightd-0.9.14.ebuild} | 28 +++--- www-servers/hinsightd/hinsightd-.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} == ** ]]; 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-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index f160cba68..1d5a41be8 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -15,10 +15,6 @@ SLOT="0" if [[ ${PV} == ** ]]; 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
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: f8045b512875e4c2db87a90a74c6f8f12b693ca2 Author: tiotags gmail com> AuthorDate: Thu Dec 16 19:31:45 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Dec 16 19:31:45 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f8045b51 www-servers/hinsightd: added ffcall iuse flag Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-.ebuild | 4 +++- www-servers/hinsightd/metadata.xml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 0248c5caa..f160cba68 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -25,7 +25,7 @@ else KEYWORDS="~amd64" fi -IUSE="+openssl cgi +fcgi +rproxy" +IUSE="+openssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" @@ -41,6 +41,7 @@ RDEPEND=" sys-libs/zlib virtual/libcrypt openssl? ( dev-libs/openssl ) + ffcall? ( dev-libs/ffcall ) " DEPEND="${RDEPEND}" @@ -59,6 +60,7 @@ src_configure() { -DUSE_CGI=$(usex cgi) -DUSE_FCGI=$(usex fcgi) -DUSE_RPROXY=$(usex rproxy) + -DUSE_FFCALL=$(usex ffcall) ) cmake_src_configure } diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 1db7cf87d..db9315164 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -19,7 +19,8 @@ Enable tls encryption with openssl Enable old/slow cgi support (legacy should not be used) - Enable fast cgi support (disabling will break the default config) + Enable fast cgi support Enable reverse proxying support + Use ffcall library for better logging format support
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 27d10f1ed98688c4761c67670d0c94a9ff6ad4ea Author: tiotags gmail com> AuthorDate: Mon Sep 20 16:47:12 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Sep 20 16:47:12 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27d10f1e www-servers/hinsightd: fix config files path Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-.ebuild | 2 +- www-servers/hinsightd/metadata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 25264fc73..0248c5caa 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -73,7 +73,7 @@ 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 diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 34968a7e2..1db7cf87d 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -19,7 +19,7 @@ Enable tls encryption with openssl Enable old/slow cgi support (legacy should not be used) - Enable fast cgi support + Enable fast cgi support (disabling will break the default config) Enable reverse proxying support
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: a6d001c9b2a9b0170bea7d17886c884caddf817e Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Sep 20 09:41:22 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Sep 20 09:41:22 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a6d001c9 www-servers/hinsightd: fix MultipleKeywordsLines Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild | 4 ++-- www-servers/hinsightd/hinsightd-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild b/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild index 1c30b7332..9d8876529 100644 --- a/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild @@ -11,20 +11,20 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; - KEYWORDS= 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" diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index bc9029037..25264fc73 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -11,18 +11,18 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; - KEYWORDS= 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 cgi +fcgi +rproxy"
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: ba9fd218cf54c1382520c1d31bebc92b3180c77b Author: tiotags gmail com> AuthorDate: Fri Sep 10 10:08:03 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Fri Sep 10 10:08:03 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba9fd218 www-servers/hinsightd: added cgi, fcgi and reverse proxy use flags switched to EAPI8, install executable via cmake install Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-.ebuild | 20 +++- www-servers/hinsightd/metadata.xml | 3 +++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 1c30b7332..bc9029037 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.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 ) @@ -13,8 +13,6 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f" - if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; @@ -27,7 +25,7 @@ else S="${WORKDIR}/hin9-v${PV}" fi -IUSE="+openssl" +IUSE="+openssl cgi +fcgi +rproxy" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" @@ -51,16 +49,22 @@ 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) ) 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 @@ -74,12 +78,10 @@ src_install() { # 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/metadata.xml b/www-servers/hinsightd/metadata.xml index 826bd5d5f..34968a7e2 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -18,5 +18,8 @@ Enable tls encryption with openssl + Enable old/slow cgi support (legacy should not be used) + Enable fast cgi support + Enable reverse proxying support
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: ecf7667db1d7dae28a8b6f3e9288fc98df9a4ed2 Author: tiotags gmail com> AuthorDate: Tue Aug 31 09:05:09 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue Aug 31 09:05:09 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ecf7667d www-servers/hinsightd: bump to 0.9.11 patch 20210831 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- ...ghtd-0.9.11.ebuild => hinsightd-0.9.11_p20210831.ebuild} | 13 + www-servers/hinsightd/hinsightd-.ebuild | 13 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index f6ec62fe6..b98a7186b 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.11.tar.gz 93126 BLAKE2B cb27db1e1477d4586cffbeb1ffa8dd9d0df3cb2de0a382548fb9dc97a3d4a5042c2a92faa09c2d8299394d89fb633caa3b378a1333d29c893da79e3732541e42 SHA512 d49c5687d68d6fcaf79edf327b91cc37d8913ed19fb8afbfd5cc624cae195bb0330dbf7b256c11fb0c7f1171a564d14e045a2de6b5933838ce0e6f24b1f17805 +DIST hin9-f04d7703f6cdbd2e33f8a7289d80a01dba5e970f.tar.gz 93515 BLAKE2B 7b2369f58042c78cd9a4633f36837b9841dc04f802df93bf2274782a46621cc1d7dfc6340a977ec42d7b0cb9abb8ebc68ebcad15950a64df2c772b457974c89a SHA512 4bea1785f0ad83ffcf5437456e7f1c11e879dfa037fa89ca892a0d4d920bc7495ee68dc72d31025ebc977bcca48ca7e88194fe13e8884ebe2ce8e5d0b2f54cde diff --git a/www-servers/hinsightd/hinsightd-0.9.11.ebuild b/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild similarity index 87% rename from www-servers/hinsightd/hinsightd-0.9.11.ebuild rename to www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild index c21c87f61..1c30b7332 100644 --- a/www-servers/hinsightd/hinsightd-0.9.11.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.11_p20210831.ebuild @@ -9,19 +9,24 @@ inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; + KEYWORDS= +elif [[ ! -z "$mycommit" ]]; then + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; + S="${WORKDIR}/hin9-${mycommit}" 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}" diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index c21c87f61..1c30b7332 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -9,19 +9,24 @@ inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f" if [[ ${PV} == ** ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; + KEYWORDS= +elif [[ ! -z "$mycommit" ]]; then + SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"; + S="${WORKDIR}/hin9-${mycommit}" 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}"
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 98db727bc51e19398c2fe81f0a59e99c6f8599b1 Author: tiotags gmail com> AuthorDate: Mon Aug 30 08:20:21 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Aug 30 08:20:21 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=98db727b www-servers/hinsightd: bump to 0.9.11 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/{hinsightd-0.9.10.ebuild => hinsightd-0.9.11.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 3f752881b..f6ec62fe6 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.10.tar.gz 91078 BLAKE2B 0209ebfb59ffe2f4c0e71f5c33fc364b65297e94101622505618ea58af22f04439fd5004b7df25a7ac98616b03749bdc10183af7bb48c10311dad6c1b8f56e35 SHA512 8e7a66d4fa173c5b74947ed2e8d075d91a3ff07f896892c1908e2d9fbe52912056b2d63d6106e32085f2178f98f512bafc7223e80343c094cd69229ddab24c4d +DIST hin9-v0.9.11.tar.gz 93126 BLAKE2B cb27db1e1477d4586cffbeb1ffa8dd9d0df3cb2de0a382548fb9dc97a3d4a5042c2a92faa09c2d8299394d89fb633caa3b378a1333d29c893da79e3732541e42 SHA512 d49c5687d68d6fcaf79edf327b91cc37d8913ed19fb8afbfd5cc624cae195bb0330dbf7b256c11fb0c7f1171a564d14e045a2de6b5933838ce0e6f24b1f17805 diff --git a/www-servers/hinsightd/hinsightd-0.9.10.ebuild b/www-servers/hinsightd/hinsightd-0.9.11.ebuild similarity index 100% rename from www-servers/hinsightd/hinsightd-0.9.10.ebuild rename to www-servers/hinsightd/hinsightd-0.9.11.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: ea8a3b38ec06d0d7b7f788defa7c0795a4e2e2d6 Author: tiotags gmail com> AuthorDate: Tue Aug 17 10:13:37 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue Aug 17 10:13:37 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea8a3b38 www-servers/hinsightd: bump to 0.9.10 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/{hinsightd-0.9.9.ebuild => hinsightd-0.9.10.ebuild} | 6 -- www-servers/hinsightd/hinsightd-.ebuild | 6 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index a56d9b956..3f752881b 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.9.tar.gz 90575 BLAKE2B 9860970c9296f78bbb9deefe44b9d71e0ae0ad30b98302e36810506ef36ef44e39998407730400e0da7093abb77aefdf49b1cca90eac48f6fbe2c3080a1f31ae SHA512 cc384cc1c321209ebf0f96f95aad28051a8f90038a4e626caf292a61c0a0e7bc5b514fde6f64c3275f5e25ea846d5817e1a6daa2cc18f3b60b760a55f400fd28 +DIST hin9-v0.9.10.tar.gz 91078 BLAKE2B 0209ebfb59ffe2f4c0e71f5c33fc364b65297e94101622505618ea58af22f04439fd5004b7df25a7ac98616b03749bdc10183af7bb48c10311dad6c1b8f56e35 SHA512 8e7a66d4fa173c5b74947ed2e8d075d91a3ff07f896892c1908e2d9fbe52912056b2d63d6106e32085f2178f98f512bafc7223e80343c094cd69229ddab24c4d diff --git a/www-servers/hinsightd/hinsightd-0.9.9.ebuild b/www-servers/hinsightd/hinsightd-0.9.10.ebuild similarity index 89% rename from www-servers/hinsightd/hinsightd-0.9.9.ebuild rename to www-servers/hinsightd/hinsightd-0.9.10.ebuild index 581b58494..c21c87f61 100644 --- a/www-servers/hinsightd/hinsightd-0.9.9.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.10.ebuild @@ -81,10 +81,4 @@ pkg_postinst() { ewarn "hinsightd requires io_uring and kernel ~5.6.0" ewarn "" fi - - ewarn "" - ewarn "hinsightd requires a higher than default RLIMIT_MEMLOCK for" - ewarn "things like graceful restarting" - ewarn "memory limit can be increased in /etc/security/limits.conf" - ewarn "" } diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 581b58494..c21c87f61 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -81,10 +81,4 @@ pkg_postinst() { ewarn "hinsightd requires io_uring and kernel ~5.6.0" ewarn "" fi - - ewarn "" - ewarn "hinsightd requires a higher than default RLIMIT_MEMLOCK for" - ewarn "things like graceful restarting" - ewarn "memory limit can be increased in /etc/security/limits.conf" - ewarn "" }
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 267f3fbfd3eea1853adc6a49419c79cff33a354c Author: tiotags gmail com> AuthorDate: Wed Aug 11 19:17:10 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Aug 11 19:17:10 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=267f3fbf www-servers/hinsightd: bump to version 0.9.9 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/{hinsightd-0.9.8.ebuild => hinsightd-0.9.9.ebuild} | 3 ++- www-servers/hinsightd/hinsightd-.ebuild| 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index b040507d4..a56d9b956 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.8.tar.gz 87014 BLAKE2B 13623c8058afee57fa862552121080af67c79e8ce8f8f917053fc651b551b243d5c543e2e4ebc0934eab6a1f606eaf68b6c5d3f45e9698b3f8d0ef733058c78e SHA512 3a408ff085ba4c7f7d72edbbe306d9b5db50fc2d5951adb92befbed3ca86e2b610713b370978a9003fd087d4337165ae3ecf650f90047d5c4ffe217e742e4117 +DIST hin9-v0.9.9.tar.gz 90575 BLAKE2B 9860970c9296f78bbb9deefe44b9d71e0ae0ad30b98302e36810506ef36ef44e39998407730400e0da7093abb77aefdf49b1cca90eac48f6fbe2c3080a1f31ae SHA512 cc384cc1c321209ebf0f96f95aad28051a8f90038a4e626caf292a61c0a0e7bc5b514fde6f64c3275f5e25ea846d5817e1a6daa2cc18f3b60b760a55f400fd28 diff --git a/www-servers/hinsightd/hinsightd-0.9.8.ebuild b/www-servers/hinsightd/hinsightd-0.9.9.ebuild similarity index 95% rename from www-servers/hinsightd/hinsightd-0.9.8.ebuild rename to www-servers/hinsightd/hinsightd-0.9.9.ebuild index cc379c653..581b58494 100644 --- a/www-servers/hinsightd/hinsightd-0.9.8.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.9.ebuild @@ -55,6 +55,7 @@ src_configure() { src_install() { newsbin "${BUILD_DIR}/hin9" $PN + newbin "${BUILD_DIR}/hin9_pid_helper" ${PN}_pid_helper newinitd "${S}/external/packaging/$PN.initd.sh" $PN newconfd "${S}/external/packaging/$PN.confd.sh" $PN systemd_dounit "${FILESDIR}/$PN.service" # not tested @@ -69,7 +70,7 @@ src_install() { insinto /etc/logrotate.d newins "${S}/external/packaging/$PN.logrotate.sh" $PN - keepdir /var/www/localhost/htdocs + keepdir /var/www/localhost } pkg_postinst() { diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index e76e5c8c0..581b58494 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -70,7 +70,7 @@ src_install() { insinto /etc/logrotate.d newins "${S}/external/packaging/$PN.logrotate.sh" $PN - keepdir /var/www/localhost/htdocs + keepdir /var/www/localhost } pkg_postinst() {
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
commit: ff194e05683971cbfd622db249addf536e42c0d3 Author: tiotags gmail com> AuthorDate: Thu Jul 29 19:59:11 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Jul 29 19:59:11 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff194e05 www-servers/hinsightd: updated version Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> .../hinsightd/files/{defines-v4.patch => hinsightd-defines-v4.patch} | 0 www-servers/hinsightd/hinsightd-0.9.8.ebuild | 2 +- www-servers/hinsightd/hinsightd-.ebuild| 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/files/defines-v4.patch b/www-servers/hinsightd/files/hinsightd-defines-v4.patch similarity index 100% rename from www-servers/hinsightd/files/defines-v4.patch rename to www-servers/hinsightd/files/hinsightd-defines-v4.patch diff --git a/www-servers/hinsightd/hinsightd-0.9.8.ebuild b/www-servers/hinsightd/hinsightd-0.9.8.ebuild index 528b0d20c..cc379c653 100644 --- a/www-servers/hinsightd/hinsightd-0.9.8.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.8.ebuild @@ -43,7 +43,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/defines-v4.patch" + "${FILESDIR}/${PN}-defines-v4.patch" ) src_configure() { diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 528b0d20c..e76e5c8c0 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -43,7 +43,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/defines-v4.patch" + "${FILESDIR}/${PN}-defines-v4.patch" ) src_configure() { @@ -55,6 +55,7 @@ src_configure() { src_install() { newsbin "${BUILD_DIR}/hin9" $PN + newbin "${BUILD_DIR}/hin9_pid_helper" ${PN}_pid_helper newinitd "${S}/external/packaging/$PN.initd.sh" $PN newconfd "${S}/external/packaging/$PN.confd.sh" $PN systemd_dounit "${FILESDIR}/$PN.service" # not tested
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: c82d1be7d2ac2b3238422abcd99ee85bb6514f65 Author: tiotags gmail com> AuthorDate: Wed Jul 28 11:06:21 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Jul 28 11:06:21 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c82d1be7 www-servers/hinsightd: version bump to v0.9.8 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/{hinsightd-0.9.7.ebuild => hinsightd-0.9.8.ebuild}| 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 8ed01577a..b040507d4 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.7.tar.gz 86527 BLAKE2B 243e627f67b6ce4efe683ca51a175e0364eebf47e7a1a881c0650f65aa922bb596dbc7814fff59b9e8d5c61ff16152cc1da0ab764b10027bed4b48bb7961b41c SHA512 161aacf50d6581643fff2c494e13faa7a07dd58fdc74ffbf14d1199500ae231be90b358bd9223e1a4cb8cb7c7502793b127c7c933d67ddd1bfbaa2984c3ae715 +DIST hin9-v0.9.8.tar.gz 87014 BLAKE2B 13623c8058afee57fa862552121080af67c79e8ce8f8f917053fc651b551b243d5c543e2e4ebc0934eab6a1f606eaf68b6c5d3f45e9698b3f8d0ef733058c78e SHA512 3a408ff085ba4c7f7d72edbbe306d9b5db50fc2d5951adb92befbed3ca86e2b610713b370978a9003fd087d4337165ae3ecf650f90047d5c4ffe217e742e4117 diff --git a/www-servers/hinsightd/hinsightd-0.9.7.ebuild b/www-servers/hinsightd/hinsightd-0.9.8.ebuild similarity index 100% rename from www-servers/hinsightd/hinsightd-0.9.7.ebuild rename to www-servers/hinsightd/hinsightd-0.9.8.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: a67913b3fa6f91d47a7bb2432e9127f29e7a93f6 Author: tiotags gmail com> AuthorDate: Tue Jul 20 08:48:01 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue Jul 20 08:48:01 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a67913b3 www-servers/hinsightd: bump to 0.9.7, removed old versions Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 4 +- ...hinsightd-defines-v3.patch => defines-v4.patch} | 13 ++-- .../hinsightd/files/hinsightd-default-config.patch | 12 --- .../files/hinsightd-redefine-directories-v2.patch | 21 -- .../files/hinsightd-redefine-directories.patch | 30 www-servers/hinsightd/files/hinsightd.service | 2 +- www-servers/hinsightd/files/init.d.sh | 50 - www-servers/hinsightd/files/initd-v1.sh| 50 - www-servers/hinsightd/files/logrotate.d.sh | 14 www-servers/hinsightd/hinsightd-0.9.3.ebuild | 81 www-servers/hinsightd/hinsightd-0.9.4.ebuild | 87 -- ...nsightd-0.9.5.ebuild => hinsightd-0.9.7.ebuild} | 8 +- www-servers/hinsightd/hinsightd-.ebuild| 8 +- 13 files changed, 17 insertions(+), 363 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 9bad66830..8ed01577a 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,3 +1 @@ -DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0 -DIST hin9-v0.9.4.tar.gz 77019 BLAKE2B 7339b407ba60c740f51f47794bd5fa4b73c662c718841c8de10be53bc6bec53f5ba511e2f69859ef9312aa85a318f0feeab5088b839dcae1dd734951f52f87a4 SHA512 817ac692778b9b7d9b2b7dd82a0d92fa0303d875601d6b52ddd75bb470cab1c9ac39170a0a1f5737ec4d28849837a8b61bf34bc96481044fe9864932bcfdd6cf -DIST hin9-v0.9.5.tar.gz 79621 BLAKE2B 2bf1fb03abf1d10d20bd47788e0d2eb39bc01be7fab867fb9b2ddb40e233cc0eed3e55cdfef84881c205de8d35da5bb9a4a56744a69e232b5f7baa6a5910c4a4 SHA512 8db159d95b008f3f4070844ba078f523f6159461c66ebe889e0a0af473e3a888cefa43eedc97c450b3a7bcc35079bfa4530cdcc8741da513a17e08ea896af1f5 +DIST hin9-v0.9.7.tar.gz 86527 BLAKE2B 243e627f67b6ce4efe683ca51a175e0364eebf47e7a1a881c0650f65aa922bb596dbc7814fff59b9e8d5c61ff16152cc1da0ab764b10027bed4b48bb7961b41c SHA512 161aacf50d6581643fff2c494e13faa7a07dd58fdc74ffbf14d1199500ae231be90b358bd9223e1a4cb8cb7c7502793b127c7c933d67ddd1bfbaa2984c3ae715 diff --git a/www-servers/hinsightd/files/hinsightd-defines-v3.patch b/www-servers/hinsightd/files/defines-v4.patch similarity index 65% rename from www-servers/hinsightd/files/hinsightd-defines-v3.patch rename to www-servers/hinsightd/files/defines-v4.patch index 271481f1f..bd0a2b563 100644 --- a/www-servers/hinsightd/files/hinsightd-defines-v3.patch +++ b/www-servers/hinsightd/files/defines-v4.patch @@ -1,21 +1,18 @@ diff --git a/src/hin/conf.h b/src/hin/conf.h -index 61db395..1eaaa14 100644 +index 9edb801..1deefd5 100644 --- a/src/hin/conf.h +++ b/src/hin/conf.h -@@ -2,11 +2,11 @@ +@@ -2,10 +2,10 @@ #ifndef HIN_CONF_H #define HIN_CONF_H -#define HIN_CONF_PATH "workdir/main.lua" -#define HIN_LOGDIR_PATH "workdir/logs/" --#define HIN_WORKDIR_PATH "./" --#define HIN_TEMP_PATH "/tmp/" --#define HIN_DEBUG_MASK 0x +#define HIN_CONF_PATH "/etc/hinsightd/main.lua" +#define HIN_LOGDIR_PATH "/var/log/hinsightd/" -+#define HIN_WORKDIR_PATH "/etc/hinsightd/" + #define HIN_WORKDIR_PATH "./" +-#define HIN_TEMP_PATH "/tmp/" +#define HIN_TEMP_PATH "/var/tmp/hinsightd/" -+#define HIN_DEBUG_MASK 0x27f0f + #define HIN_DEBUG_MASK 0x20007 #define HIN_URING_QUEUE_DEPTH 256 - #define HIN_URING_DONT_FORK 0 diff --git a/www-servers/hinsightd/files/hinsightd-default-config.patch b/www-servers/hinsightd/files/hinsightd-default-config.patch deleted file mode 100644 index 114be8fe2..0 --- a/www-servers/hinsightd/files/hinsightd-default-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -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, "") -+redirect_log (logdir.."debug.log") - - function printf (...) - io.write (string.format (...)) diff --git a/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch deleted file mode 100644 index 8406efc86..0 --- a/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/hin/conf.h b/src/hin/conf.h -index 4a6f071..f
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: 35e86e4fb59120ffeeb37a17fbf9bcfffcf5f62e Author: tiotags gmail com> AuthorDate: Sun Jun 20 09:17:24 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Sun Jun 20 09:17:55 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35e86e4f www-servers/hinsightd: new version + changes Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + .../hinsightd/files/hinsightd-defines-v3.patch | 21 + www-servers/hinsightd/files/initd-v1.sh| 50 ++ ...insightd-.ebuild => hinsightd-0.9.5.ebuild} | 10 ++--- www-servers/hinsightd/hinsightd-.ebuild| 10 ++--- 5 files changed, 82 insertions(+), 10 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 56ef7b385..9bad66830 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,2 +1,3 @@ DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0 DIST hin9-v0.9.4.tar.gz 77019 BLAKE2B 7339b407ba60c740f51f47794bd5fa4b73c662c718841c8de10be53bc6bec53f5ba511e2f69859ef9312aa85a318f0feeab5088b839dcae1dd734951f52f87a4 SHA512 817ac692778b9b7d9b2b7dd82a0d92fa0303d875601d6b52ddd75bb470cab1c9ac39170a0a1f5737ec4d28849837a8b61bf34bc96481044fe9864932bcfdd6cf +DIST hin9-v0.9.5.tar.gz 79621 BLAKE2B 2bf1fb03abf1d10d20bd47788e0d2eb39bc01be7fab867fb9b2ddb40e233cc0eed3e55cdfef84881c205de8d35da5bb9a4a56744a69e232b5f7baa6a5910c4a4 SHA512 8db159d95b008f3f4070844ba078f523f6159461c66ebe889e0a0af473e3a888cefa43eedc97c450b3a7bcc35079bfa4530cdcc8741da513a17e08ea896af1f5 diff --git a/www-servers/hinsightd/files/hinsightd-defines-v3.patch b/www-servers/hinsightd/files/hinsightd-defines-v3.patch new file mode 100644 index 0..271481f1f --- /dev/null +++ b/www-servers/hinsightd/files/hinsightd-defines-v3.patch @@ -0,0 +1,21 @@ +diff --git a/src/hin/conf.h b/src/hin/conf.h +index 61db395..1eaaa14 100644 +--- a/src/hin/conf.h b/src/hin/conf.h +@@ -2,11 +2,11 @@ + #ifndef HIN_CONF_H + #define HIN_CONF_H + +-#define HIN_CONF_PATH "workdir/main.lua" +-#define HIN_LOGDIR_PATH "workdir/logs/" +-#define HIN_WORKDIR_PATH "./" +-#define HIN_TEMP_PATH "/tmp/" +-#define HIN_DEBUG_MASK 0x ++#define HIN_CONF_PATH "/etc/hinsightd/main.lua" ++#define HIN_LOGDIR_PATH "/var/log/hinsightd/" ++#define HIN_WORKDIR_PATH "/etc/hinsightd/" ++#define HIN_TEMP_PATH "/var/tmp/hinsightd/" ++#define HIN_DEBUG_MASK 0x27f0f + + #define HIN_URING_QUEUE_DEPTH 256 + #define HIN_URING_DONT_FORK 0 diff --git a/www-servers/hinsightd/files/initd-v1.sh b/www-servers/hinsightd/files/initd-v1.sh new file mode 100644 index 0..c0c2da823 --- /dev/null +++ b/www-servers/hinsightd/files/initd-v1.sh @@ -0,0 +1,50 @@ +#!/sbin/openrc-run + +NAME=$RC_SVCNAME +RUN_DIR=/var/run/$NAME +LOG_DIR=/var/log/$NAME +TMP_DIR=/var/tmp/$NAME +CWD_DIR=/var/www/localhost +PID_FILE=$RUN_DIR/$NAME.pid +CFG_FILE=/etc/hinsightd/main.lua +LOG_FILE=$LOG_DIR/hindsight.log + +RUN_FILE=/usr/sbin/hinsightd +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 --log $LOG_FILE" +pidfile="$PID_FILE" +command_args_background="--daemonize" +command_user="$RUN_USER:$RUN_USER" + +depend() { + use net +} + +checkconfig() { + start-stop-daemon --quiet --user $RUN_USER --start --exec $command -- --check $command_args +} + +start_pre() { + checkpath --directory --owner $command_user --mode 06770 $LOG_DIR $TMP_DIR $RUN_DIR + checkconfig || return 1 +} + +reload() { + if ! service_started "${NAME}" ; then +eerror " * ERROR ${NAME} isn't running" +return 1 + fi + + checkconfig || return 1 + + echo " * Reloading ${NAME} ..." + + start-stop-daemon --quiet --signal USR1 --pidfile ${PID_FILE} + eend $? +} + + diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-0.9.5.ebuild similarity index 88% copy from www-servers/hinsightd/hinsightd-.ebuild copy to www-servers/hinsightd/hinsightd-0.9.5.ebuild index f8d82a655..727392d53 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..4} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit fcaps lua-single systemd cmake linux-info @@ -42,7 +42,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/hinsightd-redefine-directories-v2.patch" + "${FILESDIR}/hinsightd-defines-v3.patch" ) src_configure() { @@ -53,8 +53,8 @@ src_configure() { } src_install() { - newbin
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
commit: a9d6a6f50ee567c3f343da44e6ea5a7e97ac1063 Author: tiotags gmail com> AuthorDate: Tue May 25 15:29:33 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Tue May 25 15:30:22 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a9d6a6f5 www-servers/hinsightd: new version 0.9.4 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + .../files/hinsightd-redefine-directories-v2.patch | 21 www-servers/hinsightd/files/init.d.sh | 9 +++ ...insightd-.ebuild => hinsightd-0.9.4.ebuild} | 28 +- www-servers/hinsightd/hinsightd-.ebuild| 28 +- www-servers/hinsightd/metadata.xml | 12 +- 6 files changed, 67 insertions(+), 32 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index a3034ae29..56ef7b385 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1,2 @@ DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0 +DIST hin9-v0.9.4.tar.gz 77019 BLAKE2B 7339b407ba60c740f51f47794bd5fa4b73c662c718841c8de10be53bc6bec53f5ba511e2f69859ef9312aa85a318f0feeab5088b839dcae1dd734951f52f87a4 SHA512 817ac692778b9b7d9b2b7dd82a0d92fa0303d875601d6b52ddd75bb470cab1c9ac39170a0a1f5737ec4d28849837a8b61bf34bc96481044fe9864932bcfdd6cf diff --git a/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch new file mode 100644 index 0..8406efc86 --- /dev/null +++ b/www-servers/hinsightd/files/hinsightd-redefine-directories-v2.patch @@ -0,0 +1,21 @@ +diff --git a/src/hin/conf.h b/src/hin/conf.h +index 4a6f071..f4f6f36 100644 +--- a/src/hin/conf.h b/src/hin/conf.h +@@ -2,11 +2,11 @@ + #ifndef HIN_CONF_H + #define HIN_CONF_H + +-#define HIN_CONF_PATH "workdir/main.lua" +-#define HIN_LOGDIR_PATH "build/" +-#define HIN_WORKDIR_PATH "./" +-#define HIN_TEMP_PATH "/tmp/" +-#define HIN_DEBUG_MASK 0x ++#define HIN_CONF_PATH "/etc/hinsightd/main.lua" ++#define HIN_LOGDIR_PATH "/var/log/hinsightd/" ++#define HIN_WORKDIR_PATH "/etc/hinsightd/" ++#define HIN_TEMP_PATH "/var/tmp/hinsightd/" ++#define HIN_DEBUG_MASK 0x27f0f + + #define HIN_URING_QUEUE_DEPTH 256 + #define HIN_URING_DONT_FORK 0 diff --git a/www-servers/hinsightd/files/init.d.sh b/www-servers/hinsightd/files/init.d.sh index bc05ab5c9..15cd2ced5 100644 --- a/www-servers/hinsightd/files/init.d.sh +++ b/www-servers/hinsightd/files/init.d.sh @@ -6,7 +6,8 @@ LOG_DIR=/var/log/$NAME TMP_DIR=/var/tmp/$NAME CWD_DIR=/var/www/localhost PID_FILE=$RUN_DIR/$NAME.pid -CFG_FILE=/etc/hinsightd/$NAME.lua +CFG_FILE=/etc/hinsightd/main.lua +LOG_FILE=$LOG_DIR/hindsight.log RUN_FILE=/usr/bin/hinsightd RUN_USER="hinsightd" @@ -14,7 +15,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 --log $LOG_FILE" pidfile="$PID_FILE" command_args_background="--daemonize" command_user="$RUN_USER:$RUN_USER" @@ -24,11 +25,11 @@ depend() { } checkconfig() { - $command $command_args --pretend > /dev/null + start-stop-daemon --quiet --user $RUN_USER --start --exec $command -- --check $command_args } start_pre() { - checkpath --directory --owner $command_user --mode 0770 $LOG_DIR $TMP_DIR $RUN_DIR + checkpath --directory --owner $command_user --mode 06770 $LOG_DIR $TMP_DIR $RUN_DIR checkconfig || return 1 } diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-0.9.4.ebuild similarity index 66% copy from www-servers/hinsightd/hinsightd-.ebuild copy to www-servers/hinsightd/hinsightd-0.9.4.ebuild index a7e45d693..f8d82a655 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.4.ebuild @@ -42,8 +42,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/hinsightd-redefine-directories.patch" - "${FILESDIR}/hinsightd-default-config.patch" + "${FILESDIR}/hinsightd-redefine-directories-v2.patch" ) src_configure() { @@ -54,28 +53,35 @@ src_configure() { } src_install() { - newbin "${BUILD_DIR}/hin9" hinsightd - newinitd "${FILESDIR}/init.d.sh" hinsightd - systemd_dounit "${FILESDIR}/hinsightd.service" # not tested + newbin "${BUILD_DIR}/hin9" $PN + newinitd "${FILESDIR}/init.d.sh" $PN + systemd_dounit "${FILESDIR}/$P
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
commit: 95e29c33c1c2f04ef1515ec4d123f35ffa3ab19c Author: tiotags gmail com> AuthorDate: Fri Apr 30 07:49:08 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Fri Apr 30 07:49:08 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95e29c33 www-servers/hinsightd: new version 0.9.3 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/files/hinsightd-redefine-directories.patch | 12 +++- .../{hinsightd-0.9.2.ebuild => hinsightd-0.9.3.ebuild} | 0 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index bd726cf85..a3034ae29 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.2.tar.gz 65277 BLAKE2B 64f68db310ddd9438bd2b0247a285a9f7c4b162bfb105802760e4a231693116d159aaa4052d9c596356a2a6768379033b0bc1334a4da9ec9c845a1c835965922 SHA512 1ce3fd028e32be3daabf0b743c1005e9670df4f704c862aa871418dcb877d1780c174ae1c054be06bea62600e573a9ef80e67e4759c6722f9e25f3d656faa431 +DIST hin9-v0.9.3.tar.gz 65343 BLAKE2B 4b475f8088aa113ae7dbd2cfe091ee10efb39d60b7277cb821eb010e752b39adf5e2a3c53aedc73c612ed4ba3d96178c09f255b9a07caf64b9cad34af2da5841 SHA512 768f0e55c2992b0ce50187a62e4c75ae2c2e2c31067d77898d221ad89afba20a3121853f01267bf6f1e43942ddca273bfed6c63849ce922c9c9d2c971a9061e0 diff --git a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch index c204eff35..9fa2285a8 100644 --- a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch +++ b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch @@ -1,21 +1,23 @@ diff --git a/src/hin/conf.h b/src/hin/conf.h -index c4f7f4c..23b0714 100644 +index 8dfe060..3874d6c 100644 --- a/src/hin/conf.h +++ b/src/hin/conf.h -@@ -2,9 +2,9 @@ +@@ -2,10 +2,10 @@ #ifndef HIN_CONF_H #define HIN_CONF_H -#define HIN_CONF_PATH "workdir/main.lua" -#define HIN_LOGDIR_PATH "build/" --#define HIN_CWD_PATH "./" +-#define HIN_WORKDIR_PATH "./" +-#define HIN_PRINT_GREETING 1 +#define HIN_CONF_PATH "/etc/hinsightd/hinsightd.lua" +#define HIN_LOGDIR_PATH "/var/log/hinsightd/" -+#define HIN_CWD_PATH "/var/www/localhost/" ++#define HIN_WORKDIR_PATH "/var/www/localhost/" ++#define HIN_PRINT_GREETING 0 #define HIN_URING_QUEUE_DEPTH 256 #define HIN_URING_DONT_FORK 0 -@@ -20,8 +20,8 @@ +@@ -21,8 +21,8 @@ #define HIN_HTTPD_MAX_HEADER_LINE_SIZE 4096 #define HIN_HTTPD_MAX_POST_SIZE 4121440 #define HIN_HTTPD_MAX_DEFLATE_SIZE 0 diff --git a/www-servers/hinsightd/hinsightd-0.9.2.ebuild b/www-servers/hinsightd/hinsightd-0.9.3.ebuild similarity index 100% rename from www-servers/hinsightd/hinsightd-0.9.2.ebuild rename to www-servers/hinsightd/hinsightd-0.9.3.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 9b29bd2ce654700486b2d1f1232c83bc4dcda804 Author: tiotags gmail com> AuthorDate: Thu Apr 29 19:05:17 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Apr 29 19:05:17 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9b29bd2c www-servers/hinsightd: version bump v0.9.2 Closes: https://bugs.gentoo.org/786822 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/{hinsightd-0.9.1.ebuild => hinsightd-0.9.2.ebuild}| 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index e91d4ba71..bd726cf85 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.1.tar.gz 64851 BLAKE2B ca646af3b2a752f2b0ba2eec983f807d148b302a7a2db627117686dea3d16811829a1f89a3347708c775d8141372dd91ca46c79c32684b9366b703eb7018706e SHA512 175bbb25bd8be5052bcda96b709b33a996945c63f71249750ab11a46bafdb425818437023a882858e34692abc341d99141954ca31f6296383b26f617e76ac11a +DIST hin9-v0.9.2.tar.gz 65277 BLAKE2B 64f68db310ddd9438bd2b0247a285a9f7c4b162bfb105802760e4a231693116d159aaa4052d9c596356a2a6768379033b0bc1334a4da9ec9c845a1c835965922 SHA512 1ce3fd028e32be3daabf0b743c1005e9670df4f704c862aa871418dcb877d1780c174ae1c054be06bea62600e573a9ef80e67e4759c6722f9e25f3d656faa431 diff --git a/www-servers/hinsightd/hinsightd-0.9.1.ebuild b/www-servers/hinsightd/hinsightd-0.9.2.ebuild similarity index 100% rename from www-servers/hinsightd/hinsightd-0.9.1.ebuild rename to www-servers/hinsightd/hinsightd-0.9.2.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 35125f480a229bdfa738c6c0b7dee924e2d883a5 Author: tiotags gmail com> AuthorDate: Thu Apr 29 07:27:18 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Apr 29 07:27:18 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35125f48 www-servers/hinsightd: fixed compilation errors * removed version v0.9.0 * added warnings for old kernels * removed dep on dev-util/ninja, let sys decide Closes: https://bugs.gentoo.org/785007 Closes: https://bugs.gentoo.org/784965 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 - www-servers/hinsightd/hinsightd-0.9.0.ebuild | 70 www-servers/hinsightd/hinsightd-0.9.1.ebuild | 9 +++- www-servers/hinsightd/hinsightd-.ebuild | 9 +++- 4 files changed, 14 insertions(+), 75 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index 37be5d923..e91d4ba71 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,2 +1 @@ -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/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild deleted file mode 100644 index b81f198f9..0 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 ) - -inherit fcaps lua-single systemd - -DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" -HOMEPAGE="https://gitlab.com/tiotags/hin9"; -SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="" #+openssl -REQUIRED_USE="${LUA_REQUIRED_USE}" - -S="${WORKDIR}/hin9-v${PV}" - -BDEPEND=" - dev-util/ninja - virtual/pkgconfig -" - -RDEPEND=" - ${LUA_DEPS} - acct-user/hinsightd - acct-group/hinsightd - sys-libs/liburing - sys-libs/zlib - dev-libs/openssl -" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/hinsightd-redefine-directories.patch" -) - -#src_configure() { -#} - -src_compile() { - cd build - ninja || die -} - -src_install() { - newbin "${S}/build/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-0.9.1.ebuild b/www-servers/hinsightd/hinsightd-0.9.1.ebuild index 924a614e4..a7e45d693 100644 --- a/www-servers/hinsightd/hinsightd-0.9.1.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit fcaps lua-single systemd cmake +inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; @@ -26,7 +26,6 @@ IUSE="+openssl" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/ninja dev-util/cmake virtual/pkgconfig " @@ -73,4 +72,10 @@ src_install() { pkg_postinst() { fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd + + if kernel_is lt 5 7; then + ewarn "" + ewarn "hinsightd requires io_uring and kernel ~5.6.0" + ewarn "" + fi } diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 924a614e4..a7e45d693 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit fcaps lua-single systemd cmake +inherit fcaps lua-single systemd cmake linux-info DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; @@ -26,7 +26,6 @@ IUSE="+openssl" REQUIRED_USE="${LUA_REQUIRED_USE}"
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: 0a4b02d6b1e419e686dd4fb7ecde957fff152ee8 Author: tiotags gmail com> AuthorDate: Mon Apr 26 13:41:19 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Apr 26 13:41:19 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0a4b02d6 www-servers/hinsightd: version bump 0.9.1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + www-servers/hinsightd/files/hinsightd-default-config.patch | 12 .../hinsightd/files/hinsightd-redefine-directories.patch | 6 +++--- .../{hinsightd-.ebuild => hinsightd-0.9.1.ebuild}| 6 +++--- www-servers/hinsightd/hinsightd-.ebuild | 6 +++--- 5 files changed, 22 insertions(+), 9 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 0..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, "") ++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-.ebuild b/www-servers/hinsightd/hinsightd-0.9.1.ebuild similarity index 96% copy from www-servers/hinsightd/hinsightd-.ebuild copy to www-servers/hinsightd/hinsightd-0.9.1.ebuild index 9107371b8..924a614e4 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.1.ebuild @@ -11,17 +11,16 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; if [[ ${PV} == ** ]]; 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() { diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 9107371b8..924a614e4 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -11,17 +11,16 @@ DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; if [[ ${PV} == ** ]]; then - EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"; inherit git-r3 + EGIT_REPO_URI="https://gitla
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/, www-servers/hinsightd/files/
commit: ae65a194038ff27752b13602466ffef599002c09 Author: tiotags gmail com> AuthorDate: Mon Apr 26 09:39:03 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Apr 26 09:39:03 2021 + 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-.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-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 8ae886a39..9107371b8 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.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} == ** ]]; 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
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 0cae57bf7d861fcba4ece570c2120b1bcc2b4fcf Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Apr 23 12:16:29 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Apr 23 12:16:29 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0cae57bf www-servers/hinsightd: inherit systemd eclass Closes: https://bugs.gentoo.org/785217 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan riseup.net> www-servers/hinsightd/hinsightd-0.9.0.ebuild | 2 +- www-servers/hinsightd/hinsightd-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 7f95594b6..b81f198f9 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-1 ) -inherit fcaps lua-single +inherit fcaps lua-single systemd DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index cfc31c90f..8ae886a39 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit git-r3 fcaps lua-single +inherit git-r3 fcaps lua-single systemd DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9";
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 4d80cc06ee59e44ae9548ebf9a593e3f5e2dcef6 Author: tiotags gmail com> AuthorDate: Fri Apr 23 07:21:59 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Fri Apr 23 07:22:12 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d80cc06 www-servers/hinsightd: lua-single, multiple tweaks Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-0.9.0.ebuild | 6 +++--- www-servers/hinsightd/hinsightd-.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 744bf8aab..7f95594b6 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -5,11 +5,11 @@ EAPI=7 LUA_COMPAT=( lua5-1 ) -inherit fcaps lua +inherit fcaps lua-single DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; -SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz"; +SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"; LICENSE="BSD" SLOT="0" @@ -51,7 +51,7 @@ src_compile() { src_install() { newbin "${S}/build/hin9" hinsightd newinitd "${FILESDIR}/init.d.sh" hinsightd - #systemd_dounit "${FILESDIR}/hinsightd.service" # not tested + systemd_dounit "${FILESDIR}/hinsightd.service" # not tested insinto /etc/hinsightd newins "${S}/workdir/main.lua" hinsightd.lua diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index d0fcda423..cfc31c90f 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit git-r3 fcaps lua +inherit git-r3 fcaps lua-single DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; @@ -49,7 +49,7 @@ src_compile() { src_install() { newbin "${S}/build/hin9" hinsightd newinitd "${FILESDIR}/init.d.sh" hinsightd - #systemd_dounit "${FILESDIR}/hinsightd.service" # not tested + systemd_dounit "${FILESDIR}/hinsightd.service" # not tested insinto /etc/hinsightd newins "${S}/workdir/main.lua" hinsightd.lua
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 952f06c0f824ebebded46d48e9694e3e4ad6be2a Author: tiotags gmail com> AuthorDate: Thu Apr 22 18:06:45 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Thu Apr 22 18:06:45 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=952f06c0 www-servers/hinsightd: removed unsupported lua versions Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-0.9.0.ebuild | 8 +--- www-servers/hinsightd/hinsightd-.ebuild | 6 -- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 5bfcd1a68..744bf8aab 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -3,9 +3,9 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..4} ) +LUA_COMPAT=( lua5-1 ) -inherit fcaps +inherit fcaps lua DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; @@ -22,9 +22,11 @@ S="${WORKDIR}/hin9-v${PV}" BDEPEND=" dev-util/ninja + virtual/pkgconfig " -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} acct-user/hinsightd acct-group/hinsightd sys-libs/liburing diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 63a4c04ae..d0fcda423 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} ) -inherit git-r3 fcaps +inherit git-r3 fcaps lua DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; @@ -20,9 +20,11 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" dev-util/ninja + virtual/pkgconfig " -RDEPEND="${LUA_DEPS} +RDEPEND=" + ${LUA_DEPS} acct-user/hinsightd acct-group/hinsightd sys-libs/liburing
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 3238d97054d74e37ebc3a0256e508a259cfddd5c Author: Andrew Ammerlaan riseup net> AuthorDate: Thu Apr 22 07:15:53 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Apr 22 07:15:53 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3238d970 www-servers/hinsightd: correctly depend on lua Closes: https://bugs.gentoo.org/784962 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan riseup.net> www-servers/hinsightd/hinsightd-0.9.0.ebuild | 20 +++- www-servers/hinsightd/hinsightd-.ebuild | 20 +++- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 5f85e2d08..5bfcd1a68 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -10,30 +10,32 @@ inherit fcaps DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" HOMEPAGE="https://gitlab.com/tiotags/hin9"; SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz"; + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" + IUSE="" #+openssl +REQUIRED_USE="${LUA_REQUIRED_USE}" S="${WORKDIR}/hin9-v${PV}" BDEPEND=" -dev-util/ninja + dev-util/ninja " -RDEPEND=" -acct-user/hinsightd -acct-group/hinsightd -sys-libs/liburing -dev-lang/lua:* -sys-libs/zlib -dev-libs/openssl +RDEPEND="${LUA_DEPS} + acct-user/hinsightd + acct-group/hinsightd + sys-libs/liburing + sys-libs/zlib + dev-libs/openssl " DEPEND="${RDEPEND}" PATCHES=( -"${FILESDIR}/hinsightd-redefine-directories.patch" + "${FILESDIR}/hinsightd-redefine-directories.patch" ) #src_configure() { diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index bdb8dbee6..63a4c04ae 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -10,28 +10,30 @@ inherit git-r3 fcaps 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"; + LICENSE="BSD" SLOT="0" KEYWORDS="" + IUSE="" #+openssl +REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" -dev-util/ninja + dev-util/ninja " -RDEPEND=" -acct-user/hinsightd -acct-group/hinsightd -sys-libs/liburing -dev-lang/lua:* -sys-libs/zlib -dev-libs/openssl +RDEPEND="${LUA_DEPS} + acct-user/hinsightd + acct-group/hinsightd + sys-libs/liburing + sys-libs/zlib + dev-libs/openssl " DEPEND="${RDEPEND}" PATCHES=( -"${FILESDIR}/hinsightd-redefine-directories.patch" + "${FILESDIR}/hinsightd-redefine-directories.patch" ) #src_configure() {
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 801dfe25a92412f6d78bd1496e7f1c30906c8edb Author: tiotags gmail com> AuthorDate: Wed Apr 21 18:55:13 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Apr 21 18:55:13 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=801dfe25 www-servers/hinsightd: added keywords Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-0.9.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild index 1a48c1f94..5f85e2d08 100644 --- a/www-servers/hinsightd/hinsightd-0.9.0.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -12,9 +12,11 @@ HOMEPAGE="https://gitlab.com/tiotags/hin9"; SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz"; LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64" IUSE="" #+openssl +S="${WORKDIR}/hin9-v${PV}" + BDEPEND=" dev-util/ninja "
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: b1349123aa8262d56069a350b766e03813c2becb Author: tiotags gmail com> AuthorDate: Wed Apr 21 08:49:23 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Apr 21 08:49:23 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b1349123 www-servers/hinsightd: added ebuild 0.9.0 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/Manifest | 1 + www-servers/hinsightd/hinsightd-0.9.0.ebuild | 64 2 files changed, 65 insertions(+) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest new file mode 100644 index 0..61940dc50 --- /dev/null +++ b/www-servers/hinsightd/Manifest @@ -0,0 +1 @@ +DIST hin9-v0.9.0.tar.gz 65320 BLAKE2B c1348bc5afffa8804494f6ae228f54874d25cc5f40c17ee2a36f23104286f96f5d616cdc3e98de0854cf7d4b18165a2b70600b32f58024b679d213b2156c1f18 SHA512 60a1ff72d1abf57d8f764ebb77ab77f7069b40bfdbb5bb1c95324b366d1052378ffe36198112a595e08238622654a9c1e1d89679924883f8ff42b98ca7cf139e diff --git a/www-servers/hinsightd/hinsightd-0.9.0.ebuild b/www-servers/hinsightd/hinsightd-0.9.0.ebuild new file mode 100644 index 0..1a48c1f94 --- /dev/null +++ b/www-servers/hinsightd/hinsightd-0.9.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit fcaps + +DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals" +HOMEPAGE="https://gitlab.com/tiotags/hin9"; +SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v0.9.0/hin9-v0.9.0.tar.gz"; +LICENSE="BSD" +SLOT="0" +KEYWORDS="" +IUSE="" #+openssl + +BDEPEND=" +dev-util/ninja +" + +RDEPEND=" +acct-user/hinsightd +acct-group/hinsightd +sys-libs/liburing +dev-lang/lua:* +sys-libs/zlib +dev-libs/openssl +" + +DEPEND="${RDEPEND}" + +PATCHES=( +"${FILESDIR}/hinsightd-redefine-directories.patch" +) + +#src_configure() { +#} + +src_compile() { + cd build + ninja || die +} + +src_install() { + newbin "${S}/build/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 +}
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: 191d9d12162c696d701d9b93bb5f86ed04fd2213 Author: tiotags gmail com> AuthorDate: Wed Apr 21 09:19:48 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Wed Apr 21 09:19:48 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=191d9d12 www-servers/hinsightd: upstream metadata Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 50c6ba674..f494a4303 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -2,6 +2,10 @@ http://www.gentoo.org/dtd/metadata.dtd";> + + https://gitlab.com/tiotags/hin9/-/blob/master/docs/changes.md + https://gitlab.com/tiotags/hin9/-/issues + hinsightd is a http/1.1 webserver with a focus on simple code and reliable behaviour.
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: 398256d5a7bb8a7717e656587272e271e76c15c7 Author: tiotags gmail com> AuthorDate: Mon Apr 19 07:50:00 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Apr 19 07:50:37 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=398256d5 www-servers/hinsightd: added logrotate script and systemd unit Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/files/hinsightd.service | 10 ++ www-servers/hinsightd/files/logrotate.d.sh| 14 ++ www-servers/hinsightd/hinsightd-.ebuild | 5 + 3 files changed, 29 insertions(+) diff --git a/www-servers/hinsightd/files/hinsightd.service b/www-servers/hinsightd/files/hinsightd.service new file mode 100644 index 0..02215732e --- /dev/null +++ b/www-servers/hinsightd/files/hinsightd.service @@ -0,0 +1,10 @@ +[Unit] +Description=hinsightd is a http/1.1 webserver +After=syslog.target network.target + +[Service] +ExecStart=/usr/bin/hinsightd --config /etc/hinsightd/hinsightd.lua +ExecReload=/bin/kill -USR1 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/www-servers/hinsightd/files/logrotate.d.sh b/www-servers/hinsightd/files/logrotate.d.sh new file mode 100644 index 0..3483c001f --- /dev/null +++ b/www-servers/hinsightd/files/logrotate.d.sh @@ -0,0 +1,14 @@ +/var/log/hinsightd/*.log { +daily +missingok +rotate 7 +compress +delaycompress +minsize 1M +notifempty +sharedscripts +postrotate + test -e /run/openrc/softlevel && /etc/init.d/hinsightd reload 1>/dev/null || true + test -e /run/systemd/system && systemctl reload hinsightd.service || true +endscript +} diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index fc2323148..bdb8dbee6 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -45,10 +45,15 @@ src_compile() { src_install() { newbin "${S}/build/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
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: fa6c928b5253e3753be0b6c377ac8ad3a0fd9f2d Author: tiotags gmail com> AuthorDate: Mon Apr 19 07:47:55 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Mon Apr 19 07:50:37 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa6c928b www-servers/hinsightd: fail condition to src_compile Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> .../{gentoo.patch => hinsightd-redefine-directories.patch} | 0 www-servers/hinsightd/hinsightd-.ebuild| 14 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/www-servers/hinsightd/files/gentoo.patch b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch similarity index 100% rename from www-servers/hinsightd/files/gentoo.patch rename to www-servers/hinsightd/files/hinsightd-redefine-directories.patch diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index 571f67b24..fc2323148 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -15,6 +15,10 @@ SLOT="0" KEYWORDS="" IUSE="" #+openssl +BDEPEND=" +dev-util/ninja +" + RDEPEND=" acct-user/hinsightd acct-group/hinsightd @@ -26,14 +30,8 @@ dev-libs/openssl DEPEND="${RDEPEND}" -BDEPEND=" -acct-user/hinsightd -acct-group/hinsightd -dev-util/ninja -" - PATCHES=( -"${FILESDIR}/gentoo.patch" +"${FILESDIR}/hinsightd-redefine-directories.patch" ) #src_configure() { @@ -41,7 +39,7 @@ PATCHES=( src_compile() { cd build - ninja + ninja || die } src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: e44ff3483db699d558f77ee1d77c0f823d8e718a Author: tiotags gmail com> AuthorDate: Sun Apr 18 07:06:04 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Sun Apr 18 07:07:16 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e44ff348 www-servers/hinsightd: better description Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/metadata.xml | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 3e7b7f452..50c6ba674 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -1,8 +1,18 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - - - + + + hinsightd is a http/1.1 webserver with a focus on simple code and + reliable behaviour. + Notable features: reverse proxying, output caching, ssl, pipelining, + cgi, output compression with deflate, graceful restart, 304 status, + etag, range requests and a very customizable config file using lua. + Virtual hosts can be implemented in lua. + Logging is entirely controled by lua. + Full debug information can be toggled per request and outputted to console or a log file. + + + +
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
commit: eea58fcab46b6a8d85290a09cf23b01cb9fb81d0 Author: tiotags gmail com> AuthorDate: Sat Apr 17 21:06:49 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Sat Apr 17 21:07:07 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eea58fca www-servers/hinsightd: missing punctuation Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/hinsightd-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild index e76ea720c..571f67b24 100644 --- a/www-servers/hinsightd/hinsightd-.ebuild +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -45,7 +45,7 @@ src_compile() { } src_install() { - newbin "${S}/build/hin9 hinsightd" + newbin "${S}/build/hin9" hinsightd newinitd "${FILESDIR}/init.d.sh" hinsightd insinto /etc/hinsightd
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: 20417631c25a91e2ee0548600efdddccc33fad2a Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Apr 17 19:59:22 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Apr 17 19:59:22 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20417631 www-servers/hinsightd: remove RedundantLongDescription Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan riseup.net> www-servers/hinsightd/files/init.d.sh | 0 www-servers/hinsightd/metadata.xml| 3 --- 2 files changed, 3 deletions(-) diff --git a/www-servers/hinsightd/files/init.d.sh b/www-servers/hinsightd/files/init.d.sh old mode 100755 new mode 100644 diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 9b48d579b..3e7b7f452 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -2,9 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - -hinsightd a http/1.1 webserver with (hopefully) minimal goals -
[gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/files/, www-servers/hinsightd/
commit: c0abb42b17e62539099bd65adcf557839ece7c79 Author: tiotags gmail com> AuthorDate: Sat Apr 17 19:03:29 2021 + Commit: Alexandru Campeanu gmail com> CommitDate: Sat Apr 17 19:22:37 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c0abb42b www-servers/hinsightd: added hinsightd http server Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu gmail.com> www-servers/hinsightd/files/gentoo.patch| 28 + www-servers/hinsightd/files/init.d.sh | 49 +++ www-servers/hinsightd/hinsightd-.ebuild | 61 + www-servers/hinsightd/metadata.xml | 11 ++ 4 files changed, 149 insertions(+) diff --git a/www-servers/hinsightd/files/gentoo.patch b/www-servers/hinsightd/files/gentoo.patch new file mode 100644 index 0..22925c1dc --- /dev/null +++ b/www-servers/hinsightd/files/gentoo.patch @@ -0,0 +1,28 @@ +diff --git a/src/hin/conf.h b/src/hin/conf.h +index c4f7f4c..29b9375 100644 +--- a/src/hin/conf.h b/src/hin/conf.h +@@ -2,9 +2,9 @@ + #ifndef HIN_CONF_H + #define HIN_CONF_H + +-#define HIN_CONF_PATH "workdir/main.lua" +-#define HIN_LOGDIR_PATH "build/" +-#define HIN_CWD_PATH "./" ++#define HIN_CONF_PATH "/etc/hinsightd/hinsightd.lua" ++#define HIN_LOGDIR_PATH "/var/log/hinsightd/" ++#define HIN_CWD_PATH "/var/www/localhost/" + + #define HIN_URING_QUEUE_DEPTH 256 + #define HIN_URING_DONT_FORK 0 +@@ -20,8 +20,8 @@ + #define HIN_HTTPD_MAX_HEADER_LINE_SIZE 4096 + #define HIN_HTTPD_MAX_POST_SIZE 4121440 + #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_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/files/init.d.sh b/www-servers/hinsightd/files/init.d.sh new file mode 100755 index 0..9146de844 --- /dev/null +++ b/www-servers/hinsightd/files/init.d.sh @@ -0,0 +1,49 @@ +#!/sbin/openrc-run + +NAME=$RC_SVCNAME +RUN_DIR=/var/run/$NAME +LOG_DIR=/var/log/$NAME +TMP_DIR=/var/tmp/$NAME +CWD_DIR=/var/www/localhost +PID_FILE=$RUN_DIR/$NAME.pid +CFG_FILE=/etc/hinsightd/$NAME.lua + +RUN_FILE=/usr/bin/hinsightd +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" +pidfile="$PID_FILE" +command_args_background="--daemonize" +command_user="$RUN_USER:$RUN_USER" + +depend() { + use net +} + +checkconfig() { + $command $command_args --pretend > /dev/null +} + +start_pre() { + checkpath --directory --owner $command_user --mode 0770 $LOG_DIR $TMP_DIR $RUN_DIR + checkconfig || return 1 +} + +reload() { + if ! service_started "${NAME}" ; then +eerror " * ERROR ${NAME} isn't running" +return 1 + fi + + checkconfig || return 1 + + echo " * Reloading ${NAME} ..." + + start-stop-daemon --quiet --signal USR1 --pidfile ${PID_FILE} + eend $? +} + + diff --git a/www-servers/hinsightd/hinsightd-.ebuild b/www-servers/hinsightd/hinsightd-.ebuild new file mode 100644 index 0..e76ea720c --- /dev/null +++ b/www-servers/hinsightd/hinsightd-.ebuild @@ -0,0 +1,61 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit git-r3 fcaps + +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"; +LICENSE="BSD" +SLOT="0" +KEYWORDS="" +IUSE="" #+openssl + +RDEPEND=" +acct-user/hinsightd +acct-group/hinsightd +sys-libs/liburing +dev-lang/lua:* +sys-libs/zlib +dev-libs/openssl +" + +DEPEND="${RDEPEND}" + +BDEPEND=" +acct-user/hinsightd +acct-group/hinsightd +dev-util/ninja +" + +PATCHES=( +"${FILESDIR}/gentoo.patch" +) + +#src_configure() { +#} + +src_compile() { + cd build + ninja +} + +src_install() { + newbin "${S}/build/hin9 hinsightd" + newinitd "${FILESDIR}/init.d.sh" hinsightd + + insinto /etc/hinsightd + newins "${S}/workdir/main.lua" hinsightd.lua + + 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/metadata.xml b/www-servers/hinsightd/metadata.xml new file mode 100644 index 0..9b48d579b --- /dev/null +++ b/www-servers/hinsightd/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + +hinsightd a http/1.1 webserver with (hopefully) minimal goals + + + + +