mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Gavin Schenk <g.schenk@eckelmann.de>
To: <ptxdist@pengutronix.de>
Cc: Gavin Schenk <g.schenk@eckelmann.de>
Subject: [ptxdist] [PATCH v2] ptxd_make_get: Support svn custom tunnel schemes and https
Date: Wed, 12 Oct 2022 07:57:17 +0200	[thread overview]
Message-ID: <20221012055717.3853440-1-g.schenk@eckelmann.de> (raw)
In-Reply-To: <20221012055329.3849348-1-g.schenk@eckelmann.de>

Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
I changed Svn in doc to uppercase SVN as well.
v1 -> V2: Added my Signed-off

 doc/ref_make_variables.rst   | 7 ++++++-
 scripts/lib/ptxd_make_get.sh | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
index 2ee34856d..beca984ed 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 77ac98c9e..2b0ad9307 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
 			;;
-- 
2.30.2




  reply	other threads:[~2022-10-12  6:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-12  5:53 [ptxdist] [PATCH] " Gavin Schenk
2022-10-12  5:57 ` Gavin Schenk [this message]
2022-10-19  5:41   ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221012055717.3853440-1-g.schenk@eckelmann.de \
    --to=g.schenk@eckelmann.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox