Source: efibootmgr
Version: 18-1
Severity: normal
Tags: patch

Dear Maintainer,

I didn't see an upstream source link on packages.d.o, so I went to
https://tracker.debian.org/pkg/efibootmgr which says:
  [high] Problems while searching for a new upstream version
  
  uscan had problems while searching for a new upstream version:
  
  In debian/watch no matching files for watch line
    https://github.com/rhinstaller/efibootmgr/releases 
.*[^n]/(?:|v|version-|r|REL_|rel-|efibootmgr(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
  
  Created: 2022-09-23 Last update: 2023-11-13 12:42 

Navigating there in a browser shows a 3xx redirect to
https://github.com/rhboot/efibootmgr/releases,
but, naturally, uscan doesn't follow those.

This would be a trivial fix but in GitHub's continued war against its users,
"https://github.com/rhboot/efibootmgr/releases";
doesn't actually list any of the assets!
(I didn't believe it either, curl it and see),
of which "efibootmgr-18.tar.bz2" would be the one we want.

Thankfully, uscan(1)'s recommended GitHub spelling with looking at /tags
and pulling out the autogenerated tarballs works
(I don't really see a significant value-add to using upstream's re-packed
 and re-uploaded .tar.bz2s, they're not even signed):
  $ uscan -v --no-download
  uscan info: uscan (version 2.23.4) See uscan(1) for help
  uscan info: Scan watch files in .
  uscan info: Check debian/watch and debian/changelog in .
  uscan info: package="efibootmgr" version="18-1" (as seen in debian/changelog)
  uscan info: package="efibootmgr" version="18" (no epoch/revision)
  uscan info: ./debian/changelog sets package="efibootmgr" version="18"
  uscan info: Process watch file at: debian/watch
      package = efibootmgr
      version = 18
      pkg_dir = .
  uscan info: opts: 
filenamemangle=s%(?:.*?)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))((?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz)))%efibootmgr-$1$2%
  uscan info: line: https://github.com/rhboot/efibootmgr/tags 
(?:.*?/)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))(?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz))
  uscan info: Parsing 
filenamemangle=s%(?:.*?)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))((?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz)))%efibootmgr-$1$2%
  uscan info: line: https://github.com/rhboot/efibootmgr/tags 
(?:.*?/)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))(?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz))
  uscan info: Last orig.tar.* tarball version (from debian/changelog): 18
  uscan info: Last orig.tar.* tarball version (dversionmangled): 18
  uscan info: Requesting URL:
     https://github.com/rhboot/efibootmgr/tags
  uscan info: Matching pattern:
     
(?:(?:https://github.com)?\/rhboot\/efibootmgr\/)?(?:.*?/)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))(?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz))
  uscan info: Found the following matching hrefs on the web page (newest first):
     https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz (18) 
index=18-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz (18) 
index=18-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/18.zip (18) 
index=18-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/18.zip (18) 
index=18-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/17.tar.gz (17) 
index=17-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/17.tar.gz (17) 
index=17-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/17.zip (17) 
index=17-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/17.zip (17) 
index=17-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/16.tar.gz (16) 
index=16-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/16.tar.gz (16) 
index=16-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/16.zip (16) 
index=16-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/16.zip (16) 
index=16-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/15.tar.gz (15) 
index=15-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/15.tar.gz (15) 
index=15-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/15.zip (15) 
index=15-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/15.zip (15) 
index=15-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/14.tar.gz (14) 
index=14-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/14.tar.gz (14) 
index=14-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/14.zip (14) 
index=14-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/14.zip (14) 
index=14-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/13.tar.gz (13) 
index=13-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/13.tar.gz (13) 
index=13-1
     https://github.com/rhboot/efibootmgr/archive/refs/tags/13.zip (13) 
index=13-0
     https://github.com/rhboot/efibootmgr/archive/refs/tags/13.zip (13) 
index=13-0
  uscan info: Looking at $base = https://github.com/rhboot/efibootmgr/tags with
      $filepattern = 
(?:.*?/)?v?(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))(?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz))
 found
      $newfile     = 
https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz
      $newversion  = 18
      $lastversion = 18
  uscan info: Matching target for downloadurlmangle: 
https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz
  uscan info: Upstream URL(+tag) to download is identified as    
https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz
  uscan info: Matching target for filenamemangle: 
https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz
  uscan info: Filename (filenamemangled) for downloaded file: 
efibootmgr-18.tar.gz
  uscan info: Newest version of efibootmgr on remote site is 18, local version 
is 18
  uscan info:  => Package is up to date from:
               => 
https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz
  uscan info: Scan finished

Manually importing the tarball shows there are no significant differences
so the import will work
(and also that what you ship as 18-1 isn't actually 18,
 and includes multiple commits from trunk
 (95cd0728325786bbee90bc3f150bddf7c7ee9c77 and
  811ec82fc6ff3ff18933d5ca55c1dfdad1f922c6 at least),
 and this isn't reflected in either the version, changelog, nor d/README.Debian:
 it looks like the upstream branch has seen these commits applied as
 patches directly(!?) which is baffling for a gbp-maintained package ‒
 the correct procedure is to "gbp pq import", then apply the commits,
 then "gbp pq export", so they are recorded as patches, which they are,
 and not as clandestine changes to the upstream source).

Patch, baed on Salsa d34cf212fbd900dad1e14247bc782f88b31413b5, attached.

Best,
наб

-- System Information:
Debian Release: 12.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 
'stable-debug'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.1.0-9-amd64 (SMP w/24 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_FIRMWARE_WORKAROUND, 
TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
From 801c41ba1dc9fe7257a80208231c912b02d9942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz>
Date: Mon, 13 Nov 2023 16:48:41 +0100
Subject: [PATCH] d/watch: fix for moved upstream URL
X-Mutt-PGP: OS

---
 debian/watch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/watch b/debian/watch
index 66f4589..96bbb8c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,11 +1,12 @@
 # You can run the "uscan" command to check for upstream updates and more.
 # See uscan(1) for format
 
-# Compulsory line, this is a version 3 file
-version=3
+# Compulsory line, this is a version 4 file
+version=4
 
 #opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/efibootmgr-$1\.tar\.gz/ \
 #https://github.com/vathpela/efibootmgr/tags .*/v?(\d\S*)\.tar\.gz
 
-https://github.com/rhinstaller/efibootmgr/releases \
-.*[^n]/(?:|v|version-|r|REL_|rel-|efibootmgr(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+opts="filenamemangle=s%(?:.*?)?v?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE@-$1$2%" \
+    https://github.com/rhboot/efibootmgr/tags \
+    (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@
-- 
2.39.2

Attachment: signature.asc
Description: PGP signature

Reply via email to