[boinc] 03/04: Update to new release, patch refresh, upload to unstable
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Nov 21 22:14:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit 11b2cd2707d4c4ea12960978cb38a94e46402ae0
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Nov 21 19:50:46 2015 +0100
Update to new release, patch refresh, upload to unstable
---
debian/changelog | 8 ++++++++
debian/copyright | 20 ------------------
.../patches/addressing_additional_html_dirs.patch | 2 +-
debian/patches/boinclib_shared.patch | 24 ----------------------
debian/patches/cppcheck_realloc.patch | 2 +-
debian/patches/disable_new_version_check.patch | 2 +-
debian/patches/filesys_error_message.patch | 2 +-
debian/patches/fopen_closing.patch | 20 ++++++++----------
debian/patches/more_maxpathlen.patch | 4 ++--
debian/patches/possible_size_type_error.patch | 2 +-
debian/patches/some_extra_clang_warnings.patch | 10 ++++-----
11 files changed, 28 insertions(+), 68 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d65789..de6d2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.6.17+dfsg-1) unstable; urgency=medium
+
+ * Upload to unstable.
+ * New upstream release, patch refresh.
+ * Update copyright, remove stuff deleted from upstream.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Sat, 21 Nov 2015 19:42:01 +0100
+
boinc (7.6.15+dfsg-1exp1) experimental; urgency=medium
* Upload to experimental again, with the boinc-server-* packages.
diff --git a/debian/copyright b/debian/copyright
index f41ce24..6cdf391 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,30 +21,10 @@ Copyright:
2004-2014 Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
License: GPL-2+
-Files: dcapi/*
-Copyright:
- 2006-2007 Daniel Drotos
- 2005-2006 Gabor Vida
- 20069 MTA SZTAKI
-License: LGPL-3+
-
Files: doc/manpages/*.xml
Copyright: 2007-2008 University of California
License: GFDL-NIV-1.2+
-Files: rboinc/server/etc/rboinc_httpd_conf
- rboinc/client/boinc_retrieve.pl
- rboinc/client/boinc_submit.pl
- rboinc/client/boinc_lib.pl
- rboinc/server/boinc_authentication.pl
- rboinc/server/boinc_submit_server.pl
- rboinc/server/boinc_configuration.pl
- rboinc/server/boinc_retrieve_server.pl
- rboinc/server/boinc_configuration_template.pl
-Copyright: 2009-2010 Toni Giorgino
- 2010 Universitat Pompeu Fabra
-License: LGPL-3+
-
Files: rboinc/monitoring/Text/Table.pm
rboinc/monitoring/Text/Aligner.pm
Copyright: 2002 Anno Siegel.
diff --git a/debian/patches/addressing_additional_html_dirs.patch b/debian/patches/addressing_additional_html_dirs.patch
index b1593f5..21f4ceb 100644
--- a/debian/patches/addressing_additional_html_dirs.patch
+++ b/debian/patches/addressing_additional_html_dirs.patch
@@ -6,4 +6,4 @@ Description: Adding some missing html dirs to the install script
install-data-local:
mkdir -p $(htmldir)
- cp -r $(srcdir)/inc $(srcdir)/languages $(srcdir)/ops $(srcdir)/user $(htmldir)
-+ cp -r $(srcdir)/bt $(srcdir)/drupal $(srcdir)/inc $(srcdir)/languages $(srcdir)/ops $(srcdir)/project.sample $(srcdir)/queue $(srcdir)/user $(htmldir)
++ cp -r $(srcdir)/drupal $(srcdir)/inc $(srcdir)/languages $(srcdir)/ops $(srcdir)/project.sample $(srcdir)/user $(htmldir)
diff --git a/debian/patches/boinclib_shared.patch b/debian/patches/boinclib_shared.patch
index 7647ec7..db2e935 100644
--- a/debian/patches/boinclib_shared.patch
+++ b/debian/patches/boinclib_shared.patch
@@ -82,30 +82,6 @@ Index: boinc/clientscr/Makefile.am
## for an entirely statically linked library, you may want to try
## -all-static instead. There's a good chance it won't work properly,
## so we'll use the safer "-static-libtool-libs" by default.
---- boinc-7.6.7+dfsg.orig/dcapi/boinc/Makefile.am
-+++ boinc-7.6.7+dfsg/dcapi/boinc/Makefile.am
-@@ -36,4 +36,3 @@ libdcapi_client_boinc_la_LIBADD = \
- ../common/libdcapi-common-client.la \
- $(BOINC_CLIENT_LIBS)
- libdcapi_client_boinc_la_CPPFLAGS = $(AM_CPPFLAGS) $(BOINC_CPPFLAGS)
--libdcapi_client_boinc_la_LDFLAGS = -static
---- boinc-7.6.7+dfsg.orig/dcapi/condor/Makefile.am
-+++ boinc-7.6.7+dfsg/dcapi/condor/Makefile.am
-@@ -42,7 +42,6 @@ libdcapi_client_condor_la_SOURCES = cond
- condor_utils.c
-
- libdcapi_client_condor_la_LIBADD = ../common/libdcapi-common-client.la
--libdcapi_client_condor_la_LDFLAGS = -static
-
- #appdir = $(libdir)/dcapi/condor
- #app_PROGRAMS = tss tm
---- boinc-7.6.7+dfsg.orig/dcapi/local/Makefile.am
-+++ boinc-7.6.7+dfsg/dcapi/local/Makefile.am
-@@ -35,4 +35,3 @@ libdcapi_client_local_la_SOURCES = \
- local_utils.c \
- local_common.c
- libdcapi_client_local_la_LIBADD = ../common/libdcapi-common-client.la
--libdcapi_client_local_la_LDFLAGS = -static
--- boinc-7.6.7+dfsg.orig/sched/Makefile.am
+++ boinc-7.6.7+dfsg/sched/Makefile.am
@@ -4,7 +4,6 @@
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 4ded9fb..af0fe1e 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -3,7 +3,7 @@ Description: Initialisation.
--- a/lib/crypt.cpp
+++ b/lib/crypt.cpp
-@@ -345,6 +345,7 @@
+@@ -348,6 +348,7 @@
char clear_buf[MD5_LEN];
int n, retval;
DATA_BLOCK clear_signature;
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 8a72e90..1fc26d5 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
-@@ -609,7 +609,7 @@
+@@ -602,7 +602,7 @@
// inform the user if there's a newer version of client
//
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index b98e2b8..37c7af4 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -15,7 +15,7 @@ Description: this patch adds an useful error message in case of dir open failure
#endif
return dirp;
}
-@@ -615,7 +620,7 @@ static int boinc_rename_aux(const char*
+@@ -623,7 +628,7 @@ static int boinc_rename_aux(const char*
//
int retval = rename(old, newf);
if (retval) {
diff --git a/debian/patches/fopen_closing.patch b/debian/patches/fopen_closing.patch
index a7b80c9..c571da0 100644
--- a/debian/patches/fopen_closing.patch
+++ b/debian/patches/fopen_closing.patch
@@ -2,7 +2,7 @@ Description: this patch makes boinc correctly close the open files.
This patch allows also MFILE to correctly deallocate its pointers by calling close().
--- a/lib/crypt_prog.cpp
+++ b/lib/crypt_prog.cpp
-@@ -152,6 +152,8 @@ int main(int argc, char** argv) {
+@@ -154,6 +154,8 @@ int main(int argc, char** argv) {
if (!fpub) die("fopen");
print_key_hex(fpriv, (KEY*)&private_key, sizeof(private_key));
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
@@ -11,7 +11,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign")) {
if (argc < 4) {
-@@ -166,6 +168,7 @@ int main(int argc, char** argv) {
+@@ -168,6 +170,7 @@ int main(int argc, char** argv) {
signature.len = 256;
retval = sign_file(argv[2], private_key, signature);
print_hex_data(stdout, signature);
@@ -19,7 +19,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-sign_string")) {
if (argc < 4) {
usage();
-@@ -177,6 +180,7 @@ int main(int argc, char** argv) {
+@@ -179,6 +182,7 @@ int main(int argc, char** argv) {
if (retval) die("scan_key_hex\n");
generate_signature(argv[2], cbuf, private_key);
puts(cbuf);
@@ -27,7 +27,7 @@ Description: this patch makes boinc correctly close the open files.
} else if (!strcmp(argv[1], "-verify")) {
if (argc < 5) {
usage();
-@@ -190,6 +194,8 @@ int main(int argc, char** argv) {
+@@ -193,6 +197,8 @@ int main(int argc, char** argv) {
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -36,7 +36,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("scan_hex_data");
char md5_buf[64];
-@@ -219,6 +225,8 @@ int main(int argc, char** argv) {
+@@ -222,6 +228,8 @@ int main(int argc, char** argv) {
if (!fpub) die("fopen");
retval = scan_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
if (retval) die("read_public_key");
@@ -45,7 +45,7 @@ Description: this patch makes boinc correctly close the open files.
strcpy((char*)buf2, "encryption test successful");
in.data = buf2;
in.len = strlen((char*)in.data);
-@@ -236,6 +244,7 @@ int main(int argc, char** argv) {
+@@ -240,6 +248,7 @@ int main(int argc, char** argv) {
signature.data = signature_buf;
signature.len = 256;
retval = scan_hex_data(f, signature);
@@ -53,7 +53,7 @@ Description: this patch makes boinc correctly close the open files.
if (retval) die("cannot scan_hex_data");
certpath = check_validity(argv[4], argv[2], signature.data, argv[5]);
if (certpath == NULL) {
-@@ -391,6 +400,7 @@ int main(int argc, char** argv) {
+@@ -404,6 +413,7 @@ int main(int argc, char** argv) {
die("fopen");
}
print_key_hex(fpub, (KEY*)&public_key, sizeof(public_key));
@@ -63,11 +63,7 @@ Description: this patch makes boinc correctly close the open files.
} else {
--- a/lib/mfile.cpp
+++ b/lib/mfile.cpp
-@@ -38,10 +38,11 @@
- MFILE::MFILE() {
- buf = (char*)malloc(64*1024);
- len = 0;
-+ f = NULL;
+@@ -42,7 +42,7 @@
}
MFILE::~MFILE() {
diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 93abe39..67f3440 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -30,7 +30,7 @@ Description: use MAXPATHLEN and change sprintf to snprintf
if (is_dir(subdir)) {
if (recurse) {
-@@ -564,8 +564,8 @@
+@@ -566,8 +566,8 @@
}
return 0;
#elif defined(__EMX__)
@@ -41,7 +41,7 @@ Description: use MAXPATHLEN and change sprintf to snprintf
return system(cmd);
#else
// POSIX requires that shells run from an application will use the
-@@ -700,7 +700,7 @@
+@@ -708,7 +708,7 @@
p = strchr(q, '/');
if (!p) break;
*p = 0;
diff --git a/debian/patches/possible_size_type_error.patch b/debian/patches/possible_size_type_error.patch
index 6b9d097..93cf43d 100644
--- a/debian/patches/possible_size_type_error.patch
+++ b/debian/patches/possible_size_type_error.patch
@@ -19,7 +19,7 @@ Description: int may not be enough (theoretically) for large files.
// delay opening the file until we've done the first socket read
// to avoid filesystem lockups (WCG, possible paranoia)
-@@ -209,7 +209,7 @@
+@@ -221,7 +221,7 @@
// try to write n bytes to file
//
diff --git a/debian/patches/some_extra_clang_warnings.patch b/debian/patches/some_extra_clang_warnings.patch
index e8d3f56..be6751a 100644
--- a/debian/patches/some_extra_clang_warnings.patch
+++ b/debian/patches/some_extra_clang_warnings.patch
@@ -3,7 +3,7 @@ Description: fixing some clang warning.
addressed this.
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
-@@ -425,8 +425,7 @@
+@@ -426,8 +426,7 @@
CMainDocument* pDoc = wxGetApp().GetDocument();
ProjectSelectionData* selData;
PROJECT* project;
@@ -13,7 +13,7 @@ Description: fixing some clang warning.
if ( pDoc->IsConnected() ) {
int projCnt = pDoc->GetSimpleProjectCount();
-@@ -434,10 +433,11 @@
+@@ -435,10 +434,11 @@
oldProjectSelection = m_ProjectSelectionCtrl->GetSelection();
// If a new project has been added, figure out which one
@@ -27,7 +27,7 @@ Description: fixing some clang warning.
ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j))->project_url;
if (!strcmp(project->master_url, ctrl_url)) {
found = true;
-@@ -449,7 +449,7 @@
+@@ -450,7 +450,7 @@
if ( !found ) {
wxString projname(project->project_name.c_str(), wxConvUTF8);
#if SORTPROJECTLIST
@@ -36,7 +36,7 @@ Description: fixing some clang warning.
for(j = 0; j < ctrlCount; ++j) {
alphaOrder = (m_ProjectSelectionCtrl->GetString(j)).CmpNoCase(projname);
if (alphaOrder > 0) {
-@@ -481,8 +481,8 @@
+@@ -483,8 +483,8 @@
if ( projCnt < ctrlCount ) {
project = NULL;
// Check items in descending order so deletion won't change indexes of items yet to be checked
@@ -47,7 +47,7 @@ Description: fixing some clang warning.
project = pDoc->state.lookup_project(ctrl_url);
if ( project == NULL ) {
selData = (ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(j);
-@@ -510,9 +510,9 @@
+@@ -512,9 +512,9 @@
// Check to see if we need to reload the project icon
ctrlCount = m_ProjectSelectionCtrl->GetCount();
--
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