Remove gnutls-3.7.6-libgnutlsxx-const.patch
As GnuTLS 3.7.3 included the change to the API while ABI hadn't been updated, we don't need to explicitly revert the API change. Related: #2097327 Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
Daiki Ueno
parent
095c10df28
commit
81119a5e7e
@ -1,105 +0,0 @@
|
||||
From 4a64e35cdc5ad438ab3bd256e7a4f5e8f7d6f21f Mon Sep 17 00:00:00 2001
|
||||
From: Daiki Ueno <ueno@gnu.org>
|
||||
Date: Mon, 4 Jul 2022 09:49:09 +0900
|
||||
Subject: [PATCH] libgnutlsxx: revert ABI incompatible change
|
||||
|
||||
This reverts 67cab96c1d59fec2e2b85ee054ec0015195cc35c.
|
||||
|
||||
Signed-off-by: Daiki Ueno <ueno@gnu.org>
|
||||
---
|
||||
lib/gnutlsxx.cpp | 4 ++--
|
||||
lib/includes/gnutls/gnutlsxx.h | 14 +++++++-------
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/gnutlsxx.cpp b/lib/gnutlsxx.cpp
|
||||
index f87490d371..3613502aba 100644
|
||||
--- a/lib/gnutlsxx.cpp
|
||||
+++ b/lib/gnutlsxx.cpp
|
||||
@@ -397,7 +397,7 @@ namespace gnutls
|
||||
gnutls_db_remove_session (s);
|
||||
}
|
||||
|
||||
- bool server_session::db_check_entry (const gnutls_datum_t & session_data) const
|
||||
+ bool server_session::db_check_entry (gnutls_datum_t & session_data) const
|
||||
{
|
||||
int ret = gnutls_db_check_entry (s, session_data);
|
||||
|
||||
@@ -416,7 +416,7 @@ namespace gnutls
|
||||
gnutls_credentials_clear (s);
|
||||
}
|
||||
|
||||
- void session::set_credentials (const credentials & cred)
|
||||
+ void session::set_credentials (credentials & cred)
|
||||
{
|
||||
RETWRAP (gnutls_credentials_set (s, cred.get_type (), cred.ptr ()));
|
||||
}
|
||||
diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
|
||||
index 23bbd4ea36..eeefb798a3 100644
|
||||
--- a/lib/includes/gnutls/gnutlsxx.h
|
||||
+++ b/lib/includes/gnutls/gnutlsxx.h
|
||||
@@ -42,7 +42,7 @@ namespace gnutls {
|
||||
|
||||
class exception:public std::exception {
|
||||
public:
|
||||
- explicit exception(int x);
|
||||
+ exception(int x);
|
||||
const char *what() const throw();
|
||||
int get_code();
|
||||
protected:
|
||||
@@ -104,7 +104,7 @@ namespace gnutls {
|
||||
protected:
|
||||
gnutls_session_t s;
|
||||
public:
|
||||
- explicit session(unsigned int);
|
||||
+ session(unsigned int);
|
||||
virtual ~ session();
|
||||
|
||||
gnutls_session_t ptr();
|
||||
@@ -173,7 +173,7 @@ namespace gnutls {
|
||||
void set_max_handshake_packet_length(size_t max);
|
||||
|
||||
void clear_credentials();
|
||||
- void set_credentials(const class credentials & cred);
|
||||
+ void set_credentials(class credentials & cred);
|
||||
|
||||
void set_transport_ptr(gnutls_transport_ptr_t ptr);
|
||||
void set_transport_ptr(gnutls_transport_ptr_t recv_ptr,
|
||||
@@ -239,7 +239,7 @@ namespace gnutls {
|
||||
class server_session:public session {
|
||||
public:
|
||||
server_session();
|
||||
- explicit server_session(int flags);
|
||||
+ server_session(int flags);
|
||||
~server_session();
|
||||
void db_remove() const;
|
||||
|
||||
@@ -247,7 +247,7 @@ namespace gnutls {
|
||||
void set_db(const DB & db);
|
||||
|
||||
// returns true if session is expired
|
||||
- bool db_check_entry(const gnutls_datum_t & session_data) const;
|
||||
+ bool db_check_entry(gnutls_datum_t & session_data) const;
|
||||
|
||||
// server side only
|
||||
const char *get_srp_username() const;
|
||||
@@ -264,7 +264,7 @@ namespace gnutls {
|
||||
class client_session:public session {
|
||||
public:
|
||||
client_session();
|
||||
- explicit client_session(int flags);
|
||||
+ client_session(int flags);
|
||||
~client_session();
|
||||
|
||||
void set_verify_cert(const char *hostname, unsigned flags);
|
||||
@@ -281,7 +281,7 @@ namespace gnutls {
|
||||
} gnutls_credentials_type_t get_type() const;
|
||||
protected:
|
||||
friend class session;
|
||||
- explicit credentials(gnutls_credentials_type_t t);
|
||||
+ credentials(gnutls_credentials_type_t t);
|
||||
void *ptr() const;
|
||||
void set_ptr(void *ptr);
|
||||
gnutls_credentials_type_t type;
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -30,9 +30,6 @@ Patch: gnutls-3.7.6-aes-gcm-pt-limit.patch
|
||||
Patch: gnutls-3.7.3-disable-config-reload.patch
|
||||
Patch: gnutls-3.7.3-fips-dsa-post.patch
|
||||
|
||||
# to prevent ABI break; will be reverted in %%install
|
||||
Patch: gnutls-3.7.6-libgnutlsxx-const.patch
|
||||
|
||||
%bcond_without bootstrap
|
||||
%bcond_without dane
|
||||
%if 0%{?rhel}
|
||||
@ -271,10 +268,9 @@ make %{?_smp_mflags} V=1 CXX_LT_CURRENT=29 CXX_LT_REVISION=0 CXX_LT_AGE=1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# build libgnutlsxx.so with newer SONAME
|
||||
git show | patch -p1 -R
|
||||
pushd lib
|
||||
rm -f libgnutlsxx.la
|
||||
make %{?_smp_mflags} V=1 CXX_LT_CURRENT=30 CXX_LT_REVISION=0 CXX_LT_AGE=0
|
||||
make %{?_smp_mflags} V=1
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
popd
|
||||
touch doc/examples/ex-cxx
|
||||
@ -365,6 +361,8 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null
|
||||
%changelog
|
||||
* Mon Jul 25 2022 Daiki Ueno <dueno@redhat.com> - 3.7.6-3
|
||||
- Limit input size for AES-GCM according to SP800-38D (#2095251)
|
||||
- Do not treat GPG verification errors as fatal
|
||||
- Remove gnutls-3.7.6-libgnutlsxx-const.patch
|
||||
|
||||
* Tue Jul 19 2022 Daiki Ueno <dueno@redhat.com> - 3.7.6-2
|
||||
- Allow enabling KTLS with config file (#2042009)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user