[boinc] 03/04: New upstream major release! Patch refresh, wx3.0 switch
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Thu May 22 12:44:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to annotated tag debian/7.3.19+dfsg-1
in repository boinc.
commit 77381a37bea15cd20cf2945a470f9b8d45fbdb43
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed May 21 16:47:28 2014 +0200
New upstream major release! Patch refresh, wx3.0 switch
---
debian/changelog | 18 +++
debian/control.in | 3 +-
...t-Unix-attempt-to-fix-freebsd-build-error.patch | 25 ----
debian/patches/MainDocumentWarnings.patch | 6 +-
debian/patches/Missing_libSched.patch | 34 ++---
debian/patches/add-ldflags.patch | 12 +-
debian/patches/addressing_addional_html_dirs.patch | 6 +-
debian/patches/boinclib_shared.patch | 24 ++--
debian/patches/client_app_maxpathlen.patch | 12 +-
debian/patches/correctly-set-OBJCXX.patch | 34 -----
debian/patches/cppcheck_realloc.patch | 6 +-
debian/patches/csh2tcsh.patch | 12 +-
debian/patches/de.po.patch | 8 +-
.../debian_debian_AdjustBoincTopdirPython.patch | 6 +-
debian/patches/disable_new_version_check.patch | 16 +--
debian/patches/disable_silent_rules.patch | 12 +-
debian/patches/dynamic_libboinc.patch | 10 +-
.../file_upload_handler_in_sched_linking.patch | 10 +-
debian/patches/filesys_error_message.patch | 12 +-
debian/patches/fix-747964.patch | 23 ++++
debian/patches/fix-add-exclusive-app.patch | 21 ---
debian/patches/fix-android-build.patch | 12 --
debian/patches/fix-file-perms.patch | 38 ------
debian/patches/fix-italian-po.patch | 13 --
debian/patches/fix-lp-1274456.patch | 25 ----
debian/patches/fixed-tools-permissions.patch | 15 ---
debian/patches/fopen_closing.patch | 24 ++--
debian/patches/generate_less.patch | 6 +-
.../patches/gui_urls_xml_added_to_Makefile.patch | 8 +-
debian/patches/hurd-ftbfs.patch | 144 ---------------------
debian/patches/improve_opendir_warning.patch | 6 +-
debian/patches/investigate_boinc_api.patch | 22 ++--
debian/patches/lib_cppcheck.patch | 6 +-
debian/patches/libnotify-0.7.patch | 20 ++-
.../make_project_overcomes_Apache24_security.patch | 10 +-
debian/patches/more_clang_warnings.patch | 6 +-
debian/patches/more_maxpathlen.patch | 18 +--
.../nvidia_mem_display_simplification.patch | 6 +-
debian/patches/opendir_errno.patch | 24 ++--
debian/patches/opendir_error_messages.patch | 20 +--
debian/patches/parse_issues.patch | 6 +-
debian/patches/possible_size_type_error.patch | 10 +-
debian/patches/rrsim_iterator_cppcheck.patch | 6 +-
debian/patches/sched_driver_char_buffers.patch | 6 +-
debian/patches/sched_driver_f_free.patch | 6 +-
debian/patches/series | 9 --
debian/patches/server_status_php.patch | 8 +-
debian/patches/slot_dir_source_trace.patch | 44 +++----
debian/patches/some_extra_clang_warnings.patch | 16 +--
debian/patches/stripchart_debian.patch | 18 +--
debian/patches/termios_is_everywhere.patch | 6 +-
debian/patches/ticket_1168_verifycerts.patch | 6 +-
debian/patches/upstream_sztaki_configureEval.patch | 14 +-
53 files changed, 233 insertions(+), 655 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2789275..fecf1d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+boinc (7.3.19+dfsg-1) experimental; urgency=low
+
+ * New upstream release, wx3.0 compatible.
+ - add libwxgtk-webview3.0-dev as B-D
+ * Removed patches addressed upstream:
+ - 0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
+ - correctly-set-OBJCXX.patch
+ - hurd-ftbfs.patch
+ - fixed-tools-permissions.patch
+ - fix-android-build.patch
+ - fix-file-perms.patch
+ - fix-italian-po.patch
+ - fix-lp-1274456.patch
+ * Removed fix-add-exclusive-app.patch, addressed in wx3.0 switch
+ * Tweak envargs patch, changing prototype.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 21 May 2014 16:49:07 +0200
+
boinc (7.2.47+dfsg-3) UNRELEASED; urgency=medium
* Add return values to envargs function (Closes: #747964)
diff --git a/debian/control.in b/debian/control.in
index dd6a1ca..feedfe3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,11 +12,10 @@ Build-Depends: debhelper (>= 9), po-debconf, pkg-config,
docbook2x, docbook-xml, libxml2-utils,
zlib1g-dev, libssl-dev, libcurl4-openssl-dev,
libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libnotify-dev (>= 0.7.0),
- freeglut3-dev, libwxgtk2.8-dev, libgtk2.0-dev,
+ freeglut3-dev, libwxgtk3.0-dev, libwxgtk-webview3.0-dev, libgtk2.0-dev,
libsqlite3-dev, libmysqlclient-dev, python, libfcgi-dev, libjpeg-dev,
libxcb-util0-dev, libxcb-dpms0-dev,
libxss-dev, libxext-dev
-# libwebkitgtk-dev will be needed in the wx3.0 switch
Homepage: http://boinc.berkeley.edu/
Vcs-Git: git://anonscm.debian.org/pkg-boinc/boinc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-boinc/boinc.git
diff --git a/debian/patches/0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch b/debian/patches/0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
deleted file mode 100644
index 17e131d..0000000
--- a/debian/patches/0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8acebfee1076adbce0a24ea9ddb81b0b077af9e2 Mon Sep 17 00:00:00 2001
-From: David Anderson <davea at ssl.berkeley.edu>
-Date: Thu, 20 Feb 2014 10:09:18 -0800
-Subject: [PATCH] Client (Unix): attempt to fix freebsd build error
-
----
- client/mac_address.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/mac_address.cpp b/client/mac_address.cpp
-index 26bda73..87f6c3e 100644
---- a/client/mac_address.cpp
-+++ b/client/mac_address.cpp
-@@ -264,7 +264,7 @@ int get_mac_address(char* address) {
- hw_addr = (struct ether_addr *)&(item->lifr_lifru.lifru_enaddr);
- #endif
- strcpy(address, ether_ntoa(hw_addr));
-- if (strstr(item->ifr_ifrn.ifrn_name, "eth")) break;
-+ if (strstr(item->ifr_name, "eth")) break;
- }
- close(sck);
- if (!strcmp(address, "")) return -1;
---
-1.8.3.2
-
diff --git a/debian/patches/MainDocumentWarnings.patch b/debian/patches/MainDocumentWarnings.patch
index 828a1fa..b071823 100644
--- a/debian/patches/MainDocumentWarnings.patch
+++ b/debian/patches/MainDocumentWarnings.patch
@@ -2,7 +2,7 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Nothing in this patch should be functionally relevant, only compile time warnings as by the ambiguity of the result parameter are resolved.
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
-@@ -1658,7 +1658,6 @@
+@@ -1664,7 +1664,6 @@
}
#else
void CMainDocument::KillGraphicsApp(int pid) {
@@ -10,7 +10,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
char currentDir[1024];
char thePIDbuf[20];
int id, iRetVal;
-@@ -1666,12 +1665,13 @@
+@@ -1672,12 +1671,13 @@
if (g_use_sandbox) {
snprintf(thePIDbuf, sizeof(thePIDbuf), "%d", pid);
@@ -30,7 +30,7 @@ Description: Nothing in this patch should be functionally relevant, only compile
iRetVal = run_program(
getcwd(currentDir, sizeof(currentDir)),
-@@ -1681,6 +1681,10 @@
+@@ -1687,6 +1687,10 @@
0,
id
);
diff --git a/debian/patches/Missing_libSched.patch b/debian/patches/Missing_libSched.patch
index 4f6c0a4..54424f1 100644
--- a/debian/patches/Missing_libSched.patch
+++ b/debian/patches/Missing_libSched.patch
@@ -1,8 +1,6 @@
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am
-+++ boinc/tools/Makefile.am
-@@ -35,7 +35,7 @@
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -43,7 +43,7 @@
project.xml
AM_CXXFLAGS += $(MYSQL_CFLAGS)
@@ -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
-+++ boinc/vda/Makefile.am
+--- a/vda/Makefile.am
++++ b/vda/Makefile.am
@@ -4,7 +4,7 @@
vda_PROGRAMS = vda vdad ssim
@@ -24,10 +20,8 @@ Index: boinc/vda/Makefile.am
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
-+++ boinc/sched/Makefile.am
+--- 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
-+++ boinc/apps/Makefile.am
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
@@ -8,15 +8,15 @@
upper_case_SOURCES = upper_case.cpp
@@ -60,11 +52,9 @@ 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
-+++ boinc/clientgui/Makefile.am
-@@ -3,6 +3,7 @@
+--- a/clientgui/Makefile.am
++++ b/clientgui/Makefile.am
+@@ -6,6 +6,7 @@
include $(top_srcdir)/Makefile.incl
diff --git a/debian/patches/add-ldflags.patch b/debian/patches/add-ldflags.patch
index 8c843ae..33a0dcd 100644
--- a/debian/patches/add-ldflags.patch
+++ b/debian/patches/add-ldflags.patch
@@ -1,10 +1,8 @@
-Index: boinc/samples/wrapper/Makefile
-===================================================================
---- boinc.orig/samples/wrapper/Makefile
-+++ boinc/samples/wrapper/Makefile
-@@ -37,4 +37,4 @@
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
+@@ -38,4 +38,4 @@
regexp_report.o
wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
-- g++ $(CXXFLAGS) $(CPPFLAGS) -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 $(LDFLAGS)
+- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
diff --git a/debian/patches/addressing_addional_html_dirs.patch b/debian/patches/addressing_addional_html_dirs.patch
index 63b307f..7858890 100644
--- a/debian/patches/addressing_addional_html_dirs.patch
+++ b/debian/patches/addressing_addional_html_dirs.patch
@@ -1,7 +1,5 @@
-Index: boinc/html/Makefile.am
-===================================================================
---- boinc.orig/html/Makefile.am
-+++ boinc/html/Makefile.am
+--- a/html/Makefile.am
++++ b/html/Makefile.am
@@ -1,4 +1,4 @@
htmldir=$(DESTDIR)/$(prefix)/share/boinc-server-maker/html
install-data-local:
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 5e626a7..651bd36 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -1,9 +1,7 @@
-Index: boinc/lib/Makefile.am
-===================================================================
---- boinc.orig/lib/Makefile.am
-+++ boinc/lib/Makefile.am
-@@ -150,13 +150,13 @@
- libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -175,13 +175,13 @@
+ libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
@@ -18,7 +16,7 @@ Index: boinc/lib/Makefile.am
libboinc_crypt_la_LIBADD =
-@@ -225,7 +225,7 @@
+@@ -250,7 +250,7 @@
msg_test_LDADD = $(LIBBOINC)
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
@@ -27,13 +25,11 @@ Index: boinc/lib/Makefile.am
parse_test_SOURCES = parse_test.cpp
parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
parse_test_LDADD = $(LIBBOINC)
-Index: boinc/client/Makefile.am
-===================================================================
---- boinc.orig/client/Makefile.am
-+++ boinc/client/Makefile.am
-@@ -93,7 +93,7 @@
- if OS_DARWIN
- boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
+--- 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)
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index c440530..93607b0 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
@@ -48,7 +48,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
@@ -69,7 +69,7 @@
//
void get_pathname(FILE_INFO* fip, char* path, int len) {
diff --git a/debian/patches/correctly-set-OBJCXX.patch b/debian/patches/correctly-set-OBJCXX.patch
deleted file mode 100644
index 841c436..0000000
--- a/debian/patches/correctly-set-OBJCXX.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Eric J Korpela <korpela at ssl.berkeley.edu>
-Date: Sat, 10 May 2014 05:24:47 +0000 (-0700)
-Subject: Forced definition of OBJC and OBJCXX to prevent libtool error in configuration.
-X-Git-Url: http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commitdiff_plain;h=0e94586e7eeceffac0d6ca57b9ca543d79c898a0
-
-Forced definition of OBJC and OBJCXX to prevent libtool error in configuration.
-Author: Eric J Korpela <korpela at ssl.berkeley.edu>
-Bug-Debian: http://bugs.debian.org/746830
-
----
-Origin: upstream
-Forwarded: not-needed
-Reviewed-By: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Last-Update: <2014-05-10>
-
---- boinc-7.2.47+dfsg.orig/configure.ac
-+++ boinc-7.2.47+dfsg/configure.ac
-@@ -323,9 +323,15 @@ dnl GUI
- BOINC_CHECK_CYGWIN
-
- dnl enable objective-C
-+if test x$OBJC = x ; then
-+ OBJC="$CC"
-+fi
-+if test x$OBJCXX = x ; then
-+ OBJCXX="$CXX"
-+fi
- _AM_DEPENDENCIES([OBJC])
--OBJC="$CC"
- AC_SUBST(OBJC)
-+AC_SUBST(OBJCXX)
- OBJCFLAGS="-ObjC"
- AC_SUBST(OBJCFLAGS)
-
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index de10e5e..44e38c2 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
-+++ boinc/lib/crypt.cpp
+--- a/lib/crypt.cpp
++++ b/lib/crypt.cpp
@@ -342,6 +342,7 @@
char clear_buf[MD5_LEN];
int n, retval;
diff --git a/debian/patches/csh2tcsh.patch b/debian/patches/csh2tcsh.patch
index ed9ed6d..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
-+++ boinc/tools/db_query
+--- 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
-+++ boinc/tools/watch_tcp
+--- a/tools/watch_tcp
++++ b/tools/watch_tcp
@@ -1,4 +1,4 @@
-#! /bin/csh
+#!/usr/bin/tcsh
diff --git a/debian/patches/de.po.patch b/debian/patches/de.po.patch
index 84fc660..224fd65 100644
--- a/debian/patches/de.po.patch
+++ b/debian/patches/de.po.patch
@@ -1,7 +1,5 @@
-Index: boinc/html/languages/translations/de.po
-===================================================================
---- boinc.orig/html/languages/translations/de.po
-+++ boinc/html/languages/translations/de.po
+--- a/html/languages/translations/de.po
++++ b/html/languages/translations/de.po
@@ -1073,8 +1073,8 @@
#: ../inc/prefs.inc:158
@@ -35,7 +33,7 @@ Index: boinc/html/languages/translations/de.po
#: ../inc/prefs.inc:194
msgid "Tasks checkpoint to disk at most every"
-@@ -5336,9 +5336,10 @@
+@@ -5338,9 +5338,10 @@
"our message boards are moderated.\n"
"Message board postings are subject to the following posting rules:\n"
msgstr ""
diff --git a/debian/patches/debian_debian_AdjustBoincTopdirPython.patch b/debian/patches/debian_debian_AdjustBoincTopdirPython.patch
index 61a906e..081256f 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
-+++ boinc/py/boinc_path_config.py.in
+--- 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/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index d96541b..d3bbf44 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -10,11 +10,9 @@ Forwarded: not-needed
Reviewed-By: costamagnagianfranco at yahoo.it
Last-Update: <2013-03-07>
-Index: boinc/client/client_state.cpp
-===================================================================
---- boinc.orig/client/client_state.cpp
-+++ boinc/client/client_state.cpp
-@@ -488,7 +488,7 @@
+--- a/client/client_state.cpp
++++ b/client/client_state.cpp
+@@ -502,7 +502,7 @@
// inform the user if there's a newer version of client
//
@@ -23,14 +21,12 @@ Index: boinc/client/client_state.cpp
// parse account files again,
// now that we know the host's venue on each project
-Index: boinc/client/scheduler_op.cpp
-===================================================================
---- boinc.orig/client/scheduler_op.cpp
-+++ boinc/client/scheduler_op.cpp
+--- a/client/scheduler_op.cpp
++++ b/client/scheduler_op.cpp
@@ -129,7 +129,7 @@
// and project list
//
- if (!config.no_info_fetch) {
+ if (!cc_config.no_info_fetch) {
- gstate.new_version_check();
+// gstate.new_version_check();
gstate.all_projects_list_check();
diff --git a/debian/patches/disable_silent_rules.patch b/debian/patches/disable_silent_rules.patch
index 84d93a0..eb805ae 100644
--- a/debian/patches/disable_silent_rules.patch
+++ b/debian/patches/disable_silent_rules.patch
@@ -1,12 +1,10 @@
Description: Disabled silent rules, for buildlog check to work.
-Index: boinc/configure.ac
-===================================================================
---- boinc.orig/configure.ac
-+++ boinc/configure.ac
-@@ -16,7 +16,7 @@
- dnl generate .tar.gz, .tar.bz2, .zip
- dnl AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@
+
AM_INIT_AUTOMAKE(dist-zip)
+
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+#m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/debian/patches/dynamic_libboinc.patch b/debian/patches/dynamic_libboinc.patch
index 6a6f3a3..9f0ef52 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
-+++ boinc/Makefile.incl
-@@ -38,22 +38,22 @@
+--- a/Makefile.incl
++++ b/Makefile.incl
+@@ -41,22 +41,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
-@@ -61,3 +61,4 @@
+@@ -64,3 +64,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/file_upload_handler_in_sched_linking.patch b/debian/patches/file_upload_handler_in_sched_linking.patch
index 6a095af..e9e59f6 100644
--- a/debian/patches/file_upload_handler_in_sched_linking.patch
+++ b/debian/patches/file_upload_handler_in_sched_linking.patch
@@ -1,8 +1,6 @@
-Index: boinc/sched/Makefile.am
-===================================================================
---- boinc.orig/sched/Makefile.am
-+++ boinc/sched/Makefile.am
-@@ -256,7 +256,7 @@
+--- a/sched/Makefile.am
++++ b/sched/Makefile.am
+@@ -265,7 +265,7 @@
update_stats_LDADD = $(SERVERLIBS)
file_upload_handler_SOURCES = file_upload_handler.cpp
@@ -11,7 +9,7 @@ Index: boinc/sched/Makefile.am
make_work_SOURCES = make_work.cpp
make_work_LDADD = $(SERVERLIBS)
-@@ -298,7 +298,7 @@
+@@ -307,7 +307,7 @@
sched_config.cpp \
sched_msgs.cpp
fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index 03f4bef..1bed45f 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -145,7 +145,9 @@
#else
dirp = opendir(p);
@@ -40,10 +38,8 @@ Index: boinc/lib/filesys.cpp
int retval=0;
retval = boinc_rename_aux(old, newf);
-Index: boinc/lib/filesys.h
-===================================================================
---- boinc.orig/lib/filesys.h
-+++ boinc/lib/filesys.h
+--- a/lib/filesys.h
++++ b/lib/filesys.h
@@ -47,7 +47,7 @@
extern int boinc_touch_file(const char* const path);
extern FILE* boinc_fopen(const char* const path, const char* mode);
diff --git a/debian/patches/fix-747964.patch b/debian/patches/fix-747964.patch
index baeaf4b..bb93d47 100644
--- a/debian/patches/fix-747964.patch
+++ b/debian/patches/fix-747964.patch
@@ -5,6 +5,15 @@ Last-Update: <2014-05-13>
--- boinc-7.2.47+dfsg.orig/zip/zip/util.c
+++ boinc-7.2.47+dfsg/zip/zip/util.c
+@@ -802,7 +802,7 @@ unsigned char *zmbsrchr(str, c)
+ | to make the action of the code less obscure.
+ ****************************************************************/
+
+-void envargs(Pargc, Pargv, envstr, envstr2)
++int envargs(Pargc, Pargv, envstr, envstr2)
+ int *Pargc;
+ char ***Pargv;
+ char *envstr;
@@ -825,7 +825,7 @@ void envargs(Pargc, Pargv, envstr, envst
while (isspace((uch)*envptr))
envptr++;
@@ -22,3 +31,17 @@ Last-Update: <2014-05-13>
}
local int count_args(s)
+diff --git a/zip/zip/zip.h b/zip/zip/zip.h
+index ba03160..cc01701 100644
+--- a/zip/zip/zip.h
++++ b/zip/zip/zip.h
+@@ -811,7 +811,7 @@ int namecmp OF((ZCONST char *string1, ZCONST char *string2));
+
+ zvoid far **search OF((ZCONST zvoid *, ZCONST zvoid far **, extent,
+ int (*)(ZCONST zvoid *, ZCONST zvoid far *)));
+-void envargs OF((int *, char ***, char *, char *));
++int envargs OF((int *, char ***, char *, char *));
+ void expand_args OF((int *, char ***));
+
+ int is_text_buf OF((ZCONST char *buf_ptr, unsigned buf_size));
+
diff --git a/debian/patches/fix-add-exclusive-app.patch b/debian/patches/fix-add-exclusive-app.patch
deleted file mode 100644
index b9dd094..0000000
--- a/debian/patches/fix-add-exclusive-app.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Forwarded: yes (mail to boinc_alpha)
-Reviewed-By: <costamagnagianfranco at yahoo.it>
-Last-Update: <2013-01-21>
-quoting from man
-"bool wxFileName::IsFileExecutable()
-Returns true if a file with this name exists and if this process has execute permissions on it."
-
-Index: boinc/clientgui/DlgAdvPreferences.cpp
-===================================================================
---- boinc.orig/clientgui/DlgAdvPreferences.cpp
-+++ boinc/clientgui/DlgAdvPreferences.cpp
-@@ -822,7 +822,7 @@
- #endif
- wxString directory = picker.GetDirectory();
- wxFileName fn(directory, appNames[i]);
-- if (!fn.IsOk() || !fn.IsFileExecutable()) {
-+ if (!fn.IsOk() /*|| !fn.IsFileExecutable()*/) {
- errmsg.Printf(_("'%s' is not an executable application."), appNames[i].c_str());
- wxGetApp().SafeMessageBox(errmsg, _("Add Exclusive App"),
- wxOK | wxICON_EXCLAMATION, this
diff --git a/debian/patches/fix-android-build.patch b/debian/patches/fix-android-build.patch
deleted file mode 100644
index 8347861..0000000
--- a/debian/patches/fix-android-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-
-Index: boinc/samples/wrapper/build_android.sh
-===================================================================
---- boinc.orig/samples/wrapper/build_android.sh
-+++ boinc/samples/wrapper/build_android.sh
-@@ -1,4 +1,4 @@
--#/bin/sh
-+#!/bin/sh
- #script to compile Wrapper for Android
-
- export ANDROIDTC="$HOME/android-tc"
diff --git a/debian/patches/fix-file-perms.patch b/debian/patches/fix-file-perms.patch
deleted file mode 100644
index 557c1fd..0000000
--- a/debian/patches/fix-file-perms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: boinc/db/Makefile.am
-===================================================================
---- boinc.orig/db/Makefile.am
-+++ boinc/db/Makefile.am
-@@ -10,4 +10,5 @@
-
- ## other stuff to go into the distribution
- extradir = $(prefix)/share/boinc-server-maker/db
--dist_extra_DATA = constraints.sql schema.sql init_db
-+dist_extra_DATA = constraints.sql schema.sql
-+dist_extra_SCRIPTS = init_db
-Index: boinc/sched/Makefile.am
-===================================================================
---- boinc.orig/sched/Makefile.am
-+++ boinc/sched/Makefile.am
-@@ -116,7 +116,7 @@
- sample_trivial_validator \
- sample_work_generator \
- single_job_assimilator \
-- size_regulator \
-+ size_regulator \
- transitioner \
- trickle_credit \
- trickle_echo \
-@@ -129,11 +129,10 @@
- schedshare_DATA = \
- db_dump_spec.xml \
- assimilator.py \
-- pymw_assimilator.py \
-- transitioner_catchup.php
-+ pymw_assimilator.py
-
- # scripts that 'make install' should put in bindir
--schedshare_SCRIPTS = start stop status
-+schedshare_SCRIPTS = start stop status transitioner_catchup.php
-
- noinst_HEADERS = \
- assimilate_handler.h \
diff --git a/debian/patches/fix-italian-po.patch b/debian/patches/fix-italian-po.patch
deleted file mode 100644
index a3e09f8..0000000
--- a/debian/patches/fix-italian-po.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boinc/locale/Makefile.am
-===================================================================
---- boinc.orig/locale/Makefile.am
-+++ boinc/locale/Makefile.am
-@@ -21,7 +21,7 @@
- gl \
- hr \
- hu \
-- it \
-+ it_IT \
- ja \
- ko \
- lt \
diff --git a/debian/patches/fix-lp-1274456.patch b/debian/patches/fix-lp-1274456.patch
deleted file mode 100644
index 0c042fa..0000000
--- a/debian/patches/fix-lp-1274456.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Jussi Lahtinen
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1274456
-
-Index: boinc/client/hostinfo_unix.cpp
-===================================================================
---- boinc.orig/client/hostinfo_unix.cpp
-+++ boinc/client/hostinfo_unix.cpp
-@@ -1890,6 +1890,7 @@
- static Display* disp = NULL;
-
- long idle_time = 0;
-+ int event_base_return, error_base_return;
-
- if(disp != NULL) {
- XScreenSaverQueryInfo(disp, DefaultRootWindow(disp), xssInfo);
-@@ -1946,6 +1947,9 @@
- // or DISPLAY points to wrong/invalid display
- if(disp != NULL) {
- xssInfo = XScreenSaverAllocInfo();
-+ if (!XScreenSaverQueryExtension(disp, &event_base_return, &error_base_return)){
-+ // How to handle failing?
-+ }
- }
- }
-
diff --git a/debian/patches/fixed-tools-permissions.patch b/debian/patches/fixed-tools-permissions.patch
deleted file mode 100644
index e06202a..0000000
--- a/debian/patches/fixed-tools-permissions.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am
-+++ boinc/tools/Makefile.am
-@@ -31,7 +31,9 @@
- manage_privileges \
- run_in_ops \
- stage_file \
-- watch_tcp \
-+ watch_tcp
-+
-+dist_tools_DATA = \
- project.xml
-
- AM_CXXFLAGS += $(MYSQL_CFLAGS)
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index ba499e5..a939679 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/crypt_prog.cpp
-===================================================================
---- boinc.orig/lib/crypt_prog.cpp
-+++ boinc/lib/crypt_prog.cpp
+--- a/lib/crypt_prog.cpp
++++ b/lib/crypt_prog.cpp
@@ -152,6 +152,8 @@
if (!fpub) die("fopen");
print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
@@ -61,10 +59,8 @@ Index: boinc/lib/crypt_prog.cpp
}
}
} else {
-Index: boinc/lib/mfile.cpp
-===================================================================
---- boinc.orig/lib/mfile.cpp
-+++ boinc/lib/mfile.cpp
+--- a/lib/mfile.cpp
++++ b/lib/mfile.cpp
@@ -38,13 +38,14 @@
MFILE::MFILE() {
buf = (char*)malloc(64*1024);
@@ -127,10 +123,8 @@ Index: boinc/lib/mfile.cpp
int n = (int)strlen(p);
buf = (char*)realloc_aux(buf, len+n+1);
if (!buf) {
-Index: boinc/lib/parse_test.cpp
-===================================================================
---- boinc.orig/lib/parse_test.cpp
-+++ boinc/lib/parse_test.cpp
+--- a/lib/parse_test.cpp
++++ b/lib/parse_test.cpp
@@ -57,6 +57,7 @@
exit(1);
}
@@ -139,10 +133,8 @@ Index: boinc/lib/parse_test.cpp
}
/* try it with something like:
-Index: boinc/lib/mfile.h
-===================================================================
---- boinc.orig/lib/mfile.h
-+++ boinc/lib/mfile.h
+--- a/lib/mfile.h
++++ b/lib/mfile.h
@@ -37,12 +37,12 @@
public:
MFILE();
diff --git a/debian/patches/generate_less.patch b/debian/patches/generate_less.patch
index 10009c5..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
-+++ boinc/generate_svn_version.sh
+--- 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/gui_urls_xml_added_to_Makefile.patch b/debian/patches/gui_urls_xml_added_to_Makefile.patch
index bc6cce5..c4874ba 100644
--- a/debian/patches/gui_urls_xml_added_to_Makefile.patch
+++ b/debian/patches/gui_urls_xml_added_to_Makefile.patch
@@ -1,8 +1,6 @@
-Index: boinc/tools/Makefile.am
-===================================================================
---- boinc.orig/tools/Makefile.am
-+++ boinc/tools/Makefile.am
-@@ -34,7 +34,8 @@
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -40,7 +40,8 @@
watch_tcp
dist_tools_DATA = \
diff --git a/debian/patches/hurd-ftbfs.patch b/debian/patches/hurd-ftbfs.patch
deleted file mode 100644
index 0f19925..0000000
--- a/debian/patches/hurd-ftbfs.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
-Author: Guo Yixuan <culu.gyx at gmail.com> (original hurd-ftbfs.patch used in 7.0.52+dfsg-2)
-Description: Hurd ftbts: missing definition for MAXPATHLEN
- Hurd kernel doesn't limit path length.
----
-Origin: <debian>
-Forwarded: <yes>
-Reviewed-By: <costamagnagianfranco at yahoo.it>
-Last-Update: <2013-08-22>
-
-Index: boinc/sched/make_work.cpp
-===================================================================
---- boinc.orig/sched/make_work.cpp
-+++ boinc/sched/make_work.cpp
-@@ -52,6 +52,7 @@
- #include "str_replace.h"
- #include "str_util.h"
- #include "svn_version.h"
-+#include "filesys.h"
-
- #define LOCKFILE "make_work.out"
- #define PIDFILE "make_work.pid"
-Index: boinc/sched/get_file.cpp
-===================================================================
---- boinc.orig/sched/get_file.cpp
-+++ boinc/sched/get_file.cpp
-@@ -38,6 +38,7 @@
-
- #include "backend_lib.h"
- #include "str_replace.h"
-+#include "filesys.h"
-
- #include "sched_config.h"
- #include "sched_util.h"
-Index: boinc/sched/sched_assign.cpp
-===================================================================
---- boinc.orig/sched/sched_assign.cpp
-+++ boinc/sched/sched_assign.cpp
-@@ -33,6 +33,7 @@
- #include "crypt.h"
- #include "backend_lib.h"
- #include "error_numbers.h"
-+#include "filesys.h"
-
- #include "sched_main.h"
- #include "sched_msgs.h"
-Index: boinc/sched/sample_work_generator.cpp
-===================================================================
---- boinc.orig/sched/sample_work_generator.cpp
-+++ boinc/sched/sample_work_generator.cpp
-@@ -47,6 +47,7 @@
- #include "str_replace.h"
- #include "util.h"
- #include "svn_version.h"
-+#include "filesys.h"
-
- #include "sched_config.h"
- #include "sched_util.h"
-Index: boinc/sched/sched_timezone.cpp
-===================================================================
---- boinc.orig/sched/sched_timezone.cpp
-+++ boinc/sched/sched_timezone.cpp
-@@ -28,6 +28,7 @@
-
- #include "sched_types.h"
- #include "sched_msgs.h"
-+#include "filesys.h"
- #include "sched_config.h"
-
- #ifdef _USING_FCGI_
-Index: boinc/sched/feeder.cpp
-===================================================================
---- boinc.orig/sched/feeder.cpp
-+++ boinc/sched/feeder.cpp
-@@ -115,6 +115,7 @@
- #include "util.h"
- #include "str_util.h"
- #include "svn_version.h"
-+#include "filesys.h"
-
- #include "credit.h"
- #include "sched_config.h"
-Index: boinc/sched/wu_check.cpp
-===================================================================
---- boinc.orig/sched/wu_check.cpp
-+++ boinc/sched/wu_check.cpp
-@@ -35,6 +35,7 @@
- #include "error_numbers.h"
- #include "parse.h"
- #include "util.h"
-+#include "filesys.h"
-
- #include "sched_config.h"
- #include "sched_util.h"
-Index: boinc/sched/sched_shmem.cpp
-===================================================================
---- boinc.orig/sched/sched_shmem.cpp
-+++ boinc/sched/sched_shmem.cpp
-@@ -40,6 +40,7 @@
- #include "sched_msgs.h"
- #include "sched_types.h"
- #include "sched_util.h"
-+#include "filesys.h"
-
- #include "sched_shmem.h"
-
-Index: boinc/sched/transitioner.cpp
-===================================================================
---- boinc.orig/sched/transitioner.cpp
-+++ boinc/sched/transitioner.cpp
-@@ -44,7 +44,7 @@
- #include "error_numbers.h"
- #include "str_util.h"
- #include "svn_version.h"
--
-+#include "filesys.h"
- #include "sched_config.h"
- #include "credit.h"
- #include "sched_util.h"
-Index: boinc/tools/create_work.cpp
-===================================================================
---- boinc.orig/tools/create_work.cpp
-+++ boinc/tools/create_work.cpp
-@@ -37,6 +37,7 @@
- #include "sched_config.h"
- #include "str_replace.h"
- #include "util.h"
-+#include "filesys.h"
-
- void usage() {
- fprintf(stderr,
-Index: boinc/tools/dir_hier_path.cpp
-===================================================================
---- boinc.orig/tools/dir_hier_path.cpp
-+++ boinc/tools/dir_hier_path.cpp
-@@ -29,7 +29,7 @@
- #include "sched_config.h"
- #include "sched_util.h"
- #include "str_util.h"
--
-+#include "filesys.h"
-
- const char *usage =
- "\nUsage: dir_hier_path <filename>\n"
diff --git a/debian/patches/improve_opendir_warning.patch b/debian/patches/improve_opendir_warning.patch
index 6a37366..f44c815 100644
--- a/debian/patches/improve_opendir_warning.patch
+++ b/debian/patches/improve_opendir_warning.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Helping verbosity of error messages.
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -144,7 +144,10 @@
dirp->handle = INVALID_HANDLE_VALUE;
#else
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
index 83c775d..59c37d3 100644
--- a/debian/patches/investigate_boinc_api.patch
+++ b/debian/patches/investigate_boinc_api.patch
@@ -1,8 +1,6 @@
-Index: boinc/api/boinc_api.cpp
-===================================================================
---- boinc.orig/api/boinc_api.cpp
-+++ boinc/api/boinc_api.cpp
-@@ -356,7 +356,7 @@
+--- a/api/boinc_api.cpp
++++ b/api/boinc_api.cpp
+@@ -369,7 +369,7 @@
if (standalone) return true;
@@ -11,7 +9,7 @@ Index: boinc/api/boinc_api.cpp
"<current_cpu_time>%e</current_cpu_time>\n"
"<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
cpu_t, cp_cpu_t
-@@ -629,6 +629,10 @@
+@@ -645,6 +645,10 @@
}
int boinc_get_status(BOINC_STATUS *s) {
@@ -22,7 +20,7 @@ Index: boinc/api/boinc_api.cpp
s->no_heartbeat = boinc_status.no_heartbeat;
s->suspended = boinc_status.suspended;
s->quit_request = boinc_status.quit_request;
-@@ -804,7 +808,7 @@
+@@ -820,7 +824,7 @@
int boinc_parse_init_data_file() {
FILE* f;
int retval;
@@ -31,7 +29,7 @@ Index: boinc/api/boinc_api.cpp
if (aid.project_preferences) {
free(aid.project_preferences);
-@@ -854,15 +858,15 @@
+@@ -872,15 +876,15 @@
);
if (other_pid) {
sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
@@ -50,7 +48,7 @@ Index: boinc/api/boinc_api.cpp
}
if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
return 0;
-@@ -957,7 +961,7 @@
+@@ -975,7 +979,7 @@
}
static void handle_upload_file_status() {
@@ -59,7 +57,7 @@ Index: boinc/api/boinc_api.cpp
std::string filename;
int status;
-@@ -1170,7 +1174,7 @@
+@@ -1190,7 +1194,7 @@
// send graphics-related messages
//
if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -68,7 +66,7 @@ Index: boinc/api/boinc_api.cpp
"<web_graphics_url>%s</web_graphics_url>",
web_graphics_url
);
-@@ -1178,7 +1182,7 @@
+@@ -1198,7 +1202,7 @@
send_web_graphics_url = false;
}
if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
@@ -77,7 +75,7 @@ Index: boinc/api/boinc_api.cpp
"<remote_desktop_addr>%s</remote_desktop_addr>",
remote_desktop_addr
);
-@@ -1410,7 +1414,7 @@
+@@ -1442,7 +1446,7 @@
DirScanner dirscan(path);
while (dirscan.scan(filename)) {
if (strstr(filename.c_str(), "trickle_down")) {
diff --git a/debian/patches/lib_cppcheck.patch b/debian/patches/lib_cppcheck.patch
index 2553853..47db22f 100644
--- a/debian/patches/lib_cppcheck.patch
+++ b/debian/patches/lib_cppcheck.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/unix_util.cpp
-===================================================================
---- boinc.orig/lib/unix_util.cpp
-+++ boinc/lib/unix_util.cpp
+--- a/lib/unix_util.cpp
++++ b/lib/unix_util.cpp
@@ -80,7 +80,13 @@
}
if (i!=envstrings.end()) {
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index 5033d38..d764b7d 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -2,13 +2,11 @@ Author: Steffen Moeller <moeller at debian.org>
Description: Later versions of Debian come with libnotify 0.7.
Disclaimer: For backports, this patch needs to be disabled.
-Index: boinc/clientgui/Makefile.am
-===================================================================
---- boinc.orig/clientgui/Makefile.am
-+++ boinc/clientgui/Makefile.am
-@@ -117,9 +117,13 @@
+--- a/clientgui/Makefile.am
++++ b/clientgui/Makefile.am
+@@ -100,9 +100,13 @@
../lib/error_numbers.h \
- locale $(mac_headers)
+ locale
-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
@@ -23,11 +21,9 @@ Index: boinc/clientgui/Makefile.am
win_config.h: $(top_srcdir)/config.h
grep '#define.*BOINC.*VERSION' $^ > $@
-Index: boinc/configure.ac
-===================================================================
---- boinc.orig/configure.ac
-+++ boinc/configure.ac
-@@ -743,14 +743,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -887,14 +887,12 @@
dnl ---------- libNotify --------------------------------------------------
if test "${enable_manager}" = yes ; then
@@ -47,7 +43,7 @@ Index: boinc/configure.ac
fi
dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -901,7 +899,7 @@
+@@ -1051,7 +1049,7 @@
],
[enable_wx_debug="no"])
diff --git a/debian/patches/make_project_overcomes_Apache24_security.patch b/debian/patches/make_project_overcomes_Apache24_security.patch
index 6baed9c..aaf2108 100644
--- a/debian/patches/make_project_overcomes_Apache24_security.patch
+++ b/debian/patches/make_project_overcomes_Apache24_security.patch
@@ -1,8 +1,6 @@
-Index: boinc/tools/make_project
-===================================================================
---- boinc.orig/tools/make_project
-+++ boinc/tools/make_project
-@@ -321,6 +321,7 @@
+--- a/tools/make_project
++++ b/tools/make_project
+@@ -327,6 +327,7 @@
<Directory "%(proot)s/html">
Options Indexes FollowSymlinks MultiViews
AllowOverride AuthConfig
@@ -10,7 +8,7 @@ Index: boinc/tools/make_project
Order allow,deny
Allow from all
</Directory>
-@@ -328,6 +329,7 @@
+@@ -334,6 +335,7 @@
<Directory "%(proot)s/cgi-bin">
Options ExecCGI
AllowOverride AuthConfig
diff --git a/debian/patches/more_clang_warnings.patch b/debian/patches/more_clang_warnings.patch
index 0b21cb0..e5396c3 100644
--- a/debian/patches/more_clang_warnings.patch
+++ b/debian/patches/more_clang_warnings.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/shmem.cpp
-===================================================================
---- boinc.orig/lib/shmem.cpp
-+++ boinc/lib/shmem.cpp
+--- a/lib/shmem.cpp
++++ b/lib/shmem.cpp
@@ -337,7 +337,10 @@
// area to all zeros because they write beyond the old EOF.
// See the lseek man page for details.
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 4285f0a..b9a1d90 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,7 +1,5 @@
-Index: boinc/api/graphics2_util.cpp
-===================================================================
---- boinc.orig/api/graphics2_util.cpp
-+++ boinc/api/graphics2_util.cpp
+--- a/api/graphics2_util.cpp
++++ b/api/graphics2_util.cpp
@@ -37,7 +37,7 @@
static key_t get_shmem_name(const char* prog_name) {
char cwd[MAXPATHLEN], path[MAXPATHLEN];
@@ -20,10 +18,8 @@ Index: boinc/api/graphics2_util.cpp
}
#endif
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -433,7 +433,7 @@
while (1) {
retval = dir_scan(filename, dirp, sizeof(filename));
@@ -53,10 +49,8 @@ Index: boinc/lib/filesys.cpp
retval = boinc_mkdir(newpath);
if (retval) return retval;
safe_strcpy(oldpath, newpath);
-Index: boinc/lib/network.cpp
-===================================================================
---- boinc.orig/lib/network.cpp
-+++ boinc/lib/network.cpp
+--- a/lib/network.cpp
++++ b/lib/network.cpp
@@ -71,7 +71,7 @@
case WSAENOTSOCK:
return "not a socket";
diff --git a/debian/patches/nvidia_mem_display_simplification.patch b/debian/patches/nvidia_mem_display_simplification.patch
index 09e0339..59740d0 100644
--- a/debian/patches/nvidia_mem_display_simplification.patch
+++ b/debian/patches/nvidia_mem_display_simplification.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/coproc.cpp
-===================================================================
---- boinc.orig/lib/coproc.cpp
-+++ boinc/lib/coproc.cpp
+--- a/lib/coproc.cpp
++++ b/lib/coproc.cpp
@@ -355,7 +355,7 @@
cuda_version = 0;
display_driver_version = 0;
diff --git a/debian/patches/opendir_errno.patch b/debian/patches/opendir_errno.patch
index b870dd2..d62be8b 100644
--- a/debian/patches/opendir_errno.patch
+++ b/debian/patches/opendir_errno.patch
@@ -1,8 +1,6 @@
-Index: boinc/client/check_security.cpp
-===================================================================
---- boinc.orig/client/check_security.cpp
-+++ boinc/client/check_security.cpp
-@@ -40,9 +40,9 @@
+--- a/client/check_security.cpp
++++ b/client/check_security.cpp
+@@ -35,9 +35,9 @@
#endif
static int CheckNestedDirectories(
@@ -14,7 +12,7 @@ Index: boinc/client/check_security.cpp
int len
);
-@@ -505,9 +505,9 @@
+@@ -491,9 +491,9 @@
static int CheckNestedDirectories(
@@ -26,7 +24,7 @@ Index: boinc/client/check_security.cpp
) {
int isDirectory;
char full_path[MAXPATHLEN];
-@@ -517,6 +517,7 @@
+@@ -503,6 +503,7 @@
dirent *dp;
static int errShown = 0;
@@ -34,7 +32,7 @@ Index: boinc/client/check_security.cpp
dirp = opendir(basepath);
if (dirp == NULL) {
// Ideally, all project-created subdirectories under project or slot
-@@ -526,6 +527,7 @@
+@@ -512,6 +513,7 @@
// the subdirectory to check them.
strlcpy(full_path, basepath, sizeof(full_path));
if ((depth > 1) && (errno == EACCES)) {
@@ -42,11 +40,9 @@ Index: boinc/client/check_security.cpp
return 0;
} else {
retval = -1200;
-Index: boinc/client/cs_platforms.cpp
-===================================================================
---- boinc.orig/client/cs_platforms.cpp
-+++ boinc/client/cs_platforms.cpp
-@@ -45,6 +45,7 @@
+--- a/client/cs_platforms.cpp
++++ b/client/cs_platforms.cpp
+@@ -44,6 +44,7 @@
#include <sys/sysctl.h>
#endif
@@ -54,7 +50,7 @@ Index: boinc/client/cs_platforms.cpp
#include "error_numbers.h"
#include "filesys.h"
#include "str_util.h"
-@@ -178,9 +179,17 @@
+@@ -174,9 +175,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 6ff7235..eff4a59 100644
--- a/debian/patches/opendir_error_messages.patch
+++ b/debian/patches/opendir_error_messages.patch
@@ -1,7 +1,5 @@
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -585,9 +585,9 @@
fclose(src);
fclose(dst);
@@ -15,11 +13,9 @@ Index: boinc/lib/filesys.cpp
return retval;
#endif
}
-Index: boinc/lib/diagnostics.cpp
-===================================================================
---- boinc.orig/lib/diagnostics.cpp
-+++ boinc/lib/diagnostics.cpp
-@@ -344,7 +344,7 @@
+--- a/lib/diagnostics.cpp
++++ b/lib/diagnostics.cpp
+@@ -385,7 +385,7 @@
// Store various pieces of inforation for future use.
if (flags & BOINC_DIAG_BOINCAPPLICATION) {
@@ -28,10 +24,8 @@ Index: boinc/lib/diagnostics.cpp
char proxy_address[256];
int proxy_port;
MIOFILE mf;
-Index: boinc/client/sandbox.cpp
-===================================================================
---- boinc.orig/client/sandbox.cpp
-+++ boinc/client/sandbox.cpp
+--- a/client/sandbox.cpp
++++ b/client/sandbox.cpp
@@ -207,7 +207,7 @@
strcpy(filename, "");
retval = dir_scan(filename, dirp, sizeof(filename));
diff --git a/debian/patches/parse_issues.patch b/debian/patches/parse_issues.patch
index 02cb09c..4a191d7 100644
--- a/debian/patches/parse_issues.patch
+++ b/debian/patches/parse_issues.patch
@@ -1,10 +1,8 @@
Author: Steffen Moeller <moeller at debian.org>
Description: Improved memory handling.
-Index: boinc/lib/procinfo_win.cpp
-===================================================================
---- boinc.orig/lib/procinfo_win.cpp
-+++ boinc/lib/procinfo_win.cpp
+--- a/lib/procinfo_win.cpp
++++ b/lib/procinfo_win.cpp
@@ -25,6 +25,9 @@
tNTQSI pNTQSI = (tNTQSI)GetProcAddress(hNTDllLib, "NtQuerySystemInformation");
ULONG cbBuffer = 0;
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index ed977fc..6b9d097 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -1,11 +1,9 @@
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
-+++ boinc/sched/file_upload_handler.cpp
-@@ -138,13 +138,13 @@
+--- a/sched/file_upload_handler.cpp
++++ b/sched/file_upload_handler.cpp
+@@ -137,13 +137,13 @@
bytes_left = nbytes - offset;
while (bytes_left > 0) {
@@ -21,7 +19,7 @@ Index: boinc/sched/file_upload_handler.cpp
// delay opening the file until we've done the first socket read
// to avoid filesystem lockups (WCG, possible paranoia)
-@@ -210,7 +210,7 @@
+@@ -209,7 +209,7 @@
// try to write n bytes to file
//
diff --git a/debian/patches/rrsim_iterator_cppcheck.patch b/debian/patches/rrsim_iterator_cppcheck.patch
index 7a4e0cc..e35ee72 100644
--- a/debian/patches/rrsim_iterator_cppcheck.patch
+++ b/debian/patches/rrsim_iterator_cppcheck.patch
@@ -1,7 +1,5 @@
-Index: boinc/client/rrsim_test.cpp
-===================================================================
---- boinc.orig/client/rrsim_test.cpp
-+++ boinc/client/rrsim_test.cpp
+--- a/client/rrsim_test.cpp
++++ b/client/rrsim_test.cpp
@@ -184,7 +184,6 @@
vector<RESULT*> active;
unsigned int i;
diff --git a/debian/patches/sched_driver_char_buffers.patch b/debian/patches/sched_driver_char_buffers.patch
index 944c32d..8a0f85c 100644
--- a/debian/patches/sched_driver_char_buffers.patch
+++ b/debian/patches/sched_driver_char_buffers.patch
@@ -1,9 +1,7 @@
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
-+++ boinc/sched/sched_driver.cpp
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
@@ -53,9 +53,9 @@
using std::vector;
diff --git a/debian/patches/sched_driver_f_free.patch b/debian/patches/sched_driver_f_free.patch
index 0d39a78..d1645f6 100644
--- a/debian/patches/sched_driver_f_free.patch
+++ b/debian/patches/sched_driver_f_free.patch
@@ -1,9 +1,7 @@
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
-+++ boinc/sched/sched_driver.cpp
+--- a/sched/sched_driver.cpp
++++ b/sched/sched_driver.cpp
@@ -63,7 +63,7 @@
double max_time = 1;
diff --git a/debian/patches/series b/debian/patches/series
index 0d03521..601fcc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,7 +53,6 @@ client_app_maxpathlen.patch
boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
-fix-add-exclusive-app.patch
#fix-for-debian-bug-646583.patch
disable_new_version_check.patch
lib_cppcheck.patch
@@ -64,18 +63,10 @@ de.po.patch
more_clang_warnings.patch
#mmap_mem_only.patch
add-ldflags.patch
-hurd-ftbfs.patch
-fixed-tools-permissions.patch
-fix-android-build.patch
-fix-file-perms.patch
-fix-italian-po.patch
addressing_addional_html_dirs.patch
gui_urls_xml_added_to_Makefile.patch
file_upload_handler_in_sched_linking.patch
disable_silent_rules.patch
server_status_php.patch
#db_interface_use.patch
-fix-lp-1274456.patch
-0001-Client-Unix-attempt-to-fix-freebsd-build-error.patch
fix-747964.patch
-correctly-set-OBJCXX.patch
diff --git a/debian/patches/server_status_php.patch b/debian/patches/server_status_php.patch
index 66837ed..8a0fab4 100644
--- a/debian/patches/server_status_php.patch
+++ b/debian/patches/server_status_php.patch
@@ -1,8 +1,6 @@
-Index: boinc/html/user/server_status.php
-===================================================================
---- boinc.orig/html/user/server_status.php
-+++ boinc/html/user/server_status.php
-@@ -207,7 +207,12 @@
+--- a/html/user/server_status.php
++++ b/html/user/server_status.php
+@@ -192,7 +192,12 @@
}
$uldl_pid = parse_element($config_vars,"<uldl_pid>");
if ($uldl_pid == "") {
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 688c1d4..e47edb8 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -1,8 +1,6 @@
-Index: boinc/client/app.cpp
-===================================================================
---- boinc.orig/client/app.cpp
-+++ boinc/client/app.cpp
-@@ -438,8 +438,8 @@
+--- a/client/app.cpp
++++ b/client/app.cpp
+@@ -471,8 +471,8 @@
char new_path[MAXPATHLEN], old_path[MAXPATHLEN];
int retval;
@@ -13,7 +11,7 @@ Index: boinc/client/app.cpp
"%s/trickle_up_%s_%d.xml",
result->project->project_dir(), result->name, (int)time(0)
);
-@@ -474,7 +474,7 @@
+@@ -510,7 +510,7 @@
return 0;
}
@@ -22,7 +20,7 @@ Index: boinc/client/app.cpp
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) {
-@@ -484,7 +484,7 @@
+@@ -520,7 +520,7 @@
return false;
}
@@ -31,7 +29,7 @@ Index: boinc/client/app.cpp
char path[MAXPATHLEN];
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
-@@ -535,7 +535,7 @@
+@@ -571,7 +571,7 @@
return 0;
}
@@ -40,7 +38,7 @@ Index: boinc/client/app.cpp
unsigned int i;
for (i=0; i<active_tasks.size(); i++) {
if (active_tasks[i]->slot == slot) return true;
-@@ -656,7 +656,7 @@
+@@ -700,7 +700,7 @@
#endif
int ACTIVE_TASK::parse(XML_PARSER& xp) {
@@ -49,10 +47,8 @@ Index: boinc/client/app.cpp
int n, dummy;
unsigned int i;
PROJECT* project=0;
-Index: boinc/client/app.h
-===================================================================
---- boinc.orig/client/app.h
-+++ boinc/client/app.h
+--- a/client/app.h
++++ b/client/app.h
@@ -48,6 +48,7 @@
typedef int PROCESS_ID;
@@ -61,16 +57,16 @@ 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.
-@@ -112,7 +113,7 @@
+@@ -124,7 +125,7 @@
double bytes_sent;
- // reported by the app if it does network I/O
+ // bytes in all episodes
double bytes_received;
- char slot_dir[256];
+ char slot_dir[SLOT_DIR_LEN];
// directory where process runs (relative)
char slot_path[MAXPATHLEN];
// same, absolute
-@@ -153,8 +154,8 @@
+@@ -165,8 +166,8 @@
// but not descendants of the main process
// (e.g. VMs created by vboxwrapper)
// These are communicated via the app_status message channel
@@ -81,7 +77,7 @@ Index: boinc/client/app.h
ASYNC_COPY* async_copy;
double finish_file_time;
// time when we saw finish file in slot dir.
-@@ -290,8 +291,8 @@
+@@ -310,8 +311,8 @@
bool check_app_exited();
bool check_rsc_limits_exceeded();
bool check_quit_timeout_exceeded();
@@ -92,7 +88,7 @@ Index: boinc/client/app.h
void send_heartbeats();
void send_trickle_downs();
void report_overdue();
-@@ -300,7 +301,7 @@
+@@ -320,7 +321,7 @@
bool want_network(); // does any task want network?
void network_available(); // notify tasks that network is available
void free_mem();
@@ -101,10 +97,8 @@ Index: boinc/client/app.h
void get_memory_usage();
void process_control_poll();
-Index: boinc/lib/filesys.cpp
-===================================================================
---- boinc.orig/lib/filesys.cpp
-+++ boinc/lib/filesys.cpp
+--- a/lib/filesys.cpp
++++ b/lib/filesys.cpp
@@ -86,7 +86,7 @@
// routines for enumerating the entries in a directory
@@ -326,10 +320,8 @@ Index: boinc/lib/filesys.cpp
#ifdef STATFS
struct STATFS fs_info;
-Index: boinc/lib/filesys.h
-===================================================================
---- boinc.orig/lib/filesys.h
-+++ boinc/lib/filesys.h
+--- a/lib/filesys.h
++++ b/lib/filesys.h
@@ -43,30 +43,30 @@
#ifdef __cplusplus
extern "C" {
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index e6aefc7..e5aec71 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -1,8 +1,6 @@
-Index: boinc/clientgui/sg_ProjectPanel.cpp
-===================================================================
---- boinc.orig/clientgui/sg_ProjectPanel.cpp
-+++ boinc/clientgui/sg_ProjectPanel.cpp
-@@ -414,8 +414,7 @@
+--- a/clientgui/sg_ProjectPanel.cpp
++++ b/clientgui/sg_ProjectPanel.cpp
+@@ -416,8 +416,7 @@
CMainDocument* pDoc = wxGetApp().GetDocument();
ProjectSelectionData* selData;
PROJECT* project;
@@ -12,7 +10,7 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
if ( pDoc->IsConnected() ) {
int projCnt = pDoc->GetSimpleProjectCount();
-@@ -423,10 +422,11 @@
+@@ -425,10 +424,11 @@
oldProjectSelection = m_ProjectSelectionCtrl->GetSelection();
// If a new project has been added, figure out which one
@@ -26,7 +24,7 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
if (!strcmp(project->master_url, ctrl_url)) {
found = true;
-@@ -438,7 +438,7 @@
+@@ -440,7 +440,7 @@
if ( !found ) {
wxString projname(project->project_name.c_str(), wxConvUTF8);
#if SORTPROJECTLIST
@@ -35,7 +33,7 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
for(j = 0; j < ctrlCount; ++j) {
alphaOrder = (m_ProjectSelectionCtrl->GetString(j)).CmpNoCase(projname);
if (alphaOrder > 0) {
-@@ -470,8 +470,8 @@
+@@ -472,8 +472,8 @@
if ( projCnt < ctrlCount ) {
project = NULL;
// Check items in descending order so deletion won't change indexes of items yet to be checked
@@ -46,7 +44,7 @@ Index: boinc/clientgui/sg_ProjectPanel.cpp
project = pDoc->state.lookup_project(ctrl_url);
if ( project == NULL ) {
selData = (ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j);
-@@ -499,9 +499,9 @@
+@@ -501,9 +501,9 @@
// Check to see if we need to reload the project icon
ctrlCount = m_ProjectSelectionCtrl->GetCount();
diff --git a/debian/patches/stripchart_debian.patch b/debian/patches/stripchart_debian.patch
index 2b46ee9..e5c999d 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
-+++ boinc/stripchart/stripchart.cnf
+--- a/stripchart/stripchart.cnf
++++ b/stripchart/stripchart.cnf
@@ -4,7 +4,7 @@
$majorversion = 2; $minorversion = 1;
@@ -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
-+++ boinc/stripchart/stripchart
+--- 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
-+++ boinc/stripchart/stripchart.cgi
+--- a/stripchart/stripchart.cgi
++++ b/stripchart/stripchart.cgi
@@ -1,4 +1,4 @@
-#! /usr/bin/env perl
+#!/usr/bin/perl
diff --git a/debian/patches/termios_is_everywhere.patch b/debian/patches/termios_is_everywhere.patch
index a00149f..aac56f0 100644
--- a/debian/patches/termios_is_everywhere.patch
+++ b/debian/patches/termios_is_everywhere.patch
@@ -1,9 +1,7 @@
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
-+++ boinc/zip/unzip/ttyio.c
+--- 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 4d48716..ba4aacd 100644
--- a/debian/patches/ticket_1168_verifycerts.patch
+++ b/debian/patches/ticket_1168_verifycerts.patch
@@ -1,7 +1,5 @@
-Index: boinc/client/cs_files.cpp
-===================================================================
---- boinc.orig/client/cs_files.cpp
-+++ boinc/client/cs_files.cpp
+--- 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 a8f4774..87e83f1 100644
--- a/debian/patches/upstream_sztaki_configureEval.patch
+++ b/debian/patches/upstream_sztaki_configureEval.patch
@@ -1,9 +1,7 @@
Author: Unknown
-Index: boinc/configure.ac
-===================================================================
---- boinc.orig/configure.ac
-+++ boinc/configure.ac
-@@ -289,6 +289,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,6 +305,20 @@
AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -24,10 +22,8 @@ Index: boinc/configure.ac
## commented this out to turn all maintainer-mode features ON by default,
## such as automatic reconfiguring on changes in Makefile.am's and configure.ac
## AM_MAINTAINER_MODE
-Index: boinc/tools/update_versions
-===================================================================
---- boinc.orig/tools/update_versions
-+++ boinc/tools/update_versions
+--- a/tools/update_versions
++++ b/tools/update_versions
@@ -1,4 +1,4 @@
-#! /usr/bin/env php
+#!/usr/bin/php
--
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