[boinc] 04/05: Updating packaging
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Sep 8 13:44:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit a7e7a01196c72630e12abbab0b6a41da72546c33
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Sep 3 21:05:37 2015 +0200
Updating packaging
---
debian/changelog | 14 +-
debian/patches/006_correct_catalog_path.patch | 9 --
debian/patches/Missing_libSched.patch | 65 ----------
debian/patches/boinc-server-dynamic-libs.patch | 34 -----
debian/patches/boinclib_shared.patch | 141 +++++++++++++++++----
debian/patches/disable_new_version_check.patch | 2 +-
.../file_upload_handler_in_sched_linking.patch | 4 +-
debian/patches/fix-underlinking.patch | 65 ++++++----
debian/patches/mmap_mem_only.patch | 119 -----------------
debian/patches/series | 3 -
debian/rules | 1 +
11 files changed, 173 insertions(+), 284 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56c8e50..5dc1958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-boinc (7.6.7+dfsg-1) UNRELEASED; urgency=medium
+boinc (7.6.9+dfsg-1) unstable; urgency=medium
* New upstream release
* link with GLU, to fix another missing library
-
- -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 20 Aug 2015 19:53:21 +0200
+ * Refactor packaging:
+ - debian/clean: clean files leftover during build.
+ - debian/rules: configure with --enable-dynamic-client-linkage
+ - debian/patches/Missing_libSched.patch: deleted
+ - debian/patches/boinc-server-dynamic-libs.patch: deleted
+ - debian/patches/006_correct_catalog_path.patch: delete useless part
+ - debian/patches/boinclib_shared.patch: link in the proper way
+ - debian/patches/file_upload_handler_in_sched_linking.patch: refresh
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 03 Sep 2015 21:04:16 +0200
boinc (7.6.6+dfsg-3exp1) experimental; urgency=medium
diff --git a/debian/patches/006_correct_catalog_path.patch b/debian/patches/006_correct_catalog_path.patch
index 686d1ff..324ca21 100644
--- a/debian/patches/006_correct_catalog_path.patch
+++ b/debian/patches/006_correct_catalog_path.patch
@@ -5,15 +5,6 @@ Index: boinc-6.10.58/locale/Makefile.am
===================================================================
--- boinc-6.10.58.orig/locale/Makefile.am 2010-04-15 20:59:36.000000000 +0200
+++ boinc-6.10.58/locale/Makefile.am 2010-07-13 17:19:39.000000000 +0200
-@@ -2,7 +2,7 @@
-
- include $(top_srcdir)/Makefile.incl
-
--datadir = $(prefix)/share/locale
-+datadir = $(prefix)/share/locale
-
- locale_dirs = \
- ar \
@@ -45,9 +45,9 @@
install-exec-hook:
mydir=$(DESTDIR)$(datadir) ;\
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
deleted file mode 100644
index 7933ce1..0000000
--- a/debian/patches/Missing_libSched.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: help autotools to find the correct sched dynamic shared library.
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -44,7 +44,7 @@
- gui_urls.xml
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../lib/.libs -L../sched
-
- cancel_jobs_SOURCES = cancel_jobs.cpp
- cancel_jobs_LDADD = $(SERVERLIBS)
---- a/vda/Makefile.am
-+++ b/vda/Makefile.am
-@@ -4,7 +4,7 @@
- vda_PROGRAMS = vda vdad ssim
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../lib/.libs -L../sched
-
- vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
- vda_LDADD = $(SERVERLIBS)
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
-@@ -4,7 +4,7 @@
- include $(top_srcdir)/Makefile.incl
-
- AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
--AM_LDFLAGS += -static
-+AM_LDFLAGS += -static -L../lib/.libs/
-
- if ENABLE_LIBRARIES
-
---- a/apps/Makefile.am
-+++ b/apps/Makefile.am
-@@ -8,15 +8,15 @@
-
- upper_case_SOURCES = upper_case.cpp
- upper_case_CXXFLAGS = $(PTHREAD_CFLAGS)
--upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-+upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
- upper_case_LDADD = $(APPLIBS)
-
- concat_SOURCES = concat.cpp
- concat_CXXFLAGS = $(PTHREAD_CFLAGS)
--concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-+concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
- concat_LDADD = $(APPLIBS)
-
- 1sec_SOURCES = 1sec.cpp
- 1sec_CXXFLAGS = $(PTHREAD_CFLAGS)
--1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
-+1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
- 1sec_LDADD = $(APPLIBS)
---- a/clientgui/Makefile.am
-+++ b/clientgui/Makefile.am
-@@ -6,6 +6,7 @@
-
- include $(top_srcdir)/Makefile.incl
-
-+AM_LDFLAGS += -L../lib/.libs
- if ENABLE_CLIENT_RELEASE
- AM_LDFLAGS += -static-libtool-libs
- ## for an entirely statically linked library, you may want to try
diff --git a/debian/patches/boinc-server-dynamic-libs.patch b/debian/patches/boinc-server-dynamic-libs.patch
deleted file mode 100644
index 78c3dcf..0000000
--- a/debian/patches/boinc-server-dynamic-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Making the server packages ship dynamic shared libraries aswell.
---- a/sched/Makefile.am
-+++ b/sched/Makefile.am
-@@ -4,7 +4,7 @@
- include $(top_srcdir)/Makefile.incl
-
- AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
--AM_LDFLAGS += -static -L../lib/.libs/
-+AM_LDFLAGS += -L../lib/.libs/
-
- if ENABLE_LIBRARIES
-
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -44,7 +44,7 @@
- gui_urls.xml
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static -L../lib/.libs -L../sched
-+AM_LDFLAGS += -L../lib/.libs -L../sched
-
- cancel_jobs_SOURCES = cancel_jobs.cpp
- cancel_jobs_LDADD = $(SERVERLIBS)
---- a/vda/Makefile.am
-+++ b/vda/Makefile.am
-@@ -4,7 +4,7 @@
- vda_PROGRAMS = vda vdad ssim
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
--AM_LDFLAGS += -static -L../lib/.libs -L../sched
-+AM_LDFLAGS += -L../lib/.libs -L../sched
-
- vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
- vda_LDADD = $(SERVERLIBS)
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index b0d551b..7647ec7 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,9 +1,11 @@
Description: this patch makes the build system create a dynamic shared library.
Upstream didn't accept this patch because of the unstable api, so this is a
- significative debian delta.
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -172,7 +172,7 @@ lib_LTLIBRARIES = libboinc.la
+ significative Debian delta.
+Index: boinc/lib/Makefile.am
+===================================================================
+--- boinc.orig/lib/Makefile.am
++++ boinc/lib/Makefile.am
+@@ -172,7 +172,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)
@@ -12,7 +14,7 @@ Description: this patch makes the build system create a dynamic shared library.
libboinc_la_LIBADD =
if ENABLE_BOINCCRYPT
-@@ -180,7 +180,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
+@@ -180,7 +180,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)
@@ -21,23 +23,116 @@ Description: this patch makes the build system create a dynamic shared library.
libboinc_crypt_la_LIBADD =
endif
-@@ -252,7 +252,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
- msg_test_LDADD = $(LIBBOINC)
- crypt_prog_SOURCES = crypt_prog.cpp
- crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
--crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
-+crypt_prog_LDADD = -L../lib/.libs $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
- parse_test_SOURCES = parse_test.cpp
- parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
- parse_test_LDADD = $(LIBBOINC)
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -106,7 +106,7 @@
- boinc_client_SOURCES += hostinfo_unix.cpp
- endif
- endif
--boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
-+boinc_client_LDADD = -L../lib/.libs $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+Index: boinc/apps/Makefile.am
+===================================================================
+--- boinc.orig/apps/Makefile.am
++++ boinc/apps/Makefile.am
+@@ -8,15 +8,15 @@
+
+ upper_case_SOURCES = upper_case.cpp
+ upper_case_CXXFLAGS = $(PTHREAD_CFLAGS)
+-upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++upper_case_LDFLAGS = $(PTHREAD_CFLAGS)
+ upper_case_LDADD = $(APPLIBS)
+
+ concat_SOURCES = concat.cpp
+ concat_CXXFLAGS = $(PTHREAD_CFLAGS)
+-concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++concat_LDFLAGS = $(PTHREAD_CFLAGS)
+ concat_LDADD = $(APPLIBS)
+
+ 1sec_SOURCES = 1sec.cpp
+ 1sec_CXXFLAGS = $(PTHREAD_CFLAGS)
+-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
++1sec_LDFLAGS = $(PTHREAD_CFLAGS)
+ 1sec_LDADD = $(APPLIBS)
+Index: boinc/client/Makefile.am
+===================================================================
+--- boinc.orig/client/Makefile.am
++++ boinc/client/Makefile.am
+@@ -4,7 +4,6 @@
+ include $(top_srcdir)/Makefile.incl
+
+ if ENABLE_CLIENT_RELEASE
+- AM_LDFLAGS += -static-libtool-libs
+ ## 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/clientgui/Makefile.am
+===================================================================
+--- boinc.orig/clientgui/Makefile.am
++++ boinc/clientgui/Makefile.am
+@@ -7,7 +7,6 @@
+ include $(top_srcdir)/Makefile.incl
+
+ if ENABLE_CLIENT_RELEASE
+- AM_LDFLAGS += -static-libtool-libs
+ ## 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/clientscr/Makefile.am
+===================================================================
+--- boinc.orig/clientscr/Makefile.am
++++ boinc/clientscr/Makefile.am
+@@ -5,7 +5,6 @@
+
+ AM_LDFLAGS += -lpthread
+ if ENABLE_CLIENT_RELEASE
+- AM_LDFLAGS += -static-libtool-libs
+ ## 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.
+--- boinc-7.6.7+dfsg.orig/dcapi/boinc/Makefile.am
++++ boinc-7.6.7+dfsg/dcapi/boinc/Makefile.am
+@@ -36,4 +36,3 @@ libdcapi_client_boinc_la_LIBADD = \
+ ../common/libdcapi-common-client.la \
+ $(BOINC_CLIENT_LIBS)
+ libdcapi_client_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_CPPFLAGS)
+-libdcapi_client_boinc_la_LDFLAGS = -static
+--- boinc-7.6.7+dfsg.orig/dcapi/condor/Makefile.am
++++ boinc-7.6.7+dfsg/dcapi/condor/Makefile.am
+@@ -42,7 +42,6 @@ libdcapi_client_condor_la_SOURCES = cond
+ condor_utils.c
+
+ libdcapi_client_condor_la_LIBADD = ../common/libdcapi-common-client.la
+-libdcapi_client_condor_la_LDFLAGS = -static
+
+ #appdir = $(libdir)/dcapi/condor
+ #app_PROGRAMS = tss tm
+--- boinc-7.6.7+dfsg.orig/dcapi/local/Makefile.am
++++ boinc-7.6.7+dfsg/dcapi/local/Makefile.am
+@@ -35,4 +35,3 @@ libdcapi_client_local_la_SOURCES = \
+ local_utils.c \
+ local_common.c
+ libdcapi_client_local_la_LIBADD = ../common/libdcapi-common-client.la
+-libdcapi_client_local_la_LDFLAGS = -static
+--- boinc-7.6.7+dfsg.orig/sched/Makefile.am
++++ boinc-7.6.7+dfsg/sched/Makefile.am
+@@ -4,7 +4,6 @@
+ include $(top_srcdir)/Makefile.incl
+
+ AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
+-AM_LDFLAGS += -static
+
+ if ENABLE_LIBRARIES
+
+--- boinc-7.6.7+dfsg.orig/tools/Makefile.am
++++ boinc-7.6.7+dfsg/tools/Makefile.am
+@@ -44,7 +44,6 @@ dist_tools_DATA = \
+ gui_urls.xml
+
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+-AM_LDFLAGS += -static
+
+ cancel_jobs_SOURCES = cancel_jobs.cpp
+ cancel_jobs_LDADD = $(SERVERLIBS)
+--- boinc-7.6.7+dfsg.orig/vda/Makefile.am
++++ boinc-7.6.7+dfsg/vda/Makefile.am
+@@ -4,7 +4,6 @@ vdadir=$(prefix)/lib/boinc-server-maker/
+ vda_PROGRAMS = vda vdad ssim
- boinc_clientdir = $(bindir)
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+-AM_LDFLAGS += -static
+ vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
+ vda_LDADD = $(SERVERLIBS)
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 403faaa..e7f3564 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
-@@ -526,7 +526,7 @@
+@@ -528,7 +528,7 @@
// inform the user if there's a newer version of client
//
diff --git a/debian/patches/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 0708fc8..87a61c6 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,7 +1,7 @@
Description: Link LIBBOINC to some binary needing it.
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
-@@ -278,7 +278,7 @@
+@@ -277,7 +277,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
@@ -10,7 +10,7 @@ Description: Link LIBBOINC to some binary needing it.
make_work_SOURCES = make_work.cpp
make_work_LDADD = $(SERVERLIBS)
-@@ -320,7 +320,7 @@
+@@ -319,7 +319,7 @@
sched_config.cpp \
sched_msgs.cpp
fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
diff --git a/debian/patches/fix-underlinking.patch b/debian/patches/fix-underlinking.patch
index 739bde8..32f08de 100644
--- a/debian/patches/fix-underlinking.patch
+++ b/debian/patches/fix-underlinking.patch
@@ -2,69 +2,84 @@ Description: this should fix some underlinking on boinc, leading to some warning
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Bug-Debian: https://bugs.debian.org/794107
---- boinc-7.6.6+dfsg.orig/api/Makefile.am
-+++ boinc-7.6.6+dfsg/api/Makefile.am
-@@ -43,18 +43,18 @@ endif
+Index: boinc/api/Makefile.am
+===================================================================
+--- boinc.orig/api/Makefile.am
++++ boinc/api/Makefile.am
+@@ -43,18 +43,21 @@
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 -L../lib/.libs $(LIBBOINC)
++libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -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 -lGL -lGLU -lglut -L../lib/.libs $(LIBBOINC)
++libboinc_graphics2_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -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) -L../lib/.libs $(LIBBOINC) -lboinc_api
++libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
++libboinc_opencl_la_LIBADD = -L../lib/.libs $(APPLIBS)
if INSTALL_HEADERS
## install only headers that are meant for exporting the API !!
---- boinc-7.6.6+dfsg.orig/lib/Makefile.am
-+++ boinc-7.6.6+dfsg/lib/Makefile.am
-@@ -180,7 +180,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
+Index: boinc/lib/Makefile.am
+===================================================================
+--- boinc.orig/lib/Makefile.am
++++ boinc/lib/Makefile.am
+@@ -180,8 +180,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 = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS) $(LIBBOINC)
- libboinc_crypt_la_LIBADD =
+-libboinc_crypt_la_LIBADD =
++libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
++libboinc_crypt_la_LIBADD = $(LIBBOINC)
endif
---- boinc-7.6.6+dfsg.orig/sched/Makefile.am
-+++ boinc-7.6.6+dfsg/sched/Makefile.am
-@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libsched.la
+ if ENABLE_FCGI
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am
++++ boinc/sched/Makefile.am
+@@ -25,8 +25,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= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(MYSQL_LIBS) $(LIBBOINC)
- libsched_la_LIBADD= $(SSL_LIBS)
+-libsched_la_LIBADD= $(SSL_LIBS)
++libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(MYSQL_LIBS) $(SSL_LIBS)
++libsched_la_LIBADD= $(LIBBOINC)
## install only headers that are meant for exporting the API !!
-@@ -48,7 +48,7 @@ lib_LTLIBRARIES += libsched_fcgi.la
- libsched_fcgi_la_SOURCES = $(libsched_sources)
+ if INSTALL_HEADERS
+@@ -48,7 +48,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= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) $(BOINC_CRYPT)
- libsched_fcgi_la_LIBADD=
+ libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libsched_fcgi_la_LIBADD=
++libsched_fcgi_la_LIBADD= $(BOINC_CRYPT)
endif
---- boinc-7.6.6+dfsg.orig/zip/Makefile.am
-+++ boinc-7.6.6+dfsg/zip/Makefile.am
-@@ -62,7 +62,7 @@ endif
+ # end of "if ENABLE_FCGI"
+Index: boinc/zip/Makefile.am
+===================================================================
+--- boinc.orig/zip/Makefile.am
++++ 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_LIBADD =
-+libboinc_zip_la_LIBADD = -L../lib/.libs $(LIBBOINC)
++libboinc_zip_la_LIBADD = $(LIBBOINC)
# Some OSs may not prefix libraries with lib.
# For example OS2
diff --git a/debian/patches/mmap_mem_only.patch b/debian/patches/mmap_mem_only.patch
deleted file mode 100644
index dc56a7f..0000000
--- a/debian/patches/mmap_mem_only.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: boinc_debian/lib/shmem.cpp
-===================================================================
---- boinc_debian.orig/lib/shmem.cpp
-+++ boinc_debian/lib/shmem.cpp
-@@ -308,9 +308,8 @@
-
- // V6 mmap() shared memory for Unix/Linux/Mac
- //
--int create_shmem_mmap(const char *path, size_t size, void** pp) {
-+int create_shmem_mmap(const char *const path, size_t size, void** pp) {
- int fd, retval;
-- struct stat sbuf;
-
- // Return NULL pointer if create_shmem fails
- *pp = 0;
-@@ -324,26 +323,12 @@
- // it's a big headache for anyone it affects,
- // and it's not a significant security issue.
- //
-- fd = open(path, O_RDWR | O_CREAT, 0666);
-+ fd = shm_open(path, O_TRUNC | O_RDWR | O_CREAT, 0666);
- if (fd < 0) return ERR_SHMGET;
-
-- retval = fstat(fd, &sbuf);
-- if (retval) {
-- close(fd);
-- return ERR_SHMGET;
-- }
-- if (sbuf.st_size < (long)size) {
-- // The following 2 lines extend the file and clear its new
-- // area to all zeros because they write beyond the old EOF.
-- // See the lseek man page for details.
-- lseek(fd, size-1, SEEK_SET);
-- if (! write(fd, "\0", 1)) {
-- close(fd);
-- return ERR_SHMGET;
-- }
-- }
-+ if (0>ftruncate(fd,size)) return ERR_SHMGET;
-
-- *pp = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, fd, 0);
-+ *pp = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
- close(fd);
-
-@@ -360,13 +345,13 @@
- }
-
-
--int attach_shmem_mmap(const char *path, void** pp) {
-+int attach_shmem_mmap(const char *const path, void** pp) {
- int fd, retval;
- struct stat sbuf;
-
- // Return NULL pointer if attach_shmem fails
- *pp = 0;
-- fd = open(path, O_RDWR);
-+ fd = shm_open(path, O_RDWR, 0666);
- if (fd < 0) return ERR_SHMGET;
-
- retval = fstat(fd, &sbuf);
-@@ -392,8 +377,10 @@
- }
-
-
--int detach_shmem_mmap(void* p, size_t size) {
-- return munmap((char *)p, size);
-+int detach_shmem_mmap(const char* const memname, void* p, size_t size) {
-+ int i=munmap((char *)p, size);
-+ if (0==i) shm_unlink(memname);
-+ return i;
- }
-
- #if HAVE_SYS_SHM_H
-Index: boinc_debian/lib/shmem.h
-===================================================================
---- boinc_debian.orig/lib/shmem.h
-+++ boinc_debian/lib/shmem.h
-@@ -42,9 +42,9 @@
- #else
- #ifndef __EMX__
- #define MMAPPED_FILE_NAME "boinc_mmap_file"
--extern int create_shmem_mmap(const char *path, size_t size, void** pp);
--extern int attach_shmem_mmap(const char *path, void** pp);
--extern int detach_shmem_mmap(void* p, size_t size);
-+extern int create_shmem_mmap(const char *const path, size_t size, void** pp);
-+extern int attach_shmem_mmap(const char *const path, void** pp);
-+extern int detach_shmem_mmap(const char* const path, void* p, size_t size);
- #endif
- extern int create_shmem(key_t, int size, gid_t gid, void**);
- extern int attach_shmem(key_t, void**);
-Index: boinc_debian/client/app.cpp
-===================================================================
---- boinc_debian.orig/client/app.cpp
-+++ boinc_debian/client/app.cpp
-@@ -211,7 +211,9 @@
- if (app_client_shm.shm) {
- #ifndef __EMX__
- if (app_version->api_major_version() >= 6) {
-- retval = detach_shmem_mmap(app_client_shm.shm, sizeof(SHARED_MEM));
-+ char buf[MAXPATHLEN];
-+ sprintf(buf, "%s/%s", slot_dir, MMAPPED_FILE_NAME);
-+ retval = detach_shmem_mmap(buf, app_client_shm.shm, sizeof(SHARED_MEM));
- } else
- #endif
- {
-Index: boinc_debian/Makefile.incl
-===================================================================
---- boinc_debian.orig/Makefile.incl
-+++ boinc_debian/Makefile.incl
-@@ -44,7 +44,7 @@
- LIBSCHED_FCGI = -lsched_fcgi
- $(LIBSCHED_FCGI):
- cd $(top_builddir)/sched; ${MAKE} libsched_fcgi.la
--LIBBOINC = -lboinc
-+LIBBOINC = -lboinc -lrt
- $(LIBBOINC):
- cd $(top_builddir)/lib; ${MAKE} libboinc.la
- LIBBOINC_CRYPT = -lboinc_crypt
diff --git a/debian/patches/series b/debian/patches/series
index f71b981..dee3e12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@ rrsim_iterator_cppcheck.patch
filesys_error_message.patch
de.po.patch
more_clang_warnings.patch
-#mmap_mem_only.patch
add-ldflags.patch
addressing_additional_html_dirs.patch
gui_urls_xml_added_to_Makefile.patch
@@ -23,8 +22,6 @@ gui_urls_xml_added_to_Makefile.patch
make_project_overcomes_Apache24_security.patch
#debian specific patches
boinclib_shared.patch
-Missing_libSched.patch
-boinc-server-dynamic-libs.patch
disable_new_version_check.patch
disable_svn_version.patch
AdjustBoincTopdirPython.patch
diff --git a/debian/rules b/debian/rules
index 32341e7..4865d7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,6 +174,7 @@ CFGFLAGS_boinc-client = \
--enable-libraries \
--enable-unicode \
--enable-shared \
+ --enable-dynamic-client-linkage \
--with-ssl \
--with-x \
CFLAGS="$(CFLAGS_boinc-client)" \
--
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