1 files changed, 66 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
new file mode 100644
index 000000000000..0ae188069823
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
@@ -0,0 +1,66 @@
+--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
+@@ -4,6 +4,10 @@
+ 
+ #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
+ 
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <net/if_dl.h>
++#endif
+ #include <ifaddrs.h>
+ #include <net/if.h>
+ #include <stddef.h>
+@@ -105,11 +109,33 @@ class MacAddressProcessor {
+                         const char* const prefixes[],
+                         size_t prefixes_count) {
+     const int MAC_LENGTH = 6;
++#if defined(OS_FREEBSD)
++    struct ifaddrs *ifap, *ifinfo;
++#else
+     struct ifreq ifinfo;
++#endif
+ 
+     memset(&ifinfo, 0, sizeof(ifinfo));
+-    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+ 
++#if defined(OS_FREEBSD)
++    int result = getifaddrs(&ifap);
++    if (result != 0)
++      return true;
++    result = 1; // no MAC found yet
++    for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
++      struct sockaddr* sa = ifinfo->ifa_addr;
++      if (sa->sa_family == AF_LINK &&
++        !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
++        sizeof(ifinfo->ifa_name) - 1)) { 
++          result = 0;
++	  break;
++      }
++    }
++
++    char mac_address[6];
++    strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
++#else
++    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+     int sd = socket(AF_INET, SOCK_DGRAM, 0);
+     int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
+     close(sd);
+@@ -119,11 +145,17 @@ class MacAddressProcessor {
+ 
+     const char* mac_address =
+         static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
++#endif
+     if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
+       return true;
+ 
++#if defined(OS_FREEBSD)
++    if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
++      return true;
++#else
+     if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
+       return true;
++#endif
+ 
+     // Got one!
+     found_mac_address_ =