gentoo resync : 05.12.2021

4 files changed, 97 insertions, 1 deletions

diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index 21aed95d5ab8..40b85e275411 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,4 +1,6 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
+AUX qlogtools-3.1-fix-glibc-2-33.patch 737 BLAKE2B cddfad5d16e55c7fe1ca801d762a5b604fa9ac5dd66f5351f92284441ed182024e0ff27ef69b6531273e89f305d2375d3ed193e5b8b595ef2c173fa6de88fd0d SHA512 01ccc042ec41108cb93b54ad9132b9603ead9e63b11951010c540397ed447ada86c43207eb3543184be399878f84bd99f986ec49f9feec06b4dc5fc22ebc84a2
+AUX qlogtools-3.1-fix-implicit-decl.patch 1300 BLAKE2B bb9774b0feba85cae6a253c484fe4d7a1f31b8ff3036202220e51956ef58a21515ada59180119773776e332b8f064749894d2cd954586516f5565a95e246f0e9 SHA512 eb17ed365e9ecac20fbfb1dc62dcad31079057f44efc5e3b2118814832f6eda6d5470aa0b391fa79e5459a0d31d8e6b46f5749467331a3e7ebdcb3b16b9a7c86
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
-EBUILD qlogtools-3.1-r1.ebuild 863 BLAKE2B c8a065b30d3fc69b74535a49dc15db05e983d90d891f878edc6ea080cdfaf51d64d34fd8a3c79046c2201da644ae27c4f6da760f611f12e8df9963037fd55620 SHA512 37ff6daf780a265f623ba2beae7b36c7956675e6beaf4321228f61393c8e17c8bbb9ae16abb9a8a05e89d72123fb8b0dec45b35c44ac64a4739e398f55cdbc14
+EBUILD qlogtools-3.1-r1.ebuild 966 BLAKE2B e54ca4e5ad10d2fdda0e63e1b9c98303094d99819097252c6288917aa7f21726869a89ed933d5c7cf73c02ad742e1b822c839de0535bab50fff4acd7acda20a6 SHA512 5a539f5c8ed62fc1e4a4d6a134e6044b9129d41645c348b75c8d0899c692fb37907ee81fd0fab269968c18402871407c5fabecfeb27d8f2563695955be10c6ca
 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/qlogtools/files/qlogtools-3.1-fix-glibc-2-33.patch b/net-mail/qlogtools/files/qlogtools-3.1-fix-glibc-2-33.patch
new file mode 100644
index 000000000000..ea3d08561ed5
--- /dev/null
+++ b/net-mail/qlogtools/files/qlogtools-3.1-fix-glibc-2-33.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/715702
+
+From: Sam James <sam@gentoo.org>
+Date: Mon, 15 Nov 2021 05:48:50 +0000
+Subject: [PATCH 2/2] Fix build with glibc-2.33
+--- a/instcheck.c
++++ b/instcheck.c
+@@ -2,6 +2,7 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -15,14 +15,14 @@ int man;
+ static void diesys(const char* msg)
+ {
+   fprintf(stderr, "installer error: %s:\n  %s\n", msg,
+-	  sys_errlist[errno]);
++	  strerror(errno));
+   exit(1);
+ }
+ 
+ static void diefsys(const char* msg, const char* filename)
+ {
+   fprintf(stderr, "installer error: %s '%s':\n  %s\n", msg, filename,
+-	  sys_errlist[errno]);
++	  strerror(errno));
+   exit(1);
+ }
diff --git a/net-mail/qlogtools/files/qlogtools-3.1-fix-implicit-decl.patch b/net-mail/qlogtools/files/qlogtools-3.1-fix-implicit-decl.patch
new file mode 100644
index 000000000000..18fdd1e008b4
--- /dev/null
+++ b/net-mail/qlogtools/files/qlogtools-3.1-fix-implicit-decl.patch
@@ -0,0 +1,61 @@
+From: Sam James <sam@gentoo.org>
+Date: Mon, 15 Nov 2021 05:48:39 +0000
+Subject: [PATCH 1/2] Fix implicit declarations
+--- a/installer.c
++++ b/installer.c
+@@ -1,6 +1,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- a/instcheck.c
++++ b/instcheck.c
+@@ -1,6 +1,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- a/tai_decode.c
++++ b/tai_decode.c
+@@ -1,5 +1,7 @@
+ #include "tai.h"
+ 
++#include <ctype.h>
++
+ static bool isdigit(char ch)
+ {
+   return ch >= '0' && ch <= '9';
+--- a/tai_decode.c
++++ b/tai_decode.c
+@@ -2,7 +2,7 @@
+ 
+ #include <ctype.h>
+ 
+-static bool isdigit(char ch)
++static bool qlogtools_isdigit(char ch)
+ {
+   return ch >= '0' && ch <= '9';
+ }
+@@ -12,11 +12,11 @@ tai* tai_decode(const char* str, const char** endptr)
+   static tai t;
+   t.seconds = 0;
+   t.nanoseconds = 0;
+-  while(isdigit(*str))
++  while(qlogtools_isdigit(*str))
+     t.seconds = (t.seconds * 10) + (*str++ - '0');
+   if(*str == '.') {
+     ++str;
+-    while(isdigit(*str))
++    while(qlogtools_isdigit(*str))
+       t.nanoseconds = (t.nanoseconds * 10) + (*str++ - '0');
+   }
+   if(endptr)
+-- 
+2.33.1
+
diff --git a/net-mail/qlogtools/qlogtools-3.1-r1.ebuild b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
index aab3324f175d..f420295a9323 100644
--- a/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
+++ b/net-mail/qlogtools/qlogtools-3.1-r1.ebuild
@@ -19,6 +19,8 @@ RDEPEND="!app-text/multitail"
 
 PATCHES=(
 	"${FILESDIR}"/qlogtools-3.1-errno.patch
+	"${FILESDIR}"/qlogtools-3.1-fix-implicit-decl.patch
+	"${FILESDIR}"/qlogtools-3.1-fix-glibc-2-33.patch
 )
 
 src_configure() {