Fix building tsocks for 32 bit architectures

Thanks to @vishalbiswas in #1573

diff --git a/packages/tsocks/build.sh b/packages/tsocks/build.sh
index 6d218d330302344631d2ad72cdbe4421ee3a14f2..570c30dc49fef9f32ac9f557f50d8c5c9104ea5f 100644 (file)
--- a/packages/tsocks/build.sh
+++ b/packages/tsocks/build.sh
@@ -1,12 +1,12 @@
 TERMUX_PKG_HOMEPAGE=http://tsocks.sf.net
 TERMUX_PKG_DESCRIPTION="transparent network access through a SOCKS 4 or 5 proxy"
 TERMUX_PKG_VERSION=1.8beta5
 TERMUX_PKG_HOMEPAGE=http://tsocks.sf.net
 TERMUX_PKG_DESCRIPTION="transparent network access through a SOCKS 4 or 5 proxy"
 TERMUX_PKG_VERSION=1.8beta5

+TERMUX_PKG_REVISION=1

 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf"
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tsocks/tsocks/1.8%20beta%205/tsocks-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-conf=$TERMUX_PREFIX/etc/tsocks.conf"

-TERMUX_PKG_BLACKLISTED_ARCHES="i686,arm"

 
 termux_step_pre_configure() {
     cp $TERMUX_PKG_SRCDIR/tsocks.conf.complex.example $TERMUX_PREFIX/etc/tsocks.conf
 
 termux_step_pre_configure() {
     cp $TERMUX_PKG_SRCDIR/tsocks.conf.complex.example $TERMUX_PREFIX/etc/tsocks.conf

diff --git a/packages/tsocks/configure.patch b/packages/tsocks/configure.patch
index 0640a6753dd55766fe07cc2e704cf9a147ff85ff..08cf189973baf13f064927c6176aec438b24fb51 100644 (file)
--- a/packages/tsocks/configure.patch
+++ b/packages/tsocks/configure.patch
@@ -1,5 +1,5 @@
 diff --git a/configure b/configure
 diff --git a/configure b/configure

-index 78e120d..7de513b 100755
+index 78e120d..80e5418 100755

 --- a/configure
 +++ b/configure
 @@ -53,11 +53,11 @@ datadir='${prefix}/share'
 --- a/configure
 +++ b/configure
 @@ -53,11 +53,11 @@ datadir='${prefix}/share'


@@ -16,6 +16,15 @@ index 78e120d..7de513b 100755
  
  # Initialize some other variables.
  subdirs=
  
  # Initialize some other variables.
  subdirs=

+@@ -2137,7 +2137,7 @@ EOF
+ echo $ac_n "checking for correct connect prototype""... $ac_c" 1>&6
+ echo "configure:2139: checking for correct connect prototype" >&5
+ PROTO=
+-PROTO1='int __fd, const struct sockaddr * __addr, int len'
++PROTO1='int __fd, const struct sockaddr * __addr, int __len'
+ PROTO2='int __fd, const struct sockaddr_in * __addr, socklen_t __len'
+ PROTO3='int __fd, struct sockaddr * __addr, int __len'
+ PROTO4='int __fd, const struct sockaddr * __addr, socklen_t __len'

 @@ -2228,7 +2228,8 @@ EOF
  echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
  echo "configure:2230: checking for correct poll prototype" >&5
 @@ -2228,7 +2228,8 @@ EOF
  echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
  echo "configure:2230: checking for correct poll prototype" >&5