* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2018-07-17 17:14 Tony Vroon
0 siblings, 0 replies; 6+ messages in thread
From: Tony Vroon @ 2018-07-17 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 45c246558a1abfd8c5fdb2b51d00b33faf1a0d81
Author: Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Mon Jul 16 10:57:14 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 17:14:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c24655
www-servers/nginx-unit: New package, by Ralph Seichter.
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. (Source: http://unit.nginx.org/)
Bug: https://bugs.gentoo.org/661074
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9249
Closes: https://bugs.gentoo.org/661074
www-servers/nginx-unit/Manifest | 1 +
www-servers/nginx-unit/files/nginx-unit.initd | 14 ++++++++++
www-servers/nginx-unit/metadata.xml | 22 +++++++++++++++
www-servers/nginx-unit/nginx-unit-1.3.ebuild | 39 +++++++++++++++++++++++++++
4 files changed, 76 insertions(+)
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
new file mode 100644
index 00000000000..9faa8c2bda7
--- /dev/null
+++ b/www-servers/nginx-unit/Manifest
@@ -0,0 +1 @@
+DIST nginx-unit-1.3.tar.gz 401670 BLAKE2B 34a0ed9631c7061d1c71f8335103b0e266ef6f949afeb8cef283a7b5dd6c9f0a4835f20fdedd091af6950cd0897cb1ab48dea9f475e1b75a2872da7ac0090d10 SHA512 63a47b920bfdae7a7e034d616f520b27b46151a299cf5854373f7f8472043de0ffc98f9d62317c46e637857e0ef24668ded99be6e058315acf25b4e1c7f1ed09
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
new file mode 100755
index 00000000000..23720abcc1e
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/unitd"
+pidfile="/run/nginx-unit.pid"
+
+depend() {
+ use dns logger netmount
+}
+
+start_pre() {
+ checkpath -d /var/lib/nginx-unit -o root:root 0770
+}
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
new file mode 100644
index 00000000000..7660440b3f5
--- /dev/null
+++ b/www-servers/nginx-unit/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@seichter.de</email>
+ <name>Ralph Seichter</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ 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.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">nginx/unit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/www-servers/nginx-unit/nginx-unit-1.3.ebuild b/www-servers/nginx-unit/nginx-unit-1.3.ebuild
new file mode 100644
index 00000000000..da3e472ba88
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/unit-${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="perl python"
+REQUIRED_USE="|| ( ${IUSE} )"
+DEPEND="perl? ( dev-lang/perl:= )
+ python? ( dev-lang/python:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/unit-${PV}"
+
+src_configure() {
+ ./configure \
+ --prefix=/usr \
+ --log=/var/log/${PN} \
+ --state=/var/lib/${PN} \
+ --pid=/run/${PN}.pid \
+ --control=unix:/run/${PN}.sock || die "Core configuration failed"
+ for flag in ${IUSE} ; do
+ if use ${flag} ; then
+ ./configure ${flag} || die "Module configuration failed: ${flag}"
+ fi
+ done
+}
+
+src_install() {
+ default
+ keepdir /var/lib/${PN}
+ fperms 0770 /var/lib/${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2019-09-17 13:31 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-09-17 13:31 UTC (permalink / raw
To: gentoo-commits
commit: a45d69a83dc44f0da339a4b964fb551ddcbd85de
Author: Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Tue Sep 17 13:24:34 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 13:31:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45d69a8
www-servers/nginx-unit: Addressed QA issues
Closes: https://bugs.gentoo.org/694656
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/12947
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
www-servers/nginx-unit/Manifest | 1 -
www-servers/nginx-unit/files/nginx-unit.initd | 2 +-
www-servers/nginx-unit/nginx-unit-1.9.0.ebuild | 67 --------------------------
3 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index fcbfded696a..defa0ceaf85 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,3 +1,2 @@
DIST nginx-unit-1.10.0.tar.gz 564348 BLAKE2B 82339422b4b3b696ff4bbb216d6c0d54f046531aa56f6e0f5602a9bbe18db878b6bc9c9e9b1513be0cee3197f288549d8a6f826bf69ffbb91fc35757775bde4d SHA512 da2b248ba22e5d46fa1c8c21041a875655fad0e1a09683c58cb5bb33ed0a671a921c7a13f99269f0574da02d0efaeff0233abc901e4e333f3f7ac9383334c781
DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-DIST nginx-unit-1.9.0.tar.gz 522420 BLAKE2B 8fabd8a43c8e5b07a8d9db41bb1d9790a6d434a20b762649557bc4e715a00b663416cd9556c9e5fc1894487172c1549de4d5511259876ea6bcd306e258e0ff5f SHA512 25beda88e3e92cace7acfee45a640c351f4e15f20f2aa0f047c3ba61351c6119f270754186f39ab3f1fcc16b1bef9009da4f507d5cdf511538825f2a4c879d62
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
old mode 100755
new mode 100644
index 23720abcc1e..41165a659d9
--- 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/sbin/unitd"
diff --git a/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild
deleted file mode 100644
index 3b4b5a06037..00000000000
--- a/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 python-single-r1
-
-MY_P="unit-${PV}"
-DESCRIPTION="A 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}"
-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:= )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- ./configure \
- --control=unix:/run/${PN}.sock \
- --ld-opt="${LDFLAGS}" \
- --log=/var/log/${PN} \
- --modules=$(get_libdir)/${PN} \
- --pid=/run/${PN}.pid \
- --prefix=/usr \
- --state=/var/lib/${PN} || die "Core configuration failed"
- 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}
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2019-11-04 6:23 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2019-11-04 6:23 UTC (permalink / raw
To: gentoo-commits
commit: 0264d76cab957b25e3561c40bb45a738f38bc702
Author: Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Thu Oct 31 16:25:48 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 05:34:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0264d76c
www-servers/nginx-unit: Support AR build variable
The upstream build currently does not support $AR. This ebuild
patches autoconf files to remedy the issue.
Closes: https://bugs.gentoo.org/696964
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/13508
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
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 +++++++++++++++
3 files changed, 202 insertions(+)
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 00000000000..9a157ed6a86
--- /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 00000000000..e1d6775f935
--- /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 00000000000..ff15caf86a1
--- /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}
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2021-09-13 18:21 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2021-09-13 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 69589f3c571a1c6e934824403b281cc8c5d0d2ca
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 13 18:21:46 2021 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 18:21:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69589f3c
www-servers/nginx-unit: Patch for glibc 2.34 support
Closes: https://bugs.gentoo.org/812467
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
.../files/nginx-unit-1.25.0-glibc-2.34.patch | 22 ++++++++++++++++++++++
www-servers/nginx-unit/nginx-unit-1.25.0.ebuild | 6 +++++-
2 files changed, 27 insertions(+), 1 deletion(-)
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 00000000000..c2f5165402a
--- /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 <remi@remirepo.net>
+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.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
index 5a6de36e3bf..b4fa47193ab 100644
--- a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
@@ -30,9 +30,12 @@ DEPEND="perl? ( dev-lang/perl:= )
dev-lang/ruby:*
dev-ruby/rubygems:*
)
- ssl? ( dev-libs/openssl:0= )"
+ 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
}
@@ -40,6 +43,7 @@ pkg_setup() {
src_prepare() {
eapply_user
sed -i '/^CFLAGS/d' auto/make || die
+ default
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2023-02-28 20:19 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2023-02-28 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 1cb867db04d4061168de5d84bb2c8fed834b8274
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 20:18:58 2023 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 20:18:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb867db
www-servers/nginx-unit: Add conf.d file
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.confd | 27 ++++++++++++++++++++++
www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd
new file mode 100644
index 000000000000..2eae2c67538f
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.confd
@@ -0,0 +1,27 @@
+# /etc/conf.d/nginx-unit
+
+# non-privileged processes to run as specified user
+#NXT_USER="nobody"
+
+# non-privileged processes to run as specified group
+# default: user's primary group
+#NXT_GROUP=""
+
+# 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/nginx-unit-1.29.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild
index 2b5fa3f6a04f..944eabe1322d 100644
--- a/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.29.0-r1.ebuild
@@ -90,6 +90,7 @@ src_install() {
diropts -m 0770
keepdir /var/lib/${PN}
newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
@ 2023-05-20 19:08 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2023-05-20 19:08 UTC (permalink / raw
To: gentoo-commits
commit: 22ec32f8b3d69b76278db53b1cee55ae1640a266
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 19:07:57 2023 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat May 20 19:07:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ec32f8
www-servers/nginx-unit: Fix init.d script
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.initd-r2 | 25 ++++++++++++++++++++++++
www-servers/nginx-unit/nginx-unit-1.30.0.ebuild | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r2 b/www-servers/nginx-unit/files/nginx-unit.initd-r2
new file mode 100644
index 000000000000..bae7c007fbfa
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.initd-r2
@@ -0,0 +1,25 @@
+#!/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/nginx-unit-1.30.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
index 92bb5f48b16f..8d3e40e6aa94 100644
--- a/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
@@ -92,7 +92,7 @@ src_install() {
diropts -m 0770
keepdir /var/lib/${PN}
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-20 19:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-28 20:19 [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/ Mike Pagano
-- strict thread matches above, loose matches on Subject: below --
2023-05-20 19:08 Mike Pagano
2021-09-13 18:21 Mike Pagano
2019-11-04 6:23 Joonas Niilola
2019-09-17 13:31 Michał Górny
2018-07-17 17:14 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox