Accepting request 1184357 from network

fix for bnc#1227092 (forwarded request 1184356 from computersalat) OBS-URL: https://build.opensuse.org/request/show/1184357 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=63
2024-07-02 16:17:46 +00:00
parent 8c2436c489 df9a4995d5
commit 282cd4e6ac
7 changed files with 59 additions and 36 deletions
--- a/boinc-client.changes
+++ b/boinc-client.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jun 27 11:43:32 UTC 2024 - chris@computersalat.de
+
+- fix for bnc#1227092
+  * Add WorkingDirectory= to unit file
+- Add further Variables to unit file
+  +ProtectSystem=full
+  +ProtectControlGroups=true
+  +ReadWritePaths=-$BOINC_BOINC_DIR
+- rebase patches
+  * boinc-docbook2x.patch
+  * build-client-scripts.patch
+  * libboinc-shared.patch
+  * xlocale.patch
+
 -------------------------------------------------------------------
 Sun May 26 21:39:07 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

--- a/boinc-client.service
+++ b/boinc-client.service
@@ -9,6 +9,10 @@ EnvironmentFile=-/etc/sysconfig/boinc-client
 Nice=10
 User=boinc
 ProtectHome=true
+ProtectSystem=full
+ProtectControlGroups=true
+ReadWritePaths=-$BOINC_BOINC_DIR
+WorkingDirectory=$BOINC_BOINC_DIR
 CPUSchedulingPolicy=batch
 Slice=background.slice
 ### boinc logs (with --redirectio) to stdoutdae.txt and stderrdae.txt
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -138,7 +138,7 @@ This package contains development files for libboinc.

 %prep
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-%autosetup -p1 -n %{name}_release-%{minor_version}-%{version} -D
+%autosetup -p0 -n %{name}_release-%{minor_version}-%{version} -D

 %build
 # Fix default path for boincscr
--- a/boinc-docbook2x.patch
+++ b/boinc-docbook2x.patch
@@ -8,11 +8,11 @@ of docbook2x-man.
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-Index: boinc-client_release-7.22-7.22.0/configure.ac
+Index: configure.ac
 ===================================================================
--- boinc-client_release-7.22-7.22.0.orig/configure.ac
-+++ boinc-client_release-7.22-7.22.0/configure.ac
-@@ -375,7 +375,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`])
+--- configure.ac.orig
+++ configure.ac
+@@ -378,7 +378,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`])
 dnl Check for docbook2x-man, which we use to create the manpages in
 dnl doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build
 dnl the manpages only if docbook2x-man is available.
--- a/build-client-scripts.patch
+++ b/build-client-scripts.patch
@@ -1,5 +1,7 @@
--- a/client/scripts/Makefile.am
-+++ b/client/scripts/Makefile.am
+Index: client/scripts/Makefile.am
+===================================================================
+--- client/scripts/Makefile.am.orig
+++ client/scripts/Makefile.am
@@ -1,5 +1,7 @@
 ## -*- mode: makefile; tab-width: 4 -*-
 
--- a/libboinc-shared.patch
+++ b/libboinc-shared.patch
@@ -18,10 +18,10 @@ dynamic linking for the client.
 vda/Makefile.am       |    1 -
 9 files changed, 8 insertions(+), 14 deletions(-)

-Index: boinc-client_release-8.0-8.0.2/api/Makefile.am
+Index: api/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/api/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/api/Makefile.am
+--- api/Makefile.am.orig
+++ api/Makefile.am
@@ -44,20 +44,20 @@ endif
 lib_LTLIBRARIES = libboinc_api.la
 pkgconfig_DATA = libboinc_api.pc
@@ -46,10 +46,10 @@ Index: boinc-client_release-8.0-8.0.2/api/Makefile.am
 
 if INSTALL_HEADERS
 ## install only headers that are meant for exporting the API !!
-Index: boinc-client_release-8.0-8.0.2/apps/Makefile.am
+Index: apps/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/apps/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/apps/Makefile.am
+--- apps/Makefile.am.orig
+++ apps/Makefile.am
@@ -8,15 +8,15 @@ example_PROGRAMS = uppercase concat 1sec
 
 uppercase_SOURCES = uppercase.cpp
@@ -69,10 +69,10 @@ Index: boinc-client_release-8.0-8.0.2/apps/Makefile.am
 -1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
 +1sec_LDFLAGS = $(PTHREAD_CFLAGS)
 1sec_LDADD = $(APPLIBS)
-Index: boinc-client_release-8.0-8.0.2/client/Makefile.am
+Index: client/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/client/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/client/Makefile.am
+--- client/Makefile.am.orig
+++ client/Makefile.am
@@ -6,7 +6,6 @@ CXXFLAGS := $(filter-out -mfpu=vfpv3-d16
 include $(top_srcdir)/Makefile.incl
 
@@ -81,10 +81,10 @@ Index: boinc-client_release-8.0-8.0.2/client/Makefile.am
 ## for an entirely statically linked library, you may want to try
 ## -all-static instead.  There's a good chance it won't work properly,
 ## so we'll use the safer "-static-libtool-libs" by default.
-Index: boinc-client_release-8.0-8.0.2/clientgui/Makefile.am
+Index: clientgui/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/clientgui/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/clientgui/Makefile.am
+--- clientgui/Makefile.am.orig
+++ clientgui/Makefile.am
@@ -7,7 +7,6 @@
 include $(top_srcdir)/Makefile.incl
 
@@ -93,10 +93,10 @@ Index: boinc-client_release-8.0-8.0.2/clientgui/Makefile.am
 ## for an entirely statically linked library, you may want to try
 ## -all-static instead.  There's a good chance it won't work properly,
 ## so we'll use the safer "-static-libtool-libs" by default.
-Index: boinc-client_release-8.0-8.0.2/clientscr/Makefile.am
+Index: clientscr/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/clientscr/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/clientscr/Makefile.am
+--- clientscr/Makefile.am.orig
+++ clientscr/Makefile.am
@@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.incl
 
 AM_LDFLAGS += -lpthread
@@ -105,10 +105,10 @@ Index: boinc-client_release-8.0-8.0.2/clientscr/Makefile.am
 ## for an entirely statically linked library, you may want to try
 ## -all-static instead.  There's a good chance it won't work properly,
 ## so we'll use the safer "-static-libtool-libs" by default.
-Index: boinc-client_release-8.0-8.0.2/lib/Makefile.am
+Index: lib/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/lib/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/lib/Makefile.am
+--- lib/Makefile.am.orig
+++ lib/Makefile.am
@@ -184,7 +184,7 @@ pkgconfig_DATA = libboinc.pc
 libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
 libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -127,10 +127,10 @@ Index: boinc-client_release-8.0-8.0.2/lib/Makefile.am
 libboinc_crypt_la_LIBADD =
 endif
 
-Index: boinc-client_release-8.0-8.0.2/sched/Makefile.am
+Index: sched/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/sched/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/sched/Makefile.am
+--- sched/Makefile.am.orig
+++ sched/Makefile.am
@@ -4,7 +4,6 @@
 include $(top_srcdir)/Makefile.incl
 
@@ -139,10 +139,10 @@ Index: boinc-client_release-8.0-8.0.2/sched/Makefile.am
 
 if ENABLE_LIBRARIES
 
-Index: boinc-client_release-8.0-8.0.2/tools/Makefile.am
+Index: tools/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/tools/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/tools/Makefile.am
+--- tools/Makefile.am.orig
+++ tools/Makefile.am
@@ -43,7 +43,6 @@ dist_tools_DATA = \
     gui_urls.xml
 
@@ -151,10 +151,10 @@ Index: boinc-client_release-8.0-8.0.2/tools/Makefile.am
 
 cancel_jobs_SOURCES = cancel_jobs.cpp
 cancel_jobs_LDADD = $(SERVERLIBS)
-Index: boinc-client_release-8.0-8.0.2/vda/Makefile.am
+Index: vda/Makefile.am
 ===================================================================
--- boinc-client_release-8.0-8.0.2.orig/vda/Makefile.am
-+++ boinc-client_release-8.0-8.0.2/vda/Makefile.am
+--- vda/Makefile.am.orig
+++ vda/Makefile.am
@@ -4,7 +4,6 @@ vdadir=$(libexecdir)/boinc-server-maker/
 vda_PROGRAMS = vda vdad ssim
 
--- a/xlocale.patch
+++ b/xlocale.patch
@@ -8,8 +8,10 @@ glibc-2.26 has dropped xlocale.h.
 clientgui/AsyncRPC.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/clientgui/AsyncRPC.cpp
-+++ b/clientgui/AsyncRPC.cpp
+Index: clientgui/AsyncRPC.cpp
+===================================================================
+--- clientgui/AsyncRPC.cpp.orig
+++ clientgui/AsyncRPC.cpp
@@ -24,9 +24,7 @@
 #endif
 #include "config.h"