From f61c9c797f7823bfd33368308ba2ff9666c7b808 Mon Sep 17 00:00:00 2001 From: its-pointless Date: Sun, 23 Jul 2017 10:55:50 +1000 Subject: [PATCH] refix htc bug and fix dependences --- disabled-packages/apt/build.sh | 2 +- disabled-packages/apt/methods-connect.cc.patch | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/disabled-packages/apt/build.sh b/disabled-packages/apt/build.sh index 407c9ae9..7456b6db 100644 --- a/disabled-packages/apt/build.sh +++ b/disabled-packages/apt/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" -TERMUX_PKG_DEPENDS="libbz2, liblzma, dpkg, gpgv, libc++" +TERMUX_PKG_DEPENDS="libutil, libandroid-glob, libbz2, liblzma, dpkg, gpgv, libc++" TERMUX_PKG_VERSION=1.4.7 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=ea2a2e8e08daf8ea11aeaa86928d943a42ce53989165a30cc828838d470b7719 diff --git a/disabled-packages/apt/methods-connect.cc.patch b/disabled-packages/apt/methods-connect.cc.patch index 95956a0b..2767a572 100644 --- a/disabled-packages/apt/methods-connect.cc.patch +++ b/disabled-packages/apt/methods-connect.cc.patch @@ -1,5 +1,5 @@ --- ../cache/apt-1.4.7/methods/connect.cc 2017-07-14 07:45:39.000000000 +1000 -+++ ./methods/connect.cc 2017-07-20 09:33:48.701839138 +1000 ++++ ./methods/connect.cc 2017-07-23 10:50:27.755510218 +1000 @@ -129,7 +129,7 @@ // Check the socket for an error condition @@ -9,3 +9,15 @@ if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) return _error->Errno("getsockopt",_("Failed")); +@@ -301,7 +301,10 @@ + if(LastHost != Host || LastPort != Port) + { + SrvRecords.clear(); +- if (_config->FindB("Acquire::EnableSrvRecords", true) == true) ++ /* Disable by default in Termux due to it breaking on (some) HTC ++ devices (https://github.com/termux/termux-packages/issues/99). */ ++ ++ if (_config->FindB("Acquire::EnableSrvRecords", false) == true) + { + GetSrvRecords(Host, DefPort, SrvRecords); + // RFC2782 defines that a lonely '.' target is an abort reason -- 2.11.0