upgrade kbfuse to 4.8.2 (#28028)

go/libkb/version.go

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

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.5.0" ]; then
-  tar -xjf /Volumes/Keybase/team/keybase.builds.macos/macfuse/macfuse-4.5.0-src.tbz
-  mv macfuse-4.5.0-src macfuse
+if [ "$version" = "4.8.2" ]; then
+  tar -xjf ~/Downloads/macfuse-4.8.2-src-mike.tgz
+  mv macfuse-4.8.2-src macfuse
 else
   echo "Unsupported VERSION"
   exit 1
@@ -24,7 +24,7 @@ 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 12.3 -d 12.3 --kext="12,12.3,23" --kext="14->12" --kext="13->12"
+./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."
 
 cd $dir
 rm -rf kbfuse.bundle
@@ -36,10 +36,10 @@ tar zcvpf $dir/fsbundle.tgz  .
 
 # Sign the kext
 cd $dir
-codesign --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Extensions/12/kbfuse.kext
-codesign --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Resources/mount_kbfuse
-codesign --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Resources/load_kbfuse
-codesign --verbose --force --deep --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle
+codesign --force --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Extensions/12/kbfuse.kext
+codesign --force --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Resources/mount_kbfuse
+codesign --force --verbose --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle/Contents/Resources/load_kbfuse
+codesign --force --verbose --force --deep --timestamp --options runtime --sign "Developer ID Application: Keybase, Inc." kbfuse.bundle
 
 # Verify
 codesign --verbose --verify kbfuse.bundle/Contents/Extensions/12/kbfuse.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>21G115</string>
+	<string>24A335</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -23,23 +23,23 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2128.21</string>
+	<string>4.8.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13F100</string>
+	<string>24A336</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>12.3</string>
+	<string>15.0</string>
 	<key>DTSDKBuild</key>
-	<string>21E226</string>
+	<string>24A336</string>
 	<key>DTSDKName</key>
-	<string>macosx12.3</string>
+	<string>macosx15.0</string>
 	<key>DTXcode</key>
-	<string>1341</string>
+	<string>1600</string>
 	<key>DTXcodeBuild</key>
-	<string>13F100</string>
+	<string>16A242d</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>12.3</string>
 	<key>OSBundleLibraries</key>

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

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

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

@@ -5,7 +5,7 @@
 	<key>BuildFlavor</key>
 	<string></string>
 	<key>BuildMachineOSBuild</key>
-	<string>21G115</string>
+	<string>24A335</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleIdentifier</key>
@@ -17,31 +17,31 @@
 	<key>CFBundlePackageType</key>
 	<string>fs </string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.0</string>
+	<string>4.8.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.5.0</string>
+	<string>4.8.2</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13F100</string>
+	<string>24A336</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>12.3</string>
+	<string>15.0</string>
 	<key>DTSDKBuild</key>
-	<string>21E226</string>
+	<string>24A336</string>
 	<key>DTSDKName</key>
-	<string>macosx12.3</string>
+	<string>macosx15.0</string>
 	<key>DTXcode</key>
-	<string>1341</string>
+	<string>1600</string>
 	<key>DTXcodeBuild</key>
-	<string>13F100</string>
+	<string>16A242d</string>
 	<key>FSPersonalities</key>
 	<dict>
 		<key>Beagle</key>

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

@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2709
+{\rtf1\ansi\ansicpg1252\cocoartf2759
 \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-2023 Benjamin Fleischer\
+\fs20 \cf2 Copyright (c) 2011-2024 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,23 +6,23 @@
 	<dict>
 		<key>Resources/License.rtf</key>
 		<data>
-		tZkLgHrSzcaHONCgwSM58+Whsws=
+		Yh9IUz9T3WPa45y7wWB+5qUkKKs=
 		</data>
 		<key>Resources/Volume.icns</key>
 		<data>
 		qJASDfOipoOWzjNc2uiXNdbEyrw=
 		</data>
 		<key>Resources/load_kbfuse</key>
 		<data>
-		lxB4J/qqwv4R5WQMNL2iHTRfB4o=
+		dBkhtrFqRyypjPa6e4l3wpkIN6s=
 		</data>
 		<key>Resources/mount_kbfuse</key>
 		<data>
-		f+xUEwC0HKYo4TOxaCfcKvY4NPY=
+		Styry7MbO1r/2L93Vpm4MrZ/wi8=
 		</data>
 		<key>version.plist</key>
 		<data>
-		+SUZ8XikvOdn4eaKbh4XLnfB1lc=
+		rtVXUjgH7zfwKAD2FXWUTmdBbbk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -31,22 +31,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			yT91ZtpSqpanz0PdzH/I9S2W3+Y=
+			NYNdbc6dF9IvWGJ1dpQJKpSdq0Y=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZFsh2LKNTDwgS0UT42Oz88f/zBxfuMRy49fgtbBLFx0=
+			5ZL4722iB7LCgRM8XBWq/khAVydQp8AoMrEPJ745qRk=
 			</data>
 		</dict>
 		<key>Extensions/12/kbfuse.kext/Contents/MacOS/kbfuse</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			9cKkBwWYH3KAnXc82Hko4wztWuU=
+			0RDLRfqLt+dro09KcQz0wiLI8yk=
 			</data>
 			<key>hash2</key>
 			<data>
-			QsxpzQJhtl9tAVzYw9pKIKJl4Ph/2cdjS5pLgHyyCWk=
+			V4h/yDAS2wvDXW/KDhph+NrdPvdbKeRwdg7tOCCQkOg=
 			</data>
 		</dict>
 		<key>Extensions/12/kbfuse.kext/Contents/_CodeSignature/CodeResources</key>
@@ -70,15 +70,20 @@
 			<key>symlink</key>
 			<string>12</string>
 		</dict>
+		<key>Extensions/15</key>
+		<dict>
+			<key>symlink</key>
+			<string>12</string>
+		</dict>
 		<key>Resources/License.rtf</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			tZkLgHrSzcaHONCgwSM58+Whsws=
+			Yh9IUz9T3WPa45y7wWB+5qUkKKs=
 			</data>
 			<key>hash2</key>
 			<data>
-			bF6ZbTYqvKgpnQz3I3vXHTAeRxSxCEGL6zjtkblKumE=
+			h5rYq1/Ai4lH3Ox3ehR+S0rjpGnLodWSQIHDsF8tUGA=
 			</data>
 		</dict>
 		<key>Resources/Volume.icns</key>
@@ -96,33 +101,33 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			lxB4J/qqwv4R5WQMNL2iHTRfB4o=
+			dBkhtrFqRyypjPa6e4l3wpkIN6s=
 			</data>
 			<key>hash2</key>
 			<data>
-			dInymwCA1w3n5KFwkQ8FBGhBHyELh3IXxCrN1dcpnhk=
+			9LTZ2OVVkImZIILbik+AUsB2YvCFh0FN92+nMLePS4w=
 			</data>
 		</dict>
 		<key>Resources/mount_kbfuse</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			f+xUEwC0HKYo4TOxaCfcKvY4NPY=
+			Styry7MbO1r/2L93Vpm4MrZ/wi8=
 			</data>
 			<key>hash2</key>
 			<data>
-			B9YQaI0UdqzMjs87qF3so2TkiIQHE4u5cf+6I6cR5cQ=
+			/O/j+LdYyskoXFv/JiCLisviXNAk3uMq3Mq2HuseAc4=
 			</data>
 		</dict>
 		<key>version.plist</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			+SUZ8XikvOdn4eaKbh4XLnfB1lc=
+			rtVXUjgH7zfwKAD2FXWUTmdBbbk=
 			</data>
 			<key>hash2</key>
 			<data>
-			Na288m5+db3lKxNUnXE7YEXMQ8KQPis/CmvjJNZ0c/Y=
+			FHm1I+38VV8yC9Shfq5xR/Am4oQifCpylejL2f0Onxs=
 			</data>
 		</dict>
 	</dict>

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

@@ -5,9 +5,9 @@
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.0</string>
+	<string>4.8.2</string>
 	<key>CFBundleVersion</key>
-	<string>4.5.0</string>
+	<string>4.8.2</string>
 	<key>ProjectName</key>
 	<string>macFUSE</string>
 	<key>SourceVersion</key>

osx/Fuse/rename.sh

@@ -18,6 +18,7 @@ find . -name "$i" -type f -exec sed -i '' s/macfuse/kbfuse/g {} +
 find . -name "$i" -type f -exec sed -i '' s/MACFUSE/KBFUSE/g {} +
 find . -name "$i" -type f -exec sed -i '' "s/io\.kbfuse\.filesystems\.kbfuse/com.github.kbfuse.filesystems.kbfuse/g" {} +
 find . -name "$i" -type f -exec sed -i '' "s/io\.kbfuse\.filesystems\.fs\.kbfuse/com.github.kbfuse.filesystems.kbfuse/g" {} +
+find . -name "$i" -type f -exec sed -i '' s/io\.kbfuse/com.github.kbfuse/g {} +
 done
 
 find . -type d -name '*macfuse*' -exec sh -c 'mv {} $(echo {} | sed -e 's/macfuse/kbfuse/g')' \;

osx/Installer/Info.plist

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

osx/KBKit/Podfile.lock

@@ -96,4 +96,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4f18b3e179e2048f397fee4d98e1ff92fcd2f489
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

osx/Keybase.xcodeproj/project.pbxproj

@@ -1395,7 +1395,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Installer/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				PRODUCT_BUNDLE_IDENTIFIER = keybase.Installer2;
 				PRODUCT_NAME = Keybase;
 				PROVISIONING_PROFILE = "";
@@ -1423,7 +1423,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Installer/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				PRODUCT_BUNDLE_IDENTIFIER = keybase.Installer2;
 				PRODUCT_NAME = Keybase;
 				PROVISIONING_PROFILE_SPECIFIER = "";

osx/Podfile

@@ -33,3 +33,10 @@ target "keybase.Helper" do
 
 end
 
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings["MACOSX_DEPLOYMENT_TARGET"] = "10.13"
+    end
+  end
+end

osx/Podfile.lock

@@ -91,15 +91,15 @@ SPEC CHECKSUMS:
   GHKeychain: 008cdb8bbab5b0dc1da3d0f06a67ce5203231e44
   GHKit: 2a20b51df9ce8f4355b2af2821805d369d610546
   GHODictionary: 225e042596a4b3d5b66b2b24250086b2f95514af
-  KBKit: 9f139696e2cd916f05ee603e33aabfd558ac8ccd
+  KBKit: ccf98d8feb5a744960ffef063d665b9a12647007
   Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
   MDPSplitView: 127b4b371e813ec29333e515fb1c057126a75671
-  MPMessagePack: f5a67f8ee25ee5e745daa1b7347caa8b67020dac
+  MPMessagePack: d73e7444b2c90c67747d37532f7ec7a9bffe5389
   ObjectiveSugar: a6a25f23d657c19df0a0b972466d5b5ca9f5295c
   Slash: 7184f2a98e13ad62303037db3a706c88e98b197e
   Tikppa: 77ac88aa89814a5ae9d18a773b4436ebef2235b7
   YOLayout: 6728d890bab9b9e4962efd554cba16d677b30b0f
 
-PODFILE CHECKSUM: 01fde3c8c8f05e7ef5e415eccbbd48e724e63fc2
+PODFILE CHECKSUM: ad1dbef2696fdd38311764bc1fefc171f6beb439
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

osx/Scripts/build.sh

@@ -37,7 +37,7 @@ app_path="$build_dest/$app_name.app"
 rm -rf $archive_path
 
 echo "Archiving..."
-set -o pipefail && xcodebuild archive -scheme "$scheme" -workspace "$dir/../Keybase.xcworkspace" -configuration "$xcode_configuration" -archivePath "$archive_path" | xcpretty -c
+set -o pipefail && xcodebuild archive -scheme "$scheme" -workspace "$dir/../Keybase.xcworkspace" -configuration "$xcode_configuration" -archivePath "$archive_path" -destination 'platform=macOS' | xcpretty -c 
 
 # echo "Copying to archive"
 # archive_hold_path="/Users/gabe/Library/Developer/Xcode/Archives/$archive_dir_day/$app_name $archive_postfix.xcarchive"

packaging/desktop/kbfuse.sh

@@ -16,7 +16,7 @@ client_dir="$dir/../.."
 fuse_dir="$client_dir/osx/Fuse"
 tmp_dir="/tmp/desktop-kbfuse"
 # TODO build and publish arm64 version
-installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.92-darwin.tgz"
+installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.93-darwin.tgz"
 
 if [ "$EUID" -ne 0 ]; then
   echo "Please run as root"

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.92-darwin.tgz"
+installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.93-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"
 

shared/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: "com.facebook.react"
 apply plugin: 'com.github.triplet.play'
 
 // KB: app version
-def VERSION_NAME = "6.4.3"
+def VERSION_NAME = "6.5.0"
 
 // KB: Number of commits, like ios
 Integer getVersionCode() {