cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

take maintainership, ok Patrik Lundin (MAINTAINER)

Browse Source 
add patch from pascal@ to fix softhsm on aarch64
This commit is contained in:
pvk 2019-03-16 20:08:00 +00:00
parent 3e9567b10a
commit b9b9523172
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/softhsm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:10 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/03/16 20:08:00 pvk Exp $
PORTROACH= limit:^1\.
PORTROACH_COMMENT= the 2.x version has a different user interface
@ -6,13 +6,13 @@ PORTROACH_COMMENT= the 2.x version has a different user interface
COMMENT= software PKCS\#11 cryptographic token
DISTNAME= softhsm-1.3.8
REVISION= 1
REVISION= 2
CATEGORIES= security
HOMEPAGE= http://www.opendnssec.org/softhsm/
MAINTAINER= Patrik Lundin <patrik@sigterm.se>
MAINTAINER= Pavel Korovin <pvk@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes

20
security/softhsm/patches/patch-checks_Makefile_in
View File

@ -1,12 +1,24 @@
$OpenBSD: patch-checks_Makefile_in,v 1.1 2017/03/14 23:40:35 bluhm Exp $
--- checks/Makefile.in.orig Mon Nov 14 10:37:59 2016
+++ checks/Makefile.in Mon Mar 13 01:56:07 2017
$OpenBSD: patch-checks_Makefile_in,v 1.2 2019/03/16 20:08:00 pvk Exp $
Index: checks/Makefile.in
--- checks/Makefile.in.orig
+++ checks/Makefile.in
@@ -115,8 +115,8 @@ AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-checks_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+checks_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) \
$(checks_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -317,7 +317,7 @@ AM_CPPFLAGS = -I$(srcdir)/../src/lib/cryptoki_compat \
EXTRA_DIST = $(srcdir)/*.h \
$(srcdir)/softhsm.conf
-checks_LDADD = ../src/lib/libsofthsm.la -lstdc++
+checks_LDADD = ../src/lib/libsofthsm.la -lstdc++ -lbz2 -lgmp
+checks_LDADD = ../src/lib/libsofthsm.la -lbz2 -lgmp
checks_LDFLAGS = -no-install -static -shared-libgcc
all: all-am

14
security/softhsm/patches/patch-src_bin_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_bin_Makefile_in,v 1.1 2019/03/16 20:08:00 pvk Exp $
Index: src/bin/Makefile.in
--- src/bin/Makefile.in.orig
+++ src/bin/Makefile.in
@@ -372,7 +372,7 @@ softhsm_LDADD = @BOTAN_LIBS@ @SQLITE3_LIBS@ @YIELD_LIB
softhsm_keyconv_SOURCES = softhsm-keyconv.cpp softhsm-keyconv.h \
base64.c
-softhsm_keyconv_LDADD = @BOTAN_LIBS@ -lstdc++
+softhsm_keyconv_LDADD = @BOTAN_LIBS@
EXTRA_DIST = $(srcdir)/softhsm.1.in
all: all-am