From 9be00735ce12f49477a02ab0cada3cac86d5a477 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Apr 11 2017 18:29:14 +0000 Subject: Update to snapd 2.24 Drop merged patches Install snap bash completion and snapd info file --- diff --git a/0001-cmd-link-libcap-dynamically.patch b/0001-cmd-link-libcap-dynamically.patch deleted file mode 100644 index 4c5d44e..0000000 --- a/0001-cmd-link-libcap-dynamically.patch +++ /dev/null @@ -1,99 +0,0 @@ -From c63848a5199353b72f329f3cf3026b98ccd99547 Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 19:59:20 +0100 -Subject: [PATCH 1/7] cmd: link libcap dynamically - -This patch undoes an earlier hack that linked to libcap statically. This -is no longer required as the core snap ships libcap. - -Signed-off-by: Zygmunt Krynicki ---- - cmd/Makefile.am | 44 +++++--------------------------------------- - 1 file changed, 5 insertions(+), 39 deletions(-) - -diff --git a/cmd/Makefile.am b/cmd/Makefile.am -index ec240d5..4352451 100644 ---- a/cmd/Makefile.am -+++ b/cmd/Makefile.am -@@ -107,17 +107,7 @@ libsnap_confine_private_unit_tests_SOURCES = \ - libsnap_confine_private_unit_tests_CFLAGS = $(GLIB_CFLAGS) - libsnap_confine_private_unit_tests_LDADD = $(GLIB_LIBS) - libsnap_confine_private_unit_tests_CFLAGS += -D_ENABLE_FAULT_INJECTION -- --# XXX: This injects a dependency on libcap in a way that makes automake happy --# and allows us to link libcap statically. We need to link in libcap statically --# as at this time adding runtime dependencies to snap-confine is tricky. -- --libsnap-confine-private/unit-tests$(EXEEXT): $(libsnap_confine_private_unit_tests_OBJECTS) $(libsnap_confine_private_unit_tests_DEPENDENCIES) $(EXTRA_libsnap_confine_private_unit_tests_DEPENDENCIES) libsnap-confine-private/$(am__dirstamp) -- @rm -f libsnap-confine-private/unit-tests$(EXEEXT) -- $(AM_V_CCLD)$(libsnap_confine_private_unit_tests_LINK) $(libsnap_confine_private_unit_tests_OBJECTS) $(libsnap_confine_private_unit_tests_LDADD) $(LIBS) -- --libsnap-confine-private/unit-tests$(EXEEXT): LIBS += -Wl,-Bstatic -lcap -Wl,-Bdynamic -- -+libsnap_confine_private_unit_tests_LDADD += -lcap - endif - - ## -@@ -129,15 +119,7 @@ noinst_PROGRAMS += decode-mount-opts/decode-mount-opts - decode_mount_opts_decode_mount_opts_SOURCES = \ - decode-mount-opts/decode-mount-opts.c - decode_mount_opts_decode_mount_opts_LDADD = libsnap-confine-private.a --# XXX: this makes automake generate decode_mount_opts_decode_mount_opts_LINK --decode_mount_opts_decode_mount_opts_CFLAGS = -D_fake -- --decode-mount-opts/decode-mount-opts$(EXEEXT): $(decode_mount_opts_decode_mount_opts_OBJECTS) $(decode_mount_opts_decode_mount_opts_DEPENDENCIES) $(EXTRA_decode_mount_opts_decode_mount_opts_DEPENDENCIES) libsnap-confine-private/$(am__dirstamp) -- @rm -f decode-mount-opts/decode-mount-opts$(EXEEXT) -- $(AM_V_CCLD)$(decode_mount_opts_decode_mount_opts_LINK) $(decode_mount_opts_decode_mount_opts_OBJECTS) $(decode_mount_opts_decode_mount_opts_LDADD) $(LIBS) -- --decode-mount-opts/decode-mount-opts$(EXEEXT): LIBS += -Wl,-Bstatic -lcap -Wl,-Bdynamic -- -+decode_mount_opts_decode_mount_opts_LDADD += -lcap - ## - ## snap-confine - ## -@@ -205,12 +187,7 @@ snap_confine_snap_confine_LDFLAGS = $(AM_LDFLAGS) - snap_confine_snap_confine_LDADD = libsnap-confine-private.a - snap_confine_snap_confine_CFLAGS += $(LIBUDEV_CFLAGS) - snap_confine_snap_confine_LDADD += $(LIBUDEV_LIBS) -- --snap-confine/snap-confine$(EXEEXT): $(snap_confine_snap_confine_OBJECTS) $(snap_confine_snap_confine_DEPENDENCIES) $(EXTRA_snap_confine_snap_confine_DEPENDENCIES) libsnap-confine-private/$(am__dirstamp) -- @rm -f snap-confine/snap-confine$(EXEEXT) -- $(AM_V_CCLD)$(snap_confine_snap_confine_LINK) $(snap_confine_snap_confine_OBJECTS) $(snap_confine_snap_confine_LDADD) $(LIBS) -- --snap-confine/snap-confine$(EXEEXT): LIBS += -Wl,-Bstatic -lcap -Wl,-Bdynamic -+snap_confine_snap_confine_LDADD += -lcap - - # This is here to help fix rpmlint hardening issue. - # https://en.opensuse.org/openSUSE:Packaging_checks#non-position-independent-executable -@@ -238,12 +215,7 @@ snap_confine_snap_confine_debug_CFLAGS = $(snap_confine_snap_confine_CFLAGS) - snap_confine_snap_confine_debug_LDFLAGS = $(snap_confine_snap_confine_LDFLAGS) - snap_confine_snap_confine_debug_LDADD = $(snap_confine_snap_confine_LDADD) - snap_confine_snap_confine_debug_CFLAGS += -DSNAP_CONFINE_DEBUG_BUILD=1 -- --snap-confine/snap-confine-debug$(EXEEXT): $(snap_confine_snap_confine_debug_OBJECTS) $(snap_confine_snap_confine_debug_DEPENDENCIES) $(EXTRA_snap_confine_snap_confine_debug_DEPENDENCIES) libsnap-confine-private/$(am__dirstamp) -- @rm -f snap-confine/snap-confine-debug$(EXEEXT) -- $(AM_V_CCLD)$(snap_confine_snap_confine_debug_LINK) $(snap_confine_snap_confine_debug_OBJECTS) $(snap_confine_snap_confine_debug_LDADD) $(LIBS) -- --snap-confine/snap-confine-debug$(EXEEXT): LIBS += -Wl,-Bstatic -lcap -Wl,-Bdynamic -+snap_confine_snap_confine_debug_LDADD += -lcap - - if WITH_UNIT_TESTS - noinst_PROGRAMS += snap-confine/snap-confine-unit-tests -@@ -261,13 +233,7 @@ snap_confine_snap_confine_unit_tests_SOURCES = \ - snap_confine_snap_confine_unit_tests_CFLAGS = $(snap_confine_snap_confine_CFLAGS) $(GLIB_CFLAGS) - snap_confine_snap_confine_unit_tests_LDADD = $(snap_confine_snap_confine_LDADD) $(GLIB_LIBS) - snap_confine_snap_confine_unit_tests_LDFLAGS = $(snap_confine_snap_confine_LDFLAGS) -- -- --snap-confine/snap-confine-unit-tests$(EXEEXT): $(snap_confine_snap_confine_unit_tests_OBJECTS) $(snap_confine_snap_confine_unit_tests_DEPENDENCIES) $(EXTRA_snap_confine_snap_confine_unit_tests_DEPENDENCIES) libsnap-confine-private/$(am__dirstamp) -- @rm -f snap-confine/snap-confine-unit-tests$(EXEEXT) -- $(AM_V_CCLD)$(snap_confine_snap_confine_unit_tests_LINK) $(snap_confine_snap_confine_unit_tests_OBJECTS) $(snap_confine_snap_confine_unit_tests_LDADD) $(LIBS) -- --snap-confine/snap-confine-unit-tests$(EXEEXT): LIBS += -Wl,-Bstatic -lcap -Wl,-Bdynamic -+snap_confine_snap_confine_unit_tests_LDADD += -lcap - - endif - --- -2.10.2 - diff --git a/0001-cmd-rework-header-check-for-xfs-xqm.patch b/0001-cmd-rework-header-check-for-xfs-xqm.patch deleted file mode 100644 index 685c8e7..0000000 --- a/0001-cmd-rework-header-check-for-xfs-xqm.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7b98edae011aab645b2db523cb243ee0184e4c95 Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Mon, 27 Mar 2017 14:18:41 +0200 -Subject: [PATCH] cmd: rework header check for xfs/xqm.h - -Building snap-confine on i386 fails on other operating systems with: - -configure: WARNING: xfs/xqm.h: present but cannot be compiled -configure: WARNING: xfs/xqm.h: check for missing prerequisite headers? -configure: WARNING: xfs/xqm.h: see the Autoconf documentation -configure: WARNING: xfs/xqm.h: section "Present But Cannot Be Compiled" -configure: WARNING: xfs/xqm.h: proceeding with the compiler's result -[...] -checking for xfs/xqm.h... no -configure: error: xfs/xqm.h unavailable - -The official autoconf documentation recommends using a proper include -check in the AC_CHECK_HEADERS macro. ---- - cmd/configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cmd/configure.ac b/cmd/configure.ac -index 619ef42..981def6 100644 ---- a/cmd/configure.ac -+++ b/cmd/configure.ac -@@ -22,7 +22,10 @@ AC_SYS_LARGEFILE - # Checks for header files. - AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/mount.h unistd.h]) - AC_CHECK_HEADERS([sys/quota.h], [], [AC_MSG_ERROR(sys/quota.h unavailable)]) --AC_CHECK_HEADERS([xfs/xqm.h], [], [AC_MSG_ERROR(xfs/xqm.h unavailable)]) -+AC_CHECK_HEADERS([xfs/xqm.h], [], [AC_MSG_ERROR(xfs/xqm.h unavailable)], -+[[#define _FILE_OFFSET_BITS 64 -+#include -+]]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_CHECK_HEADER_STDBOOL diff --git a/0001-cmd-snap-confine-hardcode-constants-from-xfs-xqm.h-f.patch b/0001-cmd-snap-confine-hardcode-constants-from-xfs-xqm.h-f.patch deleted file mode 100644 index 445b797..0000000 --- a/0001-cmd-snap-confine-hardcode-constants-from-xfs-xqm.h-f.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ebc1b5c3a1adc6d7e5287fa76811968e7faa7621 Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Thu, 30 Mar 2017 17:39:44 +0200 -Subject: [PATCH] cmd/snap-confine: hardcode constants from xfs/xqm.h for now - ---- - cmd/snap-confine/seccomp-support.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/cmd/snap-confine/seccomp-support.c b/cmd/snap-confine/seccomp-support.c -index a08b23a..18e0459 100644 ---- a/cmd/snap-confine/seccomp-support.c -+++ b/cmd/snap-confine/seccomp-support.c -@@ -34,7 +34,18 @@ - #include - #include - #include -+#if 0 - #include -+#else -+#define XQM_CMD(x) (('X'<<8)+(x)) /* note: forms first QCMD argument */ -+#define Q_XQUOTAON XQM_CMD(1) /* enable accounting/enforcement */ -+#define Q_XQUOTAOFF XQM_CMD(2) /* disable accounting/enforcement */ -+#define Q_XGETQUOTA XQM_CMD(3) /* get disk limits and usage */ -+#define Q_XSETQLIM XQM_CMD(4) /* set disk limits */ -+#define Q_XGETQSTAT XQM_CMD(5) /* get quota subsystem status */ -+#define Q_XQUOTARM XQM_CMD(6) /* free disk space used by dquots */ -+#define Q_XQUOTASYNC XQM_CMD(7) /* delalloc flush, updates dquots */ -+#endif - #include - - #include --- -2.7.4 \ No newline at end of file diff --git a/0001-cmd-use-libtool-for-the-internal-library.patch b/0001-cmd-use-libtool-for-the-internal-library.patch new file mode 100644 index 0000000..2619034 --- /dev/null +++ b/0001-cmd-use-libtool-for-the-internal-library.patch @@ -0,0 +1,94 @@ +From 687b6de661e00db74e562ab575bfd1319f750816 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 + +This just cuts some hassle integration with how the helper library is +built. I could never get to pass the right -fPIC/-fpie combination +otherwise. + +Signed-off-by: Zygmunt Krynicki +--- + cmd/Makefile.am | 16 ++++++++-------- + cmd/configure.ac | 3 ++- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/cmd/Makefile.am b/cmd/Makefile.am +index 695b07e..767bf35 100644 +--- a/cmd/Makefile.am ++++ b/cmd/Makefile.am +@@ -58,12 +58,12 @@ hack: snap-confine/snap-confine snap-confine/snap-confine.apparmor + sudo apparmor_parser -r snap-confine/snap-confine.apparmor + + ## +-## libsnap-confine-private.a ++## libsnap-confine-private.la + ## + +-noinst_LIBRARIES += libsnap-confine-private.a ++noinst_LTLIBRARIES = libsnap-confine-private.la + +-libsnap_confine_private_a_SOURCES = \ ++libsnap_confine_private_la_SOURCES = \ + libsnap-confine-private/classic.c \ + libsnap-confine-private/classic.h \ + libsnap-confine-private/cleanup-funcs.c \ +@@ -131,7 +131,7 @@ noinst_PROGRAMS += decode-mount-opts/decode-mount-opts + + decode_mount_opts_decode_mount_opts_SOURCES = \ + decode-mount-opts/decode-mount-opts.c +-decode_mount_opts_decode_mount_opts_LDADD = libsnap-confine-private.a ++decode_mount_opts_decode_mount_opts_LDADD = libsnap-confine-private.la + decode_mount_opts_decode_mount_opts_STATIC = + + if STATIC_LIBCAP +@@ -214,7 +214,7 @@ snap_confine_snap_confine_SOURCES = \ + + snap_confine_snap_confine_CFLAGS = -Wall -Werror $(AM_CFLAGS) + snap_confine_snap_confine_LDFLAGS = $(AM_LDFLAGS) +-snap_confine_snap_confine_LDADD = libsnap-confine-private.a ++snap_confine_snap_confine_LDADD = libsnap-confine-private.la + snap_confine_snap_confine_CFLAGS += $(LIBUDEV_CFLAGS) + snap_confine_snap_confine_LDADD += $(LIBUDEV_LIBS) + # _STATIC is where we collect statically linked in libraries +@@ -379,7 +379,7 @@ snap_discard_ns_snap_discard_ns_SOURCES = \ + snap-discard-ns/snap-discard-ns.c + snap_discard_ns_snap_discard_ns_CFLAGS = -Wall -Werror $(AM_CFLAGS) + snap_discard_ns_snap_discard_ns_LDFLAGS = $(AM_LDFLAGS) +-snap_discard_ns_snap_discard_ns_LDADD = libsnap-confine-private.a ++snap_discard_ns_snap_discard_ns_LDADD = libsnap-confine-private.la + snap_discard_ns_snap_discard_ns_STATIC = + + if APPARMOR +@@ -418,7 +418,7 @@ system_shutdown_system_shutdown_SOURCES = \ + system-shutdown/system-shutdown-utils.c \ + system-shutdown/system-shutdown-utils.h \ + system-shutdown/system-shutdown.c +-system_shutdown_system_shutdown_LDADD = libsnap-confine-private.a ++system_shutdown_system_shutdown_LDADD = libsnap-confine-private.la + system_shutdown_system_shutdown_CFLAGS = $(filter-out -fPIE -pie,$(CFLAGS)) -static + system_shutdown_system_shutdown_LDFLAGS = $(filter-out -fPIE -pie,$(LDFLAGS)) -static + +@@ -428,7 +428,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 +-system_shutdown_unit_tests_LDADD = libsnap-confine-private.a ++system_shutdown_unit_tests_LDADD = libsnap-confine-private.la + system_shutdown_unit_tests_CFLAGS = $(GLIB_CFLAGS) + system_shutdown_unit_tests_LDADD += $(GLIB_LIBS) + endif +diff --git a/cmd/configure.ac b/cmd/configure.ac +index 39a6800..2ebf827 100644 +--- a/cmd/configure.ac ++++ b/cmd/configure.ac +@@ -11,7 +11,8 @@ AC_PROG_CC_C99 + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_MAKE_SET +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL ++AC_CONFIG_MACRO_DIR([m4]) + + AC_LANG([C]) + # Checks for libraries. diff --git a/0001-data-selinux-Add-context-definition-for-snapctl.patch b/0001-data-selinux-Add-context-definition-for-snapctl.patch deleted file mode 100644 index 6de563f..0000000 --- a/0001-data-selinux-Add-context-definition-for-snapctl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bc10b2df54e44a955ef338f7d1cd3dcd82db9271 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Fri, 24 Mar 2017 09:52:39 -0400 -Subject: [PATCH] data/selinux: Add context definition for snapctl - -Signed-off-by: Neal Gompa ---- - data/selinux/snappy.fc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/selinux/snappy.fc b/data/selinux/snappy.fc -index a807f84..b928aed 100644 ---- a/data/selinux/snappy.fc -+++ b/data/selinux/snappy.fc -@@ -21,6 +21,7 @@ HOME_DIR/snap(/.*)? gen_context(system_u:object_r:snappy_home_t,s0) - - - /usr/bin/snap -- gen_context(system_u:object_r:snappy_exec_t,s0) -+/usr/bin/snapctl -- gen_context(system_u:object_r:snappy_exec_t,s0) - - ifdef(`distro_redhat',` - /usr/libexec/snapd/.* -- gen_context(system_u:object_r:snappy_exec_t,s0) diff --git a/0002-cmd-remove-unused-variable.patch b/0002-cmd-remove-unused-variable.patch deleted file mode 100644 index 10db646..0000000 --- a/0002-cmd-remove-unused-variable.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f3cbc4f986d695157ee9f8d38274fe9359051011 Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 20:00:09 +0100 -Subject: [PATCH 2/7] cmd: remove unused variable - -Signed-off-by: Zygmunt Krynicki ---- - cmd/libsnap-confine-private/mountinfo.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/cmd/libsnap-confine-private/mountinfo.c b/cmd/libsnap-confine-private/mountinfo.c -index 9668dd7..2c8311d 100644 ---- a/cmd/libsnap-confine-private/mountinfo.c -+++ b/cmd/libsnap-confine-private/mountinfo.c -@@ -284,7 +284,6 @@ static struct sc_mountinfo_entry *sc_parse_mountinfo_entry(const char *line) - entry->optional_fields = &entry->line_buf[0] + offset; - // NOTE: This ensures that optional_fields is never NULL. If this changes, - // must adjust all callers of parse_mountinfo_entry() accordingly. -- char *to = entry->optional_fields; - for (int field_num = 0;; ++field_num) { - char *opt_field = parse_next_string_field(); - if (opt_field == NULL) --- -2.10.2 - diff --git a/0003-cmd-add-directive-for-shellcheck-and-follow-source.patch b/0003-cmd-add-directive-for-shellcheck-and-follow-source.patch deleted file mode 100644 index eab6d66..0000000 --- a/0003-cmd-add-directive-for-shellcheck-and-follow-source.patch +++ /dev/null @@ -1,355 +0,0 @@ -From ec7c9556b15519348ec7af471cbce54d276e577a Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 20:02:02 +0100 -Subject: [PATCH 3/7] cmd: add directive for shellcheck and follow source: - -shellcheck 0.4.4 needs a directive to find the common.sh script that is -sourced by all the seccomp unit tests. We also need to use the '-x' -command line option to have shellcheck follow such declarations. - -Signed-off-by: Zygmunt Krynicki ---- - cmd/Makefile.am | 2 +- - cmd/snap-confine/tests/test_bad_seccomp_filter_args | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_clone | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_null | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_prctl | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_prio | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_quotactl | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_socket | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_args_termios | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_length | 1 + - cmd/snap-confine/tests/test_bad_seccomp_filter_missing_trailing_newline | 1 + - cmd/snap-confine/tests/test_complain | 1 + - cmd/snap-confine/tests/test_complain_missed | 1 + - cmd/snap-confine/tests/test_noprofile | 1 + - cmd/snap-confine/tests/test_restrictions | 1 + - cmd/snap-confine/tests/test_restrictions_working | 1 + - cmd/snap-confine/tests/test_restrictions_working_args | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_clone | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_prctl | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_prio | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_quotactl | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_socket | 1 + - cmd/snap-confine/tests/test_restrictions_working_args_termios | 1 + - cmd/snap-confine/tests/test_unrestricted | 1 + - cmd/snap-confine/tests/test_unrestricted_missed | 1 + - cmd/snap-confine/tests/test_whitelist | 1 + - 26 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/cmd/Makefile.am b/cmd/Makefile.am -index 4352451..574886c 100644 ---- a/cmd/Makefile.am -+++ b/cmd/Makefile.am -@@ -28,7 +28,7 @@ check-syntax-c: - .PHONY: check-syntax-sh - check-syntax-sh: $(filter-out %.log %.trs,$(wildcard $(srcdir)/snap-confine/tests/test_*)) snap-confine/tests/common.sh - if HAVE_SHELLCHECK -- $(HAVE_SHELLCHECK) --format=gcc $^ -+ $(HAVE_SHELLCHECK) -x --format=gcc $^ - else - echo "shellcheck is not installed, skipping (non-critical) syntax test" - endif -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args b/cmd/snap-confine/tests/test_bad_seccomp_filter_args -index 900dcb7..f3f4104 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_clone b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_clone -index 7ac29ec..0eae33f 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_clone -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_clone -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_null b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_null -index 259127e..17e9c04 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_null -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_null -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prctl b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prctl -index e05bdde..d364ce7 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prctl -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prctl -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prio b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prio -index 6872b02..5ae6b48 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prio -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_prio -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_quotactl b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_quotactl -index 07b7329..91499f5 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_quotactl -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_quotactl -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_socket b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_socket -index 2cf477a..58675bc 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_socket -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_socket -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_termios b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_termios -index d6d7d91..4493e16 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_args_termios -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_args_termios -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_length b/cmd/snap-confine/tests/test_bad_seccomp_filter_length -index d2a1548..0d06005 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_length -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_length -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - printf "Test seccomp filter (bad - too long)" -diff --git a/cmd/snap-confine/tests/test_bad_seccomp_filter_missing_trailing_newline b/cmd/snap-confine/tests/test_bad_seccomp_filter_missing_trailing_newline -index ea6bcf2..9c77844 100755 ---- a/cmd/snap-confine/tests/test_bad_seccomp_filter_missing_trailing_newline -+++ b/cmd/snap-confine/tests/test_bad_seccomp_filter_missing_trailing_newline -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - printf "Test seccomp filter (bad - no trailing newline)" -diff --git a/cmd/snap-confine/tests/test_complain b/cmd/snap-confine/tests/test_complain -index 4b7878a..b58de26 100755 ---- a/cmd/snap-confine/tests/test_complain -+++ b/cmd/snap-confine/tests/test_complain -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - cat >"$TMP/snap.name.app" <"$TMP/snap.name.app" <"$TMP/snap.name.app" <"$TMP/snap.name.app" -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args b/cmd/snap-confine/tests/test_restrictions_working_args -index 7db3c63..09a300c 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args -+++ b/cmd/snap-confine/tests/test_restrictions_working_args -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_clone b/cmd/snap-confine/tests/test_restrictions_working_args_clone -index 2c43db3..9700d3e 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_clone -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_clone -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_prctl b/cmd/snap-confine/tests/test_restrictions_working_args_prctl -index 7c2f53c..6717726 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_prctl -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_prctl -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_prio b/cmd/snap-confine/tests/test_restrictions_working_args_prio -index dfbbc22..40d31e2 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_prio -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_prio -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_quotactl b/cmd/snap-confine/tests/test_restrictions_working_args_quotactl -index f9c1376..ab7056c 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_quotactl -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_quotactl -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_socket b/cmd/snap-confine/tests/test_restrictions_working_args_socket -index dfbe5ec..a50c632 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_socket -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_socket -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_restrictions_working_args_termios b/cmd/snap-confine/tests/test_restrictions_working_args_termios -index 26ef73b..0c2a42a 100755 ---- a/cmd/snap-confine/tests/test_restrictions_working_args_termios -+++ b/cmd/snap-confine/tests/test_restrictions_working_args_termios -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - get_common_syscalls >"$TMP"/tmpl -diff --git a/cmd/snap-confine/tests/test_unrestricted b/cmd/snap-confine/tests/test_unrestricted -index dede157..d0f908a 100755 ---- a/cmd/snap-confine/tests/test_unrestricted -+++ b/cmd/snap-confine/tests/test_unrestricted -@@ -2,6 +2,7 @@ - - set -e - -+# shellcheck source=snap-confine/tests/common.sh - . "${srcdir:-.}/snap-confine/tests/common.sh" - - cat >"$TMP/snap.name.app" <"$TMP/snap.name.app" < -Date: Mon, 6 Mar 2017 20:26:26 +0100 -Subject: [PATCH 4/7] cmd: use libtool for the internal library - -This just cuts some hassle integration with how the helper library is -built. I could never get to pass the right -fPIC/-fpie combination -otherwise. - -Signed-off-by: Zygmunt Krynicki ---- - cmd/Makefile.am | 22 +++++++++++----------- - cmd/configure.ac | 3 ++- - 2 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/cmd/Makefile.am b/cmd/Makefile.am -index 574886c..0733d85 100644 ---- a/cmd/Makefile.am -+++ b/cmd/Makefile.am -@@ -4,7 +4,7 @@ TESTS = - libexec_PROGRAMS = - dist_man_MANS = - noinst_PROGRAMS = --noinst_LIBRARIES = -+noinst_LTLIBRARIES = - - subdirs = snap-confine snap-discard-ns system-shutdown libsnap-confine-private snap-update-ns - -@@ -58,12 +58,12 @@ hack: snap-confine/snap-confine snap-confine/snap-confine.apparmor - sudo apparmor_parser -r snap-confine/snap-confine.apparmor - - ## --## libsnap-confine-private.a -+## libsnap-confine-private.la - ## - --noinst_LIBRARIES += libsnap-confine-private.a -+noinst_LTLIBRARIES += libsnap-confine-private.la - --libsnap_confine_private_a_SOURCES = \ -+libsnap_confine_private_la_SOURCES = \ - libsnap-confine-private/classic.c \ - libsnap-confine-private/classic.h \ - libsnap-confine-private/cleanup-funcs.c \ -@@ -118,7 +118,7 @@ noinst_PROGRAMS += decode-mount-opts/decode-mount-opts - - decode_mount_opts_decode_mount_opts_SOURCES = \ - decode-mount-opts/decode-mount-opts.c --decode_mount_opts_decode_mount_opts_LDADD = libsnap-confine-private.a -+decode_mount_opts_decode_mount_opts_LDADD = libsnap-confine-private.la - decode_mount_opts_decode_mount_opts_LDADD += -lcap - ## - ## snap-confine -@@ -184,7 +184,7 @@ snap_confine_snap_confine_SOURCES = \ - - snap_confine_snap_confine_CFLAGS = -Wall -Werror $(AM_CFLAGS) - snap_confine_snap_confine_LDFLAGS = $(AM_LDFLAGS) --snap_confine_snap_confine_LDADD = libsnap-confine-private.a -+snap_confine_snap_confine_LDADD = libsnap-confine-private.la - snap_confine_snap_confine_CFLAGS += $(LIBUDEV_CFLAGS) - snap_confine_snap_confine_LDADD += $(LIBUDEV_LIBS) - snap_confine_snap_confine_LDADD += -lcap -@@ -314,7 +314,7 @@ snap_discard_ns_snap_discard_ns_SOURCES = \ - snap-discard-ns/snap-discard-ns.c - snap_discard_ns_snap_discard_ns_CFLAGS = -Wall -Werror $(AM_CFLAGS) - snap_discard_ns_snap_discard_ns_LDFLAGS = $(AM_LDFLAGS) --snap_discard_ns_snap_discard_ns_LDADD = libsnap-confine-private.a -+snap_discard_ns_snap_discard_ns_LDADD = libsnap-confine-private.la - - if APPARMOR - snap_discard_ns_snap_discard_ns_CFLAGS += $(APPARMOR_CFLAGS) -@@ -335,7 +335,7 @@ system_shutdown_system_shutdown_SOURCES = \ - system-shutdown/system-shutdown-utils.c \ - system-shutdown/system-shutdown-utils.h \ - system-shutdown/system-shutdown.c --system_shutdown_system_shutdown_LDADD = libsnap-confine-private.a -+system_shutdown_system_shutdown_LDADD = libsnap-confine-private.la - system_shutdown_system_shutdown_CFLAGS = $(filter-out -fPIE -pie,$(CFLAGS)) -static - system_shutdown_system_shutdown_LDFLAGS = $(filter-out -fPIE -pie,$(LDFLAGS)) -static - -@@ -345,7 +345,7 @@ system_shutdown_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 --system_shutdown_system_shutdown_unit_tests_LDADD = libsnap-confine-private.a -+system_shutdown_system_shutdown_unit_tests_LDADD = libsnap-confine-private.la - system_shutdown_system_shutdown_unit_tests_CFLAGS = $(GLIB_CFLAGS) - system_shutdown_system_shutdown_unit_tests_LDADD += $(GLIB_LIBS) - endif -@@ -359,7 +359,7 @@ dist_man_MANS += snap-update-ns/snap-update-ns.5 - CLEANFILES += snap-update-ns/snap-update-ns.5 - EXTRA_DIST += snap-update-ns/snap-update-ns.rst - --snap_update_ns_snap_update_ns_LDADD = libsnap-confine-private.a -+snap_update_ns_snap_update_ns_LDADD = libsnap-confine-private.la - - snap_update_ns_snap_update_ns_SOURCES = \ - snap-update-ns/snap-update-ns.c \ -@@ -380,7 +380,7 @@ snap_update_ns_unit_tests_SOURCES = \ - snap-update-ns/test-data.h \ - snap-update-ns/test-utils.c \ - snap-update-ns/test-utils.h --snap_update_ns_unit_tests_LDADD = libsnap-confine-private.a -+snap_update_ns_unit_tests_LDADD = libsnap-confine-private.la - snap_update_ns_unit_tests_CFLAGS = $(GLIB_CFLAGS) - snap_update_ns_unit_tests_LDADD += $(GLIB_LIBS) - endif -diff --git a/cmd/configure.ac b/cmd/configure.ac -index 3c921ac..4fb6175 100644 ---- a/cmd/configure.ac -+++ b/cmd/configure.ac -@@ -11,7 +11,8 @@ AC_PROG_CC_C99 - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_MAKE_SET --AC_PROG_RANLIB -+AC_PROG_LIBTOOL -+AC_CONFIG_MACRO_DIR([m4]) - - AC_LANG([C]) - # Checks for libraries. --- -2.10.2 - diff --git a/0006-errtracker-fix-testing-outside-of-ubuntu.patch b/0006-errtracker-fix-testing-outside-of-ubuntu.patch deleted file mode 100644 index de61167..0000000 --- a/0006-errtracker-fix-testing-outside-of-ubuntu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fa80b511f54493eda0d5fb6ef17c34a30b54078a Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 23:04:09 +0100 -Subject: [PATCH 6/7] errtracker: fix testing outside of ubuntu - -Unfortunately the distribution "ubuntu" is special cased so that it -shows up as "Ubuntu". Tests are not taking this into account and were -always expecting the upper-cased distribution name. This patch fixes -this. - -Signed-off-by: Zygmunt Krynicki ---- - errtracker/errtracker_test.go | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/errtracker/errtracker_test.go b/errtracker/errtracker_test.go -index cd69d30..3a433dc 100644 ---- a/errtracker/errtracker_test.go -+++ b/errtracker/errtracker_test.go -@@ -84,9 +84,15 @@ func (s *ErrtrackerTestSuite) TestReport(c *C) { - var data map[string]string - err = bson.Unmarshal(b, &data) - c.Assert(err, IsNil) -+ var distroRelease string -+ if release.ReleaseInfo.ID == "ubuntu" { -+ distroRelease = fmt.Sprintf("%s %s", strings.Title(release.ReleaseInfo.ID), release.ReleaseInfo.VersionID) -+ } else { -+ distroRelease = fmt.Sprintf("%s %s", release.ReleaseInfo.ID, release.ReleaseInfo.VersionID) -+ } - c.Check(data, DeepEquals, map[string]string{ - "ProblemType": "Snap", -- "DistroRelease": fmt.Sprintf("%s %s", strings.Title(release.ReleaseInfo.ID), release.ReleaseInfo.VersionID), -+ "DistroRelease": distroRelease, - "HostSnapdBuildID": hostBuildID, - "CoreSnapdBuildID": coreBuildID, - "SnapdVersion": "some-snapd-version", --- -2.10.2 - diff --git a/0007-osutil-HACK-use-usr-bin-true-false.patch b/0007-osutil-HACK-use-usr-bin-true-false.patch deleted file mode 100644 index 7282703..0000000 --- a/0007-osutil-HACK-use-usr-bin-true-false.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2003224f27faebf667f091bb0f894deba8584e2d Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 23:07:24 +0100 -Subject: [PATCH 7/7] osutil: HACK: use /usr/bin/{true,false} - -This patch should not be applied upstream. This is a Debian vs OpenSUSE -delta. Ideally we'd do the golang equvalent of $(realpath /bin/false) -but I was in a hurry. - -Signed-off-by: Zygmunt Krynicki ---- - osutil/buildid_test.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/osutil/buildid_test.go b/osutil/buildid_test.go -index b11a2e7..9ef574b 100644 ---- a/osutil/buildid_test.go -+++ b/osutil/buildid_test.go -@@ -46,7 +46,7 @@ func buildID(c *C, fname string) string { - } - - func (s *buildIDSuite) TestReadBuildID(c *C) { -- for _, fname := range []string{"/bin/true", "/bin/false"} { -+ for _, fname := range []string{"/usr/bin/true", "/usr/bin/false"} { - - id, err := osutil.ReadBuildID(fname) - c.Assert(err, IsNil) --- -2.10.2 - diff --git a/0008-partition-skip-some-tests-if-grub-editenv-is-not-ava.patch b/0008-partition-skip-some-tests-if-grub-editenv-is-not-ava.patch deleted file mode 100644 index e25f7e5..0000000 --- a/0008-partition-skip-some-tests-if-grub-editenv-is-not-ava.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0944e02cabdd41e5f01ff3e0556aa28e4fa31b8b Mon Sep 17 00:00:00 2001 -From: Zygmunt Krynicki -Date: Mon, 6 Mar 2017 23:30:19 +0100 -Subject: [PATCH 8/8] partition: skip some tests if grub-editenv is not - available - -Signed-off-by: Zygmunt Krynicki ---- - partition/grub_test.go | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/partition/grub_test.go b/partition/grub_test.go -index b64d0b8..5fc5fd4 100644 ---- a/partition/grub_test.go -+++ b/partition/grub_test.go -@@ -28,6 +28,7 @@ import ( - . "gopkg.in/check.v1" - - "github.com/snapcore/snapd/dirs" -+ "github.com/snapcore/snapd/osutil" - ) - - func grubEnvPath() string { -@@ -35,11 +36,17 @@ func grubEnvPath() string { - } - - func grubEditenvSet(c *C, key, value string) { -+ if !osutil.FileExists("/usr/bin/grub-editenv") { -+ c.Skip("/usr/bin/grub-editenv is not available") -+ } - _, err := runCommand("/usr/bin/grub-editenv", grubEnvPath(), "set", fmt.Sprintf("%s=%s", key, value)) - c.Assert(err, IsNil) - } - - func grubEditenvGet(c *C, key string) string { -+ if !osutil.FileExists("/usr/bin/grub-editenv") { -+ c.Skip("/usr/bin/grub-editenv is not available") -+ } - output, err := runCommand("/usr/bin/grub-editenv", grubEnvPath(), "list") - c.Assert(err, IsNil) - cfg := goconfigparser.New() --- -2.10.2 - diff --git a/PR3084-packaging-use-templates-for-systemd-units.patch b/PR3084-packaging-use-templates-for-systemd-units.patch deleted file mode 100644 index 129c727..0000000 --- a/PR3084-packaging-use-templates-for-systemd-units.patch +++ /dev/null @@ -1,317 +0,0 @@ -From 9cfeea9155cca2febc2ab57daa57b7e4f22bfb2d Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Fri, 24 Mar 2017 17:54:48 +0100 -Subject: [PATCH 1/6] packaging: use templates for relevant systemd units - -To make packaging across different distributionis a bit easier we -now use templates for some of our systemd units and replace things -which are in a different location with sed at build time. ---- - .gitignore | 5 +++++ - data/systemd/snapd.autoimport.service | 10 ---------- - data/systemd/snapd.autoimport.service.in | 10 ++++++++++ - data/systemd/snapd.refresh.service | 11 ----------- - data/systemd/snapd.refresh.service.in | 11 +++++++++++ - data/systemd/snapd.service | 11 ----------- - data/systemd/snapd.service.in | 11 +++++++++++ - 7 files changed, 37 insertions(+), 32 deletions(-) - delete mode 100644 data/systemd/snapd.autoimport.service - create mode 100644 data/systemd/snapd.autoimport.service.in - delete mode 100644 data/systemd/snapd.refresh.service - create mode 100644 data/systemd/snapd.refresh.service.in - delete mode 100644 data/systemd/snapd.service - create mode 100644 data/systemd/snapd.service.in - -diff --git a/.gitignore b/.gitignore -index 5c55fd5..5b6919f 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -30,6 +30,11 @@ cmd/system-shutdown/unit-tests - # manual pages - cmd/*/*.[1-9] - -+# auto-generated systemd units -+data/systemd/snapd.autoimport.service -+data/systemd/snapd.refresh.service -+data/systemd/snapd.service -+ - # test-driver - *.log - *.trs -diff --git a/data/systemd/snapd.autoimport.service b/data/systemd/snapd.autoimport.service -deleted file mode 100644 -index 2c75f15..0000000 ---- a/data/systemd/snapd.autoimport.service -+++ /dev/null -@@ -1,10 +0,0 @@ --[Unit] --Description=Auto import assertions from block devices --After=snapd.service snapd.socket -- --[Service] --Type=oneshot --ExecStart=/usr/bin/snap auto-import -- --[Install] --WantedBy=multi-user.target -diff --git a/data/systemd/snapd.autoimport.service.in b/data/systemd/snapd.autoimport.service.in -new file mode 100644 -index 0000000..04b9a7e ---- /dev/null -+++ b/data/systemd/snapd.autoimport.service.in -@@ -0,0 +1,10 @@ -+[Unit] -+Description=Auto import assertions from block devices -+After=snapd.service snapd.socket -+ -+[Service] -+Type=oneshot -+ExecStart=@bindir@/snap auto-import -+ -+[Install] -+WantedBy=multi-user.target -diff --git a/data/systemd/snapd.refresh.service b/data/systemd/snapd.refresh.service -deleted file mode 100644 -index 893217f..0000000 ---- a/data/systemd/snapd.refresh.service -+++ /dev/null -@@ -1,11 +0,0 @@ --[Unit] --Description=Automatically refresh installed snaps --After=network-online.target snapd.socket --Requires=snapd.socket --ConditionPathExistsGlob=/snap/*/current --Documentation=man:snap(1) -- --[Service] --Type=oneshot --ExecStart=/usr/bin/snap refresh --Environment=SNAP_REFRESH_FROM_EMERGENCY_TIMER=1 -diff --git a/data/systemd/snapd.refresh.service.in b/data/systemd/snapd.refresh.service.in -new file mode 100644 -index 0000000..d5cd14b ---- /dev/null -+++ b/data/systemd/snapd.refresh.service.in -@@ -0,0 +1,11 @@ -+[Unit] -+Description=Automatically refresh installed snaps -+After=network-online.target snapd.socket -+Requires=snapd.socket -+ConditionPathExistsGlob=@SNAP_MOUNTDIR@/*/current -+Documentation=man:snap(1) -+ -+[Service] -+Type=oneshot -+ExecStart=@bindir@/snap refresh -+Environment=SNAP_REFRESH_FROM_EMERGENCY_TIMER=1 -diff --git a/data/systemd/snapd.service b/data/systemd/snapd.service -deleted file mode 100644 -index 0863225..0000000 ---- a/data/systemd/snapd.service -+++ /dev/null -@@ -1,11 +0,0 @@ --[Unit] --Description=Snappy daemon --Requires=snapd.socket -- --[Service] --ExecStart=/usr/lib/snapd/snapd --EnvironmentFile=/etc/environment --Restart=always -- --[Install] --WantedBy=multi-user.target -diff --git a/data/systemd/snapd.service.in b/data/systemd/snapd.service.in -new file mode 100644 -index 0000000..009e62e ---- /dev/null -+++ b/data/systemd/snapd.service.in -@@ -0,0 +1,11 @@ -+[Unit] -+Description=Snappy daemon -+Requires=snapd.socket -+ -+[Service] -+ExecStart=@libexecdir@/snapd/snapd -+EnvironmentFile=@SNAPD_ENVIRONMENT_FILE@ -+Restart=always -+ -+[Install] -+WantedBy=multi-user.target - -From 13f65b06b339f80c4dca9bd716c53908b00947b3 Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Tue, 28 Mar 2017 09:06:48 +0200 -Subject: [PATCH 2/6] data/systemd: move systemd unit - generation into separate makefile - ---- - data/systemd/Makefile | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - create mode 100644 data/systemd/Makefile - -diff --git a/data/systemd/Makefile b/data/systemd/Makefile -new file mode 100644 -index 0000000..d40b218 ---- /dev/null -+++ b/data/systemd/Makefile -@@ -0,0 +1,15 @@ -+SNAPD_ENVIRONMENT_FILE := /etc/environment -+SNAP_MOUNTDIR := /snap -+BINDIR := /usr/bin -+LIBEXECDIR := /usr/lib -+ -+all: -+ # Generate the real systemd units out of the available templates -+ cat snapd.service.in | \ -+ sed s:@libexecdir@:${LIBEXECDIR}:g | \ -+ sed s:@SNAPD_ENVIRONMENT_FILE@:${SNAPD_ENVIRONMENT_FILE}:g > snapd.service -+ cat snapd.refresh.service.in | \ -+ sed s:@bindir@:${BINDIR}:g | \ -+ sed s:@SNAP_MOUNTDIR@:${SNAP_MOUNTDIR}:g > snapd.refresh.service -+ cat snapd.autoimport.service.in | \ -+ sed s:@bindir@:${BINDIR}:g > snapd.autoimport.service - -From 9d871a1e0dd16979367c2dcf9416e122dadd013e Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Tue, 28 Mar 2017 14:22:06 +0200 -Subject: [PATCH 3/6] data/systemd: make environment file non-mandatory - ---- - data/systemd/snapd.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/systemd/snapd.service.in b/data/systemd/snapd.service.in -index 009e62e..567fe87 100644 ---- a/data/systemd/snapd.service.in -+++ b/data/systemd/snapd.service.in -@@ -4,7 +4,7 @@ Requires=snapd.socket - - [Service] - ExecStart=@libexecdir@/snapd/snapd --EnvironmentFile=@SNAPD_ENVIRONMENT_FILE@ -+EnvironmentFile=-@SNAPD_ENVIRONMENT_FILE@ - Restart=always - - [Install] - -From 3e2a80a6c5649a2d43a89882cfe67bafc3454c64 Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Tue, 28 Mar 2017 14:27:21 +0200 -Subject: [PATCH 4/6] data/systemd: add install rule for all - systemd units - ---- - data/systemd/Makefile | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/data/systemd/Makefile b/data/systemd/Makefile -index d40b218..8516d81 100644 ---- a/data/systemd/Makefile -+++ b/data/systemd/Makefile -@@ -2,6 +2,7 @@ SNAPD_ENVIRONMENT_FILE := /etc/environment - SNAP_MOUNTDIR := /snap - BINDIR := /usr/bin - LIBEXECDIR := /usr/lib -+SYSTEMDSYSTEMUNITDIR := /lib/systemd/system - - all: - # Generate the real systemd units out of the available templates -@@ -13,3 +14,13 @@ all: - sed s:@SNAP_MOUNTDIR@:${SNAP_MOUNTDIR}:g > snapd.refresh.service - cat snapd.autoimport.service.in | \ - sed s:@bindir@:${BINDIR}:g > snapd.autoimport.service -+ -+install: -+ install -d ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 snapd.refresh.timer ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 snapd.refresh.service ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 snapd.autoimport.service ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 *.socket ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 snapd.service ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ install --mode=0644 snapd.system-shutdown.service ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -+ - - -From f63c7bbbd2d87eac2a01ca2a7e96ec41f12d5dbf Mon Sep 17 00:00:00 2001 -From: Simon Fels -Date: Wed, 29 Mar 2017 13:13:21 +0200 -Subject: [PATCH 6/6] data/systemd: add template for - snapd.system-shutdown.service too - ---- - .gitignore | 1 + - data/systemd/Makefile | 2 ++ - data/systemd/snapd.system-shutdown.service | 15 --------------- - data/systemd/snapd.system-shutdown.service.in | 15 +++++++++++++++ - 4 files changed, 18 insertions(+), 15 deletions(-) - delete mode 100644 data/systemd/snapd.system-shutdown.service - create mode 100644 data/systemd/snapd.system-shutdown.service.in - -diff --git a/.gitignore b/.gitignore -index 5b6919f..6749a86 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -34,6 +34,7 @@ cmd/*/*.[1-9] - data/systemd/snapd.autoimport.service - data/systemd/snapd.refresh.service - data/systemd/snapd.service -+data/systemd/snapd.system-shutdown.service - - # test-driver - *.log -diff --git a/data/systemd/Makefile b/data/systemd/Makefile -index 8516d81..325b7d0 100644 ---- a/data/systemd/Makefile -+++ b/data/systemd/Makefile -@@ -14,6 +14,8 @@ all: - sed s:@SNAP_MOUNTDIR@:${SNAP_MOUNTDIR}:g > snapd.refresh.service - cat snapd.autoimport.service.in | \ - sed s:@bindir@:${BINDIR}:g > snapd.autoimport.service -+ cat snapd.system-shutdown.service.in | \ -+ sed s:@libexecdir@:${LIBEXECDIR}:g > snapd.system-shutdown.service - - install: - install -d ${DESTDIR}/${SYSTEMDSYSTEMUNITDIR} -diff --git a/data/systemd/snapd.system-shutdown.service b/data/systemd/snapd.system-shutdown.service -deleted file mode 100644 -index add7113..0000000 ---- a/data/systemd/snapd.system-shutdown.service -+++ /dev/null -@@ -1,15 +0,0 @@ --[Unit] --Description=Ubuntu core (all-snaps) system shutdown helper setup service --Before=umount.target --DefaultDependencies=false --# don't run on classic --ConditionKernelCommandLine=snap_core --# don't run if system-shutdown isn't there --ConditionPathExists=/usr/lib/snapd/system-shutdown -- --[Service] --Type=oneshot --ExecStart=/bin/sh -euc 'mount /run -o remount,exec; mkdir -p /run/initramfs; cp /usr/lib/snapd/system-shutdown /run/initramfs/shutdown' -- --[Install] --WantedBy=final.target -diff --git a/data/systemd/snapd.system-shutdown.service.in b/data/systemd/snapd.system-shutdown.service.in -new file mode 100644 -index 0000000..1d9249c ---- /dev/null -+++ b/data/systemd/snapd.system-shutdown.service.in -@@ -0,0 +1,15 @@ -+[Unit] -+Description=Ubuntu core (all-snaps) system shutdown helper setup service -+Before=umount.target -+DefaultDependencies=false -+# don't run on classic -+ConditionKernelCommandLine=snap_core -+# don't run if system-shutdown isn't there -+ConditionPathExists=@libexecdir@/snapd/system-shutdown -+ -+[Service] -+Type=oneshot -+ExecStart=/bin/sh -euc 'mount /run -o remount,exec; mkdir -p /run/initramfs; cp @libexecdir@/snapd/system-shutdown /run/initramfs/shutdown' -+ -+[Install] -+WantedBy=final.target diff --git a/snapd.spec b/snapd.spec index 3b24a88..4582be0 100644 --- a/snapd.spec +++ b/snapd.spec @@ -37,8 +37,8 @@ %global snappy_svcs snapd.service snapd.socket snapd.autoimport.service snapd.refresh.timer snapd.refresh.service Name: snapd -Version: 2.23.6 -Release: 4%{?dist} +Version: 2.24 +Release: 1%{?dist} Summary: A transactional software package manager Group: System Environment/Base License: GPLv3 @@ -46,32 +46,11 @@ URL: https://%{provider_prefix} %if ! 0%{?with_bundled} Source0: https://%{provider_prefix}/archive/%{version}/%{name}-%{version}.tar.gz %else -Source0: https://%{provider_prefix}/releases/download/%{version}/%{name}_%{version}.tar.xz +Source0: https://%{provider_prefix}/releases/download/%{version}/%{name}_%{version}.vendor.orig.tar.xz %endif -# Upstream proposed PR (supersedes this patch): https://github.com/snapcore/snapd/pull/3039 -Patch0001: 0001-cmd-link-libcap-dynamically.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/2989 -Patch0002: 0002-cmd-remove-unused-variable.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/2989 -Patch0003: 0003-cmd-add-directive-for-shellcheck-and-follow-source.patch -# Upstream proposed PR: https://github.com/snapcore/snapd/pull/3108 -Patch0004: 0004-cmd-use-libtool-for-the-internal-library.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/2989 -Patch0006: 0006-errtracker-fix-testing-outside-of-ubuntu.patch -# Upstream proposed PR: https://github.com/snapcore/snapd/pull/3096 -Patch0007: 0007-osutil-HACK-use-usr-bin-true-false.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/3001 -Patch0008: 0008-partition-skip-some-tests-if-grub-editenv-is-not-ava.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/3081 -Patch0009: 0001-data-selinux-Add-context-definition-for-snapctl.patch -# Upstream merged: https://github.com/snapcore/snapd/pull/3094 -Patch0010: 0001-cmd-rework-header-check-for-xfs-xqm.patch -# No upstream status yet -Patch0011: 0001-cmd-snap-confine-hardcode-constants-from-xfs-xqm.h-f.patch - -# Upstream proposed PR: https://github.com/snapcore/snapd/pull/3084 -Patch1001: PR3084-packaging-use-templates-for-systemd-units.patch +# Upstream proposed PR: https://github.com/snapcore/snapd/pull/3162 +Patch0001: 0001-cmd-use-libtool-for-the-internal-library.patch %if 0%{?with_goarches} # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -90,6 +69,8 @@ Requires: snap-confine%{?_isa} = %{version}-%{release} Requires: squashfs-tools # we need squashfs.ko loaded Requires: kmod(squashfs.ko) +# bash-completion owns /usr/share/bash-completion/completions +Requires: bash-completion # Force the SELinux module to be installed Requires: %{name}-selinux = %{version}-%{release} @@ -344,6 +325,7 @@ export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} %gobuild -o bin/snap-exec %{import_path}/cmd/snap-exec %gobuild -o bin/snapctl %{import_path}/cmd/snapctl %gobuild -o bin/snapd %{import_path}/cmd/snapd +%gobuild -o bin/snap-update-ns %{import_path}/cmd/snap-update-ns # Build SELinux module pushd ./data/selinux @@ -367,7 +349,7 @@ popd # Build systemd units pushd ./data/systemd make BINDIR="%{_bindir}" LIBEXECDIR="%{_libexecdir}" \ - SNAP_MOUNTDIR="%{_sharedstatedir}/snapd/snap" \ + SNAP_MOUNT_DIR="%{_sharedstatedir}/snapd/snap" \ SNAPD_ENVIRONMENT_FILE="%{_sysconfdir}/sysconfig/snapd" popd @@ -393,6 +375,7 @@ install -p -m 0755 bin/snap %{buildroot}%{_bindir} install -p -m 0755 bin/snap-exec %{buildroot}%{_libexecdir}/snapd install -p -m 0755 bin/snapctl %{buildroot}%{_bindir}/snapctl install -p -m 0755 bin/snapd %{buildroot}%{_libexecdir}/snapd +install -p -m 0755 bin/snap-update-ns %{buildroot}%{_libexecdir}/snapd # Install SELinux module install -p -m 0644 data/selinux/snappy.if %{buildroot}%{_datadir}/selinux/devel/include/contrib @@ -401,6 +384,12 @@ install -p -m 0644 data/selinux/snappy.pp.bz2 %{buildroot}%{_datadir}/selinux/pa # Install snap(1) man page bin/snap help --man > %{buildroot}%{_mandir}/man1/snap.1 +# Install the "info" data file with snapd version +install -m 644 -D data/info %{buildroot}%{_libexecdir}/snapd/info + +# Install bash completion for "snap" +install -m 644 -D data/completion/snap %{buildroot}%{_datadir}/bash-completion/completions/snap + # Install snap-confine pushd ./cmd %make_install @@ -489,8 +478,9 @@ popd %dir %{_libexecdir}/snapd %{_libexecdir}/snapd/snapd %{_libexecdir}/snapd/snap-exec -%exclude %{_libexecdir}/snapd/system-shutdown +%{_libexecdir}/snapd/info %{_mandir}/man1/snap.1* +%{_datadir}/bash-completion/completions/snap %{_sysconfdir}/profile.d/snapd.sh %{_unitdir}/snapd.socket %{_unitdir}/snapd.service @@ -519,7 +509,6 @@ popd %{_libexecdir}/snapd/system-shutdown %{_mandir}/man5/snap-confine.5* %{_mandir}/man5/snap-discard-ns.5* -%{_mandir}/man5/snap-update-ns.5* %{_prefix}/lib/udev/snappy-app-dev %{_udevrulesdir}/80-snappy-assign.rules %attr(0000,root,root) %{_sharedstatedir}/snapd/void @@ -580,6 +569,11 @@ fi %changelog +* Tue Apr 11 2017 Neal Gompa - 2.24-1 +- Update to snapd 2.24 +- Drop merged patches +- Install snap bash completion and snapd info file + * Wed Apr 05 2017 Neal Gompa - 2.23.6-4 - Test if snapd socket and timer enabled and start them if enabled on install