sci-misc/boinc: refresh patch stack

Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>

4 files changed, 71 insertions, 39 deletions

diff --git a/sci-misc/boinc/boinc-7.14.2.ebuild b/sci-misc/boinc/boinc-7.14.2-r1.ebuild
index 9ee5036..9ee5036 100644
--- a/sci-misc/boinc/boinc-7.14.2.ebuild
+++ b/sci-misc/boinc/boinc-7.14.2-r1.ebuild
diff --git a/sci-misc/boinc/files/0001-Install-switcher-tool-to-FHS-directory.patch b/sci-misc/boinc/files/0001-Install-switcher-tool-to-FHS-directory.patch
index 456b804..4740bf0 100644
--- a/sci-misc/boinc/files/0001-Install-switcher-tool-to-FHS-directory.patch
+++ b/sci-misc/boinc/files/0001-Install-switcher-tool-to-FHS-directory.patch
@@ -1,60 +1,92 @@
-From 3746e1367fe5dc430c431b349ed6a40ee7156e74 Mon Sep 17 00:00:00 2001
+From 21b61a4f470338ae55e0683effa20482140c7965 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Thu, 4 Oct 2018 10:30:03 +0200
 Subject: [PATCH 1/3] Install switcher tool to FHS directory
 
 ---
- client/Makefile.am                       | 2 +-
- client/{file_names.h => file_names.h.in} | 2 +-
- configure.ac                             | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
- rename client/{file_names.h => file_names.h.in} (98%)
+ client/Makefile.am          | 14 ++++++++++++--
+ client/file_names.h         |  4 ++++
+ client/file_names_unix.h.in | 23 +++++++++++++++++++++++
+ 3 files changed, 39 insertions(+), 2 deletions(-)
+ create mode 100644 client/file_names_unix.h.in
 
 diff --git a/client/Makefile.am b/client/Makefile.am
-index f39c45f..0fb91d3 100644
+index f39c45fe60..5cff108abb 100644
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
-@@ -24,7 +24,15 @@ endif
+@@ -24,7 +24,7 @@ endif
  
  bin_PROGRAMS = boinc_client boinccmd
  if !OS_WIN32
 -bin_PROGRAMS += switcher
 +pkglibexec_PROGRAMS = switcher
  endif
-
+ 
+ boinccmd_SOURCES = boinc_cmd.cpp
+@@ -106,7 +106,17 @@ else
+ if OS_DARWIN
+ boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
+ else
+-boinc_client_SOURCES += hostinfo_unix.cpp
++boinc_client_SOURCES += \
++	hostinfo_unix.cpp \
++	file_names_unix.h
++
 +edit = $(SED) -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g'
 +
-+file_names.h: file_names.h.in Makefile
++file_names_unix.h: file_names_unix.h.in Makefile
 +	$(AM_V_GEN)$(edit) $@.in > $@
 +
-+BUILT_SOURCES = file_names.h
-+CLEANFILES = file_names.h
-+
- boinccmd_SOURCES = boinc_cmd.cpp
-@@ -67,6 +67,7 @@ boinc_client_SOURCES = \
-     current_version.cpp \
-     dhrystone.cpp \
-     dhrystone2.cpp \
-+    file_names.h \
-     file_names.cpp \
-     file_xfer.cpp \
-     gpu_amd.cpp \
-diff --git a/client/file_names.h b/client/file_name.h.in
-similarity index 98%
-rename from client/file_names.h
-rename to client/file_name.h.in
-index 37f9b29..67874e5 100644
++BUILT_SOURCES = file_names_unix.h
++CLEANFILES = file_names_unix.h
+ endif
+ endif
+ boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+diff --git a/client/file_names.h b/client/file_names.h
+index 37f9b29466..3506908067 100644
 --- a/client/file_names.h
-+++ b/client/file_names.h.in
-@@ -97,7 +97,7 @@ extern void send_log_after(const char* filename, double t, MIOFILE& mf);
++++ b/client/file_names.h
+@@ -97,7 +97,11 @@ extern void send_log_after(const char* filename, double t, MIOFILE& mf);
  #define STATE_FILE_PREV             "client_state_prev.xml"
  #define STDERR_FILE_NAME            "stderr.txt"
  #define STDOUT_FILE_NAME            "stdout.txt"
--#define SWITCHER_DIR                "switcher"
-+#define SWITCHER_DIR                "@pkglibexecdir@"
++#if defined(_WIN32) || defined(__APPLE__)
+ #define SWITCHER_DIR                "switcher"
++#else
++#include "file_names_unix.h"
++#endif
  #define SWITCHER_FILE_NAME          "switcher"
  #define TASK_STATE_FILENAME         "boinc_task_state.xml"
  #define TEMP_ACCT_FILE_NAME         "temp_acct.xml"
+diff --git a/client/file_names_unix.h.in b/client/file_names_unix.h.in
+new file mode 100644
+index 0000000000..d29456af91
+--- /dev/null
++++ b/client/file_names_unix.h.in
+@@ -0,0 +1,23 @@
++// This file is part of BOINC.
++// http://boinc.berkeley.edu
++// Copyright (C) 2018 University of California
++//
++// BOINC is free software; you can redistribute it and/or modify it
++// under the terms of the GNU Lesser General Public License
++// as published by the Free Software Foundation,
++// either version 3 of the License, or (at your option) any later version.
++//
++// BOINC is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++// See the GNU Lesser General Public License for more details.
++//
++// You should have received a copy of the GNU Lesser General Public License
++// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
++
++#ifndef BOINC_FILE_NAMES_UNIX_H
++#define BOINC_FILE_NAMES_UNIX_H
++
++#define SWITCHER_DIR                "@pkglibexecdir@"
++
++#endif
 -- 
-2.18.0
+2.19.0
 
diff --git a/sci-misc/boinc/files/0002-Install-missing-tool-for-sandboxing.patch b/sci-misc/boinc/files/0002-Install-missing-tool-for-sandboxing.patch
index fa05160..3b7946f 100644
--- a/sci-misc/boinc/files/0002-Install-missing-tool-for-sandboxing.patch
+++ b/sci-misc/boinc/files/0002-Install-missing-tool-for-sandboxing.patch
@@ -1,4 +1,4 @@
-From 6a337de43686989fe3db07aed3fd5317b9754a8a Mon Sep 17 00:00:00 2001
+From 92280b2b3450827efa280596fdda788b59cdf357 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Thu, 4 Oct 2018 10:31:42 +0200
 Subject: [PATCH 2/3] Install missing tool for sandboxing
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Install missing tool for sandboxing
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/client/Makefile.am b/client/Makefile.am
-index 0fb91d3..06b48df 100644
+index 5cff108abb..6cfc3c4538 100644
 --- a/client/Makefile.am
 +++ b/client/Makefile.am
 @@ -24,7 +24,7 @@ endif
@@ -20,7 +20,7 @@ index 0fb91d3..06b48df 100644
  endif
  
  boinccmd_SOURCES = boinc_cmd.cpp
-@@ -127,6 +127,10 @@ switcher_SOURCES = switcher.cpp
+@@ -137,6 +137,10 @@ switcher_SOURCES = switcher.cpp
  switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib
  switcher_LDADD = $(LIBBOINC)
  
@@ -32,5 +32,5 @@ index 0fb91d3..06b48df 100644
  ## to both be installed properly.  The next two rules do that...
  all-local: boinc$(EXEEXT)
 -- 
-2.18.0
+2.19.0
 
diff --git a/sci-misc/boinc/files/0003-Add-missing-config.h-include-in-setprojectgrp.cpp.patch b/sci-misc/boinc/files/0003-Add-missing-config.h-include-in-setprojectgrp.cpp.patch
index 29fd579..4e556d0 100644
--- a/sci-misc/boinc/files/0003-Add-missing-config.h-include-in-setprojectgrp.cpp.patch
+++ b/sci-misc/boinc/files/0003-Add-missing-config.h-include-in-setprojectgrp.cpp.patch
@@ -1,4 +1,4 @@
-From 5b979fa7f75557b7e246a58290f70601e31db9b9 Mon Sep 17 00:00:00 2001
+From 0faa1ca286eea4f4844abe05f5cf25d80999f836 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Thu, 4 Oct 2018 11:13:35 +0200
 Subject: [PATCH 3/3] Add missing config.h include in setprojectgrp.cpp
@@ -8,7 +8,7 @@ Subject: [PATCH 3/3] Add missing config.h include in setprojectgrp.cpp
  1 file changed, 2 insertions(+)
 
 diff --git a/client/setprojectgrp.cpp b/client/setprojectgrp.cpp
-index 608410d..fcf64d2 100644
+index 608410dc00..fcf64d2055 100644
 --- a/client/setprojectgrp.cpp
 +++ b/client/setprojectgrp.cpp
 @@ -23,6 +23,8 @@
@@ -21,5 +21,5 @@ index 608410d..fcf64d2 100644
  #include <grp.h>
  #include <cstdio>
 -- 
-2.18.0
+2.19.0