Move appmenus handling code to separate repository

This code is highly Linux-specific so move it out of the core
repository.

dom0/aux-tools/convert-apptemplate2vm.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-SRC=$1
-DSTDIR=$2
-VMNAME=$3
-VMDIR=$4
-
-DST=$DSTDIR/$VMNAME-$(basename $SRC)
-
-sed -e "s/%VMNAME%/$VMNAME/" \
-    -e "s %VMDIR% $VMDIR " \
-        <$SRC >$DST
-
-

dom0/aux-tools/convert-dirtemplate2vm.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-SRC=$1
-DST=$2
-VMNAME=$3
-VMDIR=$4
-
-sed -e "s/%VMNAME%/$VMNAME/" \
-    -e "s %VMDIR% $VMDIR " \
-        <$SRC >$DST
-
-

dom0/aux-tools/create-apps-for-appvm.sh

@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# The Qubes OS Project, http://www.qubes-os.org
-#
-# Copyright (C) 2010  Joanna Rutkowska <joanna@invisiblethingslab.com>
-#
-# 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 the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
-SRCDIR=$1
-VMNAME=$2
-VMTYPE=$3
-if [ -z "$VMTYPE" ]; then
-    VMTYPE=appvms
-fi
-VMDIR=/var/lib/qubes/$VMTYPE/$VMNAME
-APPSDIR=$VMDIR/apps
-
-if [ $# -lt 2 ]; then
-    echo "usage: $0 <apps_templates_dir> <vmname> [appvms|vm-templates|servicevms]"
-    exit
-fi
-mkdir -p $APPSDIR
-
-if [ "$SRCDIR" != "none" ]; then
-    echo "--> Converting Appmenu Templates..."
-    if [ -r "$VMDIR/whitelisted-appmenus.list" ]; then
-        cat $VMDIR/whitelisted-appmenus.list | xargs -I{} /usr/lib/qubes/convert-apptemplate2vm.sh $SRCDIR/{} $APPSDIR $VMNAME $VMDIR
-    else
-        find $SRCDIR -name "*.desktop" $CHECK_WHITELISTED -exec /usr/lib/qubes/convert-apptemplate2vm.sh {} $APPSDIR $VMNAME $VMDIR \;
-    fi
-    /usr/lib/qubes/convert-apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.desktop $APPSDIR $VMNAME $VMDIR
-
-    if [ "$VMTYPE" = "vm-templates" ]; then
-        DIR_TEMPLATE=/usr/share/qubes/qubes-templatevm.directory.template
-    elif [ "$VMTYPE" = "servicevms" ]; then
-        DIR_TEMPLATE=/usr/share/qubes/qubes-servicevm.directory.template
-    else
-        DIR_TEMPLATE=/usr/share/qubes/qubes-vm.directory.template
-    fi
-    /usr/lib/qubes/convert-dirtemplate2vm.sh $DIR_TEMPLATE $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR
-fi
-
-echo "--> Adding Apps to the Menu..."
-xdg-desktop-menu install $APPSDIR/*.directory $APPSDIR/*.desktop
-
-if [ -n "$KDE_SESSION_UID" ]; then
-    kbuildsycoca4
-fi

dom0/aux-tools/remove-appvm-appmenus.sh

@@ -1,23 +0,0 @@
-#!/bin/sh
-VMNAME=$1
-VMTYPE=$2
-if [ -z "$VMTYPE" ]; then
-    VMTYPE=appvms
-fi
-VMDIR=/var/lib/qubes/$VMTYPE/$VMNAME
-APPSDIR=$VMDIR/apps
-
-if [ $# -lt 1 ]; then
-    echo "usage: $0 <vmname> [appvms|vm-templates|servicevms]"
-    exit
-fi
-
-if ls $APPSDIR/*.directory $APPSDIR/*.desktop > /dev/null 2>&1; then
-    xdg-desktop-menu uninstall $APPSDIR/*.directory $APPSDIR/*.desktop
-    rm -f $APPSDIR/*.desktop $APPSDIR/*.directory
-    rm -f $HOME/.config/menus/applications-merged/user-$VMNAME-vm.menu
-fi
-
-if [ -n "$KDE_SESSION_UID" ]; then
-    kbuildsycoca4
-fi

dom0/core-modules/000QubesVm.py

@@ -120,9 +120,6 @@ class QubesVm(object):
             "default_user": { "default": "user" },
             "qrexec_timeout": { "default": 60, "eval": "int(value)" },
             ##### Internal attributes - will be overriden in __init__ regardless of args
-            "appmenus_templates_dir": { "eval": \
-                'os.path.join(self.dir_path, vm_files["appmenus_templates_subdir"]) if self.updateable else ' + \
-                'self.template.appmenus_templates_dir if self.template is not None else None' },
             "config_file_template": { "eval": 'system_path["config_template_pv"]' },
             "icon_path": { "eval": 'os.path.join(self.dir_path, "/icon.png") if self.dir_path is not None else None' },
             # used to suppress side effects of clone_attrs
@@ -404,8 +401,6 @@ class QubesVm(object):
         return re.match(r"^[a-zA-Z0-9_-]*$", name) is not None
 
     def pre_rename(self, new_name):
-        self.remove_appmenus()
-
         # fire hooks
         for hook in self.hooks_pre_rename:
             hook(self, new_name)
@@ -436,8 +431,6 @@ class QubesVm(object):
             self.volatile_img = self.volatile_img.replace(old_dirpath, new_dirpath)
         if self.conf_file is not None:
             self.conf_file = new_conf.replace(old_dirpath, new_dirpath)
-        if self.appmenus_templates_dir is not None:
-            self.appmenus_templates_dir = self.appmenus_templates_dir.replace(old_dirpath, new_dirpath)
         if self.icon_path is not None:
             self.icon_path = self.icon_path.replace(old_dirpath, new_dirpath)
         if hasattr(self, 'kernels_dir') and self.kernels_dir is not None:
@@ -446,8 +439,6 @@ class QubesVm(object):
         self.post_rename(old_name)
 
     def post_rename(self, old_name):
-        self.create_appmenus(verbose=False)
-
         # fire hooks
         for hook in self.hooks_post_rename:
             hook(self, old_name)
@@ -934,13 +925,6 @@ class QubesVm(object):
             raise IOError ("Error while copying {0} to {1}".\
                            format(template_priv, self.private_img))
 
-        if os.path.exists(os.path.join(source_template.dir_path, '/vm-' + vm_files["whitelisted_appmenus"])):
-            if verbose:
-                print >> sys.stderr, "--> Creating default whitelisted apps list: {0}".\
-                    format(self.dir_path + '/' + vm_files["whitelisted_appmenus"])
-            shutil.copy(os.path.join(source_template.dir_path, '/vm-' + vm_files["whitelisted_appmenus"]),
-                    os.path.join(self.dir_path, vm_files["whitelisted_appmenus"]))
-
         if self.updateable:
             template_root = source_template.root_img
             if verbose:
@@ -963,11 +947,6 @@ class QubesVm(object):
                 shutil.copy(os.path.join(kernels_dir, f),
                         os.path.join(self.dir_path, vm_files["kernels_subdir"], f))
 
-            if verbose:
-                print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\
-                        format(source_template.appmenus_templates_dir, self.appmenus_templates_dir)
-            shutil.copytree (source_template.appmenus_templates_dir, self.appmenus_templates_dir)
-
         # Create volatile.img
         self.reset_volatile_storage(source_template = source_template, verbose=verbose)
 
@@ -975,26 +954,6 @@ class QubesVm(object):
             print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path)
         os.symlink (self.label.icon_path, self.icon_path)
 
-    def create_appmenus(self, verbose=False, source_template = None):
-        if source_template is None:
-            source_template = self.template
-
-        vmtype = None
-        if self.is_netvm():
-            vmtype = 'servicevms'
-        else:
-            vmtype = 'appvms'
-
-        try:
-            if source_template is not None:
-                subprocess.check_call ([system_path["qubes_appmenu_create_cmd"], source_template.appmenus_templates_dir, self.name, vmtype])
-            elif self.appmenus_templates_dir is not None:
-                subprocess.check_call ([system_path["qubes_appmenu_create_cmd"], self.appmenus_templates_dir, self.name, vmtype])
-            else:
-                # Only add apps to menu
-                subprocess.check_call ([system_path["qubes_appmenu_create_cmd"], "none", self.name, vmtype])
-        except subprocess.CalledProcessError:
-            print >> sys.stderr, "Ooops, there was a problem creating appmenus for {0} VM!".format (self.name)
         # fire hooks
         for hook in self.hooks_create_on_disk:
             hook(self, verbose, source_template=source_template)
@@ -1045,19 +1004,6 @@ class QubesVm(object):
                 raise IOError ("Error while copying {0} to {1}".\
                            format(src_vm.root_img, self.root_img))
 
-        if src_vm.updateable and src_vm.appmenus_templates_dir is not None and self.appmenus_templates_dir is not None:
-            if verbose:
-                print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\
-                        format(src_vm.appmenus_templates_dir, self.appmenus_templates_dir)
-            shutil.copytree (src_vm.appmenus_templates_dir, self.appmenus_templates_dir)
-
-        if os.path.exists(os.path.join(src_vm.dir_path, vm_files["whitelisted_appmenus"])):
-            if verbose:
-                print >> sys.stderr, "--> Copying whitelisted apps list: {0}".\
-                    format(os.path.join(self.dir_path, vm_files["whitelisted_appmenus"]))
-            shutil.copy(os.path.join(src_vm.dir_path, vm_files["whitelisted_appmenus"]),
-                    os.path.join(self.dir_path, vm_files["whitelisted_appmenus"]))
-
         if src_vm.icon_path is not None and self.icon_path is not None:
             if os.path.exists (src_vm.dir_path):
                 if os.path.islink(src_vm.icon_path):
@@ -1070,21 +1016,10 @@ class QubesVm(object):
                         print >> sys.stderr, "--> Copying icon: {0} -> {1}".format(src_vm.icon_path, self.icon_path)
                     shutil.copy(src_vm.icon_path, self.icon_path)
 
-        # Create appmenus
-        self.create_appmenus(verbose=verbose)
-
         # fire hooks
         for hook in self.hooks_clone_disk_files:
             hook(self, verbose, src_vm)
 
-    def remove_appmenus(self):
-        vmtype = None
-        if self.is_netvm():
-            vmtype = 'servicevms'
-        else:
-            vmtype = 'appvms'
-        subprocess.check_call ([system_path["qubes_appmenu_remove_cmd"], self.name, vmtype])
-
     def verify_files(self):
         if dry_run:
             return

dom0/core-modules/003QubesTemplateVm.py

@@ -49,7 +49,6 @@ class QubesTemplateVm(QubesVm):
         # Clean image for root-cow and swap (AppVM side)
         attrs_config['clean_volatile_img'] = { 'eval': 'os.path.join(self.dir_path, vm_files["clean_volatile_img"])' }
 
-        attrs_config['appmenus_templates_dir'] = { 'eval': 'os.path.join(self.dir_path, vm_files["appmenus_templates_subdir"])' }
         return attrs_config
 
     def __init__(self, **kwargs):
@@ -81,14 +80,6 @@ class QubesTemplateVm(QubesVm):
 
         super(QubesTemplateVm, self).clone_disk_files(src_vm=src_vm, verbose=verbose)
 
-        for whitelist in ['vm-' + vm_files["whitelisted_appmenus"], 'netvm-' + vm_files["whitelisted_appmenus"]]:
-            if os.path.exists(os.path.join(src_vm.dir_path, whitelist)):
-                if verbose:
-                    print >> sys.stderr, "--> Copying default whitelisted apps list: {0}".\
-                        format(os.path.join(self.dir_path, whitelist))
-                shutil.copy(os.path.join(src_vm.dir_path, whitelist),
-                        os.path.join(self.dir_path, whitelist))
-
         if verbose:
             print >> sys.stderr, "--> Copying the template's clean volatile image:\n{0} ==>\n{1}".\
                     format(src_vm.clean_volatile_img, self.clean_volatile_img)
@@ -109,35 +100,11 @@ class QubesTemplateVm(QubesVm):
         # Create root-cow.img
         self.commit_changes(verbose=verbose)
 
-    def create_appmenus(self, verbose=False, source_template = None):
-        if source_template is None:
-            source_template = self.template
-
-        try:
-            subprocess.check_call ([system_path["qubes_appmenu_create_cmd"], self.appmenus_templates_dir, self.name, "vm-templates"])
-        except subprocess.CalledProcessError:
-            print >> sys.stderr, "Ooops, there was a problem creating appmenus for {0} VM!".format (self.name)
-
-    def remove_appmenus(self):
-        subprocess.check_call ([system_path["qubes_appmenu_remove_cmd"], self.name, "vm-templates"])
-
-    def pre_rename(self, new_name):
-        self.remove_appmenus()
-
     def post_rename(self, old_name):
-        self.create_appmenus(verbose=False)
-
         old_dirpath = os.path.join(os.path.dirname(self.dir_path), old_name)
         self.clean_volatile_img = self.clean_volatile_img.replace(old_dirpath, self.dir_path)
         self.rootcow_img = self.rootcow_img.replace(old_dirpath, self.dir_path)
 
-    def remove_from_disk(self):
-        if dry_run:
-            return
-
-        self.remove_appmenus()
-        super(QubesTemplateVm, self).remove_from_disk()
-
     def verify_files(self):
         if dry_run:
             return

dom0/core-modules/005QubesNetVm.py

@@ -169,29 +169,4 @@ class QubesNetVm(QubesVm):
         self.__external_ip_allowed_xids.discard(int(xid))
         self.update_external_ip_permissions()
 
-    def create_on_disk(self, verbose, source_template = None):
-        if dry_run:
-            return
-
-        super(QubesNetVm, self).create_on_disk(verbose, source_template=source_template)
-
-        if os.path.exists(os.path.join(source_template.dir_path, 'netvm-' + vm_files["whitelisted_appmenus"])):
-            if verbose:
-                print >> sys.stderr, "--> Creating default whitelisted apps list: {0}".\
-                    format(self.dir_path + '/' + vm_files["whitelisted_appmenus"])
-            shutil.copy(os.path.join(source_template.dir_path, 'netvm-' + vm_files["whitelisted_appmenus"]),
-                    os.path.join(self.dir_path, vm_files["whitelisted_appmenus"]))
-
-        if not self.internal:
-            self.create_appmenus (verbose=verbose, source_template=source_template)
-
-    def remove_from_disk(self):
-        if dry_run:
-            return
-
-        if not self.internal:
-            self.remove_appmenus()
-        super(QubesNetVm, self).remove_from_disk()
-
-
 register_qubes_vm_class(QubesNetVm)

dom0/core-modules/01QubesAppVm.py

@@ -40,20 +40,4 @@ class QubesAppVm(QubesVm):
     def is_appvm(self):
         return True
 
-    def create_on_disk(self, verbose, source_template = None):
-        if dry_run:
-            return
-
-        super(QubesAppVm, self).create_on_disk(verbose, source_template=source_template)
-
-        if not self.internal:
-            self.create_appmenus (verbose=verbose, source_template=source_template)
-
-    def remove_from_disk(self):
-        if dry_run:
-            return
-
-        self.remove_appmenus()
-        super(QubesAppVm, self).remove_from_disk()
-
 register_qubes_vm_class(QubesAppVm)

dom0/core-modules/01QubesHVm.py

@@ -114,14 +114,6 @@ class QubesHVm(QubesVm):
             print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path)
         os.symlink (self.label.icon_path, self.icon_path)
 
-        if verbose:
-            print >> sys.stderr, "--> Creating appmenus directory: {0}".format(self.appmenus_templates_dir)
-        os.mkdir (self.appmenus_templates_dir)
-        shutil.copy (system_path["start_appmenu_template"], self.appmenus_templates_dir)
-
-        if not self.internal:
-            self.create_appmenus (verbose, source_template=source_template)
-
         self.create_config_file()
 
         # create empty disk
@@ -138,13 +130,6 @@ class QubesHVm(QubesVm):
         for hook in self.hooks_create_on_disk:
             hook(self, verbose, source_template=source_template)
 
-    def remove_from_disk(self):
-        if dry_run:
-            return
-
-        self.remove_appmenus()
-        super(QubesHVm, self).remove_from_disk()
-
     def get_disk_utilization_private_img(self):
         return 0
 

dom0/core/qubes.py

@@ -59,10 +59,6 @@ system_path = {
 
     'config_template_pv': '/usr/share/qubes/vm-template.conf',
 
-    'start_appmenu_template': '/usr/share/qubes/qubes-start.desktop',
-    'qubes_appmenu_create_cmd': '/usr/lib/qubes/create-apps-for-appvm.sh',
-    'qubes_appmenu_remove_cmd': '/usr/lib/qubes/remove-appvm-appmenus.sh',
-
     'qubes_pciback_cmd': '/usr/lib/qubes/unbind-pci-device.sh',
     'prepare_volatile_img_cmd': '/usr/lib/qubes/prepare-volatile-img.sh',
 }
@@ -73,8 +69,6 @@ vm_files = {
     'volatile_img': 'volatile.img',
     'clean_volatile_img': 'clean-volatile.img.tar',
     'private_img': 'private.img',
-    'appmenus_templates_subdir': 'apps.templates',
-    'appmenus_template_templates_subdir': 'apps-template.templates',
     'kernels_subdir': 'kernels',
     'firewall_conf': 'firewall.xml',
     'whitelisted_appmenus': 'whitelisted-appmenus.list',

dom0/core/qubesutils.py

@@ -23,7 +23,7 @@
 from qubes import QubesVm,QubesException,QubesVmCollection
 from qubes import QubesVmClasses
 from qubes import xs, xl_ctx
-from qubes import system_path
+from qubes import system_path,vm_files
 import sys
 import os
 import subprocess
@@ -857,8 +857,9 @@ def backup_prepare(base_backup_dir, vms_list = None, exclude_list = [], print_ca
                 files_to_backup += file_to_backup(vm.dir_path + "/kernels")
         if os.path.exists (vm.firewall_conf):
             files_to_backup += file_to_backup(vm.firewall_conf)
-        if os.path.exists(vm.dir_path + '/whitelisted-appmenus.list'):
+        if 'appmenus_whitelist' in vm_files and \
-            files_to_backup += file_to_backup(vm.dir_path + '/whitelisted-appmenus.list')
+                os.path.exists(vm.dir_path + vm_files['appmenus_whitelist']):
+            files_to_backup += file_to_backup(vm.dir_path + vm_files['appmenus_whitelist'])
 
         if vm.updateable:
             sz = vm.get_disk_usage(vm.root_img)
@@ -1321,7 +1322,7 @@ def backup_restore_do(backup_dir, restore_info, host_collection = None, print_ca
                 error_callback("*** Some VM property will not be restored")
 
             try:
-                new_vm.create_appmenus(verbose=True)
+                new_vm.appmenus_create(verbose=True)
             except Exception as err:
                 error_callback("ERROR during appmenu restore: {0}".format(err))
                 error_callback("*** VM '{0}' will not have appmenus".format(vm.name))

dom0/misc/qubes-appmenu-select.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=qubes-vm-settings %VMNAME% applications
-Icon=/usr/share/qubes/icons/qubes.png
-Terminal=false
-Name=%VMNAME%: Add more shortcuts...
-GenericName=%VMNAME%: Add more shortcuts...
-StartupNotify=false
-Categories=System;

dom0/misc/qubes-dispvm-firefox.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=sh -c 'echo firefox | /usr/lib/qubes/qfile-daemon-dvm qubes.VMShell dom0 DEFAULT red'
-Icon=/usr/share/qubes/icons/dispvm-red.png
-Terminal=false
-Name=DispVM: Firefox web browser
-GenericName=DispVM: Web browser
-StartupNotify=false
-Categories=Network;

dom0/misc/qubes-dispvm.directory

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=DisposableVM
-Icon=/usr/share/qubes/icons/dispvm-red.png

dom0/misc/qubes-servicevm.directory.template

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=ServiceVM: %VMNAME%
-Icon=%VMDIR%/icon.png

dom0/misc/qubes-start.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=qvm-start --quiet --tray %VMNAME%
-Icon=%VMDIR%/icon.png
-Terminal=false
-Name=%VMNAME%: Start
-GenericName=%VMNAME%: Start
-StartupNotify=false
-Categories=System;

dom0/misc/qubes-templatevm.directory.template

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Template: %VMNAME%
-Icon=/usr/share/qubes/icons/template.png

dom0/misc/qubes-vm.directory.template

@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Domain: %VMNAME%
-Icon=%VMDIR%/icon.png

dom0/qubes-rpc-policy/qubes.SyncAppMenus.policy

@@ -1,6 +0,0 @@
-## Note that policy parsing stops at the first match,
-## so adding anything below "$anyvm $anyvm action" line will have no effect
-
-## Please use a single # to start your custom comments
-
-$anyvm	dom0	allow

dom0/qubes-rpc/qubes-receive-appmenus

@@ -1,220 +0,0 @@
-#!/usr/bin/python
-#
-# The Qubes OS Project, http://www.qubes-os.org
-#
-# Copyright (C) 2011  Marek Marczykowski <marmarek@mimuw.edu.pl>
-#
-# 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 the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
-import subprocess
-import re
-import os
-import sys
-import fnmatch
-import shutil
-from optparse import OptionParser
-from qubes.qubes import QubesVmCollection,QubesException
-
-# fields required to be present (and verified) in retrieved desktop file
-required_fields = [ "Name", "Exec" ]
-
-#limits
-appmenus_line_size = 1024
-appmenus_line_count = 100000
-
-# regexps for sanitization of retrieved values
-std_re = re.compile(r"^[/a-zA-Z0-9.,&() -]*$")
-fields_regexp = {
-    "Name": std_re,
-    "GenericName": std_re,
-    "Comment": std_re,
-    "Categories": re.compile(r"^[a-zA-Z0-9/.; -]*$"),
-    "Exec": re.compile(r"^[a-zA-Z0-9%>/:.= -]*$"),
-}
-
-def get_appmenus(vm):
-    global appmenus_line_count
-    global appmenus_line_size
-    untrusted_appmenulist = []
-    if vm is None:
-        while appmenus_line_count > 0:
-            untrusted_line = sys.stdin.readline(appmenus_line_size)
-            if untrusted_line == "":
-                break;
-            untrusted_appmenulist.append(untrusted_line.strip())
-            appmenus_line_count -= 1
-        if appmenus_line_count == 0:
-            raise QubesException("Line count limit exceeded")
-    else:
-        p = vm.run('QUBESRPC qubes.GetAppmenus dom0', passio_popen=True)
-        while appmenus_line_count > 0:
-            untrusted_line = p.stdout.readline(appmenus_line_size)
-            if untrusted_line == "":
-                break;
-            untrusted_appmenulist.append(untrusted_line.strip())
-            appmenus_line_count -= 1
-        p.wait()
-        if p.returncode != 0:
-            raise QubesException("Error getting application list")
-        if appmenus_line_count == 0:
-            raise QubesException("Line count limit exceeded")
-
-    row_no = 0
-    appmenus = {}
-    line_rx = re.compile(r"([a-zA-Z0-9-.]+.desktop):([a-zA-Z0-9-]+(?:\[[a-zA-Z@_]+\])?)=(.*)")
-    ignore_rx = re.compile(r".*([a-zA-Z0-9-.]+.desktop):(#.*|\s+)$")
-    for untrusted_line in untrusted_appmenulist:
-        # Ignore blank lines and comments
-        if len(untrusted_line) == 0 or ignore_rx.match(untrusted_line):
-            continue 
-        # use search instead of match to skip file path
-        untrusted_m = line_rx.search(untrusted_line)
-        if untrusted_m:
-            untrusted_key = untrusted_m.group(2)
-            untrusted_value = untrusted_m.group(3)
-            # Look only at predefined keys
-            if fields_regexp.has_key(untrusted_key):
-                if fields_regexp[untrusted_key].match(untrusted_value):
-                    # now values are sanitized
-                    key = untrusted_key
-                    value = untrusted_value
-                    filename = untrusted_m.group(1)
-
-                    if not appmenus.has_key(filename):
-                        appmenus[filename] = {}
-
-                    appmenus[filename][key]=value
-                else:
-                    print >>sys.stderr, "Warning: ignoring key %s: %s" % (untrusted_key, untrusted_value)
-            # else: ignore this key
-        else:
-            print >>sys.stderr, "Warning: ignoring line: %s" % (untrusted_line);
-
-    return appmenus
-
-
-def create_template(path, values):
-
-    # check if all required fields are present
-    for key in required_fields:
-        if not values.has_key(key):
-            print >>sys.stderr, "Warning: not creating/updating '%s' because of missing '%s' key" % (path, key)
-            return
-
-    desktop_file = open(path, "w")
-    desktop_file.write("[Desktop Entry]\n")
-    desktop_file.write("Version=1.0\n")
-    desktop_file.write("Type=Application\n")
-    desktop_file.write("Terminal=false\n")
-    desktop_file.write("X-Qubes-VmName=%VMNAME%\n")
-    desktop_file.write("Icon=%VMDIR%/icon.png\n")
-    for key in ["Name", "GenericName" ]:
-        if values.has_key(key):
-            desktop_file.write("{0}=%VMNAME%: {1}\n".format(key, values[key]))
-    
-    for key in [ "Comment", "Categories" ]:
-        if values.has_key(key):
-            desktop_file.write("{0}={1}\n".format(key, values[key]))
-
-    desktop_file.write("Exec=qvm-run -q --tray -a %VMNAME% '{0}'\n".format(values['Exec']))
-    desktop_file.close()
-
-
-def main():
-
-    env_vmname = os.environ.get("QREXEC_REMOTE_DOMAIN")
-    usage = "usage: %prog [options] <vm-name>\n"\
-            "Updates desktop file templates for given StandaloneVM or TemplateVM"
-
-    parser = OptionParser (usage)
-    parser.add_option ("-v", "--verbose", action="store_true", dest="verbose", default=False)
-    parser.add_option ("--force-root", action="store_true", dest="force_root", default=False,
-                       help="Force to run, even with root privileges")
-
-    (options, args) = parser.parse_args ()
-    if (len (args) != 1) and env_vmname is None:
-        parser.error ("You must specify at least the VM name!")
-
-    if env_vmname:
-        vmname=env_vmname
-    else:
-        vmname=args[0]
-
-    if os.geteuid() == 0:
-        if not options.force_root:
-            print >> sys.stderr, "*** Running this tool as root is strongly discouraged, this will lead you in permissions problems."
-            print >> sys.stderr, "Retry as unprivileged user."
-            print >> sys.stderr, "... or use --force-root to continue anyway."
-            exit(1)
-
-    qvm_collection = QubesVmCollection()
-    qvm_collection.lock_db_for_reading()
-    qvm_collection.load()
-    qvm_collection.unlock_db()
-
-    vm = qvm_collection.get_vm_by_name(vmname)
-
-    if vm is None:
-        print >>sys.stderr, "ERROR: A VM with the name '{0}' does not exist in the system.".format(vmname)
-        exit(1)
-
-    if vm.template is not None:
-        print >>sys.stderr, "ERROR: To sync appmenus for template based VM, do it on template instead"
-        exit(1)
-
-    if not vm.is_running():
-        print >>sys.stderr, "ERROR: Appmenus can be retrieved only from running VM - start it first"
-        exit(1)
-
-    new_appmenus = {}
-    if env_vmname is None:
-        new_appmenus = get_appmenus(vm)
-    else:
-        options.verbose = False
-        new_appmenus = get_appmenus(None)
-
-    if len(new_appmenus) == 0:
-        print >>sys.stderr, "ERROR: No appmenus received, terminating"
-        exit(1)
-
-    if not os.path.exists(vm.appmenus_templates_dir):
-        os.mkdir(vm.appmenus_templates_dir)
-
-    # Create new/update existing templates
-    if options.verbose:
-        print >> sys.stderr, "--> Got {0} appmenus, storing to disk".format(str(len(new_appmenus)))
-    for appmenu_file in new_appmenus.keys():
-        if options.verbose:
-            if os.path.exists(vm.appmenus_templates_dir + '/' + appmenu_file):
-                print >> sys.stderr, "---> Updating {0}".format(appmenu_file)
-            else:
-                print >> sys.stderr, "---> Creating {0}".format(appmenu_file)
-        create_template(vm.appmenus_templates_dir + '/' + appmenu_file, new_appmenus[appmenu_file])
-
-    # Delete appmenus of remove applications
-    if options.verbose:
-        print >> sys.stderr, "--> Cleaning old files"
-    for appmenu_file in os.listdir(vm.appmenus_templates_dir):
-        if not fnmatch.fnmatch(appmenu_file, '*.desktop'):
-            continue
-
-        if not new_appmenus.has_key(appmenu_file):
-            if options.verbose:
-                print >> sys.stderr, "---> Removing {0}".format(appmenu_file)
-            os.unlink(vm.appmenus_templates_dir + '/' + appmenu_file)
-
-main()

dom0/qubes-rpc/qubes.SyncAppMenus

@@ -1 +0,0 @@
-/usr/lib/qubes/qubes-receive-appmenus

rpm_spec/core-dom0.spec

@@ -130,10 +130,6 @@ cp qmemman/qmemman.conf $RPM_BUILD_ROOT%{_sysconfdir}/qubes/
 
 mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes
 cp aux-tools/unbind-pci-device.sh $RPM_BUILD_ROOT/usr/lib/qubes
-cp aux-tools/convert-apptemplate2vm.sh $RPM_BUILD_ROOT/usr/lib/qubes
-cp aux-tools/convert-dirtemplate2vm.sh $RPM_BUILD_ROOT/usr/lib/qubes
-cp aux-tools/create-apps-for-appvm.sh $RPM_BUILD_ROOT/usr/lib/qubes
-cp aux-tools/remove-appvm-appmenus.sh $RPM_BUILD_ROOT/usr/lib/qubes
 cp aux-tools/cleanup-dispvms $RPM_BUILD_ROOT/usr/lib/qubes
 cp aux-tools/startup-dvm.sh $RPM_BUILD_ROOT/usr/lib/qubes
 cp aux-tools/startup-misc.sh $RPM_BUILD_ROOT/usr/lib/qubes
@@ -142,7 +138,6 @@ cp qmemman/server.py $RPM_BUILD_ROOT/usr/lib/qubes/qmemman_daemon.py
 cp qmemman/meminfo-writer $RPM_BUILD_ROOT/usr/lib/qubes/
 cp qubes-rpc/qfile-dom0-unpacker $RPM_BUILD_ROOT/usr/lib/qubes/
 cp qubes-rpc/qubes-notify-updates $RPM_BUILD_ROOT/usr/lib/qubes/
-cp qubes-rpc/qubes-receive-appmenus $RPM_BUILD_ROOT/usr/lib/qubes/
 cp qubes-rpc/qubes-receive-updates $RPM_BUILD_ROOT/usr/lib/qubes/
 cp aux-tools/udev-block-add-change $RPM_BUILD_ROOT/usr/lib/qubes/
 cp aux-tools/udev-block-remove $RPM_BUILD_ROOT/usr/lib/qubes/
@@ -159,8 +154,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy
 cp qubes-rpc-policy/qubes.Filecopy.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.Filecopy
 cp qubes-rpc-policy/qubes.OpenInVM.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.OpenInVM
 cp qubes-rpc-policy/qubes.VMShell.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.VMShell
-cp qubes-rpc-policy/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.SyncAppMenus
-cp qubes-rpc/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/
 cp qubes-rpc-policy/qubes.NotifyUpdates.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.NotifyUpdates
 cp qubes-rpc/qubes.NotifyUpdates $RPM_BUILD_ROOT/etc/qubes-rpc/
 cp qubes-rpc-policy/qubes.ReceiveUpdates.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.ReceiveUpdates
@@ -193,13 +186,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons
 for icon in icons/*.png; do
     convert -resize 48 $icon $RPM_BUILD_ROOT/usr/share/qubes/$icon
 done
-cp misc/qubes-vm.directory.template $RPM_BUILD_ROOT/usr/share/qubes/
+mkdir -p $RPM_BUILD_ROOT/usr/share/qubes
-cp misc/qubes-templatevm.directory.template $RPM_BUILD_ROOT/usr/share/qubes/
-cp misc/qubes-servicevm.directory.template $RPM_BUILD_ROOT/usr/share/qubes/
-cp misc/qubes-dispvm.directory $RPM_BUILD_ROOT/usr/share/qubes/
-cp misc/qubes-dispvm-firefox.desktop $RPM_BUILD_ROOT/usr/share/qubes/
-cp misc/qubes-appmenu-select.desktop $RPM_BUILD_ROOT/usr/share/qubes/
-cp misc/qubes-start.desktop $RPM_BUILD_ROOT/usr/share/qubes/
 cp misc/vm-template.conf $RPM_BUILD_ROOT/usr/share/qubes/
 cp misc/vm-template-hvm.conf $RPM_BUILD_ROOT/usr/share/qubes/
 
@@ -287,8 +274,6 @@ for i in /usr/share/qubes/icons/*.png ; do
 	xdg-icon-resource install --novendor --size 48 $i
 done
 
-xdg-desktop-menu install /usr/share/qubes/qubes-dispvm.directory /usr/share/qubes/qubes-dispvm-firefox.desktop
-
 # Because we now have an installer
 # this script is always executed during upgrade
 # and we decided not to restart core during upgrade
@@ -369,15 +354,10 @@ fi
 %{python_sitearch}/qubes/modules/__init__.py*
 /usr/lib/qubes/unbind-pci-device.sh
 /usr/lib/qubes/cleanup-dispvms
-/usr/lib/qubes/convert-apptemplate2vm.sh
-/usr/lib/qubes/convert-dirtemplate2vm.sh
-/usr/lib/qubes/create-apps-for-appvm.sh
-/usr/lib/qubes/remove-appvm-appmenus.sh
 /usr/lib/qubes/qmemman_daemon.py*
 /usr/lib/qubes/meminfo-writer
 /usr/lib/qubes/qfile-daemon-dvm*
 /usr/lib/qubes/qubes-notify-updates
-/usr/lib/qubes/qubes-receive-appmenus
 /usr/lib/qubes/qubes-receive-updates
 /usr/lib/qubes/udev-block-add-change
 /usr/lib/qubes/udev-block-remove
@@ -408,13 +388,6 @@ fi
 %attr(0770,root,qubes) %dir /var/lib/qubes/updates
 %attr(0770,root,qubes) %dir /var/lib/qubes/vm-kernels
 /usr/share/qubes/icons/*.png
-/usr/share/qubes/qubes-vm.directory.template
-/usr/share/qubes/qubes-templatevm.directory.template
-/usr/share/qubes/qubes-servicevm.directory.template
-/usr/share/qubes/qubes-dispvm.directory
-/usr/share/qubes/qubes-dispvm-firefox.desktop
-/usr/share/qubes/qubes-appmenu-select.desktop
-/usr/share/qubes/qubes-start.desktop
 /usr/share/qubes/vm-template.conf
 /usr/share/qubes/vm-template-hvm.conf
 /etc/sysconfig/iptables
@@ -434,11 +407,9 @@ fi
 /etc/xen/scripts/vif-route-qubes
 %attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.Filecopy
 %attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.OpenInVM
-%attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.SyncAppMenus
 %attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.NotifyUpdates
 %attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.ReceiveUpdates
 %attr(0664,root,qubes) %config(noreplace) /etc/qubes-rpc/policy/qubes.VMShell
-/etc/qubes-rpc/qubes.SyncAppMenus
 /etc/qubes-rpc/qubes.NotifyUpdates
 /etc/qubes-rpc/qubes.ReceiveUpdates
 %attr(2770,root,qubes) %dir /var/log/qubes