Browse Source

axel: remove patches that no longer needed

emacs-27
Leonid Plyushch 5 years ago
parent
commit
8ae1e0769b
No known key found for this signature in database GPG Key ID: 45F2964132545795
  1. 32
      packages/axel/axel.c.patch
  2. 1
      packages/axel/build.sh
  3. 23
      packages/axel/search.c.patch

32
packages/axel/axel.c.patch

@ -1,32 +0,0 @@
--- axel-2.16.1/src/axel.c 2017-12-05 10:46:05.000000000 +0530
+++ axel.c 2018-03-14 19:29:42.000000000 +0530
@@ -617,7 +617,7 @@
} else {
if (gettime() > (axel->conn[i].last_transfer +
axel->conf->reconnect_delay)) {
- pthread_cancel(*axel->conn[i].setup_thread);
+ pthread_kill(*axel->conn[i].setup_thread, 0);
axel->conn[i].state = false;
pthread_join(*axel->conn[i].
setup_thread, NULL);
@@ -687,7 +687,7 @@
for (int i = 0; i < axel->conf->num_connections; i++) {
/* don't try to kill non existing thread */
if (*axel->conn[i].setup_thread != 0) {
- pthread_cancel(*axel->conn[i].setup_thread);
+ pthread_kill(*axel->conn[i].setup_thread, 0);
pthread_join(*axel->conn[i].setup_thread, NULL);
}
conn_disconnect(&axel->conn[i]);
@@ -770,9 +770,11 @@
int oldstate;
/* Allow this thread to be killed at any time. */
+#ifndef __ANDROID__
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate);
+#endif
pthread_mutex_lock(&conn->lock);
if (conn_setup(conn)) {
conn->last_transfer = gettime();

1
packages/axel/build.sh

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="light command line download accelerator"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="lokesh @hax4us"
TERMUX_PKG_VERSION=2.17.5
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/axel-download-accelerator/axel/releases/download/v${TERMUX_PKG_VERSION}/axel-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=d0bc9440c61000e6076f3cd446bbe9add763bfc5ad98ba067dac0f9fab8cd2eb
TERMUX_PKG_DEPENDS="openssl"

23
packages/axel/search.c.patch

@ -1,23 +0,0 @@
--- axel-2.16.1/src/search.c 2017-12-05 10:46:05.000000000 +0530
+++ search.c 2018-03-14 19:30:01.000000000 +0530
@@ -211,7 +211,7 @@
if (gettime() < results[i].speed_start_time
+ results->conf->search_timeout)
continue; // not timed out yet
- pthread_cancel(*results[i].speed_thread);
+ pthread_kill(*results[i].speed_thread, 0);
break; // do the bookkeeping
case SPEED_FAILED:
break; // do the bookkeeping
@@ -262,9 +262,11 @@
int oldstate;
/* Allow this thread to be killed at any time. */
+#ifndef __ANDROID__
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate);
+#endif
memset(conn, 0, sizeof(conn_t));
conn->conf = results->conf;
if (conn_set(conn, results->url)
Loading…
Cancel
Save