Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
security/softhsm/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.23 2014/02/28 09:32:53 pettai Exp $
# $NetBSD: Makefile,v 1.27 2014/11/18 13:40:56 he Exp $
#
DISTNAME= softhsm-1.3.6
DISTNAME= softhsm-1.3.7
PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.opendnssec.org/files/source/

4
security/softhsm/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.7 2013/10/19 09:06:56 adam Exp $
# $NetBSD: buildlink3.mk,v 1.9 2014/10/07 16:47:14 adam Exp $
BUILDLINK_TREE+= softhsm
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= softhsm
SOFTHSM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.softhsm+= softhsm>=1.1.3
BUILDLINK_ABI_DEPENDS.softhsm+= softhsm>=1.3.5nb1
BUILDLINK_ABI_DEPENDS.softhsm+= softhsm>=1.3.7nb1
BUILDLINK_PKGSRCDIR.softhsm?= ../../security/softhsm
.include "../../databases/sqlite3/buildlink3.mk"

11
security/softhsm/distinfo
View File

@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.11 2014/02/28 09:32:53 pettai Exp $
$NetBSD: distinfo,v 1.13 2014/11/18 13:40:56 he Exp $
SHA1 (softhsm-1.3.6.tar.gz) = 442f94d681006b16b8d2630d2e58849cb804463d
RMD160 (softhsm-1.3.6.tar.gz) = becff64e6b2725b8fcf6138594e9df8a833f5ee7
Size (softhsm-1.3.6.tar.gz) = 435893 bytes
SHA1 (patch-aa) = 480865e0a50759d582380573c0254bcdb517ddfe
SHA1 (softhsm-1.3.7.tar.gz) = e8bf4269472f9e63d1dfeda238b1d542d6c036f2
RMD160 (softhsm-1.3.7.tar.gz) = bb11177520ca2fd62200a9b23d66c1b32eeb5104
Size (softhsm-1.3.7.tar.gz) = 438437 bytes
SHA1 (patch-Makefile.in) = ab9a9db898e4c1600bf9d5b28b27759e33c204b3
SHA1 (patch-src_bin_softhsm-keyconv.cpp) = 07f7ebe070047cfbbee461595effe2c7de9caef6

4
security/softhsm/patches/patch-aa → security/softhsm/patches/patch-Makefile.in
View File

@@ -1,4 +1,6 @@
$NetBSD: patch-aa,v 1.3 2012/05/23 10:05:44 pettai Exp $
$NetBSD: patch-Makefile.in,v 1.1 2014/11/18 13:40:57 he Exp $
Tweak install-data-hook target.
--- Makefile.in.orig 2012-05-09 18:41:49.000000000 +0000
+++ Makefile.in

35
security/softhsm/patches/patch-src_bin_softhsm-keyconv.cpp Normal file
View File

@@ -0,0 +1,35 @@
$NetBSD: patch-src_bin_softhsm-keyconv.cpp,v 1.1 2014/11/18 13:40:57 he Exp $
Adapt fix for SA59651, similar to CVE-2014-3209, from
https://github.com/bellgrim/SoftHSMv2/commit/492447cd4a2be449e99fb9ad2519ea3277aaad28
Ensure created pkcs8 file is not group- or world-readable.
--- src/bin/softhsm-keyconv.cpp.orig 2014-05-28 05:59:14.000000000 +0000
+++ src/bin/softhsm-keyconv.cpp
@@ -48,6 +48,10 @@
#include <iostream>
#include <fstream>
#include <stdint.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
void usage() {
printf("Converting between BIND .private-key format and PKCS#8 key file format.\n");
@@ -391,6 +395,15 @@ int to_pkcs8(char *in_path, char *out_pa
return 1;
}
+ // Create and set file permissions if the file does not exist.
+ int fd = open(out_path, O_CREAT, S_IRUSR | S_IWUSR);
+ if (fd == -1) {
+ fprintf(stderr, "ERROR: Could not open the output file: %s (errno %i)\n",
+ out_path, errno);
+ return 1;
+ }
+ ::close(fd);
+
// Save the the key to the disk
switch(algorithm) {
case DNS_KEYALG_ERROR: