Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4d33f4ce7aced0a8cb0e264f4c25baef5f404de5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4d33f4ce7aced0a8cb0e264f4c25baef5f404de5)
  • Date: Thu, 6 Aug 2020 09:33:25 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/engine_pkcs11/BUILD | 1
crypto/engine_pkcs11/CONFLICTS | 1
crypto/engine_pkcs11/DEPENDS | 4 -
crypto/engine_pkcs11/DETAILS | 23 ++--------
crypto/engine_pkcs11/DOWNLOAD | 1
crypto/engine_pkcs11/HISTORY | 24 +---------
crypto/engine_pkcs11/INSTALL | 1
crypto/engine_pkcs11/PRE_BUILD | 1
crypto/engine_pkcs11/UP_TRIGGERS | 1
crypto/libp11/DETAILS | 4 -
crypto/libp11/HISTORY | 4 +
crypto/libp11/PRE_BUILD | 3 -
crypto/libp11/patches/libressl-2.7-fix.patch | 62
---------------------------
crypto/libp11/patches/libressl.patch | 22 ---------
crypto/p11-kit/BUILD | 2
crypto/p11-kit/CONFIGURE | 1
crypto/p11-kit/DEPENDS | 16 +++---
crypto/p11-kit/DETAILS | 11 ++--
crypto/p11-kit/HISTORY | 8 +++
crypto/p11-kit/p11.gpg |binary
crypto/pcsc-lite/DETAILS | 2
crypto/pcsc-lite/HISTORY | 3 +
dev/null |binary
23 files changed, 47 insertions(+), 148 deletions(-)

New commits:
commit 4d33f4ce7aced0a8cb0e264f4c25baef5f404de5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcsc-lite: => 1.9.0

commit 0e66dfd8099032bb8c5c2bde0358736156f16044
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

p11-kit: => 0.23.20

commit e471109a1393d97a17850f15e580da3cd5f14280
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate crypto/engine_pkcs11 [replaced by libp11]

commit f7799bdc07118f7308b1e5fc2fe75f7d333f88a9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libp11: => 0.4.10

diff --git a/crypto/engine_pkcs11/BUILD b/crypto/engine_pkcs11/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/engine_pkcs11/BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/engine_pkcs11/CONFLICTS b/crypto/engine_pkcs11/CONFLICTS
new file mode 100755
index 0000000..fc3bb53
--- /dev/null
+++ b/crypto/engine_pkcs11/CONFLICTS
@@ -0,0 +1 @@
+conflicts engine_pkcs11 y
diff --git a/crypto/engine_pkcs11/DEPENDS b/crypto/engine_pkcs11/DEPENDS
deleted file mode 100755
index 5e5feb0..0000000
--- a/crypto/engine_pkcs11/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends SSL &&
-depends libp11 &&
-depends libtool &&
-depends pkgconfig
diff --git a/crypto/engine_pkcs11/DETAILS b/crypto/engine_pkcs11/DETAILS
index 3cc5e44..167e5c5 100755
--- a/crypto/engine_pkcs11/DETAILS
+++ b/crypto/engine_pkcs11/DETAILS
@@ -1,21 +1,8 @@
SPELL=engine_pkcs11
- VERSION=0.2.2
-
SOURCE_HASH=sha512:877eab21e9e31853e504e4a222e18f13a8020de724338a8af4adfc840ec55c610b35dbe455b4b59a170ff9b829610ec9bc404b10d873d17b0246c59b178ebe44
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=https://github.com/OpenSC/engine_pkcs11/releases/download/engine_pkcs11-$VERSION/$SOURCE
- WEB_SITE=https://www.opensc-project.org/$SPELL
- LICENSE[0]=BSD
- ENTERED=20090904
- KEYWORDS="crypto"
- SHORT="an implementation of an engine for OpenSS"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-Engine_pkcs11 is an implementation of an engine for OpenSSL. It can be loaded
-using code, config file or
-command line and will pass any function call by openssl to a PKCS#11
-module. Engine_pkcs11 is meant to be used
-with smart cards and software for using smart cards in PKCS#11 format,
-such as OpenSC. Originaly this engine
-was a part of OpenSC, until OpenSC was split into several small projects
-for improved flexibility.
+deprecated spell [replaced by libp11]
EOF
+
diff --git a/crypto/engine_pkcs11/DOWNLOAD b/crypto/engine_pkcs11/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/engine_pkcs11/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/crypto/engine_pkcs11/HISTORY b/crypto/engine_pkcs11/HISTORY
index a4ef199..ef5b890 100644
--- a/crypto/engine_pkcs11/HISTORY
+++ b/crypto/engine_pkcs11/HISTORY
@@ -1,20 +1,4 @@
-2017-07-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.2.2
- now at github
-
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
-
-2011-10-14 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: fixed long description wrap (scripted)
-
-2010-01-07 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.1.8
-
-2009-10-20 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.1.7
-
-2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.1.6
- spell created
-
+2020-08-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by libp11]
diff --git a/crypto/engine_pkcs11/INSTALL b/crypto/engine_pkcs11/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/engine_pkcs11/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/crypto/engine_pkcs11/PRE_BUILD b/crypto/engine_pkcs11/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/crypto/engine_pkcs11/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/engine_pkcs11/UP_TRIGGERS
b/crypto/engine_pkcs11/UP_TRIGGERS
new file mode 100755
index 0000000..6326b8a
--- /dev/null
+++ b/crypto/engine_pkcs11/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger libp11 cast_self
diff --git a/crypto/libp11/DETAILS b/crypto/libp11/DETAILS
index 0911bf5..b1a660e 100755
--- a/crypto/libp11/DETAILS
+++ b/crypto/libp11/DETAILS
@@ -1,6 +1,6 @@
SPELL=libp11
- VERSION=0.4.9
-
SOURCE_HASH=sha512:0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
+ VERSION=0.4.10
+
SOURCE_HASH=sha512:7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/OpenSC/libp11/releases/download/libp11-$VERSION/$SOURCE
diff --git a/crypto/libp11/HISTORY b/crypto/libp11/HISTORY
index a1162ed..59bbbb4 100644
--- a/crypto/libp11/HISTORY
+++ b/crypto/libp11/HISTORY
@@ -1,3 +1,7 @@
+2020-08-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.10
+ * patches PRE_BUILD: deleted
+
2018-11-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.9

diff --git a/crypto/libp11/PRE_BUILD b/crypto/libp11/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/crypto/libp11/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git a/crypto/libp11/patches/libressl-2.7-fix.patch
b/crypto/libp11/patches/libressl-2.7-fix.patch
deleted file mode 100644
index f935a9d..0000000
--- a/crypto/libp11/patches/libressl-2.7-fix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 41b30e7b49d91d31ab396c1cd163e92f72b25ae5 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sun, 6 May 2018 09:32:23 +0200
-Subject: [PATCH] libressl-2.7 fix
-
----
- src/p11_rsa.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/p11_rsa.c b/src/p11_rsa.c
-index 97cd5a2..e94fcd9 100644
---- a/src/p11_rsa.c
-+++ b/src/p11_rsa.c
-@@ -403,7 +403,7 @@ static void free_rsa_ex_index()
- #endif
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10100005L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100005L
-
- static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
- {
-@@ -418,7 +418,7 @@ static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
- }
- return ret;
- }
--
-+#if defined(LIBRESSL_VERSION_NUMBER)
- static int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)
- {
- char *tmp = OPENSSL_strdup(name);
-@@ -434,6 +434,7 @@ static int RSA_meth_set_flags(RSA_METHOD *meth, int
flags)
- meth->flags = flags;
- return 1;
- }
-+#else
-
- static int RSA_meth_set_priv_enc(RSA_METHOD *meth,
- int (*priv_enc) (int flen, const unsigned char *from,
-@@ -456,6 +457,7 @@ static int RSA_meth_set_finish(RSA_METHOD *meth, int
(*finish)(RSA *rsa))
- meth->finish = finish;
- return 1;
- }
-+#endif //libressl
-
- #endif
-
-@@ -471,8 +473,11 @@ RSA_METHOD *PKCS11_get_rsa_method(void)
- ops = RSA_meth_dup(RSA_get_default_method());
- if (ops == NULL)
- return NULL;
-+
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- RSA_meth_set1_name(ops, "libp11 RSA method");
- RSA_meth_set_flags(ops, 0);
-+#endif
- RSA_meth_set_priv_enc(ops, pkcs11_rsa_priv_enc_method);
- RSA_meth_set_priv_dec(ops, pkcs11_rsa_priv_dec_method);
- RSA_meth_set_finish(ops, pkcs11_rsa_free_method);
---
-2.17.0
-
diff --git a/crypto/libp11/patches/libressl.patch
b/crypto/libp11/patches/libressl.patch
deleted file mode 100644
index ebff65b..0000000
--- a/crypto/libp11/patches/libressl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/p11_front.c.orig 2017-08-05 14:17:47.255547585 +0200
-+++ a/src/p11_front.c 2017-08-05 14:19:15.503800488 +0200
-@@ -380,7 +380,7 @@
-
- void ERR_load_PKCS11_strings(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
- OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
- #endif
- ERR_load_P11_strings();
---- a/src/eng_front.c.orig 2017-08-05 14:23:48.944584133 +0200
-+++ 1/src/eng_front.c 2017-08-05 14:25:59.552960821 +0200
-@@ -226,7 +226,7 @@
- #ifndef OPENSSL_NO_RSA
- !ENGINE_set_RSA(e, PKCS11_get_rsa_method()) ||
- #endif
--#if OPENSSL_VERSION_NUMBER >= 0x10100002L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100002L &&
!defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_EC
- /* PKCS11_get_ec_key_method combines ECDSA and ECDH */
- !ENGINE_set_EC(e, PKCS11_get_ec_key_method()) ||
diff --git a/crypto/p11-kit/BUILD b/crypto/p11-kit/BUILD
deleted file mode 100755
index 9311fb8..0000000
--- a/crypto/p11-kit/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="$OPTS --without-trust-paths" &&
-default_build
diff --git a/crypto/p11-kit/CONFIGURE b/crypto/p11-kit/CONFIGURE
new file mode 100755
index 0000000..d0bac55
--- /dev/null
+++ b/crypto/p11-kit/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/MESON_CONFIGURE
diff --git a/crypto/p11-kit/D92765AF.gpg b/crypto/p11-kit/D92765AF.gpg
deleted file mode 100644
index df98485..0000000
Binary files a/crypto/p11-kit/D92765AF.gpg and /dev/null differ
diff --git a/crypto/p11-kit/DEPENDS b/crypto/p11-kit/DEPENDS
index b652a50..6c688ac 100755
--- a/crypto/p11-kit/DEPENDS
+++ b/crypto/p11-kit/DEPENDS
@@ -1,9 +1,7 @@
-depends GETTEXT &&
-# Not strictly necessary, but important enough that the configure script
-# by default aborts unless dependency forcibly disabled. I'm not testing
-# the disabled case. -- ThOr
-depends libtasn1 &&
-optional_depends libffi \
- "--with-ffi" \
- "--without-ffi" \
- "to build closures"
+depends meson &&
+depends ninja-build-system &&
+depends python3 &&
+optional_depends libxslt 'man=true' 'man=false' 'Build manpages' &&
+#depends GETTEXT &&
+#depends libtasn1 &&
+optional_depends libffi 'libffi=enabled' 'libffi=disabled' 'Use libffi for
building closures'
diff --git a/crypto/p11-kit/DETAILS b/crypto/p11-kit/DETAILS
index 33e629d..5bb1c09 100755
--- a/crypto/p11-kit/DETAILS
+++ b/crypto/p11-kit/DETAILS
@@ -1,13 +1,14 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=p11-kit
- VERSION=0.23.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.23.20
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
- SOURCE_GPG=D92765AF.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=p11.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://p11-glue.freedesktop.org/releases/$SOURCE
+ WEB_SITE=https://github.com/p11-glue/p11-kit
+ SOURCE_URL[0]=$WEB_SITE/releases/download/$VERSION/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- WEB_SITE=http://p11-glue.freedesktop.org/p11-kit.html
ENTERED=20110809
LICENSE[0]=BSD
SHORT="provides a way to load and enumerate PKCS#11 modules"
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index 5e13da6..befb111 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,11 @@
+2020-08-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.23.20
+ now at github
+ use meson build
+ * DEPENDS: add meson
+ * CONFIGURE: added
+ * p11.gpg: add Daiki Ueno <ueno AT unixuser.org>
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/crypto/p11-kit/p11.gpg b/crypto/p11-kit/p11.gpg
new file mode 100644
index 0000000..20bd228
Binary files /dev/null and b/crypto/p11-kit/p11.gpg differ
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index 0dce154..40d1bce 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcsc-lite
- VERSION=1.8.24
+ VERSION=1.9.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 3dcb087..9a271f6 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2020-08-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.0
+
2018-11-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.24




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4d33f4ce7aced0a8cb0e264f4c25baef5f404de5), Treeve Jelbert, 08/06/2020

Archive powered by MHonArc 2.6.24.

Top of Page