diff --git a/packages/tinyproxy/build.sh b/packages/tinyproxy/build.sh index c69bda900..5a84ad15c 100644 --- a/packages/tinyproxy/build.sh +++ b/packages/tinyproxy/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tinyproxy.github.io/ TERMUX_PKG_DESCRIPTION="Light-weight HTTP proxy daemon for POSIX operating systems" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.10.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=1.11.0 TERMUX_PKG_SRCURL=https://github.com/tinyproxy/tinyproxy/releases/download/${TERMUX_PKG_VERSION}/tinyproxy-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682 +TERMUX_PKG_SHA256=c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-regexcheck" termux_step_post_massage() { @@ -13,3 +12,7 @@ termux_step_post_massage() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/run/$TERMUX_PKG_NAME find $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var -exec chmod -f u+w,g-rwx,o-rwx \{\} \; } + +termux_step_pre_configure() { + CPPFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX" +} diff --git a/packages/tinyproxy/child.c.patch b/packages/tinyproxy/child.c.patch deleted file mode 100644 index 2f5e5ac7c..000000000 --- a/packages/tinyproxy/child.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../tinyproxy-1.8.4/src/child.c 2015-12-07 14:19:00.000000000 +0000 -+++ ./src/child.c 2018-08-21 21:56:40.448440799 +0000 -@@ -75,7 +75,7 @@ - - static void _child_lock_init (void) - { -- char lock_file[] = "/tmp/tinyproxy.servers.lock.XXXXXX"; -+ char lock_file[] = "@TERMUX_PREFIX@/tmp/tinyproxy.servers.lock.XXXXXX"; - - /* Only allow u+rw bits. This may be required for some versions - * of glibc so that mkstemp() doesn't make us vulnerable. diff --git a/packages/tinyproxy/heap.c.patch b/packages/tinyproxy/heap.c.patch deleted file mode 100644 index 3988d6381..000000000 --- a/packages/tinyproxy/heap.c.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../tinyproxy-1.8.4/src/heap.c 2015-12-07 14:19:00.000000000 +0000 -+++ ./src/heap.c 2018-08-21 21:58:46.821559832 +0000 -@@ -109,9 +109,9 @@ - { - int fd; - void *ptr; -- char buffer[32]; -+ char buffer[128]; - -- static const char *shared_file = "/tmp/tinyproxy.shared.XXXXXX"; -+ static const char *shared_file = "@TERMUX_PREFIX@/tmp/tinyproxy.shared.XXXXXX"; - - assert (size > 0); - diff --git a/packages/tinyproxy/src-m.patch b/packages/tinyproxy/src-m.patch new file mode 100644 index 000000000..5d508ea82 --- /dev/null +++ b/packages/tinyproxy/src-m.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.in 2021-04-16 12:31:11.000000000 +0000 ++++ b/src/Makefile.in 2021-06-25 04:30:56.242203644 +0000 +@@ -58,7 +58,7 @@ + transparent-proxy.c transparent-proxy.h + + tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@ +-tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ -lpthread ++tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ + EXTRA_DIST = conf-tokens.gperf + all: all-am +