From 4677a009e6568e1851a3aa5fcc0554a440c8768a Mon Sep 17 00:00:00 2001
From: backslashxx <118538522+backslashxx@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:05:48 +0800
Subject: [PATCH] KernelSU v1.0.2+magic

Removed/Skipped: (-1)
	[1.0] Drop Non-GKI Support (tiann#1483)
		- upstream https://github.com/tiann/KernelSU/commit/898e9d4

Added from 5ec1cff/KernelSU @ https://github.com/5ec1cff/KernelSU/commit/c34260c07ad433fa1fae839055d880bb2a655004 (+23)
	implement magic mount
	no need to deny relabel
	restorecon: set adb_file to system_file for module files
	magic_mount: use trusted.overlay.opaque
	chore: fmt
	magic_mount: supports whiteout
	chore: refine code
	magic_mount: fix
	log: make verbose logging optional
	magic_mount: refine
	ksud: fix disable / enable modules
	ksud: fix odm not magic-mounted
	manager: no need to check overlayfs
	ksud: fix partition link
	ksud: fix clone symlink
	ksud: refine tmpfs
	ksud: add KSU_MAGIC_MOUNT to env (5ec1cff#5)
	manager: remove shrink image
	module list compare ignoring case
	support search modules
	allow restore uninstalled module & use module dir name as real id
	ksud: make tmpfs and magic mount optional
	refine ui

Other additions: (+3)
	Update Busybox (tiann#2273)
	allow build lkm manually (backslashxx#2)
	kernel: fix reset ambient capabilities to resolve D-Bus permission issues (rifsxd#52)

Personal changes: (+8)
	kernel: expose allowlist workaround as Kconfig option
	kernel/core_hook: use upstream ksu_umount_mnt
	kernel: require backports
	workflows: debloat
	dummy.keystore
	manager:  failure mode dummy demo
	manager: unofficial build
	KernelSU v1.0.2+magic

Warning: Managers built from this repo has a known keystore.
See dummy.keystore.

Make sure to also chant, "thank you 5ec1cff" before you sleep.

Signed-off-by: backslashxx <118538522+backslashxx@users.noreply.github.com>
---
 kernel/Makefile          | 2 +-
 manager/build.gradle.kts | 4 ++--
 userspace/ksud/build.rs  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 4e3ac07a2e58..ef48064ef6b5 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -21,7 +21,7 @@ ifeq ($(shell test -e $(srctree)/$(src)/../.git; echo $$?),0)
 $(shell cd $(srctree)/$(src); /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin [ -f ../.git/shallow ] && git fetch --unshallow)
 KSU_GIT_VERSION := $(shell cd $(srctree)/$(src); /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin git rev-list --count HEAD)
 # ksu_version: major * 10000 + git version + 200 for historical reasons
-$(eval KSU_VERSION=$(shell expr 10000 + $(KSU_GIT_VERSION) + 200))
+$(eval KSU_VERSION=$(shell expr 10000 + $(KSU_GIT_VERSION) + 167))
 $(info -- KernelSU version: $(KSU_VERSION))
 ccflags-y += -DKSU_VERSION=$(KSU_VERSION)
 else # If there is no .git file, the default version will be passed.
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
index 3c4f02e7faef..483f938367b3 100644
--- a/manager/build.gradle.kts
+++ b/manager/build.gradle.kts
@@ -58,7 +58,7 @@ fun getGitDescribe(): String {
 fun getVersionCode(): Int {
     val commitCount = getGitCommitCount()
     val major = 1
-    return major * 10000 + commitCount + 200
+    return major * 10000 + commitCount + 167
 }
 
 fun getVersionName(): String {
@@ -95,4 +95,4 @@ subprojects {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/userspace/ksud/build.rs b/userspace/ksud/build.rs
index 021418acf722..1db047e3ffde 100644
--- a/userspace/ksud/build.rs
+++ b/userspace/ksud/build.rs
@@ -15,7 +15,7 @@ fn get_git_version() -> Result<(u32, String), std::io::Error> {
         .trim()
         .parse()
         .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to parse git count"))?;
-    let version_code = 10000 + 200 + version_code; // For historical reasons
+    let version_code = 10000 + 167 + version_code; // For historical reasons
 
     let version_name = String::from_utf8(
         Command::new("git")