www-servers/cherokee: Compile fixes

Removed old asciidoc.py script
Fixed errors.py python2 errors on python3
Fixed openssl compile errors
acct-user and acct-group ebuilds

acct-group/cherokee/Manifest

@@ -0,0 +1,2 @@
+EBUILD cherokee-0.ebuild 146 BLAKE2B 9cb29882c4c6aaddb9888d45d2b7ce2e3ee52e5165d71fb2aab1c193bb38e19e8de942253426a5b6bd996f53a384d5d591985d10920b245a47f3e68aea77308f SHA512 f90567df6cf444ebfcbbae7faf22b1a46c842788698a04618b27a9235266d41d1f6ff7dc56cfb385979b6003cc7fbba88e2374d88f2d32c12739138c2b3b5b18
+MISC metadata.xml 252 BLAKE2B f5a02be0647cebbd800d5a51f23ed639c404862318f0f98425a4bdfbc2771859e4349ce81a7b098c31494eef227ddec8c5afa94e665cf034870309742feb96f8 SHA512 df397066e2eefc00d0b64fc66b600b06d948ef9b4e7def258d6615f905a6047c5a11a1e53b6a8ae8fe427e5b99687d60db5aed4aad717455ee9ba5e88990ec09

acct-group/cherokee/cherokee-0.ebuild

@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=450

acct-group/cherokee/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>sandino@sandino.net</email>
+<name>Sandino Araico Sánchez</name>
+</maintainer>
+</pkgmetadata>

acct-user/cherokee/Manifest

@@ -0,0 +1,2 @@
+EBUILD cherokee-0.ebuild 269 BLAKE2B 5bcc32b6b5f922ffa588b42783c1caeb5f0b8c658489567ea604a738a329fa1d3f1b38c95b4bb91479aeebf09bf2f95a755804e47ffadaf9b62836aef6ac904f SHA512 160e0312b80881eed2f7e54a4c1610b3e264deb0dcf18da23267ff4888fc09ec0c682860fe2c26941e4f04003086fba1eff3f1cb5aeee84bee8891cbe2a1f58f
+MISC metadata.xml 252 BLAKE2B f5a02be0647cebbd800d5a51f23ed639c404862318f0f98425a4bdfbc2771859e4349ce81a7b098c31494eef227ddec8c5afa94e665cf034870309742feb96f8 SHA512 df397066e2eefc00d0b64fc66b600b06d948ef9b4e7def258d6615f905a6047c5a11a1e53b6a8ae8fe427e5b99687d60db5aed4aad717455ee9ba5e88990ec09

acct-user/cherokee/cherokee-0.ebuild

@@ -0,0 +1,13 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for www-servers/cherokee"
+ACCT_USER_ID=510
+ACCT_USER_GROUPS=( cherokee )
+ACCT_USER_HOME=/var/www
+
+acct-user_add_deps

acct-user/cherokee/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>sandino@sandino.net</email>
+<name>Sandino Araico Sánchez</name>
+</maintainer>
+</pkgmetadata>

www-servers/cherokee/Manifest

@@ -1 +1,10 @@
+AUX cherokee-1.2.104-openssl.patch 4335 BLAKE2B 67bc5e7443450bbaacfb7108a1200f4cf3e24b4b3fc88cc5b977f213a6ed701fc5dd0cee2feb14db6d1c9b1bcfc5a684c7e79ee738aefd6edbaf7046849fda92 SHA512 713897fe099cf99b5295d5125a4ccabf8d4dfdc001d33ee48b894cf23f714873568f2453c307d4336787c4be8e11f197abd74acbb9b7f529591ff3c6e2c8a92d
+AUX cherokee-1.2.104-python.patch 225500 BLAKE2B 38767a99bcfa719a4a8c5436bdcba42a1595848439b6243fc5a1e3dfea02b835096a2955d1dfc7b86dbd4a065b3c3226520272306a2bbcfbc9a2248f38de9610 SHA512 8fc0e0756bef0a7f2deb1672ca81b4fdbe3812271ce69739dabc69ee6c933b3929bc9e4e7490af5988ed9be2b3533f2249e4c7ca8c13a4226245fb549ccb3e77
+AUX cherokee-1.2.99-gentoo.patch 1763 BLAKE2B d4ab785332c60fcac0c22b1b0aefabe44db710a7a0973114e8ddbe0423dd1331c64493b4e862ce944f5afa6da30b307cbd27eead278ea9a080309d4bf1d08cc9 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b
+AUX cherokee-confd-1.2.98 144 BLAKE2B 9462724ac4500ed501a005e2b001eefa53f2e71e48181a39f497c492cf69cdce1d5d325227535bfdb465b5bb6940cb89aedafb6420a7c14074b15f36b93866e1 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84
+AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4f9d9375c26f6af04c120bccc49c6259aaf33749b071c151b80a096766cc98dee44bfc65af10208b9a43c936 SHA512 595e37b6cf70d4fbd466be918db6c17c37766f5e39a9ee4384a21025f1ce04367aeca495217b1e2c74ed2bce9ff8cfd9a58523b59d1181ce9f470eca97445641
+AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
+AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
 DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
+EBUILD cherokee-1.2.104-r3.ebuild 4991 BLAKE2B b0997ccdcc7efa297db51e0fc8d627931d9d44f1cf1d8b950d935bb2458bdcb29d7b094c674a0670087038ec91dea17964d560f21c75d6ce031f832d5103499f SHA512 7d347ccce321a04dd03f96d128e986189674f0f4faa41f2a19c9f96ba4912eba84e3bf613a738f88169cb33cf8106d2dcdf06f4ef89b1e9cd74ba3f11788e756
+MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d

www-servers/cherokee/cherokee-1.2.104-r3.ebuild

@@ -3,11 +3,9 @@
 
 EAPI=7
 
-WANT_AUTOMAKE="1.11"
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 )
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 pam systemd user
+inherit autotools pam systemd 
 
 DESCRIPTION="An extremely fast and tiny web server"
 SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
@@ -16,12 +14,14 @@ HOMEPAGE="https://www.cherokee-project.com/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
+IUSE="ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php ssl rrdtool static static-libs threads"
 RDEPEND=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
+	acct-group/cherokee
+	acct-user/cherokee
 	dev-libs/libpcre
 	>=sys-libs/zlib-1.1.4-r1
 	ffmpeg? ( media-video/ffmpeg )
@@ -34,13 +34,11 @@ COMMON_DEPEND="
 		dev-lang/php:*[fpm]
 		dev-lang/php:*[cgi]
 	) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl )
 	"
 DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	app-text/asciidoc"
 RDEPEND="${COMMON_DEPEND}
 	rrdtool? ( net-analyzer/rrdtool )"
 BDEPEND="app-arch/unzip"
@@ -49,16 +47,15 @@ RESTRICT="test"
 
 WEBROOT="/var/www/localhost"
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" )
+PATCHES="
+	${FILESDIR}/${PN}-1.2.99-gentoo.patch
+	${FILESDIR}/${PN}-1.2.104-python.patch
+	${FILESDIR}/${PN}-1.2.104-openssl.patch
+	"
 S="${WORKDIR}/webserver-${PV}"
 
-pkg_setup() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www cherokee
-}
 
 src_prepare() {
-	python_setup
 	default
 
 	"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
@@ -68,11 +65,12 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	if use admin ; then
-		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
-	else
+# Disable broken admin 
+#	if use admin ; then
+#		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
+#	else
 		myconf="${myconf} --disable-admin"
-	fi
+#	fi
 
 	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
 	if ! use php ; then
@@ -137,13 +135,13 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
 	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
 
-	if ! use admin ; then
+#	if ! use admin ; then
 		rm -r \
 			"${ED}"/usr/bin/cherokee-admin-launcher \
 			"${ED}"/usr/bin/CTK-run \
 			"${ED}"/usr/sbin/cherokee-admin \
 			"${ED}"/usr/share/cherokee/admin || die
-	fi
+#	fi
 
 	exeinto /usr/share/doc/${PF}/contrib
 	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
@@ -175,22 +173,23 @@ src_install() {
 
 pkg_postinst() {
 	elog
-	if use admin ; then
-		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
-		elog
-		elog "Cherokee currently supports configuration versioning, so from now on,"
-		elog "whenever a change is made to the configuration file format,"
-		elog "Cherokee-Admin will be able to automatically convert yours to the new"
-		elog "release. You simply have to load Cherokee-Admin and it will be converted"
-		elog "once you proceed to saving it."
-		elog
-		elog "There is also a command line utility that you can use to do the exact"
-		elog "same thing. Config format can change in different versions. It is"
-		elog "provided under:"
-		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
-	else
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-	fi
+# Disable broken admin
+#	if use admin ; then
+#		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
+#		elog
+#		elog "Cherokee currently supports configuration versioning, so from now on,"
+#		elog "whenever a change is made to the configuration file format,"
+#		elog "Cherokee-Admin will be able to automatically convert yours to the new"
+#		elog "release. You simply have to load Cherokee-Admin and it will be converted"
+#		elog "once you proceed to saving it."
+#		elog
+#		elog "There is also a command line utility that you can use to do the exact"
+#		elog "same thing. Config format can change in different versions. It is"
+#		elog "provided under:"
+#		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
+#	else
+#		elog "Try USE=admin if you want an easy way to configure cherokee."
+#	fi
 	elog
 	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
 	elog

www-servers/cherokee/files/cherokee-1.2.104-openssl.patch

@@ -0,0 +1,95 @@
+diff -puriN webserver-1.2.104.orig/cherokee/cryptor_libssl.c webserver-1.2.104/cherokee/cryptor_libssl.c
+--- webserver-1.2.104.orig/cherokee/cryptor_libssl.c	2014-04-01 11:12:48.000000000 -0600
++++ webserver-1.2.104/cherokee/cryptor_libssl.c	2022-03-18 05:44:45.000000000 -0600
+@@ -238,13 +238,13 @@ cherokee_cryptor_libssl_find_vserver (SS
+ 	/* SSL_set_SSL_CTX() only change certificates. We need to
+ 	 * changes more options by hand.
+ 	 */
+-	SSL_set_options(ssl, SSL_CTX_get_options(ssl->ctx));
++	SSL_set_options(ssl, SSL_CTX_get_options(SSL_get_SSL_CTX(ssl)));
+ 
+ 	if ((SSL_get_verify_mode(ssl) == SSL_VERIFY_NONE) ||
+ 	    (SSL_num_renegotiations(ssl) == 0)) {
+ 
+-		SSL_set_verify(ssl, SSL_CTX_get_verify_mode(ssl->ctx),
+-		               SSL_CTX_get_verify_callback(ssl->ctx));
++		SSL_set_verify(ssl, SSL_CTX_get_verify_mode(SSL_get_SSL_CTX(ssl)),
++		               SSL_CTX_get_verify_callback(SSL_get_SSL_CTX(ssl)));
+ 	}
+ 
+ 	return ret_ok;
+@@ -792,9 +792,7 @@ _socket_init_tls (cherokee_cryptor_socke
+ 
+ 	/* Disable Ciphers renegotiation (CVE-2009-3555)
+ 	 */
+-	if (cryp->session->s3) {
+-		cryp->session->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS;
+-	}
++	SSL_set_options(cryp->session, SSL_OP_NO_RENEGOTIATION);
+ 
+ 	return ret_ok;
+ }
+diff -puriN webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_1024.c webserver-1.2.104/cherokee/cryptor_libssl_dh_1024.c
+--- webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_1024.c	2014-04-01 11:12:48.000000000 -0600
++++ webserver-1.2.104/cherokee/cryptor_libssl_dh_1024.c	2022-03-18 05:08:11.000000000 -0600
+@@ -23,9 +23,9 @@ static DH *get_dh1024()
+ 	DH *dh;
+ 
+ 	if ((dh=DH_new()) == NULL) return(NULL);
+-	dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
+-	dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
+-	if ((dh->p == NULL) || (dh->g == NULL)) {
++	DH_set0_pqg(dh, BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL), 
++		NULL, BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL));
++	if ((DH_get0_p(dh) == NULL) || (DH_get0_g(dh) == NULL)) {
+ 		DH_free(dh); return(NULL);
+ 	}
+ 	return(dh);
+diff -puriN webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_2048.c webserver-1.2.104/cherokee/cryptor_libssl_dh_2048.c
+--- webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_2048.c	2014-04-01 11:12:48.000000000 -0600
++++ webserver-1.2.104/cherokee/cryptor_libssl_dh_2048.c	2022-03-18 05:09:20.000000000 -0600
+@@ -34,9 +34,9 @@ static DH *get_dh2048()
+ 	DH *dh;
+ 
+ 	if ((dh=DH_new()) == NULL) return(NULL);
+-	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+-	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+-	if ((dh->p == NULL) || (dh->g == NULL)) {
++	DH_set0_pqg(dh, BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL), 
++		NULL, BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL));
++	if ((DH_get0_p(dh) == NULL) || (DH_get0_g(dh) == NULL)) {
+ 		DH_free(dh); return(NULL);
+ 	}
+ 	return(dh);
+diff -puriN webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_4096.c webserver-1.2.104/cherokee/cryptor_libssl_dh_4096.c
+--- webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_4096.c	2014-04-01 11:12:48.000000000 -0600
++++ webserver-1.2.104/cherokee/cryptor_libssl_dh_4096.c	2022-03-18 05:10:34.000000000 -0600
+@@ -55,9 +55,9 @@ static DH *get_dh4096()
+ 	DH *dh;
+ 
+ 	if ((dh=DH_new()) == NULL) return(NULL);
+-	dh->p=BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL);
+-	dh->g=BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL);
+-	if ((dh->p == NULL) || (dh->g == NULL)) {
++	DH_set0_pqg(dh, BN_bin2bn(dh4096_p,sizeof(dh4096_p),NULL), 
++		NULL, BN_bin2bn(dh4096_g,sizeof(dh4096_g),NULL));
++	if ((DH_get0_p(dh) == NULL) || (DH_get0_g(dh) == NULL)) {
+ 		DH_free(dh); return(NULL);
+ 	}
+ 	return(dh);
+diff -puriN webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_512.c webserver-1.2.104/cherokee/cryptor_libssl_dh_512.c
+--- webserver-1.2.104.orig/cherokee/cryptor_libssl_dh_512.c	2014-04-01 11:12:48.000000000 -0600
++++ webserver-1.2.104/cherokee/cryptor_libssl_dh_512.c	2022-03-18 05:05:46.000000000 -0600
+@@ -18,9 +18,9 @@ static DH *get_dh512()
+ 	DH *dh;
+ 
+ 	if ((dh=DH_new()) == NULL) return(NULL);
+-	dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+-	dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
+-	if ((dh->p == NULL) || (dh->g == NULL)) {
++	DH_set0_pqg(dh, BN_bin2bn(dh512_p,sizeof(dh512_p),NULL), 
++		NULL, BN_bin2bn(dh512_g,sizeof(dh512_g),NULL));
++	if ((DH_get0_p(dh) == NULL) || (DH_get0_g(dh) == NULL)) {
+ 		DH_free(dh); return(NULL);
+ 	}
+ 	return(dh);