gentoo resync : 03.03.2021

2 files changed, 35 insertions, 4 deletions

diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch
new file mode 100644
index 000000000000..1c95f6b7c2d5
--- /dev/null
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/src/mongrel2.c
++++ b/src/mongrel2.c
+@@ -55,6 +55,7 @@
+ #include "logrotate.h"
+ #include "register.h"
+ 
++extern char *m2program;
+ extern int RUNNING;
+ extern uint32_t THE_CURRENT_TIME_IS;
+ int RELOAD = 0;
+--- a/src/unixy.h
++++ b/src/unixy.h
+@@ -38,7 +38,7 @@
+ #include <bstring.h>
+ #include <unistd.h>
+ 
+-char *m2program;
++extern char *m2program;
+ 
+ int Unixy_chroot(bstring path);
+ 
+--- a/tools/procer/procer.c
++++ b/tools/procer/procer.c
+@@ -9,6 +9,7 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ 
++extern char *m2program;
+ extern char **environ;
+ 
+ static int RUNNING = 1;
diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
index 0e5957e551b8..c67dc060c8a4 100644
--- a/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-polarssl-platform-590512.patch
@@ -1,6 +1,6 @@
 # Fix missing include for newer mbedtls
---- a/src/io.h       2016-08-04 15:55:53.124890328 -0700
-+++ b/src/io.h      2015-12-31 01:25:07.000000000 -0800
+--- a/src/io.h
++++ b/src/io.h
 @@ -6,6 +6,7 @@
  #endif
  
@@ -9,8 +9,8 @@
  #include <mbedtls/x509.h>
  #include <mbedtls/ssl.h>
  #include "server.h"
---- a/src/server.h   2016-08-04 15:54:49.539498093 -0700
-+++ b/src/server.h  2015-12-31 01:25:07.000000000 -0800
+--- a/src/server.h
++++ b/src/server.h
 @@ -39,6 +39,7 @@
  #include "adt/darray.h"
  #include "host.h"