Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-25 22:22:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to @syphyr's security backport branches

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-18 11:34:39 -04:00
parent 43e55668fd
commit 7ad46d58f1
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Manifests/Manifest_LAOS-14.1.xml
View File

@ -68,6 +68,14 @@
<!-- Switch to the Mulch WebView -->
<remove-project name="LineageOS/android_external_chromium-webview" />
<project path="external/chromium-webview" name="divested-mobile/mulch" groups="pdk" clone-depth="1" remote="gitlab" revision="master" />
<!-- @syphyr's security backport branches -->
<remove-project name="LineageOS/android_external_boringssl" />
<project path="external/boringssl" name="syphyr/android_external_boringssl" remote="github" revision="f8397314565d6441b52f5aa313d06a98a03c31cd" />
<remove-project name="LineageOS/android_external_ffmpeg" />
<project path="external/ffmpeg" name="syphyr/android_external_ffmpeg" remote="github" revision="651981ea74e55e475d8c32470e481896cfbf0c32" />
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<!-- END OF ADDITIONAL REPOS -->
<!-- START OF DEVICE REPOS -->

4
Manifests/Manifest_LAOS-15.1.xml
View File

@ -70,6 +70,10 @@
<!-- Switch to the Mulch WebView -->
<remove-project name="LineageOS/android_external_chromium-webview" />
<project path="external/chromium-webview" name="divested-mobile/mulch" groups="pdk" clone-depth="1" remote="gitlab" revision="master" />
<!-- @syphyr's security backport branches -->
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

4
Manifests/Manifest_LAOS-16.0.xml
View File

@ -68,6 +68,10 @@
<!-- Switch to the Mulch WebView -->
<remove-project name="LineageOS/android_external_chromium-webview" />
<project path="external/chromium-webview" name="divested-mobile/mulch" groups="pdk" clone-depth="1" remote="gitlab" revision="master" />
<!-- @syphyr's security backport branches -->
<remove-project name="LineageOS/android_external_freetype" />
<project path="external/freetype" name="syphyr/android_external_freetype-1" remote="github" revision="cae3047743733a3b39b03fbabb43a6350bf4b5bd" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->

6
Scripts/LineageOS-14.1/Patch.sh
View File

@ -104,9 +104,9 @@ applyPatch "$DOS_PATCHES/android_external_expat/337989-backport.patch"; #n-asb-2
applyPatch "$DOS_PATCHES/android_external_expat/348649.patch"; #n-asb-2023-02 Fix overeager DTD destruction (fixes #649)
fi;
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360899.patch"; #n-asb-2023-07 Cherry-pick two upstream changes
fi;
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360899.patch"; #n-asb-2023-07 Cherry-pick two upstream changes
#fi;
if enterAndClear "external/libavc"; then
applyPatch "$DOS_PATCHES/android_external_libavc/315711.patch"; #n-asb-2021-09 Decoder: Update check for increment u2_cur_slice_num

6
Scripts/LineageOS-15.1/Patch.sh
View File

@ -113,9 +113,9 @@ applyPatch "$DOS_PATCHES/android_external_expat/337989-backport.patch"; #n-asb-2
applyPatch "$DOS_PATCHES/android_external_expat/348649.patch"; #n-asb-2023-02 Fix overeager DTD destruction (fixes #649)
fi;
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
fi;
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#fi;
#if [ "$DOS_GRAPHENE_MALLOC_BROKEN" = true ]; then
#if enterAndClear "external/hardened_malloc"; then

6
Scripts/LineageOS-16.0/Patch.sh
View File

@ -138,10 +138,10 @@ git fetch https://github.com/LineageOS/android_external_expat refs/changes/56/33
git fetch https://github.com/LineageOS/android_external_expat refs/changes/28/349328/1 && git cherry-pick FETCH_HEAD; #P_asb_2023-02
fi;
if enterAndClear "external/freetype"; then
applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#if enterAndClear "external/freetype"; then
#applyPatch "$DOS_PATCHES/android_external_freetype/360951.patch"; #R_asb_2023-07 Cherry-pick two upstream changes
#applyPatch "$DOS_PATCHES/android_external_freetype/364028-backport.patch"; #R_asb_2023-08 Cherrypick following three changes #XXX: needs fix
fi;
#fi;
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
if enterAndClear "external/hardened_malloc"; then