Hello community, here is the log from the commit of package softhsm for openSUSE:Factory checked in at 2017-05-08 19:04:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/softhsm (Old) and /work/SRC/openSUSE:Factory/.softhsm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "softhsm" Mon May 8 19:04:05 2017 rev:3 rq:493357 version:2.0.0b1 Changes: -------- --- /work/SRC/openSUSE:Factory/softhsm/softhsm.changes 2015-10-14 16:44:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.softhsm.new/softhsm.changes 2017-05-08 19:04:37.458495614 +0200 @@ -1,0 +2,6 @@ +Sun May 7 17:08:43 UTC 2017 - [email protected] + +- softhsm-newcppunit.patch: new cppunit uses pkg-config now, not + cppunit-config + +------------------------------------------------------------------- New: ---- softhsm-newcppunit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ softhsm.spec ++++++ --- /var/tmp/diff_new_pack.q7eXV2/_old 2017-05-08 19:04:39.050270748 +0200 +++ /var/tmp/diff_new_pack.q7eXV2/_new 2017-05-08 19:04:39.054270183 +0200 @@ -1,7 +1,7 @@ # # spec file for package softhsm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ Patch1: softhsm-v2.0.0b1-aes-key-wrap.patch Patch2: softhsm-v2.0.0b1-ckm-rsa-pkcs-oaep-key-wrap.patch Patch3: softhsm-rsakeys.patch +Patch4: softhsm-newcppunit.patch BuildRequires: automake BuildRequires: cppunit-devel @@ -68,6 +69,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # remove softhsm/ subdir auto-added to --libdir sed -i "s:full_libdir/softhsm:full_libdir:g" configure ++++++ softhsm-newcppunit.patch ++++++ Index: softhsm-2.0.0b1/src/lib/crypto/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/crypto/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/crypto/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -I$(srcdir)/../../object_store \ -I$(srcdir)/../../session_mgr \ -I$(srcdir)/../../slot_mgr \ - `cppunit-config --cflags` + `pkg-config --cflags cppunit` check_PROGRAMS = cryptotest @@ -31,7 +31,7 @@ cryptotest_SOURCES = cryptotest.cpp \ 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 Index: softhsm-2.0.0b1/src/lib/data_mgr/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/data_mgr/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/data_mgr/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -I$(srcdir)/../../object_store \ -I$(srcdir)/../../session_mgr \ -I$(srcdir)/../../slot_mgr \ - `cppunit-config --cflags` + `pkg-config --cflags cppunit` check_PROGRAMS = datamgrtest @@ -19,7 +19,7 @@ datamgrtest_SOURCES = datamgrtest.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` TESTS = datamgrtest Index: softhsm-2.0.0b1/src/lib/handle_mgr/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/handle_mgr/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/handle_mgr/test/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -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_SOURCES = handlemgrtest.c 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 Index: softhsm-2.0.0b1/src/lib/object_store/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/object_store/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/object_store/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -I$(srcdir)/../../data_mgr \ -I$(srcdir)/../../session_mgr \ -I$(srcdir)/../../slot_mgr \ - `cppunit-config --cflags` + `pkg-config --cflags cppunit` check_PROGRAMS = objstoretest @@ -31,7 +31,7 @@ endif 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 Index: softhsm-2.0.0b1/src/lib/session_mgr/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/session_mgr/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/session_mgr/test/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -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_SOURCES = sessionmgrtest. 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 Index: softhsm-2.0.0b1/src/lib/slot_mgr/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/slot_mgr/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/slot_mgr/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \ -I$(srcdir)/../../object_store \ -I$(srcdir)/../../session_mgr \ -I$(srcdir)/../../data_mgr \ - `cppunit-config --cflags` + `pkg-config --cflags cppunit` check_PROGRAMS = slotmgrtest @@ -17,7 +17,7 @@ slotmgrtest_SOURCES = slotmgrtest.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 TESTS = slotmgrtest Index: softhsm-2.0.0b1/src/lib/test/Makefile.am =================================================================== --- softhsm-2.0.0b1.orig/src/lib/test/Makefile.am +++ softhsm-2.0.0b1/src/lib/test/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makef AM_CPPFLAGS = -I$(srcdir)/.. \ -I$(srcdir)/../cryptoki_compat \ -I$(srcdir)/../common \ - `cppunit-config --cflags` + `pkg-config --cflags cppunit` check_PROGRAMS = p11test @@ -24,7 +24,7 @@ p11test_SOURCES = p11test.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 TESTS = p11test
