5.6.4 hotfix

go/libkb/version.go

@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.5.2"
+const Version = "6.5.4"

osx/Fuse/README.md

@@ -49,12 +49,14 @@ which you can submit for PR.
 This bundle is included in the KeybaseInstaller.app, so you'll need to build a new
 installer, see [Building the Installer](/osx/Scripts/README.md).
 
-Versioning can be tricky here, here are some tips from last time:
+**Versioning can be tricky here, here are some tips from last time**
 
 - Build against the newest macOS SDK
 - Specify an old build target (like 12.3)
 - Manually fixup Info.plist for the extension, since the Fuse build script puts the wrong values in for the minimum version and kext dependencies.
-- Make sure the name in the Info.plist doesn't have a version number after it.
+  The key here is just to look at the commit from last time, and try to mimic the amount of changes to the Info.plist.
+- Make sure the name in the Info.plist doesn't have a version number after it. The Fuse stuff looks up the name without
+  a version number.
 - `sudo kmutil log show` is a great way to see what is happening.
 
 ### Manual Install

osx/Fuse/build.sh

@@ -8,9 +8,9 @@ cd "$dir"
 rm -rf osxfuse macfuse
 
 version=${VERSION:?"Need to set VERSION for Fuse"}
-if [ "$version" = "4.8.2" ]; then
-  tar -xjf ~/Downloads/macfuse-4.8.2-src-mike.tgz
-  mv macfuse-4.8.2-src macfuse
+if [ "$version" = "5.0.6" ]; then
+  tar -xjf ~/Downloads/macfuse-5.0.6-src-mike.tgz
+  #mv macfuse-5.0.6-src-mike macfuse
 else
   echo "Unsupported VERSION"
   exit 1
@@ -24,14 +24,14 @@ rm -rf /tmp/kbfuse*
 cd macfuse
 # If you get an error compiling you might have to run `brew link gettext --force` (see https://github.com/osxfuse/osxfuse/issues/149).
 # use 12.3 SDK (-s) and set deployment target 12.3 (-d). Build for macOS 12 kernel, and support up to Darwin 23 (macOS 14).
-./build.sh -v 5 -t filesystembundle -- -s 15.0 -d 12.3 --kext="12,15.0,24" --kext="15->12" --kext="14->12" --kext="13->12" --code-sign-identity="Developer ID Application: Keybase, Inc."
+./build.sh -v 5 -t filesystembundle -- -s 26.0 -d 12.3 --kext="12,26.0,25" --kext="26->12" --kext="15->12" --kext="14->12" --kext="13->12" --code-sign-identity="Developer ID Application: Keybase, Inc."
 
 cd $dir
 rm -rf kbfuse.bundle
-ditto /tmp/kbfuse/filesystembundle/kbfuse.fs kbfuse.bundle
+ditto ~/Desktop/kbfuse-5.0.6/filesystembundle/Products/kbfuse.fs kbfuse.bundle
 
 # Backup the filesystembundle directory in case we need debug symbols later
-cd /tmp/kbfuse/filesystembundle
+cd ~/Desktop/kbfuse-5.0.6/filesystembundle
 tar zcvpf $dir/fsbundle.tgz  .
 
 # Sign the kext

osx/Fuse/kbfuse.bundle/Contents/Extensions/12/kbfuse.kext/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>24A335</string>
+	<string>25A354</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -16,30 +16,28 @@
 	<string>macFUSE</string>
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
-	<key>CFBundleSignature</key>
-	<string>FUSE</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>24A336</string>
+	<string>25A352</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>15.0</string>
+	<string>26.0</string>
 	<key>DTSDKBuild</key>
-	<string>24A336</string>
+	<string>25A352</string>
 	<key>DTSDKName</key>
-	<string>macosx15.0</string>
+	<string>macosx26.0</string>
 	<key>DTXcode</key>
-	<string>1600</string>
+	<string>2600</string>
 	<key>DTXcodeBuild</key>
-	<string>16A242d</string>
+	<string>17A324</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>12.3</string>
 	<key>OSBundleLibraries</key>

osx/Fuse/kbfuse.bundle/Contents/Extensions/26

@@ -0,0 +1 @@
+12

osx/Fuse/kbfuse.bundle/Contents/Info.plist

@@ -2,46 +2,44 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildFlavor</key>
-	<string></string>
 	<key>BuildMachineOSBuild</key>
-	<string>24A335</string>
+	<string>25A354</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>macFUSE</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.github.kbfuse.filesystems.kbfuse</string>
+	<string>com.github.kbfuse.filesystems.fs.kbfuse</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>kbfuse</string>
 	<key>CFBundlePackageType</key>
-	<string>fs </string>
+	<string>fs  </string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.8.2</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>5.0.6</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>24A336</string>
+	<string>25A352</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>15.0</string>
+	<string>26.0</string>
 	<key>DTSDKBuild</key>
-	<string>24A336</string>
+	<string>25A352</string>
 	<key>DTSDKName</key>
-	<string>macosx15.0</string>
+	<string>macosx26.0</string>
 	<key>DTXcode</key>
-	<string>1600</string>
+	<string>2600</string>
 	<key>DTXcodeBuild</key>
-	<string>16A242d</string>
+	<string>17A324</string>
 	<key>FSPersonalities</key>
 	<dict>
 		<key>Beagle</key>

osx/Fuse/kbfuse.bundle/Contents/Resources/License.rtf

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2759
+{\rtf1\ansi\ansicpg1252\cocoartf2821
 \cocoascreenfonts1\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Oblique;}
 {\colortbl;\red255\green255\blue255;\red118\green118\blue118;\red255\green255\blue255;\red255\green255\blue255;
 }
@@ -20,7 +20,7 @@
 \clvertalc \clshdrawnil \clbrdrt\brdrs\brdrw500\brdrcf3 \clbrdrl\brdrs\brdrw500\brdrcf3 \clbrdrb\brdrs\brdrw500\brdrcf3 \clbrdrr\brdrs\brdrw500\brdrcf3 \clpadl100 \clpadr100 \gaph\cellx8640
 \pard\intbl\itap1\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
 
-\fs20 \cf2 Copyright (c) 2011-2024 Benjamin Fleischer\
+\fs20 \cf2 Copyright (c) 2011-2025 Benjamin Fleischer\
 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\

osx/Fuse/kbfuse.bundle/Contents/_CodeSignature/CodeResources

@@ -6,55 +6,43 @@
 	<dict>
 		<key>Resources/License.rtf</key>
 		<data>
-		Yh9IUz9T3WPa45y7wWB+5qUkKKs=
+		MokDHlYoUAJGsuUmYDQqu2m4Fl8=
 		</data>
 		<key>Resources/Volume.icns</key>
 		<data>
 		qJASDfOipoOWzjNc2uiXNdbEyrw=
 		</data>
 		<key>Resources/load_kbfuse</key>
 		<data>
-		dBkhtrFqRyypjPa6e4l3wpkIN6s=
+		vIMryRgxTKdTfdFCPxdyB/8BnJs=
 		</data>
 		<key>Resources/mount_kbfuse</key>
 		<data>
-		Styry7MbO1r/2L93Vpm4MrZ/wi8=
+		BjszRYqSR/WCMJdUxFOo0J+Ew/k=
 		</data>
 		<key>version.plist</key>
 		<data>
-		rtVXUjgH7zfwKAD2FXWUTmdBbbk=
+		j78YcBD6wh6Y112lP8FTv6osm+M=
 		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
 		<key>Extensions/12/kbfuse.kext/Contents/Info.plist</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			NYNdbc6dF9IvWGJ1dpQJKpSdq0Y=
-			</data>
 			<key>hash2</key>
 			<data>
-			5ZL4722iB7LCgRM8XBWq/khAVydQp8AoMrEPJ745qRk=
+			XmRFwKHEXEhSymDjlfTpI+Tz93hbZb9qLXCPWoHS3N4=
 			</data>
 		</dict>
 		<key>Extensions/12/kbfuse.kext/Contents/MacOS/kbfuse</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			0RDLRfqLt+dro09KcQz0wiLI8yk=
-			</data>
 			<key>hash2</key>
 			<data>
-			V4h/yDAS2wvDXW/KDhph+NrdPvdbKeRwdg7tOCCQkOg=
+			MF9cB3y/Sx+6tgZ1uqrdv1lG5P0l0/mYF8RMxO4RWrI=
 			</data>
 		</dict>
 		<key>Extensions/12/kbfuse.kext/Contents/_CodeSignature/CodeResources</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			YwoIhzByBpYWzcwx9V5tdCMIbXg=
-			</data>
 			<key>hash2</key>
 			<data>
 			ZobeEKKKL+EbNsu4bcusyCfPxOoRa02r8YReWu5inps=
@@ -75,59 +63,44 @@
 			<key>symlink</key>
 			<string>12</string>
 		</dict>
+		<key>Extensions/26</key>
+		<dict>
+			<key>symlink</key>
+			<string>12</string>
+		</dict>
 		<key>Resources/License.rtf</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			Yh9IUz9T3WPa45y7wWB+5qUkKKs=
-			</data>
 			<key>hash2</key>
 			<data>
-			h5rYq1/Ai4lH3Ox3ehR+S0rjpGnLodWSQIHDsF8tUGA=
+			sCzj80CpQK29HuxpJB0fJ+rHfB5qhMyscj9nUEO+CvA=
 			</data>
 		</dict>
 		<key>Resources/Volume.icns</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			qJASDfOipoOWzjNc2uiXNdbEyrw=
-			</data>
 			<key>hash2</key>
 			<data>
 			5EGzd4N1aaAnPoccVlA1sEspNMld7NgewR9jMPrIJYo=
 			</data>
 		</dict>
 		<key>Resources/load_kbfuse</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			dBkhtrFqRyypjPa6e4l3wpkIN6s=
-			</data>
 			<key>hash2</key>
 			<data>
-			9LTZ2OVVkImZIILbik+AUsB2YvCFh0FN92+nMLePS4w=
+			50EW3Cwirp4WN1REPer1vQvBIgCVESHJwbL4s4mv9KQ=
 			</data>
 		</dict>
 		<key>Resources/mount_kbfuse</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			Styry7MbO1r/2L93Vpm4MrZ/wi8=
-			</data>
 			<key>hash2</key>
 			<data>
-			/O/j+LdYyskoXFv/JiCLisviXNAk3uMq3Mq2HuseAc4=
+			jORbqAL4H6UtWl04S1w7j4THyZYmM4w99bovJmardN4=
 			</data>
 		</dict>
 		<key>version.plist</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			rtVXUjgH7zfwKAD2FXWUTmdBbbk=
-			</data>
 			<key>hash2</key>
 			<data>
-			FHm1I+38VV8yC9Shfq5xR/Am4oQifCpylejL2f0Onxs=
+			3Dh8njcS28IM/u9yUs1CCEYX2+v3ocB2rK1ryB8av5E=
 			</data>
 		</dict>
 	</dict>

osx/Fuse/kbfuse.bundle/Contents/version.plist

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>ProjectName</key>
 	<string>macFUSE</string>
 	<key>SourceVersion</key>

osx/Installer/Info.plist

@@ -15,15 +15,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.93</string>
+	<string>1.1.94</string>
 	<key>CFBundleSignature</key>
 	<string>KEYB</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.93</string>
+	<string>1.1.94</string>
 	<key>KBFuseBuild</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>KBFuseVersion</key>
-	<string>4.8.2</string>
+	<string>5.0.6</string>
 	<key>KBHelperBuild</key>
 	<string>1.0.47</string>
 	<key>KBHelperVersion</key>

packaging/desktop/package_darwin.sh

@@ -110,7 +110,7 @@ resources_dir="$out_dir/Keybase.app/Contents/Resources/"
 
 # TODO build and publish an arm64 version
 # The KeybaseInstaller.app installs KBFuse, keybase.Helper, services and CLI via a native app
-installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.93-darwin.tgz"
+installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.94-darwin.tgz"
 # KeybaseUpdater.app is the native updater UI (prompt dialogs)
 updater_url="https://prerelease.keybase.io/darwin-package/KeybaseUpdater-1.0.7-darwin.tgz"