From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A00C15812D for ; Sat, 04 Jan 2025 22:48:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5192E0819; Sat, 04 Jan 2025 22:47:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3463E07D8 for ; Sat, 04 Jan 2025 22:47:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B454F3409C8 for ; Sat, 04 Jan 2025 22:47:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 007C919D2 for ; Sat, 04 Jan 2025 22:47:53 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1736030828.f159c9eb1c0f0d76068b0cb98fce620fcecfd992.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/c-client/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch net-libs/c-client/files/c-client-2007f-ldflags.patch net-libs/c-client/files/c-client-2007f-openssl-1.1.patch X-VCS-Directories: net-libs/c-client/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f159c9eb1c0f0d76068b0cb98fce620fcecfd992 X-VCS-Branch: master Date: Sat, 04 Jan 2025 22:47:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 82b7b295-c45f-46dd-a459-f4a56856d0cd X-Archives-Hash: 914da2b638ff971cb28e7c1ef1ba20ac commit: f159c9eb1c0f0d76068b0cb98fce620fcecfd992 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Jan 3 15:36:27 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jan 4 22:47:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f159c9eb net-libs/c-client: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/c-client-2006k_GENTOO_amd64-so-fix.patch | 13 ----- .../c-client-2007f-implicit-declaration-fix.patch | 34 ----------- .../c-client/files/c-client-2007f-ldflags.patch | 33 ----------- .../files/c-client-2007f-openssl-1.1.patch | 66 ---------------------- 4 files changed, 146 deletions(-) diff --git a/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch b/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch deleted file mode 100644 index 79b067d21f94..000000000000 --- a/net-libs/c-client/files/c-client-2006k_GENTOO_amd64-so-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile ---- a/src/osdep/unix/Makefile Thu Feb 21 18:51:32 2008 +0100 -+++ b/src/osdep/unix/Makefile Thu Feb 21 18:53:15 2008 +0100 -@@ -962,6 +962,9 @@ onceenv: - -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS - echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS - echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(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)" \ -+ >> ARCHIVE - echo $(OS) > OSTYPE - ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy - ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) diff --git a/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch b/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch deleted file mode 100644 index 74e223d0f86c..000000000000 --- a/net-libs/c-client/files/c-client-2007f-implicit-declaration-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 - -diff --git a/src/osdep/unix/os_slx.h b/src/osdep/unix/os_slx.h -index b5f39ff..adad223 100644 ---- a/src/osdep/unix/os_slx.h -+++ b/src/osdep/unix/os_slx.h -@@ -46,6 +46,7 @@ - #include - #include - #include /* for struct tm */ -+#include - #include - #include - #include -@@ -57,6 +58,7 @@ - - #define direct dirent - -+int safe_flock(int, int); - #define flock safe_flock - - --- -2.35.1 - diff --git a/net-libs/c-client/files/c-client-2007f-ldflags.patch b/net-libs/c-client/files/c-client-2007f-ldflags.patch deleted file mode 100644 index 2f1cf506db75..000000000000 --- a/net-libs/c-client/files/c-client-2007f-ldflags.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/osdep/unix/Makefile~ 2011-06-07 16:04:29.000000000 +0300 -+++ b/src/osdep/unix/Makefile 2011-06-07 15:55:31.000000000 +0300 -@@ -954,23 +954,24 @@ - - # 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)\" \ - -DRSHPATH=\"$(RSHPATH)\" -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);$(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 $(OS) > OSTYPE - ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy diff --git a/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch b/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch deleted file mode 100644 index 918f0bd3fbd5..000000000000 --- a/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nru a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c ---- a/src/osdep/unix/ssl_unix.c 2011-07-23 02:20:10.000000000 +0200 -+++ b/src/osdep/unix/ssl_unix.c 2018-09-22 09:34:26.492765776 +0200 -@@ -59,7 +59,7 @@ - static SSLSTREAM *ssl_start(TCPSTREAM *tstream,char *host,unsigned long flags); - static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags); - static int ssl_open_verify (int ok,X509_STORE_CTX *ctx); --static char *ssl_validate_cert (X509 *cert,char *host); -+static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj); - static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat); - static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size, - long *contd); -@@ -210,6 +210,7 @@ - BIO *bio; - X509 *cert; - unsigned long sl,tl; -+ char cert_subj[250]; - char *s,*t,*err,tmp[MAILTMPLEN]; - sslcertificatequery_t scq = - (sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL); -@@ -266,13 +267,17 @@ - if (SSL_write (stream->con,"",0) < 0) - return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; - /* need to validate host names? */ -- if (!(flags & NET_NOVALIDATECERT) && -- (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), -- host))) { -- /* application callback */ -- if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : ""; -- /* error message to return via mm_log() */ -- sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); -+ if (!(flags & NET_NOVALIDATECERT)) { -+ cert_subj[0] = '\0'; -+ cert = SSL_get_peer_certificate(stream->con); -+ if (cert) -+ X509_NAME_oneline(X509_get_subject_name(cert), cert_subj, sizeof(cert_subj)); -+ err = ssl_validate_cert (cert, host, cert_subj); -+ if (err) -+ /* application callback */ -+ if (scq) return (*scq) (err,host,cert ? cert_subj : "???") ? NIL : ""; -+ /* error message to return via mm_log() */ -+ sprintf (tmp,"*%.128s: %.255s",err,cert ? cert_subj : "???"); - return ssl_last_error = cpystr (tmp); - } - return NIL; -@@ -313,7 +318,7 @@ - * Returns: NIL if validated, else string of error message - */ - --static char *ssl_validate_cert (X509 *cert,char *host) -+static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj) - { - int i,n; - char *s,*t,*ret; -@@ -322,9 +327,9 @@ - /* make sure have a certificate */ - if (!cert) ret = "No certificate from server"; - /* and that it has a name */ -- else if (!cert->name) ret = "No name in certificate"; -+ else if (cert_subj[0] == '\0') ret = "No name in certificate"; - /* locate CN */ -- else if (s = strstr (cert->name,"/CN=")) { -+ else if (s = strstr (cert_subj,"/CN=")) { - if (t = strchr (s += 4,'/')) *t = '\0'; - /* host name matches pattern? */ - ret = ssl_compare_hostnames (host,s) ? NIL :