gentoo auto-resync : 02:03:2023 - 01:27:32

6 files changed, 116 insertions, 11 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index c95bd2bddd80..7991c86018fd 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index bbfbfe90849f..6a53ca632e6e 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,8 +1,10 @@
-AUX nginx-unit.confd 511 BLAKE2B bfea89949353e3f3d2abb8507b43339322a6fda8b3a732215232e9c9f8a56afb88b45b90609617ee3e9926c1896d0c6fa0f2e94ee2e7a44c4666151ed5881c09 SHA512 e5e82e6bd68153436a31108a9471495d0156ed7ec318727beabe85df894a0a3ff847b0ea1b92479aad84c1dca7c519938bff56a66ab9ebc100910e273868ec67
+AUX nginx-unit.confd 510 BLAKE2B 03cb328cbeef1baa1cf1590b11e8019efae98729ffd44fdbd278c2e48a99333d40a86ee7f8ccd1d986fa38276b7397e6622f926a6b22a07b39c8d600cdcdf93a SHA512 54e1e77ba3c2bf63e7da0d3c47d842ff5a702a33e97217534cf73688f4809947702660ad438b5126a529c2f834761ac85965aac4e8def24e478e16b69e6637ac
 AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
-AUX nginx-unit.initd-r1 358 BLAKE2B 8a7e42d830f69ea70db4e647dac6680bf1b25915f5f49e3bf1920c093ca9c93ffda6e0e3d926471cefb9fd989ca1b864715f6f10e38593cbf3975926450c363d SHA512 21719123fe61af68ee5750df71a93d5066dd82e0a2fbae7edf7a9bed1eccacb8cc56040d4a4e7496c1195ad23780df8d680177a181d68f208d0b670b6ff21f4c
+AUX nginx-unit.initd-r1 799 BLAKE2B 867b159e37a0e4f7aaad472ce3eeeb1f19814f15969d4fda6a65bda119df05491f9e9cee20cba191b51dab901a332cc2ab95bb4048589db8b0966736ebcd0d22 SHA512 1494cdfe368a32ba47c34730784c66a6cc408418a4d55012713c48f5a78abe31117f0651a5d5952e3b6ea17371232a08465189dffd4b35cda19a329ba5a43de2
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.29.0.tar.gz 903909 BLAKE2B d9e2544ce7ffb4f9a510afaef2ddbf54a4482558d0cd3dd526c1371413e32fc72e848c95d3866928c1accc19bc2aecdb4c26b6907bfa57c382db53cc2f9fad3e SHA512 6b0a6718be5c3312f5e17fc39ae35ca849049c97d29c63a7effda7f994274af29eed88970389bb3010a2103c431e69920c951de5004853004d1aa604d868bd9f
-EBUILD nginx-unit-1.29.0-r1.ebuild 2285 BLAKE2B db0331ea317c332e6b0a7a3ec1dc594a253f1cc9ae9e1e3c1c1cd50b949273d025046219aeb35eaea82a32001f599a08fa96f9b8d48588113d37b7545c51980c SHA512 8a6700d24e780738cbcb65296d68bfc1be3c18344b2fca82150a731a4b8239c14a6acb3e91e1d51673278ffb930161ce530bd42b6077918de938ef10aabd3750
+DIST nginx-unit-1.29.1.tar.gz 906654 BLAKE2B 1068a1002b05f6f9f28b19745e3c1c0f1d1def89fad8489174fd7b38ddd8c9678f27a3b105f98a17d537621cdd2cbedf9f39b4c284a7918d290287f3c324fa49 SHA512 c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
+EBUILD nginx-unit-1.29.0-r1.ebuild 2216 BLAKE2B bceff33e4a21737e4ae9abbf574db61cdf769ad97c25997f5b0ddc207783549fd168c3bea83c3f5460c95e3a64f8e7749f5680f1b410f70fff2072152fccf7e8 SHA512 c66f9ca8686e5d9e07b0da63ee8d6a6775f63000e61a38e960efe5a8b50311eea31e2ffc516de64d120cbfe1da454b27c591df08928e9695fc7756e2486830b3
 EBUILD nginx-unit-1.29.0.ebuild 2084 BLAKE2B 19e9e6168c0fd1872f18970865f5ff2f3d271e7ed0dce4f82c65db3f427e36399b2bca565734e6d999106fcec423e11fa434b69afddedd694d56b7a0a6401bac SHA512 6bf62218235d83f3e8f6b0cfaff4778c30c4618acd0ba6782979ecaddc73734c8ed87355930e780f8dfce1c1cc5c59098fdbc7a1ba78f2bfbce025a3ac84e986
+EBUILD nginx-unit-1.29.1.ebuild 2285 BLAKE2B db0331ea317c332e6b0a7a3ec1dc594a253f1cc9ae9e1e3c1c1cd50b949273d025046219aeb35eaea82a32001f599a08fa96f9b8d48588113d37b7545c51980c SHA512 8a6700d24e780738cbcb65296d68bfc1be3c18344b2fca82150a731a4b8239c14a6acb3e91e1d51673278ffb930161ce530bd42b6077918de938ef10aabd3750
 MISC metadata.xml 830 BLAKE2B 9ff8b1d0525b28b0310f0de99abb99f1bff74a5effbc1bc3bf991e338a3f201a947fdc1687433ab0e9b6849c14feeaed2b5fdd8ba770fafa62f00f18158bbc60 SHA512 9fc506c23c1f5031774cb74823d8a5090dc8920f0e6e7e22bb2e46ae6df4e9705fa65033b57c5452310ba342ea520757a5f14bf9d1828b47101a2d5382ea1c57
diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd
index eedf0ffbd685..b9ce82d332ce 100644
--- a/www-servers/nginx-unit/files/nginx-unit.confd
+++ b/www-servers/nginx-unit/files/nginx-unit.confd
@@ -18,7 +18,6 @@
 # Modules directory name
 #NXT_MODULES="/usr/lib64/nginx-unit"
 
-
 # State directory name
 #NXT_STATE="/var/lib/nginx-unit"
 
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1
index a9ad47834899..32ef624d2103 100644
--- a/www-servers/nginx-unit/files/nginx-unit.initd-r1
+++ b/www-servers/nginx-unit/files/nginx-unit.initd-r1
@@ -4,13 +4,22 @@
 
 command="/usr/sbin/unitd"
 pidfile="/run/nginx-unit.pid"
-user=${NXT_USER:-nginx-unit}
-group=${NXT_GROUP:-nginx-unit}
+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} --modules ${NXT_MODULES} --state ${NXT_STATE} --tmp ${NXT_TMP}"
 
 depend() {
 	use dns logger netmount
 }
 
 start_pre() {
-	checkpath -d /var/lib/nginx-unit -o ${user}:${group} -m 0770
+    checkpath -d /var/lib/nginx-unit -o root:root -m 0770
 }
+
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 944eabe1322d..ecf1568f4165 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
@@ -93,7 +93,3 @@ src_install() {
 	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
 	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
 }
-
-pkg_postinst() {
-	chown ${PN}:${PN} "${EROOT}"/var/lib/nginx-unit
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
new file mode 100644
index 000000000000..944eabe1322d
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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-4 php8-0 php8-1 "
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	php8-0? ( dev-lang/php:8.0[embed] )
+	php8-1? ( dev-lang/php:8.1[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:=
+		dev-ruby/rubygems:=
+	)
+	ssl? ( dev-libs/openssl:0= )
+	virtual/libcrypt:0="
+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=$(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)
+
+	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-r1" ${PN}
+	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}
+
+pkg_postinst() {
+	chown ${PN}:${PN} "${EROOT}"/var/lib/nginx-unit
+}