Updated hiawatha from sunrise

7 files changed, 9 insertions, 109 deletions

diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest
index 2ad2479..d59eb6b 100644
--- a/www-apps/hiawatha-monitor/Manifest
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -1,2 +1,4 @@
 DIST monitor-0.6.tar.gz 538567 SHA256 8b0627f5fd78c680dd56afb49fe34c96ff252d41582b152c08153a2b6baccf08 SHA512 07731b821ea7fcde83f93af472786d6c4e816544f2e7c8bfa3669f042af19f917a772af0dbfeba786832865d0aa8794af5b248d8d7935a49d7fa7634b6903fad WHIRLPOOL 8d065dbc4e67f7eda047896a94e7303b668da055e9375617c8f4c2f30858673c0ba6fa7e7d3048756637366e940e2b24493c086e452dce3657fc42ac7e20d643
 EBUILD hiawatha-monitor-0.6.ebuild 712 SHA256 0db42108a69c804bb2d5b258e2769a1baf09f454110bf925871985ec306385be SHA512 8280a8fd7785e5708e95991f856758eb0337e74ac0d9b3eddba497960547b877ec8b3234d503b29098582c569e07fe80a3a0e07cbeb82d9c1a92d6a981a06ddd WHIRLPOOL 0c4acf277d6cbd3a9dc4f2fd55a39164545f5cda87017aaf3a01dd56d0265f9d23a92391e2699d8f34f011cc95d09e90f306069b96baabcb0f170e4b084d856b
+MISC ChangeLog 479 SHA256 981165330226d93e3fcca98efee7aec951b38be8be44f259874a32965d1cb6f6 SHA512 b2d626da09779a6d26dbc1a581db0541fdf59e51309829213eb25c683450ee535a74d655a7db988b455c552edcde7453ddbf7a904deb7fccc48e9c508fe817a8 WHIRLPOOL ddee92683c397a1205cbb332b2815aaec4d34dfa1a6330089405b60440c5588cb36d28d40de47923741fe01857fe6e9973ed6625a840d0b4139fc375cf7b0df3
+MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index 52b0faa..4662558 100644
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,7 +1,5 @@
-AUX hiawatha-9.0-no-bundled-polarssl.patch 1398 SHA256 306a5c2615910636e79d86e82f38bbda0896e68f668bea3a2bbef0acc979312b SHA512 b982d0a40e410fa70568764e8ee2b771f505748604845938bdb0fafa3f7b974d01f81b1d8ffe3254c80bbde02e821a15d74ae5dd5fbb8b0a7d0fefb9edee1599 WHIRLPOOL eb8f6a92e332fa6d71dbf9a98f32db31fe05b53e56b42166316676aed80aa96a72c185d645509e01d42226788d317fd992a19176cc61214e2edb854acc837b3a
-AUX hiawatha.initd 450 SHA256 131f1fa9277edc742f92a69fc3c4bf7880864ef7ac93633a7170e8452a4e4c13 SHA512 dfa3b58f4fdb9400a2c9ce77740bc1c175ad5206429170ba7336cdd12adabb3f6be9cce911be015f404a65c5d10807854427a186ee90405662ee43e3e4ab8824 WHIRLPOOL 39264768b25aae0e79745e010545f36df300894091d02198eb28d6313b89241dd1bca9fbfab2fc396b376fbb9a95b79db40435387d92b9e62a37b1506ff734a9
-DIST hiawatha-9.0.tar.gz 666274 SHA256 5e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc SHA512 395333c1477c42cce9cb5540a7e6589afb16103bd78dd9bbd06df598ed04a3e29f2dfe19c20cf73c258de6cc00653e97aa204bd18f391a919c7129ebff9d6e5d WHIRLPOOL 691cc874d7079b8146871abf7c2733c62cd21154b8fbd04c2aa6d1ad438ab93e4ce03608e52d5b825fda6169f2e8f7c08e15f593c90837e54bba629a2d4f5041
+AUX hiawatha.initd 450 SHA256 c229c23712d71cf830a46f152f78a1aa726cf7c7cf9129ef7acfefb73483ae4c SHA512 412ba77b765015dccf6804d0ef06c55590b7dbec0bf3beb18652e05ae0efc364061bb8892e9727d2a7ac5df93656b62bcb89448dfa4272ae6ae26c633523b17a WHIRLPOOL b4316496f5b7e0ea330ccf51a14e7fcaf586bde794e29dc13828e34e05e5bf35c5db2d7544b7fd6ba369f9d0a2fb0fbfe358cb1dc75d0aadb95d0cae61c63b1d
 DIST hiawatha-9.1.1.tar.gz 669052 SHA256 68b1c65eb5f9ab2527875fd0960d3b88aaddb7c79594a405687db2aabac40395 SHA512 3f7632dd80282c68911636b59760c28b63f5673f36c1edff00545fa7b6f6a1f0fa090c4a18c8f5a97d0a46ef90fbaf60843b0c0bec513b4e1e27e672380a3143 WHIRLPOOL 7ed5d483afdeb0c57bad1279a9cd97f63927ca72bec6f0eed3eb326d44aaf092503a12f62cabbbda8a9d1e106ad83102fe7357657f6edc3d2612b127247a87ae
-EBUILD hiawatha-9.0.ebuild 1531 SHA256 aa384558b4151ef5a34543bde154c686a906f34deeb0f91a4d5538340c55c779 SHA512 863c211cce1bdd9e353a6cbe5148cc16208b800bdf4908e73b31c8fd8af0bb19fb010b0ac51b6a94ae7285339dd0d8908dc20e8273ab10b5f270423e01943e0c WHIRLPOOL d94c59da6a093016e08638109efd6a327446896484f79c1e643c01a324c475a148fbf0c6260a5259da6a2573f0f3efa2ce3943a6c945a2cff5c9915865f24882
-EBUILD hiawatha-9.1.1.ebuild 1772 SHA256 42a7d03d7aade61453e4bc960f138f8f7c45a2a442c49bf6c5c2a89b9cb6b3a5 SHA512 70e784b5aba33af73f59e2168aa1d21fe876c4cd87441d8dcc0b2ddb9cef52e7d79a3eba03032b3392d8547cd3bcd6ef425b27bfa53bb49c648fe64772593d7f WHIRLPOOL 585f5a2cd97631ff82376ac2622a0bba110b2f432f31effa7ee18a7714c74b1d71a9f386c6c34cda83a027f33cc2354f9fe51e94b6999711bfaccafd3ed757a7
-MISC metadata.xml 683 SHA256 5601eb98666599670ae673aaa22672807004799cc4d5ec81535840bc064fa16b SHA512 85caaa20b75909a5dfe1877414205fdfefe2e721e4867c6821a71ddcd06bb090ee0070d18c5fe4045c2cd3bee7194588aaea69a8e146931e0ab73055dcca7d8a WHIRLPOOL 37f7a5f992b6f9c1f82f336f45841cf78636dee2c33a12adb3b7a0cc186bd3d4b45073c717a2b40af2337ea26443e09655112c53660a4ac2393361da2412192d
+EBUILD hiawatha-9.1.1.ebuild 1771 SHA256 97a6381bb17843ae80c83c3f0e710e9a75f986c0cb1b821b894916db2f2730ec SHA512 144d9af968dda58fe03b7cf495d1beb4a4d45e77407cb124a0ec6ef16b51a607a221e6cf3481781778238c35afe82c09726d4c4e5714dcff0bdfe0016b7484b0 WHIRLPOOL 3b2d9899f7a23ca70093d52f4e4ec909098e175a1fc476d0b3bd7a8b2c0b4e97fec5729d68067e0c546660bd4cf476c351c33c3bd3104c80a86575b4ea7ccaad
+MISC ChangeLog 724 SHA256 9c9f1d0ff0947ef2119ef7258e436de1ff3a05aa7615cf480e2f1ce91c0ba498 SHA512 1de1a300dc017fdb5d0ee2fc5e92175ef5e196cabe1384d73b9d312336d4a9e68de98e1f232501b912b37def9695ac5c76b98b059df39562fb9845e483f462c7 WHIRLPOOL 8833ac4b6053f2f0b39678351fad3374daa4c2a24fb2466ee6d8725e46812ca3532a487cb5b156798132a816f9c2e3dcfd31cff5131abfe3a11864ac525eaece
+MISC metadata.xml 631 SHA256 196fa67e1e6465734fa9ff48c66f30dd8b7c9098de40dc144c562e3f78662935 SHA512 2a5ccb65f543d0d8edeb1dcebb1511904b5a3c0b8092809fde0c39ca2d6aa1fc8e1c6444c3ca5167f5d00de4baa052953a05bf6b6e4930ecaca80a23f13f41f6 WHIRLPOOL 6c9f2edd3833b17e7bf663400692299de2e9474e74631dbea82752a4705270bfb24234eacb28f38e1c1642adaf0224c226a455495a8ba5c1f7d8a4ccdbbb6754
diff --git a/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch b/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch
deleted file mode 100644
index 2f32001..0000000
--- a/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Hiawatha bundles PolarSSL. This is bad. Use the system-wide one.
-
-Upstream is not going to remove the bundling (it even uses .c files 
-for certain operation when SSL is not enabled), so we need to keep this
-patch around.
-
-From: René Neumann <gentoo@necoro.eu>
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1f4a312..0d8c6ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,15 +92,11 @@ include(CPack)
- 
- # PolarSSL
- if(ENABLE_SSL)
--	option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." ON)
--	set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
--	set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/hiawatha)
--	add_subdirectory(polarssl)
--	set(POLARSSL_LIBRARY "polarssl")
-+    find_library(POLARSSL_LIBRARY polarssl)
- endif()
- 
- # Hiawatha
--include_directories(${CMAKE_CURRENT_BINARY_DIR} polarssl/include)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
- if(ENABLE_XSLT)
- 	include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR})
- endif()
-@@ -124,7 +120,6 @@ target_link_libraries(wigwam ${CRYPT_LIBRARY})
- target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
- if(ENABLE_SSL)
- 	target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
--	set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
- endif()
- if(ENABLE_XSLT)
- 	target_link_libraries(hiawatha ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES})
diff --git a/www-servers/hiawatha/files/hiawatha.initd b/www-servers/hiawatha/files/hiawatha.initd
index fc6d3a4..9c04296 100644
--- a/www-servers/hiawatha/files/hiawatha.initd
+++ b/www-servers/hiawatha/files/hiawatha.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/www-servers/hiawatha/hiawatha-9.0.ebuild b/www-servers/hiawatha/hiawatha-9.0.ebuild
deleted file mode 100644
index 937851e..0000000
--- a/www-servers/hiawatha/hiawatha-9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_MIN_VERSION="2.8.4"
-
-inherit cmake-utils
-
-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"
-IUSE="debug +cache chroot ipv6 monitor +rewrite rproxy ssl tomahawk xsl"
-
-DEPEND="sys-libs/zlib
-        ssl? ( >=net-libs/polarssl-1.2 )
-        xsl? ( dev-libs/libxslt
-               dev-libs/libxml2 )"
-
-RDEPEND="${DEPEND}"
-PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
-
-PATCHES=("${FILESDIR}"/${P}-no-bundled-polarssl.patch)
-
-src_configure() {
-	if use kernel_linux; then
-		local myargs=" -DENABLE_LOADCHECK=ON "
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable cache CACHE)
-		$(cmake-utils_use_enable chroot CHROOT)
-		$(cmake-utils_use_enable ipv6 IPV6)
-		$(cmake-utils_use_enable debug DEBUG)
-		$(cmake-utils_use_enable monitor MONITOR)
-		$(cmake-utils_use_enable rewrite TOOLKIT)
-		$(cmake-utils_use_enable rproxy RPROXY)
-		$(cmake-utils_use_enable ssl SSL)
-		$(cmake-utils_use_enable xsl XSLT)
-		-DLOG_DIR:STRING=/var/log/hiawatha
-		-DPID_DIR:STRING=/var/run
-		-DWEBROOT_DIR:STRING=/var/www/hiawatha
-		-DWORK_DIR:STRING=/var/lib/hiawatha
-		-DCONFIG_DIR:STRING=/etc/hiawatha
-		${myargs}
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/hiawatha.initd  hiawatha
-
-	keepdir /var/{lib,log}/hiawatha
-}
diff --git a/www-servers/hiawatha/hiawatha-9.1.1.ebuild b/www-servers/hiawatha/hiawatha-9.1.1.ebuild
index f397f98..57851ba 100644
--- a/www-servers/hiawatha/hiawatha-9.1.1.ebuild
+++ b/www-servers/hiawatha/hiawatha-9.1.1.ebuild
@@ -63,7 +63,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	newinitd "${FILESDIR}"/hiawatha.initd  hiawatha
+	newinitd "${FILESDIR}"/hiawatha.initd hiawatha
 
 	keepdir /var/{lib,log}/hiawatha
 }
diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml
index 14aa2fc..9a435e8 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -4,10 +4,9 @@
 	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 	<use>
 		<flag name='cache'>Enable caching of content.</flag>
-		<flag name='chroot'>Enable running in a chroot.</flag>
 		<flag name='monitor'>Pull in www-apps/hiawatha-monitor.</flag>
 		<flag name='rewrite'>Enable the rewrite toolkit.</flag>
-		<flag name='rproxy'>Allow Hiawatha to run a reverse proxy.</flag>
+		<flag name='rproxy'>Allow Hiawatha to serve as a reverse proxy.</flag>
 		<flag name='tomahawk'>Enable Tomahawk control server.</flag>
 		<flag name='xslt'>Enable XSLT support. This is also needed for directory listings.</flag>
 	</use>