tor 0.2.5.8-rc. update build-patches, since line offsets are kinda hi…

…gh now.
OnionBrowser · Sep 25, 2014 · 674c36b · 674c36b
1 parent 9d79327
commit 674c36b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/build-patches/tor-nsenviron.diff b/build-patches/tor-nsenviron.diff
@@ -1,6 +1,6 @@
---- build/src/tor-0.2.3.19-rc/src/common/compat.c.orig	2012-07-20 12:11:13.000000000 -0700
-+++ build/src/tor-0.2.3.19-rc/src/common/compat.c	2012-07-20 12:12:07.000000000 -0700
-@@ -1797,32 +1797,32 @@
+--- build/src/tor-0.2.5.8-rc/src/common/compat.c.orig	2014-09-25 15:05:39.000000000 -0400
++++ build/src/tor-0.2.5.8-rc/src/common/compat.c	2014-09-25 15:10:06.000000000 -0400
+@@ -2144,32 +2144,32 @@
    }
    return absfname;
  #endif

diff --git a/build-patches/tor-ptrace.diff b/build-patches/tor-ptrace.diff
@@ -1,6 +1,6 @@
---- build/src/tor-0.2.3.19-rc/src/common/compat.c.orig	2012-07-20 12:12:44.000000000 -0700
-+++ build/src/tor-0.2.3.19-rc/src/common/compat.c	2012-07-20 12:13:00.000000000 -0700
-@@ -1641,16 +1641,16 @@
+--- build/src/tor-0.2.5.8-rc/src/common/compat.c.orig	2014-09-25 15:05:39.000000000 -0400
++++ build/src/tor-0.2.5.8-rc/src/common/compat.c	2014-09-25 15:06:50.000000000 -0400
+@@ -1979,16 +1979,16 @@
  #ifdef PR_SET_DUMPABLE
    attempted = 1;
    r = prctl(PR_SET_DUMPABLE, 0);

diff --git a/build-tor.sh b/build-tor.sh
@@ -23,7 +23,7 @@
 # Choose your tor version and your currently-installed iOS SDK version:
 #
 #VERSION="0.2.4.23"
-VERSION="0.2.5.7-rc"
+VERSION="0.2.5.8-rc"
 USERSDKVERSION="8.0"
 MINIOSVERSION="6.1"
 VERIFYGPG=true
@@ -117,11 +117,17 @@ cd "${SRCDIR}/tor-${VERSION}"
 ####
 # Patch to remove the "DisableDebuggerAttachment" ptrace() calls
 # that are not allowed in App Store apps
+#   cp build/src/tor-0.2.5.8-rc/src/common/compat.c{,.orig}
+#   make the edit (see diff)
+#   diff -U5 build/src/tor-0.2.5.8-rc/src/common/compat.c{.orig,} > build-patches/tor-ptrace.diff
 patch -p3 < ../../../build-patches/tor-ptrace.diff
 
 # Patch to remove "_NSGetEnviron()" call not allowed in App Store
 # apps (even fails to compile under iPhoneSDK due to that function
 # being undefined)
+#   cp build/src/tor-0.2.5.8-rc/src/common/compat.c{.orig,} # after above patch
+#   make the edit (see diff)
+#   diff -U5 build/src/tor-0.2.5.8-rc/src/common/compat.c{.orig,} > build-patches/tor-nsenviron.diff
 patch -p3 < ../../../build-patches/tor-nsenviron.diff
 
 #####