[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-85-g7524d21
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Sun Nov 4 23:35:24 UTC 2012
The following commit has been merged in the master branch:
commit 7524d219be9d5727b6ace0ca3ba6ddd4755bebe3
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Mon Nov 5 00:32:01 2012 +0100
Removed some old patches already applied upstream.
Keeping #stream_memory_leak_fix.patch and #client_stream_realloc.patch that refers to a deleted stream.cpp
diff --git a/debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch b/debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
deleted file mode 100644
index df5f616..0000000
--- a/debian/patches/0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch
+++ /dev/null
@@ -1,52 +0,0 @@
->From d8e6277f152c42464f1c23683a575d5826a45bbc Mon Sep 17 00:00:00 2001
-From: Bernd Machenschalk <bernd.machenschalk at ligo.org>
-Date: Mon, 21 May 2012 16:35:57 +0200
-Subject: [PATCH 1/2] Patch from Steffen Moeller for recent Xcb
-
----
- clientscr/screensaver_x11.cpp | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/clientscr/screensaver_x11.cpp b/clientscr/screensaver_x11.cpp
-index a2e2649..8f6a9a4 100644
---- a/clientscr/screensaver_x11.cpp
-+++ b/clientscr/screensaver_x11.cpp
-@@ -531,10 +531,14 @@ int main(int argc, char *argv[])
- for(int n = 0; n < 10; n++)
- {
- // get list of x clients
-- xcb_atom_t NET_CLIENT_LIST = xcb_atom_get(con, "_NET_CLIENT_LIST");
-+ // xcb_atom_t NET_CLIENT_LIST = xcb_atom_get(con, "_NET_CLIENT_LIST");
-+ xcb_intern_atom_cookie_t cookie0=xcb_intern_atom(con, 0, strlen("_NET_CLIENT_LIST"),
-+ "_NET_CLIENT_LIST");
-+ xcb_intern_atom_reply_t *reply0=xcb_intern_atom_reply(con, cookie0, NULL);
-+
- xcb_get_property_cookie_t cookie =
-- xcb_get_property(con, 0, screen->root, NET_CLIENT_LIST, WINDOW, 0,
-- std::numeric_limits<uint32_t>::max());
-+ xcb_get_property(con, 0, screen->root, reply0->atom, XCB_ATOM_WINDOW, 0,
-+ std::numeric_limits<uint32_t>::max());
-
- xcb_generic_error_t *error;
- xcb_get_property_reply_t *reply =
-@@ -554,7 +558,7 @@ int main(int argc, char *argv[])
- xcb_get_property_reply_t *reply2;
-
- // check WM_COMMAND
-- cookie = xcb_get_property(con, 0, clients[c], WM_COMMAND, STRING,
-+ cookie = xcb_get_property(con, 0, clients[c], XCB_ATOM_WM_COMMAND, XCB_ATOM_STRING,
- 0, std::numeric_limits<uint32_t>::max());
- reply2 = xcb_get_property_reply(con, cookie, &error);
- if(!error) // ignore errors
-@@ -571,7 +575,7 @@ int main(int argc, char *argv[])
- }
-
- // check WM_CLASS
-- cookie = xcb_get_property(con, 0, clients[c], WM_CLASS, STRING,
-+ cookie = xcb_get_property(con, 0, clients[c], XCB_ATOM_WM_CLASS, XCB_ATOM_STRING,
- 0, std::numeric_limits<uint32_t>::max());
- reply2 = xcb_get_property_reply(con, cookie, &error);
- if(!error) // ignore errors
---
-1.7.10.1
-
diff --git a/debian/patches/0002-re-enable-X11-screensaver-build.patch b/debian/patches/0002-re-enable-X11-screensaver-build.patch
deleted file mode 100644
index d42e63b..0000000
--- a/debian/patches/0002-re-enable-X11-screensaver-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
->From d5cb7777c766c302ce0d9c37315bae7468ae297c Mon Sep 17 00:00:00 2001
-From: Bernd Machenschalk <bernd.machenschalk at ligo.org>
-Date: Mon, 21 May 2012 17:39:14 +0200
-Subject: [PATCH 2/2] re-enable X11 screensaver build
-
----
- Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: boinc/Makefile.am
-===================================================================
---- boinc.orig/Makefile.am 2012-05-18 14:28:57.925461036 +0200
-+++ boinc/Makefile.am 2012-05-22 01:03:09.000000000 +0200
-@@ -22,9 +22,9 @@
-
- if ENABLE_MANAGER
- CLIENTGUI_SUBDIRS = clientgui locale
--#if BUILD_X11_SCREENSAVER
--# CLIENTGUI_SUBDIRS += clientscr
--#endif
-+if BUILD_X11_SCREENSAVER
-+ CLIENTGUI_SUBDIRS += clientscr
-+endif
- endif
-
- # ORDER MATTERS below. One must build dependencies FIRST, then things
-Index: boinc/clientscr/Makefile.am
-===================================================================
---- boinc.orig/clientscr/Makefile.am 2012-03-31 13:44:23.051165746 +0200
-+++ boinc/clientscr/Makefile.am 2012-05-22 01:12:36.804981415 +0200
-@@ -3,6 +3,7 @@
-
- include $(top_srcdir)/Makefile.incl
-
-+AM_LDFLAGS += -lpthread
- if ENABLE_CLIENT_RELEASE
- AM_LDFLAGS += -static-libtool-libs
- ## for an entirely statically linked library, you may want to try
diff --git a/debian/patches/boinc-ftbfs-hurd.patch b/debian/patches/boinc-ftbfs-hurd.patch
deleted file mode 100644
index f3992ba..0000000
--- a/debian/patches/boinc-ftbfs-hurd.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: David Anderson
-
-
-Origin: upstream, 9506b117 http://boinc.berkeley.edu/trac/changeset/9506b117a1df4d5754d891ec12cb8aa76d4dd192/boinc
-Forwarded: not-needed
-Reviewed-By: costamagnagianfranco at yahoo.it
-Last-Update: <2012-11-01>
-
---- boinc-7.0.36+dfsg.orig/lib/filesys.h
-+++ boinc-7.0.36+dfsg/lib/filesys.h
-@@ -35,7 +35,7 @@
- #endif
-
- #ifndef MAXPATHLEN
--#define MAXPATHLEN 1024
-+#define MAXPATHLEN 4096
- #endif
-
- #endif /* !WIN32 */
---- boinc-7.0.36+dfsg.orig/lib/gui_rpc_client.h
-+++ boinc-7.0.36+dfsg/lib/gui_rpc_client.h
-@@ -33,13 +33,14 @@
- #include <locale.h>
- #endif
-
--#include "miofile.h"
--#include "prefs.h"
--#include "hostinfo.h"
-+#include "cc_config.h"
- #include "common_defs.h"
--#include "notice.h"
-+#include "filesys.h"
-+#include "hostinfo.h"
-+#include "miofile.h"
- #include "network.h"
--#include "cc_config.h"
-+#include "notice.h"
-+#include "prefs.h"
-
- struct GUI_URL {
- std::string name;
---- boinc-7.0.36+dfsg.orig/lib/boinc_win.h
-+++ boinc-7.0.36+dfsg/lib/boinc_win.h
-@@ -22,10 +22,6 @@
- #ifndef _BOINC_WIN_
- #define _BOINC_WIN_
-
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 4096
--#endif
--
- #ifndef __CYGWIN32__
-
- // Windows C Runtime Library
---- boinc-7.0.36+dfsg.orig/lib/common_defs.h
-+++ boinc-7.0.36+dfsg/lib/common_defs.h
-@@ -191,5 +191,4 @@ struct VERSION_INFO {
- #define DEFAULT_SS_EXECUTABLE "boincscr"
- #endif
-
--
- #endif
diff --git a/debian/patches/boinc-ftbfs.patch b/debian/patches/boinc-ftbfs.patch
deleted file mode 100644
index 86f51a1..0000000
--- a/debian/patches/boinc-ftbfs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description:
- This patch should fix the ftbfs introduced by boinc-ftbfs-hurd.patch
-Author: Rom Walton
-
-Origin: upstream, 4e84139 http://boinc.berkeley.edu/trac/changeset/4e841398c9b4c901e85788b32cb1c2630ef0c390/boinc
-Forwarded: not-needed
-Reviewed-By: costamagnagianfranco at yahoo.it
-Last-Update: <2012-11-2>
-
---- boinc-7.0.36+dfsg.orig/client/client_types.h
-+++ boinc-7.0.36+dfsg/client/client_types.h
-@@ -36,6 +36,7 @@
- #include "hostinfo.h"
- #include "coproc.h"
- #include "miofile.h"
-+#include "filesys.h"
- #include "common_defs.h"
- #include "cc_config.h"
-
---- boinc-7.0.36+dfsg.orig/lib/proxy_info.h
-+++ boinc-7.0.36+dfsg/lib/proxy_info.h
-@@ -19,6 +19,7 @@
- #define _PROXY_INFO_
-
- #include "miofile.h"
-+#include "parse.h"
-
- // info on whether HTTP requests need to go through a proxy
- //
diff --git a/debian/patches/printf.patch b/debian/patches/printf.patch
deleted file mode 100644
index 7017e2b..0000000
--- a/debian/patches/printf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boinc/client/cs_statefile.cpp
-===================================================================
---- boinc.orig/client/cs_statefile.cpp 2012-05-03 13:38:04.328171383 +0200
-+++ boinc/client/cs_statefile.cpp 2012-05-03 13:53:32.507458470 +0200
-@@ -865,7 +865,7 @@
- _("File referenced in app_info.xml does not exist: ")
- );
- strcat(buf, fip->name);
-- msg_printf(p, MSG_USER_ALERT, buf);
-+ msg_printf(p, MSG_USER_ALERT, "%s", buf);
- delete fip;
- continue;
- }
diff --git a/debian/patches/redundant_i.patch b/debian/patches/redundant_i.patch
deleted file mode 100644
index 095653d..0000000
--- a/debian/patches/redundant_i.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: Bringing variable declarations to where they are used.
-Index: boinc/clientgui/BOINCListCtrl.cpp
-===================================================================
---- boinc.orig/clientgui/BOINCListCtrl.cpp 2011-03-17 18:51:03.000000000 +0100
-+++ boinc/clientgui/BOINCListCtrl.cpp 2012-01-22 12:26:50.000000000 +0100
-@@ -267,7 +267,7 @@
-
- void CBOINCListCtrl::DrawProgressBars()
- {
-- long topItem, numItems, numVisibleItems, i, row;
-+ long topItem, numItems, numVisibleItems, row;
- wxRect r, rr;
- int w = 0, x = 0, xx, yy, ww;
- int progressColumn = m_pParentView->GetProgressColumn();
-@@ -300,7 +300,7 @@
- if (numItems <= (topItem + numVisibleItems)) numVisibleItems = numItems - topItem;
-
- x = 0;
-- for (i=0; i< progressColumn; i++) {
-+ for (int i=0; i< progressColumn; i++) {
- x += GetColumnWidth(i);
- }
- w = GetColumnWidth(progressColumn);
diff --git a/debian/patches/screen_saver_boinc_extra.patch b/debian/patches/screen_saver_boinc_extra.patch
deleted file mode 100644
index fc1e35b..0000000
--- a/debian/patches/screen_saver_boinc_extra.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: boinc/clientscr/screensaver_x11.cpp
-===================================================================
---- boinc.orig/clientscr/screensaver_x11.cpp 2012-05-22 01:03:09.000000000 +0200
-+++ boinc/clientscr/screensaver_x11.cpp 2012-05-22 23:37:35.829892017 +0200
-@@ -23,7 +23,7 @@
- //
- // GL: boincscr -root \n\
- //
--// If your BOINC directory differs from /var/lib/boinc, you can use
-+// If your BOINC directory differs from /var/lib/boinc-client, you can use
- // the -boinc_dir command line argument.
- //
- // When run, this screensaver connects to the BOINC client via RPC, asks for
-@@ -404,7 +404,7 @@
- {
- unsigned long int window_id = 0;
- bool windowed = true;
-- std::string boinc_wd = "/var/lib/boinc";
-+ std::string boinc_wd = "/var/lib/boinc-client";
-
- // parse command line
- for(int c = 0; c < argc; c++)
diff --git a/debian/patches/series b/debian/patches/series
index 3ba80c0..b3b8f38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,7 +31,6 @@ uninitialised_client_states.patch
# --- Z --- Currently not applicable
#Z#no_std_string.patch
clang_incompatibilities.patch
-#printf.patch #accepted upstream in 7.0.38 release
#either these 3
#convinceDavid# nvidia_detect_buffers.patch
#convinceDavid# nvidia_detect_bugs.patch
@@ -45,22 +44,13 @@ dTotalGlobalMem.patch
nvidia_mem_display_simplification.patch
api_NULL_not_defined.patch
unlink_undefined.patch
-#0001-Patch-from-Steffen-Moeller-for-recent-Xcb.patch #accepted upstream in 7.0.38 release
-
-
-#patches partially applied in trunk rev=26133
-#0002-re-enable-X11-screensaver-build.patch #accepted upstream in 7.0.38 release
cppcheck_realloc.patch
cppcheck_avoid_redundant_check.patch
-#upstream_sztaki_reduce_accessibility_of_php_inc_file.patch #accepted upstream in 7.0.38 release
MainDocumentWarnings.patch
more_maxpathlen.patch
opendir_error_messages.patch
-#redundant_i.patch #accepted upstream in 7.0.38 release
-#screen_saver_boinc_extra.patch #accepted upstream in 7.0.38 release
sched_driver_char_buffers.patch
csh2tcsh.patch
-
#socklenBuildFixByDavid.patch
ensure_there_is_no_newline_in_passwd.patch
add_hardening_flags.patch
@@ -73,10 +63,8 @@ ticket_1168_verifycerts.patch
better_makefiles.patch
client_app_maxpathlen.patch
#debian specific patches
-#boinclib_shared.patch is needed in order to make boinc build correctly otherwise it will FTBFS
+#boinclib_shared.patch #needed in order to make boinc build correctly otherwise it will FTBFS
boinclib_shared.patch
dynamic_libboinc.patch
Missing_libSched.patch
missing_libs_wrapper.patch
-#boinc-ftbfs-hurd.patch
-#boinc-ftbfs.patch
diff --git a/debian/patches/upstream_sztaki_reduce_accessibility_of_php_inc_file.patch b/debian/patches/upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
deleted file mode 100644
index 49fa97a..0000000
--- a/debian/patches/upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Description: About nothing should be world writable.
-Index: boinc/test/test.inc
-===================================================================
---- boinc.orig/test/test.inc 2011-06-12 20:42:41.000000000 +0200
-+++ boinc/test/test.inc 2011-06-12 20:43:04.000000000 +0200
-@@ -348,9 +348,9 @@
- function mkdir($dir, $chmod=0)
- {
- $d = "$this->project_dir/$dir";
-- mkdir($d,0777);
-+ mkdir($d,0775);
- if ($chmod) {
-- chmod($d, 0777);
-+ chmod($d, 0775);
- }
- }
-
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list