From 439e4f447ebed6923939d5d10e01f604fecd5511 Mon Sep 17 00:00:00 2001 From: rene Date: Fri, 28 Feb 2014 10:23:09 +0000 Subject: - Fix build on FreeBSD < 10, which need a C++11 library. - Fix a strncpy() in a patch I wrote by actually allocating storage space fo - Bump PORTREVISION MFH: 2014Q1 --- www/chromium/Makefile | 3 ++- ...er__extensions__api__music_manager_private__device_id_linux.cc | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'www/chromium') diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7678657558c9..6265bc622722 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -6,6 +6,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- DISTVERSION= 33.0.1750.117 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ @@ -46,7 +47,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison compiler:c++11-lang desktop-file-utils pkgconfig \ +USES= bison compiler:c++11-lib desktop-file-utils pkgconfig \ perl5 shebangfix ninja USE_PERL5= build USE_PYTHON_BUILD= 2 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 index 0b8519f4dbbd..fbacc011b063 100644 --- 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 @@ -1,5 +1,5 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 -+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-25 00:17:02.000000000 +0100 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-28 11:05:01.000000000 +0100 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" @@ -39,8 +39,8 @@ + } + } + -+ char* mac_address = nullptr; -+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), 6); ++ 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); -- cgit