Attachment 134102 Details for Bug 102558 – autotools patch (update 2)

[patch] autotools patch (update 2)

0001-Set-execution-level-to-asInvoker-to-dbus_update_acti.patch (text/plain), 2.07 KB, created by Ralf Habacker on 2017-09-09 00:12:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-09-09 00:12:51 UTC

Size: 2.07 KB

patch

obsolete

>From 2ff8a9d94f136497f902c2caef909e847a2dd4ea Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 6 Sep 2017 17:08:32 +0200
>Subject: [PATCH] Set execution level to 'asInvoker' to
> dbus_update_activation_environment on Windows (autotools part)
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=102558
>---
> cmake/modules/Win32.Manifest.in | 14 +++++++-------
> tools/Makefile.am               | 18 +++++++++++++++++-
> 2 files changed, 24 insertions(+), 8 deletions(-)
>
>diff --git a/cmake/modules/Win32.Manifest.in b/cmake/modules/Win32.Manifest.in
>index 63dce3b5..c416d49f 100644
>--- a/cmake/modules/Win32.Manifest.in
>+++ b/cmake/modules/Win32.Manifest.in
>@@ -1,10 +1,10 @@
> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
>-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
>-<security>
>-<requestedPrivileges>
>-<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
>-</requestedPrivileges>
>-</security>
>-</trustInfo>
>+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
>+  <security>
>+   <requestedPrivileges>
>+     <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
>+   </requestedPrivileges>
>+  </security>
>+ </trustInfo>
> </assembly>
>diff --git a/tools/Makefile.am b/tools/Makefile.am
>index 19aaf363..bb138592 100644
>--- a/tools/Makefile.am
>+++ b/tools/Makefile.am
>@@ -114,9 +114,25 @@ dbus_update_activation_environment_SOURCES = \
> 	$(NULL)
> dbus_update_activation_environment_LDADD = $(top_builddir)/dbus/libdbus-1.la
> 
>+if DBUS_WIN
>+SUFFIXES = .rc
>+
>+.rc.o:
>+	$(WINDRES) $< -o $@
>+
>+duae-manifest.rc: $(top_srcdir)/cmake/modules/Win32.Manifest.in
>+	echo -e "1 24 \"$<\"" > $@
>+
>+duae_res = duae-manifest.o
>+duae_res_ldflag = -Wl,$(duae_res)
>+EXTRA_dbus_update_activation_environment_DEPENDENCIES = $(duae_res)
>+
>+endif
>+
> EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c
> CLEANFILES = 				\
>-	run-with-tmp-session-bus.conf
>+	run-with-tmp-session-bus.conf   \
>+	duae-manifest.rc
> 
> # create the /var/lib/dbus directory for dbus-uuidgen
> install-data-local:
>-- 
>2.12.3
>

Actions: View | Splinter Review

Attachments on bug 102558: 133990 | 133998 | 133999 | 134079 | 134102 | 134443 | 134487 | 134488 | 134489 | 134491 | 134492 | 134517 | 134661 | 134662 | 134898 | 134925 | 134968

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.