[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-414-geec4d18

Steffen Moeller moeller at debian.org
Wed Mar 14 22:37:41 UTC 2012


The following commit has been merged in the master branch:
commit 615b45bd2e528c2943ba94ecbfda2da11545372f
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Mar 3 01:20:43 2012 +0100

    Preparations for 7.0.19

diff --git a/debian/changelog b/debian/changelog
index 787c8ba..991dd66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.19+dfsg-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Steffen Moeller <moeller at debian.org>  Sat, 03 Mar 2012 01:19:45 +0100
+
 boinc (7.0.15+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/patches/cppcheck_more.patch b/debian/patches/cppcheck_more.patch
deleted file mode 100644
index 9431e0f..0000000
--- a/debian/patches/cppcheck_more.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: boinc/lib/mac_address.cpp
-===================================================================
---- boinc.orig/lib/mac_address.cpp	2012-02-03 22:45:40.000000000 +0100
-+++ boinc/lib/mac_address.cpp	2012-02-12 21:23:40.000000000 +0100
-@@ -147,7 +147,7 @@
- 		// valid, no buffer overflow
- 		PIP_ADAPTER_INFO pAdapterInfo = AdapterInfo; // Contains pointer to current adapter info
- 		do {
--			sprintf(addresses, "%s%s%02x:%02x:%02x:%02x:%02x:%02x", addresses, delimiter,
-+			sprintf(addresses, "%s%s%02x:%02x:%02x:%02x:%02x:%02x", "", delimiter,
- 					pAdapterInfo->Address[0], pAdapterInfo->Address[1], pAdapterInfo->Address[2], 
- 					pAdapterInfo->Address[3], pAdapterInfo->Address[4], pAdapterInfo->Address[5]);
- 			delimiter[0] = ':';
diff --git a/debian/patches/cppcheck_realloc.patch b/debian/patches/cppcheck_realloc.patch
index 75c0610..b4c1044 100644
--- a/debian/patches/cppcheck_realloc.patch
+++ b/debian/patches/cppcheck_realloc.patch
@@ -1,75 +1,3 @@
-Index: boinc/lib/parse.cpp
-===================================================================
---- boinc.orig/lib/parse.cpp	2012-02-16 01:37:40.000000000 +0100
-+++ boinc/lib/parse.cpp	2012-02-16 10:48:24.000000000 +0100
-@@ -178,8 +178,21 @@
-         }
-         int n = (int)strlen(line);
-         if (nused + n >= bufsize) {
--            bufsize *= 2;
--            buf = (char*)realloc(buf, bufsize);
-+            char *b = (char*)realloc(buf, bufsize*2);
-+            if (b) {
-+                buf = b;
-+                bufsize *= 2;
-+            }
-+            else {
-+                b = (char*)realloc(buf, nused+n+2);
-+		if (!b) {
-+                   fprintf(stderr,"Ran out of memory.\n");
-+                   free(buf);
-+                   return ERR_XML_PARSE;
-+		}
-+               bufsize = nused+n+2;
-+		buf = b;
-+            }
-         }
-         strcpy(buf+nused, line);
-         nused += n;
-Index: boinc/lib/susp.cpp
-===================================================================
---- boinc.orig/lib/susp.cpp	2012-02-16 01:37:40.000000000 +0100
-+++ boinc/lib/susp.cpp	2012-02-16 10:48:24.000000000 +0100
-@@ -185,12 +185,13 @@
- 
-     if (i >= bottom) {
- 	bottom += 2;
--        array = (Victim_t*)realloc (
-+        Victim_t *a= (Victim_t*)realloc (
-             array, (bottom * sizeof (Victim_t)));
--        if (array == NULL) {
-+        if (a == NULL) {
-             pthread_mutex_unlock (&mut);
-             return errno;
-         }
-+	array=a;
-         array[bottom-1].inuse = 0;	/* Clear new last entry */
-     }
- 
-Index: boinc/lib/crypt_prog.cpp
-===================================================================
---- boinc.orig/lib/crypt_prog.cpp	2012-02-16 01:37:40.000000000 +0100
-+++ boinc/lib/crypt_prog.cpp	2012-02-16 10:48:24.000000000 +0100
-@@ -109,6 +109,7 @@
-         die("can't open /dev/random\n");
-     }
-     fread(&n, sizeof(n), 1, f);
-+    fclose(f);
- #endif
-     return n;
- }
-@@ -357,10 +358,10 @@
-         } else {
-             // o2b
-             rsa_key_ = (RSA *)calloc(1, sizeof(RSA));
--            memset(rsa_key_, 0, sizeof(RSA));
-             if (rsa_key_ == NULL) {
-                 die("could not allocate memory for RSA structure.\n");
-             }
-+            //memset(rsa_key_, 0, sizeof(RSA)); // redundant (calloc initiates with 0, needs to move after if
-             if (kpriv) {
-                 fpriv = fopen (argv[4], "r");
-                 rsa_key_ = PEM_read_RSAPrivateKey(fpriv, NULL, NULL, NULL);
 Index: boinc/lib/diagnostics_win.cpp
 ===================================================================
 --- boinc.orig/lib/diagnostics_win.cpp	2012-02-16 01:37:40.000000000 +0100
@@ -105,16 +33,3 @@ Index: boinc/lib/crypt.cpp
  
      n = (int)strlen(md5_buf);
      clear_signature.data = (unsigned char*)clear_buf;
-Index: boinc/lib/mac_address.cpp
-===================================================================
---- boinc.orig/lib/mac_address.cpp	2012-02-16 10:48:24.000000000 +0100
-+++ boinc/lib/mac_address.cpp	2012-02-16 11:01:27.000000000 +0100
-@@ -115,7 +115,7 @@
- 
-                 CFDataGetBytes(refData, CFRangeMake(0,CFDataGetLength(refData)), MACAddress);
-                 sprintf(buffer, "%s%s%02x:%02x:%02x:%02x:%02x:%02x",
--                        buffer, delimiter,
-+                        "" /* was race condition: buffer */, delimiter,
-                         MACAddress[0], MACAddress[1], MACAddress[2], MACAddress[3], MACAddress[4], MACAddress[5]);
-                 CFRelease(MACAddressAsCFData);
-                 delimiter[0] = ':';
diff --git a/debian/patches/improve_opendir_warning.patch b/debian/patches/improve_opendir_warning.patch
index 91dd674..58b188f 100644
--- a/debian/patches/improve_opendir_warning.patch
+++ b/debian/patches/improve_opendir_warning.patch
@@ -8,7 +8,7 @@ Index: boinc/lib/filesys.cpp
      dirp = opendir(p);
 -    if (!dirp) return NULL;
 +    if (!dirp) {
-+        fprintf("dir_open: Could not open directory '%s'.\n",p);
++        fprintf(stderr,"dir_open: Could not open directory '%s'.\n",p);
 +        return NULL;
 +    }
  #endif
diff --git a/debian/patches/mac_addresses_cores_in_kfreebsd.patch b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
index ae36b3c..dca8e93 100644
--- a/debian/patches/mac_addresses_cores_in_kfreebsd.patch
+++ b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
@@ -1,8 +1,8 @@
 Index: boinc/lib/mac_address.cpp
 ===================================================================
---- boinc.orig/lib/mac_address.cpp	2011-10-30 00:27:06.000000000 +0200
-+++ boinc/lib/mac_address.cpp	2012-02-01 15:49:40.000000000 +0100
-@@ -134,6 +134,10 @@
+--- boinc.orig/lib/mac_address.cpp	2012-03-03 01:12:22.000000000 +0100
++++ boinc/lib/mac_address.cpp	2012-03-03 01:14:00.000000000 +0100
+@@ -144,6 +144,10 @@
  
  bool
  get_mac_addresses(char* addresses) {
@@ -13,7 +13,7 @@ Index: boinc/lib/mac_address.cpp
  #if defined(_WIN32)
      IP_ADAPTER_INFO AdapterInfo[16]; // Allocate information for up to 16 NICs
  	DWORD dwBufLen = sizeof(AdapterInfo); // Save memory size of buffer
-@@ -261,6 +265,10 @@
+@@ -264,6 +268,10 @@
          }
          hw_addr=(struct ether_addr *)&(item->lifr_lifru.lifru_enaddr);  
  #endif
diff --git a/debian/patches/series b/debian/patches/series
index cb62211..cbc7d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,6 +19,5 @@ stripchart_security.patch
 #andYetMorePatches04.patch
 #erase_while_1.patch
 redundant_i.patch
-cppcheck_more.patch
 cppcheck_realloc.patch
 cwd_handling.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list