mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-13 21:47:44 +00:00
bcd6b6d963One of our patches (c-client-2007f-openssl-1.1.patch, which seems
to have been from - or derived from at least - openwrt at
b087da8530)
has been causing issues with OpenSSL 1.1 by not giving proper regard
to the return value of ssl_validate_cert.
There's a suggested alternative fixed patch in the bug, but given that
c-client is one of those zombie packages we need to keep but isn't
active upstream, let's try switching to Debian's patchset, as it
works for them, and the effective diff comparing prepared sources before/after
is pretty small overall.
(We also end up cleaning up a few things, like the library stops exporting
'Gethostbyname' (with a capital G) and such.)
Scott Tester <scott@smbc.edu.au> deserves a special mention for being persistent
here. Thank you!
Bug: https://bugs.gentoo.org/647616
Closes: https://bugs.gentoo.org/683708
Signed-off-by: Sam James <sam@gentoo.org>
46 lines
1 KiB
Diff
46 lines
1 KiB
Diff
This patch solves build issues with -Werror=implicit-function-declaration
|
|
enabled.
|
|
|
|
- safe_flock is a function from flocklnx.c but header file for consumers
|
|
is missing, the simplest was to add function prototype to other
|
|
header file.
|
|
- utime.h is needed also in multiple places but os_slx.h header file is
|
|
used in all of them
|
|
|
|
Bug: https://bugs.gentoo.org/870478
|
|
--- a/src/osdep/unix/os_lnx.h
|
|
+++ b/src/osdep/unix/os_lnx.h
|
|
@@ -46,6 +46,7 @@
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
#include <time.h> /* for struct tm */
|
|
+#include <utime.h>
|
|
#include <fcntl.h>
|
|
#include <syslog.h>
|
|
#include <sys/file.h>
|
|
@@ -57,6 +58,7 @@
|
|
|
|
#define direct dirent
|
|
|
|
+int safe_flock(int, int);
|
|
#define flock safe_flock
|
|
|
|
|
|
--- a/src/osdep/unix/os_slx.h
|
|
+++ b/src/osdep/unix/os_slx.h
|
|
@@ -46,6 +46,7 @@
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
#include <time.h> /* for struct tm */
|
|
+#include <utime.h>
|
|
#include <fcntl.h>
|
|
#include <syslog.h>
|
|
#include <sys/file.h>
|
|
@@ -57,6 +58,7 @@
|
|
|
|
#define direct dirent
|
|
|
|
+int safe_flock(int, int);
|
|
#define flock safe_flock
|
|
|
|
|