From 4c1deb830a1fdb8479a1655234c8565432568799 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 7 Mar 2014 21:25:17 +0000 Subject: MFH: r347413 Switch to using Google's tarball for both the browser and the test data. This removes one chain in the link of trust since the tarball is no longer modified and rerolled locally. This means the Courgette code is now included, but it is only compiled and used on Windows platforms to distribute binary updates. Legal documentation: http://law.justia.com/cases/federal/district-courts/massachusetts/madce/1:2009cv11813/125212/47/ Discussed with: portmgr/core (tabthorpe), FreeBSD Foundation (gnn) Approved by: portmgr (tabthorpe) --- www/chromium/Makefile | 12 ++++-------- www/chromium/distinfo | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index f2d851d77f27..a3860b0571ea 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -4,14 +4,10 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -DISTVERSIONPREFIX= courgette-redacted- DISTVERSION= 33.0.1750.146 CATEGORIES= www -MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ - http://download.goodking.org/downloads/:browser \ - LOCAL/rene:browser \ - http://files.etoilebsd.net/goodking/:browser -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser +MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ @@ -19,7 +15,6 @@ COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ @@ -98,6 +93,8 @@ OPTIONS_DEFAULT= CODECS GCONF GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} + .include .if ${PORT_OPTIONS:MCODECS} @@ -132,7 +129,6 @@ LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} -DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata .endif DEBUG_MAKE_ENV= V=1 diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 5e5a06f8b8cc..cfeda3cb6e50 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 8030316421e197de8ce7a0fa7dcb3809e3abff5c87dbd599531cc254ec527e6f -SIZE (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 197160536 +SHA256 (chromium-33.0.1750.146.tar.xz) = d5b0e7a0f086aac200493fe4e5849ca84e9e21f7770c5d5830060da9fc2c4a74 +SIZE (chromium-33.0.1750.146.tar.xz) = 185394896 SHA256 (chromium-33.0.1750.146-testdata.tar.xz) = 918ccc080788ea9b8eba2e479b521c22b37b14c62d4bc0906d7f15a88f12c84c SIZE (chromium-33.0.1750.146-testdata.tar.xz) = 112429020 -- cgit v1.2.3