Skip to content

Commit

Permalink
Update 5 packages
Browse files Browse the repository at this point in the history
libgpgme (1.22.0-2 -> 1.23.1-1)
libnghttp2 (1.57.0-1 -> 1.58.0-1)
libp11-kit (0.25.0-1 -> 0.25.1-1)
p11-kit (0.25.0-1 -> 0.25.1-1)
vim (9.0.2043-1 -> 9.0.2070-1)

Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
  • Loading branch information
Git for Windows Build Agent committed Oct 30, 2023
1 parent 8a51464 commit 8e755d6
Show file tree
Hide file tree
Showing 93 changed files with 388 additions and 110 deletions.
Binary file modified usr/bin/ex.exe
Binary file not shown.
Binary file modified usr/bin/gpgme-json.exe
Binary file not shown.
Binary file modified usr/bin/gpgme-tool.exe
Binary file not shown.
Binary file modified usr/bin/msys-gpgme-11.dll
Binary file not shown.
Binary file modified usr/bin/msys-gpgmepp-6.dll
Binary file not shown.
Binary file modified usr/bin/msys-nghttp2-14.dll
Binary file not shown.
Binary file modified usr/bin/msys-p11-kit-0.dll
Binary file not shown.
Binary file modified usr/bin/p11-kit.exe
Binary file not shown.
Binary file modified usr/bin/rview.exe
Binary file not shown.
Binary file modified usr/bin/rvim.exe
Binary file not shown.
Binary file modified usr/bin/trust.exe
Binary file not shown.
Binary file modified usr/bin/view.exe
Binary file not shown.
Binary file modified usr/bin/vim.exe
Binary file not shown.
Binary file modified usr/bin/vimdiff.exe
Binary file not shown.
Binary file modified usr/bin/xxd.exe
Binary file not shown.
Binary file modified usr/lib/pkcs11/p11-kit-client.dll
Binary file not shown.
Binary file modified usr/lib/pkcs11/p11-kit-trust.dll
Binary file not shown.
Binary file modified usr/libexec/p11-kit/p11-kit-remote.exe
Binary file not shown.
Binary file modified usr/libexec/p11-kit/p11-kit-server.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion usr/share/gtk-doc/html/p11-kit/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">p11-kit</p></th></tr></table></div>
<div><p class="releaseinfo">for p11-kit 0.25.0</p></div>
<div><p class="releaseinfo">for p11-kit 0.25.1</p></div>
</div>
<hr>
</div>
Expand Down
21 changes: 21 additions & 0 deletions usr/share/gtk-doc/html/p11-kit/p11-kit-Future.html
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,14 @@ <h2><span class="refentrytitle"><a name="p11-kit-Future.top_of_page"></a>Future<
<td class="enum_member_annotations"> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-SESSION:CAPS"></a>P11_KIT_ITER_KIND_SESSION</p></td>
<td class="enum_member_description">
<p>The iterator is pointing to a token with an
active session.</p>
</td>
<td class="enum_member_annotations"> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="P11-KIT-ITER-KIND-UNKNOWN:CAPS"></a>P11_KIT_ITER_KIND_UNKNOWN</p></td>
<td class="enum_member_description">
<p>The iterator doesn't point to anything.</p>
Expand Down Expand Up @@ -1309,6 +1317,19 @@ <h2><span class="refentrytitle"><a name="p11-kit-Future.top_of_page"></a>Future<
</td>
<td class="enum_member_annotations"> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-LOGIN:CAPS"></a>P11_KIT_ITER_WITH_LOGIN</p></td>
<td> </td>
<td> </td>
</tr>
<tr>
<td class="enum_member_name"><p><a name="P11-KIT-ITER-WITH-SESSIONS:CAPS"></a>P11_KIT_ITER_WITH_SESSIONS</p></td>
<td class="enum_member_description">
<p>Stop at each token while iterating (after
opening a session).</p>
</td>
<td class="enum_member_annotations"> </td>
</tr>
</tbody>
</table></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion usr/share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ <h2><span class="refentrytitle"><a name="p11-kit-PIN-Callbacks.top_of_page"></a>
<span class="w"> </span><span class="k">const</span><span class="w"> </span><span class="kt">char</span><span class="w"> </span><span class="o">*</span><span class="n">pin_description</span><span class="p">,</span><span class="w"> </span><span class="n">P11KitPinFlags</span><span class="w"> </span><span class="n">pin_flags</span><span class="p">,</span>
<span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="o">*</span><span class="n">callback_data</span><span class="p">)</span>
<span class="p">{</span>
<span class="w"> </span><span class="k">return</span><span class="w"> </span><span class="n">p11_kit_pin_new_from_string</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;pin-value&quot;</span><span class="p">);</span>
<span class="w"> </span><span class="k">return</span><span class="w"> </span><span class="n">p11_kit_pin_new_for_string</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;pin-value&quot;</span><span class="p">);</span>
<span class="p">}</span>

<span class="n">p11_kit_pin_register_callback</span><span class="w"> </span><span class="p">(</span><span class="s">&quot;my-application&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">my_application_pin_callback</span><span class="p">,</span>
Expand Down
3 changes: 3 additions & 0 deletions usr/share/gtk-doc/html/p11-kit/p11-kit.devhelp2
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,15 @@
<keyword type="constant" name="P11_KIT_ITER_KIND_SLOT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-SLOT:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_KIND_TOKEN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-TOKEN:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_KIND_OBJECT" link="p11-kit-Future.html#P11-KIT-ITER-KIND-OBJECT:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_KIND_SESSION" link="p11-kit-Future.html#P11-KIT-ITER-KIND-SESSION:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_KIND_UNKNOWN" link="p11-kit-Future.html#P11-KIT-ITER-KIND-UNKNOWN:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_BUSY_SESSIONS" link="p11-kit-Future.html#P11-KIT-ITER-BUSY-SESSIONS:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WANT_WRITABLE" link="p11-kit-Future.html#P11-KIT-ITER-WANT-WRITABLE:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITH_MODULES" link="p11-kit-Future.html#P11-KIT-ITER-WITH-MODULES:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITH_SLOTS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-SLOTS:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITH_TOKENS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-TOKENS:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITHOUT_OBJECTS" link="p11-kit-Future.html#P11-KIT-ITER-WITHOUT-OBJECTS:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITH_LOGIN" link="p11-kit-Future.html#P11-KIT-ITER-WITH-LOGIN:CAPS"/>
<keyword type="constant" name="P11_KIT_ITER_WITH_SESSIONS" link="p11-kit-Future.html#P11-KIT-ITER-WITH-SESSIONS:CAPS"/>
</functions>
</book>
168 changes: 158 additions & 10 deletions usr/share/gtk-doc/html/p11-kit/p11-kit.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,26 @@ <h2><span class="refentrytitle">p11-kit</span></h2>
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p><code class="command">p11-kit list-modules</code> </p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit list-tokens</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit list-objects</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit import-object</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit export-object</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit delete-object</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit generate-keypair</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit list-profiles</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit add-profile</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit delete-profile</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit list-mechanisms</code> ...
</p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit print-config</code> </p></div>
<div class="cmdsynopsis"><p><code class="command">p11-kit extract</code> ...
</p></div>
Expand Down Expand Up @@ -79,30 +93,164 @@ <h2>Synopsis</h2>
the PKCS#11 modules will be displayed.</p>
</div>
<div class="refsect1">
<a name="p11-kit-list-tokens"></a><h2>List Tokens</h2>
<p>List all tokens available in system configured PKCS#11 modules.</p>
<pre class="programlisting">
$ p11-kit list-tokens [--only-uris] pkcs11:token
</pre>
<p>This retrieves all tokens and displays some of their
common attributes. If <code class="option">--only-uris</code> is given,
only the matching token URIs are printed.</p>
</div>
<div class="refsect1">
<a name="p11-kit-list-objects"></a><h2>List Objects</h2>
<p>List objects matching given PKCS#11 URI.</p>
<pre class="programlisting">
$ p11-kit list-objects [--login] pkcs11:object_on_token
</pre>
<p>This retrieves all objects that match given PKCS#11 URI and displays
some of their common attributes. Storage objects also have their PKCS#11 URI
displayed.</p>
</div>
<div class="refsect1">
<a name="p11-kit-import-object"></a><h2>Import Object</h2>
<p>Import object into PKCS#11 token.</p>
<pre class="programlisting">
$ p11-kit import-object --file=file.pem [--label=label] [--login] pkcs11:token
</pre>
<p>Takes either an X.509 certificate or a public key in the form of a PEM file
and imports it into the first token matched by given PKCS#11 URI.</p>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
<col>
</colgroup>
<tbody>
<tr>
<td><p><span class="term"><code class="option">--file=&lt;file.pem&gt;</code></span></p></td>
<td><p>File containing either an X.509 certificate
or a public key in PEM format. This option is required.</p></td>
</tr>
<tr>
<td><p><span class="term"><code class="option">--label=&lt;label&gt;</code></span></p></td>
<td><p>Assigns label to the imported object.</p></td>
</tr>
</tbody>
</table></div>
</div>
<div class="refsect1">
<a name="p11-kit-export-object"></a><h2>Export Object</h2>
<p>Export object matching PKCS#11 URI.</p>
<pre class="programlisting">
$ p11-kit export-object [--login] pkcs11:object_on_token
</pre>
<p>Displays PEM formatted contents of the first object matched by given PKCS#11 URI.
The matched object has to either be an X.509 certificate or a public key.</p>
</div>
<div class="refsect1">
<a name="p11-kit-delete-object"></a><h2>Delete Object</h2>
<p>Delete object matching PKCS#11 URI.</p>
<pre class="programlisting">
$ p11-kit delete-object [--login] pkcs11:object_on_token
</pre>
<p>Destroys the first object matched by given PKCS#11 URI.</p>
</div>
<div class="refsect1">
<a name="p11-kit-generate-keypair"></a><h2>Generate Key-pair</h2>
<p>Generate key-pair on a PKCS#11 token.</p>
<pre class="programlisting">
$ p11-kit generate-keypair --type=algorithm {--bits=n|--curve=name} [--label=label] [--login] pkcs11:token
</pre>
<p>Generate private-public key-pair of given type on the first
token matched by given PKCS#11 URI. This command should be used
together with --type option and one of --bits or --curve options.</p>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
<col>
</colgroup>
<tbody>
<tr>
<td><p><span class="term"><code class="option">--type=&lt;algorithm&gt;</code></span></p></td>
<td><p>Specify the type of keys to generate.
Supported values are rsa, ecdsa and ed25519.
This option is required.</p></td>
</tr>
<tr>
<td><p><span class="term"><code class="option">--bits=&lt;n&gt;</code></span></p></td>
<td><p>Specify the number of bits for the key-pair generation.
Cannot be used together with --curve option.</p></td>
</tr>
<tr>
<td><p><span class="term"><code class="option">--curve=&lt;name&gt;</code></span></p></td>
<td><p>Specify an elliptic curve for the key-pair generation.
Supported values are secp256r1, secp384r1, secp521r1, ed25519 and ed448.
Cannot be used together with --bits option.</p></td>
</tr>
<tr>
<td><p><span class="term"><code class="option">--label=&lt;label&gt;</code></span></p></td>
<td><p>Assigns label to the generated key-pair objects.</p></td>
</tr>
</tbody>
</table></div>
</div>
<div class="refsect1">
<a name="p11-kit-list-profiles"></a><h2>List Profiles</h2>
<p>List PKCS#11 profiles supported by the token.</p>
<pre class="programlisting">
$ p11-kit list-profiles pkcs11:token
$ p11-kit list-profiles [--login] pkcs11:token
</pre>
<p>This searches the given token for profile objects that contain profile IDs
which are then displayed in human-readable form.</p>
<p>Displays profile IDs of the first token matched by given
PKCS#11 URI in human-readable form.</p>
</div>
<div class="refsect1">
<a name="p11-kit-add-profile"></a><h2>Add Profile</h2>
<p>Add PKCS#11 profile to the token.</p>
<p>Add PKCS#11 profile to a token.</p>
<pre class="programlisting">
$ p11-kit add-profile --profile profile pkcs11:token
$ p11-kit add-profile --profile=profile [--login] pkcs11:token
</pre>
<p>Creates a new PKCS#11 profile object on the token if it doesn't already exist.</p>
<p>Creates new profile object with given profile ID on the
first token matched by given PKCS#11 URI. This command fails
if the profile ID already exists on the token.</p>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
<col>
</colgroup>
<tbody><tr>
<td><p><span class="term"><code class="option">--profile=&lt;profile&gt;</code></span></p></td>
<td><p>Profile ID to add. Value can either
be numerical or textual. This option is required.</p></td>
</tr></tbody>
</table></div>
</div>
<div class="refsect1">
<a name="p11-kit-delete-profile"></a><h2>Delete Profile</h2>
<p>Delete PKCS#11 profile from the token.</p>
<p>Delete PKCS#11 profile from a token.</p>
<pre class="programlisting">
$ p11-kit delete-profile --profile=profile [--login] pkcs11:token
</pre>
<p>Destroys all profile objects with given profile ID from
the first token matched by given PKCS#11 URI.</p>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
<col>
</colgroup>
<tbody><tr>
<td><p><span class="term"><code class="option">--profile=&lt;profile&gt;</code></span></p></td>
<td><p>Profile ID to delete. Value can either
be numerical or textual. This option is required.</p></td>
</tr></tbody>
</table></div>
</div>
<div class="refsect1">
<a name="p11-kit-list-mechanisms"></a><h2>List Mechanisms</h2>
<p>List PKCS#11 mechanisms supported by the token.</p>
<pre class="programlisting">
$ p11-kit delete-profile --profile profile pkcs11:token
$ p11-kit list-mechanisms pkcs11:token
</pre>
<p>Searches the token for profile object that matches given PKCS#11
profile ID and attempts to destroy it.</p>
<p>This lists all available mechanimsms for a PKCS#11 token</p>
</div>
<div class="refsect1">
<a name="p11-kit-print-config"></a><h2>Print Config</h2>
Expand Down
1 change: 1 addition & 0 deletions usr/share/gtk-doc/html/p11-kit/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
.gd { color: #A00000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
.ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
.gr { color: #E40000 } /* Generic.Error */
.gh { color: #000080; font-weight: bold } /* Generic.Heading */
.gi { color: #008400 } /* Generic.Inserted */
Expand Down
Binary file modified usr/share/info/gpgme.info-1.gz
Binary file not shown.
Binary file modified usr/share/info/gpgme.info-2.gz
Binary file not shown.
Binary file modified usr/share/info/gpgme.info.gz
Binary file not shown.
Binary file modified usr/share/man/man1/trust.1.gz
Binary file not shown.
Binary file modified usr/share/man/man5/pkcs11.conf.5.gz
Binary file not shown.
Binary file modified usr/share/man/man8/p11-kit.8.gz
Binary file not shown.
4 changes: 4 additions & 0 deletions usr/share/vim/vim90/autoload/dist/script.vim
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ export def Exe2filetype(name: string, line1: string): string
elseif name =~ '^\%(rexx\|regina\)\>'
return 'rexx'

# Janet
elseif name =~ '^janet\>'
return 'janet'

endif

return ''
Expand Down
2 changes: 1 addition & 1 deletion usr/share/vim/vim90/doc/builtin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4201,7 +4201,7 @@ getscriptinfo([{opts}]) *getscriptinfo()*
Note that this is a copy, the value of
script-local variables cannot be changed using
this dictionary.
version Vimscript version (|scriptversion|)
version Vim script version (|scriptversion|)

Examples: >
:echo getscriptinfo({'name': 'myscript'})
Expand Down
10 changes: 9 additions & 1 deletion usr/share/vim/vim90/doc/digraph.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*digraph.txt* For Vim version 9.0. Last change: 2023 Mar 21
*digraph.txt* For Vim version 9.0. Last change: 2023 Oct 20


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -174,6 +174,13 @@ ROUBLE
The rouble sign was added in 2014 as 0x20bd. Vim supports the digraphs =R and
=P for this. Note that R= and P= are other characters.

QUADRUPLE PRIME

The quadruple prime using the digraph 4' was added in 2023. Although it is
not part of RFC 1345, it supplements the existing digraph implementation as
there already exist digraphs for PRIME, DOUBLE PRIME and TRIPLE PRIME using
the 1', 2' and 3' digraphs.

*digraph-table*
char digraph hex dec official name ~
^@ NU 0x00 0 NULL (NUL)
Expand Down Expand Up @@ -931,6 +938,7 @@ char digraph hex dec official name ~
′ 1' 2032 8242 PRIME
″ 2' 2033 8243 DOUBLE PRIME
‴ 3' 2034 8244 TRIPLE PRIME
⁗ 4' 2057 8279 QUADRUPLE PRIME
‵ 1" 2035 8245 REVERSED PRIME
‶ 2" 2036 8246 REVERSED DOUBLE PRIME
‷ 3" 2037 8247 REVERSED TRIPLE PRIME
Expand Down
4 changes: 2 additions & 2 deletions usr/share/vim/vim90/doc/if_pyth.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*if_pyth.txt* For Vim version 9.0. Last change: 2022 Feb 22
*if_pyth.txt* For Vim version 9.0. Last change: 2023 Oct 25


VIM REFERENCE MANUAL by Paul Moore
Expand Down Expand Up @@ -524,7 +524,7 @@ The range object methods are:

Range object type is available using "Range" attribute of vim module.

Example (assume r is the current range):
Example (assume r is the current range): >
# Send all lines in a range to the default printer
vim.command("%d,%dhardcopy!" % (r.start+1,r.end+1))
Expand Down
6 changes: 3 additions & 3 deletions usr/share/vim/vim90/doc/indent.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1236,22 +1236,22 @@ variable. It supports 3 keys, `line_continuation`, `more_in_bracket_block`,
and `searchpair_timeout`.
`line_continuation` expects a number which will be added to the indent level of
a continuation line starting with a backslash, and defaults to
`shiftwidth() * 3`. It also accepts a string, which is evaluated at runtime.
`shiftwidth() * 3` . It also accepts a string, which is evaluated at runtime.
`more_in_bracket_block` expects a boolean value; when on, an extra
`shiftwidth()` is added inside blocks surrounded with brackets. It defaults to
`v:false`.
`searchpair_timeout` expects a number which will be passed to `searchpair()` as
a timeout. Increasing the value might give more accurate results, but also
causes the indentation to take more time. It defaults to 100 (milliseconds).

Example of configuration:
Example of configuration: >
let g:vim_indent = #{
\ line_continuation: shiftwidth() * 3,
\ more_in_bracket_block: v:false,
\ searchpair_timeout: 100,
\ }

<
*g:vim_indent_cont*
This variable is equivalent to `g:vim_indent.line_continuation`.
It's supported for backward compatibility.
Expand Down
5 changes: 3 additions & 2 deletions usr/share/vim/vim90/doc/intro.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ introduce Y2K problems, but those are not really part of Vim itself.
==============================================================================
3. Credits *credits* *author*

Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|.

Parts of the documentation come from several Vi manuals, written by:
W.N. Joy
Expand Down Expand Up @@ -217,7 +217,8 @@ Vim would never have become what it is now, without the help of these people!
Bill Foster Athena GUI port (later removed)
Google Let Bram work on Vim one day a week
Loic Grenie xvim (ideas for multi windows version)
Sven Guckes Vim promoter and previous WWW page maintainer |Sven-Guckes|
Sven Guckes Vim promoter and previous WWW page maintainer
|Sven-Guckes|
Darren Hiebert Exuberant ctags
Jason Hildebrand GTK+ 2 port
Bruce Hunsaker improvements for VMS port
Expand Down
Loading

0 comments on commit 8e755d6

Please sign in to comment.