Bug#823624: devscripts: [uscan] please include tgz in @ARCHIVE_EXT@

[Paul Wise]

Control: retitle -1 devscripts: [uscan] please include short extensions 
(tgz/tbz/txz) in @ARCHIVE_EXT@

On Thu, 12 May 2016 01:08:12 +0900 Osamu Aoki wrote:

> At this moment, I chose not to complicate the code further unless such
> case exists.

There are 100 packages in Debian that use the short form instead:

https://codesearch.debian.net/search?q=path%3Adebian%2Fwatch+t[gbx]z

BTW, Daniel's patch only includes tgz, I'd add tbz and txz too.

The common mistakes section of the watch file wiki page mentions them:

https://wiki.debian.org/debian/watch#Common_mistakes

-- 
bye,
pabs

https://wiki.debian.org/PaulWise


signature.asc
Description: This is a digitally signed message part

Bug#823624: devscripts: [uscan] please include tgz in @ARCHIVE_EXT@

[Osamu Aoki]

control: severity 823624 wishlist

On Sun, May 08, 2016 at 08:46:08PM -0400, Daniel Kahn Gillmor wrote:
> On Sun 2016-05-08 02:45:40 -0400, Osamu Aoki  wrote:
> > I think it does but I think I had reason why I did not do this.
> > It may have been something to do with signiture verification.
> > I forgot what exactly put me off to add such extension ...  
> 
> hm, do we really need to avoid it if the reason is not something we can
> remember?

Without re-reading code, its hard to give you specifics but I gave
enough hint.

If tar.gz file has signature on tar file, current code can deal with it.
But not with tgz as it written now like line 3396 and 3494 as examples.
At this moment, I chose not to complicate the code further unless such
case exists.

I also did not wish to add such short regex in general since it may
cause false positive.

> > You can always use explicit description in watch file if upstream uses
> > such extension.
> 
> sure, but i'd prefer to just use the generic in case my upstreams change
^^<==wishlist
> their minds and start using more normal.

I did not prefer to include tgz :-)

If we include tgz patch, the rest of the code needs to be checked and
updated.  So patch as provided is not optimal.

Osamu

Bug#823624: devscripts: [uscan] please include tgz in @ARCHIVE_EXT@

[Daniel Kahn Gillmor]

On Sun 2016-05-08 02:45:40 -0400, Osamu Aoki  wrote:
> Hi,
>
> On Fri, May 06, 2016 at 03:15:22PM -0400, Daniel Kahn Gillmor wrote:
>> Package: devscripts
>> Version: 2.16.4
>> Severity: normal
>> Tags: patch
>> 
>> Dear Maintainer,
>> 
>> some upstreams (like sks) ship their tarballs as foo-1.1.5.tgz
>
> True and I was aware of it.
>
>> @ARCHIVE_EXT@ fails to locate this tarball.
>> 
>> The attached patch should address this concern.
>
> I think it does but I think I had reason why I did not do this.
> It may have been something to do with signiture verification.
> I forgot what exactly put me off to add such extension ...  

hm, do we really need to avoid it if the reason is not something we can
remember?

> You can always use explicit description in watch file if upstream uses
> such extension.

sure, but i'd prefer to just use the generic in case my upstreams change
their minds and start using more normal.

  --dkg

Bug#823624: devscripts: [uscan] please include tgz in @ARCHIVE_EXT@

[Osamu Aoki]

Hi,

On Fri, May 06, 2016 at 03:15:22PM -0400, Daniel Kahn Gillmor wrote:
> Package: devscripts
> Version: 2.16.4
> Severity: normal
> Tags: patch
> 
> Dear Maintainer,
> 
> some upstreams (like sks) ship their tarballs as foo-1.1.5.tgz

True and I was aware of it.

> @ARCHIVE_EXT@ fails to locate this tarball.
> 
> The attached patch should address this concern.

I think it does but I think I had reason why I did not do this.
It may have been something to do with signiture verification.
I forgot what exactly put me off to add such extension ...  

You can always use explicit description in watch file if upstream uses
such extension.

Osamu

Bug#823624: devscripts: [uscan] please include tgz in @ARCHIVE_EXT@

[Daniel Kahn Gillmor]

Package: devscripts
Version: 2.16.4
Severity: normal
Tags: patch

Dear Maintainer,

some upstreams (like sks) ship their tarballs as foo-1.1.5.tgz

@ARCHIVE_EXT@ fails to locate this tarball.

The attached patch should address this concern.

--dkg

-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
Not present

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'testing'), (200, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages devscripts depends on:
ii  dpkg-dev 1.18.4
ii  libc62.22-7
ii  perl 5.22.1-10
pn  python3:any  

Versions of packages devscripts recommends:
ii  apt 1.2.11
ii  at  3.1.18-2
ii  curl7.47.0-1
ii  dctrl-tools 2.24-2
ii  debian-keyring  2016.04.22
ii  dput-ng [dput]  1.10
ii  dupload 2.7.0
pn  equivs  
ii  fakeroot1.20.2-1
ii  file1:5.25-2
ii  gnupg   2.1.11-7+exp1
ii  libdistro-info-perl 0.14
ii  libencode-locale-perl   1.05-1
ii  liblwp-protocol-https-perl  6.06-2
pn  libsoap-lite-perl   
ii  liburi-perl 1.71-1
ii  libwww-perl 6.15-1
ii  lintian 2.5.44
ii  man-db  2.7.5-1
ii  patch   2.7.5-1
ii  patchutils  0.3.4-1
ii  python3-debian  0.1.27
ii  python3-magic   1:5.25-2
ii  sensible-utils  0.0.9
ii  strace  4.10-3
ii  unzip   6.0-20
ii  wdiff   1.2.2-1+b1
ii  wget1.17.1-1+b1
ii  xz-utils5.1.1alpha+20120614-2.1

Versions of packages devscripts suggests:
ii  build-essential  11.7
pn  cvs-buildpackage 
ii  devscripts-el35.12
ii  diffoscope   52
pn  dose-extra   
pn  gnuplot  
ii  gpgv 2.1.11-7+exp1
pn  libauthen-sasl-perl  
pn  libfile-desktopentry-perl
ii  libnet-smtp-ssl-perl 1.03-1
pn  libterm-size-perl
ii  libtimedate-perl 2.3000-2
pn  libyaml-syck-perl
ii  mailutils [mailx]1:2.99.99-1
ii  mozilla-devscripts   0.45.1
pn  mutt 
ii  openssh-client [ssh-client]  1:7.2p2-5
ii  s-nail [mailx]   14.8.8-1
ii  svn-buildpackage 0.8.5+nmu1
ii  w3m  0.5.3-27

-- debconf-show failed
>From 8039b887e7eb4ed03ce4f12cdee9f69fe89abaee Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor 
Date: Fri, 6 May 2016 15:14:11 -0400
Subject: [PATCH] include tgz in @ARCHIVE_EXT@

---
 scripts/uscan.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index e105a68..dab1947 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -262,7 +262,7 @@ This is substituted by the legal upstream version regex (capturing).
 
 This is substituted by the typical archive file extension regex (non-capturing).
 
-  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip)
+  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip|tgz)
 
 =item B<@SIGNATURE_EXT@>
 
@@ -4159,7 +4159,7 @@ sub process_watchfile ()
 
 	# Handle @PACKAGE@ @ANY_VERSION@ @ARCHIVE_EXT@ substitutions
 	my $any_version = '[-_]?(\d[\-+\.:\~\da-zA-Z]*)';
-	my $archive_ext = '(?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip)';
+	my $archive_ext = '(?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip|tgz)';
 	my $signature_ext = $archive_ext . '\.(?:asc|pgp|gpg|sig)';
 	s/\@PACKAGE\@/$package/g;
 	s/\@ANY_VERSION\@/$any_version/g;
-- 
2.8.1