CVS commit: pkgsrc/security/tor-browser

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat May 25 10:50:42 UTC 2019

Modified Files:
        pkgsrc/security/tor-browser: Makefile PLIST distinfo

Log Message:
tor-browser: update to 60.7.0esr 8.5 1 build 1

Use official tarball, now that one exists!


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/tor-browser/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/tor-browser/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.42 pkgsrc/security/tor-browser/Makefile:1.43
--- pkgsrc/security/tor-browser/Makefile:1.42   Wed May 22 14:24:43 2019
+++ pkgsrc/security/tor-browser/Makefile        Sat May 25 10:50:42 2019
@@ -1,34 +1,24 @@
-# $NetBSD: Makefile,v 1.42 2019/05/22 14:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/25 10:50:42 wiz Exp $
 
-DISTNAME=      tor-browser-60.6.1esr-8.5-2-build2
-PKGNAME=       tor-browser-8.5.60.6.1
+DISTNAME=      src-firefox-tor-browser-60.7.0esr-8.5-1-build1
+PKGNAME=       tor-browser-8.5.60.7.0
 CATEGORIES=    www
-# DISTFILE manually packaged from git checkout using
-# mv tor-browser/.git .
-# tar cvzf ${DISTNAME}.tar.gz tor-browser
-# mv .git tor-browser/
+MASTER_SITES=  https://dist.torproject.org/torbrowser/8.5/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://www.torproject.org/projects/torbrowser.html.en
 COMMENT=       Tor Browser based on Firefox
 LICENSE=       mpl-1.1
 
-WRKSRC=                ${WRKDIR}/tor-browser
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/src-//}
 
 DEPENDS+=      tor-[0-9]*:../../net/tor
 
+EXTRACT_USING= bsdtar
+
 # How to update this package:
 #
-# make a tarball:
-# git clone https://git.torproject.org/tor-browser.git
-# cd tor-browser
-# git fetch --tags
-# git tag -l
-# (choose a tag, here tor-browser-60.5.1esr-8.5-1-build2)
-# git checkout tor-browser-60.5.1esr-8.5-1-build2
-# cd ..
-# tar -cvzf tor-browser-60.5.1esr-8.5-1-build2.tar.gz --exclude .git tor-browser
-#
 # replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
 # BUT keep patch-xpcom_io_TorFileUtils.cpp!
 # make the patches apply

Index: pkgsrc/security/tor-browser/PLIST
diff -u pkgsrc/security/tor-browser/PLIST:1.4 pkgsrc/security/tor-browser/PLIST:1.5
--- pkgsrc/security/tor-browser/PLIST:1.4       Wed May 22 14:24:43 2019
+++ pkgsrc/security/tor-browser/PLIST   Sat May 25 10:50:42 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/05/22 14:24:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/05/25 10:50:42 wiz Exp $
 bin/tor-browser
 lib/tor-browser/application.ini
 lib/tor-browser/browser/blocklist.xml
@@ -3911,7 +3911,6 @@ lib/tor-browser/modules/third_party/jses
 lib/tor-browser/modules/vtt.jsm
 lib/tor-browser/modules/workers/PromiseWorker.js
 lib/tor-browser/modules/workers/require.js
-lib/tor-browser/pingsender
 lib/tor-browser/platform.ini
 lib/tor-browser/plugin-container
 lib/tor-browser/removed-files

Index: pkgsrc/security/tor-browser/distinfo
diff -u pkgsrc/security/tor-browser/distinfo:1.8 pkgsrc/security/tor-browser/distinfo:1.9
--- pkgsrc/security/tor-browser/distinfo:1.8    Wed May 22 14:24:43 2019
+++ pkgsrc/security/tor-browser/distinfo        Sat May 25 10:50:42 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2019/05/22 14:24:43 wiz Exp $
+$NetBSD: distinfo,v 1.9 2019/05/25 10:50:42 wiz Exp $
 
-SHA1 (tor-browser-60.6.1esr-8.5-2-build2.tar.gz) = 713bc3d58625a173d193b27ed42b8de2e7658016
-RMD160 (tor-browser-60.6.1esr-8.5-2-build2.tar.gz) = 0a1a293ed2882e9dad0b3b12e4d2d1c9e627cbc1
-SHA512 (tor-browser-60.6.1esr-8.5-2-build2.tar.gz) = 11fe54b0228b0be1acaa33f144088a4cbb6210b011c7f0326d120251a003530c17d6edc2a55eaad85ee846c40daac94977598acf2314de0313aaa1794f3c29b3
-Size (tor-browser-60.6.1esr-8.5-2-build2.tar.gz) = 390285348 bytes
+SHA1 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 2521274bb159d2ed3a955094d19330cdb13b3041
+RMD160 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 41e5674c7eca8ea14cc57be16ffeed97a2753c1b
+SHA512 (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 5b58abffab98cc43de19d6fcc0416e195487ce39226c5dfedc6ddeb6194b2660bbd4bf895f690e277cfdb9205898b3ae8330c1557101a55efe4749ed85e8c23d
+Size (src-firefox-tor-browser-60.7.0esr-8.5-1-build1.tar.xz) = 279370536 bytes
 SHA1 (patch-.mozconfig) = 3377e91db2560d79503e9a9dd69011f5a84b6994
 SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6