From 632e922089f1606c36c97fb5213fc237b51e87b7 Mon Sep 17 00:00:00 2001
From: MSe <mse1969@posteo.de>
Date: Thu, 12 Nov 2020 11:10:24 +0100
Subject: [PATCH] ASB 2020.11 and additional CVEs: Track further repositories

 external/freetype           CVE-2020-15999   (Branch cm-13.0 !)
 hardware/qcom/display       CVE-2019-2306    (Branch cm-12.1-caf-8974)
 packages/services/Telecomm  ASB 2020.11

Change-Id: I81cb743e1bab89a9336fb609faa14fd0ecbb58e5
---
 default.xml       | 5 ++++-
 ref/lineageos.xml | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/default.xml b/default.xml
index d1d2eb1e2..90878414f 100644
--- a/default.xml
+++ b/default.xml
@@ -36,6 +36,7 @@
   <project name="cm12-amami/android_external_chromium-libpac" path="external/chromium-libpac" />
   <project name="cm12-amami/android_external_chromium_org_v8" path="external/chromium_org/v8" /> 
   <project name="cm12-amami/android_external_e2fsprogs" path="external/e2fsprogs" groups="pdk" />
+  <project name="cm12-amami/android_external_freetype" path="external/freetype" groups="pdk" revision="cm-13.0" />
   <project name="cm12-amami/android_external_libcxx" path="external/libcxx" groups="pdk" />
   <project name="cm12-amami/android_external_libexif" path="external/libexif" />
   <project name="cm12-amami/android_external_libhevc" path="external/libhevc" />
@@ -65,6 +66,8 @@
   <project name="cm12-amami/android_hardware_libhardware" path="hardware/libhardware" groups="pdk" />
   <project name="cm12-amami/android_hardware_qcom_audio" path="hardware/qcom/audio/default" groups="qcom,qcom_audio" />
   <project name="cm12-amami/android_hardware_qcom_audio" path="hardware/qcom/audio-caf/msm8974" groups="qcom,qcom_audio" revision="cm-12.1-caf-8974" />
+  <project name="cm12-amami/android_hardware_qcom_display" path="hardware/qcom/display" groups="qcom,qcom_display" />
+  <project name="cm12-amami/android_hardware_qcom_display" path="hardware/qcom/display-caf/msm8974" groups="qcom,qcom_display" revision="cm-12.1-caf-8974" />
   <project name="cm12-amami/android_hardware_qcom_media" path="hardware/qcom/media/default" groups="qcom" />
   <project name="cm12-amami/android_hardware_qcom_media" path="hardware/qcom/media-caf/msm8974" groups="qcom" revision="cm-12.1-caf-8974" />
   <project name="cm12-amami/android_hardware_ril" path="hardware/ril" groups="pdk" />
@@ -87,6 +90,7 @@
   <project name="cm12-amami/android_packages_providers_MediaProvider" path="packages/providers/MediaProvider" />
   <project name="cm12-amami/android_packages_providers_TelephonyProvider" path="packages/providers/TelephonyProvider" />
   <project name="cm12-amami/android_packages_providers_UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" />
+  <project name="cm12-amami/android_packages_services_Telecomm" path="packages/services/Telecomm" />
   <project name="cm12-amami/android_packages_services_Telephony" path="packages/services/Telephony" />
   <project name="cm12-amami/android_platform_external_giflib" path="external/giflib" groups="pdk-cw-fs,qcom_msm8x26" />  
   <project name="cm12-amami/android_platform_external_libnl" path="external/libnl" groups="pdk" />
@@ -103,7 +107,6 @@
   <include name="ref/sony-lineage.xml" />
 
   <!-- LineageOS references from higher branches -->
-  <project name="LineageOS/android_external_freetype" path="external/freetype" groups="pdk" revision="cm-13.0" />
   <project name="LineageOS/android_external_chromium-webview" path="external/chromium-webview" clone-depth="1" revision="master" />
 
   <!-- AOSP references from higher releases -->
diff --git a/ref/lineageos.xml b/ref/lineageos.xml
index a9472fe6c..945f17b70 100644
--- a/ref/lineageos.xml
+++ b/ref/lineageos.xml
@@ -139,8 +139,6 @@
   <project path="hardware/nvidia/audio" name="LineageOS/android_hardware_nvidia_audio" groups="nvidia_audio" />
   <project path="hardware/nvidia/tegra124" name="LineageOS/android_hardware_nvidia_tegra124" groups="tegra124" />
   <project path="hardware/qcom/bt" name="LineageOS/android_hardware_qcom_bt" groups="qcom" />
-  <project path="hardware/qcom/display" name="LineageOS/android_hardware_qcom_display" groups="qcom,qcom_display" />
-  <project path="hardware/qcom/display-caf/msm8974" name="LineageOS/android_hardware_qcom_display" groups="qcom,qcom_display" revision="cm-12.1-caf-8974" />
   <project path="hardware/qcom/gps" name="LineageOS/android_hardware_qcom_gps" groups="qcom" />
   <project path="hardware/qcom/keymaster" name="LineageOS/android_hardware_qcom_keymaster" groups="qcom" />
   <project path="hardware/qcom/wlan" name="LineageOS/android_hardware_qcom_wlan" groups="qcom_wlan" />
@@ -192,7 +190,6 @@
   <project path="packages/screensavers/PhotoTable" name="LineageOS/android_packages_screensavers_PhotoTable" />
   <project path="packages/screensavers/WebView" name="LineageOS/android_packages_screensavers_WebView" />
   <project path="packages/services/Mms" name="LineageOS/android_packages_services_Mms" />
-  <project path="packages/services/Telecomm" name="LineageOS/android_packages_services_Telecomm" />
   <project path="packages/wallpapers/Basic" name="LineageOS/android_packages_wallpapers_Basic" />
   <project path="packages/wallpapers/Galaxy4" name="LineageOS/android_packages_wallpapers_Galaxy4" />
   <project path="packages/wallpapers/HoloSpiral" name="LineageOS/android_packages_wallpapers_HoloSpiral" />