* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2020-05-01 14:04 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-05-01 14:04 UTC (permalink / raw
To: gentoo-commits
commit: c6660e15ded7d96ebb158f1c0aa1ea718bbdcc00
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 16:29:37 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 1 14:04:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6660e15
www-servers/nginx-unit: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15579
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 ------------------------
2 files changed, 123 deletions(-)
diff --git a/www-servers/nginx-unit/files/auto-make.patch b/www-servers/nginx-unit/files/auto-make.patch
deleted file mode 100644
index 9a157ed6a86..00000000000
--- a/www-servers/nginx-unit/files/auto-make.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index e1d6775f935..00000000000
--- a/www-servers/nginx-unit/files/auto-os-conf.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- 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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2021-12-03 17:25 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2021-12-03 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 9673d043b11c18d1abb4bf9e5a9709d546bd8d47
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 3 16:40:03 2021 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 17:25:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9673d043
www-servers/nginx-unit: remove unused patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23169
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
.../files/nginx-unit-1.25.0-glibc-2.34.patch | 22 ----------------------
1 file changed, 22 deletions(-)
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 <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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2023-02-28 21:12 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2023-02-28 21:12 UTC (permalink / raw
To: gentoo-commits
commit: af9772fe613cef0b0f191071c1ecec95d9fa4ff1
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 21:11:22 2023 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 21:12:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af9772fe
www-servers/nginx-unit: Change default user and group appropiate
Big thanks to Vladimir Varlamov for their assistance on these
recent user and group changes to nginx-unit
Bug: https://bugs.gentoo.org/894778
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.confd | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/www-servers/nginx-unit/files/nginx-unit.confd b/www-servers/nginx-unit/files/nginx-unit.confd
index 2eae2c67538f..eedf0ffbd685 100644
--- a/www-servers/nginx-unit/files/nginx-unit.confd
+++ b/www-servers/nginx-unit/files/nginx-unit.confd
@@ -1,11 +1,10 @@
# /etc/conf.d/nginx-unit
# non-privileged processes to run as specified user
-#NXT_USER="nobody"
+#NXT_USER="nginx-unit"
# non-privileged processes to run as specified group
-# default: user's primary group
-#NXT_GROUP=""
+#NXT_GROUP="nginx-unit"
# Address of the Control API Socket
#NXT_CONTROL="unix:/run/nginx-unit.sock"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2023-03-01 18:39 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2023-03-01 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 7adaac98b3ed54c43ce0b4a1dee5f6f6a4f9dab9
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 18:39:23 2023 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 18:39:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7adaac98
www-servers/nginx-unit/files: Update conf.d and init.d files
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.confd | 1 -
www-servers/nginx-unit/files/nginx-unit.initd-r1 | 15 ++++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
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..e4ea45cdbe35 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_LOG:-/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
}
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2023-03-01 20:15 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2023-03-01 20:15 UTC (permalink / raw
To: gentoo-commits
commit: a9ba7503d272e065c35f7ea702cd0157791d729a
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 20:15:30 2023 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 20:15:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ba7503
www-servers/nginx-unit: Fix typo in init.d file
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.initd-r1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1
index e4ea45cdbe35..32ef624d2103 100644
--- a/www-servers/nginx-unit/files/nginx-unit.initd-r1
+++ b/www-servers/nginx-unit/files/nginx-unit.initd-r1
@@ -9,7 +9,7 @@ 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_LOG:-/usr/lib64/nginx-unit}
+NXT_MODULES=${NXT_MODULES:-/usr/lib64/nginx-unit}
NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit}
NXT_TMP=${NXT_TMP:-/usr/tmp}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
@ 2024-02-27 23:20 Mike Pagano
0 siblings, 0 replies; 6+ messages in thread
From: Mike Pagano @ 2024-02-27 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 64d28710783d1988847acde1e560b50e9bcdeb3f
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 23:20:00 2024 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 23:20:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d28710
www-servers/nginx-unit/files: Remove unused patches
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
www-servers/nginx-unit/files/nginx-unit.initd | 14 -------------
www-servers/nginx-unit/files/nginx-unit.initd-r1 | 25 ------------------------
2 files changed, 39 deletions(-)
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
deleted file mode 100644
index f7bd33af9334..000000000000
--- a/www-servers/nginx-unit/files/nginx-unit.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# 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 -m 0770
-}
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1
deleted file mode 100644
index 32ef624d2103..000000000000
--- a/www-servers/nginx-unit/files/nginx-unit.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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} --modules ${NXT_MODULES} --state ${NXT_STATE} --tmp ${NXT_TMP}"
-
-depend() {
- use dns logger netmount
-}
-
-start_pre() {
- checkpath -d /var/lib/nginx-unit -o root:root -m 0770
-}
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-27 23:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-01 20:15 [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/ Mike Pagano
-- strict thread matches above, loose matches on Subject: below --
2024-02-27 23:20 Mike Pagano
2023-03-01 18:39 Mike Pagano
2023-02-28 21:12 Mike Pagano
2021-12-03 17:25 Mike Pagano
2020-05-01 14:04 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox