From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Oct 2022 08:14:30 +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 ) id 1oiV0g-005f0L-8o for lore@lore.pengutronix.de; Wed, 12 Oct 2022 08:14:30 +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 ) id 1oiUkU-0000pz-Nw; Wed, 12 Oct 2022 07:57:46 +0200 Received: from mx-relay46-hz1.antispameurope.com ([94.100.133.222]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oiUkO-0000pp-LF for ptxdist@pengutronix.de; Wed, 12 Oct 2022 07:57:40 +0200 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay46-hz1.antispameurope.com; Wed, 12 Oct 2022 07:57:40 +0200 Received: from EX-SRV1.eckelmann.group (2a00:1f08:4007:e030:172:18:30:60) by EX-SRV1.eckelmann.group (2a00:1f08:4007:e030:172:18:30:60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Wed, 12 Oct 2022 07:57:36 +0200 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (2a00:1f08:4007:e035:172:18:35:1a) by smtp.eckelmann.de (2a00:1f08:4007:e035:172:18:35:4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12 via Frontend Transport; Wed, 12 Oct 2022 07:57:36 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GVzQWSNvMJY55FFO6J06tjJWcOTuhCH4xFhzhno57LF2uhiylcbzGNh2LeDUlLqqDMnWGipN4t8ukrjHZ+uwgbpTqvKcLO0POvRhhR8ad5uR6ptb7GRSgHwYMzkB8mrs514DNZTyYXHJWEsdn/VDM3+35eN9N1CiG5WpVzmwT6CPSCU/HraxJjG1mu3k8IvHL1frkLinXtXxEpLcaIHwLQfT9YrhahNzefYRc2ecKR/HVsabi7Z3oKPqOQBqZt7csh8qSrayV5cMQcWW6hImvXPsNAvArbQ6yU/QNdt7cBHw2257dKp/U/Lf7/X4ZrlhlxRu0JmKr7QtETPFX0F4eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mx5KKBcitoRiMXiLJ1T3fuCE9JhqzapOpG49GlBEd0c=; b=kHOmhKuJrIDlQRDu5a3FvFOurAl0EAgrxD9EjlzGFbJElDVz1bz7Uk9rTuX5NFxxuCLHZYOCMcPhTi0T2NaOEHdavbYB6d3jUQ88vSwIMP+6W2+Ncw2XhMrIYnLx97YpQHmoz+ukBEv4wR5h3b/JaPJWSuNz59vKE2VhgcWid+FAI8a+WCjPwa2sKaq+HcOj73uRbFl4fUHeN+NXjvqIXC0AwkrBGXdhNP/JqUxM0vtfjyqlNJBOmIS8OgAekOadViKvsnW11uCWofrOUWaVCnWN8UzXPnSQ9Aaa7EC/YlHDiT8/qlAtlEQHTAeesaoAWnhW0UD41TkyJS0WSt3UMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmannde.onmicrosoft.com; s=selector1-eckelmannde-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mx5KKBcitoRiMXiLJ1T3fuCE9JhqzapOpG49GlBEd0c=; b=RmoKiOChSFs4OCnfDCuhSiMDeWiy2tggA4HVJXmdg75nSEvj9T6Ax/bquwNuuv3uS1d4PphvSAA04HgW2M4n8ZyFKvagy7VdN4QpIo+xCgzput5OaTmwUgyXlaQOEEwuchq2TayycoWoJm/xktcLd40rHH79oXxntEvjBQY+hUQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from GV2P189MB2236.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:7e::15) by AS2P189MB2448.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:598::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.21; Wed, 12 Oct 2022 05:57:21 +0000 Received: from GV2P189MB2236.EURP189.PROD.OUTLOOK.COM ([fe80::ed39:1d34:7fc8:9f85]) by GV2P189MB2236.EURP189.PROD.OUTLOOK.COM ([fe80::ed39:1d34:7fc8:9f85%5]) with mapi id 15.20.5709.019; Wed, 12 Oct 2022 05:57:21 +0000 From: Gavin Schenk To: Date: Wed, 12 Oct 2022 07:57:17 +0200 Message-Id: <20221012055717.3853440-1-g.schenk@eckelmann.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221012055329.3849348-1-g.schenk@eckelmann.de> References: <20221012055329.3849348-1-g.schenk@eckelmann.de> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR3P281CA0159.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::19) To GV2P189MB2236.EURP189.PROD.OUTLOOK.COM (2603:10a6:150:7e::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2P189MB2236:EE_|AS2P189MB2448:EE_ X-MS-Office365-Filtering-Correlation-Id: f2a9a86c-1b1d-4ab1-df7d-08daac16a082 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cZG/Eql9PiLHreo1Bh7MFkQxcztqJ8i8UyARrp9H6k8k0UFs+rwJeDkEwfD2xHbqxW8cFJGk3Y7YtAoUVnSRrPYw1KpWCF6mKivQEB9CxbBmAkxodnp4cBVSyFHPNlOsCBsOyeduSBf1NubKMcDlHwFaMVmXDoomdh6xTDOq7rdheVq56hP+6zCvDTsYKHxCqWm6fdtz/3bekYrFP5ty+HZ3KIyW99kYKYAREqMF7QD6ngEDSCpII8r64jGCiO67lejwLW905wMukDL96LZ3k8uzNRnFZICbQES6Pg6fdBDuxF8ate7kYM+ps4XtnICV6m+zqZ/d5kbWN+fJpuW7ASDE0LasQX4Fh8bVnM3we2jHMOh/CIdCC3Y3NEV1qfw97x/PiZ78hOtiS34QRcZ1xZDz9dQW0iqhEq8JfFn/zL4ZFkzIhldcxUR+9R+MbmhA7RqsQMxAQr+kObfLLreA3kvnr8YXwb+bTAKDufx6rfCdAy7u1S0Chet1GSI7JmxCbntlgHZMmoIPzeTcIAsldIeI0ZuMt/sIE0IyOG2YcJkJ0zcorUYmjbrF4P+ZqeC5bt6FFV3ZLMKKPRfS28Ly8dbkbR3N+Cs9Bk6jl4D+PK8XA/SNaBaFu14IctQ69gEuVaHzmZObu7zNWQpn9/d2dIsKObXoG+9hQjrHEsrqVSZQCXkXtxpJHGiPT5xr7TiGxG2YXUGV/bUWbfaxar5Few== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV2P189MB2236.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(4636009)(396003)(366004)(136003)(376002)(39850400004)(346002)(451199015)(6486002)(83380400001)(5660300002)(478600001)(26005)(6512007)(316002)(86362001)(41300700001)(8936002)(6666004)(107886003)(1076003)(6506007)(36756003)(8676002)(66476007)(66556008)(4326008)(66946007)(2906002)(2616005)(186003)(38100700002)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cmFMqap+/5xncaFBeXChouo8qsz9Bce/hXV4NkGKKoGGLLZj7y3cuG6C5YxR?= =?us-ascii?Q?o/K8/S3Q0wb3Wq4ytfzSSkjfJmz5nfPCkr/rQgLaK/9uswuzlvavc9/lmidX?= =?us-ascii?Q?a+iZFgSiOmkXGoQqT90cXIIZsqmTDDwZy0BMDxhNppEkNAUzdLyiLC2RF01V?= =?us-ascii?Q?o/ps/CTgssqjWK1fuOwYBeLustXXE01SfYEMbf3tsWlkEIsbLjbldVQt1zV8?= =?us-ascii?Q?9G8E85PZ/mz9iKfeygn8ucaI4tZ6fSvfOIQ0YXxk+Wi10370Bvi/WsfOVrhp?= =?us-ascii?Q?+XJkG2Sc5B6lMh9Fn8zgN6YDeSCiG0224z0zm+w15ug2dFOOVJCROAqxDhpY?= =?us-ascii?Q?Ilu7xhGIRY/2vw1pdjnKCfnqUuwjHFgxAxJKxEiHfbpSbvIovvKjwfHIcD0M?= =?us-ascii?Q?bp6iIBYKd7afjN53gyz/8KlgOrx7JGXLRlsxatxb1q+nlw+NDt+H8A3NKxwx?= =?us-ascii?Q?ah2IQv3TMlWxqkMYmPYUk3HZWB3vKs9MZi2DTKWL3Oa7g7tn0ZGpdbjL38Xc?= =?us-ascii?Q?c9ymPv5jiN9u2fy3XY4wldavy/jb18Q9huDEP3ymIFfTPjRu/or70i3scbY2?= =?us-ascii?Q?uK4/Nxib7snUoxD3tYizH0Hw+XcQji7Fjq4NEOtuoh0AKLtH7kZktEWI9A0m?= =?us-ascii?Q?TynWz0+5u+dLGVwG3xXrGMw6ayej+VHwv6DRF0ejl2PHTMXuwWyVKaxV5ZQZ?= =?us-ascii?Q?EELsWnLm/bOaGiDr65uG9f1pvd+Rbx9eUBPTdBAig3BXaHaC6DGtYSeH/GQU?= =?us-ascii?Q?iL0KQWYlJFD85EM8JFwb01/tpRCxXkzkyFEMMs0HDHfNDt9kV+0y8mlkGzZR?= =?us-ascii?Q?IoU9AkWIM+OMJFSyRcBvByes5JpZXDqfLVxUcecbn9c8UYXXxz1dF9j5vcAk?= =?us-ascii?Q?DI4lY/E0Ib8a5BopRyIyCdijVgX9N1nzeKurwbTFTHu6q6g8DxVX1LHw/QbM?= =?us-ascii?Q?c6aLkDEdI1yex4itB5L3j11DULt7cahshn0JPgAeiXhpl68OP/p3kIaEP85g?= =?us-ascii?Q?ZHq6rPZbQxRP+rY9Gl19HB6wMRoLNi5JyEapA+5isyY55xQazsbp+8LtJABn?= =?us-ascii?Q?ruAAsX6yoVjiR3xhfmQSYVurtsjV1prJ29AI807AjeWn4Qnzt68z4vbQhGFU?= =?us-ascii?Q?X7GZzx2MN01QBN86QQw8i0Kq09l1ktJJkpItP8/WsIU2+7I1A2sdXoV/f4zM?= =?us-ascii?Q?Rbwe1e+ngWWTRIPsYu43eCD1klHmal+8kgV8Q6t+IMzOIYj0tqaUQc/XzuQj?= =?us-ascii?Q?+5EdpuW/maOhKVSIjz4UtVGNgxS4aQgQtHTeZc8XIfMAt10CK5E0xVUUaX8z?= =?us-ascii?Q?Bjhxmd/fbszoKO42WfF0nd+XcwAW/pwoe3aQOtG6b6McnPXC3gmIL0KbIJE5?= =?us-ascii?Q?sDBJmkLYo8higLpHSTccqWvMmt2611+h15HxQISBsZcmn+/lLsEMIjYorh1T?= =?us-ascii?Q?EL9kd0/oKja8bZTeoh+epH3l5ND3N1E7DVqswePHZ1m6dA1XxoWohJbIo924?= =?us-ascii?Q?xwTaO9UflUS3GTFy+fj0msGWS9/bdG1b6qc9JQAG+Ctf7Izp7NTXnrUPRSgE?= =?us-ascii?Q?z33zAXRAGzzt5+bObsWDqRAn23pX5xrzr2kVPDEq?= X-MS-Exchange-CrossTenant-Network-Message-Id: f2a9a86c-1b1d-4ab1-df7d-08daac16a082 X-MS-Exchange-CrossTenant-AuthSource: GV2P189MB2236.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 05:57:20.9629 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uYJpATT4mFI67EO44BXAwhwr38V8ePpl+2iy11jLrFHl5Tk6X7k4Zffd0/N6fQjJkSaln4vgDBjSY6q7Bb5NKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2P189MB2448 X-cloud-security-sender: g.schenk@eckelmann.de X-cloud-security-recipient: ptxdist@pengutronix.de X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay46-hz1.antispameurope.com with 4ADC58A0233 X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: ad5a2718f829f93ffb34b0d89d86b129 X-cloud-security: scantime:1.846 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=eckelmann.de; h=from:to :cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s=hse1; bh=+jt2/vQcr+Rs84twOW4m/9e/vVWHLNnxxEGWRnAeNEU=; b=E7nxWiqWDBiH n6GqkkR3gPNdd7dZZ/9z27D8Zstv0HtGaZs43ikC6vCuU53jBFJH/kwl8YdSgv+G ghj1gS9DTmNnEigwWxe5zbdnSPsYqnzy++bimq0G7SUDFzQfje1cD/+T/z59ZfzS 34pDOLmA8PDZdkHzIeQoiGZnixyi0wUtivejHO17eNDNvyZiD2U2jYnPfh5z3Z8n TMDCc+G8rrVBlUZh4pEP5QybYUyHaaqpFDl1ka09M38Iz986LeIwKWrROyYn2ZOP GahOjUQbfuj6DMtvyWnYi0FlsfOdWAPPyGwukepFzFRXZ/dwZOIhfXIREbG2X3QM Sq5qYDs5Fw== X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Gavin Schenk Sender: "ptxdist" 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 Signed-off-by: Gavin Schenk --- 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=`` option. - Svn URLs must start with 'svn://'. They have a mandatory + SVN URLs must start with 'svn://'. They have a mandatory ``rev=r`` 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. + ``_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