<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/237a0a45fbdf829839f17827a4d0d42487f04664">https://github.com/macports/macports-ports/commit/237a0a45fbdf829839f17827a4d0d42487f04664</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 237a0a45fbd borgbackup: remove already applied patch
</span>237a0a45fbd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 237a0a45fbdf829839f17827a4d0d42487f04664
</span>Author: Justin Vallon <JustinVallon@gmail.com>
AuthorDate: Tue Apr 2 00:57:30 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> borgbackup: remove already applied patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> patch-allow-msgpack-1.0.8 was already applied upstream between 1.2.7
</span><span style='display:block; white-space:pre;color:#404040;'> and 1.2.8. patch ends up assuming it is reversed, and undoes it.
</span>---
sysutils/borgbackup/Portfile | 4 +---
.../borgbackup/files/patch-allow-msgpack-1.0.8.diff | 21 ---------------------
2 files changed, 1 insertion(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/borgbackup/Portfile b/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c4b4d14a85..01f5db046df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/borgbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name borgbackup
version 1.2.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories sysutils
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,6 @@ checksums rmd160 b816db029cb4ce49de2025615c14dc87ed2cab17 \
</span> sha256 d39d22b0d2cb745584d68608a179b6c75f7b40e496e96feb789e41d34991f4aa \
size 4369117
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-allow-msgpack-1.0.8.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> python.default_version 312
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/borgbackup/files/patch-allow-msgpack-1.0.8.diff b/sysutils/borgbackup/files/patch-allow-msgpack-1.0.8.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c65483dc4a0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/borgbackup/files/patch-allow-msgpack-1.0.8.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2024-03-07 15:04:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2024-03-07 15:05:08.088211267 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Please note:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using any other msgpack version is not supported by borg development and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # any feedback related to issues caused by this will be ignored.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'msgpack >=0.5.6, <=1.0.7, !=1.0.1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'msgpack >=0.5.6, <=1.0.8, !=1.0.1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'packaging',
</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;'>---- src/borg/helpers/msgpack.py.orig 2023-12-02 02:02:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/borg/helpers/msgpack.py 2024-03-07 15:05:36.775309934 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,7 +182,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def is_supported_msgpack():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DO NOT CHANGE OR REMOVE! See also requirements and comments in setup.py.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import msgpack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (0, 5, 6) <= msgpack.version <= (1, 0, 7) and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (0, 5, 6) <= msgpack.version <= (1, 0, 8) and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msgpack.version not in [(1, 0, 1), ] # < add bad releases here to deny list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>