Control: tags 868855 + pending Dear maintainer,
I've prepared an NMU for softhsm2 (versioned as 2.2.0-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru softhsm2-2.2.0/debian/changelog softhsm2-2.2.0/debian/changelog
--- softhsm2-2.2.0/debian/changelog 2017-02-12 15:12:33.000000000 +0100
+++ softhsm2-2.2.0/debian/changelog 2017-10-22 13:41:11.000000000 +0200
@@ -1,3 +1,19 @@
+softhsm2 (2.2.0-3.1) unstable; urgency=medium
+
+ [Tobias Frost ]
+ * Non-maintainer upload.
+ * Import patch from Rene from the BTS.
+ * Lintian warning fixed:
+ - Fix VCS-* links in d/control ("right" URL and using https)
+ - As package priority extra is obsolete, change it to optional.
+ This fixed transitional-package-should-be-oldlibs-optional and
+ priority-extra-is-replaced-by-priority-optional.
+
+ [ Rene Engelhard ]
+ * use pkg-config instead of cppunit-config for cppunit (Closes: #868855)
+
+ -- Tobias Frost <[email protected]> Sun, 22 Oct 2017 13:41:11 +0200
+
softhsm2 (2.2.0-3) unstable; urgency=medium
* Replace doc symlink with directory in transitional softhsm package
diff -Nru softhsm2-2.2.0/debian/control softhsm2-2.2.0/debian/control
--- softhsm2-2.2.0/debian/control 2017-02-12 15:12:33.000000000 +0100
+++ softhsm2-2.2.0/debian/control 2017-10-22 13:41:11.000000000 +0200
@@ -1,6 +1,6 @@
Source: softhsm2
Section: admin
-Priority: extra
+Priority: optional
Maintainer: Debian DNS Packaging <[email protected]>
Uploaders: Ondřej Surý <[email protected]>
Build-Depends: autotools-dev,
@@ -15,8 +15,8 @@
sqlite3
Standards-Version: 3.9.8
Homepage: https://www.opendnssec.org/softhsm/
-Vcs-Browser: http://anonscm.debian.org/?p=pkg-dns/softhsm2.git
-Vcs-Git: git://anonscm.debian.org/pkg-dns/softhsm2.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-dns/softhsm2.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-dns/softhsm2.git
Package: softhsm2-common
Architecture: any
diff -Nru softhsm2-2.2.0/debian/patches/cppunit-pkg-config.diff softhsm2-2.2.0/debian/patches/cppunit-pkg-config.diff
--- softhsm2-2.2.0/debian/patches/cppunit-pkg-config.diff 1970-01-01 01:00:00.000000000 +0100
+++ softhsm2-2.2.0/debian/patches/cppunit-pkg-config.diff 2017-10-22 13:41:11.000000000 +0200
@@ -0,0 +1,278 @@
+Description: Fix to detect cppuinits ising pkg-config
+Author: Rene Engelhard <[email protected]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868855
+Forwarded: no, already applied upstream
+
+--- a/src/lib/crypto/test/Makefile.am
++++ b/src/lib/crypto/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = cryptotest
+
+@@ -32,7 +32,7 @@
+
+ cryptotest_LDADD = ../../libsofthsm_convarch.la
+
+-cryptotest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++cryptotest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+
+ TESTS = cryptotest
+
+--- a/src/lib/crypto/test/Makefile.in
++++ b/src/lib/crypto/test/Makefile.in
+@@ -558,7 +558,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ cryptotest_SOURCES = cryptotest.cpp \
+ AESTests.cpp \
+@@ -578,7 +578,7 @@
+ randtest.c
+
+ cryptotest_LDADD = ../../libsofthsm_convarch.la
+-cryptotest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++cryptotest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/data_mgr/test/Makefile.am
++++ b/src/lib/data_mgr/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = datamgrtest
+
+@@ -20,7 +20,7 @@
+
+ datamgrtest_LDADD = ../../libsofthsm_convarch.la
+
+-datamgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++datamgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+
+ TESTS = datamgrtest
+
+--- a/src/lib/data_mgr/test/Makefile.in
++++ b/src/lib/data_mgr/test/Makefile.in
+@@ -537,7 +537,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ datamgrtest_SOURCES = datamgrtest.cpp \
+ ByteStringTests.cpp \
+@@ -545,7 +545,7 @@
+ SecureDataMgrTests.cpp
+
+ datamgrtest_LDADD = ../../libsofthsm_convarch.la
+-datamgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++datamgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/handle_mgr/test/Makefile.am
++++ b/src/lib/handle_mgr/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ -I$(srcdir)/../../data_mgr \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = handlemgrtest
+
+@@ -18,7 +18,7 @@
+
+ handlemgrtest_LDADD = ../../libsofthsm_convarch.la
+
+-handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+
+ TESTS = handlemgrtest
+
+--- a/src/lib/handle_mgr/test/Makefile.in
++++ b/src/lib/handle_mgr/test/Makefile.in
+@@ -537,13 +537,13 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ -I$(srcdir)/../../data_mgr \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ handlemgrtest_SOURCES = handlemgrtest.cpp \
+ HandleManagerTests.cpp
+
+ handlemgrtest_LDADD = ../../libsofthsm_convarch.la
+-handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
++handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit`
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/object_store/test/Makefile.am
++++ b/src/lib/object_store/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = objstoretest
+
+@@ -32,7 +32,7 @@
+
+ objstoretest_LDADD = ../../libsofthsm_convarch.la
+
+-objstoretest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++objstoretest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+
+ TESTS = objstoretest
+
+--- a/src/lib/object_store/test/Makefile.in
++++ b/src/lib/object_store/test/Makefile.in
+@@ -554,14 +554,14 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ objstoretest_SOURCES = objstoretest.cpp DirectoryTests.cpp \
+ UUIDTests.cpp FileTests.cpp ObjectFileTests.cpp \
+ OSTokenTests.cpp ObjectStoreTests.cpp SessionObjectTests.cpp \
+ SessionObjectStoreTests.cpp $(am__append_1)
+ objstoretest_LDADD = ../../libsofthsm_convarch.la
+-objstoretest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++objstoretest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/session_mgr/test/Makefile.am
++++ b/src/lib/session_mgr/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ -I$(srcdir)/../../object_store \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = sessionmgrtest
+
+@@ -18,7 +18,7 @@
+
+ sessionmgrtest_LDADD = ../../libsofthsm_convarch.la
+
+-sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+
+ TESTS = sessionmgrtest
+
+--- a/src/lib/session_mgr/test/Makefile.in
++++ b/src/lib/session_mgr/test/Makefile.in
+@@ -537,13 +537,13 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../slot_mgr \
+ -I$(srcdir)/../../object_store \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ sessionmgrtest_SOURCES = sessionmgrtest.cpp \
+ SessionManagerTests.cpp
+
+ sessionmgrtest_LDADD = ../../libsofthsm_convarch.la
+-sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/slot_mgr/test/Makefile.am
++++ b/src/lib/slot_mgr/test/Makefile.am
+@@ -9,7 +9,7 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../data_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = slotmgrtest
+
+@@ -18,7 +18,7 @@
+
+ slotmgrtest_LDADD = ../../libsofthsm_convarch.la
+
+-slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+
+ TESTS = slotmgrtest
+
+--- a/src/lib/slot_mgr/test/Makefile.in
++++ b/src/lib/slot_mgr/test/Makefile.in
+@@ -536,13 +536,13 @@
+ -I$(srcdir)/../../session_mgr \
+ -I$(srcdir)/../../data_mgr \
+ @CRYPTO_INCLUDES@ \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ slotmgrtest_SOURCES = slotmgrtest.cpp \
+ SlotManagerTests.cpp
+
+ slotmgrtest_LDADD = ../../libsofthsm_convarch.la
+-slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
++slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread
+ EXTRA_DIST = $(srcdir)/*.h
+ all: all-am
+
+--- a/src/lib/test/Makefile.am
++++ b/src/lib/test/Makefile.am
+@@ -3,7 +3,7 @@
+ AM_CPPFLAGS = -I$(srcdir)/.. \
+ -I$(srcdir)/../cryptoki_compat \
+ -I$(srcdir)/../common \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ check_PROGRAMS = p11test
+
+@@ -29,7 +29,7 @@
+
+ p11test_LDADD = ../libsofthsm2.la
+
+-p11test_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread -static
++p11test_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread -static
+
+ TESTS = p11test
+
+--- a/src/lib/test/Makefile.in
++++ b/src/lib/test/Makefile.in
+@@ -539,7 +539,7 @@
+ AM_CPPFLAGS = -I$(srcdir)/.. \
+ -I$(srcdir)/../cryptoki_compat \
+ -I$(srcdir)/../common \
+- `cppunit-config --cflags`
++ `pkg-config --cflags cppunit`
+
+ AUTOMAKE_OPTIONS = subdir-objects
+ p11test_SOURCES = p11test.cpp \
+@@ -561,7 +561,7 @@
+ ../common/osmutex.cpp
+
+ p11test_LDADD = ../libsofthsm2.la
+-p11test_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread -static
++p11test_LDFLAGS = @CRYPTO_LIBS@ -no-install `pkg-config --libs cppunit` -pthread -static
+ EXTRA_DIST = $(srcdir)/*.h \
+ $(srcdir)/softhsm2-alt.conf.win32 \
+ $(srcdir)/softhsm2.conf.win32 \
diff -Nru softhsm2-2.2.0/debian/patches/series softhsm2-2.2.0/debian/patches/series
--- softhsm2-2.2.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ softhsm2-2.2.0/debian/patches/series 2017-10-22 13:39:17.000000000 +0200
@@ -0,0 +1 @@
+cppunit-pkg-config.diff
signature.asc
Description: PGP signature
