From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- www-servers/nginx-unit/Manifest | 3 + www-servers/nginx-unit/files/auto-make.patch | 14 +++ www-servers/nginx-unit/files/auto-os-conf.patch | 109 +++++++++++++++++++++ www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild | 79 +++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 www-servers/nginx-unit/files/auto-make.patch create mode 100644 www-servers/nginx-unit/files/auto-os-conf.patch create mode 100644 www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild (limited to 'www-servers/nginx-unit') diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest index 46d676d72b6b..031c8452ae45 100644 --- a/www-servers/nginx-unit/Manifest +++ b/www-servers/nginx-unit/Manifest @@ -1,8 +1,11 @@ +AUX auto-make.patch 368 BLAKE2B ca9b0f4fe616edefb11806a6919835ad215e5b1bf4f0ca678737f1ecff787af11cc9ecd6624e6bc27548917545c72fb09df600900d7b5bbabdf766f653e17646 SHA512 507ed06a1e57d466e9e99a1bc56694211f21cb688f68450ec138b0983e0d5bf80ad426ff07e6865f66abf417200c177846211db95ea261054dbdb296deae1b95 +AUX auto-os-conf.patch 3777 BLAKE2B 759053595665eea70d7119a31e49d9dc234b7684078781eef234e6cb2a50a401729edc7380cd7ffd64826a900167badb5bf3922c6e395a999ede1e15d2e3a28f SHA512 5e156343aa65e4c08ca3b6f6721d8564dde9ed2903a03165d8c96036cdba6f0bcd813b45a394b8684f9e06281d5a28ea0d161611c470280e639158e63816f319 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77 DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413 EBUILD nginx-unit-1.12.0-r1.ebuild 1798 BLAKE2B 44e644a1fe2e49d0e1f7049a3335e9d7d93dac0e2f878ce8281ffab27f848937d602cae900dafcbff7b9520b81f5a1c0bd59471b322932bd284045cad90a7eb0 SHA512 7646a7de6402d3c6465cc05d6a4c7352d45f3f334bb444f37ccf613aefdf23c183b8940694cb411be347b6f7cd8726d15a28d4b615d03d9056fd46ee5751eba9 EBUILD nginx-unit-1.12.0-r2.ebuild 1942 BLAKE2B 27a6b14586e16902f1b199d5b678571fd78b52565c30ea338daf63c0d557980b62bf635e7ff2e8b2a512919925bc4845ab81fbc97758c1922fb0aa9edbccf52a SHA512 4b4a801d88f732dcc29c5f4c59eb66b56c792b353b258bb2179597218f8c74f7ac8ff1a19004ae73f14ef651f2b8d5aaee9651607f3755ce7a01d81e5e494f5f +EBUILD nginx-unit-1.12.0-r3.ebuild 1975 BLAKE2B 22be98f3faeb9a13450fb6637296c634b6b7e5cb7e9a260a59827eac74c880aa2e0247a54c9d4b87520f160c6c5c5ca59ec8b73ef4fc83f9b4d821841478459f SHA512 3807ca82c3990c975bbd878fc8605988b4843dee59df46fb6aa3a16a4590ff8003e7d19753ce3de889f5c6d35f8109ac227733c404c7cf16c612b08e7a0bccfc EBUILD nginx-unit-1.12.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e EBUILD nginx-unit-1.8.0.ebuild 1702 BLAKE2B d1e3ca67f25ffe4f4538acb00a0e5c2ed91c3e56facc2c9e7591d7944f12a070fc3dd839154ee848795756f87dfcc60cadfa6ed2e5396a8abe189569f6ba18b6 SHA512 a09d58603a0d9529ad3684ba3306d0a0f603a3dc8479c6c12e9841f88c2b4f9daf6a261fbf60682b9596d6f7eea9fba5dafa4ccb514ae0667b834c0384ddf5e0 MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3 diff --git a/www-servers/nginx-unit/files/auto-make.patch b/www-servers/nginx-unit/files/auto-make.patch new file mode 100644 index 000000000000..9a157ed6a86d --- /dev/null +++ b/www-servers/nginx-unit/files/auto-make.patch @@ -0,0 +1,14 @@ +--- a/auto/make 2019-10-03 16:08:32.000000000 +0200 ++++ b/auto/make 2019-10-31 16:57:43.354566956 +0100 +@@ -13,10 +13,9 @@ + + cat << END > $NXT_MAKEFILE + ++AR = $AR + CC = $CC + +-CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS +- + NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT + NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT + NXT_MODULE_LINK = $NXT_MODULE_LINK diff --git a/www-servers/nginx-unit/files/auto-os-conf.patch b/www-servers/nginx-unit/files/auto-os-conf.patch new file mode 100644 index 000000000000..e1d6775f9350 --- /dev/null +++ b/www-servers/nginx-unit/files/auto-os-conf.patch @@ -0,0 +1,109 @@ +--- a/auto/os/conf 2019-10-31 17:17:33.194445276 +0100 ++++ b/auto/os/conf 2019-10-31 17:19:51.780033224 +0100 +@@ -21,7 +21,7 @@ + Linux) + nxt_have=NXT_LINUX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -44,7 +44,7 @@ + FreeBSD) + nxt_have=NXT_FREEBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -71,14 +71,14 @@ + case "$NXT_CC_NAME" in + + SunC): +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -G -h libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so" + NXT_MODULE_LINK="\$(CC) -G" + ;; + + *) +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared \ + -Wl,-soname,\\\$\$ORIGIN/libnxt.so" +@@ -106,7 +106,7 @@ + # HFS+ volumes are caseless by default. + nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -dynamiclib" + NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \ + -install_name @executable_path/libnxt.dylib" +@@ -130,7 +130,7 @@ + NetBSD) + nxt_have=NXT_NETBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -152,7 +152,7 @@ + OpenBSD) + nxt_have=NXT_OPENBSD . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -174,7 +174,7 @@ + DragonFly) + nxt_have=NXT_DRAGONFLY . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -196,7 +196,7 @@ + AIX) + nxt_have=NXT_AIX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -G" + NXT_SHARED_LOCAL_LINK="\$(CC) -G" + NXT_MODULE_LINK="\$(CC) -G" +@@ -220,7 +220,7 @@ + NXT_EXEC_LINK="\$(CC)" + NXT_SHARED_LOCAL_EXEC_LINK= + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -238,7 +238,7 @@ + QNX) + nxt_have=NXT_QNX . auto/have + +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" +@@ -257,7 +257,7 @@ + ;; + + *) +- NXT_STATIC_LINK="ar -r -c" ++ NXT_STATIC_LINK="\$(AR) -r -c" + NXT_SHARED_LINK="\$(CC) -shared" + NXT_SHARED_LOCAL_LINK="\$(CC) -shared" + NXT_MODULE_LINK="\$(CC) -shared" diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild new file mode 100644 index 000000000000..ff15caf86a11 --- /dev/null +++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python2_7 python3_{5,6,7}) + +inherit flag-o-matic python-single-r1 + +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" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +MY_USE="perl python ruby" +MY_USE_PHP="php5-6 php7-1 php7-2 php7-3" +IUSE="${MY_USE} ${MY_USE_PHP} ssl" +REQUIRED_USE="|| ( ${IUSE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="perl? ( dev-lang/perl:= ) + php5-6? ( dev-lang/php:5.6[embed] ) + php7-1? ( dev-lang/php:7.1[embed] ) + php7-2? ( dev-lang/php:7.2[embed] ) + php7-3? ( dev-lang/php:7.3[embed] ) + python? ( ${PYTHON_DEPS} ) + ruby? ( dev-lang/ruby:* ) + ssl? ( dev-libs/openssl:0 )" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/auto-make.patch" + "${FILESDIR}/auto-os-conf.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +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)" + ./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} +} -- cgit v1.2.3