diff --git a/helpers/DATA/software-properties/aramo_rm_livepatch.patch b/helpers/DATA/software-properties/aramo_rm_livepatch.patch deleted file mode 100644 index f8afa78bf55d6ea3656699c25ce6eb14f0a95bad..0000000000000000000000000000000000000000 --- a/helpers/DATA/software-properties/aramo_rm_livepatch.patch +++ /dev/null @@ -1,398 +0,0 @@ ---- data/gtkbuilder/main.ui 2022-07-08 00:34:50.006995542 +0000 -+++ data/gtkbuilder/main.ui.fix 2022-07-08 00:41:41.280173798 +0000 -@@ -1221,395 +1221,6 @@ - <property name="tab_fill">False</property> - </packing> - </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="border_width">12</property> -- <property name="orientation">vertical</property> -- <property name="spacing">12</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="label" translatable="yes"><b>Settings</b></property> -- <property name="use_markup">True</property> -- <property name="wrap">True</property> -- <property name="max_width_chars">1</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkStack" id="stack_ua_attach"> -- <property name="visible">True</property> -- <child> -- <object class="GtkBox" id="box_ua_unattached"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <child> -- <object class="GtkButton" id="button_ua_attach"> -- <property name="visible">True</property> -- <property name="label" translatable="yes">Attach this machine</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">This machine is not covered by an Trisquel Pro subscription. Receive security updates for over 30,000 Trisquel packages, on up to 3 machines free for personal use: <a href="https://ubuntu.com/advantage">More information</a>.</property> -- <property name="use_markup">True</property> -- <property name="wrap">True</property> -- <property name="max-width-chars">90</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes">This machine is not covered by an Trisquel Advantage subscription.</property> -- <property name="use_markup">True</property> -- <property name="wrap">True</property> -- <property name="max-width-chars">90</property> -- <property name="xalign">0</property> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_attached"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <child> -- <object class="GtkButton" id="button_ua_detach"> -- <property name="visible">True</property> -- <property name="label" translatable="yes">Detach this machine</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Trisquel Pro subscription attached.</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes">Trisquel Advantage subscription attached.</property> -- <property name="xalign">0</property> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="can_focus">False</property> -- <property name="label" translatable="yes"><b>Services</b></property> -- <property name="use_markup">True</property> -- <property name="wrap">True</property> -- <property name="max_width_chars">1</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_esm"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_esm"> -- <property name="visible">False</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">False</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>Extended Security Maintenance</b> provides security updates for over 30,000 Trisquel packages.</property> -- <property name="use_markup">True</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_esm_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable Extended Security Maintenance. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_livepatch"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_livepatch"> -- <property name="visible">True</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>Livepatch</b> helps keep your system secure by applying security updates that don't require a restart.</property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkCheckButton" id="checkbutton_livepatch_topbar"> -- <property name="visible">True</property> -- <property name="label" translatable="yes">Show Livepatch status in the top bar</property> -- <property name="sensitive">False</property> -- <property name="halign">start</property> -- <property name="draw_indicator">True</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_livepatch_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable Livepatch. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="label" translatable="yes"><b>Compliance &amp; Hardening</b></property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Please read the documentation and only enable these settings if you specifically require these certifications.</property> -- <property name="wrap">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkFrame"> -- <property name="visible">False</property> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">12</property> -- <property name="margin">18</property> -- <child> -- <object class="GtkBox" id="box_ua_fips"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_fips"> -- <property name="visible">True</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>FIPS 140-2 Level 1.</b> <a href="https://ubuntu.com/security/certifications#fips">FIPS documentation.</a></property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_fips_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable FIPS 140-2 Level 1. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_fips_updates"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_fips_updates"> -- <property name="visible">True</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>FIPS Updates.</b> <a href="https://ubuntu.com/security/certifications#fips-updates">FIPS Updates documentation.</a></property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_fips_updates_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable FIPS Updates. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_cc_eal"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_cc_eal"> -- <property name="visible">True</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>CC-EAL2.</b> <a href="https://ubuntu.com/security/certifications#common-criteria">CC-EAL2 documentation.</a></property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_cc_eal_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable CC-EAL2. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkBox" id="box_ua_cis_tools"> -- <property name="visible">True</property> -- <property name="spacing">12</property> -- <property name="sensitive">False</property> -- <child> -- <object class="GtkSwitch" id="switch_ua_cis_tools"> -- <property name="visible">True</property> -- <property name="valign">start</property> -- </object> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>CIS Tools.</b> <a href="https://ubuntu.com/security/certifications#cis-tools">CIS Tools documentation.</a></property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_ua_cis_tools_error"> -- <property name="visible">False</property> -- <property name="label" translatable="yes">Could not enable CIS Tools. Please try again.</property> -- <property name="xalign">0</property> -- <attributes> -- <attribute name="foreground" value="red"/> -- <attribute name="scale" value="0.9"/> -- </attributes> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- </object> -- <packing> -- <property name="position">6</property> -- </packing> -- </child> -- <child type="tab"> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="label">Livepatch</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">False</property> -- <property name="can_focus">False</property> -- <property name="label">Trisquel Pro</property> -- </object> -- </child> -- </object> -- <packing> -- <property name="position">6</property> -- <property name="tab_fill">False</property> -- </packing> -- </child> - </object> - <packing> - <property name="expand">True</property> diff --git a/helpers/DATA/software-properties/disable-livepatch.patch b/helpers/DATA/software-properties/disable-livepatch.patch deleted file mode 100644 index 9612792f00469e1c1f993c8e48f0230addb97640..0000000000000000000000000000000000000000 --- a/helpers/DATA/software-properties/disable-livepatch.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/softwareproperties/LivepatchService.py 2020-01-06 15:10:21.950486591 -0500 -+++ b/softwareproperties/LivepatchService.py 2020-01-06 15:07:49.294703393 -0500 -@@ -29,8 +29,6 @@ - import dateutil.parser - import requests_unixsocket - -- gi.require_version('Snapd', '1') -- from gi.repository import Snapd - except(ImportError, ValueError): - pass - -@@ -41,9 +39,6 @@ - retry - ) - --from softwareproperties.LivepatchSnap import LivepatchSnap -- -- - def datetime_parser(json_dict): - for (key, value) in json_dict.items(): - try: -@@ -89,7 +84,6 @@ - - self._timeout_id = 0 - -- self._snap = LivepatchSnap() - self._session = requests_unixsocket.Session() - - # Init Properties -@@ -129,8 +123,6 @@ - # string rapresents the error message that needs to be shown if the - # callable returns false. - rules = [ -- (lambda: self._snap.get_status() != Snapd.SnapStatus.UNKNOWN, -- _('Canonical Livepatch snap is not available.')), - (has_gnome_online_accounts, - _('Gnome Online Accounts is required to enable Livepatch.')), - (is_current_distro_lts, -@@ -177,16 +169,7 @@ - Returns: - (False, '') if successful, (True, error_message) otherwise. - """ -- if self._enabled == enabled: -- return False, '' -- -- if not enabled: -- return self._disable_service() -- elif self._snap.get_status() == Snapd.SnapStatus.ACTIVE: -- return self._enable_service(token) -- else: -- success, msg = self._snap.enable_or_install() -- return self._enable_service(token) if success else (True, msg) -+ return self._disable_service() - - def get_status(self): - """Synchronously retrieve the status of Canonical Livepatch. -@@ -194,13 +177,7 @@ - Returns: - str: The status. A valid string for success, None otherwise. - """ -- try: -- params = {'verbosity': 3, 'format': 'json'} -- r = self._session.get(self.STATUS_ENDPOINT, params=params) -- return r.json(object_hook=datetime_parser) -- except Exception as e: -- logging.debug('Failed to get Livepatch status: {}'.format(str(e))) -- return None -+ return None - - # Private methods - def _enable_service(self, token): ---- a/softwareproperties/gtk/SoftwarePropertiesGtk.py 2020-01-06 15:10:21.970486562 -0500 -+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py 2020-01-06 15:08:00.466687527 -0500 -@@ -1038,12 +1037,7 @@ - self.datadir) - d.run() - -- self.quit_when_livepatch_responds = False -- if self.livepatch_page.waiting_livepatch_response: -- self.quit_when_livepatch_responds = True -- self.hide() -- else: -- self.quit() -+ self.quit() - - def on_button_add_cdrom_clicked(self, widget): - """ when a cdrom is requested for adding """ diff --git a/helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch b/helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch deleted file mode 100644 index f570474097f05864e3e9bea4a1c189ed1d923f99..0000000000000000000000000000000000000000 --- a/helpers/DATA/software-properties/remove_livepatch_from_gtk_uiv1_1.patch +++ /dev/null @@ -1,260 +0,0 @@ -diff -Nru software-properties-0.99.9.8/data/gtkbuilder/main.ui software-properties-0.99.9.8_new/data/gtkbuilder/main.ui ---- software-properties-0.99.9.8/data/gtkbuilder/main.ui 2021-10-26 07:27:56.000000000 -0500 -+++ software-properties-0.99.9.8_new/data/gtkbuilder/main.ui 2021-11-15 21:32:20.534728294 -0600 -@@ -1241,256 +1241,6 @@ - <property name="tab_fill">False</property> - </packing> - </child> -- <child> -- <object class="GtkBox" id="vbox_livepatch"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="border_width">12</property> -- <property name="orientation">vertical</property> -- <property name="spacing">12</property> -- <child> -- <object class="GtkInfoBar" id="info_bar_ubuntu_pro"> -- <property name="visible">True</property> -- <property name="show-close-button">True</property> -- <signal name="response" handler="on_info_bar_ubuntu_pro_response" swapped="no"/> -- <child internal-child="content_area"> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="orientation">vertical</property> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label" translatable="yes"><b>Preview: Ubuntu Pro for Desktop</b>. Automatic security updates to over 30,000 open source software packages.</property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- <child> -- <object class="GtkLabel"> -- <property name="visible">True</property> -- <property name="label"><a href="http://ubuntu.com/advantage">Join the beta programme</a>.</property> -- <property name="use_markup">True</property> -- <property name="xalign">0</property> -- </object> -- </child> -- </object> -- </child> -- </object> -- </child> -- <child> -- <object class="GtkLabel" id="label_livepatch_description"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="label" translatable="yes">Canonical Livepatch helps keep your system secure by applying security updates that don't require a restart. <a href="https://www.ubuntu.com/livepatch">Learn More</a></property> -- <property name="use_markup">True</property> -- <property name="wrap">True</property> -- <property name="max_width_chars">1</property> -- <property name="xalign">0</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- </packing> -- </child> -- <child> -- <object class="GtkBox" id="hbox_switch"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="spacing">6</property> -- <child> -- <object class="GtkSwitch" id="switch_livepatch"> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">0</property> -- </packing> -- </child> -- <child> -- <object class="GtkSpinner" id="spinner_livepatch"> -- <property name="can_focus">False</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">1</property> -- </packing> -- </child> -- <child> -- <object class="GtkLabel" id="label_livepatch_switch"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">2</property> -- </packing> -- </child> -- <child> -- <object class="GtkButton" id="button_livepatch_login"> -- <property name="can_focus">True</property> -- <property name="receives_default">True</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="pack_type">end</property> -- <property name="position">3</property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- </packing> -- </child> -- <child> -- <object class="GtkStack" id="stack_livepatch"> -- <property name="can_focus">False</property> -- <property name="transition_type">crossfade</property> -- <property name="interpolate_size">True</property> -- <child> -- <object class="GtkScrolledWindow"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="shadow_type">in</property> -- <child> -- <object class="GtkTextView" id="textview_livepatch"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="pixels_above_lines">6</property> -- <property name="editable">False</property> -- <property name="wrap_mode">word</property> -- <property name="left_margin">6</property> -- <property name="right_margin">6</property> -- <property name="cursor_visible">False</property> -- <property name="buffer">textbuffer_livepatch</property> -- <property name="accepts_tab">False</property> -- </object> -- </child> -- </object> -- <packing> -- <property name="name">page_livepatch_message</property> -- </packing> -- </child> -- <child> -- <object class="GtkBox"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="orientation">vertical</property> -- <property name="spacing">12</property> -- <child> -- <object class="GtkLabel" id="label_livepatch_last_update"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="xalign">0</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">0</property> -- </packing> -- </child> -- <child> -- <object class="GtkLabel" id="label_livepatch_header"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="xalign">0</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="position">1</property> -- </packing> -- </child> -- <child> -- <object class="GtkScrolledWindow" id="scrolledwindow_livepatch_fixes"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="shadow_type">in</property> -- <child> -- <object class="GtkTreeView" id="treeview_livepatch"> -- <property name="visible">True</property> -- <property name="can_focus">True</property> -- <property name="model">model_livepatch_fixes</property> -- <property name="headers_visible">False</property> -- <property name="enable_search">False</property> -- <property name="show_expanders">False</property> -- <child internal-child="selection"> -- <object class="GtkTreeSelection"/> -- </child> -- <child> -- <object class="GtkTreeViewColumn"> -- <property name="title" translatable="yes">column</property> -- <child> -- <object class="GtkCellRendererText"> -- <property name="width_chars">100</property> -- <property name="wrap_mode">word</property> -- <property name="wrap_width">100</property> -- </object> -- <attributes> -- <attribute name="markup">0</attribute> -- </attributes> -- </child> -- </object> -- </child> -- </object> -- </child> -- </object> -- <packing> -- <property name="expand">True</property> -- <property name="fill">True</property> -- <property name="position">2</property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="name">page_livepatch_status</property> -- <property name="position">1</property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="expand">True</property> -- <property name="fill">True</property> -- </packing> -- </child> -- <child> -- <object class="GtkCheckButton" id="checkbutton_livepatch_topbar"> -- <property name="label" translatable="yes">Show Livepatch status in the top bar</property> -- <property name="visible">True</property> -- <property name="sensitive">False</property> -- <property name="can_focus">True</property> -- <property name="receives_default">False</property> -- <property name="halign">start</property> -- <property name="draw_indicator">True</property> -- </object> -- <packing> -- <property name="expand">False</property> -- <property name="fill">True</property> -- <property name="pack_type">end</property> -- </packing> -- </child> -- </object> -- <packing> -- <property name="position">6</property> -- </packing> -- </child> -- <child type="tab"> -- <object class="GtkLabel" id="label_livepatch"> -- <property name="visible">True</property> -- <property name="can_focus">False</property> -- <property name="label">Livepatch</property> -- </object> -- <packing> -- <property name="position">6</property> -- <property name="tab_fill">False</property> -- </packing> -- </child> - </object> - <packing> - <property name="expand">True</property> diff --git a/helpers/DATA/software-properties/remove_proposed_updates.patch b/helpers/DATA/software-properties/remove_proposed_updates.patch new file mode 100644 index 0000000000000000000000000000000000000000..d1cb3115440e653123d51daca55e771481fcc4b9 --- /dev/null +++ b/helpers/DATA/software-properties/remove_proposed_updates.patch @@ -0,0 +1,126 @@ +diff -Nru software-properties-0.99.22.5+11.0trisquel11/data/gtkbuilder/main.ui software-properties-0.99.22.5+11.0trisquel11_fix/data/gtkbuilder/main.ui +--- software-properties-0.99.22.5+11.0trisquel11/data/gtkbuilder/main.ui 2023-01-27 09:12:26.635563930 -0600 ++++ software-properties-0.99.22.5+11.0trisquel11_fix/data/gtkbuilder/main.ui 2023-01-27 09:21:43.497166997 -0600 +@@ -1157,70 +1157,6 @@ + <property name="tab_fill">False</property> + </packing> + </child> +- <child> +- <object class="GtkBox" id="dev_options"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="border_width">12</property> +- <property name="orientation">vertical</property> +- <property name="spacing">6</property> +- <child> +- <object class="GtkFrame" id="frame_children1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label_xalign">0</property> +- <property name="shadow_type">none</property> +- <child> +- <object class="GtkAlignment" id="alignment1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="top_padding">6</property> +- <property name="left_padding">12</property> +- <child> +- <object class="GtkBox" id="dev_box"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="orientation">vertical</property> +- <child> +- <placeholder/> +- </child> +- </object> +- </child> +- </object> +- </child> +- <child type="label"> +- <object class="GtkLabel" id="label_updates1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes">Use proposed updates if you’re willing to report bugs on any problems that occur.</property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="max_width_chars">110</property> +- </object> +- </child> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">0</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="position">5</property> +- </packing> +- </child> +- <child type="tab"> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label">Trisquel Pro</property> +- </object> +- <packing> +- <property name="position">6</property> +- <property name="tab_fill">False</property> +- </packing> +- </child> + </object> + <packing> + <property name="expand">True</property> +diff -Nru software-properties-0.99.22.5+11.0trisquel11/softwareproperties/gtk/SoftwarePropertiesGtk.py software-properties-0.99.22.5+11.0trisquel11_fix/softwareproperties/gtk/SoftwarePropertiesGtk.py +--- software-properties-0.99.22.5+11.0trisquel11/softwareproperties/gtk/SoftwarePropertiesGtk.py 2023-01-27 09:54:48.314903324 -0600 ++++ software-properties-0.99.22.5+11.0trisquel11_fix/softwareproperties/gtk/SoftwarePropertiesGtk.py 2023-01-27 10:15:52.589232983 -0600 +@@ -410,24 +410,6 @@ + self.vbox_dist_comps.add(checkbox) + checkbox.show() + +- # Setup the checkbuttons for the child repos +- for checkbutton in self.dev_box.get_children(): +- self.dev_box.remove(checkbutton) +- for template in self.distro.source_template.children: +- # Do not show source entries in there +- if template.type == "deb-src": +- continue +- if "proposed" in template.name: +- checkbox = Gtk.CheckButton(label="%s (%s)" % (template.description, +- template.name)) +- checkbox.template = template +- self.handlers[checkbox] = \ +- checkbox.connect("toggled", +- self.on_checkbutton_child_toggled, +- template) +- self.dev_box.add(checkbox) +- checkbox.show() +- + status = get_ua_status() + if not is_current_distro_lts(): + esm_available = False +@@ -510,12 +492,6 @@ + """Fill the distro user interface with life""" + self.block_handlers() + +- # Enable or disable the child source checkbuttons +- for checkbox in self.dev_box.get_children(): +- (active, inconsistent) = self.get_comp_child_state(checkbox.template) +- checkbox.set_active(active) +- checkbox.set_inconsistent(inconsistent) +- + # Enable or disable the component checkbuttons + for checkbox in self.vbox_dist_comps.get_children(): + # check if the comp is enabled +@@ -562,10 +538,8 @@ + # and source code + if len(self.distro.enabled_comps) < 1: + self.combobox_updates_subscription.set_sensitive(False) +- self.dev_box.set_sensitive(False) + self.checkbutton_source_code.set_sensitive(False) + else: +- self.dev_box.set_sensitive(True) + self.checkbutton_source_code.set_sensitive(True) + + # Check for source code sources diff --git a/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch b/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch new file mode 100644 index 0000000000000000000000000000000000000000..6038afbbbef8db8c8c9aa06ffe849a20524fee14 --- /dev/null +++ b/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch @@ -0,0 +1,427 @@ +diff -Nru software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui software-properties-0.99.22.5+11.0trisquel12_fix/data/gtkbuilder/main.ui +--- software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui 2023-01-26 15:15:06.253819392 -0600 ++++ software-properties-0.99.22.5+11.0trisquel12_fix/data/gtkbuilder/main.ui 2023-01-26 15:17:19.325782731 -0600 +@@ -1211,423 +1211,6 @@ + </packing> + </child> + <child type="tab"> +- <object class="GtkLabel" id="label7"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes">Developer Options</property> +- </object> +- <packing> +- <property name="position">5</property> +- <property name="tab_fill">False</property> +- </packing> +- </child> +- <child> +- <object class="GtkStack" id="stack_ua_main"> +- <property name="visible">True</property> +- <child> +- <object class="GtkBox" id="box_ua_options"> +- <property name="visible">True</property> +- <property name="border_width">12</property> +- <property name="orientation">vertical</property> +- <property name="spacing">12</property> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Subscription</b></property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="max_width_chars">1</property> +- <property name="xalign">0</property> +- </object> +- </child> +- <child> +- <object class="GtkFrame"> +- <property name="visible">True</property> +- <child> +- <object class="GtkBox"> +- <property name="visible">True</property> +- <property name="spacing">36</property> +- <property name="margin">18</property> +- <child> +- <object class="GtkImage" id="image_ubuntu_pro_logo"> +- <property name="visible">True</property> +- </object> +- </child> +- <child> +- <object class="GtkStack" id="stack_ua_attach"> +- <property name="visible">True</property> +- <child> +- <object class="GtkBox" id="box_ua_unattached"> +- <property name="visible">True</property> +- <property name="spacing">24</property> +- <child> +- <object class="GtkButton" id="button_ua_attach"> +- <property name="visible">True</property> +- <property name="valign">center</property> +- <property name="label" translatable="yes">_Enable Trisquel Pro</property> +- <property name="use_underline">True</property> +- </object> +- </child> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>This machine is not covered by an Trisquel Pro subscription.</b> +-Receive security updates for over 25,000 Trisquel packages, free for up to 5 machines. <a href="https://ubuntu.com/pro">Learn more</a>.</property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="max-width-chars">90</property> +- <property name="xalign">0</property> +- </object> +- </child> +- </object> +- </child> +- <child> +- <object class="GtkBox" id="box_ua_attached"> +- <property name="visible">True</property> +- <property name="spacing">24</property> +- <child> +- <object class="GtkButton" id="button_ua_detach"> +- <property name="visible">True</property> +- <property name="valign">center</property> +- <property name="label" translatable="yes">_Disable Trisquel Pro</property> +- <property name="use_underline">True</property> +- </object> +- </child> +- <child> +- <object class="GtkBox"> +- <property name="visible">True</property> +- <property name="spacing">6</property> +- <child> +- <object class="GtkImage"> +- <property name="visible">True</property> +- <property name="icon-name">emblem-default</property> +- </object> +- </child> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- <property name="label" translatable="yes"><span foreground="green">Trisquel Pro support is enabled</span></property> +- <property name="xalign">0</property> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes"><b>Security</b></property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="max_width_chars">1</property> +- <property name="xalign">0</property> +- </object> +- </child> +- <child> +- <object class="GtkGrid"> +- <property name="visible">True</property> +- <property name="row_spacing">12</property> +- <property name="column_spacing">12</property> +- <child> +- <object class="GtkSwitch" id="switch_ua_esm_infra"> +- <property name="visible">True</property> +- <property name="halign">start</property> +- <property name="valign">center</property> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_esm_infra"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- <property name="valign">center</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_esm_infra_error"> +- <property name="visible">False</property> +- <property name="valign">center</property> +- <property name="xalign">0</property> +- <attributes> +- <attribute name="foreground" value="red"/> +- <attribute name="scale" value="0.9"/> +- </attributes> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">1</property> +- </packing> +- </child> +- <child> +- <object class="GtkSwitch" id="switch_ua_esm_apps"> +- <property name="visible">True</property> +- <property name="halign">start</property> +- <property name="valign">center</property> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_esm_apps"> +- <property name="visible">True</property> +- <property name="use_markup">True</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_esm_apps_error"> +- <property name="visible">False</property> +- <property name="xalign">0</property> +- <attributes> +- <attribute name="foreground" value="red"/> +- <attribute name="scale" value="0.9"/> +- </attributes> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">3</property> +- </packing> +- </child> +- <child> +- <object class="GtkSwitch" id="switch_ua_livepatch"> +- <property name="visible">True</property> +- <property name="halign">start</property> +- <property name="valign">center</property> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">4</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_livepatch"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Kernel Livepatch</b> helps keep your system secure by applying security updates that don't require a restart.</property> +- <property name="use_markup">True</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">4</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_livepatch_error"> +- <property name="visible">False</property> +- <property name="xalign">0</property> +- <attributes> +- <attribute name="foreground" value="red"/> +- <attribute name="scale" value="0.9"/> +- </attributes> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">5</property> +- </packing> +- </child> +- <child> +- <object class="GtkCheckButton" id="checkbutton_livepatch_topbar"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Show Livepatch status in the top bar</property> +- <property name="sensitive">False</property> +- <property name="halign">start</property> +- <property name="draw_indicator">True</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">6</property> +- </packing> +- </child> +- </object> +- </child> +- <child> +- <object class="GtkFrame"> +- <property name="visible">True</property> +- <child> +- <object class="GtkExpander" id="expander_compliance_and_hardening"> +- <property name="visible">True</property> +- <property name="margin">18</property> +- <child type="label"> +- <object class="GtkBox"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">12</property> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Compliance &amp; Hardening</b></property> +- <property name="use_markup">True</property> +- <property name="xalign">0</property> +- </object> +- </child> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Only recommended to assist with FedRAMP, HIPAA, and other compliance and hardening requirements. Includes FIPS 140-2 certified modules, DISA-STIG, CIS and Common Criteria.</property> +- <property name="wrap">True</property> +- <property name="xalign">0</property> +- <property name="max-width-chars">90</property> +- </object> +- </child> +- </object> +- </child> +- <child> +- <object class="GtkGrid"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="row_spacing">12</property> +- <property name="column_spacing">12</property> +- <property name="margin_top">12</property> +- <child> +- <object class="GtkButton" id="button_ua_fips"> +- <property name="visible">True</property> +- <property name="width_request">160</property> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Enable _FIPS</property> +- <property name="use_underline">True</property> +- </object> +- </child> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_fips_status"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>FIPS 140-2</b></property> +- <property name="use_markup">True</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_fips_description"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">A US and Canada government cryptographic module certification of compliance with the FIPS 140-2 data protection standard. <a href="https://ubuntu.com/security/certifications/docs/fips">FIPS documentation</a></property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="xalign">0</property> +- <property name="max-width-chars">75</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">1</property> +- </packing> +- </child> +- <child> +- <object class="GtkButton" id="button_ua_usg"> +- <property name="visible">True</property> +- <property name="width_request">160</property> +- <child> +- <object class="GtkLabel" id="label_ua_usg_button"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Enable _USG</property> +- <property name="use_underline">True</property> +- </object> +- </child> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_usg_status"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Trisquel Security Guide (USG)</b></property> +- <property name="use_markup">True</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_ua_usg_description"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Automates hardening and auditing with CIS benchmark and DISA-STIG profiles while allowing for environment-specific customizations. <a href="https://ubuntu.com/security/certifications/docs/usg">USG documentation</a></property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="xalign">0</property> +- <property name="max-width-chars">75</property> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">3</property> +- </packing> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- <packing> +- <property name="position">6</property> +- </packing> +- </child> +- <child> +- <object class="GtkBox" id="box_ua_fips_setup"> +- <property name="visible">True</property> +- <child> +- <object class="GtkBox"> +- <property name="visible">True</property> +- <property name="orientation">vertical</property> +- <property name="spacing">18</property> +- <property name="expand">True</property> +- <property name="halign">center</property> +- <property name="valign">center</property> +- <child> +- <object class="GtkSpinner"> +- <property name="visible">True</property> +- <property name="active">True</property> +- </object> +- </child> +- <child> +- <object class="GtkLabel"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Setting up FIPS</property> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- </child> +- <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> diff --git a/helpers/make-software-properties b/helpers/make-software-properties index f218bb261c2c7828f1f18ab0d8cb7bd2e40ca412..04e498bdbfc02d055903bd0595c96edd84e3b4e6 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -20,13 +20,13 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=11 +VERSION=12 . ./config - #Temporary removal of livepatch LP:1965993 - #patch -p1 < $DATA/remove_livepatch_from_gtk_uiv1_1.patch - #patch -p1 < $DATA/disable-livepatch.patch +#Remove logo +rm data/ubuntu-pro-logo*.svg +sed -i '/ubuntu-pro-logo/d' debian/software-properties-gtk.install rm softwareproperties/gtk/UbuntuProPage.py patch --no-backup-if-mismatch -p0 < $DATA/remove_snap_label.patch @@ -37,8 +37,6 @@ sed -i '/import softwareproperties.SoftwareProperties/a from softwareproperties. sed -i 's|eol_date = distro.eol|eol_date = trisquel_eol|' softwareproperties/gtk/SoftwarePropertiesGtk.py sed -i 's|eol_text = .*|eol_text = trisquel_rel_desc|' softwareproperties/gtk/SoftwarePropertiesGtk.py #Allow to start and remove drivers tab for qt flavor - #Temporary removal of livepatch LP:1965993 - #sed -i '/info_bar_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py sed -i '/UbuntuDrivers/d' softwareproperties/qt/SoftwarePropertiesQt.py sed -i '/tab_switched(self)/i \ \ \ \ self.userinterface.tabWidget.removeTab(4)' softwareproperties/qt/SoftwarePropertiesQt.py sed -i '/tab_switched(self)/,/self.button_revert.setVisible(True)/{//!d}' softwareproperties/qt/SoftwarePropertiesQt.py @@ -62,10 +60,7 @@ replace "Trisquel-Gettext" "Ubuntu-Gettext" . sed '/test_suite/d' -i setup.py rm -rf tests -sed '/gir1.2-snapd-1/d' -i debian/control - #Temporary removal of livepatch LP:1965993 - #sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py - #sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py +sed -i '/ubuntu-advantage-tools/d' debian/control rm data/software-properties-drivers.desktop.in sed -i '/software-properties-drivers/d' po/POTFILES.in @@ -81,7 +76,8 @@ sed -i '/TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py sed -i '/init_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py #Livepatch - aramo -patch --no-backup-if-mismatch -p0 < $DATA/aramo_rm_livepatch.patch +patch --no-backup-if-mismatch -p1 < $DATA/remove_ubuntu_suscription_tab.patch +patch --no-backup-if-mismatch -p1 < $DATA/remove_proposed_updates.patch #Patch codename for PPAs patch --no-backup-if-mismatch -p1 < $DATA/fix_PPA_upstream_codename.patch