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

[SCM] Debian package checker branch, master, updated. 2.4.3-103-gd641e18



The following commit has been merged in the master branch:
commit d641e18438fa4883ebbd4b77f99edc434a5ca023
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 2 13:44:49 2011 +0100

    Unsafe ldconfig test.

diff --git a/t/COVERAGE b/t/COVERAGE
index e0fced0..b26a62b 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -163,7 +163,6 @@ shared-libs ldconfig-symlink-referencing-wrong-file
 shared-libs non-dev-pkg-with-shlib-symlink
 shared-libs pkg-has-shlibs-control-file-but-no-actual-shared-libs
 shared-libs postinst-has-useless-call-to-ldconfig
-shared-libs postrm-unsafe-ldconfig
 shared-libs shlib-calls-exit
 shared-libs shlib-with-bad-permissions
 shared-libs shlib-with-executable-stack
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/Makefile b/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
index fca7af6..5794504 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/Makefile
@@ -1,13 +1,13 @@
 CC=gcc
 CFLAGS=-Wall -Winline -O2 -fPIC
 
-SONAMES:= libfoo.so.1 libfish.so.1
+SONAMES:= libfoo.so.1 libfish.so.1 libuns.so.1
 LIBFILES:= $(patsubst %,%.0.1, $(SONAMES))
 
 all: $(LIBFILES)
 
 $(LIBFILES): code.o
-	$(CC) -o $@ -shared -Wl,-soname,$(patsubst %.0.1,%,$@) $^ -lc
+	$(CC) -o $@ -shared -Wl,-soname,$(patsubst %.0.1,%,$@) $^ -lm
 
 clean:
 	rm -f *.a *.o *.so*
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
index 35d97c4..d89f1b3 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/control.in
@@ -24,3 +24,13 @@ Description: {$description} (preinst/rm ldc)
  things.  It should not be installed like a regular package.
  .
  Checks for ldconfig in preinst/prerm scripts.
+
+Package: libuns1
+Architecture: any
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (unsafe ldc)
+ 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.
+ .
+ Checks for unsafe ldconfig usage scripts.
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.install b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.install
new file mode 100644
index 0000000..b91d5ff
--- /dev/null
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.install
@@ -0,0 +1 @@
+usr/lib/libuns*
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postrm b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.postrm
similarity index 75%
copy from t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postrm
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.postrm
index 9b2f636..acc5d15 100755
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.postrm
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-if false ; then true ; fi
+ldconfig
 
 
 # -- we will remove all debhelper stuff later.
diff --git a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.symbols b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.symbols
similarity index 50%
copy from t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.symbols
copy to t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.symbols
index a1f052b..d91149f 100644
--- a/t/tests/shared-libs-ldconfig-scripts/debian/debian/libfoo1.symbols
+++ b/t/tests/shared-libs-ldconfig-scripts/debian/debian/libuns1.symbols
@@ -1,3 +1,3 @@
-libfoo.so.1 libfoo1 #MINVER#
+libuns.so.1 libuns1 #MINVER#
  e@Base 1.0
  energy@Base 0.9
diff --git a/t/tests/shared-libs-ldconfig-scripts/desc b/t/tests/shared-libs-ldconfig-scripts/desc
index 2516b0d..3b27128 100644
--- a/t/tests/shared-libs-ldconfig-scripts/desc
+++ b/t/tests/shared-libs-ldconfig-scripts/desc
@@ -5,5 +5,6 @@ Description: Test checks related to ldconfig in scripts
 Test-For: 
  postinst-must-call-ldconfig
  postrm-should-call-ldconfig
+ postrm-unsafe-ldconfig
  preinst-calls-ldconfig
  prerm-calls-ldconfig
diff --git a/t/tests/shared-libs-ldconfig-scripts/tags b/t/tests/shared-libs-ldconfig-scripts/tags
index 6e65891..d290db5 100644
--- a/t/tests/shared-libs-ldconfig-scripts/tags
+++ b/t/tests/shared-libs-ldconfig-scripts/tags
@@ -2,3 +2,4 @@ E: libfoo1: postinst-must-call-ldconfig usr/lib/libfoo.so.1.0.1
 E: libfoo1: postrm-should-call-ldconfig usr/lib/libfoo.so.1.0.1
 W: libfish1: preinst-calls-ldconfig
 W: libfish1: prerm-calls-ldconfig
+W: libuns1: postrm-unsafe-ldconfig

-- 
Debian package checker


Reply to: