D8059.id19303.diff
View Options

	diff --git a/abi_used_libs b/abi_used_libs
	--- a/abi_used_libs
	+++ b/abi_used_libs
	@@ -1,6 +1,6 @@
	libapparmor.so.1
	libc.so.6
	libcap.so.2
	-libgcc_s.so.1
	libpthread.so.0
	+libseccomp.so.2
	libudev.so.1
	diff --git a/files/snapd.tmpfiles b/files/snapd.tmpfiles
	--- a/files/snapd.tmpfiles
	+++ b/files/snapd.tmpfiles
	@@ -10,10 +10,14 @@
	d /var/lib/snapd/hostfs 0755 root root -
	d /var/lib/snapd/mount 0755 root root -
	d /var/lib/snapd/seccomp/bpf 0755 root root -
	+d /var/lib/snapd/snap 0755 root root -
	+d /var/lib/snapd/snap/bin 0755 root root -
	d /var/lib/snapd/snaps 0755 root root -
	d /var/lib/snapd/lib/gl 0755 root root -
	d /var/lib/snapd/lib/gl32 0755 root root -
	d /var/lib/snapd/lib/vulkan 0755 root root -
	d /var/lib/snapd/lib/glvnd 0755 root root -
	d /var/lib/snapd/void 000 root root -
	-d /run/lock/snapd 0755 root root -
	\ No newline at end of file
	+d /var/lib/snapd/cookie 700 root root -
	+d /var/lib/snapd/cache 700 root root -
	+d /run/lock/snapd 0755 root root -
	diff --git a/package.yml b/package.yml
	--- a/package.yml
	+++ b/package.yml
	@@ -1,7 +1,7 @@
	name : snapd
	version : 2.43.1
	homepage : https://snapcraft.io/
	-release : 51
	+release : 52
	source :
	- https://github.com/snapcore/snapd/releases/download/2.43.1/snapd_2.43.1.vendor.tar.xz : 29db0ee6a96bd22972ff35dd7d0fd9a9536cd38fba0e11645b083d56f68b6ebe
	license : GPL-3.0-only
	@@ -24,11 +24,20 @@
	- libselinux
	- squashfs-tools
	environment: \|
	+ # snapd does not use modules, setting GO111MODULE=on in the environment breaks the build
	+ unset GO111MODULE
	+
	+ export CGO_ENABLED="1"
	+ export CGO_CFLAGS="${CFLAGS}"
	+ export CGO_CPPFLAGS="${CPPFLAGS}"
	+ export CGO_CXXFLAGS="${CXXFLAGS}"
	+ export CGO_LDFLAGS="${LDFLAGS}"
	+
	export snapddir=src/github.com/snapcore/snapd
	- export commands=(snap snapctl snapd snap-failure)
	- export stacommands=(snap-update-ns snap-seccomp snap-exec)
	- export bincommands=(snap snapctl)
	- export dcommands=(snapd snap-exec snap-failure snap-update-ns snap-seccomp)
	+ export commands=(snap snapctl snapd snap-failure snap-seccomp)
	+ export stacommands=(snap-update-ns snapctl snap-exec)
	+ export bincommands=(snap)
	+ export dcommands=(snapctl snapd snap-exec snap-failure snap-update-ns snap-seccomp)
	setup : \|
	mkdir -p src/github.com/snapcore
	ln -s `pwd` ${snapddir}
	@@ -42,10 +51,10 @@
	%reconfigure --enable-nvidia-biarch
	build : \|
	for snapvar in ${commands[@]}; do
	- GOPATH="`pwd`" go install github.com/snapcore/snapd/cmd/$snapvar
	+ GOPATH="`pwd`" go build -o bin/$snapvar -buildmode=pie --ldflags "-s -extldflags '$LDFLAGS'" github.com/snapcore/snapd/cmd/$snapvar
	done
	for staticpath in ${stacommands[@]} ; do
	- GOPATH="`pwd`" go build -o bin/$staticpath --ldflags '-extldflags "-static"' github.com/snapcore/snapd/cmd/$staticpath
	+ GOPATH="`pwd`" go build -o bin/$staticpath -buildmode=pie --ldflags "-s -extldflags '$LDFLAGS -static'" github.com/snapcore/snapd/cmd/$staticpath
	done

	%make -C ${snapddir}/cmd
	@@ -58,6 +67,9 @@
	for tgtbin in ${dcommands[@]} ; do
	install -m00755 bin/$tgtbin $installdir/%libdir%/$package/.
	done
	+ # snapctl is run from inside the snap
	+ ln -s /%libdir%/$package/snaptctl $installdir/usr/bin/snapctl
	+
	# Move into the base dir so we can install stuff
	pushd ${snapddir}
	%make_install -C data/systemd \
	diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
	--- a/pspec_x86_64.xml
	+++ b/pspec_x86_64.xml
	@@ -3,8 +3,8 @@
	<Name>snapd</Name>
	<Homepage>https://snapcraft.io/</Homepage>
	<Packager>
	- <Name>Joshua Strobl</Name>
	- <Email>joshua@stroblindustries.com</Email>
	+ <Name>Friedrich von Gellhorn</Name>
	+ <Email>friedrich@vongellhorn.ch</Email>
	</Packager>
	<License>GPL-3.0-only</License>
	<PartOf>desktop.util</PartOf>
	@@ -39,6 +39,7 @@
	<Path fileType="library">/usr/lib64/snapd/snap-mgmt</Path>
	<Path fileType="library">/usr/lib64/snapd/snap-seccomp</Path>
	<Path fileType="library">/usr/lib64/snapd/snap-update-ns</Path>
	+ <Path fileType="library">/usr/lib64/snapd/snapctl</Path>
	<Path fileType="library">/usr/lib64/snapd/snapd</Path>
	<Path fileType="library">/usr/lib64/snapd/snapd-apparmor</Path>
	<Path fileType="library">/usr/lib64/snapd/snapd.run-from-snap</Path>
	@@ -60,12 +61,12 @@
	</Files>
	</Package>
	<History>
	- <Update release="51">
	+ <Update release="52">
	<Date>2020-01-16</Date>
	<Version>2.43.1</Version>
	<Comment>Packaging update</Comment>
	- <Name>Joshua Strobl</Name>
	- <Email>joshua@stroblindustries.com</Email>
	+ <Name>Friedrich von Gellhorn</Name>
	+ <Email>friedrich@vongellhorn.ch</Email>
	</Update>
	</History>
	</PISI>
	\ No newline at end of file

File Metadata

Mime Type: text/plain
Expires: Thu, Aug 10, 6:04 PM (1 d, 2 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5836642
Default Alt Text: D8059.id19303.diff (4 KB)

D8059.id19303.diff
No OneTemporary
Actions

D8059.id19303.diff
View Options

File Metadata

Event Timeline

D8059.id19303.diffNo OneTemporaryActions

D8059.id19303.diffView Options

File Metadata

Event Timeline

D8059.id19303.diff
No OneTemporary
Actions

D8059.id19303.diff
View Options