remove all traces of the dsa-4371 workaround

QubesOS · Nov 17, 2021 · 77dbc73 · 77dbc73
1 parent a02e307
commit 77dbc73
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 178 deletions.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,6 @@ install:
 	mkdir -p $(DESTDIR)/usr/libexec/qubes-manager/
 	cp qubesmanager/mount_for_backup.sh $(DESTDIR)/usr/libexec/qubes-manager/
 	cp qubesmanager/qvm_about.sh $(DESTDIR)/usr/libexec/qubes-manager/
-	cp qubesmanager/dsa-4371-update $(DESTDIR)/usr/libexec/qubes-manager/
 
 	mkdir -p $(DESTDIR)/usr/share/applications
 	cp qubes-global-settings.desktop $(DESTDIR)/usr/share/applications/

diff --git a/debian/install b/debian/install
@@ -11,7 +11,6 @@
 /usr/bin/qubes-vm-clone
 /usr/libexec/qubes-manager/mount_for_backup.sh
 /usr/libexec/qubes-manager/qvm_about.sh
-/usr/libexec/qubes-manager/dsa-4371-update
 
 /usr/lib/*/dist-packages/qubesmanager/__pycache__
 /usr/lib/*/dist-packages/qubesmanager/__init__.py

diff --git a/qubesmanager/dsa-4371-update b/qubesmanager/dsa-4371-update
diff --git a/qubesmanager/i18n/qubesmanager_en.ts b/qubesmanager/i18n/qubesmanager_en.ts
@@ -1720,16 +1720,6 @@ The qube must be running to disable seamless mode; this setting is not persisten
 </context>
 <context>
     <name>UpdateVMThread</name>
-    <message>
-        <location filename="../qube_manager.py" line="618"/>
-        <source>Debian DSA-4371 fix installed in {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qube_manager.py" line="625"/>
-        <source>Failed to apply DSA-4371 fix: {}</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qube_manager.py" line="631"/>
         <source>Error on qube update!</source>

diff --git a/qubesmanager/i18n/qubesmanager_es.ts b/qubesmanager/i18n/qubesmanager_es.ts
@@ -1762,16 +1762,6 @@ The qube must be running to disable seamless mode; this setting is not persisten
 </context>
 <context>
     <name>UpdateVMThread</name>
-    <message>
-        <location filename="../qube_manager.py" line="618"/>
-        <source>Debian DSA-4371 fix installed in {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qube_manager.py" line="625"/>
-        <source>Failed to apply DSA-4371 fix: {}</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../qube_manager.py" line="631"/>
         <source>Error on qube update!</source>

diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
@@ -607,24 +607,6 @@ def run(self):
                     except exc.QubesDaemonAccessError:
                         # permission denied, let us hope for the best
                         pass
-                # apply DSA-4371
-                with open('/usr/libexec/qubes-manager/dsa-4371-update', 'rb') \
-                        as dsa4371update:
-                    stdout, stderr = self.vm.run_service_for_stdio(
-                            "qubes.VMShell",
-                            user="root",
-                            input=dsa4371update.read())
-                if stdout == b'changed=yes\n':
-                    subprocess.call(
-                        ['notify-send', '-i', 'dialog-information',
-                         self.tr('Debian DSA-4371 fix installed in {}').format(
-                                self.vm.name)])
-                elif stdout == b'changed=no\n':
-                    pass
-                else:
-                    raise exc.QubesException(
-                            self.tr("Failed to apply DSA-4371 fix: {}").format(
-                                stderr.decode('ascii')))
                 self.vm.run_service("qubes.InstallUpdatesGUI",
                                     user="root", wait=False)
         except (ChildProcessError, exc.QubesException) as ex:

diff --git a/qubesmanager/tests/test_qube_manager.py b/qubesmanager/tests/test_qube_manager.py
@@ -1619,9 +1619,6 @@ def test_21_update_vm_thread_running(self, mock_call, mock_open):
 
         thread.run()
 
-        mock_open.assert_called_with(
-            '/usr/libexec/qubes-manager/dsa-4371-update', 'rb')
-
         vm.run_service_for_stdio.assert_called_once_with(
             "qubes.VMShell", user='root', input=unittest.mock.ANY)
 
@@ -1644,9 +1641,6 @@ def test_22_update_vm_thread_not_running(self, mock_call, mock_open):
         thread = qube_manager.UpdateVMThread(vm)
         thread.run()
 
-        mock_open.assert_called_with(
-            '/usr/libexec/qubes-manager/dsa-4371-update', 'rb')
-
         vm.start.assert_called_once_with()
 
         vm.run_service_for_stdio.assert_called_once_with(

diff --git a/rpm_spec/qmgr.spec.in b/rpm_spec/qmgr.spec.in
@@ -73,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/qvm-template-gui
 /usr/libexec/qubes-manager/mount_for_backup.sh
 /usr/libexec/qubes-manager/qvm_about.sh
-/usr/libexec/qubes-manager/dsa-4371-update
 
 %dir %{python3_sitelib}/qubesmanager
 %{python3_sitelib}/qubesmanager/__pycache__