[tor-commits] [tor-browser-build/master] README.HACKING: explain how to test a firefox patch

[boklm]

commit cebdaf3303a4165f200d20e6d9f8c04ea90f15e2
Author: Nicolas Vigier 
Date:   Thu Aug 10 11:48:13 2017 +0200

README.HACKING: explain how to test a firefox patch
---
 README.HACKING | 24 
 1 file changed, 24 insertions(+)

diff --git a/README.HACKING b/README.HACKING
index 2687ed1..221cc90 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -198,6 +198,30 @@ To find the resulting file from the build, you can use 'ls 
-ltr out/tor/'
 to find the file with the last modification time.
 
 
+Patching Firefox (or an other component)
+
+
+If you want to test a firefox patch, the easiest way to do it is to
+copy the patch file to the projects/firefox/ directory, then edit
+projects/firefox/config to add the new patch to the list of input_files:
+
+  - filename: patch-for-.patch
+
+Then edit projects/firefox/build to add a line somewhere (probably just
+before running the configure script) to apply the patch:
+
+  patch -p1 < $rootdir/patch-for-.patch
+
+You can now run 'make testbuild' (or an other build target) to start a
+build with the patch.
+
+As an alternative, if you have your patch in a git repository, you can
+edit projects/firefox/config to change the git_url option to point to
+your git repository, and change the git_hash option to point to the
+commit you want to build. You will also need to comment the
+'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag).
+
+
 Debugging a build error
 ---
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Add 0.3.1 and 0.3.2 to known versions.

[karsten]

commit 5a15bead74d53173308eccd9ff16b54267fd4264
Author: Karsten Loesing 
Date:   Thu Aug 10 16:23:56 2017 +0200

Add 0.3.1 and 0.3.2 to known versions.

Fixes #23165.
---
 website/rserve/graphs.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index c18e228..149ddd5 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -356,7 +356,7 @@ plot_versions <- function(start, end, path) {
   relays = s$relays)
   known_versions <- c("Other", "0.1.0", "0.1.1", "0.1.2", "0.2.0",
 "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7",
-"0.2.8", "0.2.9", "0.3.0")
+"0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2")
   getPalette = colorRampPalette(brewer.pal(12, "Paired"))
   colours <- data.frame(breaks = known_versions,
 values = rep(brewer.pal(min(12, length(known_versions)), "Paired"),

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Synchronize mozconfig files with their version from tor-browser.git

[boklm]

commit aa96f1ab37786d11529f8266a1eeca07b04e7016
Author: Nicolas Vigier 
Date:   Thu Aug 10 12:39:09 2017 +0200

Synchronize mozconfig files with their version from tor-browser.git

The main change is the removal of the --enable-jemalloc=4 option which
was done with #22482.
---
 projects/firefox/mozconfig-linux-i686   | 3 +--
 projects/firefox/mozconfig-linux-x86_64 | 3 +--
 projects/firefox/mozconfig-osx-x86_64   | 3 +--
 projects/firefox/mozconfig-windows-i686 | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/mozconfig-linux-i686 
b/projects/firefox/mozconfig-linux-i686
index 8b4ecb3..a7d75fa 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -31,7 +31,6 @@ ac_add_options --disable-debug
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
-# Let's not compile EME at least until we can enable ClearKey and only 
Clearkey.
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 #ac_add_options --disable-ctypes
-ac_add_options --enable-jemalloc=4
diff --git a/projects/firefox/mozconfig-linux-x86_64 
b/projects/firefox/mozconfig-linux-x86_64
index cde5b49..7d9ab1c 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -23,7 +23,6 @@ ac_add_options --disable-debug
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
-# Let's not compile EME at least until we can enable ClearKey and only 
Clearkey.
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 #ac_add_options --disable-ctypes
-ac_add_options --enable-jemalloc=4
diff --git a/projects/firefox/mozconfig-osx-x86_64 
b/projects/firefox/mozconfig-osx-x86_64
index 1658e18..bc7a30e 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -50,7 +50,6 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
 ac_add_options --disable-tests
-# Let's not compile EME at least until we can enable ClearKey and only 
Clearkey.
-# (Apart from that there is no Adobe CRM module for OS X right now)
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 # ac_add_options --disable-ctypes
diff --git a/projects/firefox/mozconfig-windows-i686 
b/projects/firefox/mozconfig-windows-i686
index de86c49..af30573 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar
 # We can't build the sandbox code with mingw-w64:
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
 ac_add_options --disable-sandbox
-# EME is not running without sandbox. Thus, don't compile it in the first 
place.
+# Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] README.HACKING: explain which mozconfig files we are using

[boklm]

commit 2c5b8113fa1fcbfaac8f5b3310b7e54a7ca38af2
Author: Nicolas Vigier 
Date:   Thu Aug 10 12:24:20 2017 +0200

README.HACKING: explain which mozconfig files we are using
---
 README.HACKING | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/README.HACKING b/README.HACKING
index 221cc90..8dde2f2 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -222,6 +222,21 @@ commit you want to build. You will also need to comment the
 'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag).
 
 
+The Firefox mozconfig files
+---
+
+In the gitian build, we are using the mozconfig files included in the
+tor-browser.git repository (the .mozconfig, .mozconfig-mac and
+.mozconfig-mingw files).
+
+In the rbm build however, we need to make some small modifications to
+those files, so we are instead using mozconfig files stored in the
+projects/firefox/ directory and ignoring the .mozconfig files from the
+tor-browser.git repository.
+
+This could change in the future, when we are not using gitian anymore.
+
+
 Debugging a build error
 ---
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Update tor-browser.git branch used in nightly

[boklm]

commit 8a999d86a27b8edd4dfc3ec8a497f13804d37f74
Author: Nicolas Vigier 
Date:   Thu Aug 10 12:43:52 2017 +0200

Update tor-browser.git branch used in nightly
---
 projects/firefox/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index e2cf727..1360772 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -27,7 +27,7 @@ targets:
   torbrowser_update_channel: release
 
   nightly:
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2'
 tag_gpg_id: 0
 var:
   torbrowser_update_channel: default

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug 23171: Copy snowflake doc files to proper location

[gk]

commit 32c98b835b5b104de5817d1d54ffaa3755a70b4d
Author: Georg Koppen 
Date:   Thu Aug 10 10:00:34 2017 +

Bug 23171: Copy snowflake doc files to proper location
---
 gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml 
b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index ebfcaa9..710f891 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -231,8 +231,8 @@ script: |
   cmp client client.stomped && (echo "No paths replaced in snowflake-client. 
Maybe the replacement failed or is no longer needed. Check 
descriptors/mac/gitian-pluggable-transports.yml"; exit 1)
   cp -a client.stomped $PTDIR/snowflake-client
   cd ..
-  mkdir -p $INSTDIR/Docs/snowflake
-  cp -a README.md LICENSE $INSTDIR/Docs/snowflake
+  mkdir -p $DOCSDIR/snowflake
+  cp -a README.md LICENSE $DOCSDIR/snowflake
   cd ..
 
   # Grabbing the result

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits