From patchwork Sun Apr 4 21:03:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 28327 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9CD1A27BC69; Sun, 4 Apr 2021 22:04:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D02827BC68 for ; Sun, 4 Apr 2021 22:04:42 +0100 (BST) Received: from localhost ([::1]:35180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9vF-0002zc-BL for patchwork@mira.cbaines.net; Sun, 04 Apr 2021 17:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lT9uc-0002n2-P6 for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53260) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lT9uc-0000l0-Hz for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lT9uc-0000hZ-EU for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47597] [PATCH 1/3] gnu-maintenance: Add 'sourceforge' updater. References: <20210404205835.30850-1-ludo@gnu.org> In-Reply-To: <20210404205835.30850-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Apr 2021 21:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47597@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 47597-submit@debbugs.gnu.org id=B47597.16175702182650 (code B ref 47597); Sun, 04 Apr 2021 21:04:02 +0000 Received: (at 47597) by debbugs.gnu.org; 4 Apr 2021 21:03:38 +0000 Received: from localhost ([127.0.0.1]:36569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uE-0000gf-9M for submit@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uB-0000gD-QT for 47597@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45764) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9u5-0000V2-Se; Sun, 04 Apr 2021 17:03:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45190 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lT9u5-00049w-BL; Sun, 04 Apr 2021 17:03:29 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 4 Apr 2021 23:03:14 +0200 Message-Id: <20210404210316.31198-1-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This updater currently covers 2.4% of the packages. * guix/gnu-maintenance.scm (latest-sourceforge-release): New procedure. (%sourceforge-updater): New variable. * doc/guix.texi (Invoking guix refresh): Document it. --- doc/guix.texi | 2 ++ guix/gnu-maintenance.scm | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index bada446357..d9ab8090a0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11713,6 +11713,8 @@ list of updaters). Currently, @var{updater} may be one of: the updater for GNU packages; @item savannah the updater for packages hosted at @uref{https://savannah.gnu.org, Savannah}; +@item sourceforge +the updater for packages hosted at @uref{https://sourceforge.net, SourceForge}; @item gnome the updater for GNOME packages; @item kde diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index c7972d13a5..79214ae1a0 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -66,6 +66,7 @@ %gnu-updater %gnu-ftp-updater %savannah-updater + %sourceforge-updater %xorg-updater %kernel.org-updater %generic-html-updater)) @@ -660,6 +661,53 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." #:directory directory) (cut adjusted-upstream-source <> rewrite)))) +(define (latest-sourceforge-release package) + "Return the latest release of PACKAGE." + (define (uri-append uri extension) + ;; Return URI with EXTENSION appended. + (build-uri (uri-scheme uri) + #:host (uri-host uri) + #:path (string-append (uri-path uri) extension))) + + (define (valid-uri? uri) + ;; Return true if URI is reachable. + (catch #t + (lambda () + (case (response-code (http-head uri)) + ((200 302) #t) + (else #f))) + (const #f))) + + (let* ((name (package-upstream-name package)) + (base (string-append "https://sourceforge.net/projects/" + name "/files")) + (url (string-append base "/latest/download")) + (response (catch #t (lambda () (http-head url)) + (const #f)))) + (and response + (= 302 (response-code response)) + (response-location response) + (match (string-tokenize (uri-path (response-location response)) + (char-set-complement (char-set #\/))) + ((_ components ...) + (let* ((path (string-join components "/")) + (url (string-append "mirror://sourceforge/" path))) + (and (release-file? name (basename path)) + + ;; Take the heavy-handed approach of probing 3 additional + ;; URLs. XXX: Would be nicer if this could be avoided. + (let* ((loc (response-location response)) + (sig (any (lambda (extension) + (let ((uri (uri-append loc extension))) + (and (valid-uri? uri) + (string-append url extension)))) + '(".asc" ".sig" ".sign")))) + (upstream-source + (package name) + (version (tarball->version (basename path))) + (urls (list url)) + (signature-urls (and sig (list sig)))))))))))) + (define (latest-xorg-release package) "Return the latest release of PACKAGE." (let ((uri (string->uri (origin-uri (package-source package))))) @@ -774,6 +822,13 @@ the directory containing its source tarball." (pred (url-prefix-predicate "mirror://savannah/")) (latest latest-savannah-release))) +(define %sourceforge-updater + (upstream-updater + (name 'sourceforge) + (description "Updater for packages hosted on sourceforge.net") + (pred (url-prefix-predicate "mirror://sourceforge/")) + (latest latest-sourceforge-release))) + (define %xorg-updater (upstream-updater (name 'xorg) From patchwork Sun Apr 4 21:03:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 28325 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3F37B27BC6A; Sun, 4 Apr 2021 22:04:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D2C5927BC68 for ; Sun, 4 Apr 2021 22:04:24 +0100 (BST) Received: from localhost ([::1]:34754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9uy-0002o1-3E for patchwork@mira.cbaines.net; Sun, 04 Apr 2021 17:04:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lT9ud-0002n4-5h for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lT9uc-0000l6-Tj for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lT9uc-0000hg-Qb for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47597] [PATCH 2/3] upstream: 'package-latest-release' tries all the matching updaters. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Apr 2021 21:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47597@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 47597-submit@debbugs.gnu.org id=B47597.16175702202661 (code B ref 47597); Sun, 04 Apr 2021 21:04:02 +0000 Received: (at 47597) by debbugs.gnu.org; 4 Apr 2021 21:03:40 +0000 Received: from localhost ([127.0.0.1]:36571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uF-0000gq-P7 for submit@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uB-0000gF-VQ for 47597@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45766) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9u6-0000VF-Pq; Sun, 04 Apr 2021 17:03:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45190 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lT9u6-00049w-6V; Sun, 04 Apr 2021 17:03:30 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 4 Apr 2021 23:03:15 +0200 Message-Id: <20210404210316.31198-2-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210404210316.31198-1-ludo@gnu.org> References: <20210404210316.31198-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/upstream.scm (package-latest-release): Try UPDATERS until one of them returns an upstream source. This is useful for packages with several matching updaters, such a zlib ('sourceforge' and 'generic-html'). --- guix/upstream.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index accd8967d8..632e9ebc4f 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -264,12 +264,15 @@ them matches." #:optional (updaters (force %updaters))) "Return an upstream source to update PACKAGE, a object, or #f if -none of UPDATERS matches PACKAGE. It is the caller's responsibility to ensure -that the returned source is newer than the current one." - (match (lookup-updater package updaters) - ((? upstream-updater? updater) - ((upstream-updater-latest updater) package)) - (_ #f))) +none of UPDATERS matches PACKAGE. When several updaters match PACKAGE, try +them until one of them returns an upstream source. It is the caller's +responsibility to ensure that the returned source is newer than the current +one." + (any (match-lambda + (($ name description pred latest) + (and (pred package) + (latest package)))) + updaters)) (define* (package-latest-release* package #:optional From patchwork Sun Apr 4 21:03:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 28326 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8640A27BC68; Sun, 4 Apr 2021 22:04:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ED56727BC69 for ; Sun, 4 Apr 2021 22:04:25 +0100 (BST) Received: from localhost ([::1]:34800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9uz-0002pb-3n for patchwork@mira.cbaines.net; Sun, 04 Apr 2021 17:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lT9ud-0002ng-KH for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lT9ud-0000lQ-9u for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lT9ud-0000ho-6Q for guix-patches@gnu.org; Sun, 04 Apr 2021 17:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47597] [PATCH 3/3] lint: refresh: Warn about missing or dysfunctional updaters. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Apr 2021 21:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47597@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 47597-submit@debbugs.gnu.org id=B47597.16175702272674 (code B ref 47597); Sun, 04 Apr 2021 21:04:03 +0000 Received: (at 47597) by debbugs.gnu.org; 4 Apr 2021 21:03:47 +0000 Received: from localhost ([127.0.0.1]:36573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uG-0000gs-1j for submit@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lT9uC-0000gG-Mi for 47597@debbugs.gnu.org; Sun, 04 Apr 2021 17:03:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45767) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lT9u7-0000WC-HX; Sun, 04 Apr 2021 17:03:31 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45190 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lT9u7-00049w-1q; Sun, 04 Apr 2021 17:03:31 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 4 Apr 2021 23:03:16 +0200 Message-Id: <20210404210316.31198-3-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210404210316.31198-1-ludo@gnu.org> References: <20210404210316.31198-1-ludo@gnu.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This feedback should help us improve updaters. * guix/lint.scm (check-for-updates): Return a warning when PACKAGE lacks an updater or when the updater returns #f. --- guix/lint.scm | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index cdd9dd14d7..a7d6bbba4f 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1191,21 +1191,32 @@ vulnerability records for PACKAGE by calling PACKAGE-VULNERABILITIES." (define (check-for-updates package) "Check if there is an update available for PACKAGE." - (match (with-networking-fail-safe - (format #f (G_ "while retrieving upstream info for '~a'") - (package-name package)) - #f - (package-latest-release* package)) - ((? upstream-source? source) - (if (version>? (upstream-source-version source) - (package-version package)) - (list - (make-warning package - (G_ "can be upgraded to ~a") - (list (upstream-source-version source)) - #:field 'version)) - '())) - (#f '()))) ; cannot find newer upstream release + (match (lookup-updater package) + (#f + (list (make-warning package (G_ "no updater for ~a") + (list (package-name package)) + #:field 'source))) + ((? upstream-updater? updater) + (match (with-networking-fail-safe + (format #f (G_ "while retrieving upstream info for '~a'") + (package-name package)) + #f + (package-latest-release package)) + ((? upstream-source? source) + (if (version>? (upstream-source-version source) + (package-version package)) + (list + (make-warning package + (G_ "can be upgraded to ~a") + (list (upstream-source-version source)) + #:field 'version)) + '())) + (#f ;cannot find upstream release + (list (make-warning package + (G_ "updater '~a' failed to find \ +upstream releases") + (list (upstream-updater-name updater)) + #:field 'source))))))) (define (check-archival package)