Processed: Re: apache2-module-depends-on-real-apache2-package contradicts dh_apache2
Processing commands for cont...@bugs.debian.org: > tags 796285 + pending Bug #796285 [lintian] apache2-module-depends-on-real-apache2-package contradicts dh_apache2 Bug #796328 [lintian] dh_apache2: add dependence on a real apache2 package Added tag(s) pending. Added tag(s) pending. > thanks Stopping processing here. Please contact me if you need assistance. -- 796285: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796285 796328: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796328 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#796285: apache2-module-depends-on-real-apache2-package contradicts dh_apache2
tags 796285 + pending thanks Fixed in Git, pending upload: https://anonscm.debian.org/git/lintian/lintian.git/commit/?id=b880cc522da37da97f8292fccadcd96e0432f372 Regards, -- ,''`. : :' : Chris Lamb `. `'` la...@debian.org / chris-lamb.co.uk `-
[lintian] branch master updated (35b6982 -> b880cc5)
This is an automated email from the git hooks/post-receive script. lamby pushed a change to branch master in repository lintian. from 35b6982 Avoid false positive for sensible-utils itself new b880cc5 Drop apache2-module-depends-on-real-apache2-package tag as there are separate tags for missing apache2-api-* dependencies. Thanks to Thijs Kinkhorst et al. (Closes: #796285) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: checks/apache2.desc | 13 - checks/apache2.pm| 8 debian/changelog | 4 t/tests/apache2-modules-general/desc | 1 - t/tests/apache2-modules-general/tags | 1 - 5 files changed, 4 insertions(+), 23 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 01/01: Drop apache2-module-depends-on-real-apache2-package tag as there are separate tags for missing apache2-api-* dependencies. Thanks to Thijs Kinkhorst et al. (Closes: #796285)
This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian. commit b880cc522da37da97f8292fccadcd96e0432f372 Author: Chris LambDate: Mon Mar 12 10:28:33 2018 -0700 Drop apache2-module-depends-on-real-apache2-package tag as there are separate tags for missing apache2-api-* dependencies. Thanks to Thijs Kinkhorst et al. (Closes: #796285) --- checks/apache2.desc | 13 - checks/apache2.pm| 8 debian/changelog | 4 t/tests/apache2-modules-general/desc | 1 - t/tests/apache2-modules-general/tags | 1 - 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/checks/apache2.desc b/checks/apache2.desc index 60115dc..d476301 100644 --- a/checks/apache2.desc +++ b/checks/apache2.desc @@ -12,19 +12,6 @@ Info: The package appears to be an Apache2 HTTPD server module but it isn't libapache2-mod-name with mod-name being the actual mod_name.so equivalent. - -Tag: apache2-module-depends-on-real-apache2-package -Severity: serious -Certainty: certain -Info: The package is an Apache2 HTTPD server module but it depends on a real - Apache2 package. Binary module packages must depend on the virtual - apache2-api-MMNN package only in order to ease transitions in - future. - . - In particular, module packages must not pull the full web server or any of its - associated data packages as a dependency. That's left to the user. - - Tag: apache2-module-does-not-depend-on-apache2-api Severity: serious Certainty: certain diff --git a/checks/apache2.pm b/checks/apache2.pm index 843fbcb..b3531d0 100644 --- a/checks/apache2.pm +++ b/checks/apache2.pm @@ -132,13 +132,6 @@ sub check_module_package { my $expected_name = 'libapache2-' . lc($module); my $rel; -my $visit = sub { -if (m/^apache2(?:\.2)?-(?:common|data|bin)$/) { -tag 'apache2-module-depends-on-real-apache2-package', $_; -return 1; -} -return 0; -}; $expected_name =~ tr/_/-/; if ($expected_name ne $pkg) { @@ -146,7 +139,6 @@ sub check_module_package { $expected_name; } -$info->relation('strong')->visit($visit, VISIT_STOP_FIRST_MATCH); $rel = Lintian::Relation->and($info->relation('strong'), $info->relation('recommends')); if (!$rel->matches(qr/^apache2-api-\d+$/o)) { diff --git a/debian/changelog b/debian/changelog index 5abe532..b7791c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ lintian (2.5.80) UNRELEASED; urgency=medium XXX: generate tag summary + * checks/apache2.{desc,pm}: ++ [CL] Drop apache2-module-depends-on-real-apache2-package tag as there + are separate tags for missing apache2-api-* dependencies. Thanks to + Thijs Kinkhorst et al. (Closes: #796285) * checks/fields.pm: + [CL] Only check dependency fields in binary packages for mail-transport-agent-dependency-does-not-specify-default-mta etc. diff --git a/t/tests/apache2-modules-general/desc b/t/tests/apache2-modules-general/desc index 9cc6593..eb4fefe 100644 --- a/t/tests/apache2-modules-general/desc +++ b/t/tests/apache2-modules-general/desc @@ -2,7 +2,6 @@ Testname: apache2-modules-general Version: 1.0 Description: Several tests related to Apache2 module packages Test-For: - apache2-module-depends-on-real-apache2-package apache2-module-does-not-depend-on-apache2-api non-standard-apache2-module-package-name apache2-module-does-not-ship-load-file diff --git a/t/tests/apache2-modules-general/tags b/t/tests/apache2-modules-general/tags index aa2af04..d2b3188 100644 --- a/t/tests/apache2-modules-general/tags +++ b/t/tests/apache2-modules-general/tags @@ -1,7 +1,6 @@ E: libapache2-mod-foo2: apache2-module-does-not-ship-load-file etc/apache2/mods-available/foo2.load E: libapache2-mod-foo2: apache2-reverse-dependency-ships-file-in-not-allowed-directory etc/apache2/mods-enabled/foo.conf E: libapache2-mod-foo: apache2-configuration-files-need-conf-suffix etc/apache2/mods-available/foo -E: libapache2-modbaz: apache2-module-depends-on-real-apache2-package apache2.2-common E: libapache2-modbaz: apache2-module-does-not-depend-on-apache2-api W: libapache2-mod-foo2: apache2-reverse-dependency-calls-wrapper-script postinst a2enmod W: libapache2-mod-foo2: apache2-reverse-dependency-calls-wrapper-script postrm a2dismod -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Bug#889016: lintian: Please update dh_commands for scour 0.36-2
Hi, On 12/03/18 00:42, Chris Lamb wrote: > tags 889016 + pending > thanks > > Hi James, > > Thanks for the reopening this. I've updated all the debhelper data. Can > you check the scour changes over for sanity? We seem to have changed > them a number of times in the past 6 months! > > You can see the diff here: > > > https://anonscm.debian.org/git/lintian/lintian.git/commit/?id=115ce429ef09111ba8d04ebe23bbacb3a1de26c7 Thanks. I think the scour changes look correct now. James signature.asc Description: OpenPGP digital signature
[lintian] branch tagrename deleted (was ab1af5d)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch tagrename in repository lintian. was ab1af5d Warn about renamed tag This change permanently discards the following revisions: discards ab1af5d Warn about renamed tag discards 8fc290d Rename variable $tag to $rawtag in order to clarify code discards f7dbaff Allow tag to be renamed -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch utf8fix deleted (was c163818)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch utf8fix in repository lintian. was c163818 read_dpkg_control using utf8 This change permanently discards the following revisions: discards c163818 read_dpkg_control using utf8 discards 7c1c056 Read file as a whole for utf8 testing -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch unique deleted (was 642508b)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch unique in repository lintian. was 642508b Detect if license-short-name are unique in source copyright This change permanently discards the following revisions: discards 642508b Detect if license-short-name are unique in source copyright -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch wasm created (now 6182305)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch wasm in repository lintian. at 6182305 Detect wasm prebuilt file This branch includes the following new commits: new 6182305 Detect wasm prebuilt file The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch wasm deleted (was 6182305)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch wasm in repository lintian. was 6182305 Detect wasm prebuilt file This change permanently discards the following revisions: discards 6182305 Detect wasm prebuilt file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch unique created (now 642508b)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch unique in repository lintian. at 642508b Detect if license-short-name are unique in source copyright This branch includes the following new commits: new 642508b Detect if license-short-name are unique in source copyright The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch symlink deleted (was 5e4bb9c)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch symlink in repository lintian. was 5e4bb9c t/tests/java-*: Require a recent enough java version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch utf8fix created (now c163818)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch utf8fix in repository lintian. at c163818 read_dpkg_control using utf8 This branch includes the following new commits: new 7c1c056 Read file as a whole for utf8 testing new c163818 read_dpkg_control using utf8 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch master updated (4c4667d -> 35b6982)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch master in repository lintian. from 4c4667d spelling: Add another correction new 35b6982 Avoid false positive for sensible-utils itself The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: checks/scripts.pm | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch symlink created (now 5e4bb9c)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch symlink in repository lintian. at 5e4bb9c t/tests/java-*: Require a recent enough java version No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] branch tagrename created (now ab1af5d)
This is an automated email from the git hooks/post-receive script. rouca pushed a change to branch tagrename in repository lintian. at ab1af5d Warn about renamed tag This branch includes the following new commits: new f7dbaff Allow tag to be renamed new 8fc290d Rename variable $tag to $rawtag in order to clarify code new ab1af5d Warn about renamed tag The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 01/03: Allow tag to be renamed
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch tagrename in repository lintian. commit f7dbaff42c945e329f9fc1329000e330c6c8fac7 Author: Bastien ROUCARIÈSDate: Sat Aug 15 21:51:28 2015 +0200 Allow tag to be renamed Allow renaming tag. --- data/override/renamed-tags | 7 +++ lib/Lintian/Tag/Override.pm | 9 + lib/Lintian/Tags.pm | 12 .../debian/debian/overrides-shown.lintian-overrides | 3 +++ t/tests/overrides-shown/tags | 4 t/tests/overrides/debian/debian/install | 1 + t/tests/overrides/debian/debian/overrides.lintian-overrides | 3 +++ t/tests/overrides/tags | 2 +- 8 files changed, 36 insertions(+), 5 deletions(-) diff --git a/data/override/renamed-tags b/data/override/renamed-tags new file mode 100644 index 000..7dab546 --- /dev/null +++ b/data/override/renamed-tags @@ -0,0 +1,7 @@ +# list of renamed tag old name => new name. Please alpha sort by old name +dep5-file-paragraph-reference-header-paragraph => dep5-file-paragraph-references-header-paragraph +package-install-apt-preferences => package-installs-apt-preferences +package-install-apt-sources => package-installs-apt-sources +package-install-ieee-data => package-installs-ieee-data +package-install-into-obsolete-dir => package-installs-into-obsolete-dir +privacy-breach-may-use-debian-package => privacy-breach-uses-embedded-file diff --git a/lib/Lintian/Tag/Override.pm b/lib/Lintian/Tag/Override.pm index 28e0634..20132a4 100644 --- a/lib/Lintian/Tag/Override.pm +++ b/lib/Lintian/Tag/Override.pm @@ -22,6 +22,7 @@ use strict; use warnings; use parent qw(Class::Accessor::Fast); +use Lintian::Data; =head1 NAME @@ -72,9 +73,17 @@ considered a pattern. =cut +# renamed tag list +my $RENAMED_TAGS = Lintian::Data->new('override/renamed-tags',qr/\s*=>\s*/); + sub new { my ($type, $tag, $data) = @_; $data = {} unless defined $data; + +if($RENAMED_TAGS->known($tag)) { +$tag = $RENAMED_TAGS->value($tag); +} + my $self = { 'arch' => $data->{'arch'}, 'comments' => $data->{'comments'}, diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm index aea037f..13c5612 100644 --- a/lib/Lintian/Tags.pm +++ b/lib/Lintian/Tags.pm @@ -603,10 +603,6 @@ sub file_overrides { } next unless $found; } -if ($profile && !$profile->is_overridable($tag)) { -$self->{ignored_overrides}{$tag}++; -next; -} if ($last_over && $last_over->tag eq $tag && !scalar @$comments) { # There are no new comments, no "empty line" in between and @@ -624,6 +620,14 @@ sub file_overrides { }; $comments = []; $tagover = Lintian::Tag::Override->new($tag, $data); +# tag will be changed here if renamed reread +$tag = $tagover->{'tag'}; + +# treat here ignored overrides + if ($profile && !$profile->is_overridable($tag)) { +$self->{ignored_overrides}{$tag}++; +next; +} $info->{'overrides-data'}{$tag}{$extra} = $tagover; $info->{overrides}{$tag}{$extra} = 0; $last_over = $tagover; diff --git a/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides b/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides index dd2884b..04ae11b 100644 --- a/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides +++ b/t/tests/overrides-shown/debian/debian/overrides-shown.lintian-overrides @@ -14,4 +14,7 @@ FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:2* FSSTND-dir-in-manual-page */foo.1.gz:5 /usr/doc/ FSSTND-dir-in-manual-page */foo.1.gz:3* +# renamed tag +package-install-apt-sources * + #FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz * more occurrences not shown diff --git a/t/tests/overrides-shown/tags b/t/tests/overrides-shown/tags index 2ffaf8c..075742d 100644 --- a/t/tests/overrides-shown/tags +++ b/t/tests/overrides-shown/tags @@ -1,3 +1,7 @@ +N: renamed tag +O: overrides-shown: package-installs-apt-sources etc/apt/sources.list.d/ +N: renamed tag +O: overrides-shown: package-installs-apt-sources etc/apt/sources.list.d/foo.1 N: exact extra information O: overrides-shown: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:4 /usr/dict/ N: These are wildcard overrides diff --git a/t/tests/overrides/debian/debian/install b/t/tests/overrides/debian/debian/install new file mode 100644 index 000..747a313 --- /dev/null +++ b/t/tests/overrides/debian/debian/install @@ -0,0 +1 @@ +foo.1 /etc/apt/sources.list.d \ No newline at end
[lintian] 01/01: Detect if license-short-name are unique in source copyright
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch unique in repository lintian. commit 642508bccd1029e399be302e30145982a98ce10e Author: Bastien ROUCARIÈSDate: Sun Nov 16 19:50:44 2014 +0100 Detect if license-short-name are unique in source copyright Signed-off-by: Bastien ROUCARIÈS --- checks/source-copyright.desc | 9 checks/source-copyright.pm | 17 +- debian/changelog | 3 ++- t/tests/source-copyright-unique/debian/NEWS| 1 + t/tests/source-copyright-unique/debian/README | 1 + .../debian/debian/copyright| 27 ++ t/tests/source-copyright-unique/desc | 6 + t/tests/source-copyright-unique/tags | 5 8 files changed, 67 insertions(+), 2 deletions(-) diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc index 59c4459..914ff34 100644 --- a/checks/source-copyright.desc +++ b/checks/source-copyright.desc @@ -252,6 +252,15 @@ Info: One of the file paragraph reference in the or short names followed by license exceptions making up the first line must be described in stand-alone License paragraphs. +Tag: dep5-copyright-license-name-not-unique +Severity: normal +Certainty: possible +Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Info: This paragraph define an already defined license. + . + According to specification the short license name are guaranteed + to be unique within a single copyright file. + Tag: invalid-escape-sequence-in-dep5-copyright Severity: normal Certainty: possible diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm index 5e60197..2eda3b4 100644 --- a/checks/source-copyright.pm +++ b/checks/source-copyright.pm @@ -231,6 +231,7 @@ sub _parse_dep5 { my %standalone_licenses; my %required_standalone_licenses; my %short_licenses_seen; +my %full_licenses_seen; for my $field (keys %{$first_para}) { my $renamed_to = $dep5_renamed_fields{$field}; @@ -255,6 +256,7 @@ sub _parse_dep5 { if(defined($full_license_header)) { for (@short_licenses_header) { $standalone_licenses{$_} = 1; +$full_licenses_seen{$_} = 1; } } @@ -296,7 +298,13 @@ sub _parse_dep5 { "(paragraph at line $current_line)"; }else { for (@short_licenses) { -$standalone_licenses{$_} = $i; +if(defined($full_licenses_seen{$_})) { +tag 'dep5-copyright-license-name-not-unique', + "(paragraph at line $current_line)"; +} else { +$standalone_licenses{$_} = $i; +$full_licenses_seen{$_} = $current_line; +} $short_licenses_seen{$_} = $i; } } @@ -382,6 +390,13 @@ sub _parse_dep5 { $short_licenses_seen{$_} = $i; if (not defined($full_license)) { $required_standalone_licenses{$_} = $i; +} else { +if(defined($full_licenses_seen{$_})) { +tag 'dep5-copyright-license-name-not-unique', + "(paragraph at line $current_line)"; +} else { +$full_licenses_seen{$_} = $current_line; +} } } }else { diff --git a/debian/changelog b/debian/changelog index f5b3067..9b4e28b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,13 @@ lintian (2.5.31) UNRELEASED; urgency=medium * checks/fields.desc: + [BR] Add reference to build-depends-on-metapackage (Closes: #767107). - * checks/source-copyright.pm: + * checks/source-copyright.{desc,pm}: + [BR] Fix a false positive for missing-license-paragraph-in-dep5-copyright tag. Do not allow to reference header paragraph, emit a specific tag. (Closes: #766118). ++ [BR] Detect if license short name are unique. * collection/strings: + [NT] Pass "-a" to strings to avoid possible security diff --git a/t/tests/source-copyright-unique/debian/NEWS b/t/tests/source-copyright-unique/debian/NEWS new file mode 100644 index 000..8a7f3d9 --- /dev/null +++ b/t/tests/source-copyright-unique/debian/NEWS @@ -0,0 +1 @@ +no news \ No newline at end of file diff --git a/t/tests/source-copyright-unique/debian/README b/t/tests/source-copyright-unique/debian/README new file mode 100644 index 000..1a9d2ad --- /dev/null +++ b/t/tests/source-copyright-unique/debian/README @@ -0,0 +1 @@ +trivial diff --git
[lintian] 01/01: Detect wasm prebuilt file
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch wasm in repository lintian. commit 6182305d061d1042e3a2008b43f9994a3e55dbd6 Author: Bastien ROUCARIÈSDate: Fri Feb 2 10:48:37 2018 +0100 Detect wasm prebuilt file wasm have the potential to be like minified javascript. Detect early --- checks/cruft.desc | 12 data/cruft/warn-file-type | 1 + debian/changelog | 1 + t/tests/cruft-wasm/desc| 10 ++ t/tests/cruft-wasm/pre_upstream| 11 +++ t/tests/cruft-wasm/tags| 2 ++ t/tests/cruft-wasm/upstream/README | 1 + 7 files changed, 38 insertions(+) diff --git a/checks/cruft.desc b/checks/cruft.desc index 40c6cae..ab55382 100644 --- a/checks/cruft.desc +++ b/checks/cruft.desc @@ -537,6 +537,18 @@ Info: The source tarball contains a prebuilt binary for Microsoft Windows. the upstream distribution instead. If not, you may want to ask upstream to provide source-only tarballs. +Tag: source-contains-prebuilt-wasm-binary +Severity: pedantic +Certainty: certain +Info: The source tarball contains a prebuilt binary wasm object. + They are usually provided for the convenience of users. These files + usually just take up space in the tarball and need to be rebuilt from + source. + . + Check if upstream also provides source-only tarballs that you can use as + the upstream distribution instead. If not, you may want to ask upstream + to provide source-only tarballs. + Tag: source-contains-waf-binary Severity: important Certainty: certain diff --git a/data/cruft/warn-file-type b/data/cruft/warn-file-type index 22b9c36..dd60910 100644 --- a/data/cruft/warn-file-type +++ b/data/cruft/warn-file-type @@ -15,3 +15,4 @@ source-contains-prebuilt-javascript-object ~~ .* source-contains-prebuilt-python-object ~~ ^python \s \d(\.\d+)? \s byte-compiled~~ .* ~~ s/(?i)(?:\.cpython-\d{2}|\.pypy)?\.py[co]$/.py/ source-contains-prebuilt-silverlight-object ~~ ^Zip \s archive \s data ~~ (?i)\.xac$ source-contains-prebuilt-windows-binary ~~ \b(?:PE(?:32|64)|(?:MS-DOS|COFF)\s executable)\b +source-contains-prebuilt-wasm-binary~~ ^WebAssembly \s \(wasm\) \s binary \s module diff --git a/debian/changelog b/debian/changelog index 61ca98f..2bdb566 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ lintian (2.5.73) UNRELEASED; urgency=medium check "src/foo/bar.js". (Closes: #832027) + [CL] Check for upstream tarballs that ship examples but none is installed in any binary package. (Closes: #539326) ++ [BR] Check for wasm file. (Closes: #889102) * checks/debian-source-dir.desc: + [CL] Upgrade severity of missing-debian-source-format from wishlist ("I") to normal ("W"). (Closes: #702671) diff --git a/t/tests/cruft-wasm/desc b/t/tests/cruft-wasm/desc new file mode 100644 index 000..d9cf8dd --- /dev/null +++ b/t/tests/cruft-wasm/desc @@ -0,0 +1,10 @@ +Testname: cruft-wasm +Version: 1.0-1 +Description: Misc errors related to wasm +Skeleton: pedantic +Options: --pedantic -I -E +Architecture: any +Type: non-native +Test-For: + source-contains-prebuilt-wasm-binary +Test-Depends: file (>= 1:5.32) diff --git a/t/tests/cruft-wasm/pre_upstream b/t/tests/cruft-wasm/pre_upstream new file mode 100755 index 000..12344f9 --- /dev/null +++ b/t/tests/cruft-wasm/pre_upstream @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Create all the various junk that shouldn't exist in the diff so that we can +# trigger all the tags. + +set -e +dir="$1" +srcdir="$1" + +printf "\0asm\001\0\0\0" > "$srcdir/fake.wasm" + diff --git a/t/tests/cruft-wasm/tags b/t/tests/cruft-wasm/tags new file mode 100644 index 000..3401a43 --- /dev/null +++ b/t/tests/cruft-wasm/tags @@ -0,0 +1,2 @@ +P: cruft-wasm source: debian-watch-does-not-check-gpg-signature +P: cruft-wasm source: source-contains-prebuilt-wasm-binary fake.wasm diff --git a/t/tests/cruft-wasm/upstream/README b/t/tests/cruft-wasm/upstream/README new file mode 100644 index 000..a6a4fce --- /dev/null +++ b/t/tests/cruft-wasm/upstream/README @@ -0,0 +1 @@ +This include fake wasm file -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 02/03: Rename variable $tag to $rawtag in order to clarify code
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch tagrename in repository lintian. commit 8fc290d5c5b07ee519669c7e367b6bf15f5f35dc Author: Bastien ROUCARIÈSDate: Sat Aug 15 22:42:16 2015 +0200 Rename variable $tag to $rawtag in order to clarify code Signed-off-by: Bastien ROUCARIÈS --- lib/Lintian/Tags.pm | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm index 13c5612..b0ef395 100644 --- a/lib/Lintian/Tags.pm +++ b/lib/Lintian/Tags.pm @@ -548,14 +548,15 @@ sub file_overrides { ) { # Valid - so far at least my ($opkg_name, $archlist, $opkg_type, $tagdata)= ($1, $2, $3, $4); -my ($tag, $extra) = split(m/ /o, $tagdata, 2); +my ($rawtag, $extra) = split(m/ /o, $tagdata, 2); +my $tag; my $tagover; my $data; if ($opkg_type and $opkg_type ne $info->{type}) { tag( 'malformed-override', join(q{ }, -"Override of $tag for package type $opkg_type", +"Override of $rawtag for package type $opkg_type", "(expecting $info->{type}) at line $.")); next; } @@ -564,7 +565,7 @@ sub file_overrides { 'malformed-override', join(q{ }, 'Architecture list for arch:all package', -"at line $. (for tag $tag)")); +"at line $. (for tag $rawtag)")); next; } if ($archlist) { @@ -584,7 +585,7 @@ sub file_overrides { 'malformed-override', join(q{ }, "Unknown architecture \"$a\"", -"at line $. (for tag $tag)")); +"at line $. (for tag $rawtag)")); next OVERRIDE; } } @@ -594,7 +595,7 @@ sub file_overrides { 'malformed-override', join(q{ }, 'Inconsistent architecture negation', -"at line $. (for tag $tag)")); +"at line $. (for tag $rawtag)")); next; } # missing wildcard checks and sanity checking archs $arch @@ -604,7 +605,7 @@ sub file_overrides { next unless $found; } -if ($last_over && $last_over->tag eq $tag && !scalar @$comments) { +if ($last_over && $last_over->tag eq $rawtag && !scalar @$comments) { # There are no new comments, no "empty line" in between and # this tag is the same as the last, so we "carry over" the # comment from the previous override (if any). @@ -619,7 +620,7 @@ sub file_overrides { 'comments' => $comments, }; $comments = []; -$tagover = Lintian::Tag::Override->new($tag, $data); +$tagover = Lintian::Tag::Override->new($rawtag, $data); # tag will be changed here if renamed reread $tag = $tagover->{'tag'}; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 02/02: read_dpkg_control using utf8
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch utf8fix in repository lintian. commit c163818e0d98b104922979b4fc8f01621e35e64c Author: Bastien ROUCARIÈSDate: Tue Jul 21 23:36:11 2015 +0200 read_dpkg_control using utf8 Avoid mojibake on html page --- lib/Lintian/Util.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Lintian/Util.pm b/lib/Lintian/Util.pm index 2b6e9e4..8eb35b2 100644 --- a/lib/Lintian/Util.pm +++ b/lib/Lintian/Util.pm @@ -619,7 +619,7 @@ autodie exceptions if open or close fails. sub read_dpkg_control { my ($file, $flags, $lines) = @_; -open(my $CONTROL, '<', $file); +open(my $CONTROL, '<:encoding(utf8)', $file); my @data = parse_dpkg_control($CONTROL, $flags, $lines); close($CONTROL); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 01/02: Read file as a whole for utf8 testing
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch utf8fix in repository lintian. commit 7c1c0565ab32869788107efb359078ca90c1fb6b Author: Bastien ROUCARIÈSDate: Tue Jul 21 23:31:42 2015 +0200 Read file as a whole for utf8 testing Avoid a test failure latter --- lib/Test/Lintian.pm | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/Test/Lintian.pm b/lib/Test/Lintian.pm index 68cbb6e..4566152 100644 --- a/lib/Test/Lintian.pm +++ b/lib/Test/Lintian.pm @@ -77,7 +77,7 @@ use Lintian::Profile; use Lintian::Tag::Info; use Lintian::Tags; use Lintian::Util - qw(read_dpkg_control slurp_entire_file is_string_utf8_encoded); + qw(read_dpkg_control slurp_entire_file file_is_encoded_in_non_utf8); # We want data files loaded early to avoid problems with missing data # files ending up in releases (like in 2.5.17 and 2.5.18). @@ -174,6 +174,14 @@ sub test_check_desc { foreach my $desc_file (map { _find_check($find_opt, $_) } @descs) { my ($header, @tagpara); +# check utf-8 +my $not_utf8_line = file_is_encoded_in_non_utf8($path); +if ($not_utf8_line) { +$builder->ok(0, "$desc_file is not utf-8"); +$builder->diag("Error: line $not_utf8_line"); +next; +} + eval {($header, @tagpara) = read_dpkg_control($desc_file);}; if (my $err = $@) { $err =~ s/ at .*? line \d+\s*\n//; @@ -339,11 +347,6 @@ sub test_check_desc { or $builder->diag("$content_type $cname: $tag ($1)\n"); } -$builder->ok( -is_string_utf8_encoded($info), -'Tag info must be written in UTF-8' -) or $builder->diag("$content_type $cname: $tag\n"); - # Check the tag info for unescaped <> or for unknown tags (which # probably indicate the same thing). while ($info =~ s,<([^\s>]+)(?:\s+href=\"[^\"]+\")?>.*?,,s) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 01/01: Avoid false positive for sensible-utils itself
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch master in repository lintian. commit 35b69820edd338e526c1d04b3bdf91c7812b24cb Author: Bastien ROUCARIÈSDate: Mon Mar 12 13:46:18 2018 +0100 Avoid false positive for sensible-utils itself --- checks/scripts.pm | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/scripts.pm b/checks/scripts.pm index 8fcc1d0..1b5d96d 100644 --- a/checks/scripts.pm +++ b/checks/scripts.pm @@ -249,7 +249,8 @@ sub run { my $str_deps = $info->relation('strong'); my $has_sensible_utils =Lintian::Relation->and($str_deps, $info->relation('recommends')) - ->implies('sensible-utils'); + ->implies('sensible-utils') + || ($pkg eq 'sensible-utils'); for my $filename (sort keys %{$info->scripts}) { my $interpreter = $info->scripts->{$filename}{interpreter}; diff --git a/debian/changelog b/debian/changelog index 550a932..5abe532 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ lintian (2.5.80) UNRELEASED; urgency=medium package has explicit Build-Depends on dpkg-dev (>= 1.18.8) or debhelper (>= 10.10). Thanks to Andreas Metzler for the report. (Closes: #892549) + * checks/script.pm: ++ [BR] Fix FP with sensible-utils need to depends on sensible-utils. * checks/fields.{desc,pm}: + [CL] Clarify the meaning of the depends-on-build-essential-package-without-using-version tag by -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
[lintian] 03/03: Warn about renamed tag
This is an automated email from the git hooks/post-receive script. rouca pushed a commit to branch tagrename in repository lintian. commit ab1af5d4ab4a9b42f335576aa3c9fe21867f19eb Author: Bastien ROUCARIÈSDate: Sat Aug 15 22:56:25 2015 +0200 Warn about renamed tag Signed-off-by: Bastien ROUCARIÈS --- checks/lintian.desc | 10 ++ lib/Lintian/Tags.pm | 9 +++-- t/tests/overrides-shown/desc | 3 ++- t/tests/overrides-shown/tags | 1 + t/tests/overrides/desc | 2 ++ t/tests/overrides/tags | 1 + 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/checks/lintian.desc b/checks/lintian.desc index 3b57382..15c93d7 100644 --- a/checks/lintian.desc +++ b/checks/lintian.desc @@ -18,6 +18,16 @@ Info: Lintian discovered an unused override entry in its database. If the override is unused, please remove it from the overrides file. +Tag: renamed-override +Severity: pedantic +Certainty: certain +Info: Lintian discovered an renamed override entry in its database. + Lintian tag are sometime renamed in order to improve description. + . + Override file is dynamically translated by lintian. Nevertheless + please replace the old name by the new name. + + Tag: malformed-override Severity: important Certainty: certain diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm index b0ef395..65590bd 100644 --- a/lib/Lintian/Tags.pm +++ b/lib/Lintian/Tags.pm @@ -605,7 +605,8 @@ sub file_overrides { next unless $found; } -if ($last_over && $last_over->tag eq $rawtag && !scalar @$comments) { +if ($last_over && $last_over->tag eq $rawtag && !scalar @$comments) +{ # There are no new comments, no "empty line" in between and # this tag is the same as the last, so we "carry over" the # comment from the previous override (if any). @@ -624,8 +625,12 @@ sub file_overrides { # tag will be changed here if renamed reread $tag = $tagover->{'tag'}; +unless($tag eq $rawtag) { +tag('renamed-override',"$rawtag => $tag at line $."); +} + # treat here ignored overrides - if ($profile && !$profile->is_overridable($tag)) { +if ($profile && !$profile->is_overridable($tag)) { $self->{ignored_overrides}{$tag}++; next; } diff --git a/t/tests/overrides-shown/desc b/t/tests/overrides-shown/desc index 3becd5f..d44a42a 100644 --- a/t/tests/overrides-shown/desc +++ b/t/tests/overrides-shown/desc @@ -1,7 +1,8 @@ Testname: overrides-shown Sequence: 1500 Version: 1.0 -Options: --show-overrides -I -E +Skeleton: pedantic +Options: --pedantic --show-overrides -I -E Sort: no Architecture: any Description: Test override handling diff --git a/t/tests/overrides-shown/tags b/t/tests/overrides-shown/tags index 075742d..1ae7b6d 100644 --- a/t/tests/overrides-shown/tags +++ b/t/tests/overrides-shown/tags @@ -1,3 +1,4 @@ +P: overrides-shown: renamed-override package-install-apt-sources => package-installs-apt-sources at line 18 N: renamed tag O: overrides-shown: package-installs-apt-sources etc/apt/sources.list.d/ N: renamed tag diff --git a/t/tests/overrides/desc b/t/tests/overrides/desc index e27a624..a1edb0a 100644 --- a/t/tests/overrides/desc +++ b/t/tests/overrides/desc @@ -1,5 +1,7 @@ Testname: overrides Sequence: 1500 Version: 1.0 +Skeleton: pedantic +Options: --pedantic -I -E Description: Test override handling Architecture: any diff --git a/t/tests/overrides/tags b/t/tests/overrides/tags index 8cbb094..0557d93 100644 --- a/t/tests/overrides/tags +++ b/t/tests/overrides/tags @@ -2,3 +2,4 @@ I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:12 /usr/info I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:13 /usr/man/ I: overrides: FSSTND-dir-in-manual-page usr/share/man/man1/foo.1.gz:14 /usr/adm/ N: 12 tags overridden (2 errors, 1 warning, 9 info) +P: overrides: renamed-override package-install-apt-sources => package-installs-apt-sources at line 18 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Bug#796285: apache2-module-depends-on-real-apache2-package contradicts dh_apache2
Re: Thijs Kinkhorst 2016-11-13> Yes. Some of my packages have been triggering this Lintian error for a > long long time now, while all they do is depend on dh-apache2 and let that > sort out the correct misc:depends. dacs 1.4.40-1 has this problem as well. Christoph