ports/185150: [patch] security/tor: move mirrors to bsd.sites.mk

Jan Beich jbeich at tormail.org
Tue Dec 24 00:20:00 UTC 2013


>Number:         185150
>Category:       ports
>Synopsis:       [patch] security/tor: move mirrors to bsd.sites.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 24 00:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        
>Organization:
>Environment:
>Notify-List: fk at fabiankeil.de, gecko at freebsd.org

>Description:
For the upcoming Tor Browser Bundle port I need the same set of
mirrors Tor daemon uses. This would also help if someone creates a port
for Torbirdy, Vidalia bundle or any new child project in the future.

https://trillian.chruetertee.ch/freebsd-gecko/browser/trunk/www/linux-tor-browser

>How-To-Repeat:

>Fix:
Note, tor-package-archive sometimes provides betas for TBB before actual release.

 Mk/bsd.sites.mk             |   45 ++++++++++++++++++++++++++++++++++++++++++++
 net-mgmt/vidalia/Makefile   |    6 -----
 security/tor-devel/Makefile |   39 --------------------------------------
 security/tor/Makefile       |   41 ----------------------------------------
 www/xpi-torbutton/Makefile  |    2 -
 5 files changed, 49 insertions(+), 84 deletions(-)

--- tor_sites.diff begins here ---
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk	(revision 337307)
+++ Mk/bsd.sites.mk	(working copy)
@@ -1311,6 +1317,51 @@ MASTER_SITE_THEMES+= \
 	ftp://gd.tuwien.ac.at/opsys/linux/freshmeat/themes/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_TOR)
+MASTER_SITE_TOR+= \
+	https://www.torproject.org/dist/%SUBDIR%/ \
+	https://archive.torproject.org/tor-package-archive/%SUBDIR%/ \
+	ftp://ftp.bit.nl/mirror/tor/%SUBDIR%/ \
+	http://cyberside.net.ee/tor/%SUBDIR%/ \
+	http://ftp.bit.nl/mirror/tor/%SUBDIR%/ \
+	http://mirror.hessmo.com/tor/dist/%SUBDIR%/ \
+	http://mirror.host4site.co.il/torproject.org/dist/%SUBDIR%/ \
+	http://mirror.open-networx.org/torproject.org/dist/%SUBDIR%/ \
+	http://mirror.tor.hu/dist/%SUBDIR%/ \
+	https://mirror.torland.me/torproject.org/dist/%SUBDIR%/ \
+	http://mirrors.chaos-darmstadt.de/tor-mirror/dist/%SUBDIR%/ \
+	http://theonionrouter.com/dist/%SUBDIR%/ \
+	http://tor.amorphis.eu/dist/%SUBDIR%/ \
+	http://tor.askapache.com/dist/%SUBDIR%/ \
+	http://tor.beme-it.de/dist/%SUBDIR%/ \
+	http://tor.blingblingsquad.net/dist/%SUBDIR%/ \
+	http://tor.borgmann.tv/dist/%SUBDIR%/ \
+	http://tor.ccc.de/dist/%SUBDIR%/ \
+	http://tor.cyberarmy.at/dist/%SUBDIR%/ \
+	http://tor.dont-know-me.at/dist/%SUBDIR%/ \
+	http://tor.factor.cc/dist/%SUBDIR%/ \
+	http://tor.homosu.net/dist/%SUBDIR%/ \
+	http://tor.idnr.ws/dist/%SUBDIR%/ \
+	http://tor.myrl.net/dist/%SUBDIR%/ \
+	http://tor.kamagurka.org/dist/%SUBDIR%/ \
+	http://tor.spline.de/dist/%SUBDIR%/ \
+	http://tor.taiga-san.net/dist/%SUBDIR%/ \
+	http://tor.vesta.nu/dist/%SUBDIR%/ \
+	http://torproj.xpdm.us/dist/%SUBDIR%/ \
+	https://torproject.antagonism.org/dist/%SUBDIR%/ \
+	https://torproject.crypto.is/dist/%SUBDIR%/ \
+	http://torproject.is/dist/%SUBDIR%/ \
+	http://torproject.jcsh.it/dist/%SUBDIR%/ \
+	http://torproject.nwlinux.us/dist/%SUBDIR%/ \
+	http://torproject.ph3x.at/dist/%SUBDIR%/ \
+	https://www.coevoet.nl/tor/dist/%SUBDIR%/ \
+	http://www.oignon.net/dist/%SUBDIR%/ \
+	http://www.torproject.nl/dist/%SUBDIR%/ \
+	http://www.torproject.org.nyud.net/dist/%SUBDIR%/ \
+	http://www.torproject.us/dist/%SUBDIR%/ \
+	http://www.torservers.net/mirrors/torproject.org/dist/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_TUCOWS)
 .for mirror in ankara blueyonder casemanl chariot clix dataphone dialog epix \
 	fastweb genotec hellasonline iinets inspirenet latvia mclink netvisao \
Index: net-mgmt/vidalia/Makefile
===================================================================
--- net-mgmt/vidalia/Makefile	(revision 336459)
+++ net-mgmt/vidalia/Makefile	(working copy)
@@ -4,11 +4,7 @@
 PORTNAME=	vidalia
 PORTVERSION=	0.2.21
 CATEGORIES=	net-mgmt security
-MASTER_SITES=	https://archive.torproject.org/tor-package-archive/vidalia/ \
-		https://www.torproject.org/dist/vidalia/ \
-		http://tor.ccc.de/dist/vidalia/ \
-		http://tor.cyberarmy.at/dist/vidalia/ \
-		http://www.torservers.net/mirrors/torproject.org/dist/vidalia/
+MASTER_SITES=	TOR/vidalia
 
 MAINTAINER=	fk at fabiankeil.de
 COMMENT=	Graphical Tor controller based on Qt 4.x
Index: security/tor/Makefile
===================================================================
--- security/tor/Makefile	(revision 337307)
+++ security/tor/Makefile	(working copy)
@@ -5,46 +5,7 @@ PORTNAME=	tor
 DISTVERSION=	0.2.3.25
 PORTREVISION=	1
 CATEGORIES=	security net ipv6
-MASTER_SITES=	https://www.torproject.org/dist/ \
-		ftp://ftp.bit.nl/mirror/tor/ \
-		http://cyberside.net.ee/tor/ \
-		http://ftp.bit.nl/mirror/tor/ \
-		http://mirror.hessmo.com/tor/dist/ \
-		http://mirror.host4site.co.il/torproject.org/dist/ \
-		http://mirror.open-networx.org/torproject.org/dist/ \
-		http://mirror.tor.hu/dist/ \
-		https://mirror.torland.me/torproject.org/dist/ \
-		http://mirrors.chaos-darmstadt.de/tor-mirror/dist/ \
-		http://theonionrouter.com/dist/ \
-		http://tor.amorphis.eu/dist/ \
-		http://tor.askapache.com/dist/ \
-		http://tor.beme-it.de/dist/ \
-		http://tor.blingblingsquad.net/dist/ \
-		http://tor.borgmann.tv/dist/ \
-		http://tor.ccc.de/dist/ \
-		http://tor.cyberarmy.at/dist/ \
-		http://tor.dont-know-me.at/dist/ \
-		http://tor.factor.cc/dist/ \
-		http://tor.homosu.net/dist/ \
-		http://tor.idnr.ws/dist/ \
-		http://tor.myrl.net/dist/ \
-		http://tor.kamagurka.org/dist/ \
-		http://tor.spline.de/dist/ \
-		http://tor.taiga-san.net/dist/ \
-		http://tor.vesta.nu/dist/ \
-		http://torproj.xpdm.us/dist/ \
-		https://torproject.antagonism.org/dist/ \
-		https://torproject.crypto.is/dist/ \
-		http://torproject.is/dist/ \
-		http://torproject.jcsh.it/dist/ \
-		http://torproject.nwlinux.us/dist/ \
-		http://torproject.ph3x.at/dist/ \
-		https://www.coevoet.nl/tor/dist/ \
-		http://www.oignon.net/dist/ \
-		http://www.torproject.nl/dist/ \
-		http://www.torproject.org.nyud.net/dist/ \
-		http://www.torproject.us/dist/ \
-		http://www.torservers.net/mirrors/torproject.org/dist/
+MASTER_SITES=	TOR
 
 MAINTAINER=	bf at FreeBSD.org
 COMMENT=	An anonymizing overlay network for TCP
Index: security/tor-devel/Makefile
===================================================================
--- security/tor-devel/Makefile	(revision 337307)
+++ security/tor-devel/Makefile	(working copy)
@@ -4,44 +4,7 @@
 PORTNAME=	tor
 DISTVERSION=	0.2.4.18-rc
 CATEGORIES=	security net ipv6
-MASTER_SITES=	https://www.torproject.org/dist/ \
-		ftp://ftp.bit.nl/mirror/tor/ \
-		http://cyberside.net.ee/tor/ \
-		http://ftp.bit.nl/mirror/tor/ \
-		http://mirror.hessmo.com/tor/dist/ \
-		http://mirror.host4site.co.il/torproject.org/dist/ \
-		http://mirror.open-networx.org/torproject.org/dist/ \
-		http://mirror.tor.hu/dist/ \
-		https://mirror.torland.me/torproject.org/dist/ \
-		http://mirrors.chaos-darmstadt.de/tor-mirror/dist/ \
-		http://theonionrouter.com/dist/ \
-		http://tor.amorphis.eu/dist/ \
-		http://tor.askapache.com/dist/ \
-		http://tor.beme-it.de/dist/ \
-		http://tor.blingblingsquad.net/dist/ \
-		http://tor.borgmann.tv/dist/ \
-		http://tor.ccc.de/dist/ \
-		http://tor.cyberarmy.at/dist/ \
-		http://tor.dont-know-me.at/dist/ \
-		http://tor.homosu.net/dist/ \
-		http://tor.idnr.ws/dist/ \
-		http://tor.myrl.net/dist/ \
-		http://tor.kamagurka.org/dist/ \
-		http://tor.spline.de/dist/ \
-		http://tor.taiga-san.net/dist/ \
-		http://tor.vesta.nu/dist/ \
-		http://torproj.xpdm.us/dist/ \
-		https://torproject.antagonism.org/dist/ \
-		https://torproject.crypto.is/dist/ \
-		http://torproject.is/dist/ \
-		http://torproject.jcsh.it/dist/ \
-		http://torproject.nwlinux.us/dist/ \
-		http://torproject.ph3x.at/dist/ \
-		https://www.coevoet.nl/tor/dist/ \
-		http://www.oignon.net/dist/ \
-		http://www.torproject.org.nyud.net/dist/ \
-		http://www.torproject.us/dist/ \
-		http://www.torservers.net/mirrors/torproject.org/dist/
+MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bf at FreeBSD.org
Index: www/xpi-torbutton/Makefile
===================================================================
--- www/xpi-torbutton/Makefile	(revision 336459)
+++ www/xpi-torbutton/Makefile	(working copy)
@@ -4,7 +4,7 @@
 PORTNAME=	torbutton
 PORTVERSION=	1.5.2
 CATEGORIES=	www
-MASTER_SITES=	https://www.torproject.org/dist/torbutton/
+MASTER_SITES=	TOR/torbutton
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Quickly toggle use of the Tor network
--- tor_sites.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list