Hi, I have made bunch of little modifications to merge latest updates and security fixes from upstream sources for the next Replicant 6.0 0004 release. Please review them:
For https://git.replicant.us/replicant/manifest (branch LineageOS-mirror): 0001-Adapt-to-recent-LineageOS-forks-LineageOS-mirror.patch For https://git.replicant.us/replicant/manifest (branch replicant-6.0-dev): 0001-Adapt-to-recent-LineageOS-forks-replicant-6.0-dev.patch 0002-Update-F-Droid-Privileged-Extension-to-0.2.8-replicant-6.0-dev.patch For https://git.replicant.us/replicant/frameworks_base (branch replicant-6.0): 0001-Revert-Point-ResXMLTree-to-a-copy-of-the-asset-buffe.patch This last one will be replaced during the upstream merge with https://github.com/LineageOS/android_frameworks_base/commit/4541eceec70adaa58823ad58ed370b5a19777a95 You can download a version that includes all the aforementioned patches and upstream merges with "repo init -u ssh://g...@git.putti.eu/replicant/manifest.git -b replicant-6.0-dev" but you need to email me your public ssh key for access (I don't have https and git protocol is not secure, though you can use it – it's available). Joonas
From 2fcde0d6d55eae12e75074a7004e74baee40da6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylm...@iki.fi> Date: Tue, 28 Aug 2018 12:17:11 -0400 Subject: [PATCH] Adapt to recent LineageOS forks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Joonas Kylmälä <joonas.kylm...@iki.fi> --- default.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.xml b/default.xml index 586e9ad..0875a85 100644 --- a/default.xml +++ b/default.xml @@ -128,6 +128,8 @@ <project path="external/yaffs2" name="LineageOS/android_external_yaffs2" groups="pdk" /> <project path="external/zip" name="LineageOS/android_external_zip" /> <project path="external/zlib" name="LineageOS/android_external_zlib" groups="pdk" /> + <project path="external/aac" name="LineageOS/android_external_aac" groups="pdk" /> + <project path="external/libvorbis" name="LineageOS/android_external_libvorbis" groups="pdk-cw-fs,pdk-fs" /> <project path="frameworks/compile/libbcc" name="LineageOS/android_frameworks_compile_libbcc" groups="pdk" /> <project path="frameworks/compile/slang" name="LineageOS/android_frameworks_compile_slang" groups="pdk" /> <project path="frameworks/ex" name="LineageOS/android_frameworks_ex" groups="pdk-cw-fs,pdk-fs" /> -- 2.11.0
From 682a2c4a85e095a60d81121125e2aacb8e803790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylm...@iki.fi> Date: Tue, 28 Aug 2018 12:06:05 -0400 Subject: [PATCH 1/2] Adapt to recent LineageOS forks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following LineageOS commits in cm-13.0 branch forked aac and libvorbis repositories: manifest: Track own external/libvorbis (119b626212a189d098007d3774df19eee5692aaa) Switch to our external/aac (4ae095ffef693b7f50b51d7d770ad01c1e9cbf8f) This adds those changes. Signed-off-by: Joonas Kylmälä <joonas.kylm...@iki.fi> --- default.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default.xml b/default.xml index f6a1238..04921e6 100644 --- a/default.xml +++ b/default.xml @@ -319,7 +319,7 @@ <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" remote="aosp" /> <project path="device/sample" name="device/sample" groups="pdk" remote="aosp" /> <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> - <project path="external/aac" name="platform/external/aac" groups="pdk" remote="aosp" /> + <project path="external/aac" name="LineageOS-mirror/android_external_aac.git" groups="pdk" remote="lineage-mirror" /> <project path="external/androidplot" name="platform/external/androidplot" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/antlr" name="platform/external/antlr" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/apache-commons-math" name="platform/external/apache-commons-math" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> @@ -403,7 +403,7 @@ <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/libutf" name="platform/external/libutf" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/libvncserver" name="platform/external/libvncserver" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> - <project path="external/libvorbis" name="platform/external/libvorbis" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> + <project path="external/libvorbis" name="LineageOS-mirror/android_external_libvorbis.git" groups="pdk-cw-fs,pdk-fs" remote="lineage-mirror" /> <project path="external/libyuv" name="platform/external/libyuv" groups="libyuv,pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/littlemock" name="platform/external/littlemock" groups="pdk-cw-fs,pdk-fs" remote="aosp" /> <project path="external/lld" name="platform/external/lld" groups="pdk-fs" remote="aosp" /> -- 2.11.0
From 8683ec07461ea59fc5549afe9ac41e53143d3dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylm...@iki.fi>
Date: Mon, 27 Aug 2018 13:38:07 -0400
Subject: [PATCH 21/21] Revert "Point ResXMLTree to a copy of the asset buffer
in AssetManager::getPkgName()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 953d2a3493aaceb3209afc7eef1ff1e7f7242908.
The commit is replaced with commit "AssetManager: fix use-after-free of asset".
Signed-off-by: Joonas Kylmälä <joonas.kylm...@iki.fi>
---
libs/androidfw/AssetManager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index f99154ea6fd..e6e45633dc4 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -421,7 +421,7 @@ String8 AssetManager::getPkgName(const char *apkPath) {
Asset* manifestAsset = openNonAssetInPathLocked(kAndroidManifest, Asset::ACCESS_BUFFER, ap);
tree.setTo(manifestAsset->getBuffer(true),
- manifestAsset->getLength(), true);
+ manifestAsset->getLength());
tree.restart();
size_t len;
--
2.11.0
From 1a0cb1c9b40928ce2523de96650ca01420dc5aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylm...@iki.fi> Date: Tue, 28 Aug 2018 12:45:25 -0400 Subject: [PATCH 2/2] Update F-Droid Privileged Extension to 0.2.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Joonas Kylmälä <joonas.kylm...@iki.fi> --- default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.xml b/default.xml index 04921e6..2ceda12 100644 --- a/default.xml +++ b/default.xml @@ -15,7 +15,7 @@ <remote name="fdroid" fetch="https://gitlab.com/fdroid/"; - revision="refs/tags/0.2.7" /> + revision="refs/tags/0.2.8" /> <remote name="private" fetch="ssh://g...@github.com" /> -- 2.11.0
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Replicant mailing list Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant
