[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.1-130-g8a2f0f9



The following commit has been merged in the master branch:
commit 8a2f0f9ee3b902f7524b69e20cdfa26888eae812
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 20 19:19:29 2011 +0200

    Added test for set$bit-binary tags

diff --git a/t/COVERAGE b/t/COVERAGE
index fa05839..6df30a0 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2011-07-20
-Coverage: 654/912 (71.71%), w. legacy tests: 800/912 (87.72%)
+Coverage: 657/912 (72.04%), w. legacy tests: 802/912 (87.94%)
 
 The following tags are not tested by the test suite:
 
@@ -69,8 +69,6 @@ files package-installs-into-etc-rc.d
 files package-installs-perllocal-pod
 files package-uses-obsolete-file
 files perl-module-in-core-directory
-files setgid-binary
-files setuid-gid-binary
 files special-file
 files third-party-package-in-python-dir
 files udeb-contains-documentation-file
@@ -201,7 +199,6 @@ files package-installs-nonbinary-perl-in-usr-lib-perl5
 files package-installs-packlist
 files script-in-usr-share-doc
 files script-with-language-extension
-files setuid-binary
 files subdir-in-usr-bin
 files svk-commit-file-in-package
 files svn-commit-file-in-package
@@ -457,5 +454,4 @@ scripts
   python-script-but-no-python-dep
   script-in-usr-share-doc
   script-with-language-extension
-  setuid-binary
   shell-script-fails-syntax-check
diff --git a/t/tests/files-bad-perm-owner/debian/debian/docs b/t/tests/files-bad-perm-owner/debian/debian/binary.docs
similarity index 100%
rename from t/tests/files-bad-perm-owner/debian/debian/docs
rename to t/tests/files-bad-perm-owner/debian/debian/binary.docs
diff --git a/t/tests/files-bad-perm-owner/debian/debian/install b/t/tests/files-bad-perm-owner/debian/debian/binary.install
similarity index 53%
rename from t/tests/files-bad-perm-owner/debian/debian/install
rename to t/tests/files-bad-perm-owner/debian/debian/binary.install
index 0b96593..5165227 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/install
+++ b/t/tests/files-bad-perm-owner/debian/debian/binary.install
@@ -1,4 +1,6 @@
-script usr/games/
 sample.ali usr/lib/some-where/
+script-uid usr/bin/
+script-ugid usr/bin/
+script-gid usr/bin/
 script etc/cron.d/
 script etc/emacs.d/
diff --git a/t/tests/files-bad-perm-owner/debian/debian/binary.manpages b/t/tests/files-bad-perm-owner/debian/debian/binary.manpages
new file mode 100644
index 0000000..ad3e735
--- /dev/null
+++ b/t/tests/files-bad-perm-owner/debian/debian/binary.manpages
@@ -0,0 +1 @@
+script-*.1
diff --git a/t/tests/files-bad-perm-owner/debian/debian/clean b/t/tests/files-bad-perm-owner/debian/debian/clean
index 8d16fb4..1e7cec6 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/clean
+++ b/t/tests/files-bad-perm-owner/debian/debian/clean
@@ -1 +1 @@
-script.1
+script*.1
diff --git a/t/tests/manpages-dependencies/debian/debian/control.in b/t/tests/files-bad-perm-owner/debian/debian/control.in
similarity index 84%
copy from t/tests/manpages-dependencies/debian/debian/control.in
copy to t/tests/files-bad-perm-owner/debian/debian/control.in
index cfd4133..686a2bb 100644
--- a/t/tests/manpages-dependencies/debian/debian/control.in
+++ b/t/tests/files-bad-perm-owner/debian/debian/control.in
@@ -5,22 +5,24 @@ Maintainer: {$author}
 Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 7.0.50~)
 
-Package: pecho
+Package: binary
 Architecture: all
-Depends: $\{misc:Depends\}, pecho-data
+Depends: $\{misc:Depends\},
 Description: {$description}
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.  It may
  be an empty package.
 
-Package: pecho-data
+Package: game
 Architecture: all
+Section: games
 Depends: $\{misc:Depends\}
-Description: {$description} - data
+Description: {$description} - game
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
  things.  It should not be installed like a regular package.  It may
  be an empty package.
  .
- Data package.
+ Game package.
+
diff --git a/t/tests/files-bad-perm-owner/debian/debian/game.install b/t/tests/files-bad-perm-owner/debian/debian/game.install
new file mode 100644
index 0000000..f708f99
--- /dev/null
+++ b/t/tests/files-bad-perm-owner/debian/debian/game.install
@@ -0,0 +1 @@
+script usr/games/
diff --git a/t/tests/files-bad-perm-owner/debian/debian/manpages b/t/tests/files-bad-perm-owner/debian/debian/game.manpages
similarity index 100%
rename from t/tests/files-bad-perm-owner/debian/debian/manpages
rename to t/tests/files-bad-perm-owner/debian/debian/game.manpages
diff --git a/t/tests/files-bad-perm-owner/debian/debian/rules b/t/tests/files-bad-perm-owner/debian/debian/rules
index 28df8c9..3d44f49 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/rules
+++ b/t/tests/files-bad-perm-owner/debian/debian/rules
@@ -1,13 +1,24 @@
 #!/usr/bin/make -f
 
+GPKG:=game
+PKG:=binary
+
 %:
 	dh $@
 
 override_dh_auto_build:
+	for N in uid gid ugid ; do \
+		sed s/script/script-$$N/ < script > script-$$N ; \
+		pod2man --section 1 script-$$N > script-$$N.1 ; \
+	done
 	pod2man --section 1 script > script.1
 
 override_dh_fixperms:
-	# :)
-	find debian/*/ -name 'README' -exec chown "daemon:daemon" {} \;
-	find debian/*/ -name 'read-only' -exec chmod a=r {} \;
-	chown 'root:games' debian/*/usr/games/script
+	# game
+	chown 'root:games' debian/$(GPKG)/usr/games/script
+	# binary
+	find debian/$(PKG)/ -name 'README' -exec chown "daemon:daemon" {} \;
+	find debian/$(PKG)/ -name 'read-only' -exec chmod a=r {} \;
+	chmod +x,u+s debian/$(PKG)/usr/bin/script-uid
+	chmod +x,g+s debian/$(PKG)/usr/bin/script-gid
+	chmod +x,ug+s debian/$(PKG)/usr/bin/script-ugid
diff --git a/t/tests/files-bad-perm-owner/desc b/t/tests/files-bad-perm-owner/desc
index 617021e..28d9c1d 100644
--- a/t/tests/files-bad-perm-owner/desc
+++ b/t/tests/files-bad-perm-owner/desc
@@ -10,3 +10,6 @@ Test-For:
  bad-permissions-for-etc-emacs-script
  non-standard-file-perm
  non-standard-game-executable-perm
+ setgid-binary
+ setuid-binary
+ setuid-gid-binary
diff --git a/t/tests/files-bad-perm-owner/tags b/t/tests/files-bad-perm-owner/tags
index dedca0f..1082141 100644
--- a/t/tests/files-bad-perm-owner/tags
+++ b/t/tests/files-bad-perm-owner/tags
@@ -1,6 +1,9 @@
-E: files-bad-perm-owner: bad-owner-for-doc-file usr/share/doc/files-bad-perm-owner/README daemon/daemon != root/root
-E: files-bad-perm-owner: bad-permissions-for-etc-cron.d-script etc/cron.d/script 0755 != 0644
-E: files-bad-perm-owner: bad-permissions-for-etc-emacs-script etc/emacs.d/script 0755 != 0644
-W: files-bad-perm-owner: bad-permissions-for-ali-file usr/lib/some-where/sample.ali
-W: files-bad-perm-owner: non-standard-file-perm usr/share/doc/files-bad-perm-owner/read-only 0444 != 0644
-W: files-bad-perm-owner: non-standard-game-executable-perm usr/games/script 0755 != 2755
+E: binary: bad-owner-for-doc-file usr/share/doc/binary/README daemon/daemon != root/root
+E: binary: bad-permissions-for-etc-cron.d-script etc/cron.d/script 0755 != 0644
+E: binary: bad-permissions-for-etc-emacs-script etc/emacs.d/script 0755 != 0644
+W: binary: bad-permissions-for-ali-file usr/lib/some-where/sample.ali
+W: binary: non-standard-file-perm usr/share/doc/binary/read-only 0444 != 0644
+W: binary: setgid-binary usr/bin/script-gid 2755 root/root
+W: binary: setuid-binary usr/bin/script-uid 4755 root/root
+W: binary: setuid-gid-binary usr/bin/script-ugid 6755 root/root
+W: game: non-standard-game-executable-perm usr/games/script 0755 != 2755

-- 
Debian package checker


Reply to: