boinc: update to 7.16.16

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit ce361e3c1a2220f2c6d798ac1ca65dc57fdaff8b)

diff --git a/net/boinc/Makefile b/net/boinc/Makefile
index 88160affb9e44cdd767dce4327b704b52dd1c109..8ec98685fa2a4f4df4aed166c55417aaeabd504b 100644 (file)
--- a/net/boinc/Makefile
+++ b/net/boinc/Makefile
@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=boinc
-PKG_VERSION:=7.16.6
+PKG_VERSION:=7.16.16
 PKG_VERSION_SHORT:=$(shell echo $(PKG_VERSION)| cut -f1,2 -d.)
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_DATE:=2020-02-25
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/BOINC/boinc/tar.gz/client_release/$(PKG_VERSION_SHORT)/$(PKG_VERSION)?
-PKG_HASH:=caa567da8d3eb50859efe2eeba1c23c7b27d3b0f15b548136e75302713b25303
+PKG_HASH:=0d5656a9f8ed1048936a5764270848b892d63f27bdb863d0ace447f1eaae6002
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-client_release-$(PKG_VERSION_SHORT)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Christian Dreihsig <christian.dreihsig@t-online.de>, Steffen Moeller <moeller@debian.org>

diff --git a/net/boinc/patches/001-avoidExtraDependencies b/net/boinc/patches/001-avoidExtraDependencies
index e70997b49af218931b75b04a783fbb5918fad861..ca46bef58d4a6ab90540b33c54a0dc8fed8c69e1 100644 (file)
--- a/net/boinc/patches/001-avoidExtraDependencies
+++ b/net/boinc/patches/001-avoidExtraDependencies
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -506,8 +506,10 @@ SAH_CHECK_LIB([dl], [dlopen],
+@@ -502,8 +502,10 @@ SAH_CHECK_LIB([dl], [dlopen],
      [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])
  SAH_CHECK_LIB([nsl], [gethostbyname],
      [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"])

diff --git a/net/boinc/patches/002-hosttypeRespected b/net/boinc/patches/002-hosttypeRespected
index b40271c08ca9237fb3f5a0fa736680528e04187e..35a3fb4ead2a8bad918d33efff94a168631da6fc 100644 (file)
--- a/net/boinc/patches/002-hosttypeRespected
+++ b/net/boinc/patches/002-hosttypeRespected
@@ -22,7 +22,7 @@
  #if defined(_WIN32) && !defined(__CYGWIN32__)
  #if defined(_WIN64) && defined(_M_X64)
      add_platform("windows_x86_64");
-@@ -206,15 +221,6 @@ void CLIENT_STATE::detect_platforms() {
+@@ -210,15 +225,6 @@ void CLIENT_STATE::detect_platforms() {
          add_platform("i686-pc-linux-gnu");
      }
  
@@ -38,7 +38,7 @@
  #elif defined(sun)
      // Check if we can run 64-bit binaries...
      // this assumes there isn't a 64-bit only solaris.  (Every 64-bit solaris can run 32 bit binaries)
-@@ -290,6 +296,8 @@ void CLIENT_STATE::detect_platforms() {
+@@ -294,6 +300,8 @@ void CLIENT_STATE::detect_platforms() {
  #endif
  
  #endif

diff --git a/net/boinc/patches/010-openssl.patch b/net/boinc/patches/010-openssl.patch
deleted file mode 100644 (file)
index afe68d6..0000000
--- a/net/boinc/patches/010-openssl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -44,6 +44,7 @@
- #include <openssl/engine.h>
- #include <openssl/err.h>
- #include <openssl/rsa.h>
-+#include <openssl/bn.h>
- 
- #ifdef _USING_FCGI_
- #include "boinc_fcgi.h"
-@@ -720,8 +721,10 @@ char *check_validity(
-     int rbytes;
-     unsigned char md5_md[MD5_DIGEST_LENGTH],  rbuf[2048];
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
-     SSL_load_error_strings();
-     SSL_library_init();
-+#endif
- 
-     if (!is_file(origFile)) {
-         return NULL;
-@@ -772,7 +775,9 @@ int cert_verify_file(
-         fflush(stdout);
-         return false;
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
-     SSL_library_init();
-+#endif
-     if (!is_file(origFile)) return false;
-     FILE* of = boinc_fopen(origFile, "r");
-     if (!of) return false;