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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a52591b22153fb69c5d875d6442603de45c6c15f
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed Feb 1 15:51:51 2012 +0100

    First shot at #658231

diff --git a/debian/patches/mac_addresses_cores_in_kfreebsd.patch b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
new file mode 100644
index 0000000..ae36b3c
--- /dev/null
+++ b/debian/patches/mac_addresses_cores_in_kfreebsd.patch
@@ -0,0 +1,26 @@
+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 @@
+ 
+ bool
+ get_mac_addresses(char* addresses) {
++    if (!addresses) {
++        perror("get_mac_addresses: 'addresses' parameter was NULL");
++        return false;
++    }
+ #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 @@
+         }
+         hw_addr=(struct ether_addr *)&(item->lifr_lifru.lifru_enaddr);  
+ #endif
++        if (!hw_addr) {
++            perror("get_mac_addresses: Could not determine hw_addr");
++            return false;
++        }
+         strcat(addresses, delimiter);
+         delimiter[0] = ':';
+         delimiter[1] = '\0';
diff --git a/debian/patches/series b/debian/patches/series
index 87aaba9..95e5a2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+mac_addresses_cores_in_kfreebsd.patch
 stripchart_debian.patch
 upstream_sztaki_configureEval.patch
 generate_less.patch

-- 
BOINC packaging