From 1f220ccb37dc8eac088e86e7ee31f094dc0246e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 26 Feb 2021 19:20:24 +0000
Subject: [PATCH] Ubiquity 10 update URL & #27659
---
.../ubiquity/nabia_encrypt_by_default.patch | 12 +++++++
helpers/make-ubiquity | 32 ++++++++++---------
2 files changed, 29 insertions(+), 15 deletions(-)
create mode 100644 helpers/DATA/ubiquity/nabia_encrypt_by_default.patch
diff --git a/helpers/DATA/ubiquity/nabia_encrypt_by_default.patch b/helpers/DATA/ubiquity/nabia_encrypt_by_default.patch
new file mode 100644
index 00000000..980810ed
--- /dev/null
+++ b/helpers/DATA/ubiquity/nabia_encrypt_by_default.patch
@@ -0,0 +1,12 @@
+diff -ru ubiquity/plugins/ubi-partman.py ubiquity-diff/plugins/ubi-partman.py
+--- ubiquity/plugins/ubi-partman.py 2021-02-09 07:58:29.000000000 -0600
++++ ubiquity-diff/plugins/ubi-partman.py 2021-02-25 13:54:40.725587116 -0600
+@@ -739,6 +739,8 @@
+ if opt_desc:
+ opt_desc.show()
+ opt_desc.set_markup(fmt % options[option].desc)
++ if name == "use_crypto":
++ opt_widget.set_active(True)
+
+ if not ticked and opt_widget.get_sensitive():
+ opt_widget.set_active(True)
diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 0cee309a..2009f0d0 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -18,12 +18,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=13
+VERSION=14
. ./config
# Enable full disk encryption by default
-patch -p1 < $DATA/encrypt_by_default.patch
+patch -p0 < $DATA/nabia_encrypt_by_default.patch
cp $DATA/trisquel_installed.png pixmaps
rm pixmaps/ubuntu_installed.png
@@ -37,7 +37,7 @@ replace grub-efi-amd64-signed grub-efi-amd64 .
/bin/sed '/canonical/d' -i debian/ubiquity.install*
rm tests/test_ubi_partman*
-sed 's/, ubuntu-artwork//' debian/control -i
+sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control
export DEB_BUILD_OPTIONS=nocheck
@@ -64,7 +64,7 @@ set -e
file="\$1"
-FASTEST=https://archive.trisquel.info/trisquel/
+FASTEST=https://archive.trisquel.org/trisquel/
SPEED=1000000000000
for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
@@ -101,11 +101,11 @@ chmod 755 d-i/source/apt-setup/generators/99trisquel
# Redirect ports.ubuntu.com
sed '/ports.ubuntu.com/d' -i ./d-i/source/apt-setup/debian/apt-mirror-setup.install
-sed 's/ports.ubuntu.com/archive.trisquel.info/g; s/ubuntu-ports/trisquel/g; s/ubuntu/trisquel/g' -i ./d-i/source/apt-setup/debian/rules ./d-i/source/base-installer/library.sh
-sed 's/CC.ports.ubuntu.com/archive.trisquel.info/g; s/.ports.ubuntu.com/archive.trisquel.info/g' -i ./d-i/source/choose-mirror/choose-mirror.c ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
+sed 's/ports.ubuntu.com/archive.trisquel.org/g; s/ubuntu-ports/trisquel/g; s/ubuntu/trisquel/g' -i ./d-i/source/apt-setup/debian/rules ./d-i/source/base-installer/library.sh
+sed 's/CC.ports.ubuntu.com/archive.trisquel.org/g; s/.ports.ubuntu.com/archive.trisquel.org/g' -i ./d-i/source/choose-mirror/choose-mirror.c ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.ftp.sel-in ./d-i/source/choose-mirror/debian/choose-mirror-bin.templates.http-in
# Set Mirrors.masterlist
-wget https://archive.trisquel.info/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist
+wget https://archive.trisquel.org/trisquel/Mirrors.masterlist -O ./d-i/source/choose-mirror/Mirrors.masterlist
sed '/Location/d; /Comment/d;' -i ./d-i/source/choose-mirror/Mirrors.masterlist
cp ./d-i/source/choose-mirror/Mirrors.masterlist ./d-i/source/choose-mirror/Mirrors.masterlist.trisquel
rm ./d-i/source/choose-mirror/Mirrors.masterlist.ubuntu
@@ -180,16 +180,19 @@ replace Kubuntu Triskel .
replace kubuntu triskel .
find | grep kubuntu.*svg | xargs rename s/kubuntu/triskel/
replace Trisquel-Gettext-Domain Ubuntu-Gettext-Domain
+## rebrand l18n
+ ## Korean - Fix #27659
+replace 우분투 Trisquel .
#replace triskel-ubiquity kubuntu-ubiquity
replace "launchpad.net/ubuntu/+source/ubiquity/+filebug" "trisquel.info/project/issues" .
replace "launchpad.net/ubuntu/+source/ubiquity/" "trisquel.info/project/issues" .
replace "launchpad.net/ubuntu/+source/" "trisquel.info/project/issues" .
replace "ubiquity/+filebug" "" .
replace "+filebug" "" .
-replace archive.ubuntu.com/ubuntu archive.trisquel.info/trisquel .
-replace security.ubuntu.com/trisquel archive.trisquel.info/trisquel .
-replace archive.ubuntu.com archive.trisquel.info .
-replace security.ubuntu.com archive.trisquel.info .
+replace archive.ubuntu.com/ubuntu archive.trisquel.org/trisquel .
+replace security.ubuntu.com/trisquel archive.trisquel.org/trisquel .
+replace archive.ubuntu.com archive.trisquel.org .
+replace security.ubuntu.com archive.trisquel.org .
#sed -i 's/apt-install/true #apt-install/' ubiquity/components/check_kernels.py
sed -i 's/apt-install/true #apt-install/' scripts/check-kernels
#sed -i '82s/True/False/g' gui/gtk/stepPrepare.ui
@@ -197,10 +200,10 @@ sed -i 's/apt-install/true #apt-install/' scripts/check-kernels
rm -rf d-i/source/apt-setup/release-files/*
for DIST in $CODENAME $CODENAME-security $CODENAME-updates $CODENAME-backports
do
- WD=d-i/source/apt-setup/release-files/archive.trisquel.info/$DIST
+ WD=d-i/source/apt-setup/release-files/archive.trisquel.org/$DIST
mkdir $WD -p
- wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release -O $WD/Release
- wget -r -l1 -np https://archive.trisquel.info/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg
+ wget -r -l1 -np https://archive.trisquel.org/trisquel/dists/$DIST/Release -O $WD/Release
+ wget -r -l1 -np https://archive.trisquel.org/trisquel/dists/$DIST/Release.gpg -O $WD/Release.gpg
done
cp $DATA/branding.svgz gui/qt/images/branding.svgz
@@ -271,4 +274,3 @@ changelog "Adapted for Trisquel"
rm -rf debian/source
compile
-
--
GitLab