* [PR PATCH] rclone: update to 1.59.1.
@ 2022-08-11 20:58 daniel-eys
2022-08-11 21:11 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: daniel-eys @ 2022-08-11 20:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is a new pull request by daniel-eys against master on the void-packages repository
https://github.com/daniel-eys/void-packages rclone
https://github.com/void-linux/void-packages/pull/38618
rclone: update to 1.59.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
patch is upstream and now included in this release
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38618.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rclone-38618.patch --]
[-- Type: text/x-diff, Size: 3347 bytes --]
From fcd0f358541af68af8baf2a48e58e26e3d8f87eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 11 Aug 2022 22:47:09 +0200
Subject: [PATCH] rclone: update to 1.59.1.
---
srcpkgs/rclone/patches/alignment.patch | 45 --------------------------
srcpkgs/rclone/template | 4 +--
2 files changed, 2 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/rclone/patches/alignment.patch
diff --git a/srcpkgs/rclone/patches/alignment.patch b/srcpkgs/rclone/patches/alignment.patch
deleted file mode 100644
index 7ddc42a8b288..000000000000
--- a/srcpkgs/rclone/patches/alignment.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/rclone/rclone/pull/6311
-From 67fd60275a6187c41c4944545c2145cd28bc330d Mon Sep 17 00:00:00 2001
-From: r-ricci <ricci@disroot.org>
-Date: Mon, 11 Jul 2022 18:34:06 +0100
-Subject: [PATCH] union: fix panic due to misalignment of struct field in 32
- bit architectures
-
-`FS.cacheExpiry` is accessed through sync/atomic.
-According to the documentation, "On ARM, 386, and 32-bit MIPS, it is
-the caller's responsibility to arrange for 64-bit alignment of 64-bit
-words accessed atomically. The first word in a variable or in an
-allocated struct, array, or slice can be relied upon to be 64-bit
-aligned."
-Before commit 1d2fe0d8564bc679ece166c24b24e6fe7dc1455c this field was
-aligned, but then a new field was added to the structure, causing the
-test suite to panic on linux/386.
-No other field is used with sync/atomic, so `cacheExpiry` can just be
-placed at the beginning of the stuct to ensure it is always aligned.
----
- backend/union/upstream/upstream.go | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/backend/union/upstream/upstream.go b/backend/union/upstream/upstream.go
-index 35b477f7930a..7b9f44fd2a39 100644
---- a/backend/union/upstream/upstream.go
-+++ b/backend/union/upstream/upstream.go
-@@ -24,6 +24,10 @@ var (
-
- // Fs is a wrap of any fs and its configs
- type Fs struct {
-+ // In order to ensure memory alignment on 32-bit architectures
-+ // when this field is accessed through sync/atomic functions,
-+ // it must be the first entry in the struct
-+ cacheExpiry int64 // usage cache expiry time
- fs.Fs
- RootFs fs.Fs
- RootPath string
-@@ -32,7 +36,6 @@ type Fs struct {
- creatable bool
- usage *fs.Usage // Cache the usage
- cacheTime time.Duration // cache duration
-- cacheExpiry int64 // usage cache expiry time
- cacheMutex sync.RWMutex
- cacheOnce sync.Once
- cacheUpdate bool // if the cache is updating
diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 163095c64e2d..95338a183482 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,6 +1,6 @@
# Template file for 'rclone'
pkgname=rclone
-version=1.59.0
+version=1.59.1
revision=1
wrksrc="rclone-v${version}"
build_style=go
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://rclone.org/"
changelog="https://rclone.org/changelog/"
distfiles="https://downloads.rclone.org/v${version}/rclone-v${version}.tar.gz"
-checksum=9061caad3082f4d275d90f2975ef120fb71f6537ed88d08db1a3b5404db5ae49
+checksum=db3860e4549af28d87aa83f2035a57c5d081b179e40d4c828db19c3c3545831e
pre_build() {
if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: rclone: update to 1.59.1.
2022-08-11 20:58 [PR PATCH] rclone: update to 1.59.1 daniel-eys
@ 2022-08-11 21:11 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-08-11 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]
There's a merged pull request on the void-packages repository
rclone: update to 1.59.1.
https://github.com/void-linux/void-packages/pull/38618
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
patch is upstream and now included in this release
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-11 21:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-11 20:58 [PR PATCH] rclone: update to 1.59.1 daniel-eys
2022-08-11 21:11 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).