[SCM] Debian package checker branch, master, updated. 2.5.10-190-g6d8c4ec
The following commit has been merged in the master branch:
commit ccccfe0f8763d9580da09d23cffc9b5b9d3aadeb
Author: Niels Thykier <niels@thykier.net>
Date: Sat Oct 6 12:20:38 2012 +0200
t: Add subst-dsc to subst @SHA1@ (etc.) in dsc.in files
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/helpers/bin/subst-dsc b/t/helpers/bin/subst-dsc
new file mode 100755
index 0000000..da77fe0
--- /dev/null
+++ b/t/helpers/bin/subst-dsc
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+use strict;
+
+use lib "$ENV{'LINTIAN_ROOT'}/lib";
+use Lintian::Util qw(get_file_checksum);
+
+my ($size, $sha1, $sha2, $md5);
+my ($tarfile) = @ARGV;
+
+$size = (stat $tarfile)[7];
+$sha1 = get_file_checksum ("sha1", $tarfile);
+$sha2 = get_file_checksum ("sha256", $tarfile);
+$md5 = get_file_checksum ("md5", $tarfile);
+
+while ( <STDIN> ) {
+ s/\@SIZE\@/$size/g;
+ s/\@MD5\@/$md5/g;
+ s/\@SHA256\@/$sha2/g;
+ s/\@SHA1\@/$sha1/g;
+ print $_;
+}
+
+exit 0;
diff --git a/t/source/changelog-file-symlink/Makefile b/t/source/changelog-file-symlink/Makefile
index 146ad86..1fe3d36 100644
--- a/t/source/changelog-file-symlink/Makefile
+++ b/t/source/changelog-file-symlink/Makefile
@@ -11,14 +11,7 @@ all:
mkdir $(dir)/debian/source
echo '3.0 (quilt)' > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-field-traversal-1/Makefile b/t/source/control-field-traversal-1/Makefile
index 7ff7636..f87ee69 100644
--- a/t/source/control-field-traversal-1/Makefile
+++ b/t/source/control-field-traversal-1/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-field-traversal-2/Makefile b/t/source/control-field-traversal-2/Makefile
index 0c3c570..fa137c1 100644
--- a/t/source/control-field-traversal-2/Makefile
+++ b/t/source/control-field-traversal-2/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-field-traversal-3/Makefile b/t/source/control-field-traversal-3/Makefile
index d68a358..d11fe9e 100644
--- a/t/source/control-field-traversal-3/Makefile
+++ b/t/source/control-field-traversal-3/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-file-duplicate-field/Makefile b/t/source/control-file-duplicate-field/Makefile
index fd2e374..690b7ff 100644
--- a/t/source/control-file-duplicate-field/Makefile
+++ b/t/source/control-file-duplicate-field/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-file-missing-separator/Makefile b/t/source/control-file-missing-separator/Makefile
index d819ae2..454afec 100644
--- a/t/source/control-file-missing-separator/Makefile
+++ b/t/source/control-file-missing-separator/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/control-file-syntax-error/Makefile b/t/source/control-file-syntax-error/Makefile
index 30539ef..4ae7d3b 100644
--- a/t/source/control-file-syntax-error/Makefile
+++ b/t/source/control-file-syntax-error/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/debian-source-dir-traversal-1/Makefile b/t/source/debian-source-dir-traversal-1/Makefile
index a784d5c..271bf09 100644
--- a/t/source/debian-source-dir-traversal-1/Makefile
+++ b/t/source/debian-source-dir-traversal-1/Makefile
@@ -15,14 +15,7 @@ all:
mkdir $(dir)/debian/patches
touch $(dir)/debian/patches/series
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/debian-source-dir-traversal-2/Makefile b/t/source/debian-source-dir-traversal-2/Makefile
index 2ce36d5..c58e92b 100644
--- a/t/source/debian-source-dir-traversal-2/Makefile
+++ b/t/source/debian-source-dir-traversal-2/Makefile
@@ -9,14 +9,7 @@ all:
# "unknown-file-in-debian-source" tags, if lintian is vulnerable
ln -s ../ $(dir)/debian/source
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/debian-source-dir-unknown-source-format/Makefile b/t/source/debian-source-dir-unknown-source-format/Makefile
index c3c9e61..0e0a2c3 100644
--- a/t/source/debian-source-dir-unknown-source-format/Makefile
+++ b/t/source/debian-source-dir-unknown-source-format/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo "3.0 (unknown-format)" > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/debian-symlink/Makefile b/t/source/debian-symlink/Makefile
index 4fca09e..9093116 100644
--- a/t/source/debian-symlink/Makefile
+++ b/t/source/debian-symlink/Makefile
@@ -9,14 +9,7 @@ all:
mkdir $(dir)/debian/source
echo 1.0 > $(dir)/debian/source/format
tar cfz $(name)_1.tar.gz $(dir)
- cp dsc.in $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(name)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(name)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(name)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(name)_1.tar.gz") } s/\@MD5\@/$$h/g' $(name)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(name)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(name)_1.dsc
+ subst-dsc $(name)_1.tar.gz < dsc.in > $(name)_1.dsc
clean:
rm -rf $(dir)
diff --git a/t/source/fields-src-fields-filename/Makefile b/t/source/fields-src-fields-filename/Makefile
index 37ae6db..4acfab0 100644
--- a/t/source/fields-src-fields-filename/Makefile
+++ b/t/source/fields-src-fields-filename/Makefile
@@ -10,14 +10,7 @@ all:
echo 7 > $(dir)/debian/compat
cp changelog copyright control rules $(dir)/debian/
tar cfz $(dsc)_1.tar.gz $(dir)
- cp dsc.in $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha1", "$(dsc)_1.tar.gz") } s/\@SHA1\@/$$h/g' $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("sha256", "$(dsc)_1.tar.gz") } s/\@SHA256\@/$$h/g' $(dsc)_1.dsc
- perl -I$(LINTIAN_ROOT)/lib -MLintian::Util -i -pe \
- 'BEGIN { $$h = get_file_checksum("md5", "$(dsc)_1.tar.gz") } s/\@MD5\@/$$h/g' $(dsc)_1.dsc
- perl -i -pe 'BEGIN { $$s = (stat "$(dsc)_1.tar.gz")[7] } s/\@SIZE\@/$$s/g' $(dsc)_1.dsc
+ subst-dsc $(dsc)_1.tar.gz < dsc.in > $(dsc)_1.dsc
mv $(dsc)_1.dsc $(name)_1.dsc
clean:
--
Debian package checker
Reply to: