From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BD7DC1385B2 for ; Fri, 14 Aug 2015 22:18:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E8BCE0825; Fri, 14 Aug 2015 22:18:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83D40E0825 for ; Fri, 14 Aug 2015 22:18:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23B06340CD0 for ; Fri, 14 Aug 2015 22:18:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87973152 for ; Fri, 14 Aug 2015 22:18:32 +0000 (UTC) From: "Julian Ospald" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julian Ospald" Message-ID: <1439590683.8feb0db3ce7557a328716df1621b165836ce9e15.hasufell@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/hiawatha/files/, www-servers/hiawatha/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch www-servers/hiawatha/hiawatha-9.14-r1.ebuild X-VCS-Directories: www-servers/hiawatha/files/ www-servers/hiawatha/ X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald X-VCS-Revision: 8feb0db3ce7557a328716df1621b165836ce9e15 X-VCS-Branch: master Date: Fri, 14 Aug 2015 22:18:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 21689e01-d713-4dbf-96b1-d5870d698c34 X-Archives-Hash: bb9e75152cdcd384bdadd2a9b67cbfce commit: 8feb0db3ce7557a328716df1621b165836ce9e15 Author: Julian Ospald gentoo org> AuthorDate: Fri Aug 14 22:18:03 2015 +0000 Commit: Julian Ospald gentoo org> CommitDate: Fri Aug 14 22:18:03 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8feb0db3 www-servers/hiawatha: revbump to use system net-libs/mbedtls .../files/hiawatha-9.14-system-mbedtls.patch | 25 +++++++ www-servers/hiawatha/hiawatha-9.14-r1.ebuild | 87 ++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch b/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch new file mode 100644 index 0000000..05f3d09 --- /dev/null +++ b/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch @@ -0,0 +1,25 @@ +Add missing libraries to linker. + + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -114,7 +114,7 @@ + #add_definitions(-DMBEDTLS_THREADING_PTHREAD -DMBEDTLS_THREADING_C) + add_subdirectory(mbedtls) + endif() +- set(MBEDTLS_LIBRARY "mbedtls") ++ set(MBEDTLS_LIBRARIES "mbedtls" "mbedx509" "mbedcrypto") + endif() + + # Hiawatha +@@ -144,8 +144,8 @@ + target_link_libraries(wigwam ${CRYPT_LIBRARY}) + target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY}) + if(ENABLE_TLS) +- target_link_libraries(hiawatha ${MBEDTLS_LIBRARY}) +- target_link_libraries(wigwam ${MBEDTLS_LIBRARY}) ++ target_link_libraries(hiawatha ${MBEDTLS_LIBRARIES}) ++ target_link_libraries(wigwam ${MBEDTLS_LIBRARIES}) + if(NOT USE_SYSTEM_MBEDTLS) + set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) + set_target_properties(wigwam PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha) diff --git a/www-servers/hiawatha/hiawatha-9.14-r1.ebuild b/www-servers/hiawatha/hiawatha-9.14-r1.ebuild new file mode 100644 index 0000000..f1a4466 --- /dev/null +++ b/www-servers/hiawatha/hiawatha-9.14-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# ssl USE flag currently broken, unconditionally enabled +# rproxy USE flag broken too, unconditionally enabled + +EAPI=5 + +CMAKE_MIN_VERSION="2.8.4" + +inherit cmake-utils systemd user + +DESCRIPTION="Advanced and secure webserver" +HOMEPAGE="http://www.hiawatha-webserver.org" +SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+cache ipv6 monitor +rewrite tomahawk +xslt" + +RDEPEND=" + >=net-libs/mbedtls-2.0[threads] + xslt? ( dev-libs/libxslt + dev-libs/libxml2 )" +DEPEND="${RDEPEND}" +PDEPEND="monitor? ( www-apps/hiawatha-monitor )" + +# set this in make.conf if you want to use a different user/group +HIAWATHA_USER=${HIAWATHA_USER:-hiawatha} +HIAWATHA_GROUP=${HIAWATHA_GROUP:-hiawatha} + +pkg_setup() { + enewgroup ${HIAWATHA_GROUP} + enewuser ${HIAWATHA_USER} -1 -1 /var/www/hiawatha ${HIAWATHA_GROUP} +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-9.5-cflags.patch \ + "${FILESDIR}"/${PN}-9.14-system-mbedtls.patch + + grep '#ServerId =' config/hiawatha.conf.in 1>/dev/null || die + sed -i \ + -e "s/#ServerId =.*$/ServerId = ${HIAWATHA_USER}/" \ + config/hiawatha.conf.in || die +} + +src_configure() { + local mycmakeargs=( + -DCONFIG_DIR:STRING=/etc/hiawatha + $(cmake-utils_use_enable cache CACHE) + $(cmake-utils_use_enable ipv6 IPV6) + $(cmake-utils_use_enable kernel_linux LOADCHECK) + $(cmake-utils_use_enable monitor MONITOR) + -DENABLE_TLS=YES + $(cmake-utils_use_enable tomahawk TOMAHAWK) + $(cmake-utils_use_enable rewrite TOOLKIT) + $(cmake-utils_use_enable xslt XSLT) + -DUSE_SYSTEM_MBEDTLS=ON + -DLOG_DIR:STRING=/var/log/hiawatha + -DPID_DIR:STRING=/var/run + -DWEBROOT_DIR:STRING=/var/www/hiawatha + -DWORK_DIR:STRING=/var/lib/hiawatha + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + rm -rf "${ED%/}"/var/www/hiawatha/* + + newinitd "${FILESDIR}"/hiawatha.initd hiawatha + systemd_dounit "${FILESDIR}"/hiawatha.service + + local i + for i in /var/{lib,log}/hiawatha ; do + keepdir ${i} + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} ${i} + fperms 0750 ${i} + done + + keepdir /var/www/hiawatha + fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} /var/www/hiawatha +}