proxychains-ng: Update to 4.16

This commit is contained in:
Tee KOBAYASHI 2022-02-28 11:15:50 +09:00 committed by buttaface
parent 1b68db4438
commit 8b8ac623c7
3 changed files with 18 additions and 19 deletions

View File

@ -10,12 +10,3 @@ diff -uNr proxychains-ng-4.13/Makefile proxychains-ng-4.13.mod/Makefile
includedir = $(prefix)/include includedir = $(prefix)/include
libdir = $(prefix)/lib libdir = $(prefix)/lib
sysconfdir=$(prefix)/etc sysconfdir=$(prefix)/etc
@@ -25,7 +25,7 @@
CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
NO_AS_NEEDED = -Wl,--no-as-needed
LIBDL = -ldl
-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
+LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL)
INC =
PIC = -fPIC
AR = $(CROSS_COMPILE)ar

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rofl0r/proxychains-ng
TERMUX_PKG_DESCRIPTION="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies" TERMUX_PKG_DESCRIPTION="A hook preloader that allows to redirect TCP traffic of existing dynamically linked programs through one or more SOCKS or HTTP proxies"
TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=4.14 TERMUX_PKG_VERSION=4.16
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/rofl0r/proxychains-ng/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/rofl0r/proxychains-ng/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=ab31626af7177cc2669433bb244b99a8f98c08031498233bb3df3bcc9711a9cc TERMUX_PKG_SHA256=5f66908044cc0c504f4a7e618ae390c9a78d108d3f713d7839e440693f43b5e7
TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true

View File

@ -1,13 +1,22 @@
diff --git a/src/libproxychains.c b/src/libproxychains.c
index 7373d55..20bf993 100644
--- a/src/libproxychains.c --- a/src/libproxychains.c
+++ b/src/libproxychains.c +++ b/src/libproxychains.c
@@ -332,7 +332,7 @@ static int is_v4inv6(const struct in6_addr *a) { @@ -587,7 +587,7 @@
return a->s6_addr32[0] == 0 && a->s6_addr32[1] == 0 && return !memcmp(a->s6_addr, "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
a->s6_addr16[4] == 0 && a->s6_addr16[5] == 0xffff;
} }
-int connect(int sock, const struct sockaddr *addr, unsigned int len) {
+int connect(int sock, const struct sockaddr *addr, socklen_t len) { -HOOKFUNC(int, connect, int sock, const struct sockaddr *addr, unsigned int len) {
+HOOKFUNC(int, connect, int sock, const struct sockaddr *addr, socklen_t len) {
INIT(); INIT();
PFUNC(); PFUNC();
@@ -729,8 +729,8 @@
}
HOOKFUNC(int, getnameinfo, const struct sockaddr *sa, socklen_t salen,
- char *host, socklen_t hostlen, char *serv,
- socklen_t servlen, int flags)
+ char *host, size_t hostlen, char *serv,
+ size_t servlen, int flags)
{
INIT();
PFUNC();