diff --git a/.gitignore b/.gitignore index 3c388bd..af173f4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ /snapd_2.36.only-vendor.tar.xz /snapd-2.36.3.tar.gz /snapd_2.36.3.only-vendor.tar.xz +/snapd-2.37.2.tar.gz +/snapd_2.37.2.only-vendor.tar.xz diff --git a/0001-cmd-use-libtool-for-the-internal-library.patch b/0001-cmd-use-libtool-for-the-internal-library.patch index 363470d..6282939 100644 --- a/0001-cmd-use-libtool-for-the-internal-library.patch +++ b/0001-cmd-use-libtool-for-the-internal-library.patch @@ -1,4 +1,4 @@ -From 3c857b315f2aca678d33741b885f1e5778d017cd Mon Sep 17 00:00:00 2001 +From 9d6e0f96acf99073b0763c161d5c02505c4880a8 Mon Sep 17 00:00:00 2001 From: Zygmunt Krynicki Date: Mon, 6 Mar 2017 20:26:26 +0100 Subject: [PATCH] cmd: use libtool for the internal library @@ -14,10 +14,10 @@ Signed-off-by: Zygmunt Krynicki 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/cmd/Makefile.am b/cmd/Makefile.am -index af9f14e6c..ae7058a36 100644 +index de905ad59..ed72749b1 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am -@@ -76,12 +76,12 @@ snap-seccomp/snap-seccomp: snap-seccomp/*.go +@@ -84,12 +84,12 @@ snap-seccomp/snap-seccomp: snap-seccomp/*.go cd snap-seccomp && GOPATH=$(or $(GOPATH),$(realpath $(srcdir)/../../../../..)) go build -i -v ## @@ -30,11 +30,11 @@ index af9f14e6c..ae7058a36 100644 -libsnap_confine_private_a_SOURCES = \ +libsnap_confine_private_la_SOURCES = \ + libsnap-confine-private/apparmor-support.c \ + libsnap-confine-private/apparmor-support.h \ libsnap-confine-private/cgroup-freezer-support.c \ - libsnap-confine-private/cgroup-freezer-support.h \ - libsnap-confine-private/classic.c \ -@@ -108,11 +108,11 @@ libsnap_confine_private_a_SOURCES = \ - libsnap-confine-private/string-utils.h \ +@@ -122,11 +122,11 @@ libsnap_confine_private_a_SOURCES = \ + libsnap-confine-private/tool.h \ libsnap-confine-private/utils.c \ libsnap-confine-private/utils.h -libsnap_confine_private_a_CFLAGS = $(CHECK_CFLAGS) @@ -49,7 +49,7 @@ index af9f14e6c..ae7058a36 100644 if WITH_UNIT_TESTS noinst_PROGRAMS += libsnap-confine-private/unit-tests -@@ -161,7 +161,7 @@ noinst_PROGRAMS += decode-mount-opts/decode-mount-opts +@@ -176,7 +176,7 @@ noinst_PROGRAMS += decode-mount-opts/decode-mount-opts decode_mount_opts_decode_mount_opts_SOURCES = \ decode-mount-opts/decode-mount-opts.c @@ -58,7 +58,7 @@ index af9f14e6c..ae7058a36 100644 decode_mount_opts_decode_mount_opts_STATIC = if STATIC_LIBCAP -@@ -215,7 +215,7 @@ snap_confine_snap_confine_SOURCES = \ +@@ -226,7 +226,7 @@ snap_confine_snap_confine_SOURCES = \ snap_confine_snap_confine_CFLAGS = $(CHECK_CFLAGS) $(AM_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -DNATIVE_LIBDIR=\"$(libdir)\" snap_confine_snap_confine_LDFLAGS = $(AM_LDFLAGS) @@ -67,7 +67,7 @@ index af9f14e6c..ae7058a36 100644 snap_confine_snap_confine_CFLAGS += $(LIBUDEV_CFLAGS) snap_confine_snap_confine_LDADD += $(snap_confine_snap_confine_extra_libs) # _STATIC is where we collect statically linked in libraries -@@ -271,7 +271,7 @@ noinst_PROGRAMS += snap-confine/snap-confine-debug +@@ -284,7 +284,7 @@ noinst_PROGRAMS += snap-confine/snap-confine-debug snap_confine_snap_confine_debug_SOURCES = $(snap_confine_snap_confine_SOURCES) snap_confine_snap_confine_debug_CFLAGS = $(snap_confine_snap_confine_CFLAGS) snap_confine_snap_confine_debug_LDFLAGS = $(snap_confine_snap_confine_LDFLAGS) @@ -76,7 +76,7 @@ index af9f14e6c..ae7058a36 100644 snap_confine_snap_confine_debug_CFLAGS += -DSNAP_CONFINE_DEBUG_BUILD=1 snap_confine_snap_confine_debug_STATIC = $(snap_confine_snap_confine_STATIC) -@@ -401,7 +401,7 @@ snap_discard_ns_snap_discard_ns_SOURCES = \ +@@ -406,7 +406,7 @@ snap_discard_ns_snap_discard_ns_SOURCES = \ snap-discard-ns/snap-discard-ns.c snap_discard_ns_snap_discard_ns_CFLAGS = $(CHECK_CFLAGS) $(AM_CFLAGS) snap_discard_ns_snap_discard_ns_LDFLAGS = $(AM_LDFLAGS) @@ -84,8 +84,8 @@ index af9f14e6c..ae7058a36 100644 +snap_discard_ns_snap_discard_ns_LDADD = libsnap-confine-private.la snap_discard_ns_snap_discard_ns_STATIC = - if APPARMOR -@@ -436,7 +436,7 @@ system_shutdown_system_shutdown_SOURCES = \ + # Use a hacked rule if we're doing static build. This allows us to inject the LIBS += .. rule below. +@@ -426,7 +426,7 @@ system_shutdown_system_shutdown_SOURCES = \ system-shutdown/system-shutdown-utils.c \ system-shutdown/system-shutdown-utils.h \ system-shutdown/system-shutdown.c @@ -94,7 +94,7 @@ index af9f14e6c..ae7058a36 100644 system_shutdown_system_shutdown_CFLAGS = $(CHECK_CFLAGS) $(filter-out -fPIE -pie,$(CFLAGS)) -static system_shutdown_system_shutdown_LDFLAGS = $(filter-out -fPIE -pie,$(LDFLAGS)) -static -@@ -446,7 +446,7 @@ system_shutdown_unit_tests_SOURCES = \ +@@ -436,7 +436,7 @@ system_shutdown_unit_tests_SOURCES = \ libsnap-confine-private/unit-tests-main.c \ libsnap-confine-private/unit-tests.c \ system-shutdown/system-shutdown-utils-test.c @@ -103,7 +103,7 @@ index af9f14e6c..ae7058a36 100644 system_shutdown_unit_tests_CFLAGS = $(GLIB_CFLAGS) system_shutdown_unit_tests_LDADD += $(GLIB_LIBS) endif -@@ -460,7 +460,7 @@ libexec_PROGRAMS += snap-gdb-shim/snap-gdb-shim +@@ -450,7 +450,7 @@ libexec_PROGRAMS += snap-gdb-shim/snap-gdb-shim snap_gdb_shim_snap_gdb_shim_SOURCES = \ snap-gdb-shim/snap-gdb-shim.c @@ -112,7 +112,7 @@ index af9f14e6c..ae7058a36 100644 ## ## snapd-generator -@@ -470,7 +470,7 @@ systemdsystemgeneratordir = $(SYSTEMD_SYSTEM_GENERATOR_DIR) +@@ -460,7 +460,7 @@ systemdsystemgeneratordir = $(SYSTEMD_SYSTEM_GENERATOR_DIR) systemdsystemgenerator_PROGRAMS = snapd-generator/snapd-generator snapd_generator_snapd_generator_SOURCES = snapd-generator/main.c @@ -121,7 +121,7 @@ index af9f14e6c..ae7058a36 100644 ## ## snapd-env-generator -@@ -480,7 +480,7 @@ systemdsystemenvgeneratordir=$(SYSTEMD_SYSTEM_ENV_GENERATOR_DIR) +@@ -470,7 +470,7 @@ systemdsystemenvgeneratordir=$(SYSTEMD_SYSTEM_ENV_GENERATOR_DIR) systemdsystemenvgenerator_PROGRAMS = snapd-env-generator/snapd-env-generator snapd_env_generator_snapd_env_generator_SOURCES = snapd-env-generator/main.c @@ -145,5 +145,5 @@ index e3aa02655..8531b4233 100644 AC_LANG([C]) # Checks for libraries. -- -2.17.2 +2.20.1 diff --git a/snapd.spec b/snapd.spec index 999a7d2..5d725e6 100644 --- a/snapd.spec +++ b/snapd.spec @@ -72,11 +72,11 @@ # Compat path macros %{!?_environmentdir: %global _environmentdir %{_prefix}/lib/environment.d} %{!?_systemdgeneratordir: %global _systemdgeneratordir %{_prefix}/lib/systemd/system-generators} -%{!?__systemd_system_env_generator_dir: %global _systemd_system_env_generator_dir %{_prefix}/lib/systemd/system-environment-generators} +%{!?_systemd_system_env_generator_dir: %global _systemd_system_env_generator_dir %{_prefix}/lib/systemd/system-environment-generators} Name: snapd -Version: 2.36.3 -Release: 2%{?dist} +Version: 2.37.2 +Release: 1%{?dist} Summary: A transactional software package manager License: GPLv3 URL: https://%{provider_prefix} @@ -292,6 +292,7 @@ Provides: golang(%{import_path}/cmd) = %{version}-%{release} Provides: golang(%{import_path}/daemon) = %{version}-%{release} Provides: golang(%{import_path}/dirs) = %{version}-%{release} Provides: golang(%{import_path}/errtracker) = %{version}-%{release} +Provides: golang(%{import_path}/features) = %{version}-%{release} Provides: golang(%{import_path}/httputil) = %{version}-%{release} Provides: golang(%{import_path}/i18n) = %{version}-%{release} Provides: golang(%{import_path}/image) = %{version}-%{release} @@ -315,6 +316,7 @@ Provides: golang(%{import_path}/logger) = %{version}-%{release} Provides: golang(%{import_path}/netutil) = %{version}-%{release} Provides: golang(%{import_path}/osutil) = %{version}-%{release} Provides: golang(%{import_path}/osutil/squashfs) = %{version}-%{release} +Provides: golang(%{import_path}/osutil/strace) = %{version}-%{release} Provides: golang(%{import_path}/osutil/sys) = %{version}-%{release} Provides: golang(%{import_path}/osutil/udev/crawler) = %{version}-%{release} Provides: golang(%{import_path}/osutil/udev/netlink) = %{version}-%{release} @@ -351,6 +353,7 @@ Provides: golang(%{import_path}/progress) = %{version}-%{release} Provides: golang(%{import_path}/progress/progresstest) = %{version}-%{release} Provides: golang(%{import_path}/release) = %{version}-%{release} Provides: golang(%{import_path}/sanity) = %{version}-%{release} +Provides: golang(%{import_path}/selinux) = %{version}-%{release} Provides: golang(%{import_path}/snap) = %{version}-%{release} Provides: golang(%{import_path}/snap/pack) = %{version}-%{release} Provides: golang(%{import_path}/snap/snapdir) = %{version}-%{release} @@ -497,11 +500,13 @@ install -d -p %{buildroot}%{_unitdir} install -d -p %{buildroot}%{_sysconfdir}/profile.d install -d -p %{buildroot}%{_sysconfdir}/sysconfig install -d -p %{buildroot}%{_sharedstatedir}/snapd/assertions +install -d -p %{buildroot}%{_sharedstatedir}/snapd/cookie install -d -p %{buildroot}%{_sharedstatedir}/snapd/desktop/applications install -d -p %{buildroot}%{_sharedstatedir}/snapd/device install -d -p %{buildroot}%{_sharedstatedir}/snapd/hostfs install -d -p %{buildroot}%{_sharedstatedir}/snapd/lib/gl install -d -p %{buildroot}%{_sharedstatedir}/snapd/lib/gl32 +install -d -p %{buildroot}%{_sharedstatedir}/snapd/lib/glvnd install -d -p %{buildroot}%{_sharedstatedir}/snapd/lib/vulkan install -d -p %{buildroot}%{_sharedstatedir}/snapd/mount install -d -p %{buildroot}%{_sharedstatedir}/snapd/seccomp/bpf @@ -656,6 +661,7 @@ popd %{_libexecdir}/snapd/info %{_libexecdir}/snapd/snap-mgmt %{_mandir}/man8/snap.8* +%{_datadir}/applications/snap-handle-link.desktop %{_datadir}/bash-completion/completions/snap %{_libexecdir}/snapd/complete.sh %{_libexecdir}/snapd/etelpmoc.sh @@ -675,6 +681,7 @@ popd %config(noreplace) %{_sysconfdir}/sysconfig/snapd %dir %{_sharedstatedir}/snapd %dir %{_sharedstatedir}/snapd/assertions +%dir %{_sharedstatedir}/snapd/cookie %dir %{_sharedstatedir}/snapd/desktop %dir %{_sharedstatedir}/snapd/desktop/applications %dir %{_sharedstatedir}/snapd/device @@ -682,6 +689,7 @@ popd %dir %{_sharedstatedir}/snapd/lib %dir %{_sharedstatedir}/snapd/lib/gl %dir %{_sharedstatedir}/snapd/lib/gl32 +%dir %{_sharedstatedir}/snapd/lib/glvnd %dir %{_sharedstatedir}/snapd/lib/vulkan %dir %{_sharedstatedir}/snapd/mount %dir %{_sharedstatedir}/snapd/seccomp @@ -777,9 +785,426 @@ fi %changelog +* Wed Feb 06 2019 Neal Gompa - 2.37.2-1 +- Release 2.37.2 to Fedora (RH#1667460) + +* Wed Feb 06 2019 Michael Vogt +- New upstream release 2.37.2 + - cmd/snap, overlord/snapstate: silently ignore classic flag when a + snap is strictly confined + - snap-confine: remove special handling of /var/lib/jenkins + - cmd/snap-confine: handle death of helper process gracefully + - snap-confine: fix classic snaps for users with /var/lib/* homedirs + like jenkins/postgres + - packaging: disable systemd environment generator on 18.04 + - tests: update smoke/sandbox test for armhf + - cmd/snap-confine: refactor and cleanup of seccomp loading + - snap-confine: increase locking timeout to 30s + - snap-confine: fix incorrect "sanity timeout 3s" message + - snap: fix hook autodiscovery for parallel installed snaps + - tests: iterate getting journal logs to support delay on boards on + daemon-notify test + - interfaces/apparmor: deny inet/inet6 in snap-update-ns profile + - interfaces: add u2f-devices interface + * Sun Feb 03 2019 Fedora Release Engineering - 2.36.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Tue Jan 29 2019 Michael Vogt +- New upstream release 2.37.1 + - cmd/snap-confine: add special case for Jenkins + - tests: workaround missing go dependencies in debian-9 + - daemon, polkit: pid_t is signed + - interfaces: add display-control interface + - interfaces: add block-devices interface + - tests/main/searching: video section got renamed to photo-and-video + - interfaces/camera: allow reading vendor/etc info from + /run/udev/data/+usb + - interfaces/dbus: be less strict about alternations for well-known + names + - interfaces/home: allow dac_read_search with 'read: all' + - interfaces/pulseaudio: allow reading subdirectories of + /etc/pulse + - interfaces/system-observe: allow read on + /proc/locks + - tests: get test-snapd-dbus-{provider,consumer} from the beta + channel + - interfaces/apparmor: mock presence of overlayfs root + - packaging/{fedora,opensuse,ubuntu}: add /var/lib/snapd/lib/glvnd + +* Wed Jan 16 2019 Michael Vogt +- New upstream release 2.37 + - snapd: fix race in TestSanityFailGoesIntoDegradedMode test + - cmd: fix snap-device-helper to deal correctly with hooks + - tests: various fixes for external backend + - interface: raw-usb: Adding ttyACM[0-9]* as many serial devices + have device node /dev/ttyACM[0-9] + - tests: fix enable-disable-unit-gpio test on external boards + - tests: define new "tests/smoke" suite and use that for + autopkgtests + - interfaces/builtin/opengl: allow access to NVIDIA VDPAU + library + - snapshotstate: don't task.Log without the lock + - overlord/configstate/configcore: support - and _ in cloud init + field names + - cmd/snap-confine: use makedev instead of MKDEV + - tests: review/fix the autopkgtest failures in disco + - systemd: allow only a single daemon-reload at the same time + - cmd/snap: only auto-enable unicode to a tty + - cmd/snap: right-align revision and size in info's channel map + - dirs, interfaces/builtin/desktop: system fontconfig cache path is + different on Fedora + - tests: fix "No space left on device" issue on amazon-linux + - store: undo workaround for timezone-less released-at + - store, snap, cmd/snap: channels have released-at + - snap-confine: fix incorrect use "src" var in mount-support.c + - release: support probing SELinux state + - release-tools: display self-help + - interface: add new `{personal,system}-files` interface + - snap: give Epoch an Equal method + - many: remove unused interface code + - interfaces/many: use 'unsafe' with docker-support change_profile + rules + - run-checks: stop running HEAD of staticcheck + - release: use sync.Once around lazy intialized state + - overlord/ifacestate: include interface name in the hotplug- + disconnect task summary + - spread: show free space in debug output + - cmd/snap: attempt to restore SELinux context of snap user + directories + - image: do not write empty etc/cloud + - tests: skip snapd snap on reset for core systems + - cmd/snap-discard-ns: fix umount(2) typo + - overlord/ifacestate: hotplug-remove-slot task handler + - overlord/ifacestate: handler for hotplug-disconnect task + - ifacestate/hotplug: updateDevice helper + - tests: reset snapd state on tests restore + - interfaces: return security setup errors + - overlord: make InstallMany work like UpdateMany, issuing a single + request to get candidates + - systemd/systemd.go: add missing tests for systemd.IsActive + - overlord/ifacestate: addHotplugSeqWaitTask helper + - cmd/snap-confine: refactor call to snap-update-ns --user-mounts + - tests: new backend used to run upgrade test suite + - travis: short circuit failures in static and unit tests travis job + - cmd: automatically fix localized