From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Oct 2022 08:14:32 +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 1oiV0j-005f0L-9s for lore@lore.pengutronix.de; Wed, 12 Oct 2022 08:14:32 +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 1oiUhW-0000JF-VU; Wed, 12 Oct 2022 07:54:42 +0200 Received: from mx-relay77-hz1.antispameurope.com ([94.100.132.239]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oiUgv-0000Ik-SG for ptxdist@pengutronix.de; Wed, 12 Oct 2022 07:54:08 +0200 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay77-hz1.antispameurope.com; Wed, 12 Oct 2022 07:53:53 +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:53:48 +0200 Received: from EUR02-VE1-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:53:48 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SatMTKQrgAYG685WHXvVWSb77EP9B7QGLnJmOMgCz2lefPBuWf5VMerAO0i+803b/2Ek4i6wacCTUkSscbIfZsg3wBkVzdLXvVhYnrdBxlfeo70dGy7zJhnvK7Mvgfm8Y1n7LvUkTUtzXOhX22pwQakfyva8AxOZ3+3UqUM85H6kc1/pYNDa4nvWou6UfTNo3evP99P4mKZ5Diq3C2HO0WVH2VFVBdRfSWgDOmRL/x1ijzsmqvU0LmYCdAQT6niqdQxE3Y0c5HmBHFGVVsB0OTxmkEwk8Ji4LHZjwt7ZGh7MTqfCP01wW7ryoAU4gvpxT4YoOshJglyNKq1+daa3cQ== 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=5hwwpoJUeSckdVu7gr/mNfEdoekVNX/tZpRQe+ACO00=; b=X76lwQY60lgNBy7FmAP8PRCvQA0o3fYcsld+qt7TY3g24llzxxciV5LUdZhBqkYzq/My67RWPXdFGMxN+eGB/qdnkb/gyPddsleRJP6gJgxwSJN+xdpDaizVCxc10Odx0mN8lcs4V3cM+eqiQFpFFv4BHVZqwz8EOAN0ITWvehyeQBiIbJl8A2GOQn/UDs1e8xRPefKFkAuxZV+X4nqbhL3paM5Z+HjR+S35Bd1uiKBanXqtJZJjujw/oRGtY5+Pa+84i7hjb8nJGkvc9Qq230QNKffJptMhfShvWP8XssbJTSBlEgGUUYiNiy4c/P1Uc9nk0krx8zMxanPYYZ9Mgw== 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=5hwwpoJUeSckdVu7gr/mNfEdoekVNX/tZpRQe+ACO00=; b=H5UQQ6lEVRMxRHuqEE+afjcBbDh/zSgSd+zIJbVlKhB4NLO9q5jXoJ8hbjcr2I0TdX1I3JS4Eaew03cT5MocQ0QjFB2h4b2VZO2vIASYF+BkKEWiBDZtQI+m6+ks6iCJI5tC2aAU6XkHqCbi96S70YmkOnv54mR/YPO7gY0/Osg= 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:53:32 +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:53:32 +0000 From: Gavin Schenk To: Date: Wed, 12 Oct 2022 07:53:29 +0200 Message-Id: <20221012055329.3849348-1-g.schenk@eckelmann.de> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM5PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:203:69::14) 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: ca7aaf03-44e6-410e-557f-08daac16186a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I/RjPupotSeI6dB5AYP1bFoH/RyEc8zcVtWVR1qEsAs4DeCH/CON9mz8TSVJxSaTer9Iquo5eB98Iq8pVQDcKAq9ho2vd7eDKmTHG5jT8zxkOghC+RidDuUkiO9/AFSVEmf0ypzVG7htG4GKJ4MWM8jlsBnOtBNfiwyYrEu88CGLda1xeQojsT7ZefoXesR9JRHmRqP+Z97nVYR0yfYzboc1SyqCrQFzDfWskSpeRQb6TvfRzFV2E20j+GjoFW7v+CWlwkbnldf7FedzHHRL6KuENPZ4Ti30l0oxyus3s4v9AAIevUVxf99z8sLq+PlvEprZwo5+cL5fcn6Y4LBi+l2zs3MbsTLkTgJAM0iBAcCZkr6SIIF695d+jbT69ZpXlliTbQHgYfHxgiDE1OmawOEfu6aio0mAmVV9Z0pRQSUiCNfEuGvyDKgRpVthEBvcsRg4ULd8hpZOAJHHwmDmYZ1maSxmfU6nN+jduKypnj32Tf6tmkmDPzFOsiw/JzsdhdAuTB3JJ3vCmM/dAvjy5biyZJqMifbryhncB8XSkV/QTEHNpLXnycHfCgded+AKJ7j2JP294C4wwnHXwuNYxBfNX7LxYZcxA5vkT4J9dLMgNEYcPRWQ5MBA/CZvjP3ccDkdAkuH/3brB52lLkHfrSKU/BXbsXlu8Qc94eCulyuj9i7i3eR3mtnmIrS3VFtR/BO8+2t4/vq2UTPmYfDtlA== 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?+tEwSoUyvaClPCM5/egPwMjBK860S9Ch+dkC5zKqYMXpaUjq/DXFvzfSGZAK?= =?us-ascii?Q?zpasqWx2FgMu2b4YORC01stqPo3EFT3A3cyXqq+NvB7W0ye23iuJavi2cKsr?= =?us-ascii?Q?gWAkZB96cFwCTW6Sj4Qee2IQ2L7qMWC1akXF+LDIzzgS1d6817Z1v6lW0GiP?= =?us-ascii?Q?xRenGP9S3hpiNY+bdxXkLVqzRb5LdTr3mN1uUXvWFd76u+yCv/nXpA/1Xn4d?= =?us-ascii?Q?ebhjiTJOK3c74fFAxRY+BArxWY+vh5fksEMUp3RaCjdDT7zcPP6xz8MO+AlG?= =?us-ascii?Q?f4g7pyXzGU+nODWRPdZezr2neD1614cpDZUNaGzwAPbnfBklH0kQC27A1bid?= =?us-ascii?Q?jiVxz0jaXTJm85dl0nMnGq9WdmPZ0b8UgoxRQfji7nr1xePWGyPFE6U6J021?= =?us-ascii?Q?wx0Fdwm5QPYDEss1pJsv1Orke5zXV3XwjZf9t1GS/pcdytcXsh9B1ZGeiy0p?= =?us-ascii?Q?iDzR9GNFVp0ccNJqCOlABl1e4njP1MOn3nX6HuzBpCXdT6DPEfDSyitw1xcB?= =?us-ascii?Q?pzfLToroFF6AR7CWCMJalWfHxYwBopFBfNaEu7jHtS2wTCaYhN8yjMEXaRYO?= =?us-ascii?Q?ZMmfvW+YPp4s438+MJnYy1YxWJj+B0E1I88r+t2mZjdvIzfdS80npOA5Sjjm?= =?us-ascii?Q?ifYf9P7DAy+rTD6IgZ9fOG/GNZ1LZY3u/iSaWvozoWwhV9Z3no+XekIYvaJI?= =?us-ascii?Q?nm/6UEx9QOkuvwn1ursEgYaQldmquOBu2GvzOLdBtgExD+Xcf1DY8do8+8dK?= =?us-ascii?Q?2c6N7mLSNQ1dWsZxVcOsCyQNd4zLR0oy9jhTz+FaJDiYzg8IdOEZ8HklXaIm?= =?us-ascii?Q?NolhZkGFapI5NwhmWE3rtyZ42UneCxY1a23Y2kofTBgnNwiq6d43nU31yDml?= =?us-ascii?Q?dYzocvIKNGfeaVh2FUI3xGHJBxXZLie2iV23iEozMSp2XDGlKj0xu70pk1Bk?= =?us-ascii?Q?/8ja08YY0A7ADRjrvAK5JBmGqFNwYYz5O9v1/73aUS3tPBB/b0aXJo4z6hqy?= =?us-ascii?Q?aNF/fR61CeWxFh6nyRBaM4o4I38xJcmyuw7gZ9QdYsVjypqXIENY5iuCZb+P?= =?us-ascii?Q?OmNDcOtEiHLlYASDngj6Z2k1w9GI5SrZM84+KKTLxm0up/qEKkgqokMgMx/+?= =?us-ascii?Q?WI2YhJKKBLvhy1SMGvc4BPLZ/csN9+Miu4qOb3bJ+7dB5KfUEiJxZk20kvpQ?= =?us-ascii?Q?b2HN8dp7fgj5FuRVTqMqarnn0ucudOM4kRz9VvydZ3ojCR61lOUUimQkI+12?= =?us-ascii?Q?HYdEfQEv0UYTVxrN1J0djOjVj6nCeXDIIgCmQKlTWSymKvXEmxIiKQfeb0hd?= =?us-ascii?Q?aWG6DmHEUzsnO2QlFH2dCtdf9FT+o+5iUjzrcroMMxk54A2OpeUjKK2CxGXo?= =?us-ascii?Q?AqSoL/UtDzDZ5PWBIQze/0MAgGgtltH63QDnXpDXp4wBeO7MW0JX1wpg4ARL?= =?us-ascii?Q?qX/gsel9DmfkLPcbUMKpQW+gJ8cbNRSKc/G/oL/G7bbJRla51qwpBeLpQwOg?= =?us-ascii?Q?dMDMhyc31k3KoFT+d9d3CiZJRH6zuAErceUJfNOBotmLrp+XUkff9b2hiBkh?= =?us-ascii?Q?q/MGa90IBeqLOTQancpflgm7StURiSJJXB+yQuvB?= X-MS-Exchange-CrossTenant-Network-Message-Id: ca7aaf03-44e6-410e-557f-08daac16186a 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:53:32.6319 (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: TC7zzIQeajLDhVUqJ0eFsucakT1Xe0NYcftV2KgRryXSWI+o8LMcsILm1SV13NyMx349mW7Ap/6iThIznu3XOw== 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-relay77-hz1.antispameurope.com with 64ADC62475D X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: 20d42dab13232e7c7822a869bc1f626c X-cloud-security: scantime:1.983 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=eckelmann.de; h=from:to :cc:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=hse1; bh=cmEFIGi9wFkDL+U8AjiB0q0Hv dqVG+n/Z5NZR9REmF4=; b=JRmOj5Z9eBOuhO0M7N/9ZRXFCG2FDfWU8RDd1YhZj egJGPyUGBhxqqUlU54fhJQkVAZww2vKXhu+w+RPBZjkp5F2bG+5iQ3uj82wCWJ71 Z4xyAPU5aXtm2jLaB4CEnTYUNzqCbidDl/bXl+h1e6yqD7zUx7ZqnAY2GmD31qzp cTyHCtD6LV80ct6OjQcFLa7nqKMtx6hXQ8AmqGG0SqFiCFK8M2uDrb2D7n7kESo7 5ZU06PfNMTwZD7uwt/qhZvTeCv2wmngWPpWiwWUuy6G3zEjsuex58g8VSqrmtTTy GsY1kYmt39Bkp8Yf7DxRyyrfkqD25oUyYsEDzW9FFoE7Q== 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] 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 --- I changed Svn in doc to uppercase SVN as well. 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