From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- www-servers/hiawatha/Manifest | 8 ++ .../hiawatha/files/hiawatha-9.5-cflags.patch | 17 +++ www-servers/hiawatha/files/hiawatha.initd-r1 | 25 ++++ www-servers/hiawatha/files/hiawatha.service | 9 ++ www-servers/hiawatha/hiawatha-9.15.ebuild | 142 +++++++++++++++++++++ www-servers/hiawatha/metadata.xml | 19 +++ 6 files changed, 220 insertions(+) create mode 100644 www-servers/hiawatha/Manifest create mode 100644 www-servers/hiawatha/files/hiawatha-9.5-cflags.patch create mode 100644 www-servers/hiawatha/files/hiawatha.initd-r1 create mode 100644 www-servers/hiawatha/files/hiawatha.service create mode 100644 www-servers/hiawatha/hiawatha-9.15.ebuild create mode 100644 www-servers/hiawatha/metadata.xml (limited to 'www-servers/hiawatha') diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest new file mode 100644 index 000000000000..b740fab5aef2 --- /dev/null +++ b/www-servers/hiawatha/Manifest @@ -0,0 +1,8 @@ +AUX hiawatha-9.5-cflags.patch 485 SHA256 fdae13ea1a6f7ead9e4cb5786757bd9d941a8775e413154b1961f8e73e25c141 SHA512 64bb15a13d8b370bd1c22ee1fba49badfafee5aa2ba143dd1abf367e767a6bc615627f1419736cef687e521b8a6485440ee6fb1364dfea3302b8062b08047f70 WHIRLPOOL e0daa79bcc07f9b48f27da1c88ee0e476787f175c0ea0d622ddab008af914bfc44676343cd2189317cfa2e82f98ee0db881c6cc9891f99d3a2cfe8896b79ae71 +AUX hiawatha.initd-r1 474 SHA256 6bec859fa08b181f37ad6cd62e2468e7ddd7748145b503d4bb08b849d25e9033 SHA512 ce0d7e197da496c2fcad71faf313d4160357fe784569ff879debe8314728698ffc3e0e28032f301261b191947f4e332384a268be43f2ed6e522f4e183c15f5bf WHIRLPOOL 47c29caa4d4ea04c353e5c8e6442baf3448a5d2154db6dd72054e0dc0f5bed650ea09a9716b7db42ce2b577f6166d7557229e63e60f0c6296a08a6901d120f62 +AUX hiawatha.service 140 SHA256 91f46ed4d82ca1e434a9b9f06b27087c27722d988d4a93c568ed68869c9b7af5 SHA512 a393c6df1ea2c0ad1e18fc7381f12ea82f859fd7157a0b1983288037647c9bc2023c4923e1b01031c691dee4bc7b89730036ca51a50af37e11f6890098e397a1 WHIRLPOOL 7b2143bc0dc4c236589f0e8eea0831e1b2f6eb7d179e671bf578cf21370615ced1dcaf74c0a6e8e88cbdbef9719b85b670871c0843200d69e87f7e26877089a9 +DIST hiawatha-9.15.tar.gz 869922 SHA256 e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421 SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b WHIRLPOOL 80840072765430b05ecaf1ec631d3f1981c6f420edc18b4bcc7957f53f28ed2800170bbcec943c287da2968e6ac769514843fc54aa2a927d7d451057ed76d4d3 +EBUILD hiawatha-9.15.ebuild 4066 SHA256 eec8bc5a08bad3fc2056e6679f755e2c9088a74c981250c0d3ed922069e53793 SHA512 d881666c8b3fedb64caa023b9fafe9e75aabd424ebae7b2704e48c7679b63bc0f84f9869fd7f48ad841fb1da1dd1fca72fb9bfa6d6a727643de34fca8ffcbdf1 WHIRLPOOL 5a757cb65b8e89c20f4401409a562a0b06c8fa17fc2ffa01c66f8409aebb240704a8aa2f78df9ad3d91fa7dd56aefb2c035528e8cce17f36878ba2000c6ff9d5 +MISC ChangeLog 3692 SHA256 e650a45306596f4cce534379e793293be0947164dead24473809fd4eadb820ac SHA512 3e366bceb260319d2ac6cda61a727efa9f242b2fe19bcb71ac24cc94052b99b099eadfd3f548c1728dd21eadfbb34150cecd5cc1b088ff830de05775ccdfc655 WHIRLPOOL 4bbf5e502937bafff92b3587337102e42da9f5306c2393acd1ac7ed17b540c4f3ccdaca02ab5a58d1accba04f704517f2d1baab489e670150a741f672142dec6 +MISC ChangeLog-2015 1766 SHA256 3446e2818697985bb7175d029ad98a6d45318f1c5c870d4f728cbae9b5b977f6 SHA512 4db4288c57c3d1b164f59e207b73a02962c793f5a9d6a852805d92022be77a077c684329764be725e6faf96fa053cc247ea0f4db2b3759eab59a9a83ef7d79c6 WHIRLPOOL a3ac30a96730226d89f7a14b0e6b5ea6a5e3bda671e77831bb88170b5f5c2f17b30ce51d18d56222c014a52917d17ad80581c24290162183cba95f0f089123fd +MISC metadata.xml 734 SHA256 e719dbc3b6c2b060b479a76dba381170bea472ced70bc80e0084eb8d4973e5d5 SHA512 7880b2e670368a0bda7901599ef44e16b8089f2a2e445edcdb33727a42368378801d41d991f7ed5aef5f161e0a1654b5f5183e0bc2deefd437252ddaa8670587 WHIRLPOOL 922b206cd0299d46a6ad1c92b89d93485723b4221b4b6c1886a67840b0891ece462927cb394043379a0bbb3095666e32f5db9365c7c487c106c0fe9eb969c31c diff --git a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch new file mode 100644 index 000000000000..4ff33cd0d126 --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch @@ -0,0 +1,17 @@ +From: Julian Ospald +Date: Fri May 23 16:59:33 UTC 2014 +Subject: make optimization level build-type dependant + +--- hiawatha-9.5/CMakeLists.txt ++++ hiawatha-9.5/CMakeLists.txt +@@ -2,7 +2,9 @@ + project(Hiawatha C) + + # Compiler +-set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}") ++set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") ++set(CMAKE_C_FLAGS_RELEASE "-O2") ++set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2") + set(CMAKE_BUILD_TYPE "RelWithDebInfo") + + # Options diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 b/www-servers/hiawatha/files/hiawatha.initd-r1 new file mode 100644 index 000000000000..a6ebb0d64c4b --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha.initd-r1 @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon \ + --start \ + --exec "/usr/sbin/hiawatha" \ + --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon \ + --stop \ + --exec "/usr/sbin/hiawatha" \ + --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" + eend $? +} diff --git a/www-servers/hiawatha/files/hiawatha.service b/www-servers/hiawatha/files/hiawatha.service new file mode 100644 index 000000000000..35e740b7e390 --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hiawatha webserver +After=network.target + +[Service] +ExecStart=/usr/sbin/hiawatha -d + +[Install] +WantedBy=multi-user.target diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild b/www-servers/hiawatha/hiawatha-9.15.ebuild new file mode 100644 index 000000000000..754860d9b1a2 --- /dev/null +++ b/www-servers/hiawatha/hiawatha-9.15.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils eutils systemd user + +DESCRIPTION="Advanced and secure webserver" +HOMEPAGE="https://www.hiawatha-webserver.org" +SRC_URI="https://www.hiawatha-webserver.org/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt" + +RDEPEND=" + sys-libs/zlib + ssl? ( >=net-libs/mbedtls-2.0[threads] ) + xslt? ( dev-libs/libxslt + dev-libs/libxml2 )" +DEPEND="${RDEPEND}" +PDEPEND="monitor? ( www-apps/hiawatha-monitor )" + +# set these in the environment of your PM if you want to use different values +HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}" +HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}" +HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}" +HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}" +HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}" +HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}" +HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}" + +safe_sed() { + local replace_of=$1 + local replace_with=$2 + local file=$3 + # optional + local outfile=$4 + + grep -E "${replace_of}" "${file}" 1>/dev/null \ + || die "\"${replace_of}\" not found in ${file}!" + + if [[ -n ${outfile} ]] ; then + einfo "Sedding ${file} into ${outfile}" + sed -r \ + -e "s|${replace_of}|${replace_with}|" \ + "${file}" > ${outfile} || die "sed on ${file} to ${outfile} failed!" + else + einfo "Sedding ${file} in-place" + sed -r -i \ + -e "s|${replace_of}|${replace_with}|" \ + "${file}" || die "sed on ${file} failed!" + fi + +} + +pkg_pretend() { + einfo + einfo "You can change hiawatha user and group, as well as the" + einfo "directories the webserver is going to use. For that," + einfo "set the following environment variables in your PM:" + einfo " HIAWATHA_CONFIG_DIR" + einfo " default: /etc/hiawatha" + einfo " current: ${HIAWATHA_CONFIG_DIR}" + einfo " HIAWATHA_LOG_DIR" + einfo " default: /var/log/hiawatha" + einfo " current: ${HIAWATHA_LOG_DIR}" + einfo " HIAWATHA_PID_DIR" + einfo " default: /var/run" + einfo " current: ${HIAWATHA_PID_DIR}" + einfo " HIAWATHA_WEBROOT_DIR" + einfo " default: /var/www/hiawatha" + einfo " current: ${HIAWATHA_WEBROOT_DIR}" + einfo " HIAWATHA_WORK_DIR" + einfo " default: /var/lib/hiawatha" + einfo " current: ${HIAWATHA_WORK_DIR}" + einfo " HIAWATHA_USER" + einfo " default: hiawatha" + einfo " current: ${HIAWATHA_USER}" + einfo " HIAWATHA_GROUP" + einfo " default: hiawatha" + einfo " current: ${HIAWATHA_GROUP}" + einfo +} + +pkg_setup() { + enewgroup ${HIAWATHA_GROUP} + enewuser ${HIAWATHA_USER} -1 -1 "${HIAWATHA_WEBROOT_DIR}" ${HIAWATHA_GROUP} +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9.5-cflags.patch + + safe_sed "^#ServerId =.*$" "ServerId = ${HIAWATHA_USER}" \ + config/hiawatha.conf.in + + safe_sed "@HIAWATHA_PID_DIR@" "${HIAWATHA_PID_DIR}" \ + "${FILESDIR}/hiawatha.initd-r1" \ + "${T}/hiawatha.initd-r1" +} + +src_configure() { + local mycmakeargs=( + -DCONFIG_DIR:STRING="${HIAWATHA_CONFIG_DIR}" + -DENABLE_CACHE=$(usex cache) + -DENABLE_IPV6=$(usex ipv6) + -DENABLE_LOADCHECK=$(usex kernel_linux) + -DENABLE_MONITOR=$(usex monitor) + -DENABLE_RPROXY=$(usex rproxy) + -DENABLE_TLS=$(usex ssl) + -DENABLE_TOMAHAWK=$(usex tomahawk) + -DENABLE_TOOLKIT=$(usex rewrite) + -DENABLE_XSLT=$(usex xslt) + -DLOG_DIR:STRING="${HIAWATHA_LOG_DIR}" + -DPID_DIR:STRING="${HIAWATHA_PID_DIR}" + -DUSE_SYSTEM_MBEDTLS=$(usex ssl) + -DWEBROOT_DIR:STRING="${HIAWATHA_WEBROOT_DIR}" + -DWORK_DIR:STRING="${HIAWATHA_WORK_DIR}" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + rm -r "${ED%/}${HIAWATHA_WEBROOT_DIR}"/* || die + + newinitd "${T}"/hiawatha.initd-r1 hiawatha + systemd_dounit "${FILESDIR}"/hiawatha.service + + local i + for i in "${HIAWATHA_LOG_DIR}" "${HIAWATHA_WORK_DIR}" ; do + keepdir "${i}" + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${i}" + fperms 0750 "${i}" + done + + keepdir "${HIAWATHA_WEBROOT_DIR}" + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${HIAWATHA_WEBROOT_DIR}" +} diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml new file mode 100644 index 000000000000..9c55764f9182 --- /dev/null +++ b/www-servers/hiawatha/metadata.xml @@ -0,0 +1,19 @@ + + + + + + Enable caching of content + Pull in www-apps/hiawatha-monitor + Enable the rewrite toolkit + Enable TLS support via + net-libs/mbedtls + Enable Tomahawk control server + Enable XSLT support. + This is also needed for directory listings + Enable reverse proxy support + + + hsleisink/hiawatha + + -- cgit v1.2.3