From 949f1a8f0abd7d48c85b76ef6f82e4946cf62af5 Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Mon, 13 Apr 2026 08:29:48 -0400 Subject: [PATCH] www-servers/nginx-unit: remove last rited package Signed-off-by: Mike Pagano --- www-servers/nginx-unit/Manifest | 2 - .../nginx-unit/files/nginx-unit-ruby34.patch | 106 ----------------- www-servers/nginx-unit/files/nginx-unit.confd | 25 ---- .../nginx-unit/files/nginx-unit.initd-r2 | 25 ---- .../nginx-unit/files/nginx-unit.service | 13 --- www-servers/nginx-unit/metadata.xml | 22 ---- .../nginx-unit/nginx-unit-1.34.2.ebuild | 104 ----------------- .../nginx-unit/nginx-unit-1.35.0-r1.ebuild | 109 ------------------ 8 files changed, 406 deletions(-) delete mode 100644 www-servers/nginx-unit/Manifest delete mode 100644 www-servers/nginx-unit/files/nginx-unit-ruby34.patch delete mode 100644 www-servers/nginx-unit/files/nginx-unit.confd delete mode 100644 www-servers/nginx-unit/files/nginx-unit.initd-r2 delete mode 100644 www-servers/nginx-unit/files/nginx-unit.service delete mode 100644 www-servers/nginx-unit/metadata.xml delete mode 100644 www-servers/nginx-unit/nginx-unit-1.34.2.ebuild delete mode 100644 www-servers/nginx-unit/nginx-unit-1.35.0-r1.ebuild diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest deleted file mode 100644 index a02715239b561..0000000000000 --- a/www-servers/nginx-unit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST nginx-unit-1.34.2.tar.gz 1054961 BLAKE2B ecb9756c7c8bfb6100d74a8bedba6fd950850c443ff50a53143e09e8e2eb8c71fba59ac1b79f044900224504f96f952e75dfc94f9bc43e04c64291b453d1346c SHA512 c3d778b7f3de6231d4833f17b8a40c4d971a1b186efc5b4160da4acc62c43acb129c1596896ea64aa1d6c52a37418bc823094ef2e89a15494cf3d3d09eb0f666 -DIST nginx-unit-1.35.0.tar.gz 1066376 BLAKE2B 998b1f79cb7d9a303a01f3d60c21ad038a36c7d730a783a4daab87c57ed8e3fc60acfb722b2240489b21c0e2286314076a0ceb552afc36fe2d112655775a30a5 SHA512 a8c88b91dfda46aa324a5c8c688534e76b4fd1cdf3f7adb0d2604d48228dd874a20842e9b18b6cbd645e2a5c6c7f6f9e559577312012060c4b399b77422608a2 diff --git a/www-servers/nginx-unit/files/nginx-unit-ruby34.patch b/www-servers/nginx-unit/files/nginx-unit-ruby34.patch deleted file mode 100644 index 2169cdb351ddd..0000000000000 --- a/www-servers/nginx-unit/files/nginx-unit-ruby34.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 7b7b29fcfe077e577cf088414cff0128bfb0c1bf Mon Sep 17 00:00:00 2001 -From: Andrew Clayton -Date: Tue, 21 Jan 2025 19:15:02 +0000 -Subject: [PATCH] ruby: Fix build failures with Ruby 3.4 - -Ruby 3.4 started to actually mark some deprecated functions as -*deprecated* now resulting in compiler warnings (which due to -Werror we -treat as errors and thus the build fails). - -The *new* functions were actually introduced back in Ruby 1.9.2, so have -been around for quite some time. We claim support for Ruby 2.0 onwards -so this is more than fine. - -The new API replaces the old 'mark' and 'free' parameters with a struct -that allows for more fine tuning/configuration. We never made use of -either of those parameters and so the only members of this struct we -*need* to set is the structure wrapper name and the dsize function -pointer which is passed a pointer to the underlying wrapped structure to -calculate its memory usage. While this is *not* required the -documentation *recommends* setting it (though it doesn't say how it's -used). - -Ruby pytests still pass after this change... - -Closes: https://github.com/nginx/unit/issues/1525 -Link: -Link: -Signed-off-by: Andrew Clayton ---- - src/ruby/nxt_ruby_stream_io.c | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) - -diff --git a/src/ruby/nxt_ruby_stream_io.c b/src/ruby/nxt_ruby_stream_io.c -index 4ef69cee1..bda89b0f6 100644 ---- a/src/ruby/nxt_ruby_stream_io.c -+++ b/src/ruby/nxt_ruby_stream_io.c -@@ -19,6 +19,24 @@ static VALUE nxt_ruby_stream_io_write(VALUE obj, VALUE args); - nxt_inline long nxt_ruby_stream_io_s_write(nxt_ruby_ctx_t *rctx, VALUE val); - static VALUE nxt_ruby_stream_io_flush(VALUE obj); - static VALUE nxt_ruby_stream_io_close(VALUE obj); -+nxt_inline size_t nxt_ruby_dt_dsize_rctx(const void *arg); -+ -+ -+static const rb_data_type_t nxt_rctx_dt = { -+ .wrap_struct_name = "rctx", -+ .function = { -+ .dsize = nxt_ruby_dt_dsize_rctx, -+ }, -+}; -+ -+ -+nxt_inline size_t -+nxt_ruby_dt_dsize_rctx(const void *arg) -+{ -+ const nxt_ruby_ctx_t *rctx = arg; -+ -+ return sizeof(*rctx); -+} - - - VALUE -@@ -73,7 +91,7 @@ nxt_ruby_stream_io_new(VALUE class, VALUE arg) - { - VALUE self; - -- self = Data_Wrap_Struct(class, 0, 0, (void *) (uintptr_t) arg); -+ self = TypedData_Wrap_Struct(class, &nxt_rctx_dt, (void *)(uintptr_t)arg); - - rb_obj_call_init(self, 0, NULL); - -@@ -96,7 +114,7 @@ nxt_ruby_stream_io_gets(VALUE obj) - nxt_ruby_ctx_t *rctx; - nxt_unit_request_info_t *req; - -- Data_Get_Struct(obj, nxt_ruby_ctx_t, rctx); -+ TypedData_Get_Struct(obj, nxt_ruby_ctx_t, &nxt_rctx_dt, rctx); - req = rctx->req; - - if (req->content_length == 0) { -@@ -152,7 +170,7 @@ nxt_ruby_stream_io_read(VALUE obj, VALUE args) - long copy_size, u_size; - nxt_ruby_ctx_t *rctx; - -- Data_Get_Struct(obj, nxt_ruby_ctx_t, rctx); -+ TypedData_Get_Struct(obj, nxt_ruby_ctx_t, &nxt_rctx_dt, rctx); - - copy_size = rctx->req->content_length; - -@@ -208,7 +226,7 @@ nxt_ruby_stream_io_puts(VALUE obj, VALUE args) - return Qnil; - } - -- Data_Get_Struct(obj, nxt_ruby_ctx_t, rctx); -+ TypedData_Get_Struct(obj, nxt_ruby_ctx_t, &nxt_rctx_dt, rctx); - - nxt_ruby_stream_io_s_write(rctx, RARRAY_PTR(args)[0]); - -@@ -226,7 +244,7 @@ nxt_ruby_stream_io_write(VALUE obj, VALUE args) - return Qnil; - } - -- Data_Get_Struct(obj, nxt_ruby_ctx_t, rctx); -+ TypedData_Get_Struct(obj, nxt_ruby_ctx_t, &nxt_rctx_dt, rctx); - - len = nxt_ruby_stream_io_s_write(rctx, RARRAY_PTR(args)[0]); - diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd deleted file mode 100644 index b9ce82d332cee..0000000000000 --- a/www-servers/nginx-unit/files/nginx-unit.confd +++ /dev/null @@ -1,25 +0,0 @@ -# /etc/conf.d/nginx-unit - -# non-privileged processes to run as specified user -#NXT_USER="nginx-unit" - -# non-privileged processes to run as specified group -#NXT_GROUP="nginx-unit" - -# Address of the Control API Socket -#NXT_CONTROL="unix:/run/nginx-unit.sock" - -# PID file -#NXT_PID="/run/nginx-unit.pid" - -# Log File Name -#NXT_LOG="/var/log/nginx-unit" - -# Modules directory name -#NXT_MODULES="/usr/lib64/nginx-unit" - -# State directory name -#NXT_STATE="/var/lib/nginx-unit" - -# tmp directory name -#NXT_TMP="/usr/tmp" diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r2 b/www-servers/nginx-unit/files/nginx-unit.initd-r2 deleted file mode 100644 index bae7c007fbfa3..0000000000000 --- a/www-servers/nginx-unit/files/nginx-unit.initd-r2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/sbin/unitd" -pidfile="/run/nginx-unit.pid" -NXT_USER=${NXT_USER:-nginx-unit} -NXT_GROUP=${NXT_GROUP:-nginx-unit} -NXT_CONTROL=${NXT_CONTROL:-unix:/run/nginx-unit.sock} -NXT_PID=${NXT_PID:-/run/nginx-unit.pid} -NXT_LOG=${NXT_LOG:-/var/log/nginx-unit} -NXT_MODULES=${NXT_MODULES:-/usr/lib64/nginx-unit} -NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit} -NXT_TMP=${NXT_TMP:-/usr/tmp} - -command_args=" --user ${NXT_USER} --group ${NXT_GROUP} --control ${NXT_CONTROL} --pid ${NXT_PID} --log ${NXT_LOG} --modulesdir ${NXT_MODULES} --statedir ${NXT_STATE} --tmpdir ${NXT_TMP}" - -depend() { - use dns logger netmount -} - -start_pre() { - checkpath -d /var/lib/nginx-unit -o root:root -m 0770 -} - diff --git a/www-servers/nginx-unit/files/nginx-unit.service b/www-servers/nginx-unit/files/nginx-unit.service deleted file mode 100644 index e77bb8a38d62f..0000000000000 --- a/www-servers/nginx-unit/files/nginx-unit.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=NGINX Unit -Wants=network-online.target -After=network-online.target - -[Service] -Type=forking -PIDFile=/run/nginx-unit.pid -ExecStart=/usr/sbin/unitd -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml deleted file mode 100644 index 957d5e193e5ba..0000000000000 --- a/www-servers/nginx-unit/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - mpagano@gentoo.org - Mike Pagano - - - NGINX Unit is a dynamic web and application server, designed to run - applications in multiple languages. Unit is lightweight, polyglot, and - dynamically configured via API. The design of the server allows - reconfiguration of specific application parameters as needed by the - engineering or operations. - - - Support for PHP 8.3 - Support for PHP 8.4 - - - nginx/unit - - diff --git a/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild b/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild deleted file mode 100644 index 26720fa0fdf13..0000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.34.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{12..13} ) - -inherit flag-o-matic python-single-r1 systemd toolchain-funcs - -MY_P="unit-${PV}" -MY_USE="perl python ruby" -MY_USE_PHP="php8-3" - -DESCRIPTION="Dynamic web and application server" -HOMEPAGE="https://unit.nginx.org" -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="${MY_USE} ${MY_USE_PHP} perl ssl" - -REQUIRED_USE="|| ( ${IUSE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="perl? ( dev-lang/perl:= ) - php8-3? ( dev-lang/php:8.3[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby:= - dev-ruby/rubygems:= - ) - ssl? ( dev-libs/openssl:0= ) - virtual/libcrypt:0=" -BDEPEND=" - sys-apps/which -" -RDEPEND="${DEPEND} - acct-user/nginx-unit - acct-group/nginx-unit" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - eapply_user - sed -i '/^CFLAGS/d' auto/make || die - default -} - -src_configure() { - local opt=( - --control=unix:/run/${PN}.sock - --log=/var/log/${PN} - --modules=/usr/$(get_libdir)/${PN} - --pid=/run/${PN}.pid - --prefix=/usr - --state=/var/lib/${PN} - --user=${PN} - --group=${PN} - ) - - use ssl && opt+=( --openssl ) - export AR="$(tc-getAR)" - export CC="$(tc-getCC)" - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" - - # Modules require position-independent code - append-cflags $(test-flags-CC -fPIC -Wno-incompatible-pointer-types) - - for flag in ${MY_USE} ; do - if use ${flag} ; then - ./configure ${flag} || die "Module configuration failed: ${flag}" - fi - done - - for flag in ${MY_USE_PHP} ; do - if use ${flag} ; then - local php_slot="/usr/$(get_libdir)/${flag/-/.}" - ./configure php \ - --module=${flag} \ - --config=${php_slot}/bin/php-config \ - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" - fi - done -} - -src_install() { - default - - if use perl ; then - emake DESTDIR="${D}/" perl-install - fi - - rm -rf "${ED}"/usr/var - - diropts -m 0770 - keepdir /var/lib/${PN} - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service -} diff --git a/www-servers/nginx-unit/nginx-unit-1.35.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.35.0-r1.ebuild deleted file mode 100644 index e958e31655267..0000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.35.0-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{12..14} ) - -inherit flag-o-matic python-single-r1 systemd toolchain-funcs - -MY_P="unit-${PV}" -MY_USE="perl python ruby" -MY_USE_PHP="php8-3 php8-4" - -DESCRIPTION="Dynamic web and application server" -HOMEPAGE="https://unit.nginx.org" -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="${MY_USE} ${MY_USE_PHP} perl ssl" - -REQUIRED_USE="|| ( ${IUSE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="perl? ( dev-lang/perl:= ) - php8-3? ( dev-lang/php:8.3[embed] ) - php8-4? ( dev-lang/php:8.4[embed] ) - python? ( ${PYTHON_DEPS} ) - ruby? ( - dev-lang/ruby:= - dev-ruby/rubygems:= - ) - ssl? ( dev-libs/openssl:0= ) - virtual/libcrypt:0=" -BDEPEND=" - sys-apps/which -" -RDEPEND="${DEPEND} - acct-user/nginx-unit - acct-group/nginx-unit" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - eapply_user - sed -i '/^CFLAGS/d' auto/make || die - default -} - -src_configure() { - local opt=( - --control=unix:/run/${PN}.sock - --log=/var/log/${PN} - --modules=/usr/$(get_libdir)/${PN} - --pid=/run/${PN}.pid - --prefix=/usr - --state=/var/lib/${PN} - --user=${PN} - --group=${PN} - ) - - use ssl && opt+=( --openssl ) - export AR="$(tc-getAR)" - export CC="$(tc-getCC)" - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed" - - # Modules require position-independent code - append-cflags $(test-flags-CC -fPIC -Wno-incompatible-pointer-types) - - for flag in ${MY_USE} ; do - if use ${flag} ; then - ./configure ${flag} || die "Module configuration failed: ${flag}" - fi - done - - for flag in ${MY_USE_PHP} ; do - if use ${flag} ; then - local php_slot="/usr/$(get_libdir)/${flag/-/.}" - ./configure php \ - --module=${flag} \ - --config=${php_slot}/bin/php-config \ - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}" - fi - done -} - -src_test() { - use python && epytest '-opython_files=test_python*.py' -} - -src_install() { - default - - if use perl ; then - emake DESTDIR="${D}/" perl-install - fi - - rm -rf "${ED}"/usr/var - - diropts -m 0770 - keepdir /var/lib/${PN} - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service -}