aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-08-07 13:55:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-08-07 13:56:06 +0000
commitb1b84d86f3aff7df9f57aa0f284430fab56ba3d2 (patch)
tree3d4dd541be9783c41f9247c0e201cdfa45d1c1ea
parenta162da06c3871182eb27e9d58c97639897c24e73 (diff)
downloadaports-b1b84d86f3aff7df9f57aa0f284430fab56ba3d2.tar.gz
aports-b1b84d86f3aff7df9f57aa0f284430fab56ba3d2.tar.bz2
aports-b1b84d86f3aff7df9f57aa0f284430fab56ba3d2.tar.xz
community/aria2: fix time64 bug
upstream issue: https://github.com/aria2/aria2/issues/1666
-rw-r--r--community/aria2/APKBUILD6
-rw-r--r--community/aria2/musl-fix-time64.patch19
2 files changed, 23 insertions, 2 deletions
diff --git a/community/aria2/APKBUILD b/community/aria2/APKBUILD
index 3d3578e88c..72001c2fc8 100644
--- a/community/aria2/APKBUILD
+++ b/community/aria2/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=aria2
pkgver=1.35.0
-pkgrel=1
+pkgrel=2
pkgdesc="Download utility for HTTP(S), (S)FTP, Bittorrent, and Metalink"
url="https://aria2.github.io/"
arch="all"
@@ -15,8 +15,9 @@ checkdepends="cppunit-dev"
pkgusers="aria2"
pkggroups="aria2"
install="$pkgname-daemon.pre-install"
-subpackages="$pkgname-doc $pkgname-daemon::noarch $pkgname-bash-completion:bashcomp:noarch"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-daemon::noarch $pkgname-bash-completion:bashcomp:noarch"
source="https://github.com/aria2/aria2/releases/download/release-$pkgver/aria2-$pkgver.tar.xz
+ musl-fix-time64.patch
$pkgname.conf
$pkgname.initd
$pkgname.confd
@@ -70,6 +71,7 @@ daemon() {
}
sha512sums="82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef aria2-1.35.0.tar.xz
+cc37663a927e5afba348ecce6844f5e49c01374897129d62fa433d44c73ec8df6cadc19c34fcba44cf58d7390fab6584752d99f098d360f1914a9444a02c1798 musl-fix-time64.patch
dd716f27eae2628bd528fd2842de7881e8f8f00d587b179e832f1639241db5bd8f4e74a5b791ca4de984923654b38a28813a89ad49a864f64534903a46878a60 aria2.conf
a191655122d8d4379dd7aef773c6273387d8417b88f4f8f96d4a2121e71d9d005c84f15382b46b90501ecb3675f2505b22fb9494a0e5c4d96792bf8b29c2c01a aria2.initd
ee49208c36be85fdf820eda0b47549732f720624a6f94702c16e1711823d74a23728944f60c85c11d09db6dbde3515adb32bb5ddf44786645b9a36883a5b6404 aria2.confd
diff --git a/community/aria2/musl-fix-time64.patch b/community/aria2/musl-fix-time64.patch
new file mode 100644
index 0000000000..942fb9b300
--- /dev/null
+++ b/community/aria2/musl-fix-time64.patch
@@ -0,0 +1,19 @@
+upstream issue: https://github.com/aria2/aria2/issues/1666
+
+diff --git a/src/ServerStat.cc b/src/ServerStat.cc
+index d35407d..728a9e6 100644
+--- a/src/ServerStat.cc
++++ b/src/ServerStat.cc
+@@ -183,10 +183,10 @@ bool ServerStat::operator==(const ServerStat& serverStat) const
+ std::string ServerStat::toString() const
+ {
+ return fmt("host=%s, protocol=%s, dl_speed=%d, sc_avg_speed=%d,"
+- " mc_avg_speed=%d, last_updated=%ld, counter=%d, status=%s",
++ " mc_avg_speed=%d, last_updated=%" PRId64 ", counter=%d, status=%s",
+ getHostname().c_str(), getProtocol().c_str(), getDownloadSpeed(),
+ getSingleConnectionAvgSpeed(), getMultiConnectionAvgSpeed(),
+- getLastUpdated().getTimeFromEpoch(), getCounter(),
++ (int64_t)getLastUpdated().getTimeFromEpoch(), getCounter(),
+ STATUS_STRING[getStatus()]);
+ }
+