Attachment 165208 Details for Bug 206002 – update to 0.3.3

[patch] update to 0.3.3

libp11.diff (text/plain), 3.47 KB, created by Christoph Moench-Tegeder on 2016-01-07 11:37:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2016-01-07 11:37:55 UTC

Size: 3.47 KB

patch

obsolete

>Index: security/libp11/Makefile
>===================================================================
>--- security/libp11/Makefile	(revision 405302)
>+++ security/libp11/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	libp11
>-PORTVERSION=	0.2.8
>-PORTREVISION=	2
>+PORTVERSION=	0.3.0
> CATEGORIES=	security devel
>-MASTER_SITES=	SF/opensc/${PORTNAME}
>+MASTER_SITES=	https://github.com/OpenSC/${PORTNAME}/archive/
> 
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	Small layer on top of PKCS\#11 API
>@@ -18,26 +17,25 @@
> 
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>-USES=		libtool pkgconfig
>+USES=		autoreconf libtool pkgconfig
> USE_LDCONFIG=	yes
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
> 
> CONFIGURE_ENV=	LTLIB_CFLAGS="-I${LOCALBASE}/include" \
> 		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
> 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
> 
> PORTDOCS=	*
> 
>-DOCS_CONFIGURE_ON=	--enable-doc
>-
>-post-patch:
>-	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/configure
>+post-configure:
> 	@${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
>-		${WRKSRC}/doc/Makefile.in
>+		${WRKSRC}/doc/Makefile
> 
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${INSTALL_DATA}	${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA}	${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA}	${WRKSRC}/examples/Makefile ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA}	${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: security/libp11/distinfo
>===================================================================
>--- security/libp11/distinfo	(revision 405302)
>+++ security/libp11/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libp11-0.2.8.tar.gz) = a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691
>-SIZE (libp11-0.2.8.tar.gz) = 377508
>+SHA256 (libp11-0.3.0.tar.gz) = 83184d9e8e74402398e1a269fb79b68dc3615c86839eaf053a95438941a63b5d
>+SIZE (libp11-0.3.0.tar.gz) = 78674
>Index: security/libp11/files/patch-configure.ac
>===================================================================
>--- security/libp11/files/patch-configure.ac	(nonexistent)
>+++ security/libp11/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,30 @@
>+diff --git configure.ac configure.ac
>+index b437122..6491280 100644
>+--- configure.ac
>++++ configure.ac
>+@@ -133,11 +133,11 @@ AC_CHECK_PROGS([DOXYGEN],[doxygen])
>+ test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
>+ 
>+ if test "${WIN32}" != "yes"; then
>+-	AC_CHECK_LIB(
>+-		[dl],
>++	AC_SEARCH_LIBS(
>+ 		[dlopen],
>++		[dl],
>+ 		,
>+-		[AC_MSG_ERROR([libdl required])]
>++		[AC_MSG_ERROR([dlopen required])]
>+ 	)
>+ 	AC_CHECK_FUNCS([__register_atfork],,)
>+ fi
>+--- configure.ac.orig	2016-01-07 10:55:33.987034000 +0100
>++++ configure.ac	2016-01-07 10:55:53.925242000 +0100
>+@@ -159,7 +159,7 @@
>+ 	)]
>+ )
>+ 
>+-pkgconfigdir="\$(libdir)/pkgconfig"
>++pkgconfigdir="\$(prefix)/libdata/pkgconfig"
>+ 
>+ AC_SUBST([pkgconfigdir])
>+ AC_SUBST([apidocdir])
>Index: security/libp11/pkg-plist
>===================================================================
>--- security/libp11/pkg-plist	(revision 405302)
>+++ security/libp11/pkg-plist	(working copy)
>@@ -9,3 +9,4 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/decrypt.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/getrandom.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rawrsasign.c

Actions: View | Diff

Attachments on bug 206002: 165208 | 165209