From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1544190-garchives=archives.gentoo.org@lists.gentoo.org>
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 (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5AE4415800A
for <garchives@archives.gentoo.org>; Tue, 8 Aug 2023 04:38:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90EFC2BC013;
Tue, 8 Aug 2023 04:38:35 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6273E2BC013
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Aug 2023 04:38:35 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 47394335DA4
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Aug 2023 04:38:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AD78F27
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Aug 2023 04:38:32 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1691469442.55579ccfe7243a03d0cbe77d95c550913841d451.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/files/, net-libs/gnutls/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch net-libs/gnutls/gnutls-3.8.1-r1.ebuild net-libs/gnutls/gnutls-3.8.1.ebuild
X-VCS-Directories: net-libs/gnutls/files/ net-libs/gnutls/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 55579ccfe7243a03d0cbe77d95c550913841d451
X-VCS-Branch: master
Date: Tue, 8 Aug 2023 04:38:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dc4df0cb-6540-48d8-b97f-fedfe2b6ffb5
X-Archives-Hash: 32cc69253c80230da9799136a9931590
commit: 55579ccfe7243a03d0cbe77d95c550913841d451
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 04:37:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 04:37:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55579ccf
net-libs/gnutls: fix 3.8.0 headers
Closes: https://bugs.gentoo.org/911872
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gnutls-3.8.1-fix-gnutls-header.patch | 46 ++++++++++++++++++++++
...{gnutls-3.8.1.ebuild => gnutls-3.8.1-r1.ebuild} | 4 ++
2 files changed, 50 insertions(+)
diff --git a/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch b/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch
new file mode 100644
index 000000000000..b3d10c1788f6
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/911872
+https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2
+
+From abfa8634db940115a11a07596ce53c8f9c4f87d2 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Sun, 6 Aug 2023 22:46:22 +0300
+Subject: [PATCH] Move the GNUTLS_NO_EXTENSIONS compatibility #define to
+ gnutls.h
+
+Signed-off-by: Adrian Bunk <bunk@debian.org>
+--- a/lib/ext/ext_master_secret.h
++++ b/lib/ext/ext_master_secret.h
+@@ -23,9 +23,6 @@
+ #ifndef GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
+ #define GNUTLS_LIB_EXT_EXT_MASTER_SECRET_H
+
+-/* Keep backward compatibility */
+-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
+-
+ #include <hello_ext.h>
+
+ extern const hello_ext_entry_st ext_mod_ext_master_secret;
+--- a/lib/includes/gnutls/gnutls.h.in
++++ b/lib/includes/gnutls/gnutls.h.in
+@@ -542,6 +542,9 @@ typedef enum {
+ #define GNUTLS_ENABLE_CERT_TYPE_NEG 0
+ // Here for compatibility reasons
+
++/* Keep backward compatibility */
++#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
++
+ /**
+ * gnutls_alert_level_t:
+ * @GNUTLS_AL_WARNING: Alert of warning severity.
+--- a/lib/state.h
++++ b/lib/state.h
+@@ -110,7 +110,4 @@ inline static int _gnutls_PRF(gnutls_session_t session, const uint8_t *secret,
+
+ #define DEFAULT_CERT_TYPE GNUTLS_CRT_X509
+
+-/* Keep backward compatibility */
+-#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
+-
+ #endif /* GNUTLS_LIB_STATE_H */
+--
+GitLab
diff --git a/net-libs/gnutls/gnutls-3.8.1.ebuild b/net-libs/gnutls/gnutls-3.8.1-r1.ebuild
similarity index 98%
rename from net-libs/gnutls/gnutls-3.8.1.ebuild
rename to net-libs/gnutls/gnutls-3.8.1-r1.ebuild
index 19eb1aa7b6f0..730ced6f1866 100644
--- a/net-libs/gnutls/gnutls-3.8.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.8.1-r1.ebuild
@@ -60,6 +60,10 @@ DOCS=( README.md doc/certtool.cfg )
HTML_DOCS=()
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-gnutls-header.patch
+)
+
src_prepare() {
default