From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- www-servers/nginx-unit/Manifest | 8 +- .../files/nginx-unit-1.25.0-glibc-2.34.patch | 22 ------ www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild | 91 ---------------------- www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild | 91 ---------------------- www-servers/nginx-unit/nginx-unit-1.26.0.ebuild | 89 +++++++++++++++++++++ www-servers/nginx-unit/nginx-unit-1.26.1.ebuild | 89 +++++++++++++++++++++ 6 files changed, 182 insertions(+), 208 deletions(-) delete mode 100644 www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch delete mode 100644 www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild delete mode 100644 www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild create mode 100644 www-servers/nginx-unit/nginx-unit-1.26.0.ebuild create mode 100644 www-servers/nginx-unit/nginx-unit-1.26.1.ebuild (limited to 'www-servers/nginx-unit') diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest index 5d0ff8c6734d..b3423557e6b0 100644 --- a/www-servers/nginx-unit/Manifest +++ b/www-servers/nginx-unit/Manifest @@ -1,9 +1,9 @@ -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 +DIST nginx-unit-1.26.0.tar.gz 865556 BLAKE2B 8ef2f32364ae9858ec41c21639c2b9514d7aed4d4150d2952634946b0b180f5fee7c4be6e67e3608040d9bc7bd0f4fd19c158b5457fe629566bc42ff845f599b SHA512 9e10cd320bc6182e94f8b5296367922b39e2149166793f46c5012f9dbba806a4508ee4ec65a8677391f5c4d7b06481c176ccf94b8fd1ab5d4b018eb167877f5f +DIST nginx-unit-1.26.1.tar.gz 865811 BLAKE2B eb0b62e48a8d0f9199dfe77a2d6ec90a06ac24f83b362ae16fde83eea53e03923127be7b24da47a83cf51fc4ebe7930cba9a3ee7550a5243f242cc4bfba3a3b9 SHA512 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec EBUILD nginx-unit-1.22.0-r1.ebuild 1986 BLAKE2B 3acda1df9975cb822bb051544984567dc47e5ac7b57ee848235d5bce2cd0173e39ec26e43d7fea1f2b01c6280c348bba24b5fdd77b9f82fcbb4b3a9fc712c5eb SHA512 1115deb7a894188cf819b2611651f7b3515145e33f378d2ecf1f44d053b76722b3dade71d83faf9591d1bdb983737366958b201cb0e14a254343c32651fc5fda -EBUILD nginx-unit-1.25.0-r1.ebuild 2089 BLAKE2B 77878fc08dd4fb2dffff5f042324c9cc11bc5f58edf0bfdb35a16b559d65207bc9e6d966164de12643ae5b31c5fffd8a9812991042d78c62a36ca956a96d7923 SHA512 bec3902e163eb05dc53f2627e01af02f9ac0511043702f4a08b90f6fa5af7bbda35f43342c0fe607197555d77671414cc44475dd8d0e696311c8ecf7b4482ad3 -EBUILD nginx-unit-1.25.0-r2.ebuild 2089 BLAKE2B 402140a7c4e024e11325bf91c8faf50a88a3ff0805cb6ec1ce6616125766dcbff2037b9aeb7cf168362178a861e8d2036e849115ed52c64eecf1d7905d383450 SHA512 ceeebf4b46cd0ac752a338b75636e4987b284c841e5b503d011e76d8a0e0e9306461d66de904285aad9d5a23fbc3047f926b35ffcfe55dd1735814eee77f9d34 +EBUILD nginx-unit-1.26.0.ebuild 2040 BLAKE2B 0ceaf50b6da5a0dbc00938a7c6a3bc72b7f30bd214e363cb457c5828da8077fb1db0aadf4e5558c8cb7103d30248a0bf551b6c6177fa850ae7f51344cbbb1dc4 SHA512 a733c96ce5f4be49fc0db1d2389313544e0a072d98b6e38e41b57b274148d2e281ee10723314000b827de97ada5fa1b6a46abafd33574b78cda5083bb60d8928 +EBUILD nginx-unit-1.26.1.ebuild 2040 BLAKE2B 0ceaf50b6da5a0dbc00938a7c6a3bc72b7f30bd214e363cb457c5828da8077fb1db0aadf4e5558c8cb7103d30248a0bf551b6c6177fa850ae7f51344cbbb1dc4 SHA512 a733c96ce5f4be49fc0db1d2389313544e0a072d98b6e38e41b57b274148d2e281ee10723314000b827de97ada5fa1b6a46abafd33574b78cda5083bb60d8928 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 deleted file mode 100644 index c2f5165402ac..000000000000 --- a/www-servers/nginx-unit/files/nginx-unit-1.25.0-glibc-2.34.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/nginx-unit-1.25.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild deleted file mode 100644 index b4fa47193ab9..000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.25.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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 -} diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild deleted file mode 100644 index 1d9e098f0bcb..000000000000 --- a/www-servers/nginx-unit/nginx-unit-1.25.0-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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 -} diff --git a/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild new file mode 100644 index 000000000000..dcbeae43d4de --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild @@ -0,0 +1,89 @@ +# 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}" + +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 +} diff --git a/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild new file mode 100644 index 000000000000..dcbeae43d4de --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild @@ -0,0 +1,89 @@ +# 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}" + +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