Update various packages (#5113)

* calcurse: update to 4.6.0

* dialog: update to 20200327

* dictd: update to 1.13.0

* gitea: update to 1.11.4

* jfrog-cli: update to 1.35.3

* libgd: update to 2.3.0

* libgit2: update to 1.0.0

* libgraphite: update to 1.3.14

* libnftnl: update to 1.1.6

* vim, vim-python: update to 8.2.0500

* unrar: update to 5.9.2

* remind: update to 03.03.01

* nano: update to 4.9.1

* seafile-client: update to 7.0.7

* libgnutls: update to 3.6.13

* apache2: update to 2.4.43
This commit is contained in:
Henrik Grimler 2020-04-03 17:30:41 +02:00 committed by GitHub
parent f1206f1533
commit 3efa45721a
18 changed files with 36 additions and 150 deletions

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
TERMUX_PKG_DESCRIPTION="Apache Web Server"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_VERSION=2.4.41
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION=2.4.43
TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2
TERMUX_PKG_SHA256=133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40
TERMUX_PKG_SHA256=a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43
TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
TERMUX_PKG_BREAKS="apache2-dev"
TERMUX_PKG_REPLACES="apache2-dev"
@ -121,7 +120,7 @@ termux_step_post_make_install() {
termux_step_post_massage() {
# sometimes it creates a $TERMUX_PREFIX/bin/sh -> /bin/sh
rm ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/bin/sh || true
rm -f ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/bin/sh
mkdir -p ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/var/run/apache2
mkdir -p ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/var/log/apache2

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://calcurse.org/
TERMUX_PKG_DESCRIPTION="calcurse is a calendar and scheduling application for the command line"
TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_VERSION=4.5.1
TERMUX_PKG_VERSION=4.6.0
TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=5336576824cba7d40eee0b33213992b4304368972ef556a930f3965e9068f331
TERMUX_PKG_SHA256=fa090307a157e24e790819b20c93e037b89c6132f473abaaa7b21c3be76df043
TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
termux_step_pre_configure() {

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://invisible-island.net/dialog/
TERMUX_PKG_DESCRIPTION="Application used in shell scripts which displays text user interface widgets"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_DEPENDS="ncurses"
TERMUX_PKG_VERSION="1.3-20200228"
TERMUX_PKG_VERSION="1.3-20200327"
TERMUX_PKG_SRCURL=https://invisible-mirror.net/archives/dialog/dialog-$TERMUX_PKG_VERSION.tgz
TERMUX_PKG_SHA256=9ff8c41d1eee9e15d14fde3109d4612b1fe6dbe71fe2c3e743bcfff5e25c1fd9
TERMUX_PKG_SHA256=466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-config"
termux_step_pre_configure() {

View File

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/dict/
TERMUX_PKG_DESCRIPTION="Online dictionary client and server"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=1.12.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.13.0
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/dict/dictd/dictd-${TERMUX_PKG_VERSION}/dictd-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a237f6ecdc854ab10de5145ed42eaa2d9b6d51ffdc495f7daee59b05cc363656
TERMUX_PKG_SHA256=eeba51af77e87bb1b166c6bc469aad463632d40fb2bdd65e6675288d8e1a81e4
TERMUX_PKG_DEPENDS="libmaa, zlib"

View File

@ -1,108 +0,0 @@
diff -u -r ../dictd-1.12.1.orig/Makefile.in ./Makefile.in
--- ../dictd-1.12.1.orig/Makefile.in 2011-03-07 02:52:54.000000000 +0900
+++ ./Makefile.in 2018-02-08 18:50:15.790039388 +0900
@@ -123,7 +123,7 @@
%: %.o
$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
- $^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ $(^:.o=.lo) $(OBJS) $(LDFLAGS) -lz ${LIBS}
include $(srcdir)/deps
diff -u -r ../dictd-1.12.1.orig/dictd.c ./dictd.c
--- ../dictd-1.12.1.orig/dictd.c 2011-01-10 01:53:27.000000000 +0900
+++ ./dictd.c 2018-02-08 18:50:19.980039386 +0900
@@ -75,7 +75,7 @@
const char *logFile = NULL;
int logFile_set; /* 1 if set by command line option */
-const char *pidFile = "/var/run/dictd.pid";
+const char *pidFile = "@TERMUX_PREFIX@/var/run/dictd.pid";
int pidFile_set; /* 1 if set by command line option */
const char *daemon_service = DICT_DEFAULT_SERVICE;
Only in .: dictd.patch
diff -u -r ../dictd-1.12.1.orig/net.c ./net.c
--- ../dictd-1.12.1.orig/net.c 2010-08-22 02:55:40.000000000 +0900
+++ ./net.c 2018-02-08 18:50:22.640039385 +0900
@@ -65,7 +65,9 @@
{
struct hostent *hostEntry;
struct servent *serviceEntry;
+ /*
struct protoent *protocolEntry;
+ */
struct sockaddr_in ssin;
int s;
int hosts = 0;
@@ -79,8 +81,10 @@
} else if (!(ssin.sin_port = htons(atoi(service))))
return NET_NOSERVICE;
+ /*
if (!(protocolEntry = getprotobyname("tcp")))
return NET_NOPROTOCOL;
+ */
if ((hostEntry = gethostbyname(host))) {
++hosts;
@@ -92,7 +96,7 @@
memcpy( &ssin.sin_addr.s_addr, *current, hostEntry->h_length );
PRINTF(DBG_VERBOSE,
("Trying %s (%s)\n",host,inet_ntoa(ssin.sin_addr)));
- if ((s = socket(PF_INET, SOCK_STREAM, protocolEntry->p_proto)) < 0)
+ if ((s = socket(PF_INET, SOCK_STREAM, 6)) < 0)
err_fatal_errno( __func__, "Can't open socket on port %d\n",
ntohs(ssin.sin_port) );
if (connect(s, (struct sockaddr *)&ssin, sizeof(ssin)) >= 0)
@@ -100,7 +104,7 @@
close(s);
}
} else {
- if ((s = socket(PF_INET, SOCK_STREAM, protocolEntry->p_proto)) < 0)
+ if ((s = socket(PF_INET, SOCK_STREAM, 6)) < 0)
err_fatal_errno( __func__, "Can't open socket on port %d\n",
ntohs(ssin.sin_port) );
if (connect(s, (struct sockaddr *)&ssin, sizeof(ssin)) >= 0)
@@ -117,7 +121,9 @@
int queueLength)
{
struct servent *serviceEntry;
+ /*
struct protoent *protocolEntry;
+ */
struct sockaddr_in ssin;
int s;
const int one = 1;
@@ -131,10 +137,12 @@
} else if (!(ssin.sin_port = htons(atoi(service))))
err_fatal( __func__, "Can't get \"%s\" service entry\n", service );
+ /*
if (!(protocolEntry = getprotobyname("tcp")))
err_fatal( __func__, "Can't get \"tcp\" protocol entry\n" );
+ */
- if ((s = socket(PF_INET, SOCK_STREAM, protocolEntry->p_proto)) < 0)
+ if ((s = socket(PF_INET, SOCK_STREAM, 6)) < 0)
err_fatal_errno( __func__, "Can't open socket on port %d\n",
ntohs(ssin.sin_port) );
diff -u -r ../dictd-1.12.1.orig/parse.c ./parse.c
--- ../dictd-1.12.1.orig/parse.c 2008-12-08 01:50:05.000000000 +0900
+++ ./parse.c 2018-02-08 18:52:46.640039330 +0900
@@ -90,10 +90,9 @@
char *buffer;
const char **pt;
static const char *cpp = NULL;
- static const char *cpps[] = { "/lib/cpp",
- "/usr/lib/cpp",
- "/usr/ccs/lib/cpp", /* Solaris */
- "/usr/lang/cpp",
+ static const char *cpps[] = { "@TERMUX_PREFIX@/lib/cpp",
+ "@TERMUX_PREFIX@/ccs/lib/cpp", /* Solaris */
+ "@TERMUX_PREFIX@/lang/cpp",
0 };
static const char *extra_options = "";
FILE *tmp;

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitea.io
TERMUX_PKG_DESCRIPTION="Git with a cup of tea, painless self-hosted git service"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.11.3
TERMUX_PKG_VERSION=1.11.4
TERMUX_PKG_SRCURL=https://github.com/go-gitea/gitea/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=2161d32de58df8afce361cd08d843aa62bd43afbe22f18000cf6d6f6868dc672
TERMUX_PKG_SHA256=8dd92f8fdd1653a62d3846937097e12523a1394bea688dc737f559cdd8f9de07
TERMUX_PKG_DEPENDS="dash, git"
TERMUX_PKG_CONFFILES="etc/gitea/app.ini"

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://jfrog.com/getcli
TERMUX_PKG_DESCRIPTION="A CLI for JFrog products."
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_VERSION=1.35.2
TERMUX_PKG_VERSION=1.35.3
TERMUX_PKG_SRCURL=https://github.com/jfrog/jfrog-cli/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=fc8bf74fc2531437fe59a6cc44d608f32d3aa438e19aa56d0b16ae1b2a31ec87
TERMUX_PKG_SHA256=5ff83aa5e8a47915da7672eeb29f0660039aeae9da93bf52067a06771a95fa38
TERMUX_PKG_DEPENDS="libc++"
termux_step_make() {

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://libgd.github.io/
TERMUX_PKG_DESCRIPTION="GD is an open source code library for the dynamic creation of images by programmers"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=2.2.5
TERMUX_PKG_REVISION=7
TERMUX_PKG_VERSION=2.3.0
TERMUX_PKG_SRCURL=https://github.com/libgd/libgd/releases/download/gd-${TERMUX_PKG_VERSION}/libgd-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a66111c9b4a04e818e9e2a37d7ae8d4aae0939a100a36b0ffb52c706a09074b5
TERMUX_PKG_SHA256=32590e361a1ea6c93915d2448ab0041792c11bae7b18ee812514fe08b2c6a342
TERMUX_PKG_DEPENDS="freetype, fontconfig, libiconv, libjpeg-turbo, libpng, libtiff, libwebp, zlib"
TERMUX_PKG_BREAKS="libgd-dev"
TERMUX_PKG_REPLACES="libgd-dev"

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://libgit2.github.com/
TERMUX_PKG_DESCRIPTION="C library implementing Git core methods"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=0.99.0
TERMUX_PKG_VERSION=1.0.0
TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11
TERMUX_PKG_SHA256=6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4
TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2, zlib"
TERMUX_PKG_BREAKS="libgit2-dev"
TERMUX_PKG_REPLACES="libgit2-dev"

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.gnutls.org/
TERMUX_PKG_DESCRIPTION="Secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_VERSION=3.6.12
TERMUX_PKG_VERSION=3.6.13
TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnutls/v${TERMUX_PKG_VERSION:0:3}/gnutls-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b
TERMUX_PKG_SHA256=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38
TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates, libidn2, libunistring"
TERMUX_PKG_BREAKS="libgnutls-dev"
TERMUX_PKG_REPLACES="libgnutls-dev"
@ -17,6 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-system-priority-file=${TERMUX_PREFIX}/etc/gnutls/default-priorities
--with-included-libtasn1
--without-p11-kit
--disable-guile
"
termux_step_pre_configure() {

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://github.com/silnrsi/graphite
TERMUX_PKG_DESCRIPTION="Font system for multiple languages"
TERMUX_PKG_LICENSE="LGPL-2.0"
TERMUX_PKG_VERSION=1.3.13
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=1.3.14
TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=2f9f609deeddfe2b193502adc8df3b0396694b799a433c36e85fd1242e654cd9
TERMUX_PKG_SHA256=7a3b342c5681921ce2e0c2496509d30b5b078399d5a7bd2358f95166d57d91df
TERMUX_PKG_DEPENDS="libc++"
TERMUX_PKG_BREAKS="libgraphite-dev"
TERMUX_PKG_REPLACES="libgraphite-dev"

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.netfilter.org/projects/libnftnl/
TERMUX_PKG_DESCRIPTION="Netfilter library providing interface to the nf_tables subsystem"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.1.5
TERMUX_PKG_VERSION=1.1.6
TERMUX_PKG_SRCURL=http://netfilter.org/projects/libnftnl/files/libnftnl-$TERMUX_PKG_VERSION.tar.bz2
TERMUX_PKG_SHA256=66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3
TERMUX_PKG_SHA256=c1eb5a696fc1d4b3b412770586017bc01af93da3ddd25233d34a62979dee1eca
TERMUX_PKG_DEPENDS="libmnl"
TERMUX_PKG_BREAKS="libnftnl-dev"
TERMUX_PKG_REPLACES="libnftnl-dev"

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.nano-editor.org/
TERMUX_PKG_DESCRIPTION="Small, free and friendly text editor"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=4.9
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=4.9.1
TERMUX_PKG_SRCURL=https://nano-editor.org/dist/latest/nano-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=0e399729d105cb1a587b4140db5cf1b23215a0886a42b215efa98137164233a6
TERMUX_PKG_SHA256=52cd5a0cefaa6be199bf1a8f5295e2ef1f787f9533d1ab9ed1e52d3a242aba6c
TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, ncurses"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_header_pwd_h=no

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://dianne.skoll.ca/projects/remind/
TERMUX_PKG_DESCRIPTION="Sophisticated calendar and alarm program"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=1:03.03.00
TERMUX_PKG_VERSION=1:03.03.01
TERMUX_PKG_SRCURL=https://dianne.skoll.ca/projects/remind/download/remind-${TERMUX_PKG_VERSION:2}.tar.gz
TERMUX_PKG_SHA256=96895b981ae59c3ba136c59ad54bccaa4fb959197f371aff4eb16eca81b3b61a
TERMUX_PKG_SHA256=d1a164d1c2d1e963d5f1f251457a8065cae12f36e3914cac1e54275180499478
TERMUX_PKG_DEPENDS="libandroid-glob"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_RM_AFTER_INSTALL="bin/tkremind share/man/man1/tkremind.1 bin/cm2rem.tcl share/man/man1/cm2rem.1"

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=http://seafile.com
TERMUX_PKG_DESCRIPTION="Seafile is a file syncing and sharing software with file encryption and group sharing"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_VERSION=7.0.6
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=7.0.7
TERMUX_PKG_SRCURL=https://github.com/haiwen/seafile/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8a7f37b555b5e8750194db9ae8041d2b0ed0035b3fc832112d4a891e02b00488
TERMUX_PKG_SHA256=db50f0b7bc5a231dfc1bedc958e0e191b74cb4a74d6f701d0c6bfc59c4ca18dd
TERMUX_PKG_DEPENDS="ccnet, libcurl, python"
TERMUX_PKG_BREAKS="seafile-client-dev"
TERMUX_PKG_REPLACES="seafile-client-dev"

View File

@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.rarlab.com/
TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"
TERMUX_PKG_LICENSE="non-free"
TERMUX_PKG_LICENSE_FILE="license.txt"
TERMUX_PKG_VERSION=5.9.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=5.9.2
TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=0eb1d1b8e02102fccae775a6d6b79336b69e2cf90e2045de92594dcfb58de100
TERMUX_PKG_SHA256=73d3baf18cf0a197976af2794a848893c35e7d42cee0ff364c89d2e476ebdaa6
TERMUX_PKG_DEPENDS="libandroid-support, libc++"
TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -5,9 +5,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime, python"
TERMUX_PKG_RECOMMENDS="diffutils"
# vim should only be updated every 50 releases on multiples of 50.
# Update both vim and vim-python to the same version in one PR.
TERMUX_PKG_VERSION=8.2.0450
TERMUX_PKG_VERSION=8.2.0500
TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=179fe06c9a4a6fabe18befd30ead1c4c739996dc3755dee7765787bbbd3774e0
TERMUX_PKG_SHA256=93e4aca6a37bdbe7039eebc79e963799ca079ed4fbc5cc8f8e801b362f313343
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
vim_cv_getcwd_broken=no
vim_cv_memmove_handles_overlap=yes

View File

@ -5,9 +5,9 @@ TERMUX_PKG_DEPENDS="libiconv, ncurses, vim-runtime"
TERMUX_PKG_RECOMMENDS="diffutils"
# vim should only be updated every 50 releases on multiples of 50.
# Update both vim and vim-python to the same version in one PR.
TERMUX_PKG_VERSION=8.2.0450
TERMUX_PKG_VERSION=8.2.0500
TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=179fe06c9a4a6fabe18befd30ead1c4c739996dc3755dee7765787bbbd3774e0
TERMUX_PKG_SHA256=93e4aca6a37bdbe7039eebc79e963799ca079ed4fbc5cc8f8e801b362f313343
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
vim_cv_getcwd_broken=no
vim_cv_memmove_handles_overlap=yes