From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- www-servers/nginx-unit/Manifest | 8 +- .../files/nginx-unit-1.25.0-glibc-2.34.patch | 22 ++++++ www-servers/nginx-unit/files/nginx-unit.initd | 4 +- www-servers/nginx-unit/files/nginx-unit.service | 13 ++++ www-servers/nginx-unit/metadata.xml | 2 +- www-servers/nginx-unit/nginx-unit-1.25.0.ebuild | 91 ++++++++++++++++++++++ 6 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch create mode 100644 www-servers/nginx-unit/files/nginx-unit.service create mode 100644 www-servers/nginx-unit/nginx-unit-1.25.0.ebuild (limited to 'www-servers/nginx-unit') diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest index 58dd4c8bf467..4369fc5040c5 100644 --- a/www-servers/nginx-unit/Manifest +++ b/www-servers/nginx-unit/Manifest @@ -1,4 +1,8 @@ -AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77 +AUX nginx-unit-1.25.0-glibc-2.34.patch 623 BLAKE2B 4836aa03f0d4090d132046c0c2cbda8f17dc5c1e3a374f0675e0a310d8f66f0fb37869f435c693791afbfc728b2ba6fd76359808c2dadc3d70c40e96267d0f51 SHA512 ecb60becb4a2a5944b7c401b6b96461cea40a8b2d7f22338647a4fd1ea67b304966cf388de91f1f734efdae13749b329f2bed8671ca7b375d4302f8683f3ebed +AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa +AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5 +DIST nginx-unit-1.25.0.tar.gz 853280 BLAKE2B 7aa33e687ba754ebaaca4a0076df3f1cc05e83213de1b64cf28718bf53b9085a26a78c036f4e98308cabec0026ce2b4e91718dfb9d8d83fdad779a587e1c1d71 SHA512 fc001ab21c5aa6c07b092f7b1f44be3b88636f9e2059c8bc4049a06d863daae1bbfa2531a4a24bdd5976250d7a0e260dcf0dbb0dec63efcc008b5398c6bb4bbd EBUILD nginx-unit-1.22.0-r1.ebuild 1986 BLAKE2B 3acda1df9975cb822bb051544984567dc47e5ac7b57ee848235d5bce2cd0173e39ec26e43d7fea1f2b01c6280c348bba24b5fdd77b9f82fcbb4b3a9fc712c5eb SHA512 1115deb7a894188cf819b2611651f7b3515145e33f378d2ecf1f44d053b76722b3dade71d83faf9591d1bdb983737366958b201cb0e14a254343c32651fc5fda -MISC metadata.xml 1099 BLAKE2B fbbcfefcacc05e8ca3063c503551b7fa2ce78bf5c1b308362783f61bdd8817011cda83aaa31241be2e6d3a6d49ee3822d0a19bfa9efbed20c3c7c2a40edd8c38 SHA512 e4381c28854305dbf4c4b0de6d983815e37560c610745bf4c7911f8b5b20c7a80fb1f98b0b4047d3feddf660afb1b3710679cfb12ce2140e66e0a30dbd39c978 +EBUILD nginx-unit-1.25.0.ebuild 2089 BLAKE2B 77878fc08dd4fb2dffff5f042324c9cc11bc5f58edf0bfdb35a16b559d65207bc9e6d966164de12643ae5b31c5fffd8a9812991042d78c62a36ca956a96d7923 SHA512 bec3902e163eb05dc53f2627e01af02f9ac0511043702f4a08b90f6fa5af7bbda35f43342c0fe607197555d77671414cc44475dd8d0e696311c8ecf7b4482ad3 +MISC metadata.xml 1100 BLAKE2B aace2457ae0f0c2d4f294b4e4b596e4939dd967ea0126c40ae39d34c9ae9257d527b54f0f4e2dd315e944c59bac4319b6c4b6b9a5a2de2239bd35accb1a93b36 SHA512 91af085df5d35fd10de25cf5d4c843d03d38aac302c825566ee7db801923b69ef4f35ab7b3a9e2b7d670a5b4785bdad7ab902ffb6b8a5c23b42a7cae98407e38 diff --git a/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch b/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch new file mode 100644 index 000000000000..c2f5165402ac --- /dev/null +++ b/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch @@ -0,0 +1,22 @@ +From 0125873b1dfbe6e671e3c9874ec2653f1b7832fa Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 3 Sep 2021 18:03:38 +0200 +Subject: [PATCH] fix build with recent glibc + +--- + src/nxt_thread.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nxt_thread.h b/src/nxt_thread.h +index d7800cc6..36e74cde 100644 +--- a/src/nxt_thread.h ++++ b/src/nxt_thread.h +@@ -142,7 +142,7 @@ nxt_thread_yield() \ + #endif + + +-#if (PTHREAD_STACK_MIN) ++#if defined(PTHREAD_STACK_MIN) + #define NXT_THREAD_STACK_MIN PTHREAD_STACK_MIN + + #else diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd index 41165a659d93..f7bd33af9334 100644 --- a/www-servers/nginx-unit/files/nginx-unit.initd +++ b/www-servers/nginx-unit/files/nginx-unit.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/sbin/unitd" @@ -10,5 +10,5 @@ depend() { } start_pre() { - checkpath -d /var/lib/nginx-unit -o root:root 0770 + 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 new file mode 100644 index 000000000000..e77bb8a38d62 --- /dev/null +++ b/www-servers/nginx-unit/files/nginx-unit.service @@ -0,0 +1,13 @@ +[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 index 1f7e1456cef1..88bdbf1127e4 100644 --- a/www-servers/nginx-unit/metadata.xml +++ b/www-servers/nginx-unit/metadata.xml @@ -1,5 +1,5 @@ - + mpagano@gentoo.org diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild new file mode 100644 index 000000000000..b4fa47193ab9 --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit flag-o-matic python-single-r1 systemd toolchain-funcs + +MY_P="unit-${PV}" +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" +MY_USE="perl python ruby" +MY_USE_PHP="php7-3 php7-4" +IUSE="${MY_USE} ${MY_USE_PHP} ssl" +REQUIRED_USE="|| ( ${IUSE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="perl? ( dev-lang/perl:= ) + php7-3? ( dev-lang/php:7.3[embed] ) + php7-4? ( dev-lang/php:7.4[embed] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( + dev-lang/ruby:* + dev-ruby/rubygems:* + ) + ssl? ( dev-libs/openssl:0= ) + virtual/libcrypt:0=" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-glibc-2.34.patch ) + +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=$(get_libdir)/${PN} + --pid=/run/${PN}.pid + --prefix=/usr + --state=/var/lib/${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) + + 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 + + diropts -m 0770 + keepdir /var/lib/${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service +} -- cgit v1.2.3