diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-04-20 20:43:51 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-04-20 20:43:51 +0200 |
| commit | 5c8bf4906082363b4e20efd3185abbdc1d96ad90 (patch) | |
| tree | b253b1ad6d3a0b30d0e22a511310101e810f3f38 | |
| parent | e054ac7491f0b5e3f69834bda51dc5c2f11f8b0f (diff) | |
| download | overlay-5c8bf4906082363b4e20efd3185abbdc1d96ad90.tar.gz overlay-5c8bf4906082363b4e20efd3185abbdc1d96ad90.tar.bz2 overlay-5c8bf4906082363b4e20efd3185abbdc1d96ad90.zip | |
Final changes to hiawatha
| -rw-r--r-- | www-apps/hiawatha-monitor/Manifest | 2 | ||||
| -rw-r--r-- | www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/hiawatha/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch | 8 | ||||
| -rw-r--r-- | www-servers/hiawatha/hiawatha-9.0.ebuild | 8 |
5 files changed, 16 insertions, 10 deletions
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest index 944ef09..f9522d6 100644 --- a/www-apps/hiawatha-monitor/Manifest +++ b/www-apps/hiawatha-monitor/Manifest @@ -1,2 +1,2 @@ DIST monitor-0.6.tar.gz 538567 SHA256 8b0627f5fd78c680dd56afb49fe34c96ff252d41582b152c08153a2b6baccf08 SHA512 07731b821ea7fcde83f93af472786d6c4e816544f2e7c8bfa3669f042af19f917a772af0dbfeba786832865d0aa8794af5b248d8d7935a49d7fa7634b6903fad WHIRLPOOL 8d065dbc4e67f7eda047896a94e7303b668da055e9375617c8f4c2f30858673c0ba6fa7e7d3048756637366e940e2b24493c086e452dce3657fc42ac7e20d643 -EBUILD hiawatha-monitor-0.6.ebuild 733 SHA256 bb01c5012341ab58e0cb91e641217aa1df8ac20990352d3f11f2fda2b7aafe8c SHA512 252ce6d609f4e8a7e8131de13ed9ec4a3d32828bc23e6f02e0ef52c01c0fa28dc9e01dba529aa5901bf63752c72a6a1fb24adffc935a08a5b32625fbedae76c8 WHIRLPOOL dffa802a5082007808d27f2d1004f7caf1e8032c392f1e3f2b3bbd6f1ebbb7d940b4fcd687871e3e59d99d50074c864dd5965e0230078bb3dffa459a8bdadeea +EBUILD hiawatha-monitor-0.6.ebuild 731 SHA256 863e98f2e608fd324451b8213683b68f70dc1acce2b99b0ce6ba7385dd10414c SHA512 f02c1e84420e1cc89cf8317449ba6955bbc79df24ba7c19f11b2c72a7318b7130a8ccd35d3d2bdb1f64d86b806c181e4256c6514df15b93f0ff4af339fc82c20 WHIRLPOOL ca1476ec4af76a07dec221cf5e0dbf98fb98673f3a9dfa3946ffbb476dd5313906b3a7057ac41f4d0b06d1d7dd6ff4eb874c7118da8d067fba0697c7f39e2a3c diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild index 9b77fd7..821e7a0 100644 --- a/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild +++ b/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64" IUSE="" DEPEND="" @@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P} src_install () { default - rm ChangeLog README LICENSE + rm -f ChangeLog README LICENSE insinto /usr/share/${PN} doins -r * diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest index b6fbeab..22cd426 100644 --- a/www-servers/hiawatha/Manifest +++ b/www-servers/hiawatha/Manifest @@ -1,5 +1,5 @@ -AUX hiawatha-9.0-no-bundled-polarssl.patch 1136 SHA256 601979f71c563f48df0a9dc414af11853252724d225d0abad450ddbf0b10661f SHA512 51101f4cc0504975d96b47c7ac54178dc89a6d9150db42a2030f909b6608015d4027b8a4d42bcb8a64da121a4e0f7f1f2ada8efc403eba4611506a6741b1edce WHIRLPOOL f80a17174082281d5718bd9ffce5097008bf4d683795c88fd12744b8d33426bcf002973d29b4d78003bc2e316fa222f4539fff5b434dfa4bb1f881f7a84b4216 +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 -EBUILD hiawatha-9.0.ebuild 1568 SHA256 79fa540e939cfa379ca077c1acd426ece66cd42c3f2366fc42f8413fd4664cb3 SHA512 546eec83b9c789846bccbdadc9733f40efcc79d5812a9927a1a3d8fe5bbc4ce50659739a3562b0cf662df45794de4f397c061635665351cd7ce68c5caaa83cdc WHIRLPOOL 291902e463f3966f54f57b9d8e195affb8b5575e1c6c038565c3e9cb86d8b3c4e1db246c30c4c82dc56d8b0a61ae33faf8dd4d1995714688b0d833435f50c2b3 +EBUILD hiawatha-9.0.ebuild 1531 SHA256 aa384558b4151ef5a34543bde154c686a906f34deeb0f91a4d5538340c55c779 SHA512 863c211cce1bdd9e353a6cbe5148cc16208b800bdf4908e73b31c8fd8af0bb19fb010b0ac51b6a94ae7285339dd0d8908dc20e8273ab10b5f270423e01943e0c WHIRLPOOL d94c59da6a093016e08638109efd6a327446896484f79c1e643c01a324c475a148fbf0c6260a5259da6a2573f0f3efa2ce3943a6c945a2cff5c9915865f24882 MISC metadata.xml 591 SHA256 0bfe816256782a71b03169ae99d3f5615814ee6a89ba95c3dcbcc2b331906c78 SHA512 60dee97034f30e8a118bcb9248314f8567974f4e5e4dde451dc90c842c70c4b72be5acb83dcda083183fa4f25be4c4c937b3917d2cabc94e86f5d105a5e6bd4c WHIRLPOOL f900782475798d45be666f99a70462cdcafa60397d18fe42d999bd00927d7313e24af2381478a2a6d0f3e6a5084b4d76a9b2be48a9b5574192fd94b5d5a5f64b 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 index d48afd4..2f32001 100644 --- a/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch +++ b/www-servers/hiawatha/files/hiawatha-9.0-no-bundled-polarssl.patch @@ -1,3 +1,11 @@ +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 diff --git a/www-servers/hiawatha/hiawatha-9.0.ebuild b/www-servers/hiawatha/hiawatha-9.0.ebuild index 414c07a..937851e 100644 --- a/www-servers/hiawatha/hiawatha-9.0.ebuild +++ b/www-servers/hiawatha/hiawatha-9.0.ebuild @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="debug +cache chroot ipv6 monitor +rewrite rproxy ssl tomahawk xsl" -DEPEND="ssl? ( >=net-libs/polarssl-1.2 ) +DEPEND="sys-libs/zlib + ssl? ( >=net-libs/polarssl-1.2 ) xsl? ( dev-libs/libxslt dev-libs/libxml2 )" @@ -27,9 +28,6 @@ PDEPEND="monitor? ( www-apps/hiawatha-monitor )" PATCHES=("${FILESDIR}"/${P}-no-bundled-polarssl.patch) src_configure() { - if use debug; then - CMAKE_BUILD_TYPE="RelWithDebInfo" - fi if use kernel_linux; then local myargs=" -DENABLE_LOADCHECK=ON " fi @@ -59,5 +57,5 @@ src_install() { newinitd "${FILESDIR}"/hiawatha.initd hiawatha - keepdir /var/l{ib,og}/hiawatha + keepdir /var/{lib,log}/hiawatha } |