Bug#662773: debi: Please (re-)introduce -u short form for --upgrade
On 06.03.2012 10:11, Julian Andres Klode wrote: Previous versions of debi supported the use of -u instead of --upgrade if I am not mistaken. This was not documented in the manpage, but it was definitely useful. So, could you please re-introduce that? For the record, you /are/ mistaken, which is why it wasn't documented. :-) That doesn't make it a bad idea, of course... Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, squeeze, updated. v2.10.69+squeeze1-5-gf51f803
The following commit has been merged in the squeeze branch:
commit 1344d571ac9fce8f2e80d4ecd88995f5c481e82f
Author: Adam D. Barratt a...@adam-barratt.org.uk
Date: Sun Feb 12 19:37:00 2012 +
Fix CVE-2012-0211 and CVE-2012-0212 (argument injection / modification)
Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index ae32df2..1ba66f5 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -17,7 +17,10 @@
use 5.006_000;
use strict;
use Cwd;
+use Dpkg::IPC;
use File::Basename;
+use File::Copy qw/ cp move /;
+use File::Path qw/ rmtree /;
use File::Temp qw/ tempdir tempfile /;
use lib '/usr/share/devscripts';
use Devscripts::Versort;
@@ -341,10 +344,27 @@ if ($type eq 'deb') {
no strict 'refs';
foreach my $i (1,2) {
my $deb = shift;
- my $debc = `env LC_ALL=C dpkg-deb -c $deb`;
- $? == 0 or fatal dpkg-deb -c $deb failed!;
- my $debI = `env LC_ALL=C dpkg-deb -I $deb`;
- $? == 0 or fatal dpkg-deb -I $deb failed!;
+ my ($debc, $debI) = ('', '');
+ my %dpkg_env = ( LC_ALL = 'C' );
+ eval {
+ spawn(exec = ['dpkg-deb', '-c', $deb],
+ env = \%dpkg_env,
+ to_string = \$debc,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -c $deb failed!;
+ }
+
+ eval {
+ spawn(exec = ['dpkg-deb', '-I', $deb],
+ env = \%dpkg_env,
+ to_string = \$debI,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -I $deb failed!;
+ }
# Store the name for later
$singledeb[$i] = $deb;
# get package name itself
@@ -381,7 +401,7 @@ elsif ($type eq 'changes' or $type eq 'debs') {
last if $infiles and /^[^ ]/;
/^Files:/ and $infiles=1, next;
next unless $infiles;
- / (\S*.u?deb)$/ and push @debs, dirname($changes) . '/' . $1;
+ / (\S*.u?deb)$/) push @debs, dirname($changes) . '/' . $1;
}
close CHANGES
or fatal Problem reading $changes: $!;
@@ -395,10 +415,26 @@ elsif ($type eq 'changes' or $type eq 'debs') {
foreach my $deb (@debs) {
no strict 'refs';
fatal Can't read file: $deb unless -r $deb;
- my $debc = `env LC_ALL=C dpkg-deb -c $deb`;
- $? == 0 or fatal dpkg-deb -c $deb failed!;
- my $debI = `env LC_ALL=C dpkg-deb -I $deb`;
- $? == 0 or fatal dpkg-deb -I $deb failed!;
+ my ($debc, $debI) = ('', '');
+ my %dpkg_env = ( LC_ALL = 'C' );
+ eval {
+ spawn(exec = ['dpkg-deb', '-c', $deb],
+ to_string = \$debc,
+ env = \%dpkg_env,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -c $deb failed!;
+ }
+ eval {
+ spawn(exec = ['dpkg-deb', '-I', $deb],
+ to_string = \$debI,
+ env = \%dpkg_env,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -I $deb failed!;
+ }
my $debpath = $deb;
# get package name itself
$deb =~ s,.*/,,; $deb =~ s/_.*//;
@@ -503,30 +539,27 @@ elsif ($type eq 'dsc') {
and scalar(@excludes) == 0 and $use_interdiff and
!$wdiff_source_control) {
# same orig tar ball, interdiff exists and not wdiffing
- my $command = join( , (interdiff, -z, @diff_opts, '$diffs[1]',
- '$diffs[2]', , $filename) );
- my $rv = system($command);
- if ($rv) {
- fatal interdiff -z $diffs[1] $diffs[2] failed!;
- } else {
- if ($have_diffstat and $show_diffstat) {
- my $header = diffstat for . basename($diffs[1])
- . . basename($diffs[2]) . \n\n;
- $header =~ s/\.diff\.gz//g;
- print $header;
- system(diffstat $filename);
- print \n;
- }
-
- if (-s $filename) {
- open( INTERDIFF, '', $filename );
- while( INTERDIFF ) {
- print $_;
- }
- close INTERDIFF;
+ spawn(exec = ['interdiff', '-z', @diff_opts, $diffs[1], $diffs[2]],
+ to_file = $filename,
+ wait_child = 1);
+ if ($have_diffstat and $show_diffstat) {
+ my $header = diffstat for . basename($diffs[1])
+ . . basename($diffs[2]) . \n\n;
+ $header =~ s/\.diff\.gz//g;
+ print $header;
+ spawn(exec = ['diffstat', $filename],
+ wait_child = 1);
+ print \n;
+ }
- $exit_status = 1;
+ if (-s $filename) {
+ open( INTERDIFF, '', $filename );
+ while
[SCM] Git repository for devscripts branch, squeeze, updated. v2.10.69+squeeze1-5-gf51f803
The following commit has been merged in the squeeze branch:
commit 9a52dbad4f0c6eb46f098260a2c724fb657e1377
Author: Raphael Geissert geiss...@debian.org
Date: Mon Feb 13 07:27:00 2012 +
debdiff: Fix CVE-2012-0210 (insufficient input sanitising)
Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 1ba66f5..980ef41 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -401,7 +401,12 @@ elsif ($type eq 'changes' or $type eq 'debs') {
last if $infiles and /^[^ ]/;
/^Files:/ and $infiles=1, next;
next unless $infiles;
- / (\S*.u?deb)$/) push @debs, dirname($changes) . '/' . $1;
+ if (/ (\S*.u?deb)$/) {
+ my $file = $1;
+ $file !~ m,[/\x00],
+ or fatal File name contains invalid characters: $file;
+ push @debs, dirname($changes) . '/' . $file;
+ }
}
close CHANGES
or fatal Problem reading $changes: $!;
@@ -492,6 +497,8 @@ elsif ($type eq 'dsc') {
# This had better match
if (/^\s+[0-9a-f]{32}\s+\d+\s+(\S+)$/) {
my $file = $1;
+ $file !~ m,[/\x00],
+ or fatal File name contains invalid characters: $file;
if ($file =~ /\.diff\.gz$/) {
$diffs[$i] = cwd() . '/' . $file;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, squeeze, updated. v2.10.69+squeeze1-5-gf51f803
The following commit has been merged in the squeeze branch: commit f51f8036044cab47841a427d51e46903ded21a3c Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Tue Feb 14 10:26:30 2012 + releasing 2.10.69+squeeze2 Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk diff --git a/debian/changelog b/debian/changelog index 0eaa87c..05fc4ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,24 @@ +devscripts (2.10.69+squeeze2) squeeze-security; urgency=high + + [ Adam D. Barratt ] + * debdiff: Fix CVE-2012-0211 and CVE-2012-0212 (argument injection / +modification) + + [ Raphael Geissert ] + * debdiff: ++ Fix CVE-2012-0210 (insufficient input sanitising reading .dsc + and .changes files) ++ Remove undocumented feature treating extensionless files as if + they were packages (Closes: #659559) + + -- Adam D. Barratt a...@adam-barratt.org.uk Tue, 14 Feb 2012 10:26:14 + + devscripts (2.10.69+squeeze1) stable; urgency=low * bts: Accept the wheezy and wheezy-ignore tags. * debchange: + Set Squeeze as the default backports target. -+ Recognize lenny-backports-sloppy and squeeze-backports ++ Recognize lenny-backports-squeeze and squeeze-backports distributions. + Remove etch-backports and etch-volatile distributions. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.10.69+squeeze2, created. v2.10.69+squeeze2
The annotated tag, v2.10.69+squeeze2 has been created at 1de55bde6bfbfc23512a7e21559c410ad9ac5307 (tag) tagging f51f8036044cab47841a427d51e46903ded21a3c (commit) replaces v2.10.69+squeeze1 tagged by Adam D. Barratt on Sat Mar 3 18:02:26 2012 + - Shortlog Version 2.10.69+squeeze2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPUlzKAAoJEMXOXcLFQs1ZkrkP/itnfQdlKwX/Zn+dclSqjhQ8 hh/aOLcJdXkbIQ6LeIp+F0o2tIkVVkRYtkw3PRMqjlEA+9dIFwJ+EXR9LmbiJB/E ISHpATUavTwUEP3ft81OpVlHev7EJ4zsVYoddp3MVfy9cyjnCenB58gzDzHjWJp0 UUBEiscfx6r1mKBTH9i33Hs3MjuAMJkgUEQOzv5q8I8kxBrHBq0BW+9P2dS4zZ5q JcPyvASELQy9zZuJpmqzCwmu0tAWux4z76WIYnVQkfxh61qIYptxTY7o24ffXpgW fEmjZvtfdklYAJkpvqFVjp1cZvJ20QEY6dlwMsb4iUPt5/xLjmcXdydk4swmr3sl 4xIxtfZNiMKJGZUTA98TgOthmiPhrq52QZMumX+dQ3blOk3vWF2fW6GN563GkcZ6 qXphcHT/ZhHuM/ByQb7E/4eYOeXUPqD8QN/RMDdLV12Y3/zJ7PhNaI1ljrpI5kvN YFmZyPX7//fgBOFuCyE7ZuZ1fEcaPnfRVy/UP6LTUIrZ6mUwE3rsqvE+4F7Un6Ok ph0EvBSgLani2Z6CTc0X/zZkQL1p0Tw0CRNtU+kirOaNUivm+7RiTh4oKseP85zn m+gGu753QzaesebCS55RFU46ZrxNoPmjcQo+YwYGRWws7D8p5SW+yQPG8MKKRB+U LtlByG1Sq6DhodO//lJa =8dyU -END PGP SIGNATURE- Adam D. Barratt (2): Fix CVE-2012-0211 and CVE-2012-0212 (argument injection / modification) releasing 2.10.69+squeeze2 James Vega (1): lenny-backports-squeeze - lenny-backports-sloppy Raphael Geissert (2): debdiff: Fix CVE-2012-0210 (insufficient input sanitising) debdiff: Don't treat extensionless files as if they were packages --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, squeeze, updated. v2.10.69+squeeze2-1-g869de05
The following commit has been merged in the squeeze branch: commit 869de0551229abef50338b12f948d7162f56c848 Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Sat Mar 3 18:04:37 2012 + Re-introduce changelog fix accidentally dropped for +squeeze2 This was previously b0f571b0d1d39ae298ebf9bcee05d6ac6c7d8859 Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk diff --git a/debian/changelog b/debian/changelog index 05fc4ba..3458441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,7 +18,7 @@ devscripts (2.10.69+squeeze1) stable; urgency=low * bts: Accept the wheezy and wheezy-ignore tags. * debchange: + Set Squeeze as the default backports target. -+ Recognize lenny-backports-squeeze and squeeze-backports ++ Recognize lenny-backports-sloppy and squeeze-backports distributions. + Remove etch-backports and etch-volatile distributions. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#660451: /usr/bin/licensecheck: licensecheck misdetect BSD-4-clause license as BSD-3-clause
On Sun, 2012-02-19 at 13:52 +0400, Anton Martchukov wrote: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. [...] this is BSD-4-clause license as per SPDX [1], however license check incorrectly detects it as BSD-3-clause [2] : [...] [1] http://spdx.org/licenses/BSD-4-Clause Actually, afaict it's missing a clause which makes it four-clause BSD, and which is even listed on the SPDX page you linked to: 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: This product includes software developed by the organization. Since that term is the one which differs between the three- and four-clause variants of the license, it needs to be included in order for licensecheck to detect it as a four-clause license. I'll leave the bug open for now in case one of my co-maintainers disagrees, but I'm not actually convinced that the license above really even qualifies as 3-BSD + extra stuff, given that it omits: Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. and the second clause in the text you quoted doesn't appear to equate to that. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-12-g9cbe605
The following commit has been merged in the master branch:
commit 0a3e4c44856cbd4c929df6b64795429e6870690e
Author: Raphael Geissert geiss...@debian.org
Date: Tue Feb 14 23:11:12 2012 +
debdiff: Don't treat extensionless files as if they were packages
Closes: #659559
diff --git a/debian/changelog b/debian/changelog
index 3f71c41..0fa4797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ devscripts (2.11.4) UNRELEASED; urgency=low
* suspicious-source: Add inode/x-empty to whitelist of MIME types
(Closes: #659946).
+ [ Raphael Geissert ]
+ * debdiff: Remove undocumented feature treating extensionless files as if
+they were packages (Closes: #659559)
+
-- Benjamin Drung bdr...@debian.org Wed, 15 Feb 2012 15:56:19 +0100
devscripts (2.11.3) unstable; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index fa0c367..a1afcd4 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -321,14 +321,11 @@ if (! $type) {
elsif ($ARGV[0] =~ /\.udeb$/) { $type = 'deb'; }
elsif ($ARGV[0] =~ /\.changes$/) { $type = 'changes'; }
elsif ($ARGV[0] =~ /\.dsc$/) { $type = 'dsc'; }
-elsif (`file $ARGV[0]` =~ /Debian/) { $type = 'deb'; }
else {
fatal Could not recognise files; the names should end .deb, .udeb,
.changes or .dsc;
}
-if ($ARGV[1] !~ /\.$type$/) {
- unless ($type eq 'deb' and `file $ARGV[0]` =~ /Debian/) {
- fatal The two filenames must have the same suffix, either .deb,
.udeb, .changes or .dsc;
- }
+if ($ARGV[1] !~ /\.$type$/ ($type ne 'deb' || $ARGV[1] !~ /\.udeb$/)) {
+ fatal The two filenames must have the same suffix, either .deb, .udeb,
.changes or .dsc;
}
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-12-g9cbe605
The following commit has been merged in the master branch:
commit 2328cd3cd60548ea0ef42389e347122dd4fcf4b1
Author: Raphael Geissert geiss...@debian.org
Date: Tue Feb 14 23:17:05 2012 +
debdiff: remove extraneous quoting of --exclude parameters
diff --git a/debian/changelog b/debian/changelog
index b1e94af..c520a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,8 @@ devscripts (2.11.4) UNRELEASED; urgency=low
* debdiff:
+ Remove undocumented feature treating extensionless files as if
they were packages (Closes: #659559)
-+ Add missing chdir for dpkg-source
++ Add missing chdir for dpkg-source and remove extraneous quoting
+ of --exclude parameters.
-- Benjamin Drung bdr...@debian.org Wed, 15 Feb 2012 15:56:19 +0100
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 8626dce..3dd56f9 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -593,7 +593,7 @@ elsif ($type eq 'dsc') {
my @command = (diff, -Nru, @diff_opts);
for my $exclude (@excludes) {
- push @command, (--exclude, '$exclude');
+ push @command, (--exclude, $exclude);
}
push @command, ($dir1/$sdir1, $dir2/$sdir2);
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-12-g9cbe605
The following commit has been merged in the master branch:
commit 797ddc961532eb0aeb46153e3f28c8e9ea0500d2
Author: Raphael Geissert geiss...@debian.org
Date: Tue Feb 14 23:30:46 2012 +
debdiff: Fix CVE-2012-0210
(insufficient input sanitising reading .dsc and .changes files)
diff --git a/debian/changelog b/debian/changelog
index c520a30..a54684c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ devscripts (2.11.4) UNRELEASED; urgency=low
they were packages (Closes: #659559)
+ Add missing chdir for dpkg-source and remove extraneous quoting
of --exclude parameters.
++ Fix CVE-2012-0210 (insufficient input sanitising reading .dsc
+ and .changes files).
-- Benjamin Drung bdr...@debian.org Wed, 15 Feb 2012 15:56:19 +0100
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 3dd56f9..fb602f2 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -381,7 +381,12 @@ elsif ($type eq 'changes' or $type eq 'debs') {
last if $infiles and /^[^ ]/;
/^Files:/ and $infiles=1, next;
next unless $infiles;
- / (\S*.u?deb)$/ and push @debs, dirname($changes) . '/' . $1;
+ if (/ (\S*.u?deb)$/) {
+ my $file = $1;
+ $file !~ m,[/\x00],
+ or fatal File name contains invalid characters: $file;
+ push @debs, dirname($changes) . '/' . $file;
+ }
}
close CHANGES
or fatal Problem reading $changes: $!;
@@ -456,6 +461,8 @@ elsif ($type eq 'dsc') {
# This had better match
if (/^\s+[0-9a-f]{32}\s+\d+\s+(\S+)$/) {
my $file = $1;
+ $file !~ m,[/\x00],
+ or fatal File name contains invalid characters: $file;
if ($file =~ /\.diff\.gz$/) {
$diffs[$i] = cwd() . '/' . $file;
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-12-g9cbe605
The following commit has been merged in the master branch:
commit 380da98802411a53b34653d231ba2105324ebebc
Author: Raphael Geissert geiss...@debian.org
Date: Tue Feb 14 23:14:23 2012 +
debdiff: add missing chdir to a dpkg-source invocation
diff --git a/debian/changelog b/debian/changelog
index 0fa4797..b1e94af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,10 @@ devscripts (2.11.4) UNRELEASED; urgency=low
(Closes: #659946).
[ Raphael Geissert ]
- * debdiff: Remove undocumented feature treating extensionless files as if
-they were packages (Closes: #659559)
+ * debdiff:
++ Remove undocumented feature treating extensionless files as if
+ they were packages (Closes: #659559)
++ Add missing chdir for dpkg-source
-- Benjamin Drung bdr...@debian.org Wed, 15 Feb 2012 15:56:19 +0100
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index a1afcd4..8626dce 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -555,6 +555,7 @@ elsif ($type eq 'dsc') {
cp $dscs[$i], $diri || fatal copy $dscs[$i] $diri: $!;
spawn(exec = ['dpkg-source', @opts, $dscx],
to_file = '/dev/null',
+ chdir = $diri,
wait_child = 1);
}
opendir DIR,$diri;
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-12-g9cbe605
The following commit has been merged in the master branch:
commit 9cbe605d3eab4f9e67525f69b676c55b273b7a03
Author: Adam D. Barratt a...@adam-barratt.org.uk
Date: Wed Feb 15 00:02:58 2012 +
debdiff: fix CVE-2012-2012 (and possibly remnants of CVE-2012-2011)
Extend the changes from #571528 to cover more situations where
user or file input is passed to an external program. Fixes
CVE-2012-2012 (and any instance of CVE-2012-2011 not already
covered by #571528).
diff --git a/debian/changelog b/debian/changelog
index a54684c..25afc0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,13 @@ devscripts (2.11.4) UNRELEASED; urgency=low
(Closes: #601951)
[ Adam D. Barratt ]
- * debdiff: Fix a regression in the handling of embedded tarballs (a side
-effect of the changes introduced to resolve #571528).
+ * debdiff:
++ Fix a regression in the handling of embedded tarballs (a side
+ effect of the changes introduced to resolve #571528).
++ Extend the changes from #571528 to cover more situations where
+ user or file input is passed to an external program. Fixes
+ CVE-2012-2012 (and any instance of CVE-2012-2011 not already
+ covered by #571528).
[ Paul Wise ]
* suspicious-source: Also ignore mercurial and darcs VCS directories
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index fb602f2..b80c945 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -21,6 +21,7 @@ use Dpkg::IPC;
use Dpkg::Compression;
use File::Copy qw(cp move);
use File::Basename;
+use File::Path qw/ rmtree /;
use File::Temp qw/ tempdir tempfile /;
use lib '/usr/share/devscripts';
use Devscripts::Versort;
@@ -341,10 +342,27 @@ if ($type eq 'deb') {
no strict 'refs';
foreach my $i (1,2) {
my $deb = shift;
- my $debc = `env LC_ALL=C dpkg-deb -c $deb`;
- $? == 0 or fatal dpkg-deb -c $deb failed!;
- my $debI = `env LC_ALL=C dpkg-deb -I $deb`;
- $? == 0 or fatal dpkg-deb -I $deb failed!;
+ my ($debc, $debI) = ('', '');
+ my %dpkg_env = ( LC_ALL = 'C' );
+ eval {
+ spawn(exec = ['dpkg-deb', '-c', $deb],
+ env = \%dpkg_env,
+ to_string = \$debc,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -c $deb failed!;
+ }
+
+ eval {
+ spawn(exec = ['dpkg-deb', '-I', $deb],
+ env = \%dpkg_env,
+ to_string = \$debI,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -I $deb failed!;
+ }
# Store the name for later
$singledeb[$i] = $deb;
# get package name itself
@@ -400,10 +418,26 @@ elsif ($type eq 'changes' or $type eq 'debs') {
foreach my $deb (@debs) {
no strict 'refs';
fatal Can't read file: $deb unless -r $deb;
- my $debc = `env LC_ALL=C dpkg-deb -c $deb`;
- $? == 0 or fatal dpkg-deb -c $deb failed!;
- my $debI = `env LC_ALL=C dpkg-deb -I $deb`;
- $? == 0 or fatal dpkg-deb -I $deb failed!;
+ my ($debc, $debI) = ('', '');
+ my %dpkg_env = ( LC_ALL = 'C' );
+ eval {
+ spawn(exec = ['dpkg-deb', '-c', $deb],
+ to_string = \$debc,
+ env = \%dpkg_env,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -c $deb failed!;
+ }
+ eval {
+ spawn(exec = ['dpkg-deb', '-I', $deb],
+ to_string = \$debI,
+ env = \%dpkg_env,
+ wait_child = 1);
+ };
+ if ($@) {
+ fatal dpkg-deb -I $deb failed!;
+ }
my $debpath = $deb;
# get package name itself
$deb =~ s,.*/,,; $deb =~ s/_.*//;
@@ -518,7 +552,8 @@ elsif ($type eq 'dsc') {
. . basename($diffs[2]) . \n\n;
$header =~ s/\.diff\.gz//g;
print $header;
- system('diffstat', $filename);
+ spawn(exec = ['diffstat', $filename],
+ wait_child = 1);
print \n;
}
@@ -610,7 +645,8 @@ elsif ($type eq 'dsc') {
if ($have_diffstat and $show_diffstat) {
print diffstat for $sdir1 $sdir2\n\n;
- system(diffstat $filename);
+ spawn(exec = ['diffstat', $filename],
+ wait_child = 1);
print \n;
}
@@ -646,7 +682,7 @@ elsif ($type eq 'dsc') {
print \n;
# Clean up
- system (rm, -rf, $wdiffdir1, $wdiffdir2);
+ rmtree([$wdiffdir1, $wdiffdir2]);
}
if (! -f $filename) {
@@ -859,9 +895,15 @@ for my $debname (@CommonDebs) {
mktmpdirs();
for my $i (1,2) {
- if (system('dpkg-deb', '-e', ${\DebPaths$i\}{$debname},
${dir$i})) {
+ my $debpath = ${\DebPaths$i\}{$debname
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-13-g53f6833
The following commit has been merged in the master branch: commit 53f6833af26611fb8979aeb5fdf1daa9e495848f Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Wed Feb 15 19:33:04 2012 + releasing version 2.11.4 diff --git a/debian/changelog b/debian/changelog index 25afc0a..afc14a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -devscripts (2.11.4) UNRELEASED; urgency=low +devscripts (2.11.4) unstable; urgency=high + + * Urgency high for security fixes. [ James McCoy ] * bts: Revert usertags' handling of more than one +/-/=. Only the first one @@ -36,7 +38,7 @@ devscripts (2.11.4) UNRELEASED; urgency=low + Fix CVE-2012-0210 (insufficient input sanitising reading .dsc and .changes files). - -- Benjamin Drung bdr...@debian.org Wed, 15 Feb 2012 15:56:19 +0100 + -- Adam D. Barratt a...@adam-barratt.org.uk Wed, 15 Feb 2012 19:19:31 + devscripts (2.11.3) unstable; urgency=low -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts tag, 2.11.4, created. v2.11.3-13-g53f6833
The tag, 2.11.4 has been created at 53f6833af26611fb8979aeb5fdf1daa9e495848f (commit) - Shortlog commit 53f6833af26611fb8979aeb5fdf1daa9e495848f Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Wed Feb 15 19:33:04 2012 + releasing version 2.11.4 --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, v2.11.4, created. v2.11.4
The annotated tag, v2.11.4 has been created at 69b79c2d00daf455a22e46819d0408892415dcd2 (tag) tagging 53f6833af26611fb8979aeb5fdf1daa9e495848f (commit) replaces v2.11.3 tagged by Adam D. Barratt on Wed Feb 15 19:37:25 2012 + - Shortlog tagging version 2.11.4 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPPAl1AAoJEMXOXcLFQs1ZJP8P/1Gdid2ViAXqR1PEGNMLQ174 /Fjvetm8B7IeP9MVGeyVw6t34key09STOO7wXEunAn41AXS8a+rKxnoyOl+9etmK MK2ngy2LGBLfgROsTf++zdTU2ESifk+5VJlISDmqiV6SgWa9jjDniTGvgG74AhgC GDxwyi4g93QY7+/T67+LiQiHfM3UrOiSCQcdKD1U2T4pSNKYHwmmKQpUVrasBjrh NaysFp/iQh/zdqi50+5OoLgQpwEhFEW6Y0hv6zam7069voNQrInfYOJis5wjet1V SHGJB3ODEFacJeQYuHKBH44Uf3zFV1PZGm29czlB5ECJRBavchKNm33ixi4GpxgP AEBN0u0jIba4EgYWqkwxUYDixaexo97fp4mMq8R44FO1aXpBfhLsTGvXy0WkhVYP fKXRicgqu2zENua+JE7jNdFG2/fPz/7EI6Oknijb42b4yeq3yz5He3M7vOsyIPZV Q1fGrCFv4FbeX9WUtWO5MrdwjXpApF8da0udIXXKcbLBoAV34n9bMZFgmbT3feOp 1fgsW6FN2WXB5AFZCJTrh/sLRzr+dANbhyCBF6xIUyMZLu2OqlvPp68YwaKBMeZj +ZsMIsRmvuPiXO5ojtgGZ36S2KXg9b/MLPMrIc8fA/J2xVFkecYIw3aUIAgQjUcV ErSW2PiOSaushjc5EKci =KbTN -END PGP SIGNATURE- Adam D. Barratt (3): debdiff: Fix a regression in the handling of embedded tarballs (a side effect of the changes introduced to resolve #571528). debdiff: fix CVE-2012-2012 (and possibly remnants of CVE-2012-2011) releasing version 2.11.4 Benjamin Drung (2): Add changelog entry for Paul's commit. suspicious-source: Add inode/x-empty to whitelist of MIME types James McCoy (1): bts: Only the first usertags modifier (+/-/=) is relevant. Paul Wise (1): Also ignore mercurial and darcs VCS directories Raphael Geissert (4): debdiff: Don't treat extensionless files as if they were packages debdiff: add missing chdir to a dpkg-source invocation debdiff: remove extraneous quoting of --exclude parameters debdiff: Fix CVE-2012-0210 Ryan Niebur (2): dget: when finding the sources.list entry for the repository to download a package from, match any port with the correct hostname because apt-cache policy does not output port numbers in URLs (Closes: #601951) remove many unneeded [] in the substitution --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.4-1-g46d3fe2
The following commit has been merged in the master branch: commit 46d3fe2df3c21197b313137db28925eeb3b128ed Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Wed Feb 15 19:41:26 2012 + Initial changelog stanza for 2.11.5 diff --git a/debian/changelog b/debian/changelog index afc14a5..5de4861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +devscripts (2.11.5) UNRELEASED; urgency=low + + * + + -- Adam D. Barratt a...@adam-barratt.org.uk Wed, 15 Feb 2012 19:40:58 + + devscripts (2.11.4) unstable; urgency=high * Urgency high for security fixes. -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.3-4-g76227af
The following commit has been merged in the master branch:
commit 76227af1ee8d68f4844f642325eac903ca21e739
Author: Adam D. Barratt a...@adam-barratt.org.uk
Date: Sun Feb 12 20:58:10 2012 +
debdiff: Fix a regression in the handling of embedded tarballs (a side
effect of the changes introduced to resolve #571528).
diff --git a/debian/changelog b/debian/changelog
index ff4712b..9ac66a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ devscripts (2.11.4) UNRELEASED; urgency=low
because apt-cache policy does not output port numbers in URLs
(Closes: #601951)
+ [ Adam D. Barratt ]
+ * debdiff: Fix a regression in the handling of embedded tarballs (a side
+effect of the changes introduced to resolve #571528).
+
-- James McCoy james...@debian.org Wed, 18 Jan 2012 20:25:01 -0500
devscripts (2.11.3) unstable; urgency=low
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl
index 24d0670..fa0c367 100755
--- a/scripts/debdiff.pl
+++ b/scripts/debdiff.pl
@@ -586,7 +586,7 @@ elsif ($type eq 'dsc') {
chdir = $diri/$sdiri,
nocheck = 1);
if (-d $diri/$sdiri/$filename) {
- move $diri/$sdiri/$filename, $unpacked;
+ move $diri/$sdiri/$filename,
$diri/$sdiri/$unpacked;
}
}
}
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#659086: Processed: Bug#659086 retitle
On Wed, 2012-02-08 at 12:24 +, Debian Bug Tracking System wrote: Processing commands for cont...@bugs.debian.org: retitle 659086 devscripts: [PATCH] checkbashisms.1 - Use GNU OPTION conventions Bug #659086 [devscripts] devscripts: checkbashisms.1 - Use GNU OPTION conventions Changed Bug title to 'devscripts: [PATCH] checkbashisms.1 - Use GNU OPTION conventions' from 'devscripts: checkbashisms.1 - Use GNU OPTION conventions' No. That's meta-data which the BTS already has a perfectly reasonable way to represent (and even group, by default). It doesn't belong in the title. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#659086: devscripts: checkbashisms.1 - Use GNU OPTION conventions
tag 659086 + moreinfo thanks On Wed, 2012-02-08 at 03:19 -0500, Jari Aalto wrote: - Order items alphabetically. - Put help and version options last (GNU's suggested convention). - Present short first, long next (-o, --option; GNU convention) I think my (and I believe the maintainer team in general) view of at least some of these changes is clear enough from previous similar bugs. - Update SEE ALSO to mention licensecheck(1) Why? How are the two scripts linked? Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#659084: devscripts: [PATCH] debsign - use POSIX command substitution $()
On Wed, 2012-02-08 at 02:58 -0500, Jari Aalto wrote: The following patch updates to use POSIX[1] command substitution $() in place of backtics (``). Motivation: - Recommended practise. The $() is recommend by many[2]. It nests easily. - Readability. In high resolution display a tick is hard to see. Different font may also make reading the tick difficult to distinguish. - Typing convenience. The backtick key may be placed in difficult position in non-US keyboard. E.g acrobatics is needed with FI-keyboard by pressing three keys in succession: AltGr + key + Space char I'm confused as to how either the first or last of the above makes any difference to _code that already exists_, which is what you're suggesting changing. fwiw, whilst I admit that I find $() more pleasant to read in general (and use it for /new code/), that doesn't really have anything to do with either not being able to see the backtick, nor it looking similar to other characters. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#652562: /usr/bin/rmadison: [rmadison] Not showing results for lenny suite
reassign 652562 qa.debian.org forcemerge 647708 652562 thanks On Sun, 2011-12-18 at 16:28 +, Jonathan Wiltshire wrote: rmadison is no longer showing results for lenny when it should: jona@lupin:~$ rmadison mediawiki mediawiki | 1:1.12.0-2lenny5 | lenny-security | source, all mediawiki | 1:1.15.3-1~bpo50+1 | backports/lenny | source mediawiki | 1:1.15.5-1~bpo50+1 | backports/lenny | source, all mediawiki | 1:1.15.5-2 | squeeze-security | source, all mediawiki | 1:1.15.5-2squeeze1 | squeeze | source, all mediawiki | 1:1.15.5-4 | wheezy | source, all mediawiki | 1:1.15.5-4 | sid | source, all [...] All these packages should have results in lenny at the time of writing. rmadison simply queries qa.d.o - in this case http://qa.debian.org/madison.php?package=mediawiki - which also doesn't list lenny. The fact that the query results contain codenames rather than suite names (i.e. sid rather than unstable) indicates that the qa.d.o service is UDD-backed, and UDD recently dropped information about lenny - see http://lists.debian.org/debian-qa/2011/10/msg00021.html I'm therefore merging this bug with the existing qa.d.o bug about the issue. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#651286: devscripts: getbuildlogs fails to fetch logs for versions with '+'
On Wed, 2011-12-07 at 13:30 +0100, Pino Toscano wrote: it looks like getbuildlogs cannot download build logs for versions containing a '+' character, eg binNMUs. It can, if asked in the way it expects... $ getbuildlog php5 '5.3.8.0-1+b1' i386 The second argument there is version-pattern. getbuildlog(1) says: The version and architecture patterns are interpreted as extended regular expressions as described in grep(1). so you want: $ getbuildlog php5 '5\.3\.8\.0-1\+b1' i386 Admittedly the --help output doesn't explicitly indicate that the patterns are regular expressions, but each of the examples given does rather imply that fact. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.2-1-g0e83b38
The following commit has been merged in the master branch: commit 0e83b38fc6f22f5bf92b8b496ee6a3c503fd88fd Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Tue Nov 29 19:22:17 2011 + debchange: Fix typo in the description of --no-force-save-on-release Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk diff --git a/debian/changelog b/debian/changelog index e8546e5..0d8ca4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +devscripts (2.11.3) UNRELEASED; urgency=low + + * debchange: Fix typo in the description of --no-force-save-on-release. + + -- Adam D. Barratt a...@adam-barratt.org.uk Tue, 29 Nov 2011 19:19:25 + + devscripts (2.11.2) unstable; urgency=low [ Gerfried Fuchs ] diff --git a/scripts/debchange.pl b/scripts/debchange.pl index 0da718a..5e54cf9 100755 --- a/scripts/debchange.pl +++ b/scripts/debchange.pl @@ -94,7 +94,7 @@ Options: editor opened. Otherwise, the original changelog will not be modified. (default) --no-force-save-on-release - Do not do so. Note that a dummy changelog entry made be supplied + Do not do so. Note that a dummy changelog entry may be supplied in order to achieve the same effect - e.g. $progname --release The entry will not be added to the changelog but its presence will suppress the editor -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.1-31-g25c6a56
The following commit has been merged in the master branch: commit 25c6a56bdc49952bce7d8e22b3a381ebac5f1b34 Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Sat Nov 5 15:18:16 2011 + Make scripts/namecheck.pl executable in the source package Signed-off-by: Adam D. Barratt a...@adam-barratt.org.uk diff --git a/scripts/namecheck.pl b/scripts/namecheck.pl old mode 100644 new mode 100755 -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#640063: [debchange] dch complains about indented entry without previous line in the debian/control file
On Thu, 2011-09-01 at 22:58 +0200, Sylvestre Ledru wrote:
With this changelog:
[...]
and this control file:
[...]
dch will fail with the weird error message
$ dch
Parse error: indented entry without previous line at line 11 of data (
).
It should at least specify that the problem is coming from
debian/control and not debian/changelog.
The message isn't being produced by dch directly, it's coming from:
my $parser = new Parse::DebControl;
my $deb822 = $parser-parse_file('debian/control', {stripComments =
'true'});
It's also generated using warn rather than an exception, so I'm not
sure how easy trapping it inside dch would be.
Moreover, this debian/control could be considered as valid...
If you believe the parsing is incorrect, then please clone or reassign
this bug to libparse-debcontrol-perl; dch isn't doing the parsing
itself.
Regards,
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#639204: debsign: says Could not find a signing program when gpg does not have the requested key
On Mon, 2011-08-29 at 18:08 -0400, James Vega wrote: This appears to be a check for giving preference to gpg over pgp, but is it really necessary to even consider pgp? [...] I think changing it to check for the gpg or gpg2 commands only (no directory or environment variables) and providing an appropriate error message would be a good change. Yep; sounds reasonable to me. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#639204: debsign: says Could not find a signing program when gpg does not have the requested key
On Thu, 2011-08-25 at 01:26 +0200, Yann Dirson wrote: The message is quite misleading: $ debsign tulip_3.6.0dfsg-1_amd64.changes signfile tulip_3.6.0dfsg-1.dsc 5C33C1B8 It might be, but the problem isn't really what you suggest in the subject. $ mv ~/.gnupg/ ~/.gnupg.away $ debsign tulip_3.6.0dfsg-1_amd64.changes Could not find a signing program (pgp or gpg)! $ which gpg /usr/bin/gpg The test for gpg is: if [ \( -n $GNUPGHOME -a -e $GNUPGHOME \) -o -e $HOME/.gnupg ] \ command -v gpg /dev/null 21; then The result of your moving ~/.gnupg is that the first part of the test fails, so gpg is assumed not to be present. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#628801: [uscan] newest_dir is not the newest version, but the topmost matching directory
On Wed, June 1, 2011 14:25, Kai Wasserbäch wrote: while writing a watch file for kernel.org for my own use, I discovered, that uscan sets newest_dir apparently not to the latest matching version, but to the first match. This leads to the problem, that uscan checks the v1.0 directory (for kernel.org) instead of v3.0. Please see the attached watch file for a test case and the debug output for the results. Thank you in advance for fixing this problem. So far as I can see, there are a few reasons that your watch file doesn't work as you expect, and none of them is a bug in uscan. Firstly, your directory pattern is v(?:[\d\.]+). The ?: makes the group non-matching and thus the only part of the directory which is actually relevant is the v. uscan is being asked to sort a series of vs and the list as returned by the server already fulfills that criteria. The directory string you want to match also includes the v, i.e. (v[\d\.]+). Removing the ?: and putting the parentheses in the correct location gives the expected result: -- Found the following matching hrefs (newest first): v3.0/ v2.6/ v2.5/ [...] Secondly, there are no patch-*.bz2 files under the 3.0 directory, but two directories - snapshots and testing. Further, even those directories don't contain files that match patch-([\d\.]+)\.bz2, due to the inclusion of strings such as -rc1-git2. Might I suggest something along the lines of the following? http://www.kernel.org/pub/linux/kernel/(v[\d\.]+)/snapshots/patch-(.+?)\.bz2 That gives me: -- Found the following matching hrefs: patch-3.0-rc1-git1.bz2 patch-3.0-rc1-git2.bz2 Newest version on remote site is 3.0-rc1-git2, local version is 0 = Newer version available from http://www.kernel.org/pub/linux/kernel/v3.0/snapshots/patch-3.0-rc1-git2.bz2 Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.11.0-3-gedfecfc
The following commit has been merged in the master branch: commit edfecfceb9260b6eec0102a8b86b45eb7b9f1d4d Author: Adam D. Barratt a...@adam-barratt.org.uk Date: Tue May 31 19:33:00 2011 +0100 debian/copyright: Update repository information somewhat belatedly for the move to git. diff --git a/debian/changelog b/debian/changelog index 5e4315c..a010c16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ devscripts (2.11.1) UNRELEASED; urgency=low [ David Prévot ] * Stylish manual pages convention review. (Closes: #628447) + [ Adam D. Barratt ] + * debian/copyright: Update repository information somewhat belatedly +for the move to git. + -- Benjamin Drung bdr...@debian.org Sun, 29 May 2011 18:41:13 +0200 devscripts (2.11.0) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index f7d5f72..1ad4f4c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ -The current development version can be downloaded from the SVN +The current development version can be downloaded from the git repository at - svn://svn.debian.org/devscripts/trunk + git://git.debian.org/devscripts/devscripts.git -or browsed online from http://svn.debian.org/ +or browsed online at http://git.debian.org/?p=devscripts/devscripts.git This is a package written originally by Christoph Lameter clame...@debian.org and extensively modified by Julian Gilbey -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#627621: Grammatic error in --bpo changelog entry
On Sun, 2011-05-22 at 21:36 +0200, martin f krafft wrote: I think it should say rebuilt rather than rebuild, since changelogs are generally written in the past tense. I have to admit that I tend to write changelogs in the present tense. That may not be universal, but it certainly seems to be the style adopted by the couple of packages I've been most closely involved in (devscripts itself and lintian), and e.g. dpkg and apt from a very quick selection from this machine. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#622627: /usr/bin/uscan: uscan fails to identify latest directory
On Wed, April 13, 2011 14:59, you wrote: In gvfs, I have this watch file: version=3 http://ftp.gnome.org/pub/GNOME/sources/gvfs/([\d\.]+)[02468]/ \ gvfs-([\d\.]+)\.tar\.gz And it fails to find the latest upstream... running it in --debug mode shows that it selects the wrong directory: afaics, this is expected behaviour; the issue is that the watchfile is not specific enough. uscan debug: matching pattern (?:(?:http://ftp.gnome.org)?\/pub\/GNOME\/sources\/gvfs\/)?([\d\.]+)[02468] -- Found the following matching hrefs (newest first): 1.0/ 1.0/ 1.2/ 1.2/ 1.4/ 1.4/ 1.6/ 1.6/ 1.8/ 1.8/ 0.0/ 0.0/ 0.2/ 0.2/ uscan debug: newest_dir = '1.0' uscan debug: requesting URL http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/ Your watchfile says that the portion of the directory name which is used for matching is everything _except_ the terminating [02468]. This means that the above list of directories contains 0. several times, and 1. several times. uscan is correctly selecting one of the 1. choices, but precisely which one will depend on the order in which perl chooses to sort them. If you change the watchfile to: version=3 http://ftp.gnome.org/pub/GNOME/sources/gvfs/([\d\.]+[02468])/ \ gvfs-([\d\.]+)\.tar\.gz then 1.8 is selected as expected. But when you look up the Last modified timestamp on http://ftp.gnome.org/pub/GNOME/sources/gvfs/ you'll see that 1.0 is older than 1.8. The selection is based purely on the version numbers, not how recently any of the files or directories were modified. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#622317: devscripts: [rmadison] manpage mentions dak ls instead of rmadison
On Tue, 2011-04-12 at 07:06 +0200, Olivier Berger wrote: man rmadison mentions : dak ls several times where it would sound logical to read rmadison. So far as I can see, all of the mentions of dak ls are actually correct. The description paragraph mentions that rmadison is a front-end to a CGI which runs dak ls; that's correct. In the notes section, an option which is accepted by dak ls, but not by the CGI (and therefore not by rmadison) is highlighted, together with the fact that the back-end command used to be called madison, hence the naming of rmadison as remote madison. I believe the program was renamed but this hasn't been fixed. Still the manpage mentions : dak ls was formerly called madison. Maybe this last paragraph needs an update too. It's correct. The parts of the dak suite used to have other names; the part which is now dak ls used to be called madison. I assume that note exists to explain why the script in devscripts is called rmadison. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#618986: dch is not able to find correct perl module for File::Glob and is just hangs
severity 618986 important
tag 618986 + unreproducible
thanks
On Sun, 2011-03-20 at 12:26 +0530, Praveen A wrote:
After a sid dist-upgrade yesterday dch stopped working. When poked
with strace I got this (not able to find Glob.pm or Glob.so)
Those files are provided by perl-base. If this is an RC bug anywhere,
it's not in devscripts. However, in either case, this does not qualify
as grave - a broken dch doesn't make devscripts unusable, nor does a
broken glob make perl unusable - and I'm not convinced an issue in one
script makes devscripts unreleasable either.
Having said that, I've just checked that I've got the latest versions of
devscripts and perl{,-{base,modules}} in unstable installed, and my
tests work fine.
Please could you confirm:
- the versions of perl, perl-base and perl-modules installed on your
system
- exactly what steps you took which led to the issue.
Regards,
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, show, created. v2.10.47
The annotated tag, show has been created at 312a5840be28158f629cef9090afe77930bc5cee (tag) tagging b59743167f42fb831b59a4cad03465f4e9461e3c (commit) replaces v2.10.46 tagged by Adam D. Barratt on Wed Mar 4 14:23:44 2009 -0500 - Shortlog tagging version 2.10.47 Adam D. Barratt (14): Initial 2.10.47 changelog * licensecheck: rc-alert: Modify the description of the I flag to reference the * debdiff: Set the exit status correctly when comparing source packages. If Support bzip2 and lzma compressed orig tarballs. (Closes: #473969) debuild: Support bzip2 and lzma compressed orig tarballs. * nmudiff: Allow the specification of a particular DELAYED queue, rather dcontrol's French manpage should be created from dcontrol.fr.pl, not dcmd.fr.pl * dcontrol: Produce friendly error messages if liburi-perl and/or Fix daft typoes introduced in the last commit po4a update releasing version 2.10.47 Christoph Berg (4): dcontrol: New script to query binary and source package control files at dcontrol: convert to use libwww-perl dcontrol: Use : to separate archive, and add some // extra syntax to support suite names with slashes. dcontrol: forgot :~ in version numbers James Vega (2): bts: Include the module name when calling MIME::Base64::encode_base64 since MIME::Base64 is only being 'require'd not 'use'd. Thanks Євгеній Мещеряков. (Closes: #516117) debchange: Do not use an empty gecos field when trying to determine the maintainer's name. (Closes: 516423) --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts annotated tag, show, deleted. v2.10.47
The annotated tag, show has been deleted was 312a5840be28158f629cef9090afe77930bc5cee --- tag v2.10.47 tagging version 2.10.47 b59743167f42fb831b59a4cad03465f4e9461e3c releasing version 2.10.47 --- -- Git repository for devscripts -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#605235: devscripts: [mass-bug] Send report to the same version even if package list contains different versions
On Sun, 2010-11-28 at 12:46 +0100, Sandro Tosi wrote: I prepared a list of pkg_ver to report bugs against them; it contains: $ grep python-uno mbf3.packages python-uno_1:2.4.1+dfsg-1+lenny8 python-uno_1:3.2.1-7 python-uno_1:3.3.0~beta2-2 [...] Package: python-uno Version: 1:3.3.0~beta2-2 -- Package: python-uno Version: 1:3.3.0~beta2-2 -- Package: python-uno Version: 1:3.3.0~beta2-2 3 reports, all with the (highest?) same version. They will all have the version which occurs latest in the package file. mass-bug builds a hash of versions, indexed by package name, so repeated entries for a given package will simply overwrite the earlier versions. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#604740: pts-subscribe: --until 0 doesn't work
Package: devscripts User: devscri...@packages.debian.org Usertag: pts Version: 2.10.69 Severity: minor [filing so I don't forget about it post-squeeze-release] Hi, pts-subscribe's --help output indicates that --until 0, --until forever and --forever are all synonymous; however, the former does not work - rather than skipping the at call to create an unsubscription job, the script calls at 0 which fails. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#597963: uscan: incorrect parsing of ftp listing
On Fri, 2010-09-24 at 14:27 -0400, James Vega wrote: On Fri, Sep 24, 2010 at 2:20 PM, Adam D. Barratt a...@adam-barratt.org.uk wrote: On Fri, 2010-09-24 at 10:37 -0500, Raphael Geissert wrote: Current hylafax's watch file triggers a bug in uscan's ftp listing parsing. The watch file can be found at: I think there's some missing text there ;-) fwiw, this is trivially fixable in the watch file by stopping it being overly greedy; this watchfile works correctly: ftp://ftp.hylafax.org/source/hylafax-([^SNAPSHOT]*?)\.tar\.gz It's probably useful to not use [] for the wrong purpose, too. :) Yeah, I just make the quick-n-easy fix to the existing file. :-) ftp://ftp.hylafax.org/source/hylafax-([\d.]+)\.tar\.gz Above looks like a more appropriate pattern. Agreed. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#583701: /usr/bin/debchange: dch ignores identity settings
On Sat, May 29, 2010 19:04, Salvo Tomaselli wrote: As reported here, i have some identity settings in devscripts but they are completely ignored when i use dch, So i have something like: [..] --- ~/.devscripts --- [...] EMAIL=tipos...@tiscali.it NAME=Salvo 'LtWorf' Tomaselli debchange(1) clearly states that EMAIL and NAME are environment variables; they need to be set _in your environment_ not in the devscripts configuration files. If you do not feel the wording is clear then please suggest alternatives; otherwise, this is not a bug. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#581572: [debchange] --maintainer should keep timezone as-is
On Thu, 2010-05-13 at 21:54 +0200, Jakub Wilk wrote: It would be nice if dch in the --maintainer mode --maintmaint mode? :-) didn't change timezone of the top changelog entry. Does -t / --mainttrailer do what you want? Or were you looking for the datestamp to update, but maintaining the existing timezone? Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.61-31-g1f94fed
The following commit has been merged in the master branch:
commit 1f94fed9e50808e8d7b85dcffab5dc20349d95ee
Author: Adam D. Barratt a...@adam-barratt.org.uk
Date: Sun Apr 4 14:54:54 2010 +0100
Add changelog entry for zobel's checkbashisms fix
diff --git a/debian/changelog b/debian/changelog
index a1e3072..2f29ade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,9 @@ devscripts (2.10.62) UNRELEASED; urgency=low
* debchange: Sanitise list of distributions. Remove {sarge,etch}-backports
and sarge-volatile, none of which accept uploads any more.
+ [ Martin Zobel-Helas ]
+ * checkbashisms: Fix typo spotted by Dann Frazier. (Closes: #575554)
+
-- Patrick Schoenfeld schoenf...@debian.org Mon, 11 Jan 2010 15:32:59 +0100
devscripts (2.10.61) unstable; urgency=low
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
[SCM] Git repository for devscripts branch, master, updated. v2.10.61-18-g8200f2d
The following commit has been merged in the master branch:
commit 8200f2dec785254c54fb88000949a9b828cfa9c4
Author: Adam D. Barratt a...@adam-barratt.org.uk
Date: Tue Feb 16 21:11:21 2010 +
debchange: Sanitise list of distributions
Remove {sarge,etch}-backports and sarge-volatile, none of which accept
uploads any more.
diff --git a/debian/changelog b/debian/changelog
index 15b8db6..04a7004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,10 @@ devscripts (2.10.62) UNRELEASED; urgency=low
file actually exists and otherwise print a more meaningful warning.
(Closes: #564443)
+ [ Adam D. Barratt ]
+ * debchange: Sanitise list of distributions. Remove {sarge,etch}-backports
+and sarge-volatile, none of which accept uploads any more.
+
-- Patrick Schoenfeld schoenf...@debian.org Mon, 11 Jan 2010 15:32:59 +0100
devscripts (2.10.61) unstable; urgency=low
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 6dc1793..0c4f2e2 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -401,8 +401,8 @@ if (defined $opt_D) {
$distributor ||= 'Debian';
if ($distributor eq 'Debian') {
- unless ($opt_D =~
/^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|(sarge|etch|lenny)(-volatile|-backports)|((oldstable|testing)-)?proposed-updates)$/)
{
- warn $progname warning: Recognised distributions are: unstable,
testing, stable,\noldstable, experimental, UNRELEASED,
{sarge,etch,lenny}-{volatile,backports},\n{oldstable-,testing-,}proposed-updates
and {testing,stable,oldstable}-security.\nUsing your request anyway.\n;
+ unless ($opt_D =~
/^(unstable|((old)?stable|testing)(-security)?|experimental|UNRELEASED|(etch|lenny)-volatile|lenny-backports|((oldstable|testing)-)?proposed-updates)$/)
{
+ warn $progname warning: Recognised distributions are: unstable,
testing, stable,\noldstable, experimental, UNRELEASED, {etch,lenny}-volatile,
lenny-backports,\n{oldstable-,testing-,}proposed-updates and
{testing,stable,oldstable}-security.\nUsing your request anyway.\n;
$warnings++ if not $opt_force_dist;
}
} elsif ($distributor eq 'Ubuntu') {
--
Git repository for devscripts
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#556248: workaround...
Hi, On Sun, January 10, 2010 09:42, Joseph Rawson wrote: I was hoping that this problem would've been fixed by now, but since I got tired of being unable to run debuild, I tried to figure out what happened. I compared the debuild from lenny to find what change had caused the problem, and I just reverted that part of debuild back to the way it was done in lenny. I attached a simple patch that I've been using successfully (so far). -$shell_cmd .= 'while [ $# -gt 0 ]; do printf %s\n $1; shift; done;' . \n; +$shell_cmd .= 'while [ $# -gt 0 ]; do echo $1; shift; done;' . \n; Unfortunately, that also reintroduces another bug, which is what the change was made to fix in the first place, namely that the use of echo means that the dpkg / lintian options parameters can't contain any string which a valid option to echo (e.g. -e). Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r2055 - in trunk: debian scripts
Author: adsb Date: 2009-12-30 15:42:26 + (Wed, 30 Dec 2009) New Revision: 2055 Modified: trunk/debian/changelog trunk/scripts/debcommit.pl Log: decbommit: Correct spelling error in manpage (commiting - committing). Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-12-30 15:41:14 UTC (rev 2054) +++ trunk/debian/changelog 2009-12-30 15:42:26 UTC (rev 2055) @@ -18,6 +18,8 @@ * build-rdeps: Correct spelling error in manpage (ommitted - omitted). * checkbashisms: Correct spelling error in manpage (preceeded - preceded). + * decbommit: Correct spelling error in manpage (commiting - +committing). -- Patrick Schoenfeld schoenf...@debian.org Tue, 08 Dec 2009 10:01:04 +0100 Modified: trunk/scripts/debcommit.pl === --- trunk/scripts/debcommit.pl 2009-12-30 15:41:14 UTC (rev 2054) +++ trunk/scripts/debcommit.pl 2009-12-30 15:42:26 UTC (rev 2055) @@ -52,7 +52,7 @@ =item B-d B--diff -Instead of commiting, do print the diff of what would have been committed if +Instead of committing, do print the diff of what would have been committed if this option were not given. A typical usage scenario of this option is the generation of patches against the current working copy (e.g. when you don't have commit access right). -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#559740: devscripts: [licensecheck] GPL-2 not recognized (difference in columns)
tag 559740 + unreproducible thanks On Sun, 2009-12-06 at 21:00 +0200, Jari Aalto wrote: $ licensecheck gpl-test.txt nothing If it's really outputting nothing, then there's something odd going on that's nothing to do with whether you've spaced things differently. Even running licensecheck on a configuration file gives _some_ output: a...@kaa:~$ licensecheck /etc/devscripts.conf /etc/devscripts.conf: *No copyright* UNKNOWN fwiw, saving the file you attached and running licensecheck on it works here: a...@kaa:~$ licensecheck gpl-test.txt gpl-test.txt: GPL (v2 or later) The GPL-2 is not reconized if there is difference in column position. Yes, it is. See above. Please improve regexps. It's got nothing to do with the regexps. As examining the source would have shown, after removing newlines, tabs and comment characters, multiple spaces are squashed. As far as licensecheck is concerned, the following snippets are identical: # foo bar fizzbang # baz fizz # foo bar # fizzbang baz # fizz Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#559429: devscripts: licensecheck -- Does not recognize GPL-2 license in file
On Fri, 04 Dec 2009 12:57:04 +0200, Jari Aalto wrote: PROBLEM $ licensecheck debian/repack.sh debian/repack.sh: UNKNOWN The problem is that the text you're using isn't the text provided on http://www.gnu.org/copyleft/gpl.html - you've replaced and/or with and or which not only means that it's not matching licensecheck's regexes but also doesn't make much sense gramatically. :-) 8 # This program is free software; you can redistribute it and or 9 # modify it under the terms of the GNU General I wouldn't be completely averse to matching that wording (with and or) but just using the wording provided by the FSF seems easier. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#542962: [bts] please append thanks
Hi, On Mon, 2009-11-30 at 14:53 +, Iain Lane wrote: On Mon, Nov 30, 2009 at 01:37:28PM -, Adam D. Barratt wrote: bts already contains code to add thanks to the end of a mail if it's called in force-interactive mode, which is intended for the case where you want to force editing of the body before sending; see addfooter(). If thanks is added in other circumstances, that should be by modifying the condition in the existing code. I believe that last time we discussed doing so automagically under non-force-interactive conditions (while implementing #474205) the consensus was that it wasn't useful, but that was 18 months ago so people may well have changed their minds. :-) (Outlook Express?! :) When I'm mailing from my work machine, yeah :) (mainly for hysterical raisins) Hm. Is there a case when 'thanks' would cause harm? Seems to me that adding it all the time would be safe, and would mean that users wouldn't have to think about whether it was necessary. I didn't notice the force-interactive stuff, so obviously my patch needs reworking in light of that (if you agree that this is reasonable). The only potential issue I can see is making sure that we don't add the text more than once. For non-interactive use, that's obviously not an issue as the string can simply be appended to the body, and the force-interactive case is already handled. [time passes and I get distracted by dinner] Looking at the code, I've forgotten what the condition was that I thought might prove interesting for the simple interactive case. tbh, I think adapting addfooter() to always add the text but only include the signature for force-interactive would probably suffice. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#499283: bts select: ability to choose output fields
On Mon, 2009-11-16 at 19:01 +0100, martin f krafft wrote: also sprach James Vega james...@debian.org [2009.11.16.1858 +0100]: Adapting status to accept a list of fields to print isn't out of the question. But adapting select to output fields other than the bugnumber is? It's doable, but would essentially involve bts doing select | status internally. select and status are basically wrappers (albeit somewhat intelligent wrappers) around the get_bugs and status functions exposed by the BTS's SOAP interface - one of which returns a list of bug numbers matching criteria and the other returning details of a list of bugs given the bug numbers. Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r2017 - in trunk: debian scripts
Author: adsb
Date: 2009-10-30 13:39:21 + (Fri, 30 Oct 2009)
New Revision: 2017
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
debchange: Update the list of known Ubuntu distributions, adding
lucid (lynx) and removing gutsy.
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-10-30 07:02:21 UTC (rev 2016)
+++ trunk/debian/changelog 2009-10-30 13:39:21 UTC (rev 2017)
@@ -1,7 +1,8 @@
devscripts (2.10.56) UNRELEASED; urgency=low
[ Adam D. Barratt ]
- * NOT RELEASED YET
+ * debchange: Update the list of known Ubuntu distributions, adding
+lucid (lynx) and removing gutsy.
[ James Vega ]
* mk-build-deps:
Modified: trunk/scripts/debchange.pl
===
--- trunk/scripts/debchange.pl 2009-10-30 07:02:21 UTC (rev 2016)
+++ trunk/scripts/debchange.pl 2009-10-30 13:39:21 UTC (rev 2017)
@@ -406,8 +406,8 @@
$warnings++ if not $opt_force_dist;
}
} elsif ($distributor eq 'Ubuntu') {
- unless ($opt_D =~
/^((dapper|gutsy|hardy|intrepid|jaunty|karmic)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
- warn $progname warning: Recognised distributions
are:\n{dapper,gutsy,hardy,intrepid,jaunty,karmic}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n;
+ unless ($opt_D =~
/^((dapper|hardy|intrepid|jaunty|karmic|lucid)(-updates|-security|-proposed|-backports)?|UNRELEASED)$/)
{
+ warn $progname warning: Recognised distributions
are:\n{dapper,hardy,intrepid,jaunty,karmic,lucid}{,-updates,-security,-proposed,-backports}
and UNRELEASED.\nUsing your request anyway.\n;
$warnings++ if not $opt_force_dist;
}
} else {
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#549178: devscripts: uscan - no matching hrefs for watch line
Jari Aalto wrote, Thursday, October 01, 2009 9:00 AM $ uscan --report-status uscan warning: In debian/watch, no matching hrefs for watch line http://www.getdropbox.com/downloading nautilus-dropbox-(.+)\.tar\.bz2 But the href appears in the page: $ wget -O - http://www.getdropbox.com/downloading | egrep 'nautilus-dropbox-(.+)\.tar\.bz2' liimg src=/static/images/linux-icon.png style=height: 1em; border: 0px;/ a href=/download?dl=packages/nautilus-dropbox-0.6.1.tar.bz2Source/a/li Not when I try it: $ wget -O- http://www.getdropbox.com/downloading | grep bz2 --2009-10-01 09:19:51-- http://www.getdropbox.com/downloading Resolving www.getdropbox.com... 174.36.30.67 Connecting to www.getdropbox.com|174.36.30.67|:80... connected. HTTP request sent, awaiting response... 200 OK Length: unspecified [text/html] Saving to: `STDOUT' [ = ] 10,068 62.2K/s in 0.2s 2009-10-01 09:19:52 (62.2 KB/s) - `-' saved [10068] I get the same result when attempting the download from any of multiple locations. Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#546755: devscripts: [tagpending] generates invalid email to control@
Christoph Egger wrote, Tue, 15 Sep 2009 15:55:01 +0200 The email created from tagpending in clanlib fails at cont...@. The return email is attached Really? :-) I can't see an attachment. Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r2007 - trunk/debian
Author: adsb Date: 2009-09-11 09:03:05 + (Fri, 11 Sep 2009) New Revision: 2007 Modified: trunk/debian/changelog Log: releasing version 2.10.55 Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-09-10 19:26:37 UTC (rev 2006) +++ trunk/debian/changelog 2009-09-11 09:03:05 UTC (rev 2007) @@ -1,4 +1,4 @@ -devscripts (2.10.55) UNRELEASED; urgency=high +devscripts (2.10.55) unstable; urgency=high * Urgency high for security fix fix @@ -25,7 +25,7 @@ * debian/control: Bump version of po4a build-dependency to 0.31 to ensure support for --previous. - -- Ryan Niebur ryanrya...@gmail.com Fri, 04 Sep 2009 21:20:22 -0700 + -- Adam D. Barratt a...@adam-barratt.org.uk Fri, 11 Sep 2009 10:02:52 +0100 devscripts (2.10.54) unstable; urgency=high -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1997 - in trunk: debian scripts
Author: adsb Date: 2009-09-10 17:44:11 + (Thu, 10 Sep 2009) New Revision: 1997 Modified: trunk/debian/changelog trunk/scripts/bts.pl Log: bts: Refer to the --no-ack option rather than the incorrect --no-acks in the description of the BTS_SUPPRESS_ACKS variable. Thanks, Jakub Wilk. (Closes: #542961) Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-09-05 04:20:28 UTC (rev 1996) +++ trunk/debian/changelog 2009-09-10 17:44:11 UTC (rev 1997) @@ -1,11 +1,17 @@ devscripts (2.10.55) UNRELEASED; urgency=low + [ Ryan Niebur ] * uscan: fix a regression from the security fix when the command is given parameters. use Text::ParseWords::shellwords to parse the given command. * dch: fix comparison of versions when the new and current version are the same (Closes: #545099) + [ Adam D. Barratt ] + * bts: Refer to the --no-ack option rather than the incorrect --no-acks +in the description of the BTS_SUPPRESS_ACKS variable. Thanks, Jakub +Wilk. (Closes: #542961) + -- Ryan Niebur ryanrya...@gmail.com Fri, 04 Sep 2009 21:20:22 -0700 devscripts (2.10.54) unstable; urgency=high Modified: trunk/scripts/bts.pl === --- trunk/scripts/bts.pl2009-09-05 04:20:28 UTC (rev 1996) +++ trunk/scripts/bts.pl2009-09-10 17:44:11 UTC (rev 1997) @@ -3994,7 +3994,7 @@ =item BTS_SUPPRESS_ACKS -If this is set to Iyes, then it is the same as the --no-acks command +If this is set to Iyes, then it is the same as the --no-ack command line parameter being used. The default is Ino. =item BTS_INTERACTIVE -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#544638: /usr/bin/uupdate: [uupdate] Recognize tilde in source package version
On Tue, 2009-09-01 at 21:42 -0300, Nelson A. de Oliveira wrote: Is it possible to make uupdate recognize a tilde in the package version, please? Maybe. :-) I've avoided fiddling with uupdate's version detection code too much, as the comments in the code don't exactly inspire patching: # Match Pattern to extract a new version number from a given filename. # I already had to fiddle with this a couple of times so I better put it up # at front. It is now written as a Perl regexp to make it nicer. It only # matches things like: file.3.4 and file2-3.2; it will die on names such # as file3-2.7a, though. MPATTERN='^(?:[a-zA-Z][a-zA-Z0-9]*(?:-|_|\.))+(\d+\.(?:\d+\.)*\d+)$' Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1999 - in trunk: debian po4a
Author: adsb Date: 2009-09-10 18:08:44 + (Thu, 10 Sep 2009) New Revision: 1999 Modified: trunk/debian/changelog trunk/po4a/devscripts-po4a.conf Log: Fix addendum format for dcontrol in po4a/devscripts-po4a.conf Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-09-10 18:07:21 UTC (rev 1998) +++ trunk/debian/changelog 2009-09-10 18:08:44 UTC (rev 1999) @@ -13,6 +13,7 @@ Wilk. (Closes: #542961) * l10n updates; thanks, Nicolas Francois: + Update French manpage translations ++ Fix addendum format for dcontrol in po4a/devscripts-po4a.conf -- Ryan Niebur ryanrya...@gmail.com Fri, 04 Sep 2009 21:20:22 -0700 Modified: trunk/po4a/devscripts-po4a.conf === --- trunk/po4a/devscripts-po4a.conf 2009-09-10 18:07:21 UTC (rev 1998) +++ trunk/po4a/devscripts-po4a.conf 2009-09-10 18:08:44 UTC (rev 1999) @@ -34,7 +34,7 @@ [type:man] ../scripts/dcmd.1 \ fr:fr/dcmd.fr.1 add_fr:add_fr/translator_man.add [type:pod] ../scripts/dcontrol.pl \ - fr:fr/dcontrol.fr.pl add_fr:add_fr/translator_man.add + fr:fr/dcontrol.fr.pl add_fr:add_fr/translator_pod.add [type:man] ../scripts/dd-list.1 \ fr:fr/dd-list.fr.1 add_fr:add_fr/translator_man.add [type:man] ../scripts/debc.1 \ -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r2002 - trunk/debian
Author: adsb Date: 2009-09-10 18:15:19 + (Thu, 10 Sep 2009) New Revision: 2002 Modified: trunk/debian/changelog Log: Add bug closer for l10n updates Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-09-10 18:14:12 UTC (rev 2001) +++ trunk/debian/changelog 2009-09-10 18:15:19 UTC (rev 2002) @@ -11,7 +11,7 @@ * bts: Refer to the --no-ack option rather than the incorrect --no-acks in the description of the BTS_SUPPRESS_ACKS variable. Thanks, Jakub Wilk. (Closes: #542961) - * l10n updates; thanks, Nicolas Francois: + * l10n updates; thanks, Nicolas Francois: (Closes: #545327) + Update French manpage translations + Fix addendum format for dcontrol in po4a/devscripts-po4a.conf + Use --previous when invoking po4a -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r2006 - in trunk: debian scripts
Author: adsb
Date: 2009-09-10 19:26:37 + (Thu, 10 Sep 2009)
New Revision: 2006
Modified:
trunk/debian/changelog
trunk/scripts/uscan.pl
Log:
uscan: Fix regressions introduced by the security fix in the previous
upload. The parser now correctly keeps track of the last match when /g
is used to avoid infinite loops. Thanks, Raphael Geissert and Martín
Ferrari. (Closes: #544931)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-09-10 18:44:25 UTC (rev 2005)
+++ trunk/debian/changelog 2009-09-10 19:26:37 UTC (rev 2006)
@@ -1,5 +1,7 @@
-devscripts (2.10.55) UNRELEASED; urgency=low
+devscripts (2.10.55) UNRELEASED; urgency=high
+ * Urgency high for security fix fix
+
[ Ryan Niebur ]
* uscan: fix a regression from the security fix when the command is
given parameters. use Text::ParseWords::shellwords to parse the
@@ -12,6 +14,10 @@
in the description of the BTS_SUPPRESS_ACKS variable. Thanks, Jakub
Wilk. (Closes: #542961)
* licensecheck: Add missing blank line in POD. Thanks, Nicolas Francois.
+ * uscan: Fix regressions introduced by the security fix in the previous
+upload. The parser now correctly keeps track of the last match when /g
+is used to avoid infinite loops. Thanks, Raphael Geissert and Martín
+Ferrari. (Closes: #544931)
* l10n updates; thanks, Nicolas Francois: (Closes: #545327)
+ Update French manpage translations
+ Fix addendum format for dcontrol in po4a/devscripts-po4a.conf
Modified: trunk/scripts/uscan.pl
===
--- trunk/scripts/uscan.pl 2009-09-10 18:44:25 UTC (rev 2005)
+++ trunk/scripts/uscan.pl 2009-09-10 19:26:37 UTC (rev 2006)
@@ -1838,7 +1838,7 @@
sub safe_replace($$) {
my ($in, $pat) = @_;
-$pat =~ s/^\s*(.*)\s*$/$1/;
+$pat =~ s/^\s*(.*?)\s*$/$1/;
$pat =~ /^(s|tr|y)(.)/;
my ($op, $sep) = ($1, $2 || '');
@@ -1880,7 +1880,12 @@
my $global = ($flags =~ s/g//);
$flags = (?$flags) if length $flags;
- my (@captures, $first, $last);
+ my $slashg;
+ if ($regexp =~ /(?!\\)()*\\G/) {
+ $slashg = 1;
+ # if it's not initial, it is too dangerous
+ return 0 if $regexp =~ /^.*[^\\]()*\\G/;
+ }
# Behave like Perl and treat e.g. \. in replacement as .
# We allow the case escape characters to remain and
@@ -1901,24 +1906,50 @@
# the global flag was set on the input pattern.
my $orig_replacement = $replacement;
+ my ($first, $last, $pos, $zerowidth, $matched, @captures) = (0, -1, 0);
while (1) {
eval {
# handle errors due to unsafe constructs in $regexp
no re 'eval';
- my $re = qr/$flags$regexp/;
+ # restore position
+ pos($$in) = $pos if $pos;
- @captures = ($$in =~ $re);
- ($first, $last) = ($-[0], $+[0]);
+ if ($zerowidth) {
+ # previous match was a zero-width match, simulate it to set
+ # the internal flag that avoids the infinite loop
+ $$in =~ /()/g;
+ }
+ # Need to use /g to make it use and save pos()
+ $matched = ($$in =~ /$flags$regexp/g);
+
+ if ($matched) {
+ # save position and size of the match
+ my $oldpos = $pos;
+ $pos = pos($$in);
+ ($first, $last) = ($-[0], $+[0]);
+
+ if ($slashg) {
+ # \G in the match, weird things can happen
+ $zerowidth = ($pos == $oldpos);
+ # For example, matching without a match
+ $matched = 0 if (not defined $first
+ or not defined $last);
+ } else {
+ $zerowidth = ($last - $first == 0);
+ }
+ for my $i (0..$#-) {
+ $captures[$i] = substr $$in, $-[$i], $+[$i] - $-[$i];
+ }
+ }
};
return 0 if $@;
# No match; leave the original string untouched but return
# success as there was nothing wrong with the pattern
- return 1 if @captures == 0;
+ return 1 unless $matched;
# Replace $X
- unshift @captures, substr $$in, $first, $last - $first;
$replacement =~ s/[\$\\](\d)/defined $captures[$1] ? $captures[$1]
: ''/ge;
$replacement =~ s/\$\{(\d)\}/defined $captures[$1] ? $captures[$1]
: ''/ge;
$replacement =~ s/\$/$captures[0]/g;
@@ -1931,6 +1962,8 @@
# Actually do the replacement
substr $$in, $first, $last - $first, $replacement;
+ # Update position
+
Bug#545193: licensecheck: could not find license in nfoview/tools/*
On Sat, 2009-09-05 at 21:35 +0530, Kartik Mistry wrote: While check checking license with licensecheck, It could not find license in nfoview/tools/* [...] licensecheck is clearling missing tools/ directory. kar...@olive:~/development/debian/packages/sponsored/nfoview/nfoview-1.6$ licensecheck -r tools/* tools/git2cl: GPL (with incorrect FSF address) What else is in tools/ ? If it's only that file, then it's not missing anything: -c=regex --check=regex Specify a pattern against which filenames will be matched in order to decide which files to check the license of. The default includes common source files. The name git2cl does not match common source files. Actually, I'm assuming that there /is/ only git2cl in tools/, otherwise the command you quoted still wouldn't have displayed it; see #526701 for a discussion as to whether that's a good idea. In summary, I don't think there's a licensecheck bug here. It's not doing what you expected, admittedly, but it is doing what it's documented as doing. :) Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#544931: another problem in the patch
On Sat, 2009-09-05 at 18:55 +0100, Adam D. Barratt wrote:
On Sat, 2009-09-05 at 18:35 +0200, Martín Ferrari wrote:
See the patch below, or refer to revision 748 of
svn://svn.debian.org/svn/pet/trunk/PET/Watch.pm
[...]
I've included an updated patch below. PET SVN has also been updated to
fix both of the issues mentioned above.
fwiw, further testing has thrown up another issue, regarding \G - namely
that it doesn't work. :) To be honest I'm debating whether lack of
support for \G is really a problem, given that it isn't used in any
watchfile in the archive currently.
We did discover that the pattern s/(.)\G./-/ produces a number of Perl
warnings as it appears to make Perl's regex engine deeply unhappy. With
your patch applied, $matches ends up as 1 whilst $#- is -1, causing the
warnings. The original uscan code causes a segfault, which appears to
be directly attributable to perl:
$ echo foo | perl -pe s/(.)\G./-/g
Segmentation fault
In any case, the additional line below gets rid of the warnings. The
result returned is incorrect, but whether that matters depends on
whether we care about supporting \G.
[...]
+ if ($matched) {
+ # save position and size of the match
+ $pos = pos($$in);
+ ($first, $last) = ($-[0], $+[0]);
+ for my $i (0..$#-) {
+ $captures[$i] = substr $$in, $-[$i], $+[$i] - $-[$i];
+ }
$matched = 0 unless $#- = 0;
+ }
Regards,
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1994 - trunk/scripts
Author: adsb
Date: 2009-09-05 00:13:21 + (Sat, 05 Sep 2009)
New Revision: 1994
Modified:
trunk/scripts/uscan.pl
Log:
uscan: Correctly pass --no-symlink to uupdate
Modified: trunk/scripts/uscan.pl
===
--- trunk/scripts/uscan.pl 2009-09-04 01:06:38 UTC (rev 1993)
+++ trunk/scripts/uscan.pl 2009-09-05 00:13:21 UTC (rev 1994)
@@ -1451,7 +1451,6 @@
# Do whatever the user wishes to do
if ($action) {
my $usefile = $destdir/$newfile_base;
- my @cmd = shellwords($action);
if ($symlink =~ /^(symlink|rename)$/
and $newfile_base =~ /\.(tar\.gz|tgz)$/) {
$usefile = $destdir/${pkg}_${newversion}.orig.tar.gz;
@@ -1463,9 +1462,11 @@
# Any symlink requests are already handled by uscan
if ($action =~ /^uupdate(\s|$)/) {
- push @cmd, --no-symlink;
+ $action =~ s/^uupdate/uupdate --no-symlink/;
}
+ my @cmd = shellwords($action);
+
if ($watch_version 1) {
push @cmd, (--upstream-version, $newversion, $usefile);
} else {
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#544931: [uscan] Regressions due to security fix
Package: devscripts Severity: serious Version: 2.10.54 The security fixes introduced in 2.10.54 has a regression which should not migrate to testing. The regular expression parser always evaluates the entire expression, making it trivial to create infinite loops with expressions such as s/(\d)/$1./g. Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1984 - in trunk: debian scripts
Author: adsb
Date: 2009-09-02 19:20:35 + (Wed, 02 Sep 2009)
New Revision: 1984
Modified:
trunk/debian/changelog
trunk/scripts/uscan.1
trunk/scripts/uscan.pl
Log:
uscan: Evaluate mangle rules without evaluating them directly as Perl
code to avoid the possibility of remote code execution. This is
CVE-2009-2946. As a side effect, (Closes: #515209)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-09-01 02:08:27 UTC (rev 1983)
+++ trunk/debian/changelog 2009-09-02 19:20:35 UTC (rev 1984)
@@ -35,6 +35,9 @@
characters are passed on the command line. (Closes: #542484)
* dget: Update the dpkg-source output matching to enable --build to work
again. (Closes: #541409)
+ * uscan: Evaluate mangle rules without evaluating them directly as Perl
+code to avoid the possibility of remote code execution. This is
+CVE-2009-2946. As a side effect, (Closes: #515209)
* Packaging changes: Add sensible-utils to Recommends. Several scripts
make use of sensible-editor and it has moved from debianutils so is
no longer essential. (Closes: #541846)
Modified: trunk/scripts/uscan.1
===
--- trunk/scripts/uscan.1 2009-09-01 02:08:27 UTC (rev 1983)
+++ trunk/scripts/uscan.1 2009-09-02 19:20:35 UTC (rev 1984)
@@ -232,7 +232,8 @@
This is used to mangle the upstream version number as matched by the
ftp://... or http:// rules as follows. First, the \fIrules\fR string
is split into multiple rules at every `;'. Then the upstream version
-number is mangled by executing the Perl command:
+number is mangled by applying \fIrule\fR to the version, in a similar
+way to executing the Perl command:
.nf
$version =~ \fIrule\fR;
.fi
@@ -240,6 +241,11 @@
`0.' to the version number and `s/_/./g' to change underscores into
periods. Note that the \fIrules\fR string may not contain commas;
this should not be a problem.
+
+\fIrule\fR may only use the 's', 'tr' and 'y' operations. When the 's'
+operation is used, only the 'g', 'i' and 'x' flags are available and
+\fIrule\fR may not contain any expressions which have the potential to
+execute code (i.e. the (?{}) and (??{}) constructs are not supported).
.TP
\fBdversionmangle=\fIrules\fR
This is used to mangle the Debian version number of the currently
Modified: trunk/scripts/uscan.pl
===
--- trunk/scripts/uscan.pl 2009-09-01 02:08:27 UTC (rev 1983)
+++ trunk/scripts/uscan.pl 2009-09-02 19:20:35 UTC (rev 1984)
@@ -66,6 +66,8 @@
sub dehs_warn ($);
sub dehs_die ($);
sub dehs_output ();
+sub quoted_regex_replace ($);
+sub safe_replace ($$);
sub usage {
print EOF;
@@ -833,7 +835,14 @@
my $mangled_lastversion;
$mangled_lastversion = $lastversion;
foreach my $pat (@{$options{'dversionmangle'}}) {
- eval \$mangled_lastversion =~ $pat;;
+ if (! safe_replace(\$mangled_lastversion, $pat)) {
+ warn $progname: In $watchfile, potentially
+ . unsafe or malformed dversionmangle
+ . pattern:\n '$pat'
+ . found. Skipping watchline\n
+ . $line\n;
+ return 1;
+ }
}
if($opt_download_current_version) {
$download_version = $mangled_lastversion;
@@ -930,7 +939,14 @@
join(., map { $_ if defined($_) }
$href =~ m^$_pattern$);
foreach my $pat (@{$options{'uversionmangle'}}) {
- eval \$mangled_version =~ $pat;;
+ if (! safe_replace(\$mangled_version, $pat)) {
+ warn $progname: In $watchfile, potentially
+. unsafe or malformed uversionmangle
+ . pattern:\n '$pat'
+ . found. Skipping watchline\n
+ . $line\n;
+ return 1;
+ }
}
push @hrefs, [$mangled_version, $href];
}
@@ -1001,7 +1017,14 @@
my $file = $1;
my $mangled_version = join(., $file =~ m/^$pattern$/);
foreach my $pat (@{$options{'uversionmangle'}}) {
- eval \$mangled_version =~ $pat;;
+ if (! safe_replace(\$mangled_version, $pat)) {
+ warn $progname: In $watchfile, potentially
+ . unsafe or malformed uversionmangle
+ . pattern:\n '$pat'
+ . found. Skipping watchline\n
+ . $line\n;
+ return 1;
+ }
}
push @files, [$mangled_version, $file];
SVN devscripts commit: r1986 - trunk/scripts
Author: adsb
Date: 2009-09-02 19:32:40 + (Wed, 02 Sep 2009)
New Revision: 1986
Modified:
trunk/scripts/debchange.pl
Log:
Fix spacing
Modified: trunk/scripts/debchange.pl
===
--- trunk/scripts/debchange.pl 2009-09-02 19:21:20 UTC (rev 1985)
+++ trunk/scripts/debchange.pl 2009-09-02 19:32:40 UTC (rev 1986)
@@ -1050,14 +1050,14 @@
}
if(! ($opt_s or $opt_n)) {
- if ($start =~/(.*?)-(\d+)\.$/) {
- # Drop NMU revision
- my $upstream_version = $1;
- my $debian_revision = $2;
- $debian_revision++;
- $start = $upstream_version-$debian_revision;
- $end = ;
- }
+ if ($start =~/(.*?)-(\d+)\.$/) {
+ # Drop NMU revision
+ my $upstream_version = $1;
+ my $debian_revision = $2;
+ $debian_revision++;
+ $start = $upstream_version-$debian_revision;
+ $end = ;
+ }
}
if (! ($opt_qa or $opt_bpo or $opt_l)) {
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1987 - trunk/scripts
Author: adsb Date: 2009-09-02 19:34:58 + (Wed, 02 Sep 2009) New Revision: 1987 Modified: trunk/scripts/cowpoke.1 trunk/scripts/dscverify.1 Log: Escape hyphens in man pages Modified: trunk/scripts/cowpoke.1 === --- trunk/scripts/cowpoke.1 2009-09-02 19:32:40 UTC (rev 1986) +++ trunk/scripts/cowpoke.1 2009-09-02 19:34:58 UTC (rev 1987) @@ -148,7 +148,7 @@ .TP .B Alternatively you could use ssh with a forwarded key, or whatever other -mechanism suits your local access policy. su -c isn't really suitable +mechanism suits your local access policy. su \-c isn't really suitable here due to its quoting requirements being different from all the rest. .TP Modified: trunk/scripts/dscverify.1 === --- trunk/scripts/dscverify.1 2009-09-02 19:32:40 UTC (rev 1986) +++ trunk/scripts/dscverify.1 2009-09-02 19:34:58 UTC (rev 1987) @@ -56,11 +56,11 @@ rsync, as documented in the README that comes with debian-keyring. If you sync the keyring to a non-standard location (see below), you can use the possibilities to specify extra keyrings, by either -using the above mentioned configuration option or the --keyring option. +using the above mentioned configuration option or the \-\-keyring option. Below is an example for an alias: -alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg' +alias dscverify='dscverify \-\-keyring ~/.gnupg/pubring.gpg' .SH STANDARD KEYRING LOCATIONS By default dscverify searches for the debian-keyring in the following locations: -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1991 - trunk/debian
Author: adsb Date: 2009-09-02 19:59:39 + (Wed, 02 Sep 2009) New Revision: 1991 Modified: trunk/debian/changelog Log: Add dummy 2.10.55 entry Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-09-02 19:36:21 UTC (rev 1990) +++ trunk/debian/changelog 2009-09-02 19:59:39 UTC (rev 1991) @@ -1,3 +1,9 @@ +devscripts (2.10.55) UNRELEASED; urgency=low + + * NOT YET RELEASED + + -- Adam D. Barratt a...@adam-barratt.org.uk Wed, 02 Sep 2009 20:59:11 +0100 + devscripts (2.10.54) unstable; urgency=high * Urgency high for security update -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1979 - trunk/debian
Author: adsb Date: 2009-08-30 07:40:50 + (Sun, 30 Aug 2009) New Revision: 1979 Modified: trunk/debian/control Log: Add missing comma in Recommends Modified: trunk/debian/control === --- trunk/debian/control2009-08-30 05:25:33 UTC (rev 1978) +++ trunk/debian/control2009-08-30 07:40:50 UTC (rev 1979) @@ -20,7 +20,7 @@ libterm-size-perl, libtimedate-perl, liburi-perl, libwww-perl, libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx | mailutils, man-db, patch, patchutils, ssh-client, strace, unzip, wdiff, www-browser, - subversion | cvs | svk | tla | bzr | git-core | mercurial, lzma + subversion | cvs | svk | tla | bzr | git-core | mercurial, lzma, sensible-utils Suggests: build-essential, cvs-buildpackage, devscripts-el, gnuplot, libfile-desktopentry-perl, libnet-smtp-ssl-perl (= 1.01-2), mutt, -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1980 - trunk
Author: adsb Date: 2009-08-30 07:43:11 + (Sun, 30 Aug 2009) New Revision: 1980 Modified: trunk/README Log: README: Add lzma to the dependencies of uscan Modified: trunk/README === --- trunk/README2009-08-30 07:40:50 UTC (rev 1979) +++ trunk/README2009-08-30 07:43:11 UTC (rev 1980) @@ -212,7 +212,7 @@ also call a program such as uupdate to attempt to update the Debianised version based on the new update. Whilst uscan could be used to release the updated version automatically, it is probably better not to without - testing it first. [libcrypt-ssleay-perl, libwww-perl, unzip] + testing it first. [libcrypt-ssleay-perl, libwww-perl, unzip, lzma] - uupdate: Update the package with an archive or patches from an upstream author. This will be of help if you have to update your -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#543711: devscripts: redirection sf.net url's does not work as documented
reassign 543711 qa.debian.org affects 543711 devscripts thanks On Wed, 2009-08-26 at 17:20 +0200, Arnout Engelen wrote: The documentation mentions: # qa.debian.org runs a redirector which allows a simpler form of URL # for SourceForge based projects. The format below will automatically # be rewritten to use the redirector. http://sf.net/audacity/audacity-src-(.+)\.tar\.gz However, for that URL, 'uscan --debug' shows we are redirected to http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/a/project/au/audacity which does not contain links looking like 'audacity-src-(.+)\.tar\.gz'. This is a known problem with the redirector, which will hopefully be fixed soon. As mentioned in the section you quoted above, the redirector is run by the QA team, so I'm reassigning the bug there. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#542535: devscripts: who-uploads - Please add ISO 8601 date when upload for package was made
On Thu, 2009-08-20 at 08:31 +0300, Jari Aalto wrote: SUGGESTION Please add timestamp -MM-DD [HH:MM] to the beginning of line when upload was made; if that information is possible for who-uploads(1) to find out. Even -MM-DD would do if HH:MM is not available, $ who-uploads devscripts Uploads for devscripts: -MM-DD HH:MM 2.10.53 to unstable: Adam D. Barratt a...@debian.org who-uploads --date already exists, and is clearly documented. who-uploads extracts its information from the changes files as provided by the PTS, so the date displayed is in the same format as that in those files. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#542703: devscripts: wnpp-alert - Format the output to line-up columns
package devscripts user devscri...@packages.debian.org usertag 542703 wnpp-alert retitle 542703 [wnpp-alert] Format output to line-up columns merge 542703 514307 thanks On Fri, 2009-08-21 at 00:06 +0300, jaalto wrote: The display of wnpp-alert(1) is quite rugged: O 540906 avifile -- XviD video encoding plugin for libavifile RFH 354176 cvs -- Concurrent Versions System [...] Please format the columns to line-up for easier reading: Please check the BTS before filing duplicates... merging with #514307. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1966 - in trunk: debian scripts
Author: adsb
Date: 2009-08-19 22:10:20 + (Wed, 19 Aug 2009)
New Revision: 1966
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
debchange: Don't output spurious characters when extended Unicode
characters are passed on the command line. (Closes: #542484)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-08-18 04:44:56 UTC (rev 1965)
+++ trunk/debian/changelog 2009-08-19 22:10:20 UTC (rev 1966)
@@ -27,6 +27,8 @@
- Add --dpkg-opts support for passing options on to dpkg.
- Autoclean the apt-cache so it doesn't grow unbounded.
* dcmd: Add filtering options for udebs. (Closes: #541827)
+ * debchange: Don't output spurious characters when extended Unicode
+characters are passed on the command line. (Closes: #542484)
* dget: Update the dpkg-source output matching to enable --build to work
again. (Closes: #541409)
* Packaging changes: Add sensible-utils to Recommends. Several scripts
Modified: trunk/scripts/debchange.pl
===
--- trunk/scripts/debchange.pl 2009-08-18 04:44:56 UTC (rev 1965)
+++ trunk/scripts/debchange.pl 2009-08-19 22:10:20 UTC (rev 1966)
@@ -1453,11 +1453,15 @@
my $newentry=shift;
# Work around the fact that write() with formats
-# seems to assume that character == byte
+# seems to assume that characters are 7-bit
# See http://rt.perl.org/rt3/Public/Bug/Display.html?id=33832
-# and Debian bug #473769
+# and Debian bugs #473769 and #541484
+# High-bit single characters need an extra space adding per
+# character, extended Unicode characters two
my $count = () = $CHGLINE =~ /[^\x00-\x7F]/mg;
$CHGLINE .= x $count;
+$count = () = $CHGLINE =~ /[\x{0100}-\x{}]/mg;
+$CHGLINE .= x $count;
print O \n if $opt_news ! ($newentry || $linecount);
$linecount++;
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1959 - trunk
Author: adsb Date: 2009-08-12 18:41:44 + (Wed, 12 Aug 2009) New Revision: 1959 Modified: trunk/conf.default.in Log: Add DEBDIFF_UNPACK_TARBALLS to conf.default.in Modified: trunk/conf.default.in === --- trunk/conf.default.in 2009-08-12 12:26:22 UTC (rev 1958) +++ trunk/conf.default.in 2009-08-12 18:41:44 UTC (rev 1959) @@ -260,6 +260,9 @@ # Always compare package in version order, rather than the order specified # on the command line? # DEBDIFF_AUTO_VER_SORT=no +# +# Unpack tarballs found in the top level source directory. +# DEBDIFF_UNPACK_TARBALLS=yes # debi # -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#541163: uscan doesn't give an error if an ftp passive transfer is needed to check the remote site
On Tue, 2009-08-11 at 23:33 -0300, Rogério Brito wrote: I am behind a fascist firewall that only allows pasv ftp connections and I tried to run uscan with a package that I was trying to debug. Unfortunately, it took me a long time to discover the cause of the problem, because, even when I used the debug option, it told me that the regular expression could not be matched and, therefore, I started looking for a broken expression. IMVHO, uscan (and siblings) using perl's library should die/carp/whatever before going to the regexp matching phase if the page could not be downloaded or if it returned a 0-lenght reply. Looking at the code, it certainly should be aborting if the download failed. Please could you provide the output of running uscan against the watch file in question using the --debug option to help debugging (no pun intended) your issue? Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#541471: devscripts: uscan doesn't work with transparent proxy
On Fri, 2009-08-14 at 17:56 -0300, Eriberto wrote: Ok. Thanks for your quick response. I can send dumps of the tcpdump and others informations too. [...] -- In debian/watch, processing watchfile line: http://sf.net/jp2a/jp2a-(.*)\.tar\.gz uscan debug: requesting URL http://qa.debian.org/watch/sf.php/jp2a/ uscan debug: redirections: http://ftp.heanet.ie/mirrors/download.sourceforge.net/pub/sourceforge/j/project/jp/jp2a/ uscan debug: received content: [...] uscan debug: matching pattern(s) (?:(?:http://qa.debian.org)?\/watch\/sf\.php\/jp2a\/)?jp2a-(.*)\.tar\.gz(?:\?.*)? (?:(?:http://ftp.heanet.ie)?\/mirrors\/download\.sourceforge\.net\/pub\/sourceforge\/j\/project\/jp\/jp2a\/)?jp2a-(.*)\.tar\.gz(?:\?.*)? uscan warning: In debian/watch, no matching hrefs for watch line http://sf.net/jp2a/jp2a-(.*)\.tar\.gz Thanks. I get exactly the same response from multiple locations using your watchfile - the page content really doesn't match what uscan is looking for. After some discussion on IRC, it looks like this is due to Heanet changing the structure of their Sourceforge mirror. There are multiple mirrors in use by the redirector, but we suspect that when using the proxy the X-Uscan-Enhancements header, which is set by uscan and allows the other mirror to be selected, is being stripped before the request is sent to the redirector. The redirector has (a few minutes ago) been updated to remove use of the Heanet mirror. This unfortunately means that it /must/ be sent the X-U-E header or it will fail to find a mirror. Note that the redirector isn't maintained by the devscripts team, although uscan is one of its main users. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#541409: devscripts: dget option --build has no effect
On Fri, 2009-08-14 at 01:01 +0200, Vincent Lefevre wrote: dget option --build has no effect: [...] dpkg-source: info: extracting xz-utils in xz-utils-4.999.8beta+20090813 dpkg-source: info: unpacking xz-utils_4.999.8beta+20090813.orig.tar.gz dpkg-source: info: applying xz-utils_4.999.8beta+20090813-1.diff.gz and that's all. It did not run dpkg-buildpackage -b -uc as described by the dget(1) man page. I had to run it manually. It looks like the dpkg-source output has changed at some point - dget wasn't expecting the info: . I've fixed this in SVN; thanks. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1961 - in trunk: . debian scripts
Author: adsb Date: 2009-08-17 18:46:53 + (Mon, 17 Aug 2009) New Revision: 1961 Modified: trunk/cowpoke.conf trunk/debian/changelog trunk/scripts/cowpoke.1 trunk/scripts/cowpoke.sh Log: * cowpoke: + Update to new upstream version - Run with reduced privileges and only elevate them when needed to run cowbuilder. - Don't explicitly pass a buildd username unless it is set, this allows people to configure the remote username in their ssh config or similar. (Closes: #538191) - Supply pbuilder with the --buildplace and --aptcache options to enable use with reduced privileges. - Relative paths are all relative to the BUILDD_USER's home directory now, not the incoming dir. - Add --dpkg-opts support for passing options on to dpkg. - Autoclean the apt-cache so it doesn't grow unbounded. Modified: trunk/cowpoke.conf === --- trunk/cowpoke.conf 2009-08-14 19:44:07 UTC (rev 1960) +++ trunk/cowpoke.conf 2009-08-17 18:46:53 UTC (rev 1961) @@ -10,7 +10,9 @@ BUILDD_HOST= # The username for unprivileged operations on BUILDD_HOST -#BUILDD_USER=$(id -un 2/dev/null) +# If unset the user that invoked cowpoke will be assumed, or the user that +# is configured for the BUILDD_HOST in your ssh config will be used. +#BUILDD_USER= # The Debian architecture(s) to build for. A space separated list of # architectures may be used here to build for all of them in a single pass. @@ -26,7 +28,8 @@ #INCOMING_DIR=cowbuilder-incoming # The filesystem root for all pbuilder COW and result files. Arch and dist -# specific subdirectories will be created under this. +# specific subdirectories normally will be created under this. The apt cache +# and temporary build directory will also be located under this path. #PBUILDER_BASE=/var/cache/pbuilder # The gpg key id to pass to debsign's -k option. eg. SIGN_KEYID=0x12345678 @@ -38,15 +41,15 @@ # This option will be ignored if SIGN_KEYID is unset. #UPLOAD_QUEUE= -# An optional command that may be used to gain root access from the remote -# build machine. If unset, cowpoke will attempt to log in directly as root, -# which is the recommended method when used in conjunction with a secure key -# to grant root access to the machine. If you prefer to gain root access -# using a simple password (or worse, a normal user password), then you can -# set this option to the security hole^W^W privilege escalation option of -# your choice. If set, cowpoke will log in initially as the $BUILDD_USER, -# then use this command to gain the privileges that it required to execute -# the cowbuilder invocation script. +# The command to use to gain root privileges on the remote build machine. +# This is only required to invoke cowbuilder and allow it to enter its chroot, +# so you may restrict this user to only being able to run that command with +# escalated privileges. Something like this in sudoers will enable invoking +# cowbuilder without an additional password entry required: +# youruser ALL = NOPASSWD: /usr/sbin/cowbuilder +# Alternatively you could use ssh with a forwarded key, or whatever other +# mechanism suits your local access policy. su -c isn't really suitable +# here due to its quoting requirements being different from all the rest. #BUILDD_ROOTCMD=sudo # The utility to use when creating a new build root. Alternatives are Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-08-14 19:44:07 UTC (rev 1960) +++ trunk/debian/changelog 2009-08-17 18:46:53 UTC (rev 1961) @@ -10,6 +10,19 @@ [ Adam D. Barratt ] * bts: + Make tags NN = operate correctly again. (Closes: #539688) + * cowpoke: ++ Update to new upstream version + - Run with reduced privileges and only elevate them when needed to +run cowbuilder. + - Don't explicitly pass a buildd username unless it is set, this allows +people to configure the remote username in their ssh config or +similar. (Closes: #538191) + - Supply pbuilder with the --buildplace and --aptcache options to +enable use with reduced privileges. + - Relative paths are all relative to the BUILDD_USER's home directory +now, not the incoming dir. + - Add --dpkg-opts support for passing options on to dpkg. + - Autoclean the apt-cache so it doesn't grow unbounded. * dget: Update the dpkg-source output matching to enable --build to work again. (Closes: #541409) Modified: trunk/scripts/cowpoke.1 === --- trunk/scripts/cowpoke.1 2009-08-14 19:44:07 UTC (rev 1960) +++ trunk/scripts/cowpoke.1 2009-08-17 18:46:53 UTC (rev 1961) @@ -60,6 +60,12 @@ to not have an existing cowbuilder root in the expected location. .TP +.BI \-\-dpkg\-opts= 'opt1 opt2 ...' +Specify
SVN devscripts commit: r1962 - in trunk: debian scripts
Author: adsb
Date: 2009-08-17 18:51:02 + (Mon, 17 Aug 2009)
New Revision: 1962
Modified:
trunk/debian/changelog
trunk/scripts/bts.pl
Log:
bts: Use rather than writing to filehandles under /dev/fd.
(Closes: #517917)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-08-17 18:46:53 UTC (rev 1961)
+++ trunk/debian/changelog 2009-08-17 18:51:02 UTC (rev 1962)
@@ -10,6 +10,8 @@
[ Adam D. Barratt ]
* bts:
+ Make tags NN = operate correctly again. (Closes: #539688)
++ Use rather than writing to filehandles under /dev/fd.
+ (Closes: #517917)
* cowpoke:
+ Update to new upstream version
- Run with reduced privileges and only elevate them when needed to
Modified: trunk/scripts/bts.pl
===
--- trunk/scripts/bts.pl2009-08-17 18:46:53 UTC (rev 1961)
+++ trunk/scripts/bts.pl2009-08-17 18:51:02 UTC (rev 1962)
@@ -2315,7 +2315,7 @@
SUFFIX = .mail,
DIR = File::Spec-tmpdir,
UNLINK = 1);
- open (MAILOUT, /dev/fd/ . fileno($fh))
+ open (MAILOUT, , $fh)
or die bts: writing to temporary file: $!\n;
print MAILOUT $message;
@@ -2999,7 +2999,7 @@
DIR = File::Spec-tmpdir,
UNLINK = 1);
# Use filehandle for security
- open (OUT_MBOX, /dev/fd/ . fileno($fh))
+ open (OUT_MBOX, , $fh)
or die bts: writing to temporary file: $!\n;
} else {
$filename = $mboxfile;
@@ -3405,7 +3405,7 @@
UNLINK = 1);
# Use filehandle for security
- open (OUT_LIVE, /dev/fd/ . fileno($fh))
+ open (OUT_LIVE, , $fh)
or die bts: writing to temporary file: $!\n;
# Correct relative urls to point to the bts.
$live =~ s%\shref=(?:/cgi-bin/)?(\w+\.cgi)%
href=$btscgiurl$1%g;
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1963 - trunk/debian
Author: adsb Date: 2009-08-17 19:03:14 + (Mon, 17 Aug 2009) New Revision: 1963 Modified: trunk/debian/changelog trunk/debian/control Log: Packaging changes: Add sensible-utils to Recommends. Several scripts make use of sensible-editor and it has moved from debianutils so is no longer essential. (Closes: #541846) Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-08-17 18:51:02 UTC (rev 1962) +++ trunk/debian/changelog 2009-08-17 19:03:14 UTC (rev 1963) @@ -27,6 +27,9 @@ - Autoclean the apt-cache so it doesn't grow unbounded. * dget: Update the dpkg-source output matching to enable --build to work again. (Closes: #541409) + * Packaging changes: Add sensible-utils to Recommends. Several scripts +make use of sensible-editor and it has moved from debianutils so is +no longer essential. (Closes: #541846) [ Patrick Schoenfeld ] * Add an example for githubredir.debian.net to the uscan manpage Modified: trunk/debian/control === --- trunk/debian/control2009-08-17 18:51:02 UTC (rev 1962) +++ trunk/debian/control2009-08-17 19:03:14 UTC (rev 1963) @@ -20,7 +20,8 @@ libterm-size-perl, libtimedate-perl, liburi-perl, libwww-perl, libyaml-syck-perl, lintian, lsb-release, bsd-mailx | mailx | mailutils, man-db, patch, patchutils, ssh-client, strace, unzip, wdiff, www-browser, - subversion | cvs | svk | tla | bzr | git-core | mercurial + subversion | cvs | svk | tla | bzr | git-core | mercurial, + sensible-utils Suggests: build-essential, cvs-buildpackage, devscripts-el, gnuplot, libfile-desktopentry-perl, libnet-smtp-ssl-perl (= 1.01-2), mutt, svn-buildpackage -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1953 - in trunk: debian scripts
Author: adsb
Date: 2009-08-03 15:10:50 + (Mon, 03 Aug 2009)
New Revision: 1953
Modified:
trunk/debian/changelog
trunk/scripts/bts.pl
Log:
* bts:
+ Make tags NN = operate correctly again. (Closes: #539688)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-07-29 17:12:57 UTC (rev 1952)
+++ trunk/debian/changelog 2009-08-03 15:10:50 UTC (rev 1953)
@@ -1,8 +1,13 @@
devscripts (2.10.54) UNRELEASED; urgency=low
+ [ James Vega ]
* debchange: Clarify the wording for the explanation of
--force-save-on-release. (Closes: #539155)
+ [ Adam D. Barratt ]
+ * bts:
++ Make tags NN = operate correctly again. (Closes: #539688)
+
-- James Vega james...@debian.org Wed, 29 Jul 2009 19:04:12 +0200
devscripts (2.10.53) unstable; urgency=low
Modified: trunk/scripts/bts.pl
===
--- trunk/scripts/bts.pl2009-07-29 17:12:57 UTC (rev 1952)
+++ trunk/scripts/bts.pl2009-08-03 15:10:50 UTC (rev 1953)
@@ -1550,8 +1550,10 @@
mailbts(gifting $bug,
user debian-...@lists.debian.org\nusertag $bug $gift_flag gift);
}
-if ($base_command ne $command) { # at least one tag other than gift has
been manipulated
- mailbts(tagging $bug, $command);
+if (($base_command ne $command) or ($flag eq = and $gifted eq )) {
+ # at least one tag other than gift has been manipulated
+ # or all tags were removed
+ mailbts(tagging $bug, $command);
}
}
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1943 - in trunk: debian scripts
Author: adsb
Date: 2009-07-29 11:06:09 + (Wed, 29 Jul 2009)
New Revision: 1943
Modified:
trunk/debian/changelog
trunk/scripts/bts.pl
Log:
* bts:
+ Add the affects command to mark a bug as affecting packages other
than the package it was filed against.
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-07-24 16:42:47 UTC (rev 1942)
+++ trunk/debian/changelog 2009-07-29 11:06:09 UTC (rev 1943)
@@ -1,8 +1,11 @@
devscripts (2.10.53) UNRELEASED; urgency=low
[ Adam D. Barratt ]
- * bts: Add a missing use IO::File to make bts select file:foo work.
-Thanks, Raphaël Hertzog. (Closes: #538288)
+ * bts:
++ Add a missing use IO::File to make bts select file:foo work.
+ Thanks, Raphaël Hertzog. (Closes: #538288)
++ Add the affects command to mark a bug as affecting packages other
+ than the package it was filed against.
* checkbashisms: Detect the use of source when the sourced filename
contains a tilde (Closes: #528592) or consists of a single character
(Closes: #535252). Thanks, Raphael Geissert and Ryan Niebur.
Modified: trunk/scripts/bts.pl
===
--- trunk/scripts/bts.pl2009-07-24 16:42:47 UTC (rev 1942)
+++ trunk/scripts/bts.pl2009-07-29 11:06:09 UTC (rev 1943)
@@ -1556,6 +1556,44 @@
}
}
+=item affects bug [+|-|=] package [package ..]
+
+Indicates that a bug affects a package other than that against which it is
filed, causing
+the bug to be listed by default in the package list of the other package.
This should
+generally be used where the bug is severe enough to cause multiple reports
from users to be
+assigned to the wrong package.
+
+=cut
+
+sub bts_affects {
+my $bug=checkbug(shift) or die bts affects: mark what bug as affecting
another package?\n;
+
+if (! @_) {
+ die bts affects: mark which package as affected?\n;
+}
+# Parse the rest of the command line.
+my $command=affects $bug;
+my $flag=;
+if ($_[0] =~ /^[-+=]$/) {
+ $flag = $_[0];
+ $command .= $flag;
+ shift;
+} elsif ($_[0] =~ s/^([-+=])//) {
+ $flag = $1;
+ $command .= $flag;
+}
+
+if (! @_) {
+ die bts affects: mark which package as affected?\n;
+}
+
+foreach my $package (@_) {
+ $command .= $package;
+}
+
+mailbts(affects $bug, $command);
+}
+
=item user email
Specify a user email address before using the usertags command.
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1945 - in trunk: debian scripts
Author: adsb
Date: 2009-07-29 13:36:08 + (Wed, 29 Jul 2009)
New Revision: 1945
Modified:
trunk/debian/changelog
trunk/scripts/bts.pl
Log:
Temporarily disable bts done
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-07-29 11:55:35 UTC (rev 1944)
+++ trunk/debian/changelog 2009-07-29 13:36:08 UTC (rev 1945)
@@ -52,10 +52,6 @@
* bts:
+ Implement a --mutt parameter, which allows mails to be sended
using mutt.
-+ Implement a 'Done' command which creates a mail to
- nnn-d...@bugs.debian.org and defaults to sending the mail
- interactive to encourage writing explanations, why the bug
- was closed. (Closes: #482751)
* debchange: Implement a dist indication mechanism that parses
an 'Upload to $DIST' line and sets the distribution accordingly, when
the --release parameter is used. (Closes: #515346)
Modified: trunk/scripts/bts.pl
===
--- trunk/scripts/bts.pl2009-07-29 11:55:35 UTC (rev 1944)
+++ trunk/scripts/bts.pl2009-07-29 13:36:08 UTC (rev 1945)
@@ -1162,47 +1162,47 @@
EOT
}
-=item done bug version
+# =item done bug version
+#
+# # Mark a bug as Done. Defaults to implying interactive mode,
+# because you should edit the message and provide explanations,
+# why the bug is beeing closed.
+# You should specify which version of the package closed the bug, if
+# possible.
+# =cut
+#
+# sub bts_done {
+# my $bug=checkbug(shift) or die bts done: close what bug?\n;
+# my $version=shift;
+# my $subject=Closing $bug;
+# $version= unless defined $version;
+# opts_done(@_);
+#
+# # TODO: Evaluate if we want to do this by default
+# my $bug_status = Devscripts::Debbugs::status( map {[bug = $_,
indicatesource = 1]} ($bug) );
+# if ($bug_status) {
+# $subject = Re: $bug_status-{$bug}-{subject};
+# }
+#
+# # This command defaults to using interactive mode, because
+# # mails shouldn't be sent without an explanation
+# if (not $use_mutt) {
+# $interactive = 1;
+# }
+#
+# # Workaround (?) - We need to set the btsemail to nnn-d...@b.d.o
+# # to close a bug.
+# # TODO: Evaluate other possbilities to do that more beauty
+# $btsemail = $bug . '-d...@bugs.debian.org';
+#
+# my $message = ;
+# if ($version) {
+# $message .= Version: $version;
+# }
+# $message .= \nExplanation for closing the bug should go here;
+# mailbts($subject, $message);
+# }
-Mark a bug as Done. Defaults to implying interactive mode,
-because you should edit the message and provide explanations,
-why the bug is beeing closed.
-You should specify which version of the package closed the bug, if
-possible.
-=cut
-
-sub bts_done {
-my $bug=checkbug(shift) or die bts done: close what bug?\n;
-my $version=shift;
-my $subject=Closing $bug;
-$version= unless defined $version;
-opts_done(@_);
-
-# TODO: Evaluate if we want to do this by default
-my $bug_status = Devscripts::Debbugs::status( map {[bug = $_,
indicatesource = 1]} ($bug) );
-if ($bug_status) {
- $subject = Re: $bug_status-{$bug}-{subject};
-}
-
-# This command defaults to using interactive mode, because
-# mails shouldn't be sent without an explanation
-if (not $use_mutt) {
- $interactive = 1;
-}
-
-# Workaround (?) - We need to set the btsemail to nnn-d...@b.d.o
-# to close a bug.
-# TODO: Evaluate other possbilities to do that more beauty
-$btsemail = $bug . '-d...@bugs.debian.org';
-
-my $message = ;
-if ($version) {
- $message .= Version: $version;
-}
-$message .= \nExplanation for closing the bug should go here;
-mailbts($subject, $message);
-}
-
=item reopen bug [submitter]
Reopen a bug, with optional submitter.
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1946 - trunk/debian
Author: adsb Date: 2009-07-29 13:39:15 + (Wed, 29 Jul 2009) New Revision: 1946 Modified: trunk/debian/changelog Log: Changelog police Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-07-29 13:36:08 UTC (rev 1945) +++ trunk/debian/changelog 2009-07-29 13:39:15 UTC (rev 1946) @@ -27,15 +27,19 @@ because they're better. [ Patrick Schoenfeld ] - * dget: Make it clear in manpage and usage information, that dget is capable -of processing several URLs or packages -(Closes: #535977) + * bts: Implement a --mutt parameter, which allows mails to be sent +using mutt. + * debchange: Implement a dist indication mechanism that parses +an 'Upload to $DIST' line and sets the distribution accordingly, when +the --release parameter is used. (Closes: #515346) * debi: + Implement a --with-depends switch to install depencies of the package together with the package (Closes: #511061) + Implement a --tool switch to choose the tool for installing dependencies + * dget: Make it clear in manpage and usage information, that dget is capable +of processing several URLs or packages (Closes: #535977) * dscverify: + Implement a --verbose option to disable suppressing of GPG output (Closes: #525670) @@ -49,12 +53,6 @@ tag set or not and only set it, if not (Closes: #519678) * Add a script listing to devscripts.1 which is auto-generated from debian/control (Closes: #504008) - * bts: -+ Implement a --mutt parameter, which allows mails to be sended - using mutt. - * debchange: Implement a dist indication mechanism that parses -an 'Upload to $DIST' line and sets the distribution accordingly, when -the --release parameter is used. (Closes: #515346) -- Patrick Schoenfeld schoenf...@debian.org Fri, 24 Jul 2009 15:03:56 +0200 -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1948 - trunk/scripts
Author: adsb
Date: 2009-07-29 13:59:36 + (Wed, 29 Jul 2009)
New Revision: 1948
Modified:
trunk/scripts/dscverify.pl
Log:
dscverify: Add a missing space before 21 when hiding GPG output
Modified: trunk/scripts/dscverify.pl
===
--- trunk/scripts/dscverify.pl 2009-07-29 13:54:22 UTC (rev 1947)
+++ trunk/scripts/dscverify.pl 2009-07-29 13:59:36 UTC (rev 1948)
@@ -111,7 +111,7 @@
my $cmd = 'gpg --batch --no-options --no-default-keyring --always-trust';
foreach (@rings) { $cmd .= --keyring $_; }
$cmd .= $file;
-$cmd .= 21 /dev/null if not ($verbose);
+$cmd .= 21 /dev/null if not ($verbose);
my $out=`$cmd`;
if ($? == 0) { return ; }
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1950 - tags
Author: adsb Date: 2009-07-29 14:13:20 + (Wed, 29 Jul 2009) New Revision: 1950 Added: tags/2.10.53/ Log: tagging version 2.10.53 -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1951 - trunk/debian
Author: adsb Date: 2009-07-29 17:04:53 + (Wed, 29 Jul 2009) New Revision: 1951 Modified: trunk/debian/changelog Log: and so begins 2.10.54 Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-07-29 14:13:20 UTC (rev 1950) +++ trunk/debian/changelog 2009-07-29 17:04:53 UTC (rev 1951) @@ -1,3 +1,9 @@ +devscripts (2.10.54) unstable; urgency=low + + * NOT RELEASED YET + + -- Adam D. Barratt a...@adam-barratt.org.uk Wed, 29 Jul 2009 16:01:54 +0100 + devscripts (2.10.53) unstable; urgency=low The Debconf fish! upload -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1941 - trunk/scripts
Author: adsb
Date: 2009-07-24 13:18:05 + (Fri, 24 Jul 2009)
New Revision: 1941
Modified:
trunk/scripts/debchange.pl
Log:
Make the upload to $dist change more versatile
Modified: trunk/scripts/debchange.pl
===
--- trunk/scripts/debchange.pl 2009-07-24 13:06:57 UTC (rev 1940)
+++ trunk/scripts/debchange.pl 2009-07-24 13:18:05 UTC (rev 1941)
@@ -1157,8 +1157,9 @@
last;
}
}
- elsif (/ \* Upload to (.*)$/) {
- $dist_indicator = $1;
+ elsif (/ \* Upload to ([^ ]+).*$/) {
+ ($dist_indicator = $1) =~ s/[,;]$//;
+ chomp $dist_indicator;
}
elsif (/^ --\s+([^]+)\s+/) {
$lastmaint=$1;
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1942 - in trunk: debian scripts
Author: adsb Date: 2009-07-24 16:42:47 + (Fri, 24 Jul 2009) New Revision: 1942 Modified: trunk/debian/changelog trunk/scripts/bts.pl Log: bts: Add a missing use IO::File to make bts select file:foo work. Thanks, Raphaël Hertzog. (Closes: #538288) Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-07-24 13:18:05 UTC (rev 1941) +++ trunk/debian/changelog 2009-07-24 16:42:47 UTC (rev 1942) @@ -1,6 +1,8 @@ devscripts (2.10.53) UNRELEASED; urgency=low [ Adam D. Barratt ] + * bts: Add a missing use IO::File to make bts select file:foo work. +Thanks, Raphaël Hertzog. (Closes: #538288) * checkbashisms: Detect the use of source when the sourced filename contains a tilde (Closes: #528592) or consists of a single character (Closes: #535252). Thanks, Raphael Geissert and Ryan Niebur. Modified: trunk/scripts/bts.pl === --- trunk/scripts/bts.pl2009-07-24 13:18:05 UTC (rev 1941) +++ trunk/scripts/bts.pl2009-07-24 16:42:47 UTC (rev 1942) @@ -39,6 +39,7 @@ use File::Temp qw/tempfile/; use Net::SMTP; use Cwd; +use IO::File; use IO::Handle; use lib '/usr/share/devscripts'; use Devscripts::DB_File_Lock; -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Re: SVN devscripts commit: r1936 - in trunk: debian scripts
On Wed, 2009-07-22 at 02:50 +, Patrick Schoenfeld wrote:
Author: schoenfeld
Date: 2009-07-22 14:50:10 + (Wed, 22 Jul 2009)
New Revision: 1936
[...]
+# This command defaults to using interactive mode, because
+# mails shouldn't be sent without an explanation
+if (not $use_mutt) {
+ $interactive = 1;
+}
Hmmm, should that be force-interactive mode? Standard interactive mode
displays the message and gives the user the option of sending the mail
as-is or editing it; force-interactive dumps them straight in to an
editor.
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Re: SVN devscripts commit: r1927 - in trunk: debian scripts
Patrick Schoenfeld wrote: Author: schoenfeld Date: 2009-07-20 15:06:24 + (Mon, 20 Jul 2009) New Revision: 1927 Modified: trunk/debian/changelog trunk/scripts/dget.pl Log: dch: Make it clear in manpage and usage information, that dget is Erm... :-) (s/dch/dget/) Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#537766: debchange: --multimaint does not work with -m
On Mon, 2009-07-20 at 21:30 +0200, Joachim Breitner wrote: I have a changelog that starts with these lines: $ head -n 18 debian/changelog haskell-zlib (0.5.0.0-3) UNRELEASED; urgency=low [...] -- Marco Túlio Gontijo e Silva mar...@riseup.net Mon, 13 Jul 2009 11:54:27 -0300 [..] I’m not Marco. When I run dch without any options (and --multimaint enabled by default), I get an editor which offers me: [multi-maintainer headers] as expected. But running $ dch -m 'Provide and Replace the previous -doc package name' instead generates: [changelog with no multi-maintainer headers] where I would expect debchange to also add a name header. This is actually documented in debchange(1): --maintmaint, -m Do not modify the maintainer details previously listed in the changelog. This is useful particularly for sponsors wanting to auto‐ matically add a sponsorship message without disrupting the other changelog details. Note that there may be some interesting interac‐ tions if multi-maintainer mode is in use; you will probably wish to check the changelog manually before uploading it in such cases. Patches welcome if you're brave enough to dive into the code. :-) Alternatively, if you were expecting -m to mean message as in debcommit -m or svn ci -m then you're not the only person I know of who's made that assumption, but it's incorrect. You don't need any special options to add text to the changelog with debchange - any non-option text on the command line is automatically inserted, so you only need $ dch 'Provide and Replace the previous -doc package name' Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#517917: bts temp file problem
On Sun, 2009-07-19 at 12:04 +0200, Joey Hess wrote:
Hello, I think I am seeing the same bug, on one machine
(a xen domU running 2.6.18-6-xen-amd64 and Debian unstable userland FWIW):
[...]
This kernel is too old to have a /dev/fd. But, your use of /dev/fd is
completly unnecessary anyway. You already have an open $fh, so just
point OUT_MBOX at it:
-open (OUT_MBOX, /dev/fd/ . fileno($fh))
+open(OUT_MBOX, , $fh);
Works for me. Note that bts contains the idiom in two places.
Hmmm, good point; thanks.
Alexander, could you please try the following diff (against the current
unstable package) and see if it fixes the issue you were seeing?
Index: scripts/bts.pl
===
--- scripts/bts.pl (revision 1918)
+++ scripts/bts.pl (working copy)
@@ -2881,7 +2881,7 @@
DIR = File::Spec-tmpdir,
UNLINK = 1);
# Use filehandle for security
- open (OUT_MBOX, /dev/fd/ . fileno($fh))
+ open (OUT_MBOX, , $fh)
or die bts: writing to temporary file: $!\n;
} else {
$filename = $mboxfile;
@@ -3287,7 +3287,7 @@
UNLINK = 1);
# Use filehandle for security
- open (OUT_LIVE, /dev/fd/ . fileno($fh))
+ open (OUT_LIVE, , $fh)
or die bts: writing to temporary file: $!\n;
# Correct relative urls to point to the bts.
$live =~ s%\shref=(?:/cgi-bin/)?(\w+\.cgi)%
href=$btscgiurl$1%g;
Regards,
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1925 - in trunk: debian scripts
Author: adsb
Date: 2009-07-16 20:50:41 + (Thu, 16 Jul 2009)
New Revision: 1925
Modified:
trunk/debian/changelog
trunk/scripts/rmadison.pl
Log:
rmadison: When using curl, follow redirects by default. (Also from the Ubuntu
patch).
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-07-16 20:47:46 UTC (rev 1924)
+++ trunk/debian/changelog 2009-07-16 20:50:41 UTC (rev 1925)
@@ -14,6 +14,8 @@
* rmadison:
+ Add patch from Ubuntu to make lookups against their database work again.
(The server moved from people.ubuntu.com to people.canonical.com)
++ When using curl, follow redirects by default. (Also from the Ubuntu
+ patch).
-- Adam D. Barratt a...@adam-barratt.org.uk Wed, 01 Jul 2009 18:43:43 +0100
Modified: trunk/scripts/rmadison.pl
===
--- trunk/scripts/rmadison.pl 2009-07-16 20:47:46 UTC (rev 1924)
+++ trunk/scripts/rmadison.pl 2009-07-16 20:50:41 UTC (rev 1925)
@@ -171,7 +171,7 @@
foreach my $url (@url) {
print $url:\n if @url 1;
$url = $url_map{$url} if $url_map{$url};
-my @cmd = -x /usr/bin/curl ? qw/curl -s -S/ : qw/wget -q -O -/;
+my @cmd = -x /usr/bin/curl ? qw/curl -s -S -L/ : qw/wget -q -O -/;
system @cmd, $url . ?package= . join(+, map { uri_escape($_) } @ARGV)
. text=on . join (, @args);
}
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#536037: debcommit: Please add darcs-support
On Tue, 2009-07-07 at 01:50 +0200, Joachim Breitner wrote: tag 536037 + patch thanks Hi, Am Dienstag, den 07.07.2009, 01:27 +0200 schrieb Joachim Breitner: it would be nice if debcommit had darcs-support. I’m writing a patch and will attach it here. here it goes. Patch is against SVN revision 1921. Applied; thanks. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#537302: rmadison: -u ubuntu doesn't work
On Thu, 2009-07-16 at 13:27 -0700, Ryan Niebur wrote: $ rmadison -u ubuntu libgtk2-mozembed-perl !DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN htmlhead title302 Found/title /headbody h1Found/h1 pThe document has moved a href=http://people.canonical.com/~ubuntu-archive//madison.cgi?package=libgtk2-mozembed-perlamp;text=onamp;;here/a./p /body/html running: sed -i s/people.ubuntu.com/people.canonical.com/ scripts/rmadison.pl seems to fix it. Spooky timing. :-) I've literally just applied the patch from 2.10.48ubuntu2 to our repository for the above change. fwiw, the patch also updates the options passed to curl so that it follows HTTP redirects; if that had been in place before then everything would have carried on working happily despite the move - users without curl installed would have fallen back to wget which dtrt by default already. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1921 - in trunk: debian scripts
Author: adsb
Date: 2009-07-05 16:24:36 + (Sun, 05 Jul 2009)
New Revision: 1921
Modified:
trunk/debian/changelog
trunk/scripts/nmudiff.sh
Log:
nmudiff: Fix specification of BCc to cont...@bugs so that it's interpreted
as an option to mutt and not as a recipient address. Thanks, Filippo
Giunchedi. (Closes: #534585)
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2009-07-01 18:07:54 UTC (rev 1920)
+++ trunk/debian/changelog 2009-07-05 16:24:36 UTC (rev 1921)
@@ -3,6 +3,9 @@
* checkbashisms: Detect the use of source when the sourced filename
contains a tilde (Closes: #528592) or consists of a single character
(Closes: #535252). Thanks, Raphael Geissert and Ryan Niebur.
+ * nmudiff: Fix specification of BCc to cont...@bugs so that it's interpreted
+as an option to mutt and not as a recipient address. Thanks, Filippo
+Giunchedi. (Closes: #534585)
-- Adam D. Barratt a...@adam-barratt.org.uk Wed, 01 Jul 2009 18:43:43 +0100
Modified: trunk/scripts/nmudiff.sh
===
--- trunk/scripts/nmudiff.sh2009-07-01 18:07:54 UTC (rev 1920)
+++ trunk/scripts/nmudiff.sh2009-07-05 16:24:36 UTC (rev 1921)
@@ -411,8 +411,8 @@
mutt -s $SOURCE: diff for NMU version $VERSION -i $TMPNAM \
-e my_hdr X-NMUDIFF-Version: ###VERSION### \
- -a ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff -- \
- $BCC_ADDRESS_MUTT $TO_ADDRESSES_MUTT
+ -a ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff $BCC_ADDRESS_MUTT \
+ -- $TO_ADDRESSES_MUTT
fi
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#534585: nmudiff: $BCC_ADDRESS_MUTT before --
On Thu, 2009-06-25 at 16:59 +0200, Filippo Giunchedi wrote:
in nmudiff BCC_ADDRESS_MUTT must be before -- otherwise it is not
recognized as an option, trivial patch:
--- nmudiff.sh(revision 1917)
+++ nmudiff.sh(working copy)
@@ -411,8 +411,8 @@
mutt -s $SOURCE: diff for NMU version $VERSION -i $TMPNAM \
-e my_hdr X-NMUDIFF-Version: ###VERSION### \
- -a ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff -- \
- $BCC_ADDRESS_MUTT $TO_ADDRESSES_MUTT
+ -a ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff $BCC_ADDRESS_MUTT \
+ -- $TO_ADDRESSES_MUTT
Looks like this was broken as part of fixing #518127; thanks for
pointing it out, and for the patch.
Regards,
Adam
--
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#535252: checkbashisms doesn't detect source
Ryan Niebur wrote, Wednesday, July 01, 2009 8:21 AM: bash jade test-checkbashism $ cat script.sh #!/bin/sh source a [...] bash jade test-checkbashism $ checkbashisms ./script.sh bash jade test-checkbashism $ echo $? 0 It *does*, but not if the filename being sourced is a single character. $ cat script.sh #!/bin/sh source ab $ checkbashisms script.sh possible bashism in script.sh line 3 (should be '.', not 'source'): source ab I can see why, and a possible solution; I just need to check that it doesn't introduce any further issues. Regards, Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
Bug#535252: checkbashisms doesn't detect source
Ryan Niebur wrote, Wednesday, July 01, 2009 10:21 AM On Wed, Jul 01, 2009 at 09:52:00AM +0100, Adam D. Barratt wrote: It *does*, but not if the filename being sourced is a single character. ok. but that's not the only case where it doesn't detect it. the problem that caused me to make this small test case and file the bug was like this: bash jade master ORDB-DebianModules-Generator $ cat test #!/bin/sh if [ -f ~/.bashrc ]; then source ~/.bashrc fi That's #528592 ; I can't spot an immediately obvious reason why we haven't applied Raphael's patch yet. By using something else as your test case when reporting this bug, you have uncovered another issue though, so we should fix both while we're at it. Adam -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1919 - in trunk: debian scripts
Author: adsb Date: 2009-07-01 17:45:15 + (Wed, 01 Jul 2009) New Revision: 1919 Modified: trunk/debian/changelog trunk/scripts/checkbashisms.pl Log: checkbashisms: Detect the use of source when the sourced filename contains a tilde (Closes: #528592) or consists of a single character (Closes: #535252). Thanks, Raphael Geissert and Ryan Niebur. Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-06-25 20:40:39 UTC (rev 1918) +++ trunk/debian/changelog 2009-07-01 17:45:15 UTC (rev 1919) @@ -1,3 +1,11 @@ +devscripts (2.10.53) UNRELEASED; urgency=low + + * checkbashisms: Detect the use of source when the sourced filename +contains a tilde (Closes: #528592) or consists of a single character +(Closes: #535252). Thanks, Raphael Geissert and Ryan Niebur. + + -- Adam D. Barratt a...@adam-barratt.org.uk Wed, 01 Jul 2009 18:43:43 +0100 + devscripts (2.10.52) unstable; urgency=low * debdiff: Make --diffstat work again; accidentally broken in 2.10.48. Modified: trunk/scripts/checkbashisms.pl === --- trunk/scripts/checkbashisms.pl 2009-06-25 20:40:39 UTC (rev 1918) +++ trunk/scripts/checkbashisms.pl 2009-07-01 17:45:15 UTC (rev 1919) @@ -540,7 +540,7 @@ %singlequote_bashisms = ( $LEADIN . qr'echo\s+(?:-[^e\s]+\s+)?\'[^\']*(\\[abcEfnrtv0])+.*?[\']' = qunsafe echo with backslash, - $LEADIN . qr'source\s+[\\']?(?:\.\/|\/|\$|[\w.-])[^\s]+' = + $LEADIN . qr'source\s+[\\']?(?:\.\/|\/|\$|[\w~.-])\S*(\s|\z)' = qshould be '.', not 'source', ); -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
SVN devscripts commit: r1912 - in trunk: debian scripts
Author: adsb Date: 2009-06-17 10:26:33 + (Wed, 17 Jun 2009) New Revision: 1912 Modified: trunk/debian/changelog trunk/scripts/uupdate.sh Log: uupdate: Fix invocation of *cat when attempting to apply diffs. Thanks, Yannick Roehlly. (Closes: #533415) Modified: trunk/debian/changelog === --- trunk/debian/changelog 2009-06-15 19:29:21 UTC (rev 1911) +++ trunk/debian/changelog 2009-06-17 10:26:33 UTC (rev 1912) @@ -2,6 +2,8 @@ * debdiff: Make --diffstat work again; diffstat exits 0 unless there was a problem. Accidentally broken in 2.10.48. + * uupdate: Fix invocation of *cat when attempting to apply diffs. +Thanks, Yannick Roehlly. (Closes: #533415) -- Adam D. Barratt a...@adam-barratt.org.uk Mon, 15 Jun 2009 19:41:02 +0100 Modified: trunk/scripts/uupdate.sh === --- trunk/scripts/uupdate.sh2009-06-15 19:29:21 UTC (rev 1911) +++ trunk/scripts/uupdate.sh2009-06-17 10:26:33 UTC (rev 1912) @@ -722,7 +722,7 @@ done fi - if $DIFFCAT ../$DIFF | patch -sNp1 ; then + if $DIFFCAT $DIFF | patch -sNp1 ; then echo Success! The diffs from version $VERSION worked fine. else echo $PROGNAME: the diffs from version $VERSION did not apply cleanly! 2 -- To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.
