From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Wed, 19 Oct 2022 07:42:15 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1ol1qK-000Gc0-OW
	for lore@lore.pengutronix.de; Wed, 19 Oct 2022 07:42:15 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1ol1qH-0005fq-8Q; Wed, 19 Oct 2022 07:42:13 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1ol1pW-0002Wt-Ob; Wed, 19 Oct 2022 07:41:26 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ol1pV-0002x9-Sq; Wed, 19 Oct 2022 07:41:25 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ol1pV-001gti-9O; Wed, 19 Oct 2022 07:41:25 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Wed, 19 Oct 2022 07:41:25 +0200
Message-Id: <20221019054125.403183-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221012055717.3853440-1-g.schenk@eckelmann.de>
References: <20221012055717.3853440-1-g.schenk@eckelmann.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] ptxd_make_get: Support svn custom tunnel
 schemes and https
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Gavin Schenk <g.schenk@eckelmann.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as a3f49aa038778dc51886dce5482e15833b3294d5.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:41:25 +0200, Gavin Schenk <g.schenk@eckelmann.de> wrote:
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> Message-Id: <20221012055717.3853440-1-g.schenk@eckelmann.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
> index 2ee34856dd02..beca984edccc 100644
> --- a/doc/ref_make_variables.rst
> +++ b/doc/ref_make_variables.rst
> @@ -196,9 +196,14 @@ Package Definition
>    Git URLs must either start with 'git://' or end with '.git'. They have a
>    mandatory ``tag=<tagname>`` option.
>  
> -  Svn URLs must start with 'svn://'. They have a mandatory
> +  SVN URLs must start with 'svn://'. They have a mandatory
>    ``rev=r<number>`` option.
>  
> +  SVN custom tunnel schemes (e.g. 'svn+ssh') are supported as
> +  well. There is a special treatment for 'svn+https'. In this case
> +  the URL is fixed and 'svn+' is removed from URL. This is useful to
> +  work around firewalls that block 'svn' ports.
> +
>  ``<PKG>_SOURCE``
>    The location of the downloaded source archive. There should be no reason
>    to set this to anything other than
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index 77ac98c9e4bc..2b0ad9307476 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -434,7 +434,14 @@ ptxd_make_get() {
>  			ptxd_make_get_download_permitted &&
>  			ptxd_make_get_git && return
>  			;;
> -		svn://*)
> +		svn://*|svn+*://*)
> +			url=${url/svn+https/https}
> +			if [[ "${url}" =~ ^https ]]; then
> +				echo "svn+https is fixed in URL, using https directly"
> +			fi
> +			if [[ "${url}" =~ ^svn\+ ]]; then
> +				echo "Custom SVN tunnel scheme detected"
> +			fi
>  			ptxd_make_get_download_permitted &&
>  			ptxd_make_get_svn && return
>  			;;