Skip to content

Commit

Permalink
Update to 0.2.8.
Browse files Browse the repository at this point in the history
Packaging changes:
 - adapt to non-standardly-named github WRKSRC
 - bootstrap automake (this is a git snapshot, not "make distribution"
   output)

Upstream changes:

New in 0.2.8; 2011-04-15; Martin Paljak
* Bumped soname for PKCS11_token struct size changes (Martin Paljak).
* Display the number of available slots (Ludovic Rousseau).
* Add openssl libcrypto to pkg-config private libs list (Kalev Lember).
* Fix building examples with --no-add-needed which is the default in Fedora
  (Kalev Lember).
* Expose more token flags in PKCS11_token structure (Kalev Lember).
* Check that private data is not NULL in pkcs11_release_slot (Robin Bryce,
  ticket #137).

New in 0.2.7; 2009-10-20; Andreas Jellinghaus
* If CKR_CRYPTOKI_ALREADY_INITIALIZED is returned from C_Initialize(): ignore.
  (Needed for unloaded/reloaded engines e.g. in wpa_supplicant.) By David Smith.
  • Loading branch information
gdt committed Apr 2, 2014
1 parent 6909e8f commit 92a4bc0
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 28 deletions.
21 changes: 13 additions & 8 deletions security/libp11/Makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
# $NetBSD: Makefile,v 1.9 2014/02/12 23:18:33 tron Exp $
# $NetBSD: Makefile,v 1.10 2014/04/02 20:14:19 gdt Exp $
#

DISTNAME= libp11-0.2.6
PKGREVISION= 4
VERSION= 0.2.8
DISTNAME= libp11-${VERSION}
CATEGORIES= security
MASTER_SITES= http://www.opensc-project.org/files/libp11/
MASTER_SITES= https://github.com/OpenSC/libp11/archive/

MAINTAINER= [email protected]
HOMEPAGE= http://www.opensc-project.org/libp11/
HOMEPAGE= https://github.com/OpenSC/libp11/wiki
COMMENT= Convenience library for easy PKCS\#11 implementation
LICENSE= gnu-lgpl-v2.1

WRKSRC= ${WRKDIR}/libp11-libp11-${VERSION}

BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7

USE_PKGLOCALEDIR= yes
USE_TOOLS+= autoconf automake gmake pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libp11.pc.in
GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config

pre-configure:
cd ${WRKSRC} && ./bootstrap

.include "../../devel/libltdl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
Expand Down
10 changes: 5 additions & 5 deletions security/libp11/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.2 2009/08/03 18:43:00 hasso Exp $
$NetBSD: distinfo,v 1.3 2014/04/02 20:14:19 gdt Exp $

SHA1 (libp11-0.2.6.tar.gz) = 87a7e59c1d7a93f3e1ee863ad462487c4479ae27
RMD160 (libp11-0.2.6.tar.gz) = 0f568e22d9a5813e4fcea22fc927c3cb4b3eb93a
Size (libp11-0.2.6.tar.gz) = 376101 bytes
SHA1 (patch-aa) = 97e85e23d74f7fdc7db67bc8f40844679846e96c
SHA1 (libp11-0.2.8.tar.gz) = e20a3eb67b7effc26339f1decbca85dee3d98586
RMD160 (libp11-0.2.8.tar.gz) = 8f54c66f929fff1bc4ec548f95e7798f9992a272
Size (libp11-0.2.8.tar.gz) = 69955 bytes
SHA1 (patch-Makefile.am) = 5020d2b5f345f603be775b7d5bf3edb75b5a2549
22 changes: 22 additions & 0 deletions security/libp11/patches/patch-Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
$NetBSD: patch-Makefile.am,v 1.1 2014/04/02 20:14:19 gdt Exp $

Don't install NEWS, as usually it is not.
Don't install a README about a wiki copy that isn't there.

These changes have not yet been submitted upstream.

--- Makefile.am.orig 2011-04-15 11:52:31.000000000 +0000
+++ Makefile.am
@@ -16,9 +16,10 @@ EXTRA_DIST = svnignore Makefile.mak winc

dist_noinst_DATA = COPYING bootstrap \
$(srcdir)/examples/Makefile $(srcdir)/examples/*.c $(srcdir)/examples/README
-dist_doc_DATA = NEWS
+#dist_doc_DATA = NEWS

-SUBDIRS = src doc
+SUBDIRS = src
+# doc

# Allow detection of packaged tarball
dist-hook:
15 changes: 0 additions & 15 deletions security/libp11/patches/patch-aa

This file was deleted.

0 comments on commit 92a4bc0

Please sign in to comment.