# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1621175641 -7200
# Node ID d07a6ab6455d864fc58205a47f19798d2d9a5243
# Parent  df3a3ec5a843b88ee8f6fa3ce832deac83d39194# Parent  20416e8b70cccaec77eb70ad5cb736ea940d7602
MERGE: New FreeBSD upstream 2.0.19.1

diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl-plugin-lang-py3/distinfo
diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl/Makefile
diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl/distinfo
diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl/files/patch-core-logging.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl/files/patch-core-logging.c	Sun May 16 16:34:01 2021 +0200
@@ -0,0 +1,32 @@
+--- core/logging.c.orig	2020-11-06 10:12:49.865752000 +0100
++++ core/logging.c	2020-11-06 10:17:57.825745000 +0100
+@@ -536,13 +536,23 @@
+ 			uwsgi_error_open(logfile);
+ 			exit(1);
+ 		}
+-		else {
+-			if (dup2(fd, log_fd) < 0) {
+-				// this could be lost :(
+-				uwsgi_error("uwsgi_log_do_rotate()/dup2()");
+-				exit(1);
+-			}
++		if (dup2(fd, log_fd) < 0) {
++			// this could be lost :(
++			uwsgi_error("uwsgi_log_do_rotate()/dup2()");
+ 			close(fd);
++			exit(1);
++		}
++		close(fd);
++
++		if (uwsgi.chmod_logfile_value) {
++			if (fchmod(log_fd, uwsgi.chmod_logfile_value)) {
++				uwsgi_error("fchmod()");
++			}
++		}
++		if (uwsgi.logfile_chown) {
++			if (fchown(log_fd, uwsgi.uid, uwsgi.gid)) {
++				uwsgi_error("fchown()");
++			}
+ 		}
+ 	}
+ 	else {
diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl/files/patch-plugins_coroae_uwsgiplugin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl/files/patch-plugins_coroae_uwsgiplugin.py	Sun May 16 16:34:01 2021 +0200
@@ -0,0 +1,11 @@
+--- plugins/coroae/uwsgiplugin.py.orig	2020-06-17 09:03:34 UTC
++++ plugins/coroae/uwsgiplugin.py
+@@ -9,7 +9,7 @@ for p in search_paths:
+         coroapi = p
+ 
+ if not coroapi:
+-    print "unable to find the Coro perl module !!!"
++    print("unable to find the Coro perl module !!!")
+     sys.exit(1)
+ 
+ NAME='coroae'
diff -r df3a3ec5a843 -r d07a6ab6455d uwsginl/files/uwsginl.in
--- a/uwsginl/files/uwsginl.in	Thu Dec 17 00:32:52 2020 +0100
+++ b/uwsginl/files/uwsginl.in	Sun May 16 16:34:01 2021 +0200
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: uwsginl
 # REQUIRE: DAEMON
 # KEYWORD: shutdown