From 270d843e5ac482d6ad5f7bc73e095a2bf5a2d886 Mon Sep 17 00:00:00 2001
From: NamecoinBot <ncdns-repro-bump-bot@namecoin.org>
Date: Fri, 6 May 2022 13:28:41 +0000
Subject: [PATCH 1/5] Bump tor-browser-build to tbb-11.5a11-build1

---
 tor-browser-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-browser-build b/tor-browser-build
index 6f39bfb..564dccb 160000
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 6f39bfb567e775cfae831b46bc09fee0dbb2b5f6
+Subproject commit 564dccbcf08a781a689eedbcd2ff834ae46c4047

From c69739d28d123b16b2defb93575199ef1d34e45b Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Fri, 6 May 2022 13:43:30 +0000
Subject: [PATCH 2/5] Add llvm-project project

---
 projects/llvm-project | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 projects/llvm-project

diff --git a/projects/llvm-project b/projects/llvm-project
new file mode 120000
index 0000000..d30ef2c
--- /dev/null
+++ b/projects/llvm-project
@@ -0,0 +1 @@
+../tor-browser-build/projects/llvm-project
\ No newline at end of file

From ef25e036c92e37ef512b9fa6cad41350dbd8cf41 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Fri, 6 May 2022 13:47:34 +0000
Subject: [PATCH 3/5] Remove clang-source project

---
 projects/clang-source | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 projects/clang-source

diff --git a/projects/clang-source b/projects/clang-source
deleted file mode 120000
index de6f54d..0000000
--- a/projects/clang-source
+++ /dev/null
@@ -1 +0,0 @@
-../tor-browser-build/projects/clang-source
\ No newline at end of file

From c73c160a360a014336cccc1b362fd7777ba874bd Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Fri, 6 May 2022 21:25:22 +0000
Subject: [PATCH 4/5] ncdns-nsis: Use Python 3 for pe_checksum_fix

---
 projects/ncdns-nsis/build  | 10 +---------
 projects/ncdns-nsis/config |  6 +-----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/projects/ncdns-nsis/build b/projects/ncdns-nsis/build
index ba3a892..62c1f32 100644
--- a/projects/ncdns-nsis/build
+++ b/projects/ncdns-nsis/build
@@ -4,14 +4,6 @@
 distdir=/var/tmp/dist/[% project %]
 mkdir -p "$distdir"
 
-# We need to install a recent version of python-pefile so that it works
-# in a x86_64 container:
-# https://github.com/TheTorProject/tor-messenger-build/pull/10
-tar xf $rootdir/[% c('input_files_by_name/python-pefile') %]
-cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/\.tar\.gz$//)
-python setup.py install --user
-cd ..
-
 tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %]
 export PATH="/var/tmp/dist/nsis/bin:$PATH"
 
@@ -70,5 +62,5 @@ makensis ${NSISFLAGS} -DPOSIX_BUILD=1 -DNCDNS_PRODVER=${NCDNS_NSIS_VERSION} [% c
 
 # Working around NSIS braindamage
 mv "${OUTFN}" torbrowser-install-tmp.exe
-python $rootdir/pe_checksum_fix.py
+python3 $rootdir/pe_checksum_fix.py
 mv torbrowser-install-tmp2.exe [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/ncdns-nsis/config b/projects/ncdns-nsis/config
index 359d45a..6277cae 100644
--- a/projects/ncdns-nsis/config
+++ b/projects/ncdns-nsis/config
@@ -16,8 +16,7 @@ var:
   container:
     use_container: 1
   deps:
-    - python
-    - python-future
+    - python3-pefile
     - unzip
 
 targets:
@@ -63,6 +62,3 @@ input_files:
   - project: stemns
     name: stemns
   - filename: pe_checksum_fix.py
-  - name: python-pefile
-    URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533b4016bd582842f53cd9fe9585a74c74/pefile-2017.11.5.tar.gz
-    sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854

From 925631411b8f069b4c2bd7f0be469723b2d3ac37 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Fri, 6 May 2022 23:27:20 +0000
Subject: [PATCH 5/5] ncdns-nsis: Add xz dependency

---
 projects/ncdns-nsis/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/ncdns-nsis/config b/projects/ncdns-nsis/config
index 6277cae..6a29439 100644
--- a/projects/ncdns-nsis/config
+++ b/projects/ncdns-nsis/config
@@ -18,6 +18,7 @@ var:
   deps:
     - python3-pefile
     - unzip
+    - xz-utils
 
 targets:
   windows-x86_64: