Update whitelist

This reverts commit 58fe440996.

.github/workflows/release.yaml

@@ -45,7 +45,7 @@ jobs:
         run: |
           wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
           unzip pup_v0.4.0_linux_amd64.zip && rm pup_v0.4.0_linux_amd64.zip
-          BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch a text{})
+          BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
           echo "BRANCH=$BRANCH" >> $GITHUB_ENV
 
           wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz
@@ -74,7 +74,7 @@ jobs:
           cd bromite
           VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
           ../gh_2.4.0_linux_amd64/bin/gh release create $VERSION-$BROMITE_SHA \
-            ../$APK --notes ""
+            ../$APK --notes "" -p
 
 #      - name: Enable proxy on container
 #        shell: bash

export-all-patch.sh

@@ -32,3 +32,16 @@ for patch in $ALLPATCHS_E; do
 	bash ~/bromite-buildtools/export-single-patch.sh $patch $PATCH_FILE
 
 done
+
+PATCH_LIST=~/bromite/build/bromite_patches_list.txt
+mkdir ~/bromite/build/patches-new/changed
+mkdir ~/bromite/build/patches-new/contrib
+for current_file in $(cat $PATCH_LIST); do
+	if [[ "$current_file" == *".patch" ]]; then
+		if [[ $current_file =~ ^changed/.* ]]; then
+			mv ~/bromite/build/patches-new/$(basename $current_file) ~/bromite/build/patches-new/changed
+		elif [[ $current_file =~ ^contrib/.* ]]; then
+			mv ~/bromite/build/patches-new/$(basename $current_file) ~/bromite/build/patches-new/contrib
+		fi
+	fi
+done

images/bromite-source/apply-bromite-patches.sh

@@ -10,6 +10,7 @@ cd chromium/src
 echo -e ${RED} ------- apply patchs ${NC}
 for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
 
+   if [[ "$file" == *".patch" ]]; then
 	#if [[ "$file" == *"Automated-domain-substitution"* ]]; then
 	#	echo -e ${RED} " -> Excluding $file" ${NC}
 	#	continue
@@ -17,7 +18,7 @@ for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
 	
 	echo -e ${RED} " -> Apply $file" ${NC}
 
-	REPL="0,/^---/s//FILE:"$file"\n---/"
+	REPL="0,/^---/s//FILE:"$(basename $file)"\n---/"
 	cat ../../bromite/build/patches/$file | sed $REPL | git am
 
 	if [ $? -ne 0 ]
@@ -27,4 +28,6 @@ for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do
 	fi
 
 	echo " "
+    fi
+    
 done

images/squid/whitelist

@@ -4,6 +4,13 @@
 .githubusercontent.com
 .ubuntu.com
 
+# for .net
+.dot.net
+dotnet.microsoft.com
+dotnetcli.azureedge.net
+aka.ms
+packages.microsoft.com
+
 # for buildeps
 #chromium.googlesource.com