[boinc] 04/10: Drop and patch refresh
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Fri Aug 11 17:29:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository boinc.
commit 97f5ecb105e1d1468100371b0c9e3544d5677c68
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Jun 20 14:50:27 2017 +0200
Drop and patch refresh
---
.../056f788ea3a9ba1b45e17bcacea91a38c1ed8d73.patch | 49 ---
.../1ec4be73d83d6041e4097b547a3fca297dd828db.patch | 82 -----
.../7c2cb62aa3a119818e9ceab0d6358f4c910fb337.patch | 353 ---------------------
.../8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch | 30 --
debian/patches/MainDocumentWarnings.patch | 8 +-
debian/patches/boinc-issue-1177.patch | 111 -------
debian/patches/boinclib_shared.patch | 12 +-
debian/patches/cppcheck_realloc.patch | 2 +-
debian/patches/de.po.patch | 49 ++-
debian/patches/disable_new_version_check.patch | 2 +-
.../e965ea2e32d467e6937f206c96270cabd381df6e.patch | 271 ----------------
debian/patches/envargs.patch | 44 ---
.../file_upload_handler_in_sched_linking.patch | 10 +-
debian/patches/filesys_error_message.patch | 8 +-
debian/patches/fix-underlinking.patch | 28 +-
debian/patches/fopen_closing.patch | 14 +-
.../make_project_overcomes_Apache24_security.patch | 6 +-
debian/patches/more_maxpathlen.patch | 2 +-
debian/patches/possible_size_type_error.patch | 2 +-
debian/patches/series | 7 -
debian/patches/static_scientific_apps.patch | 22 +-
21 files changed, 75 insertions(+), 1037 deletions(-)
diff --git a/debian/patches/056f788ea3a9ba1b45e17bcacea91a38c1ed8d73.patch b/debian/patches/056f788ea3a9ba1b45e17bcacea91a38c1ed8d73.patch
deleted file mode 100644
index d6509cf..0000000
--- a/debian/patches/056f788ea3a9ba1b45e17bcacea91a38c1ed8d73.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 056f788ea3a9ba1b45e17bcacea91a38c1ed8d73 Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Mon, 18 Jul 2016 16:01:26 +0200
-Subject: [PATCH] Tools: fix segfault in crypt_prog
-
-The API changes in e965ea2 introduced a segfault when converting a private BOINC key into OpenSSL format. Also moved from the deprecated (since at least 1.0) RSA_generate_key() function to RSA_generate_key_ex().
----
- lib/crypt_prog.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/lib/crypt_prog.cpp b/lib/crypt_prog.cpp
-index 3bc2d53..88d9f2d 100644
---- a/lib/crypt_prog.cpp
-+++ b/lib/crypt_prog.cpp
-@@ -126,7 +126,7 @@ int main(int argc, char** argv) {
- FILE *f, *fpriv, *fpub;
- char cbuf[256];
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
-- RSA *rsa_key;
-+ RSA *rsa_key = RSA_new();
- #else
- RSA rsa_key;
- #endif
-@@ -136,6 +136,7 @@ int main(int argc, char** argv) {
- char *certpath;
- bool b2o=false; // boinc key to openssl key ?
- bool kpriv=false; // private key ?
-+ BIGNUM *e;
-
- if (argc == 1) {
- usage();
-@@ -150,7 +151,16 @@ int main(int argc, char** argv) {
- n = atoi(argv[2]);
-
- srand(random_int());
-- RSA* rp = RSA_generate_key(n, 65537, 0, 0);
-+ e = BN_new();
-+ retval = BN_set_word(e, (unsigned long)65537);
-+ if (retval != 1) {
-+ die("BN_set_word");
-+ }
-+ RSA *rp = RSA_new();
-+ retval = RSA_generate_key_ex(rp, n, e, NULL);
-+ if (retval != 1) {
-+ die("RSA_generate_key_ex");
-+ }
- openssl_to_keys(rp, n, private_key, public_key);
- fpriv = fopen(argv[3], "w");
- if (!fpriv) die("fopen");
diff --git a/debian/patches/1ec4be73d83d6041e4097b547a3fca297dd828db.patch b/debian/patches/1ec4be73d83d6041e4097b547a3fca297dd828db.patch
deleted file mode 100644
index ebaae42..0000000
--- a/debian/patches/1ec4be73d83d6041e4097b547a3fca297dd828db.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1ec4be73d83d6041e4097b547a3fca297dd828db Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Mon, 18 Jul 2016 15:23:34 +0200
-Subject: [PATCH] Lib: adapt to OpenSSL 1.1 API change
-
-The API changed with https://github.com/openssl/openssl/commit/fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327
-Also fixed the missing parameter when creating a public OpenSSL key. The d parameter for RSA_set0_key() is allowed to be NULL in this case.
----
- lib/crypt.cpp | 38 ++++++++++++++++++--------------------
- 1 file changed, 18 insertions(+), 20 deletions(-)
-
-diff --git a/lib/crypt.cpp b/lib/crypt.cpp
-index cd6f04a..30db6d8 100644
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -464,14 +464,14 @@ void openssl_to_keys(
- ) {
- pub.bits = nbits;
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
-- BIGNUM *n;
-- BIGNUM *e;
-- BIGNUM *d;
-- BIGNUM *p;
-- BIGNUM *q;
-- BIGNUM *dmp1;
-- BIGNUM *dmq1;
-- BIGNUM *iqmp;
-+ const BIGNUM *n;
-+ const BIGNUM *e;
-+ const BIGNUM *d;
-+ const BIGNUM *p;
-+ const BIGNUM *q;
-+ const BIGNUM *dmp1;
-+ const BIGNUM *dmq1;
-+ const BIGNUM *iqmp;
- RSA_get0_key(rp, &n, &e, &d);
- RSA_get0_factors(rp, &p, &q);
- RSA_get0_crt_params(rp, &dmp1, &dmq1, &iqmp);
-@@ -544,18 +544,16 @@ void public_to_openssl(R_RSA_PUBLIC_KEY& pub, RSA* rp) {
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
- BIGNUM *n;
- BIGNUM *e;
-- BIGNUM *d;
- n = BN_bin2bn(pub.modulus, sizeof(pub.modulus), 0);
- e = BN_bin2bn(pub.exponent, sizeof(pub.exponent), 0);
-- // d??? FIXME
-- RSA_set0_key(rp, n, e, d);
-+ RSA_set0_key(rp, n, e, NULL);
- #else
- rp->n = BN_bin2bn(pub.modulus, sizeof(pub.modulus), 0);
- rp->e = BN_bin2bn(pub.exponent, sizeof(pub.exponent), 0);
- #endif
- }
-
--static int _bn2bin(BIGNUM *from, unsigned char *to, int max) {
-+static int _bn2bin(const BIGNUM *from, unsigned char *to, int max) {
- int i;
- i=BN_num_bytes(from);
- if (i > max) {
-@@ -569,14 +567,14 @@ static int _bn2bin(BIGNUM *from, unsigned char *to, int max) {
-
- int openssl_to_private(RSA *from, R_RSA_PRIVATE_KEY *to) {
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
-- BIGNUM *n;
-- BIGNUM *e;
-- BIGNUM *d;
-- BIGNUM *p;
-- BIGNUM *q;
-- BIGNUM *dmp1;
-- BIGNUM *dmq1;
-- BIGNUM *iqmp;
-+ const BIGNUM *n;
-+ const BIGNUM *e;
-+ const BIGNUM *d;
-+ const BIGNUM *p;
-+ const BIGNUM *q;
-+ const BIGNUM *dmp1;
-+ const BIGNUM *dmq1;
-+ const BIGNUM *iqmp;
-
- RSA_get0_key(from, &n, &e, &d);
- RSA_get0_factors(from, &p, &q);
diff --git a/debian/patches/7c2cb62aa3a119818e9ceab0d6358f4c910fb337.patch b/debian/patches/7c2cb62aa3a119818e9ceab0d6358f4c910fb337.patch
deleted file mode 100644
index 9fa4ca0..0000000
--- a/debian/patches/7c2cb62aa3a119818e9ceab0d6358f4c910fb337.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-From 7c2cb62aa3a119818e9ceab0d6358f4c910fb337 Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Mon, 18 Jul 2016 16:25:31 +0200
-Subject: [PATCH] Lib: fix indentation (whitespace changes only)
-
----
- lib/crypt.cpp | 106 ++++++++++++++++++++++++++---------------------------
- lib/crypt_prog.cpp | 78 +++++++++++++++++++--------------------
- 2 files changed, 92 insertions(+), 92 deletions(-)
-
-diff --git a/lib/crypt.cpp b/lib/crypt.cpp
-index 30db6d8..cb1f49c 100644
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -554,15 +554,15 @@ void public_to_openssl(R_RSA_PUBLIC_KEY& pub, RSA* rp) {
- }
-
- static int _bn2bin(const BIGNUM *from, unsigned char *to, int max) {
-- int i;
-- i=BN_num_bytes(from);
-- if (i > max) {
-- return(0);
-- }
-- memset(to,0,(unsigned int)max);
-- if (!BN_bn2bin(from,&(to[max-i])))
-- return(0);
-- return(1);
-+ int i;
-+ i=BN_num_bytes(from);
-+ if (i > max) {
-+ return(0);
-+ }
-+ memset(to,0,(unsigned int)max);
-+ if (!BN_bn2bin(from,&(to[max-i])))
-+ return(0);
-+ return(1);
- }
-
- int openssl_to_private(RSA *from, R_RSA_PRIVATE_KEY *to) {
-@@ -598,23 +598,23 @@ int openssl_to_private(RSA *from, R_RSA_PRIVATE_KEY *to) {
- if (!_bn2bin(iqmp,to->coefficient,MAX_RSA_PRIME_LEN))
- return(0);
- #else
-- to->bits = BN_num_bits(from->n);
-- if (!_bn2bin(from->n,to->modulus,MAX_RSA_MODULUS_LEN))
-- return(0);
-- if (!_bn2bin(from->e,to->publicExponent,MAX_RSA_MODULUS_LEN))
-- return(0);
-- if (!_bn2bin(from->d,to->exponent,MAX_RSA_MODULUS_LEN))
-- return(0);
-- if (!_bn2bin(from->p,to->prime[0],MAX_RSA_PRIME_LEN))
-- return(0);
-- if (!_bn2bin(from->q,to->prime[1],MAX_RSA_PRIME_LEN))
-- return(0);
-- if (!_bn2bin(from->dmp1,to->primeExponent[0],MAX_RSA_PRIME_LEN))
-- return(0);
-- if (!_bn2bin(from->dmq1,to->primeExponent[1],MAX_RSA_PRIME_LEN))
-- return(0);
-- if (!_bn2bin(from->iqmp,to->coefficient,MAX_RSA_PRIME_LEN))
-- return(0);
-+ to->bits = BN_num_bits(from->n);
-+ if (!_bn2bin(from->n,to->modulus,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(from->e,to->publicExponent,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(from->d,to->exponent,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(from->p,to->prime[0],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(from->q,to->prime[1],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(from->dmp1,to->primeExponent[0],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(from->dmq1,to->primeExponent[1],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(from->iqmp,to->coefficient,MAX_RSA_PRIME_LEN))
-+ return(0);
- #endif
- return 1;
- }
-@@ -634,8 +634,8 @@ int check_validity_of_cert(
- bio = BIO_new(BIO_s_file());
- BIO_read_filename(bio, cFile);
- if (NULL == (cert = PEM_read_bio_X509(bio, NULL, 0, NULL))) {
-- BIO_vfree(bio);
-- return 0;
-+ BIO_vfree(bio);
-+ return 0;
- }
- // verify certificate
- store = X509_STORE_new();
-@@ -668,32 +668,32 @@ int check_validity_of_cert(
- #endif
- BN_CTX *c = BN_CTX_new();
- if (!c) {
-- X509_free(cert);
-- EVP_PKEY_free(pubKey);
-- BIO_vfree(bio);
-- return 0;
-- }
-+ X509_free(cert);
-+ EVP_PKEY_free(pubKey);
-+ BIO_vfree(bio);
-+ return 0;
-+ }
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
- RSA *rsa;
- rsa = EVP_PKEY_get0_RSA(pubKey);
- if (!RSA_blinding_on(rsa, c)) {
- #else
-- if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
-+ if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
- #endif
-- X509_free(cert);
-- EVP_PKEY_free(pubKey);
-- BIO_vfree(bio);
-- BN_CTX_free(c);
-- return 0;
-- }
-+ X509_free(cert);
-+ EVP_PKEY_free(pubKey);
-+ BIO_vfree(bio);
-+ BN_CTX_free(c);
-+ return 0;
-+ }
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
- retval = RSA_verify(NID_md5, md5_md, MD5_DIGEST_LENGTH, sfileMsg, sfsize, rsa);
- RSA_blinding_off(rsa);
- #else
-- retval = RSA_verify(NID_md5, md5_md, MD5_DIGEST_LENGTH, sfileMsg, sfsize, pubKey->pkey.rsa);
-- RSA_blinding_off(pubKey->pkey.rsa);
-+ retval = RSA_verify(NID_md5, md5_md, MD5_DIGEST_LENGTH, sfileMsg, sfsize, pubKey->pkey.rsa);
-+ RSA_blinding_off(pubKey->pkey.rsa);
- #endif
-- BN_CTX_free(c);
-+ BN_CTX_free(c);
- }
- #ifdef HAVE_OPAQUE_EVP_PKEY
- if (EVP_PKEY_id(pubKey) == EVP_PKEY_DSA) {
-@@ -730,7 +730,7 @@ char *check_validity(
- if (!of) return NULL;
- MD5_Init(&md5CTX);
- while (0 != (rbytes = (int)fread(rbuf, 1, sizeof(rbuf), of))) {
-- MD5_Update(&md5CTX, rbuf, rbytes);
-+ MD5_Update(&md5CTX, rbuf, rbytes);
- }
- MD5_Final(md5_md, &md5CTX);
- fclose(of);
-@@ -740,12 +740,12 @@ char *check_validity(
- char file[MAXPATHLEN];
- while (!dir_scan(file, dir, sizeof(file))) {
- char fpath[MAXPATHLEN];
-- snprintf(fpath, sizeof(fpath), "%s/%s", certPath, file);
-+ snprintf(fpath, sizeof(fpath), "%s/%s", certPath, file);
- // TODO : replace '128'
-- if (check_validity_of_cert(fpath, md5_md, signature, 128, caPath)) {
-- dir_close(dir);
-- return strdup(fpath);
-- }
-+ if (check_validity_of_cert(fpath, md5_md, signature, 128, caPath)) {
-+ dir_close(dir);
-+ return strdup(fpath);
-+ }
- }
-
- dir_close(dir);
-@@ -778,7 +778,7 @@ int cert_verify_file(
- if (!of) return false;
- MD5_Init(&md5CTX);
- while (0 != (rbytes = (int)fread(rbuf, 1, sizeof(rbuf), of))) {
-- MD5_Update(&md5CTX, rbuf, rbytes);
-+ MD5_Update(&md5CTX, rbuf, rbytes);
- }
- MD5_Final(md5_md, &md5CTX);
- fclose(of);
-@@ -805,10 +805,10 @@ int cert_verify_file(
- bio = BIO_new(BIO_s_file());
- BIO_read_filename(bio, fbuf);
- if (NULL == (cert = PEM_read_bio_X509(bio, NULL, 0, NULL))) {
-- BIO_vfree(bio);
-+ BIO_vfree(bio);
- printf("Cannot read certificate ('%s')\n", fbuf);
- file_counter++;
-- continue;
-+ continue;
- }
- fflush(stdout);
- subj = X509_get_subject_name(cert);
-@@ -816,7 +816,7 @@ int cert_verify_file(
- // ???
- //X509_NAME_free(subj);
- X509_free(cert);
-- BIO_vfree(bio);
-+ BIO_vfree(bio);
- if (strcmp(buf, signatures->signatures.at(i).subject)) {
- printf("Subject does not match ('%s' <-> '%s')\n", buf, signatures->signatures.at(i).subject);
- file_counter++;
-diff --git a/lib/crypt_prog.cpp b/lib/crypt_prog.cpp
-index 88d9f2d..7174afc 100644
---- a/lib/crypt_prog.cpp
-+++ b/lib/crypt_prog.cpp
-@@ -62,23 +62,23 @@ void die(const char* p) {
-
- void usage() {
- fprintf(stderr,
-- "Usage: crypt_prog options\n\n"
-- "Options:\n\n"
-- "-genkey n private_keyfile public_keyfile\n"
-- " create an n-bit key pair\n"
-- "-sign file private_keyfile\n"
-- " create a signature for a given file, write to stdout\n"
-- "-sign_string string private_keyfile\n"
-- " create a signature for a given string\n"
-- "-verify file signature_file public_keyfile\n"
-- " verify a signature\n"
-- "-test_crypt private_keyfile public_keyfile\n"
-- " test encrypt/decrypt functions\n"
-- "-conkey o2b/b20 priv/pub input_file output_file\n"
-- " convert keys between BOINC and OpenSSL format\n"
-- "-cert_verify file signature certificate_dir\n"
-- " verify a signature using a directory of certificates\n"
-- );
-+ "Usage: crypt_prog options\n\n"
-+ "Options:\n\n"
-+ "-genkey n private_keyfile public_keyfile\n"
-+ " create an n-bit key pair\n"
-+ "-sign file private_keyfile\n"
-+ " create a signature for a given file, write to stdout\n"
-+ "-sign_string string private_keyfile\n"
-+ " create a signature for a given string\n"
-+ "-verify file signature_file public_keyfile\n"
-+ " verify a signature\n"
-+ "-test_crypt private_keyfile public_keyfile\n"
-+ " test encrypt/decrypt functions\n"
-+ "-conkey o2b/b20 priv/pub input_file output_file\n"
-+ " convert keys between BOINC and OpenSSL format\n"
-+ "-cert_verify file signature certificate_dir\n"
-+ " verify a signature using a directory of certificates\n"
-+ );
- }
-
- unsigned int random_int() {
-@@ -93,7 +93,7 @@ unsigned int random_int() {
- die("Can't load ADVAPI32.DLL");
- }
- BOOLEAN (APIENTRY *pfn)(void*, ULONG) =
-- (BOOLEAN (APIENTRY *)(void*,ULONG))GetProcAddress(hLib,"SystemFunction036");
-+ (BOOLEAN (APIENTRY *)(void*,ULONG))GetProcAddress(hLib,"SystemFunction036");
- if (pfn) {
- char buff[32];
- ULONG ulCbBuff = sizeof(buff);
-@@ -131,7 +131,7 @@ int main(int argc, char** argv) {
- RSA rsa_key;
- #endif
- RSA *rsa_key_;
-- BIO *bio_out=NULL;
-+ BIO *bio_out=NULL;
- BIO *bio_err=NULL;
- char *certpath;
- bool b2o=false; // boinc key to openssl key ?
-@@ -220,8 +220,8 @@ int main(int argc, char** argv) {
- retval = md5_file(argv[2], md5_buf, size);
- if (retval) die("md5_file");
- retval = check_file_signature(
-- md5_buf, public_key, signature, is_valid
-- );
-+ md5_buf, public_key, signature, is_valid
-+ );
- if (retval) die("check_file_signature");
- if (is_valid) {
- printf("file is valid\n");
-@@ -271,9 +271,9 @@ int main(int argc, char** argv) {
- printf("siganture verified using certificate '%s'.\n\n", certpath);
- free(certpath);
- }
-- // this converts, but an executable signed with sign_executable,
-- // and signature converted to OpenSSL format cannot be verified with
-- // OpenSSL
-+ // this converts, but an executable signed with sign_executable,
-+ // and signature converted to OpenSSL format cannot be verified with
-+ // OpenSSL
- } else if (!strcmp(argv[1], "-convsig")) {
- if (argc < 5) {
- usage();
-@@ -329,18 +329,18 @@ int main(int argc, char** argv) {
- die("either 'pub' or 'priv' must be defined for -convkey\n");
- }
- OpenSSL_add_all_algorithms();
-- ERR_load_crypto_strings();
-- ENGINE_load_builtin_engines();
-- if (bio_err == NULL) {
-- bio_err = BIO_new_fp(stdout, BIO_NOCLOSE);
-+ ERR_load_crypto_strings();
-+ ENGINE_load_builtin_engines();
-+ if (bio_err == NULL) {
-+ bio_err = BIO_new_fp(stdout, BIO_NOCLOSE);
- }
- //enc=EVP_get_cipherbyname("des");
- //if (enc == NULL)
- // die("could not get cypher.\n");
- // no encription yet.
- bio_out=BIO_new(BIO_s_file());
-- if (BIO_write_filename(bio_out,argv[5]) <= 0) {
-- perror(argv[5]);
-+ if (BIO_write_filename(bio_out,argv[5]) <= 0) {
-+ perror(argv[5]);
- die("could not create output file.\n");
- }
- if (b2o) {
-@@ -360,11 +360,11 @@ int main(int argc, char** argv) {
- #endif
-
- //i = PEM_write_bio_RSAPrivateKey(bio_out, &rsa_key,
-- // enc, NULL, 0, pass_cb, NULL);
-- // no encryption yet.
--
-+ // enc, NULL, 0, pass_cb, NULL);
-+ // no encryption yet.
-+
- //i = PEM_write_bio_RSAPrivateKey(bio_out, &rsa_key,
-- // NULL, NULL, 0, pass_cb, NULL);
-+ // NULL, NULL, 0, pass_cb, NULL);
- fpriv = fopen(argv[5], "w+");
- if (!fpriv) die("fopen");
- #ifdef HAVE_OPAQUE_RSA_DSA_DH
-@@ -373,10 +373,10 @@ int main(int argc, char** argv) {
- PEM_write_RSAPrivateKey(fpriv, &rsa_key, NULL, NULL, 0, 0, NULL);
- #endif
- fclose(fpriv);
-- //if (i == 0) {
-+ //if (i == 0) {
- // ERR_print_errors(bio_err);
- // die("could not write key file.\n");
-- //}
-+ //}
- } else {
- fpub = fopen(argv[4], "r");
- if (!fpub) {
-@@ -390,11 +390,11 @@ int main(int argc, char** argv) {
- die("fopen");
- }
- public_to_openssl(public_key, rsa_key_);
-- i = PEM_write_RSA_PUBKEY(fpub, rsa_key_);
-- if (i == 0) {
-+ i = PEM_write_RSA_PUBKEY(fpub, rsa_key_);
-+ if (i == 0) {
- ERR_print_errors(bio_err);
- die("could not write key file.\n");
-- }
-+ }
- fclose(fpub);
- }
- } else {
diff --git a/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch b/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch
deleted file mode 100644
index 9994fc4..0000000
--- a/debian/patches/8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8416d8a1a423535fbc5d4e7416d6eac8ac5c050b Mon Sep 17 00:00:00 2001
-From: Preston Maness <aggroskater at gmail.com>
-Date: Tue, 26 Apr 2016 23:06:57 -0500
-Subject: [PATCH] Fix #1530 (null pointer dereference)
-
----
- client/hostinfo_unix.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
-index 38a0cf5..54f577e 100644
---- a/client/hostinfo_unix.cpp
-+++ b/client/hostinfo_unix.cpp
-@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_initialize() {
- "[idle_detection] Error (%d) opening %s.", errno, dir.c_str());
- }
- }
--
-- while ((dirp = readdir(dp)) != NULL) {
-- display_values.push_back(string(dirp->d_name));
-+ else {
-+ while ((dirp = readdir(dp)) != NULL) {
-+ display_values.push_back(string(dirp->d_name));
-+ }
-+ closedir(dp);
- }
-- closedir(dp);
-
- // Get rid of non-matching elements and format the matching ones.
- for ( it = display_values.begin() ; it != display_values.end() ; ) {
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 828a1fa..d2dd3df 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1658,7 +1658,6 @@
+@@ -1690,7 +1690,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +10,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
char currentDir[1024];
char thePIDbuf[20];
int id, iRetVal;
-@@ -1666,12 +1665,13 @@
+@@ -1698,12 +1697,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -27,10 +27,10 @@ Description: Nothing in this patch should be functionally relevant, only compile
+ strdup("-KILL"),
+ thePIDbuf,0
+ };
-
+
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1681,6 +1681,10 @@
+@@ -1713,6 +1713,10 @@
0,
id
);
diff --git a/debian/patches/boinc-issue-1177.patch b/debian/patches/boinc-issue-1177.patch
deleted file mode 100644
index 7e6950b..0000000
--- a/debian/patches/boinc-issue-1177.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 31e8427469ede148249796fed05be0165e321d23 Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Thu, 16 Mar 2017 18:28:08 +0100
-Subject: [PATCH 1/2] Manager/Lib: fix 'New Manager window' function on Linux
-
-This was not working because the manager was not detecting its own executable name and path so it couldn't start a new instance of itself. Windows and Mac use different codepaths so it worked there.
-The new library function can be extended for Windows and Mac to avoid code duplication.
----
- clientgui/BOINCGUIApp.cpp | 21 +++++++++++++++++++++
- configure.ac | 5 +++++
- lib/util.cpp | 17 +++++++++++++++++
- lib/util.h | 2 ++
- 4 files changed, 45 insertions(+)
-
-Index: boinc/clientgui/BOINCGUIApp.cpp
-===================================================================
---- boinc.orig/clientgui/BOINCGUIApp.cpp
-+++ boinc/clientgui/BOINCGUIApp.cpp
-@@ -765,6 +765,16 @@
-
- // Store the root directory for later use.
- m_strBOINCMGRExecutableName = pszProg;
-+#elif defined(__WXGTK__)
-+ char path[PATH_MAX];
-+ if (!get_real_executable_path(path, PATH_MAX)) {
-+ // find filename component
-+ char* name = strrchr(path, '/');
-+ if (name) {
-+ name++;
-+ m_strBOINCMGRExecutableName = name;
-+ }
-+ }
- #endif
- }
-
-@@ -786,6 +796,17 @@
-
- // Store the root directory for later use.
- m_strBOINCMGRRootDirectory = szPath;
-+#elif defined(__WXGTK__)
-+ char path[PATH_MAX];
-+ if (!get_real_executable_path(path, PATH_MAX)) {
-+ // find path component
-+ char* name = strrchr(path, '/');
-+ if (name) {
-+ name++;
-+ *name = '\0';
-+ m_strBOINCMGRRootDirectory = path;
-+ }
-+ }
- #endif
- }
-
-Index: boinc/configure.ac
-===================================================================
---- boinc.orig/configure.ac
-+++ boinc/configure.ac
-@@ -1026,6 +1026,11 @@
- AC_DEFINE(HAVE__PROC_SELF_STAT, 1, [Define to 1 if /proc/self/stat exists])
- fi
-
-+dnl Check for /proc/self/exe (Linux)
-+if test -e "/proc/self/exe"; then
-+ AC_DEFINE(HAVE__PROC_SELF_EXE, 1, [Define to 1 if /proc/self/exe exists])
-+fi
-+
- dnl Check for /proc/meminfo (Linux)
- if test -e "/proc/meminfo"; then
- AC_DEFINE(HAVE__PROC_MEMINFO, 1, [Define to 1 if /proc/meminfo exists])
-Index: boinc/lib/util.cpp
-===================================================================
---- boinc.orig/lib/util.cpp
-+++ boinc/lib/util.cpp
-@@ -617,3 +617,24 @@
- cached = true;
- return z*cos(PI2*u2);
- }
-+
-+// determines the real path and filename of the current process
-+// not the current working directory
-+//
-+int get_real_executable_path(char* path, size_t max_len) {
-+#ifdef HAVE__PROC_SELF_EXE
-+ int ret = readlink("/proc/self/exe", path, max_len);
-+ if ( ret >= 0) {
-+ path[ret] = '\0'; // readlink does not null terminate
-+ return 0;
-+ } else {
-+#ifdef _USING_FCGI_
-+ FCGI::perror("readlink");
-+#else
-+ perror("readlink");
-+#endif
-+ return ERR_PROC_PARSE;
-+ }
-+#endif
-+ return ERR_NOT_IMPLEMENTED;
-+}
-Index: boinc/lib/util.h
-===================================================================
---- boinc.orig/lib/util.h
-+++ boinc/lib/util.h
-@@ -110,6 +110,8 @@
-
- extern int wait_client_mutex(const char* dir, double timeout);
-
-+extern int get_real_executable_path(char* path, size_t max_len);
-+
- #ifdef GCL_SIMULATOR
- extern double simtime;
- #define time(x) ((int)simtime)
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 48a30f9..3c759c5 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -5,21 +5,21 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -173,7 +173,7 @@
+@@ -176,7 +176,7 @@
libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
--libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
-+libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
++libboinc_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
if ENABLE_BOINCCRYPT
-@@ -181,7 +181,7 @@
+@@ -184,7 +184,7 @@
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
--libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
-+libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
++libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_crypt_la_LIBADD =
endif
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index af0fe1e..3c433b6 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -3,7 +3,7 @@ Description: Initialisation.
--- a/lib/crypt.cpp
+++ b/lib/crypt.cpp
-@@ -348,6 +348,7 @@
+@@ -349,6 +349,7 @@
char clear_buf[MD5_LEN];
int n, retval;
DATA_BLOCK clear_signature;
diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index f142b84..49710c4 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,49 +1,36 @@
Description: fixing some "de" typos, this should be addressed on other languages aswell.
--- a/html/languages/translations/de.po
+++ b/html/languages/translations/de.po
-@@ -1073,8 +1073,8 @@
+@@ -1201,8 +1201,8 @@
- #: ../inc/prefs.inc:158
- #, php-format
--msgid "% of the processors"
+ #: html/inc/prefs.inc:58
+ #, no-php-format
+-msgid "% of the CPUs"
-msgstr "% der Prozessoren"
-+msgid "%% of the processors"
++msgid "%% of the CPUs"
+msgstr "%% der Prozessoren"
- #: ../inc/prefs.inc:162
- msgid "Use at most %1 Can be used to reduce CPU heat %2"
-@@ -1083,8 +1083,8 @@
+ #: html/inc/prefs.inc:63
+ #, no-php-format
+@@ -1214,8 +1214,8 @@
- #: ../inc/prefs.inc:167
- #, php-format
+ #: html/inc/prefs.inc:66
+ #, no-php-format
-msgid "% of CPU time"
-msgstr "% der Prozessorzeit"
+msgid "%% of CPU time"
+msgstr "%% der Prozessorzeit"
- #: ../inc/prefs.inc:175 ../inc/prefs.inc:189
- msgid "Disk: use at most"
-@@ -1103,8 +1103,8 @@
- #: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
- #: ../inc/prefs.inc:211
- #, php-format
+ #: html/inc/prefs.inc:68 html/inc/prefs.inc:214
+ msgid "When to suspend"
+@@ -1369,8 +1369,8 @@
+
+ #: html/inc/prefs.inc:158
+ #, no-php-format
-msgid "% of total"
-msgstr "% von Gesamt"
+msgid "%% of total"
+msgstr "%% von Gesamt"
- #: ../inc/prefs.inc:194
- msgid "Tasks checkpoint to disk at most every"
-@@ -5338,9 +5338,10 @@
- "our message boards are moderated.\n"
- "Message board postings are subject to the following posting rules:\n"
- msgstr ""
-+"\n"
- "Um eine angenehme Diskussion und den bestmöglichen Informationsfluss zu "
--"gewährleisten wird dieses Forum moderiert. Forenbeiträge müssen den "
--"folgenden Regeln entsprechen:"
-+"gewährleisten, wird dieses Forum moderiert. Forenbeiträge müssen den "
-+"folgenden Regeln entsprechen:\n"
-
- #: ../user/moderation.php:30
- msgid ""
+ #: html/inc/prefs.inc:164
+ msgid "When computer is in use, use at most"
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index f836c12..4541fc6 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
-@@ -606,7 +606,7 @@
+@@ -598,7 +598,7 @@
// inform the user if there's a newer version of client
//
diff --git a/debian/patches/e965ea2e32d467e6937f206c96270cabd381df6e.patch b/debian/patches/e965ea2e32d467e6937f206c96270cabd381df6e.patch
deleted file mode 100644
index 4def293..0000000
--- a/debian/patches/e965ea2e32d467e6937f206c96270cabd381df6e.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From e965ea2e32d467e6937f206c96270cabd381df6e Mon Sep 17 00:00:00 2001
-From: Christian Beer <christian.beer at aei.mpg.de>
-Date: Mon, 27 Jun 2016 18:26:27 +0200
-Subject: [PATCH] Lib: build against openSSL 1.1.0
-
-The upcoming OpenSSL version introduces some API changes (https://wiki.openssl.org/index.php/1.1_API_Changes). In BOINC mainly code related to RSA keys is affected for now.
-
-Contributed by: Gianfranco Costamagna
----
- lib/crypt.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- lib/crypt.h | 5 +++
- lib/crypt_prog.cpp | 12 ++++++
- 3 files changed, 131 insertions(+), 1 deletion(-)
-
-diff --git a/lib/crypt.cpp b/lib/crypt.cpp
-index 192bbc2..cd6f04a 100644
---- a/lib/crypt.cpp
-+++ b/lib/crypt.cpp
-@@ -453,7 +453,7 @@ int read_key_file(const char* keyfile, R_RSA_PRIVATE_KEY& key) {
- return 0;
- }
-
--static void bn_to_bin(BIGNUM* bn, unsigned char* bin, int n) {
-+static void bn_to_bin(const BIGNUM* bn, unsigned char* bin, int n) {
- memset(bin, 0, n);
- int m = BN_num_bytes(bn);
- BN_bn2bin(bn, bin+n-m);
-@@ -463,11 +463,38 @@ void openssl_to_keys(
- RSA* rp, int nbits, R_RSA_PRIVATE_KEY& priv, R_RSA_PUBLIC_KEY& pub
- ) {
- pub.bits = nbits;
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ BIGNUM *n;
-+ BIGNUM *e;
-+ BIGNUM *d;
-+ BIGNUM *p;
-+ BIGNUM *q;
-+ BIGNUM *dmp1;
-+ BIGNUM *dmq1;
-+ BIGNUM *iqmp;
-+ RSA_get0_key(rp, &n, &e, &d);
-+ RSA_get0_factors(rp, &p, &q);
-+ RSA_get0_crt_params(rp, &dmp1, &dmq1, &iqmp);
-+
-+ bn_to_bin(n, pub.modulus, sizeof(pub.modulus));
-+ bn_to_bin(e, pub.exponent, sizeof(pub.exponent));
-+#else
- bn_to_bin(rp->n, pub.modulus, sizeof(pub.modulus));
- bn_to_bin(rp->e, pub.exponent, sizeof(pub.exponent));
-+#endif
-
- memset(&priv, 0, sizeof(priv));
- priv.bits = nbits;
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ bn_to_bin(n, priv.modulus, sizeof(priv.modulus));
-+ bn_to_bin(e, priv.publicExponent, sizeof(priv.publicExponent));
-+ bn_to_bin(d, priv.exponent, sizeof(priv.exponent));
-+ bn_to_bin(p, priv.prime[0], sizeof(priv.prime[0]));
-+ bn_to_bin(q, priv.prime[1], sizeof(priv.prime[1]));
-+ bn_to_bin(dmp1, priv.primeExponent[0], sizeof(priv.primeExponent[0]));
-+ bn_to_bin(dmq1, priv.primeExponent[1], sizeof(priv.primeExponent[1]));
-+ bn_to_bin(iqmp, priv.coefficient, sizeof(priv.coefficient));
-+#else
- bn_to_bin(rp->n, priv.modulus, sizeof(priv.modulus));
- bn_to_bin(rp->e, priv.publicExponent, sizeof(priv.publicExponent));
- bn_to_bin(rp->d, priv.exponent, sizeof(priv.exponent));
-@@ -476,9 +503,32 @@ void openssl_to_keys(
- bn_to_bin(rp->dmp1, priv.primeExponent[0], sizeof(priv.primeExponent[0]));
- bn_to_bin(rp->dmq1, priv.primeExponent[1], sizeof(priv.primeExponent[1]));
- bn_to_bin(rp->iqmp, priv.coefficient, sizeof(priv.coefficient));
-+#endif
- }
-
- void private_to_openssl(R_RSA_PRIVATE_KEY& priv, RSA* rp) {
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ BIGNUM *n;
-+ BIGNUM *e;
-+ BIGNUM *d;
-+ BIGNUM *p;
-+ BIGNUM *q;
-+ BIGNUM *dmp1;
-+ BIGNUM *dmq1;
-+ BIGNUM *iqmp;
-+
-+ n = BN_bin2bn(priv.modulus, sizeof(priv.modulus), 0);
-+ e = BN_bin2bn(priv.publicExponent, sizeof(priv.publicExponent), 0);
-+ d = BN_bin2bn(priv.exponent, sizeof(priv.exponent), 0);
-+ p = BN_bin2bn(priv.prime[0], sizeof(priv.prime[0]), 0);
-+ q = BN_bin2bn(priv.prime[1], sizeof(priv.prime[1]), 0);
-+ dmp1 = BN_bin2bn(priv.primeExponent[0], sizeof(priv.primeExponent[0]), 0);
-+ dmq1 = BN_bin2bn(priv.primeExponent[1], sizeof(priv.primeExponent[1]), 0);
-+ iqmp = BN_bin2bn(priv.coefficient, sizeof(priv.coefficient), 0);
-+ RSA_set0_key(rp, n, e, d);
-+ RSA_set0_factors(rp, p, q);
-+ RSA_set0_crt_params(rp, dmp1, dmq1, iqmp);
-+#else
- rp->n = BN_bin2bn(priv.modulus, sizeof(priv.modulus), 0);
- rp->e = BN_bin2bn(priv.publicExponent, sizeof(priv.publicExponent), 0);
- rp->d = BN_bin2bn(priv.exponent, sizeof(priv.exponent), 0);
-@@ -487,11 +537,22 @@ void private_to_openssl(R_RSA_PRIVATE_KEY& priv, RSA* rp) {
- rp->dmp1 = BN_bin2bn(priv.primeExponent[0], sizeof(priv.primeExponent[0]), 0);
- rp->dmq1 = BN_bin2bn(priv.primeExponent[1], sizeof(priv.primeExponent[1]), 0);
- rp->iqmp = BN_bin2bn(priv.coefficient, sizeof(priv.coefficient), 0);
-+#endif
- }
-
- void public_to_openssl(R_RSA_PUBLIC_KEY& pub, RSA* rp) {
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ BIGNUM *n;
-+ BIGNUM *e;
-+ BIGNUM *d;
-+ n = BN_bin2bn(pub.modulus, sizeof(pub.modulus), 0);
-+ e = BN_bin2bn(pub.exponent, sizeof(pub.exponent), 0);
-+ // d??? FIXME
-+ RSA_set0_key(rp, n, e, d);
-+#else
- rp->n = BN_bin2bn(pub.modulus, sizeof(pub.modulus), 0);
- rp->e = BN_bin2bn(pub.exponent, sizeof(pub.exponent), 0);
-+#endif
- }
-
- static int _bn2bin(BIGNUM *from, unsigned char *to, int max) {
-@@ -507,6 +568,38 @@ static int _bn2bin(BIGNUM *from, unsigned char *to, int max) {
- }
-
- int openssl_to_private(RSA *from, R_RSA_PRIVATE_KEY *to) {
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ BIGNUM *n;
-+ BIGNUM *e;
-+ BIGNUM *d;
-+ BIGNUM *p;
-+ BIGNUM *q;
-+ BIGNUM *dmp1;
-+ BIGNUM *dmq1;
-+ BIGNUM *iqmp;
-+
-+ RSA_get0_key(from, &n, &e, &d);
-+ RSA_get0_factors(from, &p, &q);
-+ RSA_get0_crt_params(from, &dmp1, &dmq1, &iqmp);
-+
-+ to->bits = BN_num_bits(n);
-+ if (!_bn2bin(n,to->modulus,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(e,to->publicExponent,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(d,to->exponent,MAX_RSA_MODULUS_LEN))
-+ return(0);
-+ if (!_bn2bin(p,to->prime[0],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(q,to->prime[1],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(dmp1,to->primeExponent[0],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(dmq1,to->primeExponent[1],MAX_RSA_PRIME_LEN))
-+ return(0);
-+ if (!_bn2bin(iqmp,to->coefficient,MAX_RSA_PRIME_LEN))
-+ return(0);
-+#else
- to->bits = BN_num_bits(from->n);
- if (!_bn2bin(from->n,to->modulus,MAX_RSA_MODULUS_LEN))
- return(0);
-@@ -524,6 +617,7 @@ int openssl_to_private(RSA *from, R_RSA_PRIVATE_KEY *to) {
- return(0);
- if (!_bn2bin(from->iqmp,to->coefficient,MAX_RSA_PRIME_LEN))
- return(0);
-+#endif
- return 1;
- }
-
-@@ -569,7 +663,11 @@ int check_validity_of_cert(
- BIO_vfree(bio);
- return 0;
- }
-+#ifdef HAVE_OPAQUE_EVP_PKEY
-+ if (EVP_PKEY_id(pubKey) == EVP_PKEY_RSA) {
-+#else
- if (pubKey->type == EVP_PKEY_RSA) {
-+#endif
- BN_CTX *c = BN_CTX_new();
- if (!c) {
- X509_free(cert);
-@@ -577,18 +675,33 @@ int check_validity_of_cert(
- BIO_vfree(bio);
- return 0;
- }
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ RSA *rsa;
-+ rsa = EVP_PKEY_get0_RSA(pubKey);
-+ if (!RSA_blinding_on(rsa, c)) {
-+#else
- if (!RSA_blinding_on(pubKey->pkey.rsa, c)) {
-+#endif
- X509_free(cert);
- EVP_PKEY_free(pubKey);
- BIO_vfree(bio);
- BN_CTX_free(c);
- return 0;
- }
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ retval = RSA_verify(NID_md5, md5_md, MD5_DIGEST_LENGTH, sfileMsg, sfsize, rsa);
-+ RSA_blinding_off(rsa);
-+#else
- retval = RSA_verify(NID_md5, md5_md, MD5_DIGEST_LENGTH, sfileMsg, sfsize, pubKey->pkey.rsa);
- RSA_blinding_off(pubKey->pkey.rsa);
-+#endif
- BN_CTX_free(c);
- }
-+#ifdef HAVE_OPAQUE_EVP_PKEY
-+ if (EVP_PKEY_id(pubKey) == EVP_PKEY_DSA) {
-+#else
- if (pubKey->type == EVP_PKEY_DSA) {
-+#endif
- fprintf(stderr,
- "%s: ERROR: DSA keys are not supported.\n",
- time_to_string(dtime())
-diff --git a/lib/crypt.h b/lib/crypt.h
-index 022bd2a..33c62a8 100644
---- a/lib/crypt.h
-+++ b/lib/crypt.h
-@@ -26,6 +26,11 @@
-
- #include <openssl/rsa.h>
-
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) /* OpenSSL 1.1.0+ */
-+#define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
-+#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
-+#endif
-+
- #define MAX_RSA_MODULUS_BITS 1024
- #define MAX_RSA_MODULUS_LEN ((MAX_RSA_MODULUS_BITS + 7) / 8)
- #define MAX_RSA_PRIME_BITS ((MAX_RSA_MODULUS_BITS + 1) / 2)
-diff --git a/lib/crypt_prog.cpp b/lib/crypt_prog.cpp
-index 2a1eb5d..3bc2d53 100644
---- a/lib/crypt_prog.cpp
-+++ b/lib/crypt_prog.cpp
-@@ -125,7 +125,11 @@ int main(int argc, char** argv) {
- unsigned char signature_buf[256], buf[256], buf2[256];
- FILE *f, *fpriv, *fpub;
- char cbuf[256];
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ RSA *rsa_key;
-+#else
- RSA rsa_key;
-+#endif
- RSA *rsa_key_;
- BIO *bio_out=NULL;
- BIO *bio_err=NULL;
-@@ -339,7 +343,11 @@ int main(int argc, char** argv) {
- retval = scan_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
- fclose(fpriv);
- if (retval) die("scan_key_hex\n");
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ private_to_openssl(private_key, rsa_key);
-+#else
- private_to_openssl(private_key, &rsa_key);
-+#endif
-
- //i = PEM_write_bio_RSAPrivateKey(bio_out, &rsa_key,
- // enc, NULL, 0, pass_cb, NULL);
-@@ -349,7 +357,11 @@ int main(int argc, char** argv) {
- // NULL, NULL, 0, pass_cb, NULL);
- fpriv = fopen(argv[5], "w+");
- if (!fpriv) die("fopen");
-+#ifdef HAVE_OPAQUE_RSA_DSA_DH
-+ PEM_write_RSAPrivateKey(fpriv, rsa_key, NULL, NULL, 0, 0, NULL);
-+#else
- PEM_write_RSAPrivateKey(fpriv, &rsa_key, NULL, NULL, 0, 0, NULL);
-+#endif
- fclose(fpriv);
- //if (i == 0) {
- // ERR_print_errors(bio_err);
diff --git a/debian/patches/envargs.patch b/debian/patches/envargs.patch
deleted file mode 100644
index 9aaf684..0000000
--- a/debian/patches/envargs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description:
- Fix inconsistencies spot with research compiler (Debian bug ##747964).
-
-diff -urN a/zip/zip/util.c b/zip/zip/util.c
---- a/zip/zip/util.c 2015-04-02 00:03:00.000000000 +0100
-+++ b/zip/zip/util.c 2015-04-02 00:04:10.000000000 +0100
-@@ -802,7 +802,7 @@
- | to make the action of the code less obscure.
- ****************************************************************/
-
--void envargs(Pargc, Pargv, envstr, envstr2)
-+int envargs(Pargc, Pargv, envstr, envstr2)
- int *Pargc;
- char ***Pargv;
- char *envstr;
-@@ -825,7 +825,7 @@
- while (isspace((uch)*envptr))
- envptr++;
- if (envptr == NULL || *envptr == '\0')
-- return;
-+ return 0;
-
- /* count the args so we can allocate room for them */
- argc = count_args(envptr);
-@@ -902,6 +902,7 @@
- /* save the values and return */
- *Pargv = argvect;
- *Pargc = argc;
-+ return 0;
- }
-
- local int count_args(s)
-diff -urN a/zip/zip/zip.h b/zip/zip/zip.h
---- a/zip/zip/zip.h 2015-04-02 00:18:02.000000000 +0100
-+++ b/zip/zip/zip.h 2015-04-02 00:18:58.000000000 +0100
-@@ -811,7 +811,7 @@
-
- zvoid far **search OF((ZCONST zvoid *, ZCONST zvoid far **, extent,
- int (*)(ZCONST zvoid *, ZCONST zvoid far *)));
--void envargs OF((int *, char ***, char *, char *));
-+int envargs OF((int *, char ***, char *, char *));
- void expand_args OF((int *, char ***));
-
- int is_text_buf OF((ZCONST char *buf_ptr, unsigned buf_size));
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 87a61c6..1df82ad 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,18 +1,18 @@
Description: Link LIBBOINC to some binary needing it.
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
-@@ -277,7 +277,7 @@
+@@ -276,7 +276,7 @@
update_stats_LDADD = $(SERVERLIBS)
- file_upload_handler_SOURCES = file_upload_handler.cpp sched_msgs.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
+ file_upload_handler_SOURCES = file_upload_handler.cpp sched_config.cpp sched_util_basic.cpp sched_limit.cpp
-file_upload_handler_LDADD = $(FUHLIBS)
+file_upload_handler_LDADD = $(FUHLIBS) $(LIBBOINC)
make_work_SOURCES = make_work.cpp
make_work_LDADD = $(SERVERLIBS)
-@@ -319,7 +319,7 @@
- sched_config.cpp \
- sched_msgs.cpp
+@@ -317,7 +317,7 @@
+ file_upload_handler.cpp \
+ sched_config.cpp
fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI)
+fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI) $(LIBBOINC)
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index 318289e..e90e88f 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,7 +1,7 @@
Description: this patch adds an useful error message in case of dir open failure.
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
-@@ -147,7 +147,12 @@ DIRREF dir_open(const char* p) {
+@@ -154,7 +154,12 @@ DIRREF dir_open(const char* p) {
dirp->handle = INVALID_HANDLE_VALUE;
#else
dirp = opendir(p);
@@ -15,12 +15,12 @@ Description: this patch adds an useful error message in case of dir open failure
#endif
return dirp;
}
-@@ -650,7 +655,7 @@ static int boinc_rename_aux(const char*
+@@ -684,7 +689,7 @@ static int boinc_rename_aux(const char*
//
int retval = rename(old, newf);
if (retval) {
- char buf[MAXPATHLEN+MAXPATHLEN];
+ char buf[MAXPATHLEN+MAXPATHLEN+1+7];
sprintf(buf, "mv \"%s\" \"%s\"", old, newf);
- retval = system(buf);
- }
+ #ifdef __APPLE__
+ // system() is deprecated in Mac OS 10.10.
diff --git a/debian/patches/fix-underlinking.patch b/debian/patches/fix-underlinking.patch
index 3cc7559..9890fca 100644
--- a/debian/patches/fix-underlinking.patch
+++ b/debian/patches/fix-underlinking.patch
@@ -10,23 +10,21 @@ Index: boinc/api/Makefile.am
lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
--libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
-+libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -lpthread
+-libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
++libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -lpthread
+libboinc_api_la_LIBADD = -L../lib/.libs $(LIBBOINC)
if BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_graphics2.la
libboinc_graphics2_la_SOURCES = $(graphics2_files)
libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs
--libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg
-+libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg
+ libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
+libboinc_graphics2_la_LIBADD = -L../lib/.libs $(APPLIBS)
endif #BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_opencl.la
libboinc_opencl_la_SOURCES = $(opencl_files)
--libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
-+libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+libboinc_opencl_la_LIBADD = -L../lib/.libs $(APPLIBS)
if INSTALL_HEADERS
@@ -35,13 +33,13 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -181,8 +181,8 @@
+@@ -184,8 +184,8 @@
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
--libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
-libboinc_crypt_la_LIBADD =
-+libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
++libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
+libboinc_crypt_la_LIBADD = $(LIBBOINC)
endif
@@ -50,21 +48,21 @@ Index: boinc/sched/Makefile.am
===================================================================
--- boinc.orig/sched/Makefile.am
+++ boinc/sched/Makefile.am
-@@ -25,8 +25,8 @@
+@@ -24,8 +24,8 @@
libsched_la_SOURCES = $(libsched_sources)
libsched_la_CFLAGS = $(AM_CPPFLAGS)
libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
--libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION)
-libsched_la_LIBADD= $(SSL_LIBS)
-+libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(MYSQL_LIBS) $(SSL_LIBS)
++libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION) $(MYSQL_LIBS) $(SSL_LIBS)
+libsched_la_LIBADD= $(LIBBOINC) $(LIBBOINC_CRYPT)
## install only headers that are meant for exporting the API !!
if INSTALL_HEADERS
-@@ -48,7 +48,7 @@
+@@ -47,7 +47,7 @@
libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
- libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libsched_fcgi_la_LDFLAGS= -version-number $(LIBBOINC_VERSION)
-libsched_fcgi_la_LIBADD=
+libsched_fcgi_la_LIBADD= $(LIBBOINC_CRYPT)
@@ -77,7 +75,7 @@ Index: boinc/zip/Makefile.am
@@ -62,7 +62,7 @@
lib_LTLIBRARIES = libboinc_zip.la
libboinc_zip_la_SOURCES = $(libboinc_zip_sources)
- libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
-libboinc_zip_la_LIBADD =
+libboinc_zip_la_LIBADD = $(LIBBOINC)
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index 65c27d8..c07d316 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -2,7 +2,7 @@ Description: this patch makes boinc correctly close the open files.
This patch allows also MFILE to correctly deallocate its pointers by calling close().
--- a/lib/crypt_prog.cpp
+++ b/lib/crypt_prog.cpp
-@@ -154,6 +154,8 @@ int main(int argc, char** argv) {
+@@ -168,6 +168,8 @@ int main(int argc, char** argv) {
if (!fpub) die("fopen");
print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
@@ -11,7 +11,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign")) {
if (argc < 4) {
-@@ -168,6 +170,7 @@ int main(int argc, char** argv) {
+@@ -182,6 +184,7 @@ int main(int argc, char** argv) {
signature.len = 256;
retval = sign_file(argv[2], private_key, signature);
print_hex_data(stdout, signature);
@@ -19,7 +19,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign_string")) {
if (argc < 4) {
usage();
-@@ -179,6 +182,7 @@ int main(int argc, char** argv) {
+@@ -193,6 +196,7 @@ int main(int argc, char** argv) {
if (retval) die("scan_key_hex\n");
generate_signature(argv[2], cbuf, private_key);
puts(cbuf);
@@ -27,7 +27,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-verify")) {
if (argc < 5) {
usage();
-@@ -193,6 +197,8 @@ int main(int argc, char** argv) {
+@@ -207,6 +211,8 @@ int main(int argc, char** argv) {
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -36,7 +36,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("scan_hex_data");
char md5_buf[64];
-@@ -222,6 +228,8 @@ int main(int argc, char** argv) {
+@@ -236,6 +242,8 @@ int main(int argc, char** argv) {
if (!fpub) die("fopen");
retval = scan_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
if (retval) die("read_public_key");
@@ -45,7 +45,7 @@ Description: this patch makes boinc correctly close the open files.
strcpy((char*)buf2, "encryption test successful");
in.data = buf2;
in.len = strlen((char*)in.data);
-@@ -240,6 +248,7 @@ int main(int argc, char** argv) {
+@@ -254,6 +262,7 @@ int main(int argc, char** argv) {
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -53,7 +53,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("cannot scan_hex_data");
certpath = check_validity(argv[4], argv[2], signature.data, argv[5]);
if (certpath == NULL) {
-@@ -404,6 +413,7 @@ int main(int argc, char** argv) {
+@@ -426,6 +435,7 @@ int main(int argc, char** argv) {
die("fopen");
}
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
diff --git a/debian/patches/make_project_overcomes_Apache24_security.patch b/debian/patches/make_project_overcomes_Apache24_security.patch
index bdc2181..ec54471 100644
--- a/debian/patches/make_project_overcomes_Apache24_security.patch
+++ b/debian/patches/make_project_overcomes_Apache24_security.patch
@@ -3,15 +3,15 @@ Description: Installations outside /var/www are disabled by default
http://dabase.com/blog/AH01630:_client_denied_by_server_configuration/
--- a/tools/make_project
+++ b/tools/make_project
-@@ -331,6 +331,7 @@
+@@ -385,6 +385,7 @@
<Directory "%(proot)s/html">
- Options Indexes FollowSymlinks MultiViews
+ Options Indexes MultiViews
AllowOverride AuthConfig
+ Require all granted
Order allow,deny
Allow from all
</Directory>
-@@ -338,6 +339,7 @@
+@@ -393,6 +394,7 @@
<Directory "%(proot)s/cgi-bin">
Options ExecCGI
AllowOverride AuthConfig
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 1c945f6..d886744 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -21,7 +21,7 @@ Description: use MAXPATHLEN and change sprintf to snprintf
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
-@@ -581,7 +581,7 @@ int boinc_copy(const char* orig, const char* newf) {
+@@ -600,7 +600,7 @@ int boinc_copy(const char* orig, const char* newf) {
}
return 0;
#elif defined(__EMX__)
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 93cf43d..f5961d4 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -19,7 +19,7 @@ Description: int may not be enough (theoretically) for large files.
// delay opening the file until we've done the first socket read
// to avoid filesystem lockups (WCG, possible paranoia)
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
// try to write n bytes to file
//
diff --git a/debian/patches/series b/debian/patches/series
index a355079..481568d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,12 +27,5 @@ disable_svn_version.patch
AdjustBoincTopdirPython.patch
file_upload_handler_in_sched_linking.patch
disable_silent_rules.patch
-envargs.patch
fix-underlinking.patch
static_scientific_apps.patch
-8416d8a1a423535fbc5d4e7416d6eac8ac5c050b.patch
-e965ea2e32d467e6937f206c96270cabd381df6e.patch
-1ec4be73d83d6041e4097b547a3fca297dd828db.patch
-056f788ea3a9ba1b45e17bcacea91a38c1ed8d73.patch
-7c2cb62aa3a119818e9ceab0d6358f4c910fb337.patch
-boinc-issue-1177.patch
diff --git a/debian/patches/static_scientific_apps.patch b/debian/patches/static_scientific_apps.patch
index 9cae2e4..6354d88 100644
--- a/debian/patches/static_scientific_apps.patch
+++ b/debian/patches/static_scientific_apps.patch
@@ -2,7 +2,7 @@ Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
-@@ -173,6 +173,10 @@ lib_LTLIBRARIES = libboinc.la
+@@ -176,6 +176,10 @@ lib_LTLIBRARIES = libboinc.la
libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -10,10 +10,10 @@ Index: boinc/lib/Makefile.am
+libboinc_la_RANLIB = gcc-ranlib
+libboinc_a_AR = gcc-ar
+libboinc_a_RANLIB = gcc-ranlib
- libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
-@@ -181,6 +185,10 @@ lib_LTLIBRARIES += libboinc_crypt.la
+@@ -184,6 +188,10 @@ lib_LTLIBRARIES += libboinc_crypt.la
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
@@ -21,10 +21,10 @@ Index: boinc/lib/Makefile.am
+libboinc_crypt_la_RANLIB = gcc-ranlib
+libboinc_crypt_a_AR = gcc-ar
+libboinc_crypt_a_RANLIB = gcc-ranlib
- libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
+ libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
libboinc_crypt_la_LIBADD = $(LIBBOINC)
endif
-@@ -190,6 +198,10 @@ lib_LTLIBRARIES += libboinc_fcgi.la
+@@ -193,6 +201,10 @@lib_LTLIBRARIES += libboinc_fcgi.la
libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -32,10 +32,10 @@ Index: boinc/lib/Makefile.am
+libboinc_fcgi_la_RANLIB = gcc-ranlib
+libboinc_fcgi_a_AR = gcc-ar
+libboinc_fcgi_a_RANLIB = gcc-ranlib
- libboinc_fcgi_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_fcgi_la_LIBADD =
endif
-@@ -253,7 +265,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
+@@ -256,7 +268,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
msg_test_LDADD = $(LIBBOINC)
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
@@ -230,7 +230,7 @@ Index: boinc/api/Makefile.am
+++ boinc/api/Makefile.am
@@ -45,6 +45,10 @@ lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
- libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -lpthread
+ libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -lpthread
libboinc_api_la_LIBADD = -L../lib/.libs $(LIBBOINC)
+libboinc_api_la_AR = gcc-ar
+libboinc_api_la_RANLIB = gcc-ranlib
@@ -241,7 +241,7 @@ Index: boinc/api/Makefile.am
lib_LTLIBRARIES += libboinc_graphics2.la
@@ -52,12 +56,20 @@ libboinc_graphics2_la_SOURCES = $(graphi
libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs
- libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg
+ libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
libboinc_graphics2_la_LIBADD = -L../lib/.libs $(APPLIBS)
+libboinc_graphics2_la_AR = gcc-ar
+libboinc_graphics2_la_RANLIB = gcc-ranlib
@@ -251,7 +251,7 @@ Index: boinc/api/Makefile.am
lib_LTLIBRARIES += libboinc_opencl.la
libboinc_opencl_la_SOURCES = $(opencl_files)
- libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_opencl_la_LIBADD = -L../lib/.libs $(APPLIBS)
+libboinc_opencl_la_AR = gcc-ar
+libboinc_opencl_la_RANLIB = gcc-ranlib
@@ -266,7 +266,7 @@ Index: boinc/zip/Makefile.am
+++ boinc/zip/Makefile.am
@@ -63,6 +63,10 @@ lib_LTLIBRARIES = libboinc_zip.la
libboinc_zip_la_SOURCES = $(libboinc_zip_sources)
- libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+ libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_zip_la_LIBADD = $(LIBBOINC)
+libboinc_zip_la_AR = gcc-ar
+libboinc_zip_la_RANLIB = gcc-ranlib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list