commit: 73fc018ba8f073441beb053067843a132c111390
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 4 14:06:57 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 14:31:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fc018b
www-servers/monkeyd: treeclean
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
www-servers/monkeyd/Manifest | 1 -
.../files/monkeyd-1.6.8-system-mbedtls.patch | 19 ---
.../monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch | 12 --
www-servers/monkeyd/files/monkeyd.confd | 5 -
www-servers/monkeyd/files/monkeyd.initd | 25 ----
www-servers/monkeyd/files/monkeyd.initd-r1 | 25 ----
www-servers/monkeyd/metadata.xml | 9 --
www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild | 136 ---------------------
www-servers/monkeyd/monkeyd-9999.ebuild | 136 ---------------------
9 files changed, 368 deletions(-)
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
deleted file mode 100644
index c767551ade4e..000000000000
--- a/www-servers/monkeyd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B
f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7
SHA512
3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
b/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
deleted file mode 100644
index 6b7ca5473ee0..000000000000
--- a/www-servers/monkeyd/files/monkeyd-1.6.8-system-mbedtls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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.2.1)
-- add_subdirectory(${MK_MBEDTLS_SRC} ${CMAKE_BINARY_DIR}/mbedtls-2.2.1)
-- include_directories(${MK_MBEDTLS_SRC}/include)
--endif()
--
- MONKEY_PLUGIN(tls "${src}")
-
- MONKEY_PLUGIN_LINK_LIB(tls mbedtls)
diff --git a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch
b/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch
deleted file mode 100644
index 82550aef4d09..000000000000
--- a/www-servers/monkeyd/files/monkeyd-1.6.9-fix-pidfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur monkey-1.6.9.orig/CMakeLists.txt monkey-1.6.9/CMakeLists.txt
---- monkey-1.6.9.orig/CMakeLists.txt 2016-06-04 19:16:47.000000000 -0400
-+++ monkey-1.6.9/CMakeLists.txt 2016-07-01 13:08:51.237213196 -0400
-@@ -285,7 +285,7 @@
-
- # Custom PIDPATH
- if(NOT PID_PATH)
-- set(MK_PATH_PIDPATH ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/ CACHE STRING
"Server PID path")
-+ set(MK_PATH_PIDPATH /run/ CACHE STRING "Server PID path")
- else()
- set(MK_PATH_PIDPATH ${PID_PATH} CACHE STRING "Server PID path")
- endif()
diff --git a/www-servers/monkeyd/files/monkeyd.confd
b/www-servers/monkeyd/files/monkeyd.confd
deleted file mode 100644
index 818957c9792c..000000000000
--- a/www-servers/monkeyd/files/monkeyd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Add any additional command line arguments here
-MONKEY_ARGS=""
diff --git a/www-servers/monkeyd/files/monkeyd.initd
b/www-servers/monkeyd/files/monkeyd.initd
deleted file mode 100644
index c44975ddda24..000000000000
--- a/www-servers/monkeyd/files/monkeyd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/bin/monkey"
-CONFFILE="/etc/monkeyd/monkey.conf"
-
-depend() {
- use net
-}
-
-start() {
- ebegin "Starting monkeyd"
- start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}"
>/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping monkeyd"
- local PORT=$(awk '/^ *Port/ { print $2 }' "${CONFFILE}")
- local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
- PIDFILE="${PIDFILE}"."${PORT}"
- start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/www-servers/monkeyd/files/monkeyd.initd-r1
b/www-servers/monkeyd/files/monkeyd.initd-r1
deleted file mode 100644
index 6ec67e11435c..000000000000
--- a/www-servers/monkeyd/files/monkeyd.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/monkey"
-CONFFILE="/etc/monkeyd/monkey.conf"
-
-depend() {
- use net
-}
-
-start() {
- ebegin "Starting monkeyd"
- local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
- mkdir -p $(dirname ${PIDFILE})
- start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}"
>/dev/null
- eend $?
-}
-
-stop() {
- ebegin "Stopping monkeyd"
- local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
- start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
deleted file mode 100644
index 56d90feb80b4..000000000000
--- a/www-servers/monkeyd/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="debug">Enable lots of debugging info</flag>
- <flag name="static-plugins">Build statically linked
plugins</flag>
- </use>
-</pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
deleted file mode 100644
index 1d194afb20c4..000000000000
--- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-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-r3
-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}"
-
-REQUIRED_USE="
- monkeyd_plugins_tls? ( !static-plugins )
- cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
- dev-build/cmake
- monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
- acct-group/monkeyd
- acct-user/monkeyd
- 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
- eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
- eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
- eapply_user
-}
-
-src_configure() {
- append-cflags -fcommon
- local myconf=""
-
- 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.
- local p
- 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
-
- # Non-autotools configure
- ./configure \
- --pthread-tls \
- --prefix=/usr \
- --default-user=monkeyd \
- --sbindir=/usr/sbin \
- --webroot=${WEBROOT}/htdocs \
- --logdir=/var/log/monkeyd \
- --mandir=/usr/share/man \
- --libdir=/usr/$(get_libdir) \
- --sysconfdir=/etc/monkeyd \
- ${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 || die
-
- keepdir /var/log/monkeyd ${WEBROOT}/htdocs
-
- # This needs to be created at runtime
- rm -rf "${D}"/run
-}
-
-pkg_postinst() {
- chown monkeyd:monkeyd /var/log/monkeyd
- chmod 770 /var/log/monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild
b/www-servers/monkeyd/monkeyd-9999.ebuild
deleted file mode 100644
index 09c054059b22..000000000000
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs
-
-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-r3
-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}"
-
-REQUIRED_USE="
- monkeyd_plugins_tls? ( !static-plugins )
- cgi? ( php )"
-
-#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-DEPEND="
- dev-build/cmake
- monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
-RDEPEND="
- acct-group/monkeyd
- acct-user/monkeyd
- 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
- eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
- eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
- eapply_user
-}
-
-src_configure() {
- append-cflags -fcommon
- local myconf=""
-
- 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.
- local p
- 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
-
- # Non-autotools configure
- ./configure \
- --pthread-tls \
- --prefix=/usr \
- --default-user=monkeyd \
- --sbindir=/usr/sbin \
- --webroot=${WEBROOT}/htdocs \
- --logdir=/var/log/monkeyd \
- --mandir=/usr/share/man \
- --libdir=/usr/$(get_libdir) \
- --sysconfdir=/etc/monkeyd \
- ${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 || die
-
- keepdir /var/log/monkeyd ${WEBROOT}/htdocs
-
- # This needs to be created at runtime
- rm -rf "${D}"/run
-}
-
-pkg_postinst() {
- chown monkeyd:monkeyd /var/log/monkeyd
- chmod 770 /var/log/monkeyd
-}
