Your message dated Sat, 28 Jun 2008 17:32:15 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#487436: fixed in devscripts 2.10.31
has caused the Debian Bug report #487436,
regarding [uscan] please be smarter when redirected
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
487436: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487436
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: devscripts
Version: 2.10.30
Severity: wishlist
Tags: patch
User: [EMAIL PROTECTED]
Usertags: uscan
Let's take as an example a common sf.net project file:
http://sf.net/kcheckgmail/kcheckgmail-(.*)\.tar\.gz
If the redirector redirects the request to let's say heanet, the regex used to
match the href is still:
(?:(?:http://qa.debian.org)?
\/watch\/sf\.php\/kcheckgmail\/)?kcheckgmail-(.*)\.tar\.gz
But it would be nice if it also tried to match whatever $response->base
returns. So in case the redirector redirects the request to kent it still
works.
This feature would be very very useful in case of the redirector and some
other sites that not only redirect to another site, but actually change the
directory structure.
Attached is a patch adding this feature, together with a HTTP header called
X-uscan-features which is now set to 'enhaced-matching'. The latter was added
so, at least, the sf.net redirector can now balance the mirror's load to even
more addresses if that header is present on the request, as not to break
watch files being checked with an old uscan.
Example:
$ uscan.pl --report --verbose --debug
-- Scanning for watchfiles in .
-- Found watchfile in ./debian
-- In debian/watch, processing watchfile line:
http://sf.net/ffmpeg-php/ffmpeg-php-(.*)\.tbz2
uscan.pl debug: requesting URL http://qa.debian.org/watch/sf.php/ffmpeg-php/
uscan.pl debug: base URI:
http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/
uscan.pl debug: received content:
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd";>
<HTML LANG="en-GB">
<HEAD>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<TITLE>UK Mirror Service:
sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php</TITLE>
<LINK REL="STYLESHEET" HREF="/styles/main.css">
</HEAD>
<BODY BGCOLOR="#ffffff" TEXT="#000000" LINK="#0000ff" VLINK="#800080"
ALINK="#ff0000">
<FORM METHOD=GET ACTION="http://search.mirrorservice.org/search/";
STYLE="padding:0; margin:0">
<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0>
<TR>
[...]
<TR>
<TD><A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.2.1.tbz2"><IMG
ALT="[binary]" SRC="/nams/icons/br/binary.gif" BORDER=0 ALIGN=left VSPACE=0
HSPACE=0></A> <A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.2.1.tbz2">ffmpeg-php-0.5.2.1.tbz2</A></TD>
<TD ALIGN=right> 1.5M 06-Apr-2008 </TD>
<TD></TD>
</TR>
<TR>
<TD><A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.1.tbz2"><IMG
ALT="[binary]" SRC="/nams/icons/br/binary.gif" BORDER=0 ALIGN=left VSPACE=0
HSPACE=0></A> <A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.1.tbz2">ffmpeg-php-0.5.3.1.tbz2</A></TD>
<TD ALIGN=right> 288.5K 10-Jun-2008 </TD>
<TD></TD>
</TR>
<TR>
<TD><A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.tbz2"><IMG
ALT="[binary]" SRC="/nams/icons/br/binary.gif" BORDER=0 ALIGN=left VSPACE=0
HSPACE=0></A> <A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.tbz2">ffmpeg-php-0.5.3.tbz2</A></TD>
<TD ALIGN=right> 1.5M 31-May-2008 </TD>
<TD></TD>
[...]
</TR>
</TABLE>
<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>
<TD WIDTH=3 HEIGHT=8><IMG SRC="/nams/icons/blank.gif" WIDTH=3></TD>
<TD WIDTH=483 COLSPAN=3><IMG SRC="/nams/icons/lha_top.gif" WIDTH=483
HEIGHT=8></TD>
</TR></TABLE>
<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>
<TD WIDTH=3><IMG SRC="/nams/icons/blank.gif" ALT="" WIDTH=3></TD>
<TD WIDTH=2 BGCOLOR="#000000"><IMG SRC="/nams/icons/blank.gif" ALT=""
WIDTH=2></TD>
<TD WIDTH=6><IMG SRC="/nams/icons/blank.gif" ALT="" WIDTH=3></TD>
<TD VALIGN=top><FONT FACE="Arial, arial, sans serif, Sans Serif, sans-serif"
SIZE="2">
<A
HREF="/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/[confdisp]">Customise
display options</A><BR>
Select the name of a file to download it.
<BR>
<TABLE BORDER=0 CELLPADDING=2 CELLSPACING=0>
<TR>
<TD VALIGN=top>
<FONT FACE="Arial, arial, sans serif, Sans Serif, sans-serif" SIZE="2">
<IMG SRC="/nams/icons/br/squishdir.gif" ALT="[archive]"> - an archive of other
files.<BR CLEAR=all>
</FONT>
</TD>
<TD VALIGN=top>
<FONT FACE="Arial, arial, sans serif, Sans Serif, sans-serif" SIZE="2">
<IMG SRC="/nams/icons/br/peek.gif" ALT="[browse]"> - peek inside an
archive.<BR CLEAR=all>
</FONT>
</TD>
</TR>
</TABLE>
<A HREF="/help/browser_icons.html">Further help</A>
</FONT>
</FONT>
</TD>
</TR>
<TR>
<TD COLSPAN=3><IMG SRC="/nams/icons/down_arrow.gif" WIDTH=8
HEIGHT=12></TD>
<TD></TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH=500>
<TR>
<TD ALIGN="left"><FONT FACE="Arial, arial, sans serif, Sans Serif,
sans-serif" SIZE="2"><FONT SIZE=-2> <A HREF="/legal.txt">Terms of Use</A>
</FONT></FONT></TD>
<TD ALIGN="right"><FONT FACE="Arial, arial, sans serif, Sans Serif,
sans-serif" SIZE="2"><FONT SIZE=-2> Comments or Questions:
<A HREF="/help/contact.html">contact us</A><BR>
</FONT></FONT></TD>
</TR>
</TABLE>
</BODY>
</HTML>
[End of received content]
uscan.pl debug: matching pattern(s) (?:(?:http://qa.debian.org)?
\/watch\/sf\.php\/ffmpeg\-php\/)?ffmpeg-php-(.*)\.tbz2 (?:
(?:http://www.mirrorservice.org)?
\/sites\/download\.sourceforge\.net\/pub\/sourceforge\/f\/ff\/ffmpeg\-php\/)?ffmpeg-php-(.*)\.tbz2
-- Found the following matching hrefs:
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.2.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.2.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.3.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.3.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.4.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.4.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.5.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.5.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.6.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.6.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.7.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.7.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.8.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.8.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.9.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.4.9.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.0.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.0.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.2.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.2.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.1.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.tbz2
/sites/download.sourceforge.net/pub/sourceforge/f/ff/ffmpeg-php/ffmpeg-php-0.5.3.tbz2
Newest version on remote site is 0.5.3.1, local version is 0.5.2.1
=> ffmpeg-php-0.5.3.1.tbz2 already in package directory
-- Scan finished
Kind regards,
--
Atomo64 - Raphael
Please avoid sending me Word, PowerPoint or Excel attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html
Index: /home/raphael/Deb/devscripts/trunk/scripts/uscan.pl
===================================================================
--- /home/raphael/Deb/devscripts/trunk/scripts/uscan.pl (revision 1515)
+++ /home/raphael/Deb/devscripts/trunk/scripts/uscan.pl (working copy)
@@ -653,13 +653,17 @@
my $origline = $line;
my ($base, $site, $dir, $filepattern, $pattern, $lastversion, $action);
+ my (@patterns, $response_uri);
my %options = ();
my ($request, $response);
my ($newfile, $newversion);
my $style='new';
my $urlbase;
+ my $headers = HTTP::Headers->new;
+ # Please separate the features with commas, only add them if needed
+ $headers->header('X-uscan-features' => 'enhaced-matching');
%dehs_tags = ('package' => $pkg);
if ($watch_version == 1) {
@@ -787,6 +791,8 @@
return 1;
}
+ push @patterns, $pattern;
+
# What is the most recent file, based on the filenames?
# We first have to find the candidates, then we sort them using
# Devscripts::Versort::versort
@@ -795,13 +801,30 @@
die "$progname: you must have the libcrypt-ssleay-perl package installed\nto use https URLs\n";
}
print STDERR "$progname debug: requesting URL $base\n" if $debug;
- $request = HTTP::Request->new('GET', $base);
+ $request = HTTP::Request->new('GET', $base, $headers);
$response = $user_agent->request($request);
if (! $response->is_success) {
warn "$progname warning: In watchfile $watchfile, reading webpage\n $base failed: " . $response->status_line . "\n";
return 1;
}
+ $response_uri = $response->base;
+ if (! defined($response_uri)) {
+ warn "$progname warning: In watchfile $watchfile, failed to get base URI: \n";
+ }
+
+ print STDERR "$progname debug: base URI: $response_uri\n"
+ if $debug;
+
+ if (defined($response_uri)) {
+ my $base_dir = $response_uri;
+
+ $base_dir =~ s%^\w+://[^/]+/%/%;
+ if ($response_uri =~ m%^(\w+://[^/]+)%) {
+ push @patterns, "(?:(?:$1)?" . quotemeta($base_dir) . ")?$filepattern";
+ }
+ }
+
my $content = $response->content;
print STDERR "$progname debug: received content:\n$content\[End of received content]\n"
if $debug;
@@ -821,27 +844,29 @@
($urlbase = $base) =~ s%/[^/]*$%/%;
}
- print STDERR "$progname debug: matching pattern $pattern\n" if $debug;
+ print STDERR "$progname debug: matching pattern(s) @patterns\n" if $debug;
my @hrefs;
while ($content =~ m/<\s*a\s+[^>]*href\s*=\s*([\"\'])(.*?)\1/gi) {
my $href = $2;
- if ($href =~ m&^$pattern$&) {
- if ($watch_version == 2) {
- # watch_version 2 only recognised one group; the code
- # below will break version 2 watchfiles with a construction
- # such as file-([\d\.]+(-\d+)?) (bug #327258)
- push @hrefs, [$1, $href];
- } else {
- # need the map { ... } here to handle cases of (...)?
- # which may match but then return undef values
- my $mangled_version =
- join(".", map { $_ if defined($_) }
- $href =~ m&^$pattern$&);
- foreach my $pat (@{$options{'uversionmangle'}}) {
- eval "\$mangled_version =~ $pat;";
+ foreach my $_pattern (@patterns) {
+ if ($href =~ m&^$_pattern$&) {
+ if ($watch_version == 2) {
+ # watch_version 2 only recognised one group; the code
+ # below will break version 2 watchfiles with a construction
+ # such as file-([\d\.]+(-\d+)?) (bug #327258)
+ push @hrefs, [$1, $href];
+ } else {
+ # need the map { ... } here to handle cases of (...)?
+ # which may match but then return undef values
+ my $mangled_version =
+ join(".", map { $_ if defined($_) }
+ $href =~ m&^$_pattern$&);
+ foreach my $pat (@{$options{'uversionmangle'}}) {
+ eval "\$mangled_version =~ $pat;";
+ }
+ push @hrefs, [$mangled_version, $href];
+ }
}
- push @hrefs, [$mangled_version, $href];
- }
}
}
if (@hrefs) {
signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.10.31
We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive:
devscripts_2.10.31.dsc
to pool/main/d/devscripts/devscripts_2.10.31.dsc
devscripts_2.10.31.tar.gz
to pool/main/d/devscripts/devscripts_2.10.31.tar.gz
devscripts_2.10.31_amd64.deb
to pool/main/d/devscripts/devscripts_2.10.31_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Adam D. Barratt <[EMAIL PROTECTED]> (supplier of updated devscripts package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 28 Jun 2008 10:24:56 -0700
Source: devscripts
Binary: devscripts
Architecture: source amd64
Version: 2.10.31
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <[email protected]>
Changed-By: Adam D. Barratt <[EMAIL PROTECTED]>
Description:
devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 486594 487384 487436 487513 487592 487999 488190
Changes:
devscripts (2.10.31) unstable; urgency=low
.
[ Adam D. Barratt ]
* bts
+ Replace the use of date -R with strftime(). Thanks Stephen Gran.
+ Allow an SMTP host to be specified as using SMTPS and/or a
non-standard port number
* checkbashisms:
+ Add a check for $UID being set to -x
+ Apply a small fix to part of the "quoted block detection"
+ Quote test expressions using qr to allow perl to optionally compile
or otherwise optimise them. Thanks to Frank Lichtenheld for the idea.
+ Add a --posix option which flags constructs not supported by POSIX but
permitted by Debian Policy (echo -n, local (with no options or
assignments) and test / [ using -a or -o )
+ Improve the suggested replacement for $UID and $EUID (Closes: #488190)
* Debbugs.pm: Move initialisation of the SOAP object in to a common routine
and set the underlying transport object to honour proxies from the
environment (Closes: #487592)
* debchange, nmudiff: Replace calls to date -R with strftime(). Thanks
Stephen Gran (Closes: #486594)
* debuild: Update the dpkg-buildpackage emulation to use whitespace as the
separator in DEB_BUILD_OPTIONS as per Debian Policy 3.8.0 and to print a
warning if an unrecognised option is encountered; based on the
corresponding patch to Dpkg::BuildOptions
* debsign: If we don't have permission to create files in the same location
as the originals, use a temporary location instead (Closes: #487999)
* licensecheck:
+ Add .cxx and .hxx to the default list of file extensions to check
(Closes: #487384)
+ Add _MTN (monotone) to the default exclusion expression
* rc-alert: Allow bugs matching specific sets of tags or applying to
specific distributions to be included or excluded from the list of
reported bugs (Closes: #487513)
* uscan:
+ Add an example of a newer form of watch file syntax for SourceForge
based projects to the manpage
+ If the site being checked redirects to another with a directory
structure that does not match the original site, check for download URLs
that refer to any of the redirected sites, in addition to the original
site. Based on a patch by Raphael Geissert (Closes: #487436)
* debian/control
+ Suggest libnet-smtp-ssl-perl (>= 1.01-2) in order to allow bts to
support SMTPS. The versioned dependency is required in order to ensure
that a fixed libio-socket-ssl-perl is used.
+ Add libnet-smtp-ssl-perl to the description of bts
* README: Add libnet-smtp-ssl-perl to the description of bts
.
[ James Vega ]
* Debbugs.pm
+ Actually include the documented 'severity' key for the select
function.
+ Fix some whitespace.
* who-uploads: Accept -M as a short form for --max-uploads
Checksums-Sha1:
5dd0acfd47f63967f222f19a5c3e11a4974b3d19 1393 devscripts_2.10.31.dsc
cdc456e5782ad58dfaf64671cb887fb122f16657 585804 devscripts_2.10.31.tar.gz
6f82743dc2feac142b5fa9eaea737162ed3c2264 497810 devscripts_2.10.31_amd64.deb
Checksums-Sha256:
b7c3cef1096aaf26b8f6a64ffe4851f0511a2b832d9137d54f037db2cf9395c5 1393
devscripts_2.10.31.dsc
ba23ad336deaacfb8aeacdb57f2f2545f8b26d55bce6ce33527318b20224a502 585804
devscripts_2.10.31.tar.gz
ab420e1de477edf6c848caad9d8a98de414b86133c15a4372bfbe82920de7329 497810
devscripts_2.10.31_amd64.deb
Files:
8756f2e5b7cf7f4c42861f9b21b80607 1393 devel optional devscripts_2.10.31.dsc
570d2227de13aabdcd82a117a2c1413e 585804 devel optional
devscripts_2.10.31.tar.gz
c2c4e8d805f4b03a32e29817fc7d31ad 497810 devel optional
devscripts_2.10.31_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkhmdQUACgkQokcE1TReOoVvPACfQ5/3Tb+rSN0ID1JbBLA5cf1W
cdwAn3+veiHxu3scM1lAOX7a2aONB0t5
=KJlR
-----END PGP SIGNATURE-----
--- End Message ---
