diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -109,7 +109,10 @@ snap-seccomp:C_ACT_ALLOW snap-seccomp:C_ACT_ERRNO snap-seccomp:C_ACT_KILL +snap-seccomp:C_ACT_KILL_PROCESS +snap-seccomp:C_ACT_KILL_THREAD snap-seccomp:C_ACT_LOG +snap-seccomp:C_ACT_NOTIFY snap-seccomp:C_ACT_TRACE snap-seccomp:C_ACT_TRAP snap-seccomp:C_ARCH_AARCH64 @@ -122,9 +125,12 @@ snap-seccomp:C_ARCH_MIPSEL64 snap-seccomp:C_ARCH_MIPSEL64N32 snap-seccomp:C_ARCH_NATIVE +snap-seccomp:C_ARCH_PARISC +snap-seccomp:C_ARCH_PARISC64 snap-seccomp:C_ARCH_PPC snap-seccomp:C_ARCH_PPC64 snap-seccomp:C_ARCH_PPC64LE +snap-seccomp:C_ARCH_RISCV64 snap-seccomp:C_ARCH_S390 snap-seccomp:C_ARCH_S390X snap-seccomp:C_ARCH_X32 @@ -132,7 +138,9 @@ snap-seccomp:C_ARCH_X86_64 snap-seccomp:C_ATTRIBUTE_BADARCH snap-seccomp:C_ATTRIBUTE_DEFAULT +snap-seccomp:C_ATTRIBUTE_LOG snap-seccomp:C_ATTRIBUTE_NNP +snap-seccomp:C_ATTRIBUTE_SSB snap-seccomp:C_ATTRIBUTE_TSYNC snap-seccomp:C_CMP_EQ snap-seccomp:C_CMP_GE @@ -147,40 +155,14 @@ snap-seccomp:_IO_stdin_used snap-seccomp:__bss_start snap-seccomp:__data_start -snap-seccomp:_cgo_33abf05e8200_Cfunc__Cmalloc -snap-seccomp:_cgo_33abf05e8200_Cfunc_add_struct_arg_cmp -snap-seccomp:_cgo_33abf05e8200_Cfunc_free -snap-seccomp:_cgo_33abf05e8200_Cfunc_get_major_version -snap-seccomp:_cgo_33abf05e8200_Cfunc_get_micro_version -snap-seccomp:_cgo_33abf05e8200_Cfunc_get_minor_version -snap-seccomp:_cgo_33abf05e8200_Cfunc_make_arg_cmp_array -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_arch_add -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_arch_exist -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_arch_native -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_arch_remove -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_attr_get -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_attr_set -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_export_bpf -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_export_pfc -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_init -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_load -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_merge -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_release -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_reset -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_rule_add_array -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_rule_add_exact_array -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_syscall_priority -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_syscall_resolve_name -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_syscall_resolve_name_arch -snap-seccomp:_cgo_33abf05e8200_Cfunc_seccomp_syscall_resolve_num_arch snap-seccomp:_cgo_3c1cec0c9a4e_C2func_getaddrinfo snap-seccomp:_cgo_3c1cec0c9a4e_C2func_getnameinfo snap-seccomp:_cgo_3c1cec0c9a4e_Cfunc_freeaddrinfo snap-seccomp:_cgo_3c1cec0c9a4e_Cfunc_gai_strerror snap-seccomp:_cgo_3c1cec0c9a4e_Cfunc_getaddrinfo snap-seccomp:_cgo_3c1cec0c9a4e_Cfunc_getnameinfo -snap-seccomp:_cgo_6a0288d5cf0d_Cfunc_htot32 -snap-seccomp:_cgo_6a0288d5cf0d_Cfunc_htot64 +snap-seccomp:_cgo_a07edf69e47c_Cfunc_htot32 +snap-seccomp:_cgo_a07edf69e47c_Cfunc_htot64 snap-seccomp:_cgo_aacb17fbab05_Cfunc__Cmalloc snap-seccomp:_cgo_aacb17fbab05_Cfunc_free snap-seccomp:_cgo_aacb17fbab05_Cfunc_mygetgrgid_r @@ -190,6 +172,43 @@ snap-seccomp:_cgo_aacb17fbab05_Cfunc_mygetpwuid_r snap-seccomp:_cgo_aacb17fbab05_Cfunc_realloc snap-seccomp:_cgo_aacb17fbab05_Cfunc_sysconf +snap-seccomp:_cgo_e3b9c6931303_C2func_seccomp_notify_id_valid +snap-seccomp:_cgo_e3b9c6931303_C2func_seccomp_notify_receive +snap-seccomp:_cgo_e3b9c6931303_C2func_seccomp_notify_respond +snap-seccomp:_cgo_e3b9c6931303_Cfunc__Cmalloc +snap-seccomp:_cgo_e3b9c6931303_Cfunc_add_struct_arg_cmp +snap-seccomp:_cgo_e3b9c6931303_Cfunc_free +snap-seccomp:_cgo_e3b9c6931303_Cfunc_get_major_version +snap-seccomp:_cgo_e3b9c6931303_Cfunc_get_micro_version +snap-seccomp:_cgo_e3b9c6931303_Cfunc_get_minor_version +snap-seccomp:_cgo_e3b9c6931303_Cfunc_make_arg_cmp_array +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_api_get +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_api_set +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_arch_add +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_arch_exist +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_arch_native +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_arch_remove +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_attr_get +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_attr_set +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_export_bpf +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_export_pfc +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_init +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_load +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_merge +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_alloc +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_fd +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_free +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_id_valid +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_receive +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_notify_respond +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_release +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_reset +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_rule_add_array +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_rule_add_exact_array +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_syscall_priority +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_syscall_resolve_name +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_syscall_resolve_name_arch +snap-seccomp:_cgo_e3b9c6931303_Cfunc_seccomp_syscall_resolve_num_arch snap-seccomp:_cgo_get_context_function snap-seccomp:_cgo_libc_setegid snap-seccomp:_cgo_libc_seteuid diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -29,6 +29,7 @@ libc.so.6:closedir libc.so.6:dirfd libc.so.6:dirname +libc.so.6:dlclose libc.so.6:dlerror libc.so.6:dlopen libc.so.6:dlsym @@ -122,6 +123,7 @@ libc.so.6:regcomp libc.so.6:regexec libc.so.6:regfree +libc.so.6:rename libc.so.6:rmdir libc.so.6:secure_getenv libc.so.6:setegid @@ -176,6 +178,8 @@ libcap.so.2:cap_from_name libcap.so.2:cap_get_flag libcap.so.2:cap_get_proc +libseccomp.so.2:seccomp_api_get +libseccomp.so.2:seccomp_api_set libseccomp.so.2:seccomp_arch_add libseccomp.so.2:seccomp_arch_exist libseccomp.so.2:seccomp_arch_native @@ -187,6 +191,12 @@ libseccomp.so.2:seccomp_init libseccomp.so.2:seccomp_load libseccomp.so.2:seccomp_merge +libseccomp.so.2:seccomp_notify_alloc +libseccomp.so.2:seccomp_notify_fd +libseccomp.so.2:seccomp_notify_free +libseccomp.so.2:seccomp_notify_id_valid +libseccomp.so.2:seccomp_notify_receive +libseccomp.so.2:seccomp_notify_respond libseccomp.so.2:seccomp_release libseccomp.so.2:seccomp_reset libseccomp.so.2:seccomp_rule_add_array diff --git a/files/0001-Add-lib64-to-expected-paths-for-snapd-confine.patch b/files/0001-Add-lib64-to-expected-paths-for-snapd-confine.patch new file mode 100644 --- /dev/null +++ b/files/0001-Add-lib64-to-expected-paths-for-snapd-confine.patch @@ -0,0 +1,39 @@ +From c3d6dd869b4a5a93cbf5d455ab57076c2102c9e2 Mon Sep 17 00:00:00 2001 +From: Joey Riches +Date: Sat, 7 May 2022 11:44:45 +0100 +Subject: [PATCH 1/1] Add lib64 to expected paths for snapd-confine + +?????????????????????? +--- + cmd/libsnap-confine-private/utils-test.c | 1 + + cmd/libsnap-confine-private/utils.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmd/libsnap-confine-private/utils-test.c b/cmd/libsnap-confine-private/utils-test.c +index 2440d722a7..ea9a60d6f4 100644 +--- a/cmd/libsnap-confine-private/utils-test.c ++++ b/cmd/libsnap-confine-private/utils-test.c +@@ -88,6 +88,7 @@ static void test_sc_is_expected_path(void) + {"/snap/cꓳre/1/usr/lib/snapd/snap-confine", false}, + {"/snap/snapd1/1/usr/lib/snapd/snap-confine", false}, + {"/snap/core/current/usr/lib/snapd/snap-confine", false}, ++ {"/usr/lib64/snapd/snap-confine", true}, + {"/usr/lib/snapd/snap-confine", true}, + {"/usr/libexec/snapd/snap-confine", true}, + {"/snap/core/1/usr/lib/snapd/snap-confine", true}, +diff --git a/cmd/libsnap-confine-private/utils.c b/cmd/libsnap-confine-private/utils.c +index 635538a3da..723e684519 100644 +--- a/cmd/libsnap-confine-private/utils.c ++++ b/cmd/libsnap-confine-private/utils.c +@@ -242,7 +242,7 @@ int sc_nonfatal_mkpath(const char *const path, mode_t mode) + bool sc_is_expected_path(const char *path) + { + const char *expected_path_re = +- "^(/snap/(snapd|core)/x?[0-9]+/usr/lib|/usr/lib(exec)?)/snapd/snap-confine$"; ++ "^(/snap/(snapd|core)/x?[0-9]+/usr/lib|/usr/lib64|/usr/lib(exec)?)/snapd/snap-confine$"; + regex_t re; + if (regcomp(&re, expected_path_re, REG_EXTENDED | REG_NOSUB) != 0) + die("can not compile regex %s", expected_path_re); +-- +2.35.3 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : snapd -version : 2.53.4 +version : 2.55.4 homepage : https://snapcraft.io/ -release : 67 +release : 68 source : - - https://github.com/snapcore/snapd/releases/download/2.53.4/snapd_2.53.4.vendor.tar.xz : 5bdb45a27f29eefa0ec2da13643107fa9c52a6a4ea93c2b597b9edbc79ddbe67 + - https://github.com/snapcore/snapd/releases/download/2.55.4/snapd_2.55.4.vendor.tar.xz : c76cdd744fe58bd335b379d243197e8b087d49ed2780749d4007a4bce4679227 license : GPL-3.0-only component : desktop.util summary : The snapd and snap tools enable systems to work with .snap files @@ -45,8 +45,7 @@ %patch -p1 < $pkgfiles/0001-Force-usage-of-sudo-over-runuser-on-Solus.patch %patch -p1 < $pkgfiles/0002-Support-avx2-library-paths.patch - - # Temporarily disable apparmor due to numerous issues. See T9638 + %patch -p1 < $pkgfiles/0001-Add-lib64-to-expected-paths-for-snapd-confine.patch pushd cmd %reconfigure \ @@ -68,10 +67,10 @@ # Golang binaries for snap_bin in ${bincommands[@]} ; do - install -m755 bin/$snap_bin $installdir/usr/bin/. + install -m00755 bin/$snap_bin $installdir/usr/bin/. done for snap_lib in ${dcommands[@]} ; do - install -m755 bin/$snap_lib $installdir/%libdir%/$package/. + install -m00755 bin/$snap_lib $installdir/%libdir%/$package/. done # snapctl is run from inside the snap ln -s /%libdir%/$package/snapctl $installdir/usr/bin/snapctl @@ -102,6 +101,11 @@ install -Dm00644 data/completion/bash/etelpmoc.sh $installdir/%libdir%/snapd/etelpmoc.sh install -Dm00644 data/completion/zsh/_snap $installdir/usr/share/zsh/site-functions/_snap + # Sort out fish completions (unsure why this is automatic and bash/zsh are not) + install -dm00755 $installdir/usr/share/fish/vendor_completions.d/ + mv $installdir/usr/share/fish/vendor_conf.d/snapd.fish $installdir/usr/share/fish/vendor_completions.d/snapd.fish + rmdir $installdir/usr/share/fish/vendor_conf.d/ + # remove unneeded stuff rm -rf $installdir/var rm -rf $installdir/usr/bin/ubuntu-core-launcher 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 @@ snapd https://snapcraft.io/ - F. von Gellhorn - flinux@vongellhorn.ch + Joey Riches + josephriches@gmail.com GPL-3.0-only desktop.util @@ -66,6 +66,7 @@ /usr/share/dbus-1/session.d/snapd.session-services.conf /usr/share/dbus-1/system.d/snapd.system-services.conf /usr/share/defaults/etc/profile.d/70-snapd.sh + /usr/share/fish/vendor_completions.d/snapd.fish /usr/share/man/man8/snap-confine.8 /usr/share/man/man8/snap-discard-ns.8 /usr/share/man/man8/snapd-env-generator.8 @@ -75,12 +76,12 @@ - - 2022-03-26 - 2.53.4 + + 2022-05-07 + 2.55.4 Packaging update - F. von Gellhorn - flinux@vongellhorn.ch + Joey Riches + josephriches@gmail.com \ No newline at end of file