Add patch to fix issues with setcap on wine-preloader executable.

This commit is contained in:
Sebastian Lackner 2014-08-27 00:38:26 +02:00
parent 4e4a8b7d32
commit 3246faa114
5 changed files with 62 additions and 1 deletions

View File

@ -13,10 +13,11 @@ which are not present in regular wine, and always report such issues to us
Included bugfixes and improvements
----------------------------------
**Bugfixes and features included in the next upcoming release [2]:**
**Bugfixes and features included in the next upcoming release [3]:**
* Fix unintentional leaks with ntdll internals
* Support for DOS hidden/system file attributes ([Wine Bug #9158](http://bugs.winehq.org/show_bug.cgi?id=9158 "Multiple Microsoft development tools online/web installers fail to skip \"$shtdwn$.req\" with FILE_ATTRIBUTE_HIDDEN (Visual Studio Express Editions, .NET Framework 3.0)"))
* Support for setcap on wine-preloader ([Wine Bug #26256](http://bugs.winehq.org/show_bug.cgi?id=26256 "wine64-preloader can't handle setcap cap_net_raw+epi"))
**Bugs fixed in Wine-Compholio 1.7.25 [53]:**

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
wine-compholio (1.7.26) UNRELEASED; urgency=low
* Fixed issues in the winepulse configure script.
* Added patch to fix unintentional leaks with ntdll internals.
* Added patch to add support for DOS hidden/system file attributes.
* Added patch to use dynamic linking for libpcap.
* Added patch to fix issues when using setcap on wine executable.
-- Erich E. Hoover <erich.e.hoover@gmail.com> Wed, 27 Aug 2014 00:34:51 +0200
wine-compholio (1.7.25) unstable; urgency=low
* Improve generation of README.md on patch update.
* Updated patches for riched20 IText* Interface.

View File

@ -14,6 +14,7 @@ PATCHLIST := \
bcrypt-BCryptGetFipsAlgorithmMode.ok \
comctl32-ImageList.ok \
comctl32-LoadIconMetric.ok \
configure-Absolute_RPATH.ok \
dsound-Fast_Mixer.ok \
fonts-Missing_Fonts.ok \
iphlpapi-TCP_Table.ok \
@ -200,6 +201,24 @@ comctl32-LoadIconMetric.ok:
echo '+ { "comctl32-LoadIconMetric", "Michael Müller", "Implement LoadIconMetric function." },'; \
) > comctl32-LoadIconMetric.ok
# Patchset configure-Absolute_RPATH
# |
# | Included patches:
# | * Also add the absolute RPATH when linking against libwine. [by Sebastian Lackner]
# |
# | This patchset fixes the following Wine bugs:
# | * [#26256] Support for setcap on wine-preloader
# |
# | Modified files:
# | * configure.ac
# |
.INTERMEDIATE: configure-Absolute_RPATH.ok
configure-Absolute_RPATH.ok:
$(call APPLY_FILE,configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch)
@( \
echo '+ { "configure-Absolute_RPATH", "Sebastian Lackner", "Also add the absolute RPATH when linking against libwine." },'; \
) > configure-Absolute_RPATH.ok
# Patchset dsound-Fast_Mixer
# |
# | Included patches:

View File

@ -0,0 +1,29 @@
From d39d120e7b69873b864286ec574c7b5c9eb1de0d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 27 Aug 2014 00:31:23 +0200
Subject: configure: Also add the absolute RPATH when linking against libwine.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index c4066f6..1c5f156 100644
--- a/configure.ac
+++ b/configure.ac
@@ -970,10 +970,10 @@ wine-installed: main.o
[LDEXECFLAGS="-Wl,--export-dynamic"])
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`"
+ [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`:\$(DESTDIR)\$(libdir)"
LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"],
[WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`"
+ [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \$(bindir) \$(libdir)\`:\$(DESTDIR)\$(libdir)"
LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
--
1.7.9.5

View File

@ -0,0 +1,4 @@
Author: Sebastian Lackner
Subject: Also add the absolute RPATH when linking against libwine.
Revision: 1
Fixes: [26256] Support for setcap on wine-preloader