<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/3adca112cce0fb66787cf3f7e8fc98ca89dc3779">https://github.com/macports/macports-ports/commit/3adca112cce0fb66787cf3f7e8fc98ca89dc3779</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3adca112cce0fb66787cf3f7e8fc98ca89dc3779
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Jun 24 13:22:53 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-digest: update to 0.6.36, drop now unneeded patch
</span>---
R/R-digest/Portfile | 17 ++---
...port-upstream-patch-for-Big-endian-platfo.patch | 84 ----------------------
2 files changed, 7 insertions(+), 94 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-digest/Portfile b/R/R-digest/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1449a8f64b..a554defef2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-digest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-digest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,25 +3,22 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran eddelbuettel digest 0.6.35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran eddelbuettel digest 0.6.36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-2+
description Create compact hash digests of R objects
long_description {*}${description}
homepage http://dirk.eddelbuettel.com/code/digest.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2c0e51e77cff0b33be6a78f41a1b8478feb9c0b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cc333fbb05059c4973d0ca5d0f1322c812943d81cdbfa18455f72267abd8781f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 230386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/eddelbuettel/digest/pull/205
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-blake3-backport-upstream-patch-for-Big-endian-platfo.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dbdca36b4fc996087a0880596f6f6803d465619b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d1777364b2358b3ff9d79428fa7c1b280042f88896302765b0d0e2d4dc7ae637 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 231298
</span>
depends_test-append port:R-simplermarkdown \
port:R-tinytest
# On Big-endian platforms spooky hash works fine, but computes different values.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Therefore related tests will fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # https://github.com/eddelbuettel/digest/issues/182
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Therefore it is disabled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/eddelbuettel/digest/issues/182
</span> test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-digest/files/0001-blake3-backport-upstream-patch-for-Big-endian-platfo.patch b/R/R-digest/files/0001-blake3-backport-upstream-patch-for-Big-endian-platfo.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d36a4d0bfd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-digest/files/0001-blake3-backport-upstream-patch-for-Big-endian-platfo.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f1b5e0e719f1a2e3d7baab631abc52e408e744ca Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 22 Jun 2024 08:06:25 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] blake3: backport upstream patch for Big-endian
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://github.com/BLAKE3-team/BLAKE3/commit/0b13637ae31c2e7e1a471e39258606fabb01685e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/blake3.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/blake3_impl.h | 19 +++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/blake3_portable.c | 10 +---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 21 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/blake3.c src/blake3.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 50038b3..1971762 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/blake3.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/blake3.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@ INLINE void output_chaining_value(const output_t *self, uint8_t cv[32]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(cv_words, self->input_cv, 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blake3_compress_in_place(cv_words, self->block, self->block_len,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self->counter, self->flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy(cv, cv_words, 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store_cv_words(cv, cv_words);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INLINE void output_root_bytes(const output_t *self, uint64_t seek, uint8_t *out,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/blake3_impl.h src/blake3_impl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4dfe52f..be245fb 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/blake3_impl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/blake3_impl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,6 +154,25 @@ INLINE void load_key_words(const uint8_t key[BLAKE3_KEY_LEN],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key_words[7] = load32(&key[7 * 4]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INLINE void store32(void *dst, uint32_t w) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ uint8_t *p = (uint8_t *)dst;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p[0] = (uint8_t)(w >> 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p[1] = (uint8_t)(w >> 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p[2] = (uint8_t)(w >> 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p[3] = (uint8_t)(w >> 24);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INLINE void store_cv_words(uint8_t bytes_out[32], uint32_t cv_words[8]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[0 * 4], cv_words[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[1 * 4], cv_words[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[2 * 4], cv_words[2]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[3 * 4], cv_words[3]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[4 * 4], cv_words[4]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[5 * 4], cv_words[5]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[6 * 4], cv_words[6]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store32(&bytes_out[7 * 4], cv_words[7]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void blake3_compress_in_place(uint32_t cv[8],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const uint8_t block[BLAKE3_BLOCK_LEN],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t block_len, uint64_t counter,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/blake3_portable.c src/blake3_portable.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3dce0f8..8a920cb 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/blake3_portable.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/blake3_portable.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,14 +9,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "blake3_impl.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INLINE void store32(void *dst, uint32_t w) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- uint8_t *p = (uint8_t *)dst;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p[0] = (uint8_t)(w >> 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p[1] = (uint8_t)(w >> 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p[2] = (uint8_t)(w >> 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- p[3] = (uint8_t)(w >> 24);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INLINE uint32_t rotr32(uint32_t w, uint32_t c) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (w >> c) | (w << (32 - c));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +147,7 @@ INLINE void hash_one_portable(const uint8_t *input, size_t blocks,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blocks -= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- block_flags = flags;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy(out, cv, 32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ store_cv_words(out, cv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void blake3_hash_many_portable(const uint8_t *const *inputs, size_t num_inputs,
</span></pre><pre style='margin:0'>
</pre>