From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 15 20:00:09 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B62801065674; Fri, 15 May 2009 20:00:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 924928FC1A; Fri, 15 May 2009 20:00:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4FK091D025684; Fri, 15 May 2009 20:00:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4FK09IV025683; Fri, 15 May 2009 20:00:09 GMT (envelope-from gnats) Resent-Date: Fri, 15 May 2009 20:00:09 GMT Resent-Message-Id: <200905152000.n4FK09IV025683@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@freebsd.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: wxs@freebsd.org Resent-Reply-To: FreeBSD-gnats-submit@freebsd.org, Eygene Ryabinkin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F27B01065672 for ; Fri, 15 May 2009 19:53:26 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45]) by mx1.freebsd.org (Postfix) with ESMTP id 863918FC18 for ; Fri, 15 May 2009 19:53:26 +0000 (UTC) (envelope-from rea-fbsd@codelabs.ru) Received: from phoenix.codelabs.ru (ppp85-141-160-101.pppoe.mtu-net.ru [85.141.160.101]) by 0.mx.codelabs.ru with esmtps (TLSv1:CAMELLIA256-SHA:256) id 1M53TB-00002o-7A for FreeBSD-gnats-submit@freebsd.org; Fri, 15 May 2009 23:53:25 +0400 Message-Id: <20090515195324.A390FB8031@phoenix.codelabs.ru> Date: Fri, 15 May 2009 23:53:24 +0400 (MSD) From: Eygene Ryabinkin To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: wxs@freebsd.org Cc: Subject: ports/134566: [patch] bsd.sites.mk: create list of kernel.org mirrors and use it X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Eygene Ryabinkin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2009 20:00:10 -0000 >Number: 134566 >Category: ports >Synopsis: [patch] bsd.sites.mk: create list of kernel.org mirrors and use it >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri May 15 20:00:08 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Eygene Ryabinkin >Release: FreeBSD 7.1-STABLE amd64 >Organization: Code Labs >Environment: System: FreeBSD 7.1-STABLE amd64 >Description: There are a bunch of kernel.org mirrors, but there is no corresponding MASTER_SITE knobs in the bsd.sites.mk. >How-To-Repeat: Look at bsd.sites.mk. >Fix: The following patch add MASTER_SITE_KERNEL_ORG and use it for all ports that are currently downloading the stuff from kernel.org or its mirrors. --- use-kernel.org-mirrors.diff begins here --- >From be5d2c172de4a71725e2be958e8ffacc15b5c9a2 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 7 May 2009 09:06:37 +0400 ...and use it in all ports that download sources from there. The list was composed from mirrors that have 2 or more backend hosts behind their DNS names. Signed-off-by: Eygene Ryabinkin --- Mk/bsd.sites.mk | 12 ++++++++++++ comms/openobex/Makefile | 4 ++-- devel/cgit/Makefile | 3 ++- devel/git/Makefile | 3 ++- devel/libpci/Makefile | 3 ++- ftp/tftp-hpa/Makefile | 3 ++- security/linux-pam-docs/Makefile | 3 ++- sysutils/linrename/Makefile | 4 ++-- sysutils/linuxfdisk/Makefile | 4 ++-- sysutils/pciutils/Makefile | 3 ++- sysutils/syslinux/Makefile | 3 ++- sysutils/zisofs-tools/Makefile | 3 ++- 12 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 841912a..2864705 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -1472,6 +1472,18 @@ MASTER_SITE_XORG+= \ ftp://ftp.x.org/pub/%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_KERNEL_ORG) +MASTER_SITE_KERNEL_ORG+= \ + http://kernel.org/pub/%SUBDIR%/ \ + http://www.us.kernel.org/pub/%SUBDIR%/ \ + http://www.uk.kernel.org/pub/%SUBDIR%/ \ + http://www.no.kernel.org/pub/%SUBDIR%/ \ + http://www.de.kernel.org/pub/%SUBDIR%/ \ + http://www.it.kernel.org/pub/%SUBDIR%/ \ + http://www.ru.kernel.org/pub/%SUBDIR%/ \ + http://www.au.kernel.org/pub/%SUBDIR%/ +.endif + # Macro magic MASTER_SITES_ABBREVS= CPAN:PERL_CPAN SF:SOURCEFORGE SFE:SOURCEFORGE_EXTENDED \ diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile index c52c56c..cf96e61 100644 --- a/comms/openobex/Makefile +++ b/comms/openobex/Makefile @@ -8,8 +8,8 @@ PORTNAME= openobex PORTVERSION= 1.4 CATEGORIES= comms net -MASTER_SITES= http://www.kernel.org/pub/linux/bluetooth/ \ - http://www.de.kernel.org/pub/linux/bluetooth/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= linux/bluetooth MAINTAINER= mad@madpilot.net COMMENT= Open source implementation of the OBEX protocol diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index e8ada28..50e4eee 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -9,7 +9,8 @@ PORTNAME= cgit PORTVERSION= 0.8.2 CATEGORIES= devel www MASTER_SITES= http://hjemli.net/git/cgit/snapshot/:cgit \ - http://www.kernel.org/pub/software/scm/git/:git + ${MASTER_SITE_KERNEL_ORG:S/$/:git/g} +MASTER_SITE_SUBDIR= software/scm/git/:git DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ git-${GIT_VERSION}.tar.bz2:git GIT_VERSION= 1.6.1.1 diff --git a/devel/git/Makefile b/devel/git/Makefile index 3b989b2..07021c5 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -8,7 +8,8 @@ PORTNAME= git PORTVERSION= 1.6.2.5 CATEGORIES= devel -MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= software/scm/${PORTNAME} DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-manpages-${PORTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sign diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile index 0c10fae..442fdf1 100644 --- a/devel/libpci/Makefile +++ b/devel/libpci/Makefile @@ -10,8 +10,9 @@ PORTVERSION= 2.2.8 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ - ftp://ftp.kernel.org/pub/software/utils/pciutils/ \ + ${MASTER_SITE_KERNEL_ORG} \ ftp://metalab.unc.edu/pub/Linux/hardware/ +MASTER_SITE_SUBDIR= software/utils/pciutils DISTNAME= pciutils-${PORTVERSION} MAINTAINER= sbahra@gwu.edu diff --git a/ftp/tftp-hpa/Makefile b/ftp/tftp-hpa/Makefile index 3ed93c5..7031a1d 100644 --- a/ftp/tftp-hpa/Makefile +++ b/ftp/tftp-hpa/Makefile @@ -8,7 +8,8 @@ PORTNAME= tftp-hpa PORTVERSION= 0.49 CATEGORIES= ftp -MASTER_SITES= ftp://ftp.kernel.org/pub/software/network/tftp/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= software/network/tftp MAINTAINER= brooks@FreeBSD.org COMMENT= An advanced tftp server diff --git a/security/linux-pam-docs/Makefile b/security/linux-pam-docs/Makefile index 497ef0e..8c4f334 100644 --- a/security/linux-pam-docs/Makefile +++ b/security/linux-pam-docs/Makefile @@ -8,7 +8,8 @@ PORTNAME= linux-pam-docs PORTVERSION= 0.76 CATEGORIES= security -MASTER_SITES= http://www.kernel.org/pub/linux/libs/pam/pre/doc/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= linux/libs/pam/pre/history DISTNAME= Linux-PAM-${PORTVERSION}-docs MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/linrename/Makefile b/sysutils/linrename/Makefile index e5d5282..e649ffc 100644 --- a/sysutils/linrename/Makefile +++ b/sysutils/linrename/Makefile @@ -12,8 +12,8 @@ CATEGORIES= sysutils MASTER_SITES= http://mirror.linux.org.au/pub/linux/utils/util-linux/ \ http://debian.csail.mit.edu/pub/linux/utils/util-linux/ \ http://www.club.cc.cmu.edu/pub/linux.out-of-date/utils/util-linux/ \ - http://www.kernel.org/pub/linux/utils/util-linux/ \ - ftp://ftp.kernel.org/pub/linux/utils/util-linux/old/ + ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= linux/utils/util-linux DISTNAME= util-linux-${PORTVERSION} MAINTAINER= Net147@hotmail.com diff --git a/sysutils/linuxfdisk/Makefile b/sysutils/linuxfdisk/Makefile index d6606b8..c8b6302 100644 --- a/sysutils/linuxfdisk/Makefile +++ b/sysutils/linuxfdisk/Makefile @@ -8,9 +8,9 @@ PORTNAME= linuxfdisk PORTVERSION= 2.11z CATEGORIES= sysutils -MASTER_SITES= ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \ - ftp://ftp.kernel.org/pub/linux/utils/util-linux/old/ \ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} \ ftp://segfault.kiev.ua/pub/ +MASTER_SITE_SUBDIR= linux/utils/util-linux/old DISTNAME= util-linux-${PORTVERSION} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index 931804b..921932e 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -9,8 +9,9 @@ PORTNAME= pciutils PORTVERSION= 3.0.3 CATEGORIES= sysutils MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ - ftp://ftp.kernel.org/pub/software/utils/pciutils/ \ + ${MASTER_SITE_KERNEL_ORG} \ ftp://metalab.unc.edu/pub/Linux/hardware/ +MASTER_SITE_SUBDIR= software/utils/pciutils MAINTAINER= sbahra@gwu.edu COMMENT= PCI configuration utilities diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile index 75c79eb..0d04c6b 100644 --- a/sysutils/syslinux/Makefile +++ b/sysutils/syslinux/Makefile @@ -9,7 +9,8 @@ PORTNAME= syslinux PORTVERSION= 3.72 CATEGORIES= sysutils -MASTER_SITES= http://www.kernel.org/pub/linux/utils/boot/syslinux/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= linux/boot/syslinux/Old MAINTAINER= luigi@FreeBSD.org COMMENT= Syslinux for FreeBSD diff --git a/sysutils/zisofs-tools/Makefile b/sysutils/zisofs-tools/Makefile index 28621fc..abc0099 100644 --- a/sysutils/zisofs-tools/Makefile +++ b/sysutils/zisofs-tools/Makefile @@ -8,7 +8,8 @@ PORTNAME= zisofs-tools PORTVERSION= 1.0.8 CATEGORIES= sysutils -MASTER_SITES= http://www.kernel.org/pub/linux/utils/fs/zisofs/ +MASTER_SITES= ${MASTER_SITE_KERNEL_ORG} +MASTER_SITE_SUBDIR= linux/utils/fs/zisofs MAINTAINER= chip-set@mail.ru COMMENT= User utilities for zisofs -- 1.6.1.3 --- use-kernel.org-mirrors.diff ends here --- I had verified that all distfiles can be fetched with the corrected master site lists: some kernel.org mirrors seem to be a bit out of date, but not all. One should also pay attention to the fact that www.XX.kernel.org is just a DNS alias for the bunch of hosts and only some of the backends are out of date. >Release-Note: >Audit-Trail: >Unformatted: