From fa3bdd0146d7b3066807e2acb657ba6acb8f5725 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.3+magic

Removed/Skipped: (-6)
	kernel:Add Huawei hisi check (tiann#1545)
		- upstream tiann/KernelSU@4f05fe2
		- superceded by `kernel: expose allowlist workaround as Kconfig option`
	[1.0] Drop Non-GKI Support (tiann#1483)
		- upstream tiann/KernelSU@898e9d4
	Drop some legacy codes (#1981)
		- upstream tiann/KernelSU@fd09ccf
	kernel: add support for disable sucompat
		- upstream tiann/KernelSU@2096bd7
	kernel: Allow to re-enable sucompat
		- upstream tiann/KernelSU@4593ae8
	kernel: remove unused CONFIG guard becuase GKI kernel enable kprobe by default
		- upstream tiann/KernelSU@500ff9b

Added from https://github.com/5ec1cff/KernelSU/commit/7525490 (+22)
	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
	use module dir name as real id
	allow restore uninstalled module
	ksud: make tmpfs and magic mount optional
	ksud: fix stat

Personal changes: (+13)
	manager: show module id on module page (tiann#2365)
	kernel: drop LKM and kprobe support
	kernel: add support for sucompat disable/enable
	kernel: core_hook: unconditional umount for /system/etc/hosts (tiann#1494)
	kernel: throne_tracker: re-initialize apk_path_hash_list on search_manager
	kernel: expose allowlist workaround as Kconfig option
	kernel/core_hook: use upstream ksu_umount_mnt
	kernel: handle easy backports
	kernel: handle harder backports
	workflows: debloat
	dummy.keystore
	manager:  failure mode dummy demo
	manager: unofficial build
	KernelSU v1.0.3+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 f5a052f52c97..9ae84f9ece80 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) + 170))
 $(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 568e5aefb53d..00c8ed0c05ab 100644
--- a/manager/build.gradle.kts
+++ b/manager/build.gradle.kts
@@ -57,7 +57,7 @@ fun getGitDescribe(): String {
 fun getVersionCode(): Int {
     val commitCount = getGitCommitCount()
     val major = 1
-    return major * 10000 + commitCount + 200
+    return major * 10000 + commitCount + 170
 }
 
 fun getVersionName(): String {
@@ -93,4 +93,4 @@ subprojects {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/userspace/ksud/build.rs b/userspace/ksud/build.rs
index 021418acf722..62e9f7ee7382 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 + 170 + version_code; // For historical reasons
 
     let version_name = String::from_utf8(
         Command::new("git")