diff options
| author | Sam James <sam@gentoo.org> | 2023-02-06 03:56:03 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-02-06 03:58:50 +0000 |
| commit | bcd6b6d96343c2a56ed7f0df97dc9ec13daa94c9 (patch) | |
| tree | a01062c684bd384c40f1393e28486e119d19928b /net-libs/c-client/files/c-client-2007f_p7-ldflags.patch | |
| parent | 05959063729b46ea3b9306613aad49c888e54fce (diff) | |
| download | gentoo-bcd6b6d96343c2a56ed7f0df97dc9ec13daa94c9.tar.gz gentoo-bcd6b6d96343c2a56ed7f0df97dc9ec13daa94c9.tar.bz2 gentoo-bcd6b6d96343c2a56ed7f0df97dc9ec13daa94c9.zip | |
net-libs/c-client: add 2007f_p7
One of our patches (c-client-2007f-openssl-1.1.patch, which seems
to have been from - or derived from at least - openwrt at
https://github.com/openwrt/packages/commit/b087da8530a8889bd7c765dddbbe218116d11643)
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>
Diffstat (limited to 'net-libs/c-client/files/c-client-2007f_p7-ldflags.patch')
| -rw-r--r-- | net-libs/c-client/files/c-client-2007f_p7-ldflags.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch new file mode 100644 index 000000000000..8a273355c2f9 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch @@ -0,0 +1,33 @@ +--- a/src/osdep/unix/Makefile ++++ b/src/osdep/unix/Makefile +@@ -975,23 +975,24 @@ os_sol.h: + + # Once-only environment setup + +-once: onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c ++once: ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c + + onceenv: + @echo Once-only environment setup... + echo $(CC) > CCTYPE +- echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS +- echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ ++ echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS ++ echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \ + -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \ + -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \ + -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ + -DLOCKPGM=\"$(LOCKPGM)\" \ + -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \ + -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS +- echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS ++ echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS ++ echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS + echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(LIBRARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE +- echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ +- -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ ++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \ ++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \ + >> ARCHIVE + echo $(ARCHIVE) > ARCHIVENAME + echo $(OS) > OSTYPE |