[lintian] 01/01: Fix test failures on archs where /bin/true is not hardened.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit a35a6fe496f54c8dd9f0b0ea6d1de762483cd6d7
Author: Chris Lamb <lamby@debian.org>
Date: Tue Dec 12 19:15:36 2017 +0000
Fix test failures on archs where /bin/true is not hardened.
---
.../debian/Makefile | 7 ++++++
.../debian/debian/control.in | 2 +-
.../debian/debian/libcontrib-dev.install | 4 ----
.../debian/debian/libmultiarch-foreign-dev.install | 4 ----
.../debian/debian/libmultiarch-none-dev.install | 4 ----
.../debian/debian/libmultiarch-same-dev.install | 4 ----
.../debian/debian/rules | 27 ++++++++++++++--------
.../debian/true.c | 5 ++++
.../tags | 14 +++--------
9 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/Makefile b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/Makefile
new file mode 100644
index 0000000..a877dfd
--- /dev/null
+++ b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/Makefile
@@ -0,0 +1,7 @@
+all:
+ gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o true true.c
+
+clean distclean:
+ rm -f true
+
+check test:
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/control.in b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/control.in
index f96bd53..fded3d5 100644
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/control.in
+++ b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/control.in
@@ -41,7 +41,7 @@ Description: {$description} (M-A: same)
.
This package specifies Multi-Arch: same.
-Package: libcontrib-dev
+Package: libmultiarch-contrib-dev
Architecture: any
Section: contrib/libdevel
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libcontrib-dev.install b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libcontrib-dev.install
deleted file mode 100644
index 61667a8..0000000
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libcontrib-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-contrib /usr/bin
-contrib /var/lib/private
-contrib-script /usr/bin
-contrib-script /var/lib/private
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-foreign-dev.install b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-foreign-dev.install
deleted file mode 100644
index ea430ad..0000000
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-foreign-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-foreign /usr/bin
-foreign /var/lib/private
-foreign-script /usr/bin
-foreign-script /var/lib/private
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-none-dev.install b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-none-dev.install
deleted file mode 100644
index 759d37c..0000000
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-none-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-none /usr/bin
-none /var/lib/private
-none-script /usr/bin
-none-script /var/lib/private
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-same-dev.install b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-same-dev.install
deleted file mode 100644
index 5d90f6e..0000000
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/libmultiarch-same-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-same /usr/bin
-same /var/lib/private
-same-script /usr/bin
-same-script /var/lib/private
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/rules b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/rules
index 61a11fb..fe4db63 100755
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/rules
+++ b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/debian/rules
@@ -1,15 +1,22 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+include /usr/share/dpkg/buildflags.mk
+
%:
dh $@
-override_dh_auto_build:
- cp /bin/true none
- cp /bin/true same
- cp /bin/true foreign
- cp /bin/true contrib
-
- cp script none-script
- cp script same-script
- cp script foreign-script
- cp script contrib-script
+override_dh_auto_install:
+ set -e; for X in none same foreign contrib; do \
+ install -d debian/libmultiarch-$$X-dev/usr/bin; \
+ install -d debian/libmultiarch-$$X-dev/var/lib/private; \
+ install -m 755 true debian/libmultiarch-$$X-dev/usr/bin/$$X; \
+ install -m 755 true debian/libmultiarch-$$X-dev/var/lib/private/$$X; \
+ install -m 755 script debian/libmultiarch-$$X-dev/usr/bin/$$X-script; \
+ install -m 755 script debian/libmultiarch-$$X-dev/var/lib/private/$$X-script; \
+ done
+
+override_dh_strip:
+ # Avoid symbol conflicts warnings
+ dh_strip --no-automatic-dbgsym
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/true.c b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/true.c
new file mode 100644
index 0000000..8479e67
--- /dev/null
+++ b/t/tests/binaries-development-package-ships-elf-binary-in-path/debian/true.c
@@ -0,0 +1,5 @@
+int
+main(void)
+{
+ return 0;
+}
diff --git a/t/tests/binaries-development-package-ships-elf-binary-in-path/tags b/t/tests/binaries-development-package-ships-elf-binary-in-path/tags
index 2d46f7d..f4bbe94 100644
--- a/t/tests/binaries-development-package-ships-elf-binary-in-path/tags
+++ b/t/tests/binaries-development-package-ships-elf-binary-in-path/tags
@@ -1,21 +1,13 @@
E: libmultiarch-same-dev: arch-dependent-file-not-in-arch-specific-directory usr/bin/same
E: libmultiarch-same-dev: arch-dependent-file-not-in-arch-specific-directory var/lib/private/same
-I: libcontrib-dev: hardening-no-bindnow usr/bin/contrib
-I: libcontrib-dev: hardening-no-bindnow var/lib/private/contrib
-I: libmultiarch-foreign-dev: hardening-no-bindnow usr/bin/foreign
-I: libmultiarch-foreign-dev: hardening-no-bindnow var/lib/private/foreign
-I: libmultiarch-none-dev: hardening-no-bindnow usr/bin/none
-I: libmultiarch-none-dev: hardening-no-bindnow var/lib/private/none
-I: libmultiarch-same-dev: hardening-no-bindnow usr/bin/same
-I: libmultiarch-same-dev: hardening-no-bindnow var/lib/private/same
-W: libcontrib-dev: binary-without-manpage usr/bin/contrib
-W: libcontrib-dev: binary-without-manpage usr/bin/contrib-script
+W: libmultiarch-contrib-dev: binary-without-manpage usr/bin/contrib
+W: libmultiarch-contrib-dev: binary-without-manpage usr/bin/contrib-script
W: libmultiarch-foreign-dev: binary-without-manpage usr/bin/foreign
W: libmultiarch-foreign-dev: binary-without-manpage usr/bin/foreign-script
W: libmultiarch-none-dev: binary-without-manpage usr/bin/none
W: libmultiarch-none-dev: binary-without-manpage usr/bin/none-script
W: libmultiarch-same-dev: binary-without-manpage usr/bin/same
W: libmultiarch-same-dev: binary-without-manpage usr/bin/same-script
-X: libcontrib-dev: development-package-ships-elf-binary-in-path usr/bin/contrib
+X: libmultiarch-contrib-dev: development-package-ships-elf-binary-in-path usr/bin/contrib
X: libmultiarch-none-dev: development-package-ships-elf-binary-in-path usr/bin/none
X: libmultiarch-same-dev: development-package-ships-elf-binary-in-path usr/bin/same
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: