[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/files/

[Jeroen Roovers]

commit:     553be092524167fadd8bd7614e9beab3fb5d7fd0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 14:10:05 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 19:10:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553be092

net-libs/wvstreams: Fix patches.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch         | 12 ++++++------
 net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch      |  8 ++++----
 net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch |  4 ++--
 net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
index b284da8f3e7..a1ad8881793 100644
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
@@ -5,8 +5,8 @@ See -gcc47-patch and -magic.patch in Fedora git:
 
 http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
 
---- include/wvtask.h
-+++ include/wvtask.h
+--- a/include/wvtask.h
++++ b/include/wvtask.h
 @@ -45,7 +45,8 @@
      typedef void TaskFunc(void *userdata);
      
@@ -26,8 +26,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
      static WvTaskList all_tasks, free_tasks;
      
      static void get_stack(WvTask &task, size_t size);
---- include/wvuid.h
-+++ include/wvuid.h
+--- a/include/wvuid.h
++++ b/include/wvuid.h
 @@ -7,6 +7,7 @@
  #ifndef __WVUID_H
  #define __WVUID_H
@@ -36,8 +36,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
  #include "wvstring.h"
  
  #if WIN32
---- utils/wvtask.cc
-+++ utils/wvtask.cc
+--- a/utils/wvtask.cc
++++ b/utils/wvtask.cc
 @@ -58,7 +58,8 @@
  int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
  

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
index 473d3e83293..38218d7213a 100644
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/333301
 
---- ipstreams/wvunixdgsocket.cc
-+++ ipstreams/wvunixdgsocket.cc
+--- a/ipstreams/wvunixdgsocket.cc
++++ b/ipstreams/wvunixdgsocket.cc
 @@ -1,5 +1,5 @@
  #include "wvunixdgsocket.h"
 -#ifdef MACOS
@@ -9,8 +9,8 @@ http://bugs.gentoo.org/333301
  #include <sys/types.h>
  #include <sys/stat.h>
  #endif
---- streams/wvatomicfile.cc
-+++ streams/wvatomicfile.cc
+--- a/streams/wvatomicfile.cc
++++ b/streams/wvatomicfile.cc
 @@ -11,7 +11,8 @@
  #include "wvfileutils.h"
  #include "wvstrutils.h"

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
index c27e7233627..327e19a0c11 100644
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/304283
 
---- crypto/wvx509.cc
-+++ crypto/wvx509.cc
+--- a/crypto/wvx509.cc
++++ b/crypto/wvx509.cc
 @@ -1157,7 +1157,11 @@
          
          if (ext)

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
index d6f7d6e7617..688178c3a1b 100644
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -131,12 +131,19 @@
  # libwvstreams: stream/event handling library
  #
@@ -34,8 +34,8 @@
    TESTS += $(call tests_cc,dbus/tests)
    libwvdbus_OBJS += $(call objects,dbus)
    libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
---- wvrules-posix.mk
-+++ wvrules-posix.mk
+--- a/wvrules-posix.mk
++++ b/wvrules-posix.mk
 @@ -85,12 +85,15 @@
  	$(AR) s $1
  endef

[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/files/

[Sam James]

commit:     949dc3a4760373cef18aa53f3ba17c1a27215821
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 18:38:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  3 18:45:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949dc3a4

net-libs/wvstreams: drop obsolete LibreSSL patch(es)

Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/wvstreams-4.6.1_p14-libressl.patch       | 114 ---------------------
 1 file changed, 114 deletions(-)

diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
deleted file mode 100644
index e897c95bf09..00000000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From cb8a81da928054c2e8174d671f2abc88f4f35b87 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Mon, 10 Jun 2019 17:07:06 +0300
-Subject: [PATCH] Fix LibreSSL support
-
----
- crypto/wvocsp.cc    | 34 ++++++++++++++++++++++++++++++++++
- crypto/wvx509mgr.cc | 14 ++++++++++++++
- include/wvdigest.h  |  1 +
- 3 files changed, 49 insertions(+)
-
-diff --git a/crypto/wvocsp.cc b/crypto/wvocsp.cc
-index 7d5da072..7a157f90 100644
---- a/crypto/wvocsp.cc
-+++ b/crypto/wvocsp.cc
-@@ -130,6 +130,7 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
- }
- 
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- WvX509 WvOCSPResp::get_signing_cert() const
- {
-     const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
-@@ -143,6 +144,39 @@ WvX509 WvOCSPResp::get_signing_cert() const
- 
-     return WvX509();
- }
-+#else
-+WvX509 WvOCSPResp::get_signing_cert() const
-+{
-+    if (!bs || !sk_X509_num(bs->certs))
-+        return WvX509();
-+
-+    // note: the following bit of code is taken almost verbatim from
-+    // ocsp_vfy.c in OpenSSL 0.9.8. Copyright and attribution should
-+    // properly belong to them
-+
-+    OCSP_RESPID *id = bs->tbsResponseData->responderId;
-+
-+    if (id->type == V_OCSP_RESPID_NAME)
-+    {
-+        X509 *x = X509_find_by_subject(bs->certs, id->value.byName);
-+        if (x)
-+            return WvX509(X509_dup(x));
-+    }
-+
-+    if (id->value.byKey->length != SHA_DIGEST_LENGTH) return NULL;
-+    unsigned char tmphash[SHA_DIGEST_LENGTH];
-+    unsigned char *keyhash = id->value.byKey->data;
-+    for (int i = 0; i < sk_X509_num(bs->certs); i++)
-+    {
-+        X509 *x = sk_X509_value(bs->certs, i);
-+        X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL);
-+        if(!memcmp(keyhash, tmphash, SHA_DIGEST_LENGTH))
-+            return WvX509(X509_dup(x));
-+    }
-+
-+    return WvX509();
-+}
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
- 
- WvOCSPResp::Status WvOCSPResp::get_status(const WvX509 &cert, 
-diff --git a/crypto/wvx509mgr.cc b/crypto/wvx509mgr.cc
-index 156d3a49..e2bb3ffe 100644
---- a/crypto/wvx509mgr.cc
-+++ b/crypto/wvx509mgr.cc
-@@ -350,8 +350,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
-         return false;
-     }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     uint32_t ex_flags = X509_get_extension_flags(cert);
-     uint32_t ex_kusage = X509_get_key_usage(cert);
-+#else
-+    X509_check_purpose(cert, -1, -1);
-+    uint32_t ex_flags = cert->ex_flags;
-+    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
-+                         cert->ex_kusage : UINT32_MAX;
-+#endif
-     if (cert == unsignedcert.cert)
-     {
- 	debug("Self Signing!\n");
-@@ -392,8 +399,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
- 
- bool WvX509Mgr::signcrl(WvCRL &crl) const
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
-     uint32_t ex_flags = X509_get_extension_flags(cert);
-     uint32_t ex_kusage = X509_get_key_usage(cert);
-+#else
-+    X509_check_purpose(cert, -1, -1);
-+    uint32_t ex_flags = cert->ex_flags;
-+    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
-+                         cert->ex_kusage : UINT32_MAX;
-+#endif
-     if (!isok() || !crl.isok())
-     {
-         debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
-diff --git a/include/wvdigest.h b/include/wvdigest.h
-index f2eed401..e637fb49 100644
---- a/include/wvdigest.h
-+++ b/include/wvdigest.h
-@@ -10,6 +10,7 @@
- #include "wvencoder.h"
- #include <stdint.h>
- #include <openssl/evp.h>
-+#include <openssl/hmac.h>
- 
- 
- /**
--- 
-2.21.0
-