From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oGf3BfMyTWBnAQAA0tVLHw (envelope-from ) for ; Sat, 13 Mar 2021 21:47:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8Ea4AfMyTWCpBgAA1q6Kng (envelope-from ) for ; Sat, 13 Mar 2021 21:47:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C51458C88 for ; Sat, 13 Mar 2021 22:47:30 +0100 (CET) Received: from localhost ([::1]:47408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6c-0005eu-0d for larch@yhetil.org; Sat, 13 Mar 2021 16:47:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLC6D-00057K-39 for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49306) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLC6C-00036l-Ri for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLC6C-0000mk-QT for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47126] [PATCH 6/7] gnu-maintenance: Add 'generic-html' updater. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Mar 2021 21:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47126@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 47126-submit@debbugs.gnu.org id=B47126.16156720182963 (code B ref 47126); Sat, 13 Mar 2021 21:47:04 +0000 Received: (at 47126) by debbugs.gnu.org; 13 Mar 2021 21:46:58 +0000 Received: from localhost ([127.0.0.1]:60846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5y-0000la-B4 for submit@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5l-0000jt-3D for 47126@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42784) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC5f-0002sL-Ov; Sat, 13 Mar 2021 16:46:31 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39284 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lLC5e-0004wi-FV; Sat, 13 Mar 2021 16:46:30 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 13 Mar 2021 22:46:19 +0100 Message-Id: <20210313214620.28186-6-ludo@gnu.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210313214620.28186-1-ludo@gnu.org> References: <20210313214620.28186-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615672050; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=8+2bR50YrGRxazJnmTrqwXg03ri9LzSYJXqjKdaW85Y=; b=MvvClopIjUfHEuIzP1iRaSudMqs/F855yKHmwPeBEPLVmlJ7EGd8YEz1ag0XpI67lmB6Lh QWbFXRXmjOl2vmrrvPVfiJ32S/1hVoG0zfFcnslYqWyRlD+s4hbzzimJqlKxyWGeTvZqC/ B0zP1Wsb5VjxFVh7JzQ8s+rzAadjFlUbktZ0ilEdmH02CgONPkNGWiuT3Y0BJ2aUCsxwjt Wn2ueTf36+e4LfEZkEqN0K82kNwUnvEOHDZpgeEU1iNf1GcMQj+9OhEDot13mNhnpkqIJU vxxt0xpC2P+gDk3drJGRlQPRhDLsklMqckERYq9t1kMlPiN90iR6irApWTDBMQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615672050; a=rsa-sha256; cv=none; b=nHbtobquhTnbZG8y1Xl26QaIiwghwnO9t7lXN9w8BG9QgFkwb+QoMk2gEmUmsw69J4dpyZ Q2GF8l3T1SlNCSewdARpab/uWWFa5SWV9hmnIFmjvKA/TPl+2n/22GPj5N/PZHMXO3hG0P V3uxXfs/NG9IYh8ANnohwhlmdDZNaAOf1R+5k/mgx53z3S8d/1Xz59wPm+qDDx0WT/ayae oEg0T6wxMPyVg/u3epj5CSw0uCqc0a1rTJGNR1vK3h3eUfH9O8/x02MMbJmAOBHoQfp7ZY AYR/FGSu48jF3slKPWhnQIRawR9F2iR4DTW/vOUJ9Fa+VjAABxAzY8xVn+5x6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C51458C88 X-Spam-Score: 2.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: ptks1kWjgZdL This brings total updater coverage, as reported by 'guix refresh --list-updaters', from 78% to 88.3%. Among many other things, it covers freedesktop.org packages. * guix/gnu-maintenance.scm (html-updatable-package?) (latest-html-updatable-release): New procedures. (%generic-html-updater): New variable. * doc/guix.texi (Invoking guix refresh): Document it. --- doc/guix.texi | 3 +++ guix/gnu-maintenance.scm | 58 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 97094a7d0a..89c8c58295 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11693,6 +11693,9 @@ the updater for @uref{https://www.stackage.org, Stackage} packages. the updater for @uref{https://crates.io, Crates} packages. @item launchpad the updater for @uref{https://launchpad.net, Launchpad} packages. +@item generic-html +a generic updater that crawls the HTML page where the source tarball of +the package is hosted, when applicable. @end table For instance, the following command only checks for updates of Emacs diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 5aa16acfde..ced5497b37 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -28,6 +28,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) #:use-module (rnrs io ports) #:use-module (system foreign) #:use-module (guix http-client) @@ -66,7 +67,8 @@ %gnu-ftp-updater %savannah-updater %xorg-updater - %kernel.org-updater)) + %kernel.org-updater + %generic-html-updater)) ;;; Commentary: ;;; @@ -697,6 +699,53 @@ releases are on gnu.org." #:file->signature file->signature) (cut adjusted-upstream-source <> rewrite)))) +(define html-updatable-package? + ;; Return true if the given package may be handled by the generic HTML + ;; updater. + (let ((hosting-sites '("github.com" "github.io" "gitlab.com" + "notabug.org" "sr.ht" + "gforge.inria.fr" "gitlab.inria.fr" + "ftp.gnu.org" "download.savannah.gnu.org" + "pypi.org" "crates.io" "rubygems.org" + "bioconductor.org"))) + (url-predicate (lambda (url) + (match (string->uri url) + (#f #f) + (uri + (let ((scheme (uri-scheme uri)) + (host (uri-host uri))) + (and (memq scheme '(http https)) + (not (member host hosting-sites)))))))))) + +(define (latest-html-updatable-release package) + "Return the latest release of PACKAGE. Do that by crawling the HTML page of +the directory containing its source tarball." + (let* ((uri (string->uri + (match (origin-uri (package-source package)) + ((? string? url) url) + ((url _ ...) url)))) + (custom (assoc-ref (package-properties package) + 'release-monitoring-url)) + (base (or custom + (string-append (symbol->string (uri-scheme uri)) + "://" (uri-host uri)))) + (directory (if custom + "" + (dirname (uri-path uri)))) + (package (package-upstream-name package))) + (catch #t + (lambda () + (guard (c ((http-get-error? c) #f)) + (latest-html-release package + #:base-url base + #:directory directory))) + (lambda (key . args) + ;; Return false and move on upon connection failures. + (unless (memq key '(gnutls-error tls-certificate-error + system-error)) + (apply throw key args)) + #f)))) + (define %gnu-updater ;; This is for everything at ftp.gnu.org. (upstream-updater @@ -737,4 +786,11 @@ releases are on gnu.org." (pred (url-prefix-predicate "mirror://kernel.org/")) (latest latest-kernel.org-release))) +(define %generic-html-updater + (upstream-updater + (name 'generic-html) + (description "Updater that crawls HTML pages.") + (pred html-updatable-package?) + (latest latest-html-updatable-release))) + ;;; gnu-maintenance.scm ends here -- 2.30.1