From 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 18 Apr 2024 12:04:39 +0100 Subject: gentoo auto-resync : 18:04:2024 - 12:04:39 --- net-libs/gnutls/Manifest | 1 - .../files/gnutls-3.8.1-fix-gnutls-header.patch | 46 ---------------------- 2 files changed, 47 deletions(-) delete mode 100644 net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch (limited to 'net-libs/gnutls') diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index 1e6f8f079e8d..47998de6a0d6 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -1,4 +1,3 @@ -AUX gnutls-3.8.1-fix-gnutls-header.patch 1432 BLAKE2B 019f3e720c3f4f72cbb022fcef53b6a0ab1ea41fcd9080bd2d4ea0cc8ef786250c869245cc71605364a0b899c1e9b6f136a53d3246ab991827750572017d0e40 SHA512 a763fffcd8abc828a194e1cc4162231992e5c961a693bf314c5fb8cdf338a9cca062c0113ba7a1cd81f6560adb9a1f9de131551d94c4805978abc50fabaec245 DIST gnutls-3.7.8.tar.xz 6029220 BLAKE2B 0a21e63c7cb0ba4eeff23593c7282e0b4d704fa2d2a1cd5289998fd04b58ea36fc343f872225ad05478e278b1cdebbcd0fd376459abcb58547f8fa1488485530 SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359 DIST gnutls-3.7.8.tar.xz.sig 1250 BLAKE2B 66c6a335c3b2290a4e44ffa6ae715ad71d2bcd7df485c1d2d9490985d9dcd445768d6eb021ad3a61614431183c6652254c63ebd8abd0f0a03d3164a6193b6192 SHA512 cecf9843e8683a278d065b663dc98ac2b5fcad1905ee25333038c93c2289b518c974629367e77e66552ac1c9d122d551616edba35cb0c4204202ec676f1a2db7 DIST gnutls-3.7.9.tar.xz 6377212 BLAKE2B c8263381132b0c96f23a580823cfaf57112056876e5f2cc21aec4eeddec641b0c01fa02ff9493ea686f49fd917190b06f89379eb448a510cf4d50fe3a0742851 SHA512 56ccbab5f214f9e3cf10a43dd90dedc1e10a38d08b8359a4305dc05c59ddb4a1d3680b282077b6446605c31675a4261cd0579c2c0d976e0b2ced02e6dba224c1 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 deleted file mode 100644 index b3d10c1788f6..000000000000 --- a/net-libs/gnutls/files/gnutls-3.8.1-fix-gnutls-header.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/911872 -https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2 - -From abfa8634db940115a11a07596ce53c8f9c4f87d2 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk -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 ---- 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 - - 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 -- cgit v1.2.3