diff --git a/packages/isync/build.sh b/packages/isync/build.sh index dc44fa4461..e246ea62e8 100644 --- a/packages/isync/build.sh +++ b/packages/isync/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=http://isync.sourceforge.net TERMUX_PKG_DESCRIPTION="IMAP and MailDir mailbox synchronizer" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.3.3 +TERMUX_PKG_VERSION=1.4.0 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/isync/isync/${TERMUX_PKG_VERSION}/isync-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f2213bf7f90266e1295deafe39b02d1ba0b4c7f3b897c09cd17c60f0d4f4c882 +TERMUX_PKG_SHA256=84f8bf3ed293365d6d73702ae4680077efddf641bf1ef63fccbda0589bde785e TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-sasl ac_cv_header_db=no ac_cv_berkdb4=no" TERMUX_PKG_DEPENDS="openssl, zlib" diff --git a/packages/isync/isync.patch b/packages/isync/isync.patch deleted file mode 100644 index 08c4179103..0000000000 --- a/packages/isync/isync.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -u -r ../isync-1.3.0.orig/src/compat/config.c ./src/compat/config.c ---- ../isync-1.3.0.orig/src/compat/config.c 2017-10-01 17:42:35.000000000 +0900 -+++ ./src/compat/config.c 2018-02-06 08:41:15.750006264 +0900 -@@ -451,7 +451,7 @@ - goto gotstor; - box->local_store_path = my_strndup( path, pl ); - /* derive a suitable name */ -- if (!strcmp( box->local_store_path, "/var/mail/" ) || !strcmp( box->local_store_path, "/var/spool/mail/" )) { -+ if (!strcmp( box->local_store_path, "@TERMUX_PREFIX@/var/mail/" ) || !strcmp( box->local_store_path, "@TERMUX_PREFIX@/var/spool/mail/" )) { - local_store = nfstrdup( "spool" ); - } else if (!strcmp( box->local_store_path, "~/" )) { - local_store = nfstrdup( "home" ); -diff -u -r ../isync-1.3.0.orig/src/compat/main.c ./src/compat/main.c ---- ../isync-1.3.0.orig/src/compat/main.c 2017-10-01 17:42:35.000000000 +0900 -+++ ./src/compat/main.c 2018-02-06 08:41:15.750006264 +0900 -@@ -384,7 +384,7 @@ - return 1; - } - } else { -- strcpy( path2, "/tmp/mbsyncrcXXXXXX" ); -+ strcpy( path2, "@TERMUX_PREFIX@/tmp/mbsyncrcXXXXXX" ); - if ((fd = mkstemp( path2 )) < 0) { - sys_error( "Error: cannot create temporary config file" ); - return 1; -diff -u -r ../isync-1.3.0.orig/src/socket.c ./src/socket.c ---- ../isync-1.3.0.orig/src/socket.c 2017-10-01 17:42:35.000000000 +0900 -+++ ./src/socket.c 2018-02-06 08:41:15.750006264 +0900 -@@ -398,7 +398,7 @@ - _exit( 127 ); - close( a[0] ); - close( a[1] ); -- execl( "/bin/sh", "sh", "-c", conf->tunnel, (char *)0 ); -+ execl( "@TERMUX_PREFIX@/bin/sh", "sh", "-c", conf->tunnel, (char *)0 ); - _exit( 127 ); - } - diff --git a/packages/isync/src-socket.c.patch b/packages/isync/src-socket.c.patch new file mode 100644 index 0000000000..38bfdd6924 --- /dev/null +++ b/packages/isync/src-socket.c.patch @@ -0,0 +1,12 @@ +diff -uNr isync-1.4.0/src/socket.c isync-1.4.0.mod/src/socket.c +--- isync-1.4.0/src/socket.c 2021-01-01 13:46:34.000000000 +0000 ++++ isync-1.4.0.mod/src/socket.c 2021-02-05 21:07:36.435025222 +0000 +@@ -510,7 +510,7 @@ + _exit( 127 ); + close( a[0] ); + close( a[1] ); +- execl( "/bin/sh", "sh", "-c", conf->tunnel, (char *)0 ); ++ execl( "@TERMUX_PREFIX@/bin/sh", "sh", "-c", conf->tunnel, (char *)0 ); + _exit( 127 ); + } +