Opened 11 months ago

Closed 9 months ago

#21116 closed defect (fixed)

fix building on raspbian wheezy

Reported by: hein Owned by:
Priority: Medium Milestone: Tor: 0.3.0.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

I need the attached patch to build tor raspbian wheezy with

deb-src http://deb.torproject.org/torproject.org wheezy main

--- /home/hein/emacs-backups/!home!hein!src!tor-0.2.9.8!src!test!test_util.c.~1~ 2016-12-07 08:09:23.000000000 -0800
+++ src/test/test_util.c 2016-12-31 04:57:49.261173627 -0800
@@ -5074,7 +5074,8 @@

fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0);
int err = tor_socket_errno(fd1);

  • if (fd1 < 0 && err == SOCK_ERRNO(EPROTONOSUPPORT)) {
+ if (fd1 < 0 && (err == SOCK_ERRNO(EPROTONOSUPPORT)

+ err == SOCK_ERRNO(EAFNOSUPPORT))) {

/* Assume we're on an IPv4-only or IPv6-only system, and give up now. */
goto done;

}

Child Tickets

Change History (5)

comment:1 Changed 11 months ago by nickm

Milestone: Tor: 0.2.8.x-final
Status: newneeds_review

comment:2 Changed 10 months ago by nickm

Milestone: Tor: 0.2.8.x-finalTor: 0.3.0.x-final

comment:3 Changed 10 months ago by dgoulet

Status: needs_reviewmerge_ready

I've cleaned up and taken this one ready for merge: bug21116_030_01

comment:4 Changed 10 months ago by cypherpunks

Status: merge_readyneeds_revision

The changes file contains a extraneous dot and a version number prefixed with tor-.

diff --git a/changes/bug21116 b/changes/bug21116
index 2304ab0fd..09b6e6293 100644
--- a/changes/bug21116
+++ b/changes/bug21116
@@ -1,3 +1,3 @@
   o Minor bugfixes (test):
-    - Fix Raspbian build missing socket errno in test util. Fixes bug 21116.;
-      bugfix on tor-0.2.8.2. Patch by "hein".
+    - Fix Raspbian build missing socket errno in test util. Fixes bug 21116;
+      bugfix on 0.2.8.2. Patch by "hein".

comment:5 Changed 9 months ago by nickm

Resolution: fixed
Status: needs_revisionclosed

I'll merge as-is ; my lint script will catch that for me. :)

Thanks, all!

Note: See TracTickets for help on using tickets.