-static int get_time_seed()
+static int get_time_seed(void)
{
- DEBUG_SEED("get_time_seed");
+ DEBUG_SEED("get_time_seed");
- return (int)time(NULL) * 433494437;
+ return (int)time(NULL) * 433494437;
}
-
/* json_c_get_random_seed */
-int json_c_get_random_seed()
+int json_c_get_random_seed(void)
{
-#if HAVE_RDRAND
- if (has_rdrand()) return get_rdrand_seed();
+#ifdef OVERRIDE_GET_RANDOM_SEED
+ OVERRIDE_GET_RANDOM_SEED;
+#endif
+#if defined HAVE_RDRAND && HAVE_RDRAND
+ if (has_rdrand())
+ return get_rdrand_seed();
#endif
-#if HAVE_DEV_RANDOM
- if (has_dev_urandom()) return get_dev_random_seed();
+#if defined HAVE_DEV_RANDOM && HAVE_DEV_RANDOM
+ if (has_dev_urandom())
+ return get_dev_random_seed();
#endif
-#if HAVE_CRYPTGENRANDOM
- return get_cryptgenrandom_seed();
+#if defined HAVE_CRYPTGENRANDOM && HAVE_CRYPTGENRANDOM
+ return get_cryptgenrandom_seed();
#endif
- return get_time_seed();
+ return get_time_seed();
}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/random_seed.h thunderbird-91.8.1+build1/comm/third_party/json-c/random_seed.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/random_seed.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/random_seed.h 2022-04-15 07:49:21.000000000 +0000
@@ -20,7 +20,7 @@
extern "C" {
#endif
-extern int json_c_get_random_seed();
+extern int json_c_get_random_seed(void);
#ifdef __cplusplus
}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/README.html thunderbird-91.8.1+build1/comm/third_party/json-c/README.html
--- thunderbird-91.7.0+build2/comm/third_party/json-c/README.html 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/README.html 2022-04-15 07:49:21.000000000 +0000
@@ -8,8 +8,8 @@
JSON-C - A JSON implementation in C
Overview
- JSON-C implements a reference counting object model that allows you to easily
- construct JSON objects in C, output them as JSON formatted strings and parse
+
JSON-C implements a reference counting object model that allows you to easily
+ construct JSON objects in C, output them as JSON formatted strings and parse
JSON formatted strings back into the C representation of JSON objects.
It aims to conform to RFC 7159.
@@ -26,8 +26,7 @@
Documentation
- Doxygen generated documentation exists here
- and Win32 specific notes can be found here.
+ Doxygen generated documentation exists here.
git clone https://github.com/json-c/json-c.git
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/README.md thunderbird-91.8.1+build1/comm/third_party/json-c/README.md
--- thunderbird-91.7.0+build2/comm/third_party/json-c/README.md 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/README.md 2022-04-15 07:49:22.000000000 +0000
@@ -1,12 +1,17 @@
-`json-c` {#mainpage}
+\mainpage
+
+`json-c`
========
1. [Overview and Build Status](#overview)
2. [Building on Unix](#buildunix)
-3. [Install Prerequisites](#installprereq)
-4. [Building with partial threading support](#buildthreaded)
-5. [Linking to libjson-c](#linking)
-6. [Using json-c](#using)
+ * [Prerequisites](#installprereq)
+ * [Build commands](#buildcmds)
+3. [CMake options](#CMake)
+4. [Testing](#testing)
+5. [Building with `vcpkg`](#buildvcpkg)
+6. [Linking to libjson-c](#linking)
+7. [Using json-c](#using)
JSON-C - A JSON implementation in C
-----------------------------------
@@ -15,126 +20,195 @@
* [AppVeyor Build](https://ci.appveyor.com/project/hawicz/json-c) 
* [Travis Build](https://travis-ci.org/json-c/json-c) 
-JSON-C implements a reference counting object model that allows you to easily
-construct JSON objects in C, output them as JSON formatted strings and parse
+Test Status
+* [Coveralls](https://coveralls.io/github/json-c/json-c?branch=master) [](https://coveralls.io/github/json-c/json-c?branch=master)
+
+JSON-C implements a reference counting object model that allows you to easily
+construct JSON objects in C, output them as JSON formatted strings and parse
JSON formatted strings back into the C representation of JSON objects.
It aims to conform to [RFC 7159](https://tools.ietf.org/html/rfc7159).
-
-Building on Unix with `git`, `gcc` and `autotools`
+Building on Unix with `git`, `gcc` and `cmake`
--------------------------------------------------
Home page for json-c: https://github.com/json-c/json-c/wiki
-### Prerequisites:
-
-See also the "Installing prerequisites" section below.
+### Prerequisites:
- `gcc`, `clang`, or another C compiler
- - `libtool>=2.2.6b`
-If you're not using a release tarball, you'll also need:
+ - cmake>=2.8, >=3.16 recommended
- - `autoconf>=2.64` (`autoreconf`)
- - `automake>=1.13`
+To generate docs you'll also need:
+ - `doxygen>=1.8.13`
-Make sure you have a complete `libtool` install, including `libtoolize`.
+If you are on a relatively modern system, you'll likely be able to install
+the prerequisites using your OS's packaging system.
-To generate docs (e.g. as part of make distcheck) you'll also need:
- - `doxygen>=1.8.13`
+### Install using apt (e.g. Ubuntu 16.04.2 LTS)
+```sh
+sudo apt install git
+sudo apt install cmake
+sudo apt install doxygen # optional
+sudo apt install valgrind # optional
+```
-### Build instructions:
+### Build instructions:
`json-c` GitHub repo: https://github.com/json-c/json-c
```sh
$ git clone https://github.com/json-c/json-c.git
-$ cd json-c
-$ sh autogen.sh
+$ mkdir json-c-build
+$ cd json-c-build
+$ cmake ../json-c # See CMake section below for custom arguments
```
-followed by
+Note: it's also possible to put your build directory inside the json-c
+source directory, or even not use a separate build directory at all, but
+certain things might not work quite right (notably, `make distcheck`)
+
+Then:
```sh
-$ ./configure # --enable-threading
$ make
+$ make test
+$ make USE_VALGRIND=0 test # optionally skip using valgrind
$ make install
```
-To build and run the test programs:
-```sh
-$ make check
-$ make USE_VALGRIND=0 check # optionally skip using valgrind
-```
-
-Install prerequisites
------------------------
+### Generating documentation with Doxygen:
-If you are on a relatively modern system, you'll likely be able to install
-the prerequisites using your OS's packaging system.
+The libray documentation can be generated directly from the source codes using Doxygen tool:
-### Install using apt (e.g. Ubuntu 16.04.2 LTS)
```sh
-sudo apt install git
-sudo apt install autoconf automake libtool
-sudo apt install valgrind # optional
+# in build directory
+make doc
+google-chrome doc/html/index.html
```
-Then start from the "git clone" command, above.
-### Manually install and build autoconf, automake and libtool
+CMake Options
+--------------------
-For older OS's that don't have up-to-date version of the packages will
-require a bit more work. For example, CentOS release 5.11, etc...
+The json-c library is built with [CMake](https://cmake.org/cmake-tutorial/),
+which can take a few options.
-```sh
-curl -O http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
-curl -O http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz
-curl -O http://ftp.gnu.org/gnu/libtool/libtool-2.2.6b.tar.gz
+Variable | Type | Description
+-----------------------------|--------|--------------
+CMAKE_INSTALL_PREFIX | String | The install location.
+CMAKE_BUILD_TYPE | String | Defaults to "debug".
+BUILD_SHARED_LIBS | Bool | The default build generates a dynamic (dll/so) library. Set this to OFF to create a static library only.
+BUILD_STATIC_LIBS | Bool | The default build generates a static (lib/a) library. Set this to OFF to create a shared library only.
+DISABLE_STATIC_FPIC | Bool | The default builds position independent code. Set this to OFF to create a shared library only.
+DISABLE_BSYMBOLIC | Bool | Disable use of -Bsymbolic-functions.
+DISABLE_THREAD_LOCAL_STORAGE | Bool | Disable use of Thread-Local Storage (HAVE___THREAD).
+DISABLE_WERROR | Bool | Disable use of -Werror.
+ENABLE_RDRAND | Bool | Enable RDRAND Hardware RNG Hash Seed.
+ENABLE_THREADING | Bool | Enable partial threading support.
+OVERRIDE_GET_RANDOM_SEED | String | A block of code to use instead of the default implementation of json_c_get_random_seed(), e.g. on embedded platforms where not even the fallback to time() works. Must be a single line.
-tar xzf autoconf-2.69.tar.gz
-tar xzf automake-1.15.tar.gz
-tar xzf libtool-2.2.6b.tar.gz
+Pass these options as `-D` on CMake's command-line.
-export PATH=${HOME}/ac_install/bin:$PATH
-
-(cd autoconf-2.69 && \
- ./configure --prefix ${HOME}/ac_install && \
- make && \
- make install)
-
-(cd automake-1.15 && \
- ./configure --prefix ${HOME}/ac_install && \
- make && \
- make install)
-
-(cd libtool-2.2.6b && \
- ./configure --prefix ${HOME}/ac_install && \
- make && \
- make install)
+```sh
+# build a static library only
+cmake -DBUILD_SHARED_LIBS=OFF ..
```
-
-Building with partial threading support
-----------------------------------------
+### Building with partial threading support
Although json-c does not support fully multi-threaded access to
-object trees, it has some code to help make use in threaded programs
+object trees, it has some code to help make its use in threaded programs
a bit safer. Currently, this is limited to using atomic operations for
json_object_get() and json_object_put().
Since this may have a performance impact, of at least 3x slower
according to https://stackoverflow.com/a/11609063, it is disabled by
-default. You may turn it on by adjusting your configure command with:
- --enable-threading
+default. You may turn it on by adjusting your cmake command with:
+ -DENABLE_THREADING=ON
Separately, the default hash function used for object field keys,
-lh_char_hash, uses a compare-and-swap operation to ensure the randomly
+lh_char_hash, uses a compare-and-swap operation to ensure the random
seed is only generated once. Because this is a one-time operation, it
is always compiled in when the compare-and-swap operation is available.
+### cmake-configure wrapper script
+
+For those familiar with the old autoconf/autogen.sh/configure method,
+there is a `cmake-configure` wrapper script to ease the transition to cmake.
+
+```sh
+mkdir build
+cd build
+../cmake-configure --prefix=/some/install/path
+make
+```
+
+cmake-configure can take a few options.
+
+| options | Description|
+| ---- | ---- |
+| prefix=PREFIX | install architecture-independent files in PREFIX |
+| enable-threading | Enable code to support partly multi-threaded use |
+| enable-rdrand | Enable RDRAND Hardware RNG Hash Seed generation on supported x86/x64 platforms. |
+| enable-shared | build shared libraries [default=yes] |
+| enable-static | build static libraries [default=yes] |
+| disable-Bsymbolic | Avoid linking with -Bsymbolic-function |
+| disable-werror | Avoid treating compiler warnings as fatal errors |
+
+
+Testing:
+----------
+
+By default, if valgrind is available running tests uses it.
+That can slow the tests down considerably, so to disable it use:
+```sh
+export USE_VALGRIND=0
+```
+
+To run tests a separate build directory is recommended:
+```sh
+mkdir build-test
+cd build-test
+# VALGRIND=1 causes -DVALGRIND=1 to be passed when compiling code
+# which uses slightly slower, but valgrind-safe code.
+VALGRIND=1 cmake ..
+make
+
+make test
+# By default, if valgrind is available running tests uses it.
+make USE_VALGRIND=0 test # optionally skip using valgrind
+```
+
+If a test fails, check `Testing/Temporary/LastTest.log`,
+`tests/testSubDir/${testname}/${testname}.vg.out`, and other similar files.
+If there is insufficient output try:
+```sh
+VERBOSE=1 make test
+```
+or
+```sh
+JSONC_TEST_TRACE=1 make test
+```
+and check the log files again.
+
+
+Building on Unix and Windows with `vcpkg`
+--------------------------------------------------
+
+You can download and install JSON-C using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:
+
+ git clone https://github.com/Microsoft/vcpkg.git
+ cd vcpkg
+ ./bootstrap-vcpkg.sh
+ ./vcpkg integrate install
+ vcpkg install json-c
+
+The JSON-C port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
+
+
Linking to `libjson-c`
----------------------
@@ -165,9 +239,38 @@
* json_tokener.h - Methods for parsing and serializing json-c object trees.
* json_pointer.h - JSON Pointer (RFC 6901) implementation for retrieving
objects from a json-c object tree.
-* json_object_iterator.h - Methods for iterating over single json_object instances.
+* json_object_iterator.h - Methods for iterating over single json_object instances. (See also `json_object_object_foreach()` in json_object.h)
* json_visit.h - Methods for walking a tree of json-c objects.
* json_util.h - Miscelleanous utility functions.
-For a full list of headers see [files.html](files.html)
+For a full list of headers see [files.html](http://json-c.github.io/json-c/json-c-current-release/doc/html/files.html)
+
+The primary type in json-c is json_object. It describes a reference counted
+tree of json objects which are created by either parsing text with a
+json_tokener (i.e. `json_tokener_parse_ex()`), or by creating
+(with `json_object_new_object()`, `json_object_new_int()`, etc...) and adding
+(with `json_object_object_add()`, `json_object_array_add()`, etc...) them
+individually.
+Typically, every object in the tree will have one reference, from it's parent.
+When you are done with the tree of objects, you call json_object_put() on just
+the root object to free it, which recurses down through any child objects
+calling json_object_put() on each one of those in turn.
+
+You can get a reference to a single child
+(`json_object_object_get()` or `json_object_array_get_idx()`)
+and use that object as long as its parent is valid.
+If you need a child object to live longer than its parent, you can
+increment the child's refcount (`json_object_get()`) to allow it to survive
+the parent being freed or it being removed from its parent
+(`json_object_object_del()` or `json_object_array_del_idx()`)
+
+When parsing text, the json_tokener object is independent from the json_object
+that it returns. It can be allocated (`json_tokener_new()`)
+used ones or multiple times (`json_tokener_parse_ex()`, and
+freed (`json_tokener_free()`) while the json_object objects live on.
+
+A json_object tree can be serialized back into a string with
+`json_object_to_json_string_ext()`. The string that is returned
+is only valid until the next "to_json_string" call on that same object.
+Also, it is freed when the json_object is freed.
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/RELEASE_CHECKLIST.txt thunderbird-91.8.1+build1/comm/third_party/json-c/RELEASE_CHECKLIST.txt
--- thunderbird-91.7.0+build2/comm/third_party/json-c/RELEASE_CHECKLIST.txt 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/RELEASE_CHECKLIST.txt 2022-04-15 07:49:21.000000000 +0000
@@ -1,73 +1,103 @@
-Release checklist:
+# Release checklist:
+
+## Pre-release tasks
+
+* Figure out whether a release is worthwhile to do.
+* Analyze the previous release branch to see if anything should have been
+ applied to master.
+* Collect changes and assemble tentative release notes.
+ * Identify previous release branch point
+ * Check commit logs between previous branch point and now for
+ notable changes worth mentioning
+ * Create a new issues_closed_for_X.Y.md file
+ * Include notable entries from here in the release notes.
+ * Analyze APIs between previous release branch and master to produce list of
+ changes (added/removed/updated funcs, etc...), and detect backwards compat
+ issues.
+ * https://github.com/lvc/abi-compliance-checker
+ * If the new release is not backwards compatible, then this is a MAJOR release.
+ * Mention removed features in ChangeLog
+ * Consider re-adding backwards compatible support, through symbol
+ aliases and appropriate entries in json-c.sym
+ * Update the AUTHORS file
+ * Exclude mentioning changes that have already been included in a point
+ release of the previous release branch.
+
+* Update ChangeLog with relevant notes before branching.
+
+* Check that the compile works on Linux - automatic through Travis
+* Check that the compile works on NetBSD
+* Check that the compile works on Windows - automatic through AppVeyor
+
+## Release creation
+
+Start creating the new release:
+ release=0.15
+ git clone https://github.com/json-c/json-c json-c-${release}
+
+ mkdir distcheck
+ cd distcheck
+ # Note, the build directory *must* be entirely separate from
+ # the source tree for distcheck to work properly.
+ cmake ../json-c-${release}
+ make distcheck
+ cd ..
-release=0.13
-git clone https://github.com/json-c/json-c json-c-${release}
-cd json-c-${release}
-
-Check that the compile works on Linux
-Check that the compile works on NetBSD
-Check that the compile works on Windows
-Run "make distcheck" and fix any problems
- (e.g. adding new files to SOURCES variables in Makefile.am)
-Check ChangeLog to see if anything should be added.
Make any fixes/changes *before* branching.
- git branch json-c-${release}
- git checkout json-c-${release}
+ cd json-c-${release}
+ git branch json-c-${release}
+ git checkout json-c-${release}
------------
-Update the version in json_c_version.h
-Update the version in Doxyfile
-Update the version in configure.ac
-Update the version in CMakeLists.txt
- Use ${release}.
+Using ${release}:
+ Update the version in json_c_version.h
+ Update the version in CMakeLists.txt (VERSION in the project(...) line)
+ Update the version in config.h.win32 (several places)
-Update the libjson_la_LDFLAGS line in Makefile.am to the new version.
- Generally, unless we're doing a major release, change:
- -version-info x:y:z
- to
- -version-info x:y+1:z
-
-------------
+Update the set_target_properties() line in CmakeLists.txt to set the shared
+library version. Generally, unless we're doing a major release, change:
+ VERSION x.y.z
+to
+ VERSION x.y+1.z
-Generate the configure script and other files:
- sh autogen.sh
- git add -f Makefile.in aclocal.m4 config.guess config.h.in \
- config.sub configure depcomp install-sh \
- ltmain.sh missing tests/Makefile.in \
- INSTALL
+ git commit -a -m "Bump version to ${release}"
- # check for anything else to be added:
- git status --ignored
- git commit
+If we're doing a major release (SONAME bump), also bump the version
+ of ALL symbols in json-c.sym.
+ See explanation at https://github.com/json-c/json-c/issues/621
+ More info at: https://software.intel.com/sites/default/files/m/a/1/e/dsohowto.pdf
------------
Generate the doxygen documentation:
- doxygen
- git add -f doc
- git commit doc
+
+ doxygen
+ git add -f doc
+ git commit doc
------------
-cd ..
-echo .git > excludes
-echo autom4te.cache >> excludes
-tar -czf json-c-${release}.tar.gz -X excludes json-c-${release}
+Create the release tarballs:
+
+ cd ..
+ echo .git > excludes
+ tar -czf json-c-${release}.tar.gz -X excludes json-c-${release}
-echo doc >> excludes
-tar -czf json-c-${release}-nodoc.tar.gz -X excludes json-c-${release}
+ echo doc >> excludes
+ tar -czf json-c-${release}-nodoc.tar.gz -X excludes json-c-${release}
------------
Tag the branch:
-cd json-c-${release}
-git tag -a json-c-${release}-$(date +%Y%m%d) -m "Release json-c-${release}"
-git push origin json-c-${release}
-git push --tags
+ cd json-c-${release}
+ git tag -a json-c-${release}-$(date +%Y%m%d) -m "Release json-c-${release}"
+
+ git push origin json-c-${release}
+ git push --tags
------------
@@ -75,7 +105,7 @@
https://console.aws.amazon.com/s3/
Upload the two tarballs in the json-c_releases folder.
- When uploading, use "Reduced Redundancy", and make the uploaded files publicly accessible.
+ When uploading, use "Standard" storage class, and make the uploaded files publicly accessible.
Logout of Amazon S3, and verify that the files are visible.
https://s3.amazonaws.com/json-c_releases/releases/index.html
@@ -84,48 +114,51 @@
Post-release checklist:
-git checkout master
-Add new section to ChangeLog
-Update the version in json_c_version.h
-Update the version in Doxyfile
-Update the version in configure.ac
-Update the version in CMakeLists.txt
- Use ${release}.99 to indicate a version "newer" than anything on the branch.
-
-Leave the libjson_la_LDFLAGS line in Makefile.am alone.
- For more details see:
- http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ git checkout master
+
+Add new section to ChangeLog for ${release}+1
+
+Use ${release}.99 to indicate a version "newer" than anything on the branch:
+ Update the version in json_c_version.h
+ Update the version in CMakeLists.txt
+ Update the version in config.h.win32
+
+Update RELEASE_CHECKLIST.txt, set release=${release}+1
+
+Update the set_target_properties() line in CmakeLists.txt to match the release branch.
+
+ git commit -a -m "Update the master branch to version 0.${release}.99"
+ git push
------------
Update the gh-pages branch with new docs:
-cd json-c-${release}
-git checkout json-c-${release}
-cd ..
-
-git clone -b gh-pages https://github.com/json-c/json-c json-c-pages
-cd json-c-pages
-mkdir json-c-${release}
-cp -R ../json-c-${release}/doc json-c-${release}/.
-cp ../json-c-${release}/README-WIN32.html json-c-${release}/.
-git add json-c-${release}
-git commit
+ cd json-c-${release}
+ git checkout json-c-${release}
+ cd ..
+
+ git clone -b gh-pages https://github.com/json-c/json-c json-c-pages
+ cd json-c-pages
+ mkdir json-c-${release}
+ cp -R ../json-c-${release}/doc json-c-${release}/.
+ git add json-c-${release}
+ git commit -a -m "Add the ${release} docs."
-vi index.html
- Add/change links to current release.
+ vi index.html
+ # Add/change links to current release.
-git commit index.html
+ git commit -a -m "Update the doc links to point at ${release}"
-git push
+ git push
------------
Update checksums on wiki page.
-cd ..
-openssl sha -sha256 json-c*gz
-openssl md5 json-c*gz
+ cd ..
+ openssl sha -sha256 json-c*gz
+ openssl md5 json-c*gz
Copy and paste this output into the wiki page at:
https://github.com/json-c/json-c/wiki
@@ -133,4 +166,3 @@
------------
Send an email to the mailing list.
-
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/snprintf_compat.h thunderbird-91.8.1+build1/comm/third_party/json-c/snprintf_compat.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/snprintf_compat.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/snprintf_compat.h 2022-04-15 07:49:21.000000000 +0000
@@ -13,7 +13,7 @@
#include
-#if !defined(HAVE_SNPRINTF) && defined(_MSC_VER)
+#if !defined(HAVE_SNPRINTF) && (defined(_MSC_VER) || defined(__MINGW32__))
static int json_c_vsnprintf(char *str, size_t size, const char *format, va_list ap)
{
int ret;
@@ -35,7 +35,7 @@
#define snprintf json_c_snprintf
#elif !defined(HAVE_SNPRINTF) /* !HAVE_SNPRINTF */
-# error Need vsnprintf!
+#error Need vsnprintf!
#endif /* !HAVE_SNPRINTF && defined(WIN32) */
#endif /* __snprintf_compat_h */
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/strdup_compat.h thunderbird-91.8.1+build1/comm/third_party/json-c/strdup_compat.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/strdup_compat.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/strdup_compat.h 2022-04-15 07:49:22.000000000 +0000
@@ -7,10 +7,10 @@
*/
#if !defined(HAVE_STRDUP) && defined(_MSC_VER)
- /* MSC has the version as _strdup */
-# define strdup _strdup
+/* MSC has the version as _strdup */
+#define strdup _strdup
#elif !defined(HAVE_STRDUP)
-# error You do not have strdup on your system.
+#error You do not have strdup on your system.
#endif /* HAVE_STRDUP */
#endif
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override.c thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override.c
--- thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override.c 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override.c 2022-04-15 07:49:21.000000000 +0000
@@ -5,10 +5,12 @@
* Override strerror() to get consistent output across platforms.
*/
-static struct {
+static struct
+{
int errno_value;
const char *errno_str;
} errno_list[] = {
+/* clang-format off */
#define STRINGIFY(x) #x
#define ENTRY(x) {x, &STRINGIFY(undef_ ## x)[6]}
ENTRY(EPERM),
@@ -18,7 +20,9 @@
ENTRY(EIO),
ENTRY(ENXIO),
ENTRY(E2BIG),
+#ifdef ENOEXEC
ENTRY(ENOEXEC),
+#endif
ENTRY(EBADF),
ENTRY(ECHILD),
ENTRY(EDEADLK),
@@ -52,9 +56,11 @@
ENTRY(EAGAIN),
{ 0, (char *)0 }
};
+/* clang-format on */
// Enabled during tests
-int _json_c_strerror_enable = 0;
+static int _json_c_strerror_enable = 0;
+extern char *getenv(const char *name); // Avoid including stdlib.h
#define PREFIX "ERRNO="
static char errno_buf[128] = PREFIX;
@@ -65,6 +71,8 @@
int ii, jj;
if (!_json_c_strerror_enable)
+ _json_c_strerror_enable = (getenv("_JSON_C_STRERROR_ENABLE") == NULL) ? -1 : 1;
+ if (_json_c_strerror_enable == -1)
return strerror(errno_in);
// Avoid standard functions, so we don't need to include any
@@ -76,7 +84,8 @@
if (errno_list[ii].errno_value != errno_in)
continue;
- for (start_idx = sizeof(PREFIX) - 1, jj = 0; errno_str[jj] != '\0'; jj++, start_idx++)
+ for (start_idx = sizeof(PREFIX) - 1, jj = 0; errno_str[jj] != '\0';
+ jj++, start_idx++)
{
errno_buf[start_idx] = errno_str[jj];
}
@@ -92,10 +101,9 @@
digbuf[ii] = "0123456789"[(errno_in % 10)];
// Reverse the digits
- for (start_idx = sizeof(PREFIX) - 1 ; ii >= 0; ii--, start_idx++)
+ for (start_idx = sizeof(PREFIX) - 1; ii >= 0; ii--, start_idx++)
{
errno_buf[start_idx] = digbuf[ii];
}
return errno_buf;
}
-
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override.h thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override.h 2022-04-15 07:49:21.000000000 +0000
@@ -20,11 +20,11 @@
JSON_EXPORT char *_json_c_strerror(int errno_in);
#ifndef STRERROR_OVERRIDE_IMPL
-#define strerror _json_c_strerror
+#define strerror _json_c_strerror
#endif
#ifdef __cplusplus
}
#endif
-#endif /* _json_strerror_override_h_ */
+#endif /* _json_strerror_override_h_ */
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override_private.h thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override_private.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/strerror_override_private.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/strerror_override_private.h 2022-04-15 07:49:21.000000000 +0000
@@ -6,7 +6,9 @@
* @brief Do not use, json-c internal, may be changed or removed at any time.
*/
+#include "json_types.h"
+
/* Used by tests to get consistent output */
-extern int _json_c_strerror_enable;
+JSON_EXPORT int _json_c_strerror_enable;
#endif
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/STYLE.txt thunderbird-91.8.1+build1/comm/third_party/json-c/STYLE.txt
--- thunderbird-91.7.0+build2/comm/third_party/json-c/STYLE.txt 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/STYLE.txt 2022-04-15 07:49:21.000000000 +0000
@@ -4,22 +4,22 @@
For new code and major changes to a function, switch to the official json-c style.
Official json-c style:
+
Aim for readability, not strict conformance to fixed style rules.
-These rules are not comprehensive. Look to existing code for guidelines.
-Indentation is tab based, with continuations of long lines starting with tabs then spaces for alignment.
-Try to line up components of continuation lines with corresponding part of the line above (i.e. "indent -lp" effect), but avoid excessive identation tha causes extra line wraps.
- e.g. (T=tab, S=space):
-TTTTsome_long_func_call(arg1, arg2,
-TTTTSSSSSSSSSSSSSSSSSSSarg3, arg4);
-TTTTsome_reallly_really_long_func_name(arg1,
-TTTTTarg2, arg3, arg4);
-There should be a space between "if"/"while" and the following parenthesis.
-"case" lines are indented at the same level as the "switch" statement.
-Commas are followed by a single space.
-Include spaces around most non-unary, non-postfix operators, "=", "==', "&", "||", etc...
-Function calls have no space between the name and the parenthesis.
-Curly braces go on their own line.
-Curly braces may be omitted.
+Formatting is tab based; previous attempts at proper alignment with
+spaces for continuation lines have been abandoned in favor of the
+convenience of using clang-format.
+Refer to the .clang-format file for details, and run the tool before commit:
+
+ clang-format -i somefile.c foo.h
+
+For sections of code that would be significantly negatively impacted, surround
+them with magic comments to disable formatting:
+
+ /* clang-format off */
+ ...code...
+ /* clang-format on */
+
Naming:
Words within function and variable names are separated with underscores. Avoid camel case.
diff -Nru thunderbird-91.7.0+build2/comm/third_party/json-c/vasprintf_compat.h thunderbird-91.8.1+build1/comm/third_party/json-c/vasprintf_compat.h
--- thunderbird-91.7.0+build2/comm/third_party/json-c/vasprintf_compat.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/json-c/vasprintf_compat.h 2022-04-15 07:49:21.000000000 +0000
@@ -8,6 +8,8 @@
#include "snprintf_compat.h"
+#include
+
#if !defined(HAVE_VASPRINTF)
/* CAW: compliant version of vasprintf */
static int vasprintf(char **buf, const char *fmt, va_list ap)
@@ -18,24 +20,36 @@
int chars;
char *b;
- if(!buf) { return -1; }
+ if (!buf)
+ {
+ return -1;
+ }
#ifdef WIN32
- chars = _vscprintf(fmt, ap)+1;
-#else /* !defined(WIN32) */
+ chars = _vscprintf(fmt, ap) + 1;
+#else /* !defined(WIN32) */
/* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite
- our buffer like on some 64bit sun systems.... but hey, its time to move on */
- chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap)+1;
- if(chars < 0) { chars *= -1; } /* CAW: old glibc versions have this problem */
+ * our buffer like on some 64bit sun systems.... but hey, its time to move on
+ */
+ chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap) + 1;
+ if (chars < 0)
+ {
+ chars *= -1;
+ } /* CAW: old glibc versions have this problem */
#endif /* defined(WIN32) */
- b = (char*)malloc(sizeof(char)*chars);
- if(!b) { return -1; }
+ b = (char *)malloc(sizeof(char) * chars);
+ if (!b)
+ {
+ return -1;
+ }
- if((chars = vsprintf(b, fmt, ap)) < 0)
+ if ((chars = vsprintf(b, fmt, ap)) < 0)
{
free(b);
- } else {
+ }
+ else
+ {
*buf = b;
}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/openpgp.configure thunderbird-91.8.1+build1/comm/third_party/openpgp.configure
--- thunderbird-91.7.0+build2/comm/third_party/openpgp.configure 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/openpgp.configure 2022-04-15 07:49:21.000000000 +0000
@@ -277,27 +277,3 @@
set_config("COMPILER_RT_BUILTIN_PATH", clang_rt_builtins.clang_rt_path, when=is_windows)
set_config("COMPILER_RT_BUILTIN_LIB", clang_rt_builtins.clang_rt_lib, when=is_windows)
-
-
-@depends(c_compiler, cxx_compiler, when=compile_environment)
-def rnp_compiler(c_compiler, cxx_compiler):
- # Replace -std=gnu++17 or -std=c++17 with -std=gnu++11 or -std=c++11
- _cxxflags = []
- for f in cxx_compiler.flags:
- if f == "-std=c++17":
- _cxxflags.append("-std=c++14")
- elif f == "-std=gnu++17":
- _cxxflags.append("-std=gnu++11")
- else:
- _cxxflags.append(f)
-
- rnp_cc = " ".join(
- list(c_compiler.wrapper) + [c_compiler.compiler] + c_compiler.flags
- )
- rnp_cxx = " ".join(list(cxx_compiler.wrapper) + [cxx_compiler.compiler] + _cxxflags)
-
- return namespace(rnp_cc=rnp_cc, rnp_cxx=rnp_cxx)
-
-
-set_config("MZLA_RNP_CC", rnp_compiler.rnp_cc)
-set_config("MZLA_RNP_CXX", rnp_compiler.rnp_cxx)
diff -Nru thunderbird-91.7.0+build2/comm/third_party/patches/rnp/disable_obsolete_ciphers.patch thunderbird-91.8.1+build1/comm/third_party/patches/rnp/disable_obsolete_ciphers.patch
--- thunderbird-91.7.0+build2/comm/third_party/patches/rnp/disable_obsolete_ciphers.patch 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/patches/rnp/disable_obsolete_ciphers.patch 2022-04-15 07:49:21.000000000 +0000
@@ -1,12 +1,12 @@
diff --git a/third_party/rnp/src/lib/crypto/signatures.cpp b/third_party/rnp/src/lib/crypto/signatures.cpp
--- a/third_party/rnp/src/lib/crypto/signatures.cpp
+++ b/third_party/rnp/src/lib/crypto/signatures.cpp
-@@ -188,29 +188,89 @@ signature_calculate(pgp_signature_t *
- sig->write_material(material);
- return RNP_SUCCESS;
+@@ -178,22 +178,83 @@ signature_calculate(pgp_signature_t &
+ try {
+ sig.write_material(material);
} catch (const std::exception &e) {
RNP_LOG("%s", e.what());
- return RNP_ERROR_GENERIC;
+ throw;
}
}
@@ -64,30 +64,24 @@
+}
+
rnp_result_t
- signature_validate(const pgp_signature_t *sig, const pgp_key_material_t *key, pgp_hash_t *hash)
+ signature_validate(const pgp_signature_t & sig,
+ const pgp_key_material_t & key,
+ rnp::Hash & hash,
+ const rnp::SecurityContext &ctx)
{
- uint8_t hval[PGP_MAX_HASH_SIZE];
- size_t hlen = 0;
- rnp_result_t ret = RNP_ERROR_GENERIC;
-
- const pgp_hash_alg_t hash_alg = pgp_hash_alg_type(hash);
-+ if (!is_hash_alg_allowed_in_sig(hash_alg)) {
++ if (!is_hash_alg_allowed_in_sig(hash.alg())) {
+ return RNP_ERROR_SIGNATURE_INVALID;
+ }
-
- if (!key) {
- return RNP_ERROR_NULL_POINTER;
- }
-
-+ if (!is_pubkey_alg_allowed_in_sig(sig->palg)) {
++
++ if (!is_pubkey_alg_allowed_in_sig(sig.palg)) {
+ return RNP_ERROR_SIGNATURE_INVALID;
+ }
+
- if (sig->palg != key->alg) {
+ if (sig.palg != key.alg) {
RNP_LOG("Signature and key do not agree on algorithm type: %d vs %d",
- (int) sig->palg,
- (int) key->alg);
+ (int) sig.palg,
+ (int) key.alg);
return RNP_ERROR_BAD_PARAMETERS;
}
- /* Finalize hash */
+ /* Check signature security */
diff -Nru thunderbird-91.7.0+build2/comm/third_party/README.json-c thunderbird-91.8.1+build1/comm/third_party/README.json-c
--- thunderbird-91.7.0+build2/comm/third_party/README.json-c 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/README.json-c 2022-04-15 07:49:21.000000000 +0000
@@ -1,41 +1,33 @@
-Directory ./json-c contains a copy of version 0.13.1 of the json-c library,
-which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1-nodoc.tar.gz .
+Directory ./json-c contains a copy of version 0.15 of the json-c library,
+which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15-nodoc.tar.gz .
(Link at https://github.com/json-c/json-c/wiki).
For licensing information, please refer to the included documentation.
The SHA256SUM of the imported file is:
-94a26340c0785fcff4f46ff38609cf84ebcd670df0c8efd75d039cc951d80132 json-c-0.13.1-nodoc.tar.gz
+99bca4f944b8ced8ae0bbc6310d6a3528ca715e69541793a1ef51f8c5b4b0878 json-c-0.15-nodoc.tar.gz
The following files and directories were removed from the source distribution's root:
-autoconf-archive/
+.github/
+apps/
+bench/
+cmake/
fuzz/
tests/
+.clang-format
.editorconfig
.gitignore
.travis.yml
Android.configure.mk
CMakeLists.txt
-Doxyfile
-Makefile.am
-Makefile.in
README
-aclocal.m4
appveyor.yml
-autogen.sh
-compile
-config.guess
-config.sub
-configure
-configure.ac
-depcomp
-install-sh
-json-c-uninstalled.pc.in
+cmake-configure
json-c.pc.in
-ltmain.sh
-missing
-test-driver
+json-c.sym
The following files were added to the source's root by MZLA Technologies:
+config.h.in (modified copy from cmake/config.h.in)
moz.build
+
diff -Nru thunderbird-91.7.0+build2/comm/third_party/README.rnp thunderbird-91.8.1+build1/comm/third_party/README.rnp
--- thunderbird-91.7.0+build2/comm/third_party/README.rnp 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/README.rnp 2022-04-15 07:49:21.000000000 +0000
@@ -1,7 +1,7 @@
Directory ./rnp contains a copy of rnp which has been obtained from:
https://github.com/rnpgp/rnp
-[commit dd923a4e1375a01cf3e8dab7b97be96dde9f94b3]
+[commit f06439f77e50974e427023f77a459843e46ac682]
For licensing information, please refer to the included documentation.
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/CHANGELOG.md thunderbird-91.8.1+build1/comm/third_party/rnp/CHANGELOG.md
--- thunderbird-91.7.0+build2/comm/third_party/rnp/CHANGELOG.md 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/CHANGELOG.md 2022-04-15 07:49:22.000000000 +0000
@@ -1,5 +1,52 @@
## Changelog
+### 0.16.0 [2022-01-20]
+
+#### General
+
+* Added support for OpenSSL cryptography backend so RNP may be built and used on systems without the Botan installed.
+* Added compile-time switches to disable certain features (AEAD, Brainpool curves, SM2/SM3/SM4 algorithms, Twofish)
+* Fixed possible incompatibility with GnuPG on x25519 secret key export from RNP to GnuPG.
+* Fixed building if Git is not available.
+* Fixed export of non-FFI symbols from the rnp.so/rnp.dylib.
+* Fixed support for Gnu/Hurd (absence of PATH_MAX).
+* Added support for `None` compression algorithm.
+* Added support for the dumping of notation data signature subpackets.
+* Fixed key expiration time calculation in the case with newer non-primary self-certification.
+* Improved performance of key import (no key material checks)
+
+#### Security
+
+* Added initial support for customizable security profiles.
+* Mark SHA1 signatures produced later than 2019-01-19, as invalid.
+* Mark MD5 signatures produced later than 2012-01-01, as invalid.
+* Remove SHA1 and 3DES from the default key preferences.
+* Use SHA1 collision detection code when using SHA1.
+* Mark signatures with unknown critical notation as invalid.
+* Do not prematurely mark secret keys as valid.
+* Validate secret key material before the first operation.
+* Limit the number of possible message recipients/signatures to a reasonable value (16k).
+* Limit the number of signature subpackets during parsing.
+
+#### FFI
+
+* Added functions `rnp_backend_string()` and `rnp_backend_version()`.
+* Added functions `rnp_key_25519_bits_tweaked()` and `rnp_key_25519_bits_tweak()` to check and fix x25519 secret key bits.
+* Added security profile manipulation functions: `rnp_add_security_rule()`, `rnp_get_security_rule()`, `rnp_remove_security_rule()`.
+* Added function `rnp_signature_get_expiration()`.
+* Deprecate functions `rnp_enable_debug()`/`rnp_disable_debug()`.
+
+#### CLI
+
+* Write new detailed help messages for `rnp` and `rnpkeys`.
+* Added `-` (stdin) and `env:VAR_NAME` input specifiers, as well as `-` (stdout) output specifier.
+* Do not fail with empty keyrings if those are not needed for the operation.
+* Added algorithm aliases for better usability (i.e. `SHA-256`, `SHA256`, etc.).
+* Added option `--notty` to print everything to stdout instead of TTY.
+* Added command `--edit-key` with subcommands `--check-cv25519-bits` and `--fix-cv25519-bits`.
+* Remove support for `-o someoption=somevalue`, which is unused.
+* Remove no longer used support for additional debug dumping via `--debug source.c`.
+
### 0.15.2 [2021-07-20]
#### General
@@ -32,7 +79,7 @@
#### FFI
* Added function `rnp_key_valid_till64()` to correctly handle keys which expire after the year 2038.
-* Added RNP_FEATURE_* defines to be used instead of raw strings.
+* Added `RNP_FEATURE_*` defines to be used instead of raw strings.
#### Security
@@ -281,7 +328,7 @@
#### FFI
-* Fixed rnp_op_add_signature for G10 keys
+* Fixed `rnp_op_add_signature` for G10 keys
### 0.9.1 [2018-07-12]
@@ -292,7 +339,7 @@
#### CLI
* Added support for keyid/fpr usage with (some) spaces and 0x prefix in
- operations (--sign, etc).
+ operations (`--sign`, etc).
#### FFI
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/default.nix thunderbird-91.8.1+build1/comm/third_party/rnp/default.nix
--- thunderbird-91.7.0+build2/comm/third_party/rnp/default.nix 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/default.nix 2022-04-15 07:49:22.000000000 +0000
@@ -0,0 +1,46 @@
+{ pkgs ? import { }
+, lib ? pkgs.lib
+, stdenv ? pkgs.stdenv
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rnp";
+ version = "unstable";
+
+ src = ./.;
+
+ buildInputs = with pkgs; [ zlib bzip2 json_c botan2 ];
+
+ cmakeFlags = [
+ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
+ "-DBUILD_SHARED_LIBS=on"
+ "-DBUILD_TESTING=on"
+ "-DDOWNLOAD_GTEST=off"
+ "-DDOWNLOAD_RUBYRNP=off"
+ ];
+
+ nativeBuildInputs = with pkgs; [ asciidoctor cmake gnupg gtest pkg-config python3 ];
+
+ # NOTE: check-only inputs should ideally be moved to checkInputs, but it
+ # would fail during buildPhase.
+ # checkInputs = [ gtest python3 ];
+
+ outputs = [ "out" "lib" "dev" ];
+
+ preConfigure = ''
+ commitEpoch=$(date +%s)
+ baseVersion=$(cat version.txt)
+ echo "v$baseVersion-0-g0-dirty+$commitEpoch" > version.txt
+
+ # For generating the correct timestamp in cmake
+ export SOURCE_DATE_EPOCH=$commitEpoch
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/rnpgp/rnp";
+ description = "High performance C++ OpenPGP library, fully compliant to RFC 4880";
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ribose-jeffreylau ];
+ };
+}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/docs/c-usage.adoc thunderbird-91.8.1+build1/comm/third_party/rnp/docs/c-usage.adoc
--- thunderbird-91.7.0+build2/comm/third_party/rnp/docs/c-usage.adoc 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/docs/c-usage.adoc 2022-04-15 07:49:21.000000000 +0000
@@ -108,7 +108,7 @@
=== verify.c
-Location: https://github.com/rnpgp/rnp/blob/master/src/examples/verify.c[
+Location: https://github.com/rnpgp/rnp/blob/master/src/examples/verify.c
This example uses keyrings generated in the `generate.c` example.
@@ -120,7 +120,7 @@
=== dump.c
-Location: https://github.com/rnpgp/rnp/blob/master/src/examples/dump.c[
+Location: https://github.com/rnpgp/rnp/blob/master/src/examples/dump.c
This example dumps OpenPGP packet information from the input stream
(via `stdin` or filename), tuned with flags passed via the
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/docs/installation.adoc thunderbird-91.8.1+build1/comm/third_party/rnp/docs/installation.adoc
--- thunderbird-91.7.0+build2/comm/third_party/rnp/docs/installation.adoc 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/docs/installation.adoc 2022-04-15 07:49:22.000000000 +0000
@@ -5,6 +5,26 @@
* `rnp`
* `rnpkeys`
+
+== On NixOS or Nix package manager
+
+We provide a Nix package for easy installation on NixOS and any OS with Nix
+installed (including Linux and macOS, even NixOS on WSL).
+
+[source,console]
+----
+nix-env -iA nixpkgs.rnp
+----
+
+== With Nix Flakes
+
+We provide a Nix flake.
+
+[source,console]
+----
+nix profile install github:rnpgp/rnp
+----
+
== On macOS using Homebrew
We provide a Homebrew tap for easy installation of RNP on macOS.
@@ -34,15 +54,15 @@
[source,console]
----
# Clone the repository by version tag (or omit it to get the latest sources)
-git clone https://github.com/rnpgp/rnp.git -b v0.15.2
+git clone https://github.com/rnpgp/rnp.git -b v0.16.0
# Install required packages
sudo apt install g++-8 cmake libbz2-dev zlib1g-dev libjson-c-dev \
build-essential python-minimal
# Download, build and install Botan2
-wget -qO- https://botan.randombit.net/releases/Botan-2.14.0.tar.xz | tar xvJ
-cd Botan-2.14.0
+wget -qO- https://botan.randombit.net/releases/Botan-2.18.2.tar.xz | tar xvJ
+cd Botan-2.18.2
./configure.py --prefix=/usr
make
sudo make install
@@ -70,7 +90,7 @@
[source,console]
----
# Clone the repository by version tag (or omit it to get the latest sources)
-git clone https://github.com/rnpgp/rnp.git -b v0.15.2
+git clone https://github.com/rnpgp/rnp.git -b v0.16.0
# Enable access to `testing` packages by editing /etc/apt/sources.list
# deb http://deb.debian.org/debian testing main
@@ -91,6 +111,32 @@
sudo make install
----
+== On Gentoo Linux
+
+RNP ebuilds are available from an overlay repository named `rnp`.
+
+=== Using eselect-repository (the current way)
+
+Prerequisite: ensure `eselect-repository` is installed on your system.
+
+[source,console]
+----
+eselect repository enable rnp
+emaint sync -r rnp
+emerge -av app-crypt/rnp
+----
+
+=== Using layman (the old way)
+
+Prerequisite: ensure `layman` is installed on your system.
+
+[source,console]
+----
+layman -a rnp
+layman -s rnp
+emerge -av app-crypt/rnp
+----
+
== Compile from source
Clone this repo, or download a release and expand it.
@@ -185,4 +231,3 @@
You may check dependencies and their paths via `ntldd.exe` in the MSYS command
prompt.
-
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/docs/signing-keys.adoc thunderbird-91.8.1+build1/comm/third_party/rnp/docs/signing-keys.adoc
--- thunderbird-91.7.0+build2/comm/third_party/rnp/docs/signing-keys.adoc 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/docs/signing-keys.adoc 2022-04-15 07:49:22.000000000 +0000
@@ -0,0 +1,5 @@
+
+= PGP keys used for signing source code
+
+The current OpenPGP key used for signing source code for RNP is hosted at
+https://www.rnpgp.org/openpgp_keys/[rnpgp.org^].
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/flake.lock thunderbird-91.8.1+build1/comm/third_party/rnp/flake.lock
--- thunderbird-91.7.0+build2/comm/third_party/rnp/flake.lock 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/flake.lock 2022-04-15 07:49:22.000000000 +0000
@@ -0,0 +1,42 @@
+{
+ "nodes": {
+ "flake-utils": {
+ "locked": {
+ "lastModified": 1638122382,
+ "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1640849002,
+ "narHash": "sha256-XrU11TR+Nz7bm8XLU07uQJAxeH5cKnZhXf0hfZftFqE=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "d50c9666ca2b96b4488551ec968babe4cc45c52b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/flake.nix thunderbird-91.8.1+build1/comm/third_party/rnp/flake.nix
--- thunderbird-91.7.0+build2/comm/third_party/rnp/flake.nix 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/flake.nix 2022-04-15 07:49:22.000000000 +0000
@@ -0,0 +1,26 @@
+{
+ description = "High performance C++ OpenPGP library, fully compliant to RFC 4880";
+
+ inputs = {
+ nixpkgs.url = "github:nixos/nixpkgs";
+ flake-utils.url = "github:numtide/flake-utils";
+ };
+
+ outputs = { self, nixpkgs, flake-utils }:
+ flake-utils.lib.eachDefaultSystem (system:
+ let
+ pkgs = nixpkgs.legacyPackages.${system};
+ thePackage = pkgs.callPackage ./default.nix { };
+ in
+ rec {
+ defaultApp = flake-utils.lib.mkApp {
+ drv = defaultPackage;
+ };
+ defaultPackage = thePackage;
+ devShell = pkgs.mkShell {
+ buildInputs = [
+ thePackage
+ ];
+ };
+ });
+}
diff -Nru thunderbird-91.7.0+build2/comm/third_party/rnp/include/rekey/rnp_key_store.h thunderbird-91.8.1+build1/comm/third_party/rnp/include/rekey/rnp_key_store.h
--- thunderbird-91.7.0+build2/comm/third_party/rnp/include/rekey/rnp_key_store.h 2022-03-07 21:35:20.000000000 +0000
+++ thunderbird-91.8.1+build1/comm/third_party/rnp/include/rekey/rnp_key_store.h 2022-04-15 07:49:21.000000000 +0000
@@ -40,75 +40,9 @@
#include
#include