[lintian] 01/03: Add v6 transition string for gcc v6 for so name matching
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit cde722896f2fa83a898d413bab35194e59b89d38
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date: Mon Nov 14 13:58:10 2016 +0100
Add v6 transition string for gcc v6 for so name matching
Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
checks/binaries.pm | 2 +-
t/tests/binaries-doesnt-match-sonames/debian/Makefile | 2 +-
.../binaries-doesnt-match-sonames/debian/debian/control.in | 11 +++++++++++
.../debian/debian/libanygcc1v6.install | 1 +
.../debian/debian/libanygcc1v6.symbols | 2 ++
.../debian/debian/mylibany.install | 1 +
6 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/checks/binaries.pm b/checks/binaries.pm
index 9123b1e..30c9095 100644
--- a/checks/binaries.pm
+++ b/checks/binaries.pm
@@ -253,7 +253,7 @@ sub run {
$base_pkg =~ s/c2a?\b//o;
$base_pkg =~ s/\dg$//o;
$base_pkg =~ s/gf$//o;
- $base_pkg =~ s/v5$//o; # GCC-5 / libstdc++6 C11 ABI breakage
+ $base_pkg =~ s/v[5-6]$//o; # GCC-5 / libstdc++6 C11 ABI breakage
$base_pkg =~ s/-udeb$//o;
$base_pkg =~ s/^lib64/lib/o;
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/Makefile b/t/tests/binaries-doesnt-match-sonames/debian/Makefile
index f1e3a5a..78d4852 100644
--- a/t/tests/binaries-doesnt-match-sonames/debian/Makefile
+++ b/t/tests/binaries-doesnt-match-sonames/debian/Makefile
@@ -2,7 +2,7 @@ CC=gcc
MYCFLAGS=-Wall -Winline -O2 -fPIC
CFLAGS:=$(MYCFLAGS) $(CPPFLAGS) $(CFLAGS)
-SONAMES:= libany.so.1
+SONAMES:= libany.so.1 libanygcc.so.1v6
LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
all: $(LIBFILES)
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in b/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
index d7d79c5..f12c14e 100644
--- a/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
+++ b/t/tests/binaries-doesnt-match-sonames/debian/debian/control.in
@@ -12,3 +12,14 @@ 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.
+
+
+Package: libanygcc1v6
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} with gcc version
+ 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 test if v6 string are correctly escaped
\ No newline at end of file
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.install b/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.install
new file mode 100644
index 0000000..6873a48
--- /dev/null
+++ b/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.install
@@ -0,0 +1 @@
+/usr/lib/libanygcc.*
\ No newline at end of file
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.symbols b/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.symbols
new file mode 100644
index 0000000..f102bd2
--- /dev/null
+++ b/t/tests/binaries-doesnt-match-sonames/debian/debian/libanygcc1v6.symbols
@@ -0,0 +1,2 @@
+libanygcc.so.1v6 libanygcc1v6 #MINVER#
+ e@Base 1.0
diff --git a/t/tests/binaries-doesnt-match-sonames/debian/debian/mylibany.install b/t/tests/binaries-doesnt-match-sonames/debian/debian/mylibany.install
new file mode 100644
index 0000000..5c86ce1
--- /dev/null
+++ b/t/tests/binaries-doesnt-match-sonames/debian/debian/mylibany.install
@@ -0,0 +1 @@
+/usr/lib/libany.*
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: