[tor-commits] [Git][tpo/applications/tor-browser-build] Deleted branch bug_40759

2023-04-17 Thread Richard Pospesel (@richard) via tor-commits


Richard Pospesel deleted branch bug_40759 at The Tor Project / Applications / 
tor-browser-build

-- 

You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser-build] Pushed new branch bug_40759

2023-04-17 Thread Richard Pospesel (@richard) via tor-commits


Richard Pospesel pushed new branch bug_40759 at The Tor Project / Applications 
/ tor-browser-build

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/bug_40759
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.10.0esr-12.5-1-build3

2023-04-17 Thread Richard Pospesel (@richard) via tor-commits


Richard Pospesel pushed new tag tor-browser-102.10.0esr-12.5-1-build3 at The 
Tor Project / Applications / Tor Browser

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-browser-102.10.0esr-12.5-1-build3
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] 2 commits: Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when...

2023-04-17 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at The 
Tor Project / Applications / Tor Browser


Commits:
b0a97d20 by Jonathan Kew at 2023-04-17T21:38:31+02:00
Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when 
they 'shadow' system-installed families. r=gfx-reviewers,lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D175350
- - - - -
970ae0b1 by Pier Angelo Vendrame at 2023-04-17T21:38:40+02:00
fixup! Firefox preference overrides.

Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP

Removed the workaround now that we have the upstream fix.

- - - - -


2 changed files:

- browser/app/profile/001-base-profile.js
- gfx/thebes/gfxFcPlatformFontList.cpp


Changes:

=
browser/app/profile/001-base-profile.js
=
@@ -690,8 +690,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto 
Sans Balinese, Noto S
 #endif
 
 #ifdef XP_LINUX
-pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 
41163
-
 // Arabic
 pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
 pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo");


=
gfx/thebes/gfxFcPlatformFontList.cpp
=
@@ -1869,17 +1869,19 @@ void 
gfxFcPlatformFontList::InitSharedFontListForPlatform() {
 }
   };
 
-  // iterate over available fonts
-  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
-  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
-
 #ifdef MOZ_BUNDLED_FONTS
+  // Add bundled fonts before system fonts, to set correct visibility status
+  // for any families that appear in both.
   if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) {
 FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication);
 addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true);
   }
 #endif
 
+  // iterate over available fonts
+  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
+  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
+
   mozilla::fontlist::FontList* list = SharedFontList();
   list->SetFamilyNames(families);
 



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22054938a3c6181b20e57d5e462a2359dead63a7...970ae0b1f280ae01ae1ab3fd38fd131fe0bc7e42

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/22054938a3c6181b20e57d5e462a2359dead63a7...970ae0b1f280ae01ae1ab3fd38fd131fe0bc7e42
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when...

2023-04-17 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor 
Project / Applications / Tor Browser


Commits:
a0b015c4 by Jonathan Kew at 2023-04-17T19:00:43+02:00
Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when 
they 'shadow' system-installed families. r=gfx-reviewers,lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D175350
- - - - -
c24cc05f by Pier Angelo Vendrame at 2023-04-17T19:02:29+02:00
fixup! Firefox preference overrides.

Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP

Removed the workaround now that we have the upstream fix.

- - - - -


2 changed files:

- browser/app/profile/001-base-profile.js
- gfx/thebes/gfxFcPlatformFontList.cpp


Changes:

=
browser/app/profile/001-base-profile.js
=
@@ -696,8 +696,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto 
Sans Balinese, Noto S
 #endif
 
 #ifdef XP_LINUX
-pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 
41163
-
 // Arabic
 pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos");
 pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo");


=
gfx/thebes/gfxFcPlatformFontList.cpp
=
@@ -1869,17 +1869,19 @@ void 
gfxFcPlatformFontList::InitSharedFontListForPlatform() {
 }
   };
 
-  // iterate over available fonts
-  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
-  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
-
 #ifdef MOZ_BUNDLED_FONTS
+  // Add bundled fonts before system fonts, to set correct visibility status
+  // for any families that appear in both.
   if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) {
 FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication);
 addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true);
   }
 #endif
 
+  // iterate over available fonts
+  FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
+  addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false);
+
   mozilla::fontlist::FontList* list = SharedFontList();
   list->SetFamilyNames(families);
 



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/64ea04a6aff7c15c457817b998224da0e8289bcf...c24cc05fc6c5452d9bdd8919d12f93def0a1e406

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/64ea04a6aff7c15c457817b998224da0e8289bcf...c24cc05fc6c5452d9bdd8919d12f93def0a1e406
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [pluggable-transports/snowflake-webext] branch main updated: Add CSP to webextension manifest

2023-04-17 Thread gitolite role via tor-commits
This is an automated email from the git hooks/post-receive script.

cohosh pushed a commit to branch main
in repository pluggable-transports/snowflake-webext.

The following commit(s) were added to refs/heads/main by this push:
 new cbc437e  Add CSP to webextension manifest
cbc437e is described below

commit cbc437eaf36c027ea2d34aacef1179160708771c
Author: Cecylia Bocovich 
AuthorDate: Tue Apr 11 11:47:08 2023 -0400

Add CSP to webextension manifest
---
 webext/manifest_base.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webext/manifest_base.json b/webext/manifest_base.json
index e95025d..1df634c 100644
--- a/webext/manifest_base.json
+++ b/webext/manifest_base.json
@@ -22,7 +22,8 @@
 "default_title": "Snowflake",
 "default_popup": "embed.html"
   },
+  "content_security_policy": "default-src 'self'; connect-src 
wss://*.freehaven.net/ wss://*.torproject.net https://*.torproject.net:* 
https://*.freehaven.net:*";,
   "permissions": [
 "storage"
   ]
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [bridgedb] branch main updated (d43d0ff -> f3e9d85)

2023-04-17 Thread gitolite role via tor-commits
This is an automated email from the git hooks/post-receive script.

meskio pushed a change to branch main
in repository bridgedb.

from d43d0ff  Add changelog entry for version 0.15
 new 1c5f0a9  Shim-token fixes
 new fee040a  Send the captcha challenge on the https form
 new f3e9d85  Update dependencies

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .test.requirements.txt| 10 +-
 .travis.requirements.txt  | 26 +-
 bridgedb/distributors/moat/distributor.py | 18 +++---
 frontend/templates/captcha.html   |  3 ++-
 4 files changed, 31 insertions(+), 26 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [bridgedb] 01/03: Shim-token fixes

2023-04-17 Thread gitolite role via tor-commits
This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main
in repository bridgedb.

commit 1c5f0a9a82435f8c6ffb70abcb9cebdfc2985ed5
Author: meskio 
AuthorDate: Wed Aug 24 12:34:56 2022 +0200

Shim-token fixes

Read all bridges from the dummy file, not only the first one. And use
dummy bridges only for requests without valid shim-token.
---
 bridgedb/distributors/moat/distributor.py | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bridgedb/distributors/moat/distributor.py 
b/bridgedb/distributors/moat/distributor.py
index 82a6d3a..c4aeef4 100644
--- a/bridgedb/distributors/moat/distributor.py
+++ b/bridgedb/distributors/moat/distributor.py
@@ -80,13 +80,17 @@ class MoatDistributor(HTTPSDistributor):
 """Load dummy bridges from a file
 """
 with open(dummyBridgesFile) as f:
-bridge_line = f.readline()
-bridge = Bridge()
-try:
-bridge.updateFromBridgeLine(bridge_line)
-except MalformedBridgeInfo as e:
-logging.warning("Got a malformed dummy bridge: %s" % e)
-self.dummyHashring.insert(bridge)
+for bridge_line in f:
+bridge_line = bridge_line.strip()
+if not bridge_line:
+continue
+
+bridge = Bridge()
+try:
+bridge.updateFromBridgeLine(bridge_line)
+except MalformedBridgeInfo as e:
+logging.warning("Got a malformed dummy bridge: %s" % e)
+self.dummyHashring.insert(bridge)
 
 def getBridges(self, bridgeRequest, interval, dummyBridges=False):
 """Return a list of bridges to give to a user.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [bridgedb] 03/03: Update dependencies

2023-04-17 Thread gitolite role via tor-commits
This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main
in repository bridgedb.

commit f3e9d854996035dd1d12e547b6e49bf4021a9d5a
Author: meskio 
AuthorDate: Fri Sep 9 12:34:27 2022 +0200

Update dependencies
---
 .test.requirements.txt   | 10 +-
 .travis.requirements.txt | 26 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index a256d50..76b711f 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -5,8 +5,8 @@
 # $ pip install -r .test.requirements.txt
 # $ make coverage
 #
-coverage==5.5
-mechanize==0.4.5
-pycodestyle==2.7.0
-pylint==2.8.2
-sure==1.4.11
+coverage==6.4.4
+mechanize==0.4.8
+pycodestyle==2.9.1
+pylint==2.15.2
+sure==2.0.0
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index 17f8b48..2b71958 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -13,21 +13,21 @@
 # $ make coverage
 #
 #--
-attrs==21.2.0
-Babel==2.9.1
-beautifulsoup4==4.9.3
-Mako==1.1.4
-pycryptodome==3.10.1
-Twisted==21.2.0
-coverage==5.5
-coveralls==3.0.1
+attrs==22.1.0
+Babel==2.10.3
+beautifulsoup4==4.11.1
+Mako==1.2.2
+pycryptodome==3.15.0
+Twisted==22.8.0
+coverage==6.4.4
+coveralls==3.3.1
 ipaddr==2.2.0
-mechanize==0.4.5
-Pillow==8.2.0
-pyOpenSSL==20.0.1
+mechanize==0.4.8
+Pillow==9.2.0
+pyOpenSSL==22.0.0
 pygeoip==0.3.2
-qrcode==6.1
+qrcode==7.3.1
 service_identity==21.1.0
 stem==1.8.0
-sure==1.4.11
+sure==2.0.0
 zope.interface==5.4.0

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [bridgedb] 02/03: Send the captcha challenge on the https form

2023-04-17 Thread gitolite role via tor-commits
This is an automated email from the git hooks/post-receive script.

meskio pushed a commit to branch main
in repository bridgedb.

commit fee040af5acc58897d0dfe4e469223a2e128785c
Author: meskio 
AuthorDate: Wed Aug 24 16:06:28 2022 +0200

Send the captcha challenge on the https form
---
 frontend/templates/captcha.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/templates/captcha.html b/frontend/templates/captcha.html
index 5b3b8b3..07a85fd 100644
--- a/frontend/templates/captcha.html
+++ b/frontend/templates/captcha.html
@@ -11,7 +11,8 @@
   {% endif %}
 
 
-  
+  {% raw %}{% endraw %}
+  
   
 
   

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time

2023-04-17 Thread boklm (@boklm) via tor-commits


boklm pushed to branch maint-12.0-mullvad at The Tor Project / Applications / 
tor-browser-build


Commits:
e51dec66 by Nicolas Vigier at 2023-04-17T19:03:44+02:00
Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to 
local time

- - - - -


4 changed files:

- projects/hfsplus-tools/build
- projects/hfsplus-tools/config
- + projects/hfsplus-tools/ignore-timezone.diff
- tools/signing/gatekeeper-bundling.sh


Changes:

=
projects/hfsplus-tools/build
=
@@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz
 cd diskdev_cmds-[% c("version") %]
 
 patch -p1 < $rootdir/newfs_hfs.diff
+patch -p1 < $rootdir/ignore-timezone.diff
 
 make -j[% c("num_procs") %]
 


=
projects/hfsplus-tools/config
=
@@ -21,3 +21,6 @@ input_files:
   # exist on Linux (at that path) and is not required on Linux either, and make
   # the UUID deterministic.
   - filename: newfs_hfs.diff
+  # Remove UTCToLocal conversion to avoid a different result when hwclock
+  # is set to local time or utc time (tor-browser-build#40844)
+  - filename: ignore-timezone.diff


=
projects/hfsplus-tools/ignore-timezone.diff
=
@@ -0,0 +1,13 @@
+diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 
diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c
+--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c2012-02-02 
23:36:59.0 +0100
 diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c  2023-04-17 
13:59:41.99300 +0200
+@@ -463,8 +463,7 @@
+   }
+   hp->lastMountedVersion = kHFSPlusMountVersion;
+ 
+-  /* NOTE: create date is in local time, not GMT!  */
+-  hp->createDate = UTCToLocal(defaults->createDate);
++  hp->createDate = defaults->createDate;
+   hp->modifyDate = defaults->createDate;
+   hp->backupDate = 0;
+   hp->checkedDate = defaults->createDate;


=
tools/signing/gatekeeper-bundling.sh
=
@@ -45,7 +45,7 @@ test -f "$libdmg_file" || \
  "You can build it with:" \
  "  ./rbm/rbm build --target no_containers libdmg-hfsplus" \
  "See var/deps in projects/libdmg-hfsplus/config for the list of 
build dependencies"
-hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz"
+hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz"
 test -f "$hfstools_file" || \
   exit_error "$hfstools_file is missing." \
  "You can build it with:" \



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e51dec66dd9b6a2a92097edc32841dfdafd3c386

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e51dec66dd9b6a2a92097edc32841dfdafd3c386
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time

2023-04-17 Thread boklm (@boklm) via tor-commits


boklm pushed to branch maint-12.0 at The Tor Project / Applications / 
tor-browser-build


Commits:
8c7da1d9 by Nicolas Vigier at 2023-04-17T18:59:23+02:00
Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to 
local time

- - - - -


4 changed files:

- projects/hfsplus-tools/build
- projects/hfsplus-tools/config
- + projects/hfsplus-tools/ignore-timezone.diff
- tools/signing/gatekeeper-bundling.sh


Changes:

=
projects/hfsplus-tools/build
=
@@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz
 cd diskdev_cmds-[% c("version") %]
 
 patch -p1 < $rootdir/newfs_hfs.diff
+patch -p1 < $rootdir/ignore-timezone.diff
 
 make -j[% c("num_procs") %]
 


=
projects/hfsplus-tools/config
=
@@ -21,3 +21,6 @@ input_files:
   # exist on Linux (at that path) and is not required on Linux either, and make
   # the UUID deterministic.
   - filename: newfs_hfs.diff
+  # Remove UTCToLocal conversion to avoid a different result when hwclock
+  # is set to local time or utc time (tor-browser-build#40844)
+  - filename: ignore-timezone.diff


=
projects/hfsplus-tools/ignore-timezone.diff
=
@@ -0,0 +1,13 @@
+diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 
diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c
+--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c2012-02-02 
23:36:59.0 +0100
 diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c  2023-04-17 
13:59:41.99300 +0200
+@@ -463,8 +463,7 @@
+   }
+   hp->lastMountedVersion = kHFSPlusMountVersion;
+ 
+-  /* NOTE: create date is in local time, not GMT!  */
+-  hp->createDate = UTCToLocal(defaults->createDate);
++  hp->createDate = defaults->createDate;
+   hp->modifyDate = defaults->createDate;
+   hp->backupDate = 0;
+   hp->checkedDate = defaults->createDate;


=
tools/signing/gatekeeper-bundling.sh
=
@@ -45,7 +45,7 @@ test -f "$libdmg_file" || \
  "You can build it with:" \
  "  ./rbm/rbm build --target no_containers libdmg-hfsplus" \
  "See var/deps in projects/libdmg-hfsplus/config for the list of 
build dependencies"
-hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz"
+hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz"
 test -f "$hfstools_file" || \
   exit_error "$hfstools_file is missing." \
  "You can build it with:" \



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8c7da1d98c5ab30eb3788cea703b60adf0acf2e4

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8c7da1d98c5ab30eb3788cea703b60adf0acf2e4
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time

2023-04-17 Thread boklm (@boklm) via tor-commits


boklm pushed to branch main at The Tor Project / Applications / 
tor-browser-build


Commits:
a00cfb3c by Nicolas Vigier at 2023-04-17T18:58:08+02:00
Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to 
local time

- - - - -


4 changed files:

- projects/hfsplus-tools/build
- projects/hfsplus-tools/config
- + projects/hfsplus-tools/ignore-timezone.diff
- tools/signing/gatekeeper-bundling.sh


Changes:

=
projects/hfsplus-tools/build
=
@@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz
 cd diskdev_cmds-[% c("version") %]
 
 patch -p1 < $rootdir/newfs_hfs.diff
+patch -p1 < $rootdir/ignore-timezone.diff
 
 make -j[% c("num_procs") %]
 


=
projects/hfsplus-tools/config
=
@@ -21,3 +21,6 @@ input_files:
   # exist on Linux (at that path) and is not required on Linux either, and make
   # the UUID deterministic.
   - filename: newfs_hfs.diff
+  # Remove UTCToLocal conversion to avoid a different result when hwclock
+  # is set to local time or utc time (tor-browser-build#40844)
+  - filename: ignore-timezone.diff


=
projects/hfsplus-tools/ignore-timezone.diff
=
@@ -0,0 +1,13 @@
+diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 
diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c
+--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c2012-02-02 
23:36:59.0 +0100
 diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c  2023-04-17 
13:59:41.99300 +0200
+@@ -463,8 +463,7 @@
+   }
+   hp->lastMountedVersion = kHFSPlusMountVersion;
+ 
+-  /* NOTE: create date is in local time, not GMT!  */
+-  hp->createDate = UTCToLocal(defaults->createDate);
++  hp->createDate = defaults->createDate;
+   hp->modifyDate = defaults->createDate;
+   hp->backupDate = 0;
+   hp->checkedDate = defaults->createDate;


=
tools/signing/gatekeeper-bundling.sh
=
@@ -45,7 +45,7 @@ test -f "$libdmg_file" || \
  "You can build it with:" \
  "  ./rbm/rbm build --target no_containers libdmg-hfsplus" \
  "See var/deps in projects/libdmg-hfsplus/config for the list of 
build dependencies"
-hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz"
+hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz"
 test -f "$hfstools_file" || \
   exit_error "$hfstools_file is missing." \
  "You can build it with:" \



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a00cfb3ccb3253fbb25efe91c030617fef5f7fef

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a00cfb3ccb3253fbb25efe91c030617fef5f7fef
You're receiving this email because of your account on gitlab.torproject.org.


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


[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40811: Make it easier to test the updater

2023-04-17 Thread Pier Angelo Vendrame (@pierov) via tor-commits


Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / 
tor-browser-build


Commits:
7968b10a by Pier Angelo Vendrame at 2023-04-17T17:04:05+02:00
Bug 40811: Make it easier to test the updater

This commit adds a config variable to override the URL for the updater.
When it is defined, a user-provided certificate will replace the
default public keys used to sign nightly builds.

- - - - -


3 changed files:

- .gitignore
- projects/firefox/build
- projects/firefox/config


Changes:

=
.gitignore
=
@@ -14,3 +14,7 @@
 /release
 /alpha
 /nightly
+
+# This file is used to test the updater, and whoever is interested in doing so,
+# should provide their file.
+/projects/firefox/marsigner.der


=
projects/firefox/build
=
@@ -92,7 +92,10 @@ fi
   popd
 [% END %]
 
-[% IF c("var/nightly") && ! c("var/mullvad-browser") -%]
+[% IF c("var/override_updater_url") -%]
+  sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=[% 
c("var/override_updater_url") %]|' build/application.ini.in
+  cp $rootdir/marsigner.der 
toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
+[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
   # Set update url for nightly (#33402 / #40033)
   sed -i 
's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[%
 c("var/nightly_updates_publish_dir") 
%]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
 [% END -%]


=
projects/firefox/config
=
@@ -30,6 +30,12 @@ var:
 - pkg-config
   has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
 
+  # Uncomment this if you want to test the updater. You will need to provide a
+  # marsigner.der in this directory, too. It will be used as a replacement for
+  # the nightly builds keys only. So, using this option for alphas and releases
+  # will not work (the browser will fail with a key/signature mismatch).
+  # override_updater_url: 
'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL'
+
   rezip: |
 rezip_tmpdir=$(mktemp -d)
 mkdir -p "$rezip_tmpdir/z"
@@ -199,6 +205,8 @@ input_files:
 name: translation-tor-browser
 pkg_type: tor-browser
 enable: '[% c("var/tor-browser") && c("var/has_l10n") %]'
+  - filename: marsigner.der
+enable: '[% c("var/override_updater_url") %]'
   - filename: namecoin-torbutton.patch
 enable: '[% c("var/namecoin") %]'
 # TorButton patch authored by Arthur Edelstein, from 
https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7968b10aab154582ac444daf6fe0a47bd26408c4

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7968b10aab154582ac444daf6fe0a47bd26408c4
You're receiving this email because of your account on gitlab.torproject.org.


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