Attachment 184371 Details for Bug 220744 – patch to upgrade

[patch] patch to upgrade

softhsm2-upgrade.patch (text/plain), 3.28 KB, created by Jaap Akkerhuis on 2017-07-15 11:28:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaap Akkerhuis

Created: 2017-07-15 11:28:14 UTC

Size: 3.28 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 445863)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	softhsm
>-PORTVERSION=	2.2.0
>-PORTREVISION=	1
>+PORTVERSION=	2.3.0
> CATEGORIES=	security
> MASTER_SITES=	http://dist.opendnssec.org/source/ \
> 		http://dist.opendnssec.org/source/testing/
>@@ -14,17 +13,19 @@
> 
> LICENSE=	BSD2CLAUSE
> 
>-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
>-
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
>+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
> INSTALL_TARGET=	install-strip
>-USES=		libtool sqlite
>+USES=		libtool
> 
> CONFLICTS=	softhsm-1.*
> 
> USE_LDCONFIG=	yes
> 
>+OPTIONS_DEFINE=		SQLITE
>+OPTIONS_SUB=		yes
>+SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
>+
> OPTIONS_SINGLE=		CRYP
> OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
> 
>@@ -31,11 +32,15 @@
> CRYP_OPEN_DESC=		Build with OpenSSL crypto library
> CRYP_BOTAN_DESC=	Build with Botan crypto library
> 
>+
> OPTIONS_DEFAULT=	CRYP_OPEN
> 
>+SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
>+SQLITE_USES=		sqlite
>+
> CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
> CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
>-CRYP_OPEN_USES=		ssl
>+
> CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
> 
> .include <bsd.port.options.mk>
>@@ -44,4 +49,8 @@
> CONFIGURE_ARGS+=	--disable-gost
> .endif
> 
>+.if ${SSL_DEFAULT:Mopenssl-devel}
>+CONFIGURE_ARGS+=	--disable-gost
>+.endif
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 445863)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1480976612
>-SHA256 (softhsm-2.2.0.tar.gz) = eb6928ae08da44fca4135d84d6b79ad7345f408193208c54bf69f5b2e71f85f7
>-SIZE (softhsm-2.2.0.tar.gz) = 966806
>+TIMESTAMP = 1499110463
>+SHA256 (softhsm-2.3.0.tar.gz) = 5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127
>+SIZE (softhsm-2.3.0.tar.gz) = 992417
>Index: files/patch-src_lib_object__store_DB.h
>===================================================================
>--- files/patch-src_lib_object__store_DB.h	(nonexistent)
>+++ files/patch-src_lib_object__store_DB.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/lib/object_store/DB.h.orig	2017-07-13 14:38:02 UTC
>++++ src/lib/object_store/DB.h
>+@@ -37,6 +37,7 @@
>+ 
>+ #include <string>
>+ #include <sqlite3.h>
>++#include <time.h>
>+ 
>+ namespace DB {
>+ 
>
>Property changes on: files/patch-src_lib_object__store_DB.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 445863)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,5 @@
> bin/softhsm2-dump-file
>+%%SQLITE%%bin/softhsm2-dump-db
> bin/softhsm2-keyconv
> bin/softhsm2-util
> @sample %%ETCDIR%%2.conf.sample
>@@ -5,6 +6,7 @@
> lib/softhsm/libsofthsm2.a
> lib/softhsm/libsofthsm2.so
> man/man1/softhsm2-dump-file.1.gz
>+%%SQLITE%%man/man1/softhsm2-dump-db.1.gz
> man/man1/softhsm2-keyconv.1.gz
> man/man1/softhsm2-util.1.gz
> man/man5/softhsm2.conf.5.gz

Flags:

jaap: maintainer-approval+

Actions: View | Diff

Attachments on bug 220744: 184371