Stuart Henderson <[email protected]> writes:
[...]
> 2. The i386 problems are a bit concerning, it seems quite unlikely that
> they will only affect i386.
I'll take a look at them this evening, had to update my i386 box.
> softhsm is probably easier to test so let's look at that first. I'm
> fairly busy at the moment but I'll put it on my list to look at...
Here's a diff against Patrick's tarball, and a new tarball attached.
- don't hardcode the botan libs but use botan-config
- no need for libsofthsm.{a,la}, ltdl is not used
I think it's ready to import.
diff -pruN softhsm.orig/Makefile softhsm/Makefile
--- softhsm.orig/Makefile Mon Jun 22 12:38:53 2015
+++ softhsm/Makefile Mon Jun 22 13:13:45 2015
@@ -25,9 +25,11 @@ FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/so
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --with-botan="${LOCALBASE}"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/softhsm
cd ${WRKSRC}; ${INSTALL_DATA} LICENSE ${PREFIX}/share/doc/softhsm
+ rm ${PREFIX}/lib/softhsm/libsofthsm.*a
.include <bsd.port.mk>
diff -pruN softhsm.orig/patches/patch-configure softhsm/patches/patch-configure
--- softhsm.orig/patches/patch-configure Mon Jun 22 12:38:53 2015
+++ softhsm/patches/patch-configure Mon Jun 22 13:16:51 2015
@@ -1,12 +1,14 @@
$OpenBSD$
---- configure.orig Sat Apr 26 21:59:55 2014
-+++ configure Sat Apr 26 22:00:31 2014
-@@ -4352,7 +4352,7 @@ fi
+--- configure.orig Wed May 28 08:03:56 2014
++++ configure Mon Jun 22 13:16:45 2015
+@@ -4351,8 +4351,8 @@ else
+ fi
- BOTAN_INCLUDES="-I$BOTAN_PATH/include/botan-1.10"
+- BOTAN_INCLUDES="-I$BOTAN_PATH/include/botan-1.10"
- BOTAN_LIBS="-L$BOTAN_PATH/lib -lbotan-1.10"
-+ BOTAN_LIBS="-L$BOTAN_PATH/lib -lbotan-1.10 -lbz2 -lcrypto -lgmp
-lpthread -lz"
++ BOTAN_INCLUDES=`botan-config-1.10 --cflags`
++ BOTAN_LIBS=`botan-config-1.10 --libs`
tmp_CPPFLAGS=$CPPFLAGS
tmp_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $BOTAN_INCLUDES"
diff -pruN softhsm.orig/pkg/PLIST softhsm/pkg/PLIST
--- softhsm.orig/pkg/PLIST Mon Jun 22 12:38:53 2015
+++ softhsm/pkg/PLIST Mon Jun 22 12:55:46 2015
@@ -2,8 +2,6 @@
@bin bin/softhsm
@bin bin/softhsm-keyconv
lib/softhsm/
-lib/softhsm/libsofthsm.a
-lib/softhsm/libsofthsm.la
lib/softhsm/libsofthsm.so
@man man/man1/softhsm-keyconv.1
@man man/man1/softhsm.1
softhsm.tgz
Description: Binary data
-- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
