From 983b4c1124dd5d43b23af9561948ab225c8f4413 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 14 Oct 2015 21:36:08 -0400 Subject: www-servers/monkeyd: version bump 1.6.3. enable tls plugin. Package-Manager: portage-2.2.20.1 --- www-servers/monkeyd/Manifest | 2 +- .../files/monkeyd-1.6.3-system-mbedtls.patch | 19 +++ www-servers/monkeyd/monkeyd-1.6.2.ebuild | 139 -------------------- www-servers/monkeyd/monkeyd-1.6.3.ebuild | 141 +++++++++++++++++++++ www-servers/monkeyd/monkeyd-9999.ebuild | 14 +- 5 files changed, 169 insertions(+), 146 deletions(-) create mode 100644 www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch delete mode 100644 www-servers/monkeyd/monkeyd-1.6.2.ebuild create mode 100644 www-servers/monkeyd/monkeyd-1.6.3.ebuild (limited to 'www-servers/monkeyd') diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest index 29e9b396ce53..443362c8bd5d 100644 --- a/www-servers/monkeyd/Manifest +++ b/www-servers/monkeyd/Manifest @@ -1,2 +1,2 @@ DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1 -DIST monkey-1.6.2.tar.gz 1913867 SHA256 d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b WHIRLPOOL 1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a +DIST monkey-1.6.3.tar.gz 2032771 SHA256 47973b12cc45c185b054e251a6c3d8a36cae70301f614b4132bb1ef504f01cfa SHA512 21d317b55bc22e0ef34a2ff545103fbba3728a47e888db58506891e525e926397af81d0ad42ac134f67ab30548853ea4c98df264fab6238901dd05c5b0f55abe WHIRLPOOL acda82625c281f31212eb22d4cef0f64fa251fad25ba5e8aa9e2f4f2146d5bd626a6c66cdb2d17f6559cc858d09fd0afd2383bcdccbf225b8956e2f8b272726c diff --git a/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch b/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch new file mode 100644 index 000000000000..30d13cc426b8 --- /dev/null +++ b/www-servers/monkeyd/files/monkeyd-1.6.3-system-mbedtls.patch @@ -0,0 +1,19 @@ +diff -Naur monkey-1.6.3.orig/plugins/tls/CMakeLists.txt monkey-1.6.3/plugins/tls/CMakeLists.txt +--- monkey-1.6.3.orig/plugins/tls/CMakeLists.txt 2015-10-13 13:23:34.000000000 -0400 ++++ monkey-1.6.3/plugins/tls/CMakeLists.txt 2015-10-14 21:28:27.941930485 -0400 +@@ -2,15 +2,6 @@ + tls.c + ) + +-if(NOT WITH_MBEDTLS_SHARED) +- option(ENABLE_TESTING OFF) +- option(ENABLE_PROGRAMS OFF) +- option(INSTALL_MBEDTLS_HEADERS OFF) +- set(MK_MBEDTLS_SRC ../../deps/mbedtls-2.1.2) +- add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.1.2) +- include_directories(${MK_MBEDTLS_SRC}/include) +-endif() +- + MONKEY_PLUGIN(tls "${src}") + + MONKEY_PLUGIN_LINK_LIB(tls mbedtls) diff --git a/www-servers/monkeyd/monkeyd-1.6.2.ebuild b/www-servers/monkeyd/monkeyd-1.6.2.ebuild deleted file mode 100644 index e0f015929ad5..000000000000 --- a/www-servers/monkeyd/monkeyd-1.6.2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit flag-o-matic toolchain-funcs multilib - -DESCRIPTION="A small, fast, and scalable web server" -HOMEPAGE="http://www.monkey-project.com/" -MY_P="${PN/d}-${PV}" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/monkey/monkey.git" - inherit git-2 - KEYWORDS="" -else - SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -# Currently monkeyd_plugins_tls is off. It provides mbed TLS (formerly PolarSSL). -# jemalloc is also off until we figure out how to work CMakeLists.txt magic. -#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" -#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}" - -PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril" -IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}" - -# uclibc is often compiled without backtrace info so we should -# force this off. If someone complains, consider relaxing it. -REQUIRED_USE=" - elibc_uclibc? ( !debug ) - cgi? ( php )" - -#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" -DEPEND="dev-util/cmake" -RDEPEND=" - php? ( dev-lang/php ) - cgi? ( dev-lang/php[cgi] )" - -S="${WORKDIR}/${MY_P}" - -WEBROOT="/var/www/localhost" - -pkg_setup() { - if use debug; then - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn "Do not use debug in production!" - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - fi -} - -src_prepare() { - # Unconditionally get rid of the bundled jemalloc and mbedTLS - rm -rf "${S}"/deps -} - -src_configure() { - local myconf="" - - use elibc_uclibc && myconf+=" --uclib-mode" - use elibc_musl && myconf+=" --musl-mode" - - #use jemalloc || myconf+=" --malloc-libc" - myconf+=" --malloc-libc" - - if use debug; then - myconf+=" --debug --trace" - else - myconf+=" --no-backtrace" - fi - - local enable_plugins="" - local disable_plugins="" - # We use 'cgi' and 'fastcgi' because they are global flags - # instead of the corresponding monkeyd_plugins_* - use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," - use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," - # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. - for p in ${PLUGINS}; do - pp=${p/+/} - cp=${pp/monkeyd_plugins_/} - use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp}," - done - myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}" - if use static-plugins; then - myconf+=" --static-plugins=${enable_plugins%,}" - fi - - # For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc, - # but shouldn't because it is POSIX. This needs to be fixed - # in uClibc. Also, we really should us append-cppflags but - # monkey's build system doesn't respect CPPFLAGS. This needs - # to be fixed in monkey. - use elibc_uclibc && append-cflags -D_GNU_SOURCE - - # Non-autotools configure - ./configure \ - --pthread-tls \ - --prefix=/usr \ - --sbindir=/usr/sbin \ - --webroot=${WEBROOT}/htdocs \ - --logdir=/var/log/${PN} \ - --mandir=/usr/share/man \ - --libdir=/usr/$(get_libdir) \ - --pidfile=/run/monkey.pid \ - --sysconfdir=/etc/${PN} \ - ${myconf} \ - || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - default - - newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd - newconfd "${FILESDIR}"/monkeyd.confd monkeyd - - # Move htdocs to docdir, bug #429632 - docompress -x /usr/share/doc/"${PF}"/htdocs.dist - mv "${D}"${WEBROOT}/htdocs \ - "${D}"/usr/share/doc/"${PF}"/htdocs.dist - mkdir "${D}"${WEBROOT}/htdocs - - keepdir \ - /var/log/monkeyd \ - ${WEBROOT}/htdocs - - # This needs to be created at runtime - rm -rf "${D}"/run -} diff --git a/www-servers/monkeyd/monkeyd-1.6.3.ebuild b/www-servers/monkeyd/monkeyd-1.6.3.ebuild new file mode 100644 index 000000000000..fc9146ee2746 --- /dev/null +++ b/www-servers/monkeyd/monkeyd-1.6.3.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="A small, fast, and scalable web server" +HOMEPAGE="http://www.monkey-project.com/" +MY_P="${PN/d}-${PV}" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/monkey/monkey.git" + inherit git-2 + KEYWORDS="" +else + SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +# jemalloc is also off until we figure out how to work CMakeLists.txt magic. +#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}" + +PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" +IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}" + +# uclibc is often compiled without backtrace info so we should +# force this off. If someone complains, consider relaxing it. +REQUIRED_USE=" + monkeyd_plugins_tls? ( !static-plugins ) + elibc_uclibc? ( !debug ) + cgi? ( php )" + +#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" +DEPEND=" + dev-util/cmake + monkeyd_plugins_tls? ( net-libs/mbedtls:= )" +RDEPEND=" + php? ( dev-lang/php ) + cgi? ( dev-lang/php[cgi] )" + +S="${WORKDIR}/${MY_P}" + +WEBROOT="/var/www/localhost" + +pkg_setup() { + if use debug; then + ewarn + ewarn "\033[1;33m**************************************************\033[00m" + ewarn "Do not use debug in production!" + ewarn "\033[1;33m**************************************************\033[00m" + ewarn + fi +} + +src_prepare() { + # Unconditionally get rid of the bundled jemalloc + rm -rf "${S}"/deps + epatch "${FILESDIR}"/${P}-system-mbedtls.patch +} + +src_configure() { + local myconf="" + + use elibc_uclibc && myconf+=" --uclib-mode" + use elibc_musl && myconf+=" --musl-mode" + + #use jemalloc || myconf+=" --malloc-libc" + myconf+=" --malloc-libc" + + if use debug; then + myconf+=" --debug --trace" + else + myconf+=" --no-backtrace" + fi + + local enable_plugins="" + local disable_plugins="" + # We use 'cgi' and 'fastcgi' because they are global flags + # instead of the corresponding monkeyd_plugins_* + use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," + use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," + # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. + for p in ${PLUGINS}; do + pp=${p/+/} + cp=${pp/monkeyd_plugins_/} + use $pp && enable_plugins+="${cp}," || disable_plugins+="${cp}," + done + myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}" + if use static-plugins; then + myconf+=" --static-plugins=${enable_plugins%,}" + fi + + # For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc, + # but shouldn't because it is POSIX. This needs to be fixed + # in uClibc. Also, we really should us append-cppflags but + # monkey's build system doesn't respect CPPFLAGS. This needs + # to be fixed in monkey. + use elibc_uclibc && append-cflags -D_GNU_SOURCE + + # Non-autotools configure + ./configure \ + --pthread-tls \ + --prefix=/usr \ + --sbindir=/usr/sbin \ + --webroot=${WEBROOT}/htdocs \ + --logdir=/var/log/${PN} \ + --mandir=/usr/share/man \ + --libdir=/usr/$(get_libdir) \ + --pidfile=/run/monkey.pid \ + --sysconfdir=/etc/${PN} \ + ${myconf} \ + || die +} + +src_compile() { + emake VERBOSE=1 +} + +src_install() { + default + + newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd + newconfd "${FILESDIR}"/monkeyd.confd monkeyd + + # Move htdocs to docdir, bug #429632 + docompress -x /usr/share/doc/"${PF}"/htdocs.dist + mv "${D}"${WEBROOT}/htdocs \ + "${D}"/usr/share/doc/"${PF}"/htdocs.dist + mkdir "${D}"${WEBROOT}/htdocs + + keepdir \ + /var/log/monkeyd \ + ${WEBROOT}/htdocs + + # This needs to be created at runtime + rm -rf "${D}"/run +} diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild index e0f015929ad5..fc9146ee2746 100644 --- a/www-servers/monkeyd/monkeyd-9999.ebuild +++ b/www-servers/monkeyd/monkeyd-9999.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit flag-o-matic toolchain-funcs multilib +inherit eutils flag-o-matic toolchain-funcs multilib DESCRIPTION="A small, fast, and scalable web server" HOMEPAGE="http://www.monkey-project.com/" @@ -21,22 +21,23 @@ fi LICENSE="GPL-2" SLOT="0" -# Currently monkeyd_plugins_tls is off. It provides mbed TLS (formerly PolarSSL). # jemalloc is also off until we figure out how to work CMakeLists.txt magic. -#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" #IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}" -PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril" +PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}" # uclibc is often compiled without backtrace info so we should # force this off. If someone complains, consider relaxing it. REQUIRED_USE=" + monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )" #DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" -DEPEND="dev-util/cmake" +DEPEND=" + dev-util/cmake + monkeyd_plugins_tls? ( net-libs/mbedtls:= )" RDEPEND=" php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )" @@ -56,8 +57,9 @@ pkg_setup() { } src_prepare() { - # Unconditionally get rid of the bundled jemalloc and mbedTLS + # Unconditionally get rid of the bundled jemalloc rm -rf "${S}"/deps + epatch "${FILESDIR}"/${P}-system-mbedtls.patch } src_configure() { -- cgit v1.2.3-65-gdbad