<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9b94092c260a4218aac15599539e9024528870cd">https://github.com/macports/macports-ports/commit/9b94092c260a4218aac15599539e9024528870cd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9b94092c260 scute: new port
</span>9b94092c260 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9b94092c260a4218aac15599539e9024528870cd
</span>Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
AuthorDate: Fri Sep 16 14:14:29 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> scute: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a new port for Scute, a PKCS#11 interface to the GnuPG Agent.
</span>---
security/scute/Portfile | 45 ++++++++++++++
.../files/scute-1.7.0-add-no-chain-option.diff | 69 ++++++++++++++++++++++
.../files/scute-1.7.0-fix-global-definition.diff | 28 +++++++++
3 files changed, 142 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/scute/Portfile b/security/scute/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5c26c9ab9a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/scute/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name scute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@gouttegd incenp.org:dgouttegattat} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description PKCS#11 interface to the GnuPG Agent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Scute is a PKCS#11 implementation relying on the GnuPG Agent. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It enables the use of an OpenPGP smartcard for TLS client \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ authentication and for CMS digital signatures with Mozilla \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and other PKCS#11-compatible applications.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gnupg.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gnupg.org/ftp/gcrypt/scute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e14690f5ab4eaee4b934c7b5af6fc47c39c4146b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 437fe758b27c243a5ee2535c6b065ea1d09f2c9a02d83567d2f934bb6395c249 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 851177
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We hardcode the path to gpgconf, so that if Scute is called from an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # application started from the graphical environment (rather than from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # a terminal), it can still find gpgconf even if the application's
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PATH does not include the MacPorts' bin directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|pgmname = \"gpgconf\";|pgmname = \"${prefix}/bin/gpgconf\";|" "${worksrcpath}/src/get-path.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append scute-${version}-fix-global-definition.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scute-${version}-add-no-chain-option.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gnupg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://gnupg.org/ftp/gcrypt/${name}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/scute/files/scute-1.7.0-add-no-chain-option.diff b/security/scute/files/scute-1.7.0-add-no-chain-option.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aeb5e5b0f9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/scute/files/scute-1.7.0-add-no-chain-option.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,69 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/scute.texi 2022-09-16 12:34:52.944579251 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/scute.texi 2022-09-16 12:39:49.165461792 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,6 +208,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log to @var{file}. Writing to a socket will be possible by prefixing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the @var{file} with the string @code{socket://}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@item no-chain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@opindex no-chain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++By default, when Scute is asked for a certificate, it returns the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++requested certificate along with the chain of signing certificates.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++This option makes Scute return only the leaf certificate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end table
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @mansect notes (Firefox)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gpgsm.c 2022-09-16 12:34:52.945579240 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gpgsm.c 2022-09-16 12:35:03.810464946 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +118,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.found = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.cert_get_cb = cert_get_cb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.hook = hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- search.with_chain = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ search.with_chain = !_scute_opt.no_chain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search.kinfo = kinfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG (DBG_INFO, "scute_gpgsm_get_cert: keyref='%s'", kinfo->keyref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,7 +136,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG (DBG_INFO, "scute_gpgsm_get_cert: falling back to gpgsm");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- search.with_chain = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = scute_gpgsm_search_certs (KEYLIST_BY_GRIP, kinfo->grip,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search_cb, &search);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/options.h 2022-09-16 12:34:52.945579240 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/options.h 2022-09-16 12:35:34.672140238 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *user;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int debug_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int no_chain;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } _scute_opt_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern _scute_opt_t _scute_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/readconf.c 2022-09-16 12:34:52.945579240 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/readconf.c 2022-09-16 12:36:53.867306894 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,12 +53,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _scute_read_conf (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enum { oNull = 500, oUser, oDebug, oLogfile };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enum { oNull = 500, oUser, oDebug, oLogfile, oNoChain };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gpgrt_opt_t opts[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGPARSE_s_s(oUser, "user", NULL ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGPARSE_s_s(oDebug, "debug", NULL),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGPARSE_s_s(oLogfile, "log-file", NULL),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARGPARSE_s_n(oNoChain, "no-chain", NULL),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGPARSE_end()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dummy_argc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,6 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case oDebug: _scute_opt.debug_flags = 1; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case oLogfile: break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case oNoChain: _scute_opt.no_chain = 1; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ARGPARSE_CONFFILE: break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default : pargs.err = ARGPARSE_PRINT_WARNING; break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/scute/files/scute-1.7.0-fix-global-definition.diff b/security/scute/files/scute-1.7.0-fix-global-definition.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fab6b772219
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/scute/files/scute-1.7.0-fix-global-definition.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/options.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,10 +22,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OPTIONS_H 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Global options. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *user;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int debug_flags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} _scute_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} _scute_opt_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern _scute_opt_t _scute_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*-- readconf.c --*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/readconf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/readconf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "options.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_scute_opt_t _scute_opt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_strusage (int level)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>