From 79e26d7b5e70d01a189702241df14bdee48c761a Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Thu, 12 Sep 2019 23:47:00 -0700 Subject: [PATCH 1/8] remove livepatch, update for etiona --- helpers/make-update-manager | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/helpers/make-update-manager b/helpers/make-update-manager index f7c63da..7d9ddab 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -17,10 +17,16 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=8 +VERSION=9 . ./config +rm UpdateManager/Core/LivePatchSocket.py +rm tests/test_livepatch_socket.py +patch -p1 < $DATA/remove-livepatch.patch +sed -i '/import LivePatchSocket/d' UpdateManager/Dialogs.py +sed -i '/self.check_livepatch_status/d' UpdateManager/Dialogs.py + #Closes #12545 patch -p0 < $DATA/trisquel-versions.patch @@ -50,7 +56,7 @@ replace xubuntu-desktop trisquel-mini . replace edubuntu-desktop toast . sed '/%s base/ s/name.*/name = "Trisquel base"/' -i ./UpdateManager/Core/UpdateList.py -sed 's_http://changelogs.ubuntu.com/changelogs/pool/_http://packages.trisquel.info/changelogs/pool/_' -i UpdateManager/Core/MyCache.py +sed 's_https://changelogs.ubuntu.com/changelogs/pool/_https://packages.trisquel.info/changelogs/pool/_' -i UpdateManager/Core/MyCache.py sed '/len(changelog) == 0/,/"later."/d' -i UpdateManager/Core/MyCache.py changelog "Compiled for Trisquel" From 0ae7f6878bbc980b18457d2433b8886e829468b5 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 00:04:09 -0700 Subject: [PATCH 2/8] update for etiona --- helpers/make-ubuntu-release-upgrader | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index aa2075f..d7c48c3 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -2,6 +2,7 @@ # # Copyright (C) 2008-2018 Ruben Rodriguez # Copyright (C) 2014 Santiago Rodriguez +# Copyright (C) 2019 Mason Hock # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,7 +24,7 @@ # Also, don't forget to update the meta-release files at archive and packages.t.i # The "obsoletes" list from ubuntu has been removed -VERSION=3 +VERSION=4 . ./config @@ -33,7 +34,6 @@ rm ./DistUpgrade/NvidiaDetector sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py -sed '/nvidia/d' DistUpgrade/build-tarball.sh -i rm tests/test-data/xorg.conf.fglrx #https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740 @@ -333,10 +333,6 @@ for i in core gtk qt; do sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control done -#ubuntu-drivers-common is not a build-dep, nor avaliable in trisquel. -sed -i 's/cp \/usr\/share\/ubuntu-drivers-common\/obsolete/touch/g' DistUpgrade/build-tarball.sh - - changelog "Compiled for Trisquel" PARALLEL=false compile From 9a74d7a6d5645fe74f2718483a0ae475bd38bb1e Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 00:04:59 -0700 Subject: [PATCH 3/8] update copyright --- helpers/make-update-manager | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers/make-update-manager b/helpers/make-update-manager index 7d9ddab..b2c86ce 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2008-2018 Ruben Rodriguez +# Copyright (C) 2019 Mason Hock # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by From e76d3d104b1eb3de968db85f96ca74a0d4bdf06c Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 00:21:05 -0700 Subject: [PATCH 4/8] provide version of ubuntu-release-upgrader-core --- helpers/make-ubuntu-release-upgrader | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index d7c48c3..2f6a753 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -333,6 +333,8 @@ for i in core gtk qt; do sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control done +sed 's/ubuntu-release-upgrader-core/ubuntu-release-upgrader-core (= ${source:Version})/' -i debian/control + changelog "Compiled for Trisquel" PARALLEL=false compile From d4fbc976ac30d35acef10a933749aad2defc0df8 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 00:21:27 -0700 Subject: [PATCH 5/8] update for etiona --- helpers/make-ubuntu-release-upgrader | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 2f6a753..52572c3 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -268,6 +268,9 @@ replace '14.04' '7.0' . -R rpl 16\.04 8\.0 po/* -R rpl 16\.04 8\.0 DistUpgrade/*.ui -R replace '16.04' '8.0' . -R +rpl 18\.04 9\.0 po/* -R +rpl 18\.04 9\.0 DistUpgrade/*.ui -R +replace '18.04' '9.0' . -R rpl $UPSTREAM $CODENAME . -R rpl oneiric brigantia . -R rpl natty dagda . -R @@ -279,6 +282,8 @@ rpl hardy robur . -R rpl lucid taranis . -R rpl precise toutatis . -R rpl trusty belenos . -R +rpl xenial flidas . -R +rpl bionic etiona . -R rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.trusty utils/demoted.cfg.trusty data/demoted.cfg.trusty echo "notification-daemon" > data/demoted.cfg From dee01fb9e0de0d36ca20c3f2516d525986d315bc Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 00:22:00 -0700 Subject: [PATCH 6/8] fixed patch --- helpers/DATA/update-manager/prevent-autoconnection.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/DATA/update-manager/prevent-autoconnection.patch b/helpers/DATA/update-manager/prevent-autoconnection.patch index 9484ccd..b617a7f 100644 --- a/helpers/DATA/update-manager/prevent-autoconnection.patch +++ b/helpers/DATA/update-manager/prevent-autoconnection.patch @@ -25,14 +25,14 @@ diff -ru source.orig/UpdateManager/Dialogs.py source/UpdateManager/Dialogs.py diff -ru source.orig/UpdateManager/UpdateManager.py source/UpdateManager/UpdateManager.py --- source.orig/UpdateManager/UpdateManager.py 2018-02-12 20:44:33.317329071 -0500 +++ source/UpdateManager/UpdateManager.py 2018-02-12 20:45:28.133249491 -0500 -@@ -50,6 +50,7 @@ +@@ -52,6 +52,7 @@ ErrorDialog, + HWEUpgradeDialog, NeedRestartDialog, - NoUpdatesDialog, + ShouldUpdateDialog, - StoppedUpdatesDialog, + NoUpdatesDialog, PartialUpgradeDialog, - UnsupportedDialog, + StoppedUpdatesDialog, @@ -205,6 +206,17 @@ self.start_available() From 51490d0d11e51eab1cf9cbf5a79f0c71cde19f66 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 01:09:01 -0700 Subject: [PATCH 7/8] fix upstream/downstream names/versions --- helpers/make-update-manager | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helpers/make-update-manager b/helpers/make-update-manager index b2c86ce..5141c7f 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -51,6 +51,9 @@ replace internet Internet . replace Ubuntu Trisquel . replace "Trisquel-Gettext" "Ubuntu-Gettext" . +sed -i 's/Trisquel 16.04 LTS to Trisquel 18.04 LTS/Trisquel 8.0 LTS to Trisquel 9.0 LTS/' HweSupportStatus/consts.py +sed -i 's/TrisquelDistroInfo/UbuntuDistroInfo/' UpdateManager/UpdateManager.py + replace ubuntu-desktop trisquel . replace kubuntu-desktop triskel . replace xubuntu-desktop trisquel-mini . From f80a851d56b08fa468ecff66dd59363eaa2b661f Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 13 Sep 2019 13:09:54 -0700 Subject: [PATCH 8/8] remove livepatch integration --- .../update-manager/remove-livepatch.patch | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 helpers/DATA/update-manager/remove-livepatch.patch diff --git a/helpers/DATA/update-manager/remove-livepatch.patch b/helpers/DATA/update-manager/remove-livepatch.patch new file mode 100644 index 0000000..2b840dd --- /dev/null +++ b/helpers/DATA/update-manager/remove-livepatch.patch @@ -0,0 +1,66 @@ +diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py +index b100c3a..d604f54 100644 +--- a/UpdateManager/Dialogs.py ++++ b/UpdateManager/Dialogs.py +@@ -149,61 +149,6 @@ class InternalDialog(BuilderDialog): + self.main_container.add(content_widget) + self.main_container.set_visible(bool(content_widget)) + +- def _is_livepatch_supported(self): +- di = distro_info.UbuntuDistroInfo() +- codename = get_dist() +- return di.is_lts(codename) +- +- def on_livepatch_status_ready(self, active, cs, ps, fixes): +- self.set_desc(None) +- +- if not active: +- if self._is_livepatch_supported() and \ +- self.settings_button and \ +- self.settings.get_int('launch-count') >= 4: +- self.set_desc(_("Tip: You can use Livepatch to " +- "keep your computer more secure between " +- "restarts.")) +- self.settings_button.set_label(_("Settings & Livepatch…")) +- return +- +- needs_reschedule = False +- +- if cs == "needs-check": +- needs_reschedule = True +- elif cs == "check-failed": +- pass +- elif cs == "checked": +- if ps == "unapplied" or ps == "applying": +- needs_reschedule = True +- elif ps == "applied": +- fixes = [fix for fix in fixes if fix.patched] +- d = ngettext("%d Livepatch update applied since the last " +- "restart.", +- "%d Livepatch updates applied since the last " +- "restart.", +- len(fixes)) % len(fixes) +- self.set_desc(d) +- elif ps == "applied-with-bug" or ps == "apply-failed": +- fixes = [fix for fix in fixes if fix.patched] +- d = ngettext("%d Livepatch update failed to apply since the " +- "last restart.", +- "%d Livepatch updates failed to apply since the " +- "last restart.", +- len(fixes)) % len(fixes) +- self.set_desc(d) +- elif ps == "nothing-to-apply": +- pass +- elif ps == "unknown": +- pass +- +- if needs_reschedule: +- self.lp_socket.get_status(self.on_livepatch_status_ready) +- +- def check_livepatch_status(self): +- self.lp_socket = LivePatchSocket() +- self.lp_socket.get_status(self.on_livepatch_status_ready) +- + + class StoppedUpdatesDialog(InternalDialog): + def __init__(self, window_main):