[SCM] BOINC packaging branch, debian-folder-release, updated. c251009caf95a5bcff9b4c83636cf19fc21f5e68
Steffen Moeller
steffen_moeller at gmx.de
Mon Mar 4 12:56:54 UTC 2013
The following commit has been merged in the debian-folder-release branch:
commit 877652ec9a2ea18ce03f5a0ca834488322b56e2e
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Mon Mar 4 13:49:40 2013 +0100
Merged recent copy from alioth/master branch
diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 2f94aad..1c52e78 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -104,6 +104,9 @@ start()
if is_running; then
log_progress_msg "already running"
else
+ # workaround for ubuntu bug #933354
+ log_progress_msg "sleeping a little bit in order to let graphics start"
+ sleep 5
if [ -n "$DISPLAY" -a -x /usr/bin/xhost ]; then
# grant the boinc client to perform GPU computing
xhost local:boinc || echo -n "xhost error ignored, GPU computing may not be possible"
diff --git a/debian/boinc-server-maker.examples b/debian/boinc-server-maker.examples
index ff556c6..8b251f6 100644
--- a/debian/boinc-server-maker.examples
+++ b/debian/boinc-server-maker.examples
@@ -20,9 +20,9 @@ samples/image_libs/bmplib.cpp
samples/image_libs/bmplib.h
samples/image_libs/tgalib.cpp
samples/image_libs/tgalib.h
-samples/mac_build
-samples/mac_build/UpperCase2.xcodeproj
-samples/mac_build/UpperCase2.xcodeproj/project.pbxproj
+#samples/mac_build
+#samples/mac_build/UpperCase2.xcodeproj
+#samples/mac_build/UpperCase2.xcodeproj/project.pbxproj
samples/multi_thread
samples/multi_thread/Makefile
samples/multi_thread/multi_thread.cpp
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 2f63131..83af3b9 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -115,4 +115,6 @@ usr/bin/crypt_prog usr/lib/boinc-server/bin
#usr/libexec/sched usr/lib/boinc-server
+# Only built together with server
+usr/lib/libboinc_zip.so.* usr/lib
diff --git a/debian/changelog b/debian/changelog
index 9b18858..62f03e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,106 @@
+boinc (7.0.53+dfsg-1) UNRELEASED; urgency=low
+
+ [ Gianfranco Costamagna ]
+ * New upstream release.
+ * Added boincmgr_fix_long_pointers.patch to fix boincmgr crash
+ Thanks Alyssa Milburn (Closes: #679207)
+ * Added sleep to boinc-client init script to workaround GPU
+ detection issues (lp: #933354).
+
+ [ Guo Yixuan ]
+ * Reverted the workaround for #679207.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sun, 24 Feb 2013 23:05:30 +0100
+
+boinc (7.0.52+dfsg-2) experimental; urgency=low
+
+ * Try to fix ftbfs on hurd-i386.
+ * Rebuild against libc6 2.13 (in sid).
+
+ -- Guo Yixuan <culu.gyx at gmail.com> Wed, 20 Feb 2013 16:16:45 +0800
+
+boinc (7.0.52+dfsg-1) experimental; urgency=low
+
+ * New upstream release, all platforms.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 14 Feb 2013 16:54:55 +0100
+
+boinc (7.0.51+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 13 Feb 2013 22:15:44 +0100
+
+boinc (7.0.50+dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 09 Feb 2013 13:38:34 +0100
+
+boinc (7.0.48+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 08 Feb 2013 15:42:50 +0100
+
+boinc (7.0.47+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release, l10n updated.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Thu, 31 Jan 2013 22:09:35 +0100
+
+boinc (7.0.46+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Fixed a FTBFS when building without zip library. (Closes: #699789)
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Tue, 29 Jan 2013 23:46:33 +0100
+
+boinc (7.0.45+dfsg-1) experimental; urgency=low
+
+ * New upstream release
+ * Removed boinc zip library from client builds.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Fri, 25 Jan 2013 00:01:24 +0100
+
+boinc (7.0.44+dfsg-1) UNRELEASED; urgency=low
+
+ [ Gianfranco Costamagna ]
+ * New upstream release
+ * Added libxext-dev and libxcb-dpms0-dev in order to address a long time
+ bug. (lp: #179849)
+
+ [ Guo Yixuan ]
+ * Added libx11-dev to build-deps. (It's used directly in
+ client/hostinfo_unix.cpp.)
+ * link_with_gold.patch: patched configure.ac to add -lX11 for linking client
+ with ld.gold.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 09 Jan 2013 17:40:34 +0100
+
boinc (7.0.42+dfsg-1) UNRELEASED; urgency=low
* New upstream release
- * Revised some patches
+ * Revised some patches.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 12 Dec 2012 01:53:09 +0100
boinc (7.0.40+dfsg-1) UNRELEASED; urgency=low
* New upstream release
- * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream) and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
+ * Dropped mac_addresses_cores_in_kfreebsd.patch (file to patch deleted upstream)
+ and ensure_there_is_no_newline_in_passwd.patch (applied upstream)
* Revised slot_dir_source_trace.patch
- * Removed some old patches
+ * Removed some old patches.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 08 Dec 2012 01:26:23 +0100
boinc (7.0.39+dfsg-1) UNRELEASED; urgency=low
* New upstram release
- * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch already applied upstream
- * Added link time optimisation
+ * Dropped add-missing-test-files.patch and add-missing-stripchart-samples.patch patch
+ already applied upstream
+ * Added link time optimisation.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 26 Nov 2012 00:11:23 +0100
@@ -27,7 +109,7 @@ boinc (7.0.38+dfsg-1) UNRELEASED; urgency=low
* New upstream release
* Revised some patches (some of them should will be removed in a future commit)
* Added add-missing-test-files.patch to fix a FTBFS
- * Added add-missing-stripchart-samples.patch to fix another FTBFS
+ * Added add-missing-stripchart-samples.patch to fix another FTBFS.
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Mon, 05 Nov 2012 13:16:32 +0100
@@ -37,7 +119,7 @@ boinc (7.0.36+dfsg-3) UNRELEASED; urgency=low
* Added Gianfranco to uploaders.
[ Gianfranco Costamagna ]
- * Added missing_libs_wrapper.patch to fix a FTBFS on ubuntu 13.04 raring
+ * Added missing_libs_wrapper.patch to fix a FTBFS on ubuntu 13.04
* added boinc-ftbfs-hurd.patch from upstream
[ Guo Yixuan ]
diff --git a/debian/copyright b/debian/copyright
index 2f28fdf..286ea70 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -155,7 +155,7 @@ License: LGPL-2.1+, other
Files: client/os2/boinc_attach.cmd
Copyright: © 2005 Yuri Dario
-License: PD
+License: LGPL-3+
Files: clientgui/wizardex.*
Copyright: © 1999 Vadim Zeitlin <zeitlin at dptmaths.ens-cachan.fr>
@@ -175,7 +175,7 @@ License: wxWindows-3
Files: doc/manpages/*.xml
Copyright: © 2007-2008 University of California
-License: GFDL-1.2+
+License: GFDL-NIV-1.2+
Files: html/inc/geoip.inc
Copyright: © 2004 MaxMind LLC
@@ -642,10 +642,46 @@ License: GPL-2+
License: LGPL-3+
+ 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/>.
+ .
On Debian systems, the complete text of the GNU Lesser General Public License
can be found in `/usr/share/common-licenses/LGPL-3'.
-License: GFDL-1.2+
+License: LGPL-2.1+
+ This library 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 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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 this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: GFDL-NIV-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+ any later version published by the Free Software Foundation; with no
+ Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
On Debian systems, the complete text of the GNU Free Documentation License can
be found in `/usr/share/common-licenses/GFDL-1.2'.
diff --git a/debian/libboinc-app7.install b/debian/libboinc-app7.install
index 47fccbd..dde05f6 100644
--- a/debian/libboinc-app7.install
+++ b/debian/libboinc-app7.install
@@ -1,4 +1,5 @@
usr/lib/libboinc_api.so.* usr/lib
usr/lib/libboinc_graphics2.so.* usr/lib
usr/lib/libboinc_opencl.so.* usr/lib
-usr/lib/libboinc_zip.so.* usr/lib
+# only for server builds, moved to boinc-server-maker
+#usr/lib/libboinc_zip.so.* usr/lib
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index f666548..492f808 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -1,10 +1,8 @@
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.
-Index: boinc/clientgui/MainDocument.cpp
-===================================================================
---- boinc.orig/clientgui/MainDocument.cpp 2012-03-30 23:42:06.944079056 +0200
-+++ boinc/clientgui/MainDocument.cpp 2012-03-30 23:47:44.963448069 +0200
-@@ -1634,20 +1634,20 @@
+--- a/clientgui/MainDocument.cpp
++++ b/clientgui/MainDocument.cpp
+@@ -1643,20 +1643,20 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -33,7 +31,7 @@ Index: boinc/clientgui/MainDocument.cpp
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1657,6 +1657,10 @@
+@@ -1666,6 +1666,10 @@
0,
id
);
@@ -44,5 +42,3 @@ Index: boinc/clientgui/MainDocument.cpp
} else {
kill_program(pid);
}
-Index: boinc/lib/util.cpp
-===================================================================
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 5972f37..036b124 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,7 +1,5 @@
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/tools/Makefile.am 2012-07-08 20:36:51.027526800 +0200
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
@@ -24,7 +24,7 @@
run_in_ops
@@ -11,10 +9,8 @@ Index: boinc/tools/Makefile.am
cancel_jobs_SOURCES = cancel_jobs.cpp
cancel_jobs_LDADD = $(SERVERLIBS)
-Index: boinc/vda/Makefile.am
-===================================================================
---- boinc.orig/vda/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/vda/Makefile.am 2012-07-08 20:36:51.035526690 +0200
+--- a/vda/Makefile.am
++++ b/vda/Makefile.am
@@ -3,7 +3,7 @@
bin_PROGRAMS = vda vdad ssim
@@ -22,12 +18,10 @@ Index: boinc/vda/Makefile.am
-AM_LDFLAGS += -static
+AM_LDFLAGS += -static -L../lib/.libs -L../sched
- vda_SOURCES = vda.cpp vda_policy.cpp
+ vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
vda_LDADD = $(SERVERLIBS)
-Index: boinc/sched/Makefile.am
-===================================================================
---- boinc.orig/sched/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/sched/Makefile.am 2012-07-08 20:36:51.039526636 +0200
+--- a/sched/Makefile.am
++++ b/sched/Makefile.am
@@ -4,7 +4,7 @@
include $(top_srcdir)/Makefile.incl
@@ -37,10 +31,8 @@ Index: boinc/sched/Makefile.am
if ENABLE_LIBRARIES
-Index: boinc/apps/Makefile.am
-===================================================================
---- boinc.orig/apps/Makefile.am 2012-07-08 20:36:42.483643292 +0200
-+++ boinc/apps/Makefile.am 2012-07-08 20:36:51.043526582 +0200
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
@@ -8,15 +8,15 @@
upper_case_SOURCES = upper_case.cpp
@@ -60,10 +52,8 @@ Index: boinc/apps/Makefile.am
-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
+1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS) -L../api/.libs -L../lib/.libs
1sec_LDADD = $(APPLIBS)
-Index: boinc/clientgui/Makefile.am
-===================================================================
---- boinc.orig/clientgui/Makefile.am 2012-07-08 20:10:13.000000000 +0200
-+++ boinc/clientgui/Makefile.am 2012-07-08 20:38:08.338472678 +0200
+--- a/clientgui/Makefile.am
++++ b/clientgui/Makefile.am
@@ -3,6 +3,7 @@
include $(top_srcdir)/Makefile.incl
diff --git a/debian/patches/add_hardening_flags.patch b/debian/patches/add_hardening_flags.patch
index 9ec11f0..f844dcf 100644
--- a/debian/patches/add_hardening_flags.patch
+++ b/debian/patches/add_hardening_flags.patch
@@ -2,10 +2,8 @@ Author: Guo Yixuan <culu.gyx at gmail.com>
Description: Add standard flags to custom Makefiles
There're several hand-written Makefiles among other Makefiles by automake, they don't take
CXXFLAGS and CPPFLAGS from environment.
-Index: boinc/samples/sleeper/Makefile
-===================================================================
---- boinc.orig/samples/sleeper/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/sleeper/Makefile 2012-06-24 22:01:09.745618530 +0800
+--- a/samples/sleeper/Makefile
++++ b/samples/sleeper/Makefile
@@ -4,7 +4,7 @@
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@@ -21,20 +19,18 @@ Index: boinc/samples/sleeper/Makefile
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
-Index: boinc/samples/example_app/Makefile
-===================================================================
---- boinc.orig/samples/example_app/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/example_app/Makefile 2012-06-24 22:00:45.305617579 +0800
-@@ -4,7 +4,7 @@
- BOINC_API_DIR = $(BOINC_DIR)/api
- BOINC_LIB_DIR = $(BOINC_DIR)/lib
+--- a/samples/example_app/Makefile
++++ b/samples/example_app/Makefile
+@@ -6,7 +6,7 @@
+ BOINC_ZIP_DIR = $(BOINC_DIR)/zip
+ FREETYPE_DIR = /usr/include/freetype2
-CXXFLAGS = -g \
+CXXFLAGS += -g \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-DAPP_GRAPHICS \
-I$(BOINC_DIR) \
-@@ -47,12 +47,12 @@
+@@ -62,12 +62,12 @@
# because otherwise you might get a version in /usr/lib etc.
uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
@@ -43,16 +39,14 @@ Index: boinc/samples/example_app/Makefile
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a
- uc2_graphics: uc2_graphics.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
-- $(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
+ uc2_graphics: uc2_graphics.o ttfont.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
+- $(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o uc2_graphics uc2_graphics.o ttfont.o libstdc++.a -pthread \
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
-Index: boinc/samples/worker/Makefile
-===================================================================
---- boinc.orig/samples/worker/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/worker/Makefile 2012-06-24 22:01:23.257619057 +0800
+--- a/samples/worker/Makefile
++++ b/samples/worker/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS = -g
+CXXFLAGS += -g
@@ -65,22 +59,20 @@ Index: boinc/samples/worker/Makefile
worker: worker.o
- g++ $(CXXFLAGS) -o worker worker.o
+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile 2012-06-24 21:56:27.000000000 +0800
-+++ boinc/samples/wrapper/Makefile 2012-06-24 22:01:43.641619849 +0800
-@@ -5,7 +5,7 @@
- BOINC_API_DIR = $(BOINC_DIR)/api
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
+@@ -6,7 +6,7 @@
BOINC_LIB_DIR = $(BOINC_DIR)/lib
+ BOINC_ZIP_DIR = $(BOINC_DIR)/zip
--CXXFLAGS = -g \
-+CXXFLAGS += -g \
+-CXXFLAGS = -g -O0 \
++CXXFLAGS += -g -O0 \
-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
-I$(BOINC_DIR) \
-I$(BOINC_LIB_DIR) \
-@@ -28,4 +28,4 @@
- /bin/rm -f $(PROGS) *.o libstdc++.a
+@@ -38,4 +38,4 @@
+ regexp_report.o
- wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-- g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
-+ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
+ wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
+- g++ $(CXXFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
++ g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a -pthread -lboinc_api -lboinc -lboinc_zip
diff --git a/debian/patches/api_NULL_not_defined.patch b/debian/patches/api_NULL_not_defined.patch
index cd6668b..af18795 100644
--- a/debian/patches/api_NULL_not_defined.patch
+++ b/debian/patches/api_NULL_not_defined.patch
@@ -1,11 +1,9 @@
Description: Picked from http://boinc.berkeley.edu/svn/trunk/boinc@25877
-Index: boinc/api/boinc_api.h
-===================================================================
---- boinc.orig/api/boinc_api.h 2012-09-16 23:16:46.000000000 +0800
-+++ boinc/api/boinc_api.h 2012-09-16 23:21:04.000000000 +0800
-@@ -18,6 +18,8 @@
- #ifndef _BOINC_API_
- #define _BOINC_API_
+--- a/api/boinc_api.h
++++ b/api/boinc_api.h
+@@ -20,6 +20,8 @@
+
+ #include <stddef.h> // for NULL
+#include <stddef.h> // for NULL
+
diff --git a/debian/patches/better_makefiles.patch b/debian/patches/better_makefiles.patch
index c58dc93..dca99ec 100644
--- a/debian/patches/better_makefiles.patch
+++ b/debian/patches/better_makefiles.patch
@@ -1,10 +1,8 @@
Author: Guo Yixuan <culu.gyx at gmail.com>
Description: Better clean target for several Makefiles
This would save some rm's in override_dh_auto_clean.
-Index: boinc/samples/sleeper/Makefile
-===================================================================
---- boinc.orig/samples/sleeper/Makefile 2012-09-17 21:46:22.208746208 +0200
-+++ boinc/samples/sleeper/Makefile 2012-09-17 21:46:22.428749121 +0200
+--- a/samples/sleeper/Makefile
++++ b/samples/sleeper/Makefile
@@ -19,11 +19,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
@@ -19,10 +17,8 @@ Index: boinc/samples/sleeper/Makefile
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc
-Index: boinc/samples/worker/Makefile
-===================================================================
---- boinc.orig/samples/worker/Makefile 2012-09-17 21:46:22.212746265 +0200
-+++ boinc/samples/worker/Makefile 2012-09-17 21:46:22.428749121 +0200
+--- a/samples/worker/Makefile
++++ b/samples/worker/Makefile
@@ -4,11 +4,10 @@
all: $(PROGS)
@@ -37,11 +33,9 @@ Index: boinc/samples/worker/Makefile
worker: worker.o
g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker worker.o
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile 2012-09-17 21:46:22.212746265 +0200
-+++ boinc/samples/wrapper/Makefile 2012-09-17 21:46:22.432749185 +0200
-@@ -21,11 +21,10 @@
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
+@@ -24,11 +24,10 @@
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
@@ -53,5 +47,5 @@ Index: boinc/samples/wrapper/Makefile
- /bin/rm -f $(PROGS) *.o libstdc++.a
+ rm -f $(PROGS) *.o libstdc++.a
- wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
- g++ $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc
+ REGEXP_OBJS = \
+ regexp.o \
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 1de8c82..fdffc7c 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -9,8 +9,8 @@
libboinc_la_LIBADD = -lm -lstdc++
libboinc_crypt_la_SOURCES = crypt.cpp
- libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ 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_LIBADD = -lm -lstdc++
@@ -28,7 +28,7 @@
parse_test_LDADD = $(LIBBOINC)
--- a/client/Makefile.am
+++ b/client/Makefile.am
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
if OS_DARWIN
boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
endif
diff --git a/debian/patches/clang_incompatibilities.patch b/debian/patches/clang_incompatibilities.patch
index d31ba26..037443c 100644
--- a/debian/patches/clang_incompatibilities.patch
+++ b/debian/patches/clang_incompatibilities.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller <steffen.moeller at uk-sh.de>
Description: Tested compatibility with clang.
-Index: boinc/lib/Makefile.am
-===================================================================
---- boinc.orig/lib/Makefile.am 2012-08-01 20:48:02.126264079 +0200
-+++ boinc/lib/Makefile.am 2012-08-01 20:52:55.174302455 +0200
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
@@ -147,13 +147,13 @@
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
@@ -12,19 +10,16 @@ Index: boinc/lib/Makefile.am
+libboinc_la_LIBADD = -lm -lstdc++
libboinc_crypt_la_SOURCES = crypt.cpp
- libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+ 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_LIBADD =
+libboinc_crypt_la_LIBADD = -lm -lstdc++
if ENABLE_FCGI
-
-Index: boinc/sched/make_work.cpp
-===================================================================
---- boinc.orig/sched/make_work.cpp 2012-08-01 20:48:02.126264079 +0200
-+++ boinc/sched/make_work.cpp 2012-08-01 20:52:55.186302294 +0200
+--- a/sched/make_work.cpp
++++ b/sched/make_work.cpp
@@ -176,9 +176,6 @@
char keypath[MAXPATHLEN];
char buf[BLOB_SIZE];
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index b682da9..73834ea 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,7 +1,5 @@
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h
-+++ boinc/client/app.h
+--- a/client/app.h
++++ b/client/app.h
@@ -47,7 +47,7 @@
typedef int PROCESS_ID;
@@ -11,10 +9,8 @@ Index: boinc/client/app.h
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-Index: boinc/client/file_names.cpp
-===================================================================
---- boinc.orig/client/file_names.cpp
-+++ boinc/client/file_names.cpp
+--- a/client/file_names.cpp
++++ b/client/file_names.cpp
@@ -66,7 +66,7 @@
}
@@ -102,7 +98,7 @@ Index: boinc/client/file_names.cpp
DIRREF dirp;
int retval;
-@@ -339,7 +339,7 @@
+@@ -341,7 +341,7 @@
}
void boinc_version_dir(PROJECT& p, VERSION_INFO& vi, char* buf) {
diff --git a/debian/patches/cmath_missing.patch b/debian/patches/cmath_missing.patch
index bfbcf51..6e91a49 100644
--- a/debian/patches/cmath_missing.patch
+++ b/debian/patches/cmath_missing.patch
@@ -1,7 +1,5 @@
-Index: boinc/api/gutil.cpp
-===================================================================
---- boinc.orig/api/gutil.cpp 2012-08-18 14:30:37.274778529 +0200
-+++ boinc/api/gutil.cpp 2012-08-18 14:42:31.653112311 +0200
+--- a/api/gutil.cpp
++++ b/api/gutil.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -11,10 +9,8 @@ Index: boinc/api/gutil.cpp
#include <setjmp.h>
#ifdef _WIN32
-Index: boinc/api/gutil_text.cpp
-===================================================================
---- boinc.orig/api/gutil_text.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/api/gutil_text.cpp 2012-08-18 14:42:31.657112257 +0200
+--- a/api/gutil_text.cpp
++++ b/api/gutil_text.cpp
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -24,10 +20,8 @@ Index: boinc/api/gutil_text.cpp
#include <setjmp.h>
#ifdef _WIN32
-Index: boinc/client/client_state.cpp
-===================================================================
---- boinc.orig/client/client_state.cpp 2012-08-18 14:42:31.265117561 +0200
-+++ boinc/client/client_state.cpp 2012-08-18 14:42:31.661112203 +0200
+--- a/client/client_state.cpp
++++ b/client/client_state.cpp
@@ -26,7 +26,7 @@
#include <ctime>
#include <cstdarg>
@@ -37,10 +31,8 @@ Index: boinc/client/client_state.cpp
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-Index: boinc/client/sim_util.cpp
-===================================================================
---- boinc.orig/client/sim_util.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/client/sim_util.cpp 2012-08-18 14:42:31.665112149 +0200
+--- a/client/sim_util.cpp
++++ b/client/sim_util.cpp
@@ -35,7 +35,7 @@
#define finite _finite
#endif
@@ -49,11 +41,9 @@ Index: boinc/client/sim_util.cpp
+#include <cmath>
#include "error_numbers.h"
- #include "str_util.h"
-Index: boinc/client/whetstone.cpp
-===================================================================
---- boinc.orig/client/whetstone.cpp 2012-08-17 16:08:20.402579016 +0200
-+++ boinc/client/whetstone.cpp 2012-08-18 14:42:31.669112094 +0200
+ #include "filesys.h"
+--- a/client/whetstone.cpp
++++ b/client/whetstone.cpp
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <stdio.h>
@@ -63,10 +53,8 @@ Index: boinc/client/whetstone.cpp
#include <time.h>
#endif
-Index: boinc/clientscr/ss_app.cpp
-===================================================================
---- boinc.orig/clientscr/ss_app.cpp 2012-08-18 14:30:37.430776418 +0200
-+++ boinc/clientscr/ss_app.cpp 2012-08-18 14:42:31.741111121 +0200
+--- a/clientscr/ss_app.cpp
++++ b/clientscr/ss_app.cpp
@@ -22,7 +22,7 @@
#ifdef _WIN32
#include "boinc_win.h"
@@ -76,10 +64,8 @@ Index: boinc/clientscr/ss_app.cpp
#endif
#include <string>
#include <vector>
-Index: boinc/db/boinc_db.cpp
-===================================================================
---- boinc.orig/db/boinc_db.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/db/boinc_db.cpp 2012-08-18 14:42:31.761110850 +0200
+--- a/db/boinc_db.cpp
++++ b/db/boinc_db.cpp
@@ -22,7 +22,7 @@
#include <ctime>
#include <unistd.h>
@@ -89,10 +75,8 @@ Index: boinc/db/boinc_db.cpp
// For machines with finite() defined in ieeefp.h
#if HAVE_IEEEFP_H
-Index: boinc/lib/boinc_win.h
-===================================================================
---- boinc.orig/lib/boinc_win.h 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/lib/boinc_win.h 2012-08-18 14:42:31.809110201 +0200
+--- a/lib/boinc_win.h
++++ b/lib/boinc_win.h
@@ -197,7 +197,7 @@
#include <assert.h>
#include <ctype.h>
@@ -102,10 +86,8 @@ Index: boinc/lib/boinc_win.h
#include <setjmp.h>
#include <signal.h>
#include <stdarg.h>
-Index: boinc/lib/md5.c
-===================================================================
---- boinc.orig/lib/md5.c 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/lib/md5.c 2012-08-18 14:42:31.841109767 +0200
+--- a/lib/md5.c
++++ b/lib/md5.c
@@ -88,7 +88,7 @@
* For reference, here is the program that computed the T values.
*/
@@ -115,10 +97,8 @@ Index: boinc/lib/md5.c
main()
{
int i;
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp 2012-08-18 14:42:31.041120592 +0200
-+++ boinc/lib/parse.cpp 2012-08-18 14:42:31.877109279 +0200
+--- a/lib/parse.cpp
++++ b/lib/parse.cpp
@@ -31,7 +31,7 @@
#include <cstring>
#include <cstdlib>
@@ -128,10 +108,8 @@ Index: boinc/lib/parse.cpp
#include <ctype.h>
#include <errno.h>
#if HAVE_IEEEFP_H
-Index: boinc/lib/str_util.cpp
-===================================================================
---- boinc.orig/lib/str_util.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/lib/str_util.cpp 2012-08-18 14:42:31.913108793 +0200
+--- a/lib/str_util.cpp
++++ b/lib/str_util.cpp
@@ -27,7 +27,7 @@
#ifndef _WIN32
#include "config.h"
@@ -141,11 +119,9 @@ Index: boinc/lib/str_util.cpp
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-Index: boinc/lib/util.cpp
-===================================================================
---- boinc.orig/lib/util.cpp 2012-08-18 14:42:31.313116911 +0200
-+++ boinc/lib/util.cpp 2012-08-18 14:42:31.945108359 +0200
-@@ -44,7 +44,7 @@
+--- a/lib/util.cpp
++++ b/lib/util.cpp
+@@ -50,7 +50,7 @@
#include <errno.h>
#include <string>
#include <cstring>
@@ -154,10 +130,8 @@ Index: boinc/lib/util.cpp
#if HAVE_IEEEFP_H
#include <ieeefp.h>
extern "C" {
-Index: boinc/samples/atiopencl/atiopencl.hpp
-===================================================================
---- boinc.orig/samples/atiopencl/atiopencl.hpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/atiopencl/atiopencl.hpp 2012-08-18 14:42:31.965108089 +0200
+--- a/samples/atiopencl/atiopencl.hpp
++++ b/samples/atiopencl/atiopencl.hpp
@@ -28,7 +28,7 @@
#endif
@@ -167,23 +141,19 @@ Index: boinc/samples/atiopencl/atiopencl.hpp
#include <time.h>
#include <cstdlib>
#include <iostream>
-Index: boinc/samples/example_app/uc2_graphics.cpp
-===================================================================
---- boinc.orig/samples/example_app/uc2_graphics.cpp 2012-08-18 14:30:37.462775986 +0200
-+++ boinc/samples/example_app/uc2_graphics.cpp 2012-08-18 14:42:31.973107981 +0200
+--- a/samples/example_app/uc2_graphics.cpp
++++ b/samples/example_app/uc2_graphics.cpp
@@ -33,7 +33,7 @@
- #ifdef _WIN32
- #include "boinc_win.h"
- #else
--#include <math.h>
-+#include <cmath>
- #endif
-
- #include "parse.h"
-Index: boinc/samples/nvcuda/cuda_kernel.cu
-===================================================================
---- boinc.orig/samples/nvcuda/cuda_kernel.cu 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/nvcuda/cuda_kernel.cu 2012-08-18 14:42:31.977107927 +0200
+ #ifdef _WIN32
+ #include "boinc_win.h"
+ #else
+-#include <math.h>
++#include <cmath>
+ #endif
+
+ #include "parse.h"
+--- a/samples/nvcuda/cuda_kernel.cu
++++ b/samples/nvcuda/cuda_kernel.cu
@@ -25,7 +25,7 @@
// identity matrix and the product A * incerse(A). For debugging...
//#define VERIFY 1
@@ -193,10 +163,8 @@ Index: boinc/samples/nvcuda/cuda_kernel.cu
#include <time.h>
#include "cuda_config.h"
-Index: boinc/samples/nvopencl/nvopencl.hpp
-===================================================================
---- boinc.orig/samples/nvopencl/nvopencl.hpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/nvopencl/nvopencl.hpp 2012-08-18 14:42:31.981107873 +0200
+--- a/samples/nvopencl/nvopencl.hpp
++++ b/samples/nvopencl/nvopencl.hpp
@@ -24,7 +24,7 @@
#include <CL/cl.h>
#include <oclUtils.h>
@@ -206,23 +174,19 @@ Index: boinc/samples/nvopencl/nvopencl.hpp
#include <time.h>
#include <cstdlib>
#include <iostream>
-Index: boinc/samples/vboxwrapper/vboxwrapper.cpp
-===================================================================
---- boinc.orig/samples/vboxwrapper/vboxwrapper.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/vboxwrapper/vboxwrapper.cpp 2012-08-18 14:42:31.985107818 +0200
+--- a/samples/vboxwrapper/vboxwrapper.cpp
++++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -56,7 +56,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
--#include <math.h>
-+#include <cmath>
- #include <string>
- #include <unistd.h>
- #endif
-Index: boinc/samples/wrappture/fermi.cpp
-===================================================================
---- boinc.orig/samples/wrappture/fermi.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/wrappture/fermi.cpp 2012-08-18 14:42:32.021107331 +0200
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+-#include <math.h>
++#include <cmath>
+ #include <string>
+ #include <unistd.h>
+ #endif
+--- a/samples/wrappture/fermi.cpp
++++ b/samples/wrappture/fermi.cpp
@@ -2,7 +2,7 @@
#include <stdlib.h>
@@ -232,10 +196,8 @@ Index: boinc/samples/wrappture/fermi.cpp
#include <unistd.h>
int main(int argc, char * argv[]) {
-Index: boinc/samples/wrappture/wrappture_example.cpp
-===================================================================
---- boinc.orig/samples/wrappture/wrappture_example.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/samples/wrappture/wrappture_example.cpp 2012-08-18 14:42:32.029107223 +0200
+--- a/samples/wrappture/wrappture_example.cpp
++++ b/samples/wrappture/wrappture_example.cpp
@@ -15,7 +15,7 @@
#include <stdlib.h>
@@ -245,42 +207,14 @@ Index: boinc/samples/wrappture/wrappture_example.cpp
#ifndef _WIN32
#include <unistd.h>
#endif
-Index: boinc/sched/credit.cpp
-===================================================================
---- boinc.orig/sched/credit.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/sched/credit.cpp 2012-08-18 14:42:32.033107169 +0200
-@@ -22,7 +22,7 @@
- // Note: this is credit.cpp rather than sched_credit.cpp
- // because you might grant credit e.g. from a trickle handler
-
--#include <math.h>
-+#include <cmath>
+--- a/vda/vda_lib.cpp
++++ b/vda/vda_lib.cpp
+@@ -19,7 +19,7 @@
- #include "boinc_db.h"
- #include "error_numbers.h"
-Index: boinc/sched/feeder.cpp
-===================================================================
---- boinc.orig/sched/feeder.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/sched/feeder.cpp 2012-08-18 14:42:32.037107115 +0200
-@@ -98,7 +98,7 @@
- #include <ctime>
- #include <csignal>
- #include <unistd.h>
--#include <math.h>
-+#include <cmath>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
-Index: boinc/vda/vda_lib.cpp
-===================================================================
---- boinc.orig/vda/vda_lib.cpp 2012-08-17 16:08:20.406578962 +0200
-+++ boinc/vda/vda_lib.cpp 2012-08-18 14:42:32.041107061 +0200
-@@ -23,7 +23,7 @@
- #include <vector>
- #include <set>
#include <algorithm>
+ #include <limits.h>
-#include <math.h>
+#include <cmath>
- #include <limits.h>
-
- using std::vector;
+ #include <set>
+ #include <stdio.h>
+ #include <vector>
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 300f2b1..ef71752 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Initialisation.
-Index: boinc/lib/crypt.cpp
-===================================================================
---- boinc.orig/lib/crypt.cpp 2012-05-03 13:28:56.000000000 +0200
-+++ boinc/lib/crypt.cpp 2012-05-03 13:42:06.416854048 +0200
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
@@ -339,6 +339,7 @@
char clear_buf[MD5_LEN];
int n, retval;
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index c2854d5..7c05cd3 100644
--- a/debian/patches/csh2tcsh.patch
+++ b/debian/patches/csh2tcsh.patch
@@ -1,18 +1,14 @@
Description: The use of the C Shell is deprecated.
-Index: boinc/tools/db_query
-===================================================================
---- boinc.orig/tools/db_query 2011-04-27 22:39:13.000000000 +0200
-+++ boinc/tools/db_query 2011-04-27 22:45:42.000000000 +0200
+--- a/tools/db_query
++++ b/tools/db_query
@@ -1,4 +1,4 @@
-#! /bin/tcsh
+#!/usr/bin/tcsh
set CIVDATE = `date "+%Y:%m:%d:%H:%M"`
set UNIXDATE = `perl -e 'print time()'`
-Index: boinc/tools/watch_tcp
-===================================================================
---- boinc.orig/tools/watch_tcp 2011-04-27 22:39:13.000000000 +0200
-+++ boinc/tools/watch_tcp 2011-04-27 22:45:42.000000000 +0200
+--- a/tools/watch_tcp
++++ b/tools/watch_tcp
@@ -1,4 +1,4 @@
-#! /bin/csh
+#!/usr/bin/tcsh
diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
index 6661862..eb66fa5 100644
--- a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
+++ b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
@@ -1,9 +1,7 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Adjusted path for BOINC to server for python code
-Index: boinc/py/boinc_path_config.py.in
-===================================================================
---- boinc.orig/py/boinc_path_config.py.in 2011-07-25 15:03:16.000000000 +0200
-+++ boinc/py/boinc_path_config.py.in 2011-07-25 15:03:50.000000000 +0200
+--- a/py/boinc_path_config.py.in
++++ b/py/boinc_path_config.py.in
@@ -8,5 +8,5 @@
import sys, os
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index c95a97e..b0619ad 100644
--- a/debian/patches/dynamic_libboinc.patch
+++ b/debian/patches/dynamic_libboinc.patch
@@ -1,8 +1,6 @@
-Index: boinc/Makefile.incl
-===================================================================
---- boinc.orig/Makefile.incl 2012-03-31 13:44:20.891195251 +0200
-+++ boinc/Makefile.incl 2012-05-29 16:08:30.239454422 +0200
-@@ -37,22 +37,22 @@
+--- a/Makefile.incl
++++ b/Makefile.incl
+@@ -38,22 +38,22 @@
# dependencies to make sure libs gets compiled before
# programs linking to them:
@@ -31,7 +29,7 @@ Index: boinc/Makefile.incl
$(LIBAPI):
cd $(top_builddir)/api; ${MAKE} libboinc_api.la
-@@ -60,3 +60,4 @@
+@@ -61,3 +61,4 @@
SERVERLIBS_FCGI = $(LIBSCHED_FCGI) $(LIBBOINC_CRYPT) $(LIBBOINC_FCGI) -lfcgi $(MYSQL_LIBS) $(PTHREAD_LIBS) $(RSA_LIBS) $(SSL_LIBS)
APPLIBS = $(LIBAPI) $(LIBBOINC)
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index 12ed8d6..bba2350 100644
--- a/debian/patches/generate_less.patch
+++ b/debian/patches/generate_less.patch
@@ -1,9 +1,7 @@
Author: unknown
-Index: boinc/generate_svn_version.sh
-===================================================================
---- boinc.orig/generate_svn_version.sh 2011-07-24 19:39:09.000000000 +0200
-+++ boinc/generate_svn_version.sh 2011-07-24 22:50:22.000000000 +0200
+--- a/generate_svn_version.sh
++++ b/generate_svn_version.sh
@@ -7,7 +7,9 @@
echo "#define SVN_VERSION_H" >> $TMPFILE
echo "" >> $TMPFILE
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 8f5f557..af876d5 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,6 +1,6 @@
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
-@@ -322,7 +322,7 @@
+@@ -331,7 +331,7 @@
if (standalone) return true;
@@ -9,36 +9,16 @@
"<current_cpu_time>%e</current_cpu_time>\n"
"<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
cpu_t, cp_cpu_t
-@@ -334,23 +334,23 @@
+@@ -343,7 +343,7 @@
double range = aid.fraction_done_end - aid.fraction_done_start;
double fdone = aid.fraction_done_start + fraction_done*range;
sprintf(buf, "<fraction_done>%e</fraction_done>\n", fdone);
- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
+ strlcat(msg_buf, buf, sizeof(msg_buf));
}
- if (fpops_per_cpu_sec) {
- sprintf(buf, "<fpops_per_cpu_sec>%e</fpops_per_cpu_sec>\n", fpops_per_cpu_sec);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (fpops_cumulative) {
- sprintf(buf, "<fpops_cumulative>%e</fpops_cumulative>\n", fpops_cumulative);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (intops_per_cpu_sec) {
- sprintf(buf, "<intops_per_cpu_sec>%e</intops_per_cpu_sec>\n", intops_per_cpu_sec);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- if (intops_cumulative) {
- sprintf(buf, "<intops_cumulative>%e</intops_cumulative>\n", intops_cumulative);
-- strlcat(msg_buf, buf, MSG_CHANNEL_SIZE);
-+ strlcat(msg_buf, buf, sizeof(msg_buf));
- }
- return app_client_shm->shm->app_status.send_msg(msg_buf);
- }
-@@ -549,6 +549,10 @@
+ if (bytes_sent) {
+ sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
+@@ -608,6 +608,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -49,7 +29,7 @@
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -720,7 +724,7 @@
+@@ -784,7 +788,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -58,26 +38,26 @@
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -770,15 +774,15 @@
+@@ -834,15 +838,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
- if (bytes_sent) {
- sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", bytes_sent);
+ if (_bytes_sent) {
+ sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", _bytes_sent);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
- if (bytes_received) {
- sprintf(buf, "<bytes_received>%f</bytes_received>\n", bytes_received);
+ if (_bytes_received) {
+ sprintf(buf, "<bytes_received>%f</bytes_received>\n", _bytes_received);
- strcat(msg_buf, buf);
+ strncat(msg_buf, buf, sizeof(msg_buf));
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -849,16 +853,16 @@
+@@ -913,16 +917,16 @@
}
static void handle_upload_file_status() {
@@ -97,7 +77,7 @@
FILE* f = boinc_fopen(filename.c_str(), "r");
if (!f) {
fprintf(stderr,
-@@ -867,7 +871,7 @@
+@@ -931,7 +935,7 @@
);
continue;
}
@@ -106,7 +86,7 @@
fclose(f);
if (p && parse_int(buf, "<status>", status)) {
UPLOAD_FILE_STATUS uf;
-@@ -1004,7 +1008,7 @@
+@@ -1072,7 +1076,7 @@
#ifdef _WIN32
GetFullPathName(path, MAXPATHLEN, abspath, NULL);
#else
@@ -115,25 +95,7 @@
#endif
argv[0] = const_cast<char*>(GRAPHICS_APP_FILENAME);
if (fullscreen) {
-@@ -1103,7 +1107,7 @@
- // timer handler; runs in the timer thread
- //
- static void timer_handler() {
-- char buf[256];
-+ char buf[256*2];
- if (g_sleep) return;
- interrupt_count++;
- if (!boinc_status.suspended) {
-@@ -1156,7 +1160,7 @@
- if (in_critical_section==0 && options.check_heartbeat) {
- if (heartbeat_giveup_time < interrupt_count) {
- boinc_msg_prefix(buf, sizeof(buf));
-- buf[255] = 0; // paranoia
-+ buf[sizeof(buf)-1] = 0; // paranoia
- fputs(buf, stderr);
- fputs(" No heartbeat from core client for 30 sec - exiting\n", stderr);
- if (options.direct_process_action) {
-@@ -1196,7 +1200,7 @@
+@@ -1260,7 +1264,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -142,7 +104,7 @@
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1204,7 +1208,7 @@
+@@ -1268,7 +1272,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index 2143f5d..edf4400 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -23,7 +23,7 @@ Disclaimer: For backports, this patch needs to be disabled.
grep '#define.*BOINC.*VERSION' $^ > $@
--- a/configure.ac
+++ b/configure.ac
-@@ -725,14 +725,12 @@
+@@ -743,14 +743,12 @@
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
@@ -43,7 +43,7 @@ Disclaimer: For backports, this patch needs to be disabled.
fi
dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -876,7 +874,7 @@
+@@ -900,7 +898,7 @@
],
[enable_wx_debug="no"])
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 82e0386..93ac735 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -51,7 +51,7 @@
strcpy(oldpath, newpath);
--- a/lib/network.cpp
+++ b/lib/network.cpp
-@@ -70,7 +70,7 @@
+@@ -71,7 +71,7 @@
case WSAENOTSOCK:
return "not a socket";
}
@@ -60,7 +60,7 @@
return buf;
#else
switch (h_errno) {
-@@ -84,11 +84,11 @@
+@@ -85,11 +85,11 @@
return "host not found or server failure";
#ifdef NETDB_INTERNAL
case NETDB_INTERNAL:
@@ -74,12 +74,12 @@
return buf;
#endif
}
-@@ -108,7 +108,7 @@
- {
+@@ -107,7 +107,7 @@
+ case AF_INET6: {
sockaddr_in6* sin = (sockaddr_in6*)&s;
char buf[256];
- inet_ntop(AF_INET6, (void*)(&sin->sin6_addr), buf, 256);
+ inet_ntop(AF_INET6, (void*)(&sin->sin6_addr), buf, sizeof(buf));
return (strcmp(buf, "::1") == 0);
+ break;
}
-
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 4a62d7d..13b2150 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,6 +1,6 @@
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
-@@ -497,7 +497,7 @@
+@@ -502,7 +502,7 @@
cuda_version = 0;
display_driver_version = 0;
strcpy(prop.name, "");
@@ -9,7 +9,7 @@
prop.sharedMemPerBlock = 0;
prop.regsPerBlock = 0;
prop.warpSize = 0;
-@@ -527,7 +527,7 @@
+@@ -532,7 +532,7 @@
while (!xp.get_tag()) {
if (xp.match_tag("/coproc_cuda")) {
if (!peak_flops) {
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index d5eb0d5..7554d83 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -50,7 +50,7 @@
#include "error_numbers.h"
#include "filesys.h"
#include "str_util.h"
-@@ -180,9 +181,17 @@
+@@ -178,9 +179,17 @@
int i;
for (i=0; i < nlibdirs; i++) {
struct dirent *entry;
diff --git a/debian/patches/opendir_error_messages.patch b/debian/patches/opendir_error_messages.patch
index eddc472..6f40b12 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -15,7 +15,7 @@
}
--- a/lib/diagnostics.cpp
+++ b/lib/diagnostics.cpp
-@@ -75,14 +75,14 @@
+@@ -74,14 +74,14 @@
static int diagnostics_initialized = false;
static int flags;
@@ -36,7 +36,7 @@
static int boinc_proxy_enabled;
static char boinc_proxy[256];
static char symstore[256];
-@@ -306,7 +306,7 @@
+@@ -305,7 +305,7 @@
// Store various pieces of inforation for future use.
if (flags & BOINC_DIAG_BOINCAPPLICATION) {
@@ -45,7 +45,7 @@
char proxy_address[256];
int proxy_port;
MIOFILE mf;
-@@ -331,13 +331,13 @@
+@@ -330,13 +330,13 @@
mf.init_file(p);
while(mf.fgets(buf, sizeof(buf))) {
if (match_tag(buf, "</app_init_data>")) break;
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 931b342..325aa8c 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,11 +1,9 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Improved memory handling.
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp 2012-03-27 16:38:37.000000000 +0200
-+++ boinc/lib/parse.cpp 2012-03-27 16:41:59.678459719 +0200
-@@ -179,7 +179,12 @@
+--- a/lib/parse.cpp
++++ b/lib/parse.cpp
+@@ -178,7 +178,12 @@
int n = (int)strlen(line);
if (nused + n >= bufsize) {
bufsize *= 2;
@@ -19,11 +17,9 @@ Index: boinc/lib/parse.cpp
}
strcpy(buf+nused, line);
nused += n;
-Index: boinc/lib/procinfo_win.cpp
-===================================================================
---- boinc.orig/lib/procinfo_win.cpp 2012-03-27 16:38:02.000000000 +0200
-+++ boinc/lib/procinfo_win.cpp 2012-03-27 16:41:59.682459664 +0200
-@@ -24,13 +24,16 @@
+--- a/lib/procinfo_win.cpp
++++ b/lib/procinfo_win.cpp
+@@ -25,6 +25,9 @@
tNTQSI pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
ULONG cbBuffer = 0;
@@ -33,14 +29,7 @@ Index: boinc/lib/procinfo_win.cpp
while (1) {
// Store the buffer size since it appears that somebody is monkeying around
// with the return values on some systems.
- cbBuffer = *pcbBuffer;
-
- *ppBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, *pcbBuffer);
- if (*ppBuffer == NULL) {
- return ERR_MALLOC;
- }
-
-@@ -54,9 +57,9 @@
+@@ -55,9 +58,9 @@
} else if (!NT_SUCCESS(Status)) {
HeapFree(hHeap, NULL, *ppBuffer);
return ERR_GETRUSAGE;
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 47bc5ed..caaca34 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -1,14 +1,12 @@
Author: Steffen Moeller <moeller at debian.org>
Description: int may not be enough (theoretically) for large files.
-Index: boinc/sched/file_upload_handler.cpp
-===================================================================
---- boinc.orig/sched/file_upload_handler.cpp 2011-10-30 00:29:08.000000000 +0200
-+++ boinc/sched/file_upload_handler.cpp 2011-10-30 00:29:10.000000000 +0200
-@@ -173,17 +173,17 @@
+--- a/sched/file_upload_handler.cpp
++++ b/sched/file_upload_handler.cpp
+@@ -123,13 +123,13 @@
+ bytes_left = nbytes - offset;
while (bytes_left > 0) {
-
- int n, m, to_write;
+ int m;
@@ -19,6 +17,10 @@ Index: boinc/sched/file_upload_handler.cpp
- n = fread(buf, 1, m, in);
+ size_t n = fread(buf, 1, m, in);
+ // delay opening the file until we've done the first socket read
+ // to avoid filesystem lockups (WCG, possible paranoia)
+@@ -195,7 +195,7 @@
+
// try to write n bytes to file
//
- to_write=n;
@@ -26,12 +28,3 @@ Index: boinc/sched/file_upload_handler.cpp
while (to_write > 0) {
ssize_t ret = write(fd, buf+n-to_write, to_write);
if (ret < 0) {
-@@ -237,7 +237,7 @@
- unsigned char buf[BLOCK_SIZE];
-
- while (1) {
-- int n = fread(buf, 1, BLOCK_SIZE, in);
-+ size_t n = fread(buf, 1, BLOCK_SIZE, in);
- if (n <= 0) return;
- }
- }
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 5fd74b5..8a0f85c 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller
Description: Allowing descriptions of hosts, vendor or model that are larger than a SMS.
-Index: boinc/sched/sched_driver.cpp
-===================================================================
---- boinc.orig/sched/sched_driver.cpp 2012-03-30 19:46:56.436149392 +0200
-+++ boinc/sched/sched_driver.cpp 2012-03-30 19:46:57.428135859 +0200
-@@ -50,9 +50,9 @@
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
+@@ -53,9 +53,9 @@
using std::vector;
struct HOST_DESC{
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index 9056cdd..bce5e53 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -1,11 +1,9 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Increased buffers and eliminated memory sink.
-Index: boinc/sched/sched_driver.cpp
-===================================================================
---- boinc.orig/sched/sched_driver.cpp 2012-03-30 18:44:06.691639668 +0200
-+++ boinc/sched/sched_driver.cpp 2012-03-30 19:42:10.688047314 +0200
-@@ -44,6 +44,8 @@
- #include <vector>
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
+@@ -47,6 +47,8 @@
+
#include "util.h"
#include "svn_version.h"
+#include "str_replace.h" // strlcpy
@@ -13,7 +11,7 @@ Index: boinc/sched/sched_driver.cpp
using std::vector;
-@@ -58,7 +60,7 @@
+@@ -61,7 +63,7 @@
double max_time = 1;
void read_hosts() {
@@ -22,7 +20,7 @@ Index: boinc/sched/sched_driver.cpp
host_descs.clear();
FILE* f = fopen("host_descs.txt", "r");
if (!f) {
-@@ -69,17 +71,18 @@
+@@ -72,15 +74,15 @@
HOST_DESC hd;
strcpy(buf2, buf);
char* p1 = strtok(buf2, "\t\n");
@@ -40,7 +38,4 @@ Index: boinc/sched/sched_driver.cpp
+ safe_strcpy(hd.p_model, p3);
host_descs.push_back(hd);
}
-+ free(f);
- }
-
- inline double req_time() {
+ fclose(f);
diff --git a/debian/patches/series b/debian/patches/series
index 9355ce4..00b608a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,12 +36,9 @@ clang_incompatibilities.patch
some_extra_clang_warnings.patch
#tmpA# nvidia_direct_invocation.patch
#tmpA# nvidia_direct_invocation_2.patch
-dTotalGlobalMem.patch
nvidia_mem_display_simplification.patch
api_NULL_not_defined.patch
-unlink_undefined.patch
cppcheck_realloc.patch
-cppcheck_avoid_redundant_check.patch
MainDocumentWarnings.patch
more_maxpathlen.patch
opendir_error_messages.patch
@@ -52,7 +49,6 @@ add_hardening_flags.patch
cmath_missing.patch
investigate_boinc_api.patch
slot_dir_source_trace.patch
-ignored_return_value.patch
opendir_errno.patch
ticket_1168_verifycerts.patch
better_makefiles.patch
@@ -62,5 +58,8 @@ client_app_maxpathlen.patch
boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
-missing_libs_wrapper.patch
-missing_gpu_intel.cpp_in_Makefile.am.patch
+fix-add-exclusive-app.patch
+zip_only_built_with_server.patch
+#fix-for-debian-bug-646583.patch
+hurd-ftbfs.patch
+boincmgr_fix_long_pointers.patch
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index b95b3d1..93e7ce5 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,6 +1,6 @@
--- a/client/app.cpp
+++ b/client/app.cpp
-@@ -420,8 +420,8 @@
+@@ -424,8 +424,8 @@
int retval;
get_project_dir(result->project, project_dir, sizeof(project_dir));
@@ -11,7 +11,7 @@
"%s/trickle_up_%s_%d.xml",
project_dir, result->name, (int)time(0)
);
-@@ -456,7 +456,7 @@
+@@ -460,7 +460,7 @@
return 0;
}
@@ -20,7 +20,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -466,7 +466,7 @@
+@@ -470,7 +470,7 @@
return false;
}
@@ -29,7 +29,7 @@
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -507,7 +507,7 @@
+@@ -511,7 +511,7 @@
#endif
}
@@ -38,7 +38,7 @@
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) return true;
-@@ -619,7 +619,7 @@
+@@ -623,7 +623,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -47,7 +47,7 @@
int n, dummy;
unsigned int i;
PROJECT* project=0;
-@@ -894,7 +894,7 @@
+@@ -898,7 +898,7 @@
DirScanner dirscan(slot_dir);
while (dirscan.scan(filename)) {
@@ -66,7 +66,7 @@
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-@@ -110,7 +111,7 @@
+@@ -111,7 +112,7 @@
double bytes_sent;
// reported by the app if it does network I/O
double bytes_received;
@@ -75,7 +75,7 @@
// directory where process runs (relative)
char slot_path[MAXPATHLEN];
// same, absolute
-@@ -151,8 +152,8 @@
+@@ -152,8 +153,8 @@
// but not descendants of the main process
// (e.g. VMs created by vboxwrapper)
// These are communicated via the app_status message channel
@@ -86,7 +86,7 @@
ASYNC_COPY* async_copy;
double finish_file_time;
// time when we saw finish file in slot dir.
-@@ -288,8 +289,8 @@
+@@ -289,8 +290,8 @@
bool check_app_exited();
bool check_rsc_limits_exceeded();
bool check_quit_timeout_exceeded();
@@ -97,7 +97,7 @@
void send_heartbeats();
void send_trickle_downs();
void report_overdue();
-@@ -298,7 +299,7 @@
+@@ -299,7 +300,7 @@
bool want_network(); // does any task want network?
void network_available(); // notify tasks that network is available
void free_mem();
@@ -311,9 +311,9 @@
boinc_getcwd(path);
if (strlen(relname)) {
strcat(path, "/");
-@@ -771,7 +771,7 @@
- // get total and free space on current filesystem (in bytes)
- //
+@@ -769,7 +769,7 @@
+ }
+
#if defined(_WIN32) && !(defined(WXDEBUG) || defined(WXNDEBUG))
-int boinc_allocate_file(const char* path, double size) {
+int boinc_allocate_file(const char* const path, double size) {
@@ -331,7 +331,7 @@
--- a/lib/filesys.h
+++ b/lib/filesys.h
-@@ -42,30 +42,30 @@
+@@ -43,30 +43,30 @@
#ifdef __cplusplus
extern "C" {
#endif
@@ -380,7 +380,7 @@
#ifdef __cplusplus
}
-@@ -74,10 +74,10 @@
+@@ -75,10 +75,10 @@
/* C++ specific prototypes/defines follow here */
#ifdef __cplusplus
@@ -395,7 +395,7 @@
// TODO TODO TODO
// remove this code - the DirScanner class does the same thing.
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
extern int dir_scan(std::string&, DIRREF);
extern void dir_close(DIRREF);
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index c279709..6c3e070 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -11,7 +11,7 @@
--- a/tools/dir_hier_move.cpp
+++ b/tools/dir_hier_move.cpp
-@@ -42,14 +42,14 @@
+@@ -43,14 +43,14 @@
int retval;
if ( (argc == 1) || !strcmp(argv[1], "-h") || !strcmp(argv[1],"--help") || (argc != 4) ) {
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index 531607f..bd6a025 100644
--- a/debian/patches/stripchart_debian.patch
+++ b/debian/patches/stripchart_debian.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Adjusting paths.
Disclaimer: This is mostly dead code in upstream.
-Index: boinc/stripchart/stripchart.cnf
-===================================================================
---- boinc.orig/stripchart/stripchart.cnf 2011-07-24 22:21:26.000000000 +0200
-+++ boinc/stripchart/stripchart.cnf 2011-07-24 22:33:51.000000000 +0200
+--- a/stripchart/stripchart.cnf
++++ b/stripchart/stripchart.cnf
@@ -8,7 +8,7 @@
# Directory where gnuplot is
# $gnuplot = "/usr/local/gnuplot-3.7";
@@ -38,10 +36,8 @@ Index: boinc/stripchart/stripchart.cnf
# What time is it right now?
$rightnow = time;
-Index: boinc/stripchart/stripchart
-===================================================================
---- boinc.orig/stripchart/stripchart 2011-07-24 22:21:41.000000000 +0200
-+++ boinc/stripchart/stripchart 2011-07-24 22:23:31.000000000 +0200
+--- a/stripchart/stripchart
++++ b/stripchart/stripchart
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
@@ -57,10 +53,8 @@ Index: boinc/stripchart/stripchart
# Read it in:
open (CNFFILE,$cnfpath) or die "cannot open configuration file: $cnfpath\nmake sure this variable is set properly";
-Index: boinc/stripchart/stripchart.cgi
-===================================================================
---- boinc.orig/stripchart/stripchart.cgi 2011-07-24 22:26:25.000000000 +0200
-+++ boinc/stripchart/stripchart.cgi 2011-07-24 22:27:14.000000000 +0200
+--- a/stripchart/stripchart.cgi
++++ b/stripchart/stripchart.cgi
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/perl
diff --git a/debian/patches/stripchart_security.patch b/debian/patches/stripchart_security.patch
index ef8593d..d7cf568 100644
--- a/debian/patches/stripchart_security.patch
+++ b/debian/patches/stripchart_security.patch
@@ -52,10 +52,8 @@ Disclaimer: This is mostly dead code of upstream.
#+UNIXDATE=`perl -e 'print time()'`
#
# echo $CIVDATE $UNIXDATE $SIZE
-Index: boinc/stripchart/stripchart.cnf
-===================================================================
---- boinc.orig/stripchart/stripchart.cnf 2012-01-15 02:02:04.000000000 +0100
-+++ boinc/stripchart/stripchart.cnf 2012-01-15 02:02:05.000000000 +0100
+--- a/stripchart/stripchart.cnf
++++ b/stripchart/stripchart.cnf
@@ -1,4 +1,5 @@
-#! /usr/bin/env perl
+
diff --git a/debian/patches/termios_is_everywhere.patch b/debian/patches/termios_is_everywhere.patch
index 3289da0..aac56f0 100644
--- a/debian/patches/termios_is_everywhere.patch
+++ b/debian/patches/termios_is_everywhere.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Helping compilation on freebsd machines.
-Index: boinc/zip/unzip/ttyio.c
-===================================================================
---- boinc.orig/zip/unzip/ttyio.c 2012-02-04 18:57:37.000000000 +0100
-+++ boinc/zip/unzip/ttyio.c 2012-02-05 00:17:10.000000000 +0100
-@@ -54,6 +55,7 @@
+--- a/zip/unzip/ttyio.c
++++ b/zip/unzip/ttyio.c
+@@ -54,6 +54,7 @@
# define HAVE_TERMIOS_H
#endif
diff --git a/debian/patches/ticket_1168_verifycerts.patch b/debian/patches/ticket_1168_verifycerts.patch
index 80c392c..784ba7d 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -1,5 +1,5 @@
---- boinc.orig/client/cs_files.cpp 2012-09-15 12:23:56.549116980 +0200
-+++ boinc/client/cs_files.cpp 2012-09-15 14:59:54.911398600 +0200
+--- a/client/cs_files.cpp
++++ b/client/cs_files.cpp
@@ -177,7 +177,9 @@
//
if (download_gzipped && !boinc_file_exists(pathname)) {
diff --git a/debian/patches/upstream_sztaki_configureEval.patch b/debian/patches/upstream_sztaki_configureEval.patch
index 2111582..5a2de47 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,7 +1,7 @@
Author: Unknown
--- a/configure.ac
+++ b/configure.ac
-@@ -282,6 +282,20 @@
+@@ -289,6 +289,20 @@
AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -29,4 +29,4 @@ Author: Unknown
+#!/usr/bin/php
<?php
-
+ // This file is part of BOINC.
diff --git a/debian/rules b/debian/rules
index bb6b685..a5d9c96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,8 +108,8 @@ endif
GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
# Link-Time-Optimization
-CFLAGS += -flto
-LDFLAGS += -flto
+#CFLAGS += -flto
+#LDFLAGS += -flto
CFLAGS += -Wall
CXXFLAGS += -Wall
@@ -385,16 +385,27 @@ get-orig-source:
echo "Not enough disk space for download. Have 250MB available if not more."; \
exit 1; \
fi
- LATEST_VERSION=`svn list http://boinc.berkeley.edu/svn/tags/ | \
- sed 's/boinc_core_release_\(.*\)\//\1/' | \
- sort -g -t_ -k1 -k2 -k3 | sed 's/_/./g' | tail -n 1 | tr -d '\n'`; \
- if [ -z "$$VERSION" ]; then VERSION=$$LATEST_VERSION; fi ; \
- EXB=/tmp/export-boinc; \
- nice="nice -5"; if [ -x /usr/bin/ionice ]; then nice="$$nice ionice -c 3"; fi ; \
- $$nice wget -O $$EXB "http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-boinc;hb=HEAD" --quiet; \
- chmod +x $$EXB; \
- $$nice $$EXB -r $$VERSION -t $(origDir); \
- rm -f $$EXB
+ #LATEST_VERSION=`svn list http://boinc.berkeley.edu/svn/tags/ | \
+ # sed 's/boinc_core_release_\(.*\)\//\1/' | \
+ # sort -g -t_ -k1 -k2 -k3 | sed 's/_/./g' | tail -n 1 | tr -d '\n'`; \
+ #
+ echo "this script doesn't work anymore since the upstream switch from svn to git"
+ #VERSION=$(shell dpkg-parsechangelog | egrep '^Version:' | \
+ #cut -d ' ' -f 2 | cut -d '-' -f 1 | cut -d '+' -f 1 | cut -d '~' -f 1 | perl -pe 's/^.*?://')
+ #EXB=/tmp/index.html; \
+ #nice="nice -5"; if [ -x /usr/bin/ionice ]; then nice="$$nice ionice -c 3"; fi ; \
+ #$$nice wget -O $$EXB "http://boinc.berkeley.edu/git/boinc.git/refs/tags/" --quiet;
+ #LATEST_VERSION=`grep -e 'client_release_[0-9]\.[0-9]\.[0-9]*' $$EXB -o | tail -n 1 | sed 's/client_release_//g'`
+ #rm -f $$EXB
+ #FIXME
+ #next part should be done only if the two versions are different, how to perform this if?
+ ##if [ "$$VERSION"!="$$LATEST_VERSION" ]; then
+ #EXB=/tmp/export-boinc; \
+ #$$nice wget -O $$EXB "http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-boinc;hb=HEAD" --quiet; \
+ #chmod +x $$EXB; \
+ #$$nice $$EXB -r $$VERSION -t $(origDir); \
+ #rm -f $$EXB ;
+ ##fi ;
.PHONY: get-orig-source
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list