Page MenuHomeSolus
Files F11035624

D5079.id.diff
No OneTemporary
Actions

D5079.id.diff
View Options

diff --git a/files/0001-interfaces-builtin-Add-new-steam-support-interface.patch b/files/0001-Steam-support.patch
rename from files/0001-interfaces-builtin-Add-new-steam-support-interface.patch
rename to files/0001-Steam-support.patch
--- a/files/0001-interfaces-builtin-Add-new-steam-support-interface.patch
+++ b/files/0001-Steam-support.patch
@@ -1,7 +1,7 @@
-From e50cfa0f533943668539901833896fb211371d2e Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Thu, 21 Dec 2017 01:05:06 +0000
-Subject: [PATCH 1/4] interfaces/builtin: Add new steam-support interface
+From 62cc13ba9559d04785db5bcf8f786b366f4ca050 Mon Sep 17 00:00:00 2001
+From: "F. von Gellhorn" <flinux@vongellhorn.ch>
+Date: Wed, 16 Jan 2019 23:37:25 +0100
+Subject: [PATCH 1/1] Add new steam-support interface
The new steam interface provides the necessary support for the new
`linux-steam-integration` snap to operate on top of `solus-runtime-gaming`.
@@ -16,22 +16,13 @@
access is initially granted by the `removable-media` interface. Without
this, many games will simply not work at all, or worse, half work and
completely seize up when using a multiprocess architecture.
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- interfaces/builtin/steam_support.go | 202 +++++++++++++++++++++
- interfaces/builtin/steam_support_test.go | 109 +++++++++++
- .../test-snapd-policy-app-consumer/meta/snap.yaml | 3 +
- 3 files changed, 314 insertions(+)
- create mode 100644 interfaces/builtin/steam_support.go
- create mode 100644 interfaces/builtin/steam_support_test.go
-
+
diff --git a/interfaces/builtin/steam_support.go b/interfaces/builtin/steam_support.go
new file mode 100644
-index 000000000..5d8c75fd0
+index 0000000..3b9ee4d
--- /dev/null
+++ b/interfaces/builtin/steam_support.go
-@@ -0,0 +1,202 @@
+@@ -0,0 +1,201 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
@@ -57,7 +48,6 @@
+
+const steamSupportBaseDeclarationSlots = `
+ steam-support:
-+ allow-installation: false
+ deny-connection: true
+ deny-auto-connection: true
+`
@@ -169,10 +159,10 @@
+# Steam requires +x permissions on the partitions and will perform
+# such a test:
+# sh: /run/media/bigdisk/games//steamapps/.steam_exec_test.sh: /bin/sh: bad interpreter: Permission denied
-+/run/media/**/.steam_exec_test.sh ixmrw,
++/{,run/}media/**/.steam_exec_test.sh ixmrw,
+
+# Libraries and executables on other partitions require map + execute permissions
-+/run/media/**/steamapps/common/** ixm,
++/{,run/}media/**/steamapps/common/** ixm,
+
+########################
+# Udev / PCI Support #
@@ -217,26 +207,26 @@
+# AppArmor Limitations #
+########################
+
-+# Games Dev Tycoon reads /proc/$ppid/environ but unfortunately AppArmor
++# Game Dev Tycoon reads /proc/$ppid/environ but unfortunately AppArmor
+# doesn't have any such qualifier.
+@{PROC}/[0-9]*/environ r,
+`
+
+func init() {
-+ registerIface(&commonInterface{
-+ name: "steam-support",
-+ summary: steamSupportSummary,
-+ implicitOnCore: true,
-+ implicitOnClassic: true,
-+ baseDeclarationSlots: steamSupportBaseDeclarationSlots,
-+ connectedPlugAppArmor: browserSupportConnectedPlugAppArmor + steamSupportConnectedPlugAppArmor,
-+ connectedPlugSecComp: browserSupportConnectedPlugSecComp + steamSupportConnectedPlugSecComp,
-+ reservedForOS: true,
-+ })
++ registerIface(&commonInterface{
++ name: "steam-support",
++ summary: steamSupportSummary,
++ implicitOnCore: true,
++ implicitOnClassic: true,
++ baseDeclarationSlots: steamSupportBaseDeclarationSlots,
++ connectedPlugAppArmor: browserSupportConnectedPlugAppArmor + steamSupportConnectedPlugAppArmor,
++ connectedPlugSecComp: browserSupportConnectedPlugSecComp + steamSupportConnectedPlugSecComp,
++ reservedForOS: true,
++ })
+}
diff --git a/interfaces/builtin/steam_support_test.go b/interfaces/builtin/steam_support_test.go
new file mode 100644
-index 000000000..80ca7b514
+index 0000000..5498e07
--- /dev/null
+++ b/interfaces/builtin/steam_support_test.go
@@ -0,0 +1,109 @@
@@ -262,26 +252,26 @@
+package builtin_test
+
+import (
-+ . "gopkg.in/check.v1"
-+
-+ "github.com/snapcore/snapd/interfaces"
-+ "github.com/snapcore/snapd/interfaces/apparmor"
-+ "github.com/snapcore/snapd/interfaces/builtin"
-+ "github.com/snapcore/snapd/interfaces/seccomp"
-+ "github.com/snapcore/snapd/snap"
-+ "github.com/snapcore/snapd/testutil"
++ . "gopkg.in/check.v1"
++
++ "github.com/snapcore/snapd/interfaces"
++ "github.com/snapcore/snapd/interfaces/apparmor"
++ "github.com/snapcore/snapd/interfaces/builtin"
++ "github.com/snapcore/snapd/interfaces/seccomp"
++ "github.com/snapcore/snapd/snap"
++ "github.com/snapcore/snapd/testutil"
+)
+
+type SteamSupportInterfaceSuite struct {
-+ iface interfaces.Interface
-+ slotInfo *snap.SlotInfo
-+ slot *interfaces.ConnectedSlot
-+ plugInfo *snap.PlugInfo
-+ plug *interfaces.ConnectedPlug
++ iface interfaces.Interface
++ slotInfo *snap.SlotInfo
++ slot *interfaces.ConnectedSlot
++ plugInfo *snap.PlugInfo
++ plug *interfaces.ConnectedPlug
+}
+
+var _ = Suite(&SteamSupportInterfaceSuite{
-+ iface: builtin.MustInterface("steam-support"),
++ iface: builtin.MustInterface("steam-support"),
+})
+
+const steamSupportConsumerYaml = `name: consumer
@@ -297,63 +287,63 @@
+`
+
+func (s *SteamSupportInterfaceSuite) SetUpTest(c *C) {
-+ s.plug, s.plugInfo = MockConnectedPlug(c, steamSupportConsumerYaml, nil, "steam-support")
-+ s.slot, s.slotInfo = MockConnectedSlot(c, steamSupportCoreYaml, nil, "steam-support")
++ s.plug, s.plugInfo = MockConnectedPlug(c, steamSupportConsumerYaml, nil, "steam-support")
++ s.slot, s.slotInfo = MockConnectedSlot(c, steamSupportCoreYaml, nil, "steam-support")
+}
+
+func (s *SteamSupportInterfaceSuite) TestName(c *C) {
-+ c.Assert(s.iface.Name(), Equals, "steam-support")
++ c.Assert(s.iface.Name(), Equals, "steam-support")
+}
+
+func (s *SteamSupportInterfaceSuite) TestSanitizeSlot(c *C) {
-+ c.Assert(interfaces.BeforePrepareSlot(s.iface, s.slotInfo), IsNil)
-+ slot := &snap.SlotInfo{
-+ Snap: &snap.Info{SuggestedName: "some-snap"},
-+ Name: "steam-support",
-+ Interface: "steam-support",
-+ }
-+
-+ c.Assert(interfaces.BeforePrepareSlot(s.iface, slot), IsNil)
++ c.Assert(interfaces.BeforePrepareSlot(s.iface, s.slotInfo), IsNil)
++ slot := &snap.SlotInfo{
++ Snap: &snap.Info{SuggestedName: "some-snap"},
++ Name: "steam-support",
++ Interface: "steam-support",
++ }
++
++ c.Assert(interfaces.BeforePrepareSlot(s.iface, slot), IsNil)
+}
+
+func (s *SteamSupportInterfaceSuite) TestSanitizePlug(c *C) {
-+ c.Assert(interfaces.BeforePreparePlug(s.iface, s.plugInfo), IsNil)
++ c.Assert(interfaces.BeforePreparePlug(s.iface, s.plugInfo), IsNil)
+}
+
+func (s *SteamSupportInterfaceSuite) TestAppArmorSpec(c *C) {
-+ spec := &apparmor.Specification{}
-+ c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil)
-+ c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"})
-+ c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "owner /{dev,run}/shm/{,.}org.chromium.Chromium.shmem.libcef_* mrwk,\n")
++ spec := &apparmor.Specification{}
++ c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil)
++ c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"})
++ c.Assert(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "owner /{dev,run}/shm/{,.}org.chromium.Chromium.shmem.libcef_* mrwk,\n")
+}
+
+func (s *SteamSupportInterfaceSuite) TestSecCompSpec(c *C) {
-+ spec := &seccomp.Specification{}
-+ c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil)
-+ c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"})
-+ c.Check(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "sched_setaffinity\n")
++ spec := &seccomp.Specification{}
++ c.Assert(spec.AddConnectedPlug(s.iface, s.plug, s.slot), IsNil)
++ c.Assert(spec.SecurityTags(), DeepEquals, []string{"snap.consumer.app"})
++ c.Check(spec.SnippetForTag("snap.consumer.app"), testutil.Contains, "sched_setaffinity\n")
+}
+
+func (s *SteamSupportInterfaceSuite) TestStaticInfo(c *C) {
-+ si := interfaces.StaticInfoOf(s.iface)
-+ c.Assert(si.ImplicitOnCore, Equals, false)
-+ c.Assert(si.ImplicitOnClassic, Equals, false)
-+ c.Assert(si.Summary, Equals, `allows access to various permissions required to use Steam`)
-+ c.Assert(si.BaseDeclarationSlots, testutil.Contains, "steam-support")
++ si := interfaces.StaticInfoOf(s.iface)
++ c.Assert(si.ImplicitOnCore, Equals, false)
++ c.Assert(si.ImplicitOnClassic, Equals, false)
++ c.Assert(si.Summary, Equals, `allows access to various permissions required to use Steam`)
++ c.Assert(si.BaseDeclarationSlots, testutil.Contains, "steam-support")
+}
+
+func (s *SteamSupportInterfaceSuite) TestAutoConnect(c *C) {
-+ c.Check(s.iface.AutoConnect(nil, nil), Equals, true)
++ c.Check(s.iface.AutoConnect(nil, nil), Equals, true)
+}
+
+func (s *SteamSupportInterfaceSuite) TestInterfaces(c *C) {
-+ c.Check(builtin.Interfaces(), testutil.DeepContains, s.iface)
++ c.Check(builtin.Interfaces(), testutil.DeepContains, s.iface)
+}
diff --git a/tests/lib/snaps/test-snapd-policy-app-consumer/meta/snap.yaml b/tests/lib/snaps/test-snapd-policy-app-consumer/meta/snap.yaml
-index f31809454..b988d51a9 100644
+index aee7bb0..8ee598f 100644
--- a/tests/lib/snaps/test-snapd-policy-app-consumer/meta/snap.yaml
+++ b/tests/lib/snaps/test-snapd-policy-app-consumer/meta/snap.yaml
-@@ -251,6 +251,9 @@ apps:
+@@ -299,6 +299,9 @@ apps:
ssh-public-keys:
command: bin/run
plugs: [ ssh-public-keys ]
@@ -364,5 +354,5 @@
command: bin/run
plugs: [ storage-framework-service ]
--
-2.16.2
+2.20.1
diff --git a/files/Support-avx2-library-paths.patch b/files/0002-Support-avx2-library-paths.patch
rename from files/Support-avx2-library-paths.patch
rename to files/0002-Support-avx2-library-paths.patch
--- a/files/Support-avx2-library-paths.patch
+++ b/files/0002-Support-avx2-library-paths.patch
@@ -1,8 +1,7 @@
-From 009e92adb9b4dbb347867e53d5831607e9cecbcb Mon Sep 17 00:00:00 2001
-From: Peter O'Connor <peter@solus-project.com>
-Date: Sat, 4 Aug 2018 15:08:29 +1000
-Subject: [PATCH] cmd/snap-confine: allow confinement of AVX specific library
- paths
+From 62cc13ba9559d04785db5bcf8f786b366f4ca050 Mon Sep 17 00:00:00 2001
+From: "F. von Gellhorn" <flinux@vongellhorn.ch>
+Date: Wed, 16 Jan 2019 23:37:25 +0100
+Subject: [PATCH 1/1] allow confinement of AVX specific library paths
Since glibc 2.26 library lookups will now look first for specific AVX2 and
AVX512 library versions on compatible hardware. This patch adds the directories
@@ -15,15 +14,12 @@
After:
Application loads as expected
----
- cmd/snap-confine/snap-confine.apparmor.in | 38 +++++++++++------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/cmd/snap-confine/snap-confine.apparmor.in b/cmd/snap-confine/snap-confine.apparmor.in
-index 75d7ce073b..923c2a3713 100644
+index 0ee702b..6596c01 100644
--- a/cmd/snap-confine/snap-confine.apparmor.in
+++ b/cmd/snap-confine/snap-confine.apparmor.in
-@@ -14,27 +14,27 @@
+@@ -14,30 +14,30 @@
# any abstractions
/etc/ld.so.cache r,
/etc/ld.so.preload r,
@@ -39,6 +35,9 @@
- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libresolv{,-[0-9]*}.so* mr,
- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libselinux.so* mr,
- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libpcre.so* mr,
+- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libmount.so* mr,
+- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libblkid.so* mr,
+- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libuuid.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libc{,-[0-9]*}.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libpthread{,-[0-9]*}.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libreadline{,-[0-9]*}.so* mr,
@@ -48,6 +47,9 @@
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libresolv{,-[0-9]*}.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libselinux.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libpcre.so* mr,
++ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libmount.so* mr,
++ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libblkid.so* mr,
++ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libuuid.so* mr,
# normal libs in order
- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libapparmor.so* mr,
- /{,usr/}lib{,32,64,x32}/{,@{multiarch}/}libcgmanager.so* mr,
@@ -67,6 +69,5 @@
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libudev.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libseccomp.so* mr,
+ /{,usr/}lib{,32,64,x32}/{,haswell/{,avx512_1/},@{multiarch}/}libcap.so* mr,
-
+
@LIBEXECDIR@/snap-confine mr,
-
diff --git a/files/0002-interfaces-builtin-Fix-typo-in-steam-support-interfa.patch b/files/0002-interfaces-builtin-Fix-typo-in-steam-support-interfa.patch
deleted file mode 100644
--- a/files/0002-interfaces-builtin-Fix-typo-in-steam-support-interfa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 492abc107a1a904e1e072c1604574294e6ec8685 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Thu, 25 Jan 2018 12:15:47 +0000
-Subject: [PATCH 2/4] interfaces/builtin: Fix typo in steam-support interface
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- interfaces/builtin/steam_support.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/interfaces/builtin/steam_support.go b/interfaces/builtin/steam_support.go
-index 5d8c75fd0..312761bb7 100644
---- a/interfaces/builtin/steam_support.go
-+++ b/interfaces/builtin/steam_support.go
-@@ -183,7 +183,7 @@ ptrace (trace, read) peer=snap.@{SNAP_NAME}.**,
- # AppArmor Limitations #
- ########################
-
--# Games Dev Tycoon reads /proc/$ppid/environ but unfortunately AppArmor
-+# Game Dev Tycoon reads /proc/$ppid/environ but unfortunately AppArmor
- # doesn't have any such qualifier.
- @{PROC}/[0-9]*/environ r,
- `
---
-2.16.2
-
diff --git a/files/0003-interfaces-builtin-Match-Steam-media-paths-to-remova.patch b/files/0003-interfaces-builtin-Match-Steam-media-paths-to-remova.patch
deleted file mode 100644
--- a/files/0003-interfaces-builtin-Match-Steam-media-paths-to-remova.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 921bb4c1df44e5fbc76d53627e7cd7c4e0a1aa24 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Fri, 26 Jan 2018 11:20:51 +0000
-Subject: [PATCH 3/4] interfaces/builtin: Match Steam media paths to
- `removable-media` style
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- interfaces/builtin/steam_support.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/interfaces/builtin/steam_support.go b/interfaces/builtin/steam_support.go
-index 312761bb7..369eea661 100644
---- a/interfaces/builtin/steam_support.go
-+++ b/interfaces/builtin/steam_support.go
-@@ -135,10 +135,10 @@ owner /{dev,run}/shm/mono.@{pid} mrw,
- # Steam requires +x permissions on the partitions and will perform
- # such a test:
- # sh: /run/media/bigdisk/games//steamapps/.steam_exec_test.sh: /bin/sh: bad interpreter: Permission denied
--/run/media/**/.steam_exec_test.sh ixmrw,
-+/{,run/}media/**/.steam_exec_test.sh ixmrw,
-
- # Libraries and executables on other partitions require map + execute permissions
--/run/media/**/steamapps/common/** ixm,
-+/{,run/}media/**/steamapps/common/** ixm,
-
- ########################
- # Udev / PCI Support #
---
-2.16.2
-
diff --git a/files/0004-interfaces-built-in-Remove-core-breaking-line.patch b/files/0004-interfaces-built-in-Remove-core-breaking-line.patch
deleted file mode 100644
--- a/files/0004-interfaces-built-in-Remove-core-breaking-line.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6006da7a5d78f878c95dfbb48800a2a99c8e6f27 Mon Sep 17 00:00:00 2001
-From: Ikey Doherty <ikey@solus-project.com>
-Date: Wed, 28 Feb 2018 16:10:00 +0000
-Subject: [PATCH 4/4] interfaces/built-in: Remove core-breaking line
-
-With advice from zyga on IRC, we discovered this was the culprit for
-breaking the installation of core when this interface is active.
-
-Signed-off-by: Ikey Doherty <ikey@solus-project.com>
----
- interfaces/builtin/steam_support.go | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/interfaces/builtin/steam_support.go b/interfaces/builtin/steam_support.go
-index 369eea661..3b9ee4d6c 100644
---- a/interfaces/builtin/steam_support.go
-+++ b/interfaces/builtin/steam_support.go
-@@ -23,7 +23,6 @@ const steamSupportSummary = `allows access to various permissions required to us
-
- const steamSupportBaseDeclarationSlots = `
- steam-support:
-- allow-installation: false
- deny-connection: true
- deny-auto-connection: true
- `
---
-2.16.2
-
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,5 +1,2 @@
-0001-interfaces-builtin-Add-new-steam-support-interface.patch
-0002-interfaces-builtin-Fix-typo-in-steam-support-interfa.patch
-0003-interfaces-builtin-Match-Steam-media-paths-to-remova.patch
-0004-interfaces-built-in-Remove-core-breaking-line.patch
-Support-avx2-library-paths.patch
+0001-Steam-support.patch
+0002-Support-avx2-library-paths.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,9 @@
name : snapd
-version : 2.36.3
+version : '2.37'
homepage : https://snapcraft.io/
-release : 30
+release : 31
source :
- - https://github.com/snapcore/snapd/releases/download/2.36.3/snapd_2.36.3.vendor.tar.xz : 77b98473b334678abbb36ea58fba005dad441f9f453ee87b4ec2ed3dad4aeb59
+ - https://github.com/snapcore/snapd/releases/download/2.37/snapd_2.37.vendor.tar.xz : 88329a65ad1dfb59a8a5f2bbdae11717afaa0c92deec9499fb4e53d3343c4908
license : GPL-3.0-only
component : desktop.util
summary : The snapd and snap tools enable systems to work with .snap files
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -65,12 +65,12 @@
</Files>
</Package>
<History>
- <Update release="30">
- <Date>2018-12-31</Date>
- <Version>2.36.3</Version>
+ <Update release="31">
+ <Date>2019-01-17</Date>
+ <Version>2.37</Version>
<Comment>Packaging update</Comment>
<Name>F. von Gellhorn</Name>
<Email>flinux@vongellhorn.ch</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 6:06 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5808920
Default Alt Text
D5079.id.diff (18 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.