From 0eac1f7ba49eacf7a87fcb25dff762c4d28a2509 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 12 Aug 2022 10:43:22 +0100
Subject: [PATCH 1/2] build: include share/rpcauth in tarball & installer

Fixes #19081.
---
 contrib/guix/libexec/build.sh | 2 ++
 share/setup.nsi.in            | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 28cad05013527..2795a90036970 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -369,6 +369,8 @@ mkdir -p "$DISTSRC"
         # has not been run before buildling, this file will be a stub
         cp "${DISTSRC}/share/examples/bitcoin.conf" "${DISTNAME}/"
 
+        cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/"
+
         # Finally, deterministically produce {non-,}debug binary tarballs ready
         # for release
         case "$HOST" in
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index a5fb2e06cb811..7fa2f39c3c72d 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -75,6 +75,8 @@ Section -Main SEC0000
     File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
     File /oname=COPYING.txt @abs_top_srcdir@/COPYING
     File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
+    SetOutPath $INSTDIR\share\rpcauth
+    File @abs_top_srcdir@/share/rpcauth/*.*
     SetOutPath $INSTDIR\daemon
     File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@
     File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@
@@ -127,6 +129,7 @@ Section /o -un.Main UNSEC0000
     Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
+    RMDir /r /REBOOTOK $INSTDIR\share
     RMDir /r /REBOOTOK $INSTDIR\daemon
     DeleteRegValue HKCU "${REGKEY}\Components" Main
 SectionEnd

From 495caa9a0149a87c4148fbae1b622c998c019d40 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 16 Aug 2022 09:28:58 +0100
Subject: [PATCH 2/2] build: add example bitcoin conf to win installer

Addresses
https://github.com/bitcoin/bitcoin/pull/22235#discussion_r946359661.
---
 share/setup.nsi.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index 7fa2f39c3c72d..2ce798bd2d1d3 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -75,6 +75,7 @@ Section -Main SEC0000
     File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@
     File /oname=COPYING.txt @abs_top_srcdir@/COPYING
     File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
+    File @abs_top_srcdir@/share/examples/bitcoin.conf
     SetOutPath $INSTDIR\share\rpcauth
     File @abs_top_srcdir@/share/rpcauth/*.*
     SetOutPath $INSTDIR\daemon
@@ -129,6 +130,7 @@ Section /o -un.Main UNSEC0000
     Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
     Delete /REBOOTOK $INSTDIR\COPYING.txt
     Delete /REBOOTOK $INSTDIR\readme.txt
+    Delete /REBOOTOK $INSTDIR\bitcoin.conf
     RMDir /r /REBOOTOK $INSTDIR\share
     RMDir /r /REBOOTOK $INSTDIR\daemon
     DeleteRegValue HKCU "${REGKEY}\Components" Main