[SCM] Debian package checker branch, master, updated. 2.5.10-26-g2a7978a
The following commit has been merged in the master branch:
commit 2a7978a9adcbb588dff799534ebd7f8f986c241b
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jul 12 21:20:51 2012 +0200
t/: Add test for shared-lib with executable stack
Kodus to Bernhard R. Link for the C code to make gcc create an
executable stack.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index f69747a..0896c92 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-07-11
-Coverage: 815/964 (84.54%), w. legacy tests: 920/964 (95.44%)
+Last generated 2012-07-12
+Coverage: 816/964 (84.65%), w. legacy tests: 921/964 (95.54%)
The following tags are not tested by the test suite:
@@ -55,7 +55,6 @@ menus doc-base-file-syntax-error
menus executable-in-usr-share-docbase
menus executable-menu-file
-shared-libs shlib-with-executable-stack
shared-libs shlib-without-PT_GNU_STACK-section
The following tags are only tested by the legacy test suite:
diff --git a/t/tests/shared-libs-exit-fork/debian/Makefile b/t/tests/shared-libs-exec-stack/debian/Makefile
similarity index 86%
copy from t/tests/shared-libs-exit-fork/debian/Makefile
copy to t/tests/shared-libs-exec-stack/debian/Makefile
index 68d5863..1754891 100644
--- a/t/tests/shared-libs-exit-fork/debian/Makefile
+++ b/t/tests/shared-libs-exec-stack/debian/Makefile
@@ -1,13 +1,13 @@
CC=gcc
CFLAGS+= -fPIC
-SONAMES:= libexecbit.so.1
+SONAMES:= libexecstack.so.1
LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
all: $(LIBFILES)
-$(LIBFILES): code.o
- $(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(patsubst %.0.1,%,$@) $^ -lc
+$(LIBFILES): foo.o get.o
+ $(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(patsubst %.0.1,%,$@) $^
clean:
rm -f *.a *.o *.so*
diff --git a/t/tests/shared-libs-exec-bit/debian/debian/control.in b/t/tests/shared-libs-exec-stack/debian/debian/control.in
similarity index 94%
copy from t/tests/shared-libs-exec-bit/debian/debian/control.in
copy to t/tests/shared-libs-exec-stack/debian/debian/control.in
index deafe45..012d746 100644
--- a/t/tests/shared-libs-exec-bit/debian/debian/control.in
+++ b/t/tests/shared-libs-exec-stack/debian/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 9)
-Package: libexecbit1
+Package: libexecstack1
Architecture: any
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: {$description}
diff --git a/t/tests/shared-libs-exec-stack/debian/debian/libexecstack1.symbols b/t/tests/shared-libs-exec-stack/debian/debian/libexecstack1.symbols
new file mode 100644
index 0000000..1cc72ae
--- /dev/null
+++ b/t/tests/shared-libs-exec-stack/debian/debian/libexecstack1.symbols
@@ -0,0 +1,3 @@
+libexecstack.so.1 libexecstack1 #MINVER#
+ foo@Base 1.0
+ get@Base 1.0
diff --git a/t/tests/shared-libs-exec-stack/debian/foo.c b/t/tests/shared-libs-exec-stack/debian/foo.c
new file mode 100644
index 0000000..7f41799
--- /dev/null
+++ b/t/tests/shared-libs-exec-stack/debian/foo.c
@@ -0,0 +1,9 @@
+extern int get(int, int (*)(int));
+
+int foo(int a) {
+ int b = a;
+ int bar(int a) {
+ return a + b;
+ }
+ return get(a, bar);
+}
diff --git a/t/tests/shared-libs-exec-stack/debian/get.c b/t/tests/shared-libs-exec-stack/debian/get.c
new file mode 100644
index 0000000..8207637
--- /dev/null
+++ b/t/tests/shared-libs-exec-stack/debian/get.c
@@ -0,0 +1,6 @@
+int get(int a, int (*f)(int)) {
+ return f(a);
+}
+
+extern int foo(int);
+
diff --git a/t/tests/shared-libs-exec-stack/desc b/t/tests/shared-libs-exec-stack/desc
new file mode 100644
index 0000000..62d376b
--- /dev/null
+++ b/t/tests/shared-libs-exec-stack/desc
@@ -0,0 +1,5 @@
+Testname: shared-libs-exec-stack
+Sequence: 6000
+Version: 1.0
+Description: Test checks related to libs with exec stack
+Test-For: shlib-with-executable-stack
diff --git a/t/tests/shared-libs-exec-stack/tags b/t/tests/shared-libs-exec-stack/tags
new file mode 100644
index 0000000..36fe4b8
--- /dev/null
+++ b/t/tests/shared-libs-exec-stack/tags
@@ -0,0 +1 @@
+W: libexecstack1: shlib-with-executable-stack usr/lib/libexecstack.so.1.0.1
--
Debian package checker
Reply to: