[SCM] Debian package checker branch, master, updated. 2.5.6-140-ge6d2f22
The following commit has been merged in the master branch:
commit f644beaab3aed40421f806dc52e3d5df94d4d78c
Author: Niels Thykier <niels@thykier.net>
Date: Mon May 14 22:36:49 2012 +0200
Move apache2 checks to a separate profile
The apache2 checks are related to apache2.4 which is not in unstable
yet.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/debian/changelog b/debian/changelog
index 10771c0..e946734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ lintian (2.5.7) UNRELEASED; urgency=low
+ [NT] New files to check for apache2 related packages. Thanks
to Arno Töll and Stefan Fritsch for the patches.
(Closes: #668546)
+ + [NT] This check is not enabled by default. It can be used
+ via the debian/extra-apache2 profile.
* checks/binaries{,.desc}:
+ [NT] Move embedded library data to a data file.
+ [NT] Add ELF hardening checks. Thanks to Kees Cook for
diff --git a/debian/rules b/debian/rules
index fb7159c..c8992ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ PERL ?= /usr/bin/perl
VER := $(shell head -1 debian/changelog | sed -e 's/^.*(//' -e 's/).*$$//')
tmp := $(CURDIR)/debian/lintian
profiles := profiles/debian/main.profile \
- profiles/debian/ftp-master-auto-reject.profile
+ profiles/debian/ftp-master-auto-reject.profile \
+ profiles/debian/extra-apache2.profile
neededfiles := debian/rules frontend/lintian $(profiles)
docsource := doc/lintian.xml doc/README.in man/lintian.pod.in \
man/lintian-info.pod
diff --git a/private/generate-profiles.pl b/private/generate-profiles.pl
index 7831303..805e0cf 100755
--- a/private/generate-profiles.pl
+++ b/private/generate-profiles.pl
@@ -35,7 +35,8 @@ foreach my $check (<$root/checks/*.desc>){
my ($header, undef) = read_dpkg_control($check);
my $cname = $header->{'check-script'};
fail "$check missing check-script\n" unless defined $cname;
- push @checks, $cname;
+ # FIXME, enable apache2 when apache2.4 is uploaded to sid.
+ push @checks, $cname unless $cname eq 'apache2';
}
@fatal = read_tags ('vendors/debian/ftp-master-auto-reject/data/output/ftp-master-fatal');
@@ -50,6 +51,11 @@ generate_profile('debian/main', {
'Enable-Tags-From-Check' => \@checks,
});
+generate_profile('debian/extra-apache2', {
+ 'Extends' => 'debian/main',
+ 'Enable-Tags-From-Check' => ['apache2'],
+ });
+
generate_profile('debian/ftp-master-auto-reject', {
'Enable-Tags' => [@fatal, @nonfatal],
},
diff --git a/profiles/debian/extra-apache2.profile b/profiles/debian/extra-apache2.profile
new file mode 100644
index 0000000..264afc9
--- /dev/null
+++ b/profiles/debian/extra-apache2.profile
@@ -0,0 +1,5 @@
+# This profile is auto-generated
+Profile: debian/extra-apache2
+Extends: debian/main
+Enable-Tags-From-Check: apache2
+
diff --git a/profiles/debian/main.profile b/profiles/debian/main.profile
index 771bb3e..b3a39db 100644
--- a/profiles/debian/main.profile
+++ b/profiles/debian/main.profile
@@ -1,11 +1,11 @@
# This profile is auto-generated
Profile: debian/main
Extends: debian/ftp-master-auto-reject
-Enable-Tags-From-Check: apache2, binaries, changelog-file, changes-file, conffiles,
- control-file, control-files, copyright-file, cruft, deb-format, debconf,
- debhelper, debian-readme, debian-source-dir, description, duplicate-files,
- fields, filename-length, files, group-checks, huge-usr-share, infofiles, init.d,
- java, lintian, manpages, md5sums, menu-format, menus, nmu, ocaml, patch-systems,
+Enable-Tags-From-Check: binaries, changelog-file, changes-file, conffiles, control-file,
+ control-files, copyright-file, cruft, deb-format, debconf, debhelper,
+ debian-readme, debian-source-dir, description, duplicate-files, fields,
+ filename-length, files, group-checks, huge-usr-share, infofiles, init.d, java,
+ lintian, manpages, md5sums, menu-format, menus, nmu, ocaml, patch-systems,
po-debconf, rules, scripts, shared-libs, source-copyright, standards-version,
symlinks, version-substvars, watch-file
diff --git a/t/tests/apache2-modules-general/desc b/t/tests/apache2-modules-general/desc
index 420a0e3..1ee10ab 100644
--- a/t/tests/apache2-modules-general/desc
+++ b/t/tests/apache2-modules-general/desc
@@ -1,6 +1,7 @@
Testname: apache2-modules-general
Sequence: 6000
Version: 1.0
+Profile: debian/extra-apache2
Description: Several tests related to Apache2 module packages
Test-For:
apache2-module-depends-on-real-apache2-package
diff --git a/t/tests/apache2-webapplications-general/desc b/t/tests/apache2-webapplications-general/desc
index 0ba9ba0..150eb29 100644
--- a/t/tests/apache2-webapplications-general/desc
+++ b/t/tests/apache2-webapplications-general/desc
@@ -1,6 +1,7 @@
Testname: apache2-webapplications-general
Sequence: 6000
Version: 1.0
+Profile: debian/extra-apache2
Description: Several tests related to Apache2 web application packages
Test-For:
non-standard-apache2-configuration-name
--
Debian package checker
Reply to: