[termux-packages] / packages / apt / methods-connect.cc.patch

--- ../cache/apt-1.4.7/methods/connect.cc	2017-07-14 07:45:39.000000000 +1000
+++ ./methods/connect.cc	2017-07-23 10:50:27.755510218 +1000
@@ -129,7 +129,7 @@
 
    // Check the socket for an error condition
    unsigned int Err;
-   unsigned int Len = sizeof(Err);
+   socklen_t Len = sizeof(Err);
    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
Commit	Line	Data
dc111072 FF	1	--- ../cache/apt-1.4.7/methods/connect.cc 2017-07-14 07:45:39.000000000 +1000
	2	+++ ./methods/connect.cc 2017-07-23 10:50:27.755510218 +1000
	3	@@ -129,7 +129,7 @@
54cb74f9 FF	4
	5	// Check the socket for an error condition
	6	unsigned int Err;
	7	- unsigned int Len = sizeof(Err);
	8	+ socklen_t Len = sizeof(Err);
	9	if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
	10	return _error->Errno("getsockopt",_("Failed"));
	11
dc111072	12	@@ -301,7 +301,10 @@
54cb74f9 FF	13	if(LastHost != Host \|\| LastPort != Port)
	14	{
	15	SrvRecords.clear();
	16	- if (_config->FindB("Acquire::EnableSrvRecords", true) == true)
	17	+ /* Disable by default in Termux due to it breaking on (some) HTC
	18	+ devices (https://github.com/termux/termux-packages/issues/99). */
dc111072 FF	19	+
	20	+ if (_config->FindB("Acquire::EnableSrvRecords", false) == true)
	21	{
54cb74f9	22	GetSrvRecords(Host, DefPort, SrvRecords);
dc111072	23	// RFC2782 defines that a lonely '.' target is an abort reason