diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch | 147 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 8 insertions, 161 deletions
@@ -1,7 +1,7 @@ pkgbase = snapd pkgdesc = Service and tools for management of snap packages. - pkgver = 2.32.6 - pkgrel = 2 + pkgver = 2.32.7 + pkgrel = 1 url = https://github.com/snapcore/snapd install = snapd.install arch = x86_64 @@ -21,10 +21,8 @@ pkgbase = snapd conflicts = snap-confine options = !strip options = emptydirs - source = snapd-2.32.6.tar.gz::https://github.com/snapcore/snapd/archive/2.32.6.tar.gz - source = 0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch - sha256sums = 6bc2b4c2005713cdff711c2ddb937289b95e8459091f0eb9cda9f177e81181e7 - sha256sums = df09d7a85da832781eb32acf9dafc3a41a78d3419666b0727db2921f0d93a81b + source = snapd-2.32.7.tar.gz::https://github.com/snapcore/snapd/archive/2.32.7.tar.gz + sha256sums = 672652d67fd28f388985b981c6e2fa89f32be264768b55f0ee4b79333792a0fc pkgname = snapd diff --git a/0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch b/0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch deleted file mode 100644 index b86e131f8d2a..000000000000 --- a/0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch +++ /dev/null @@ -1,147 +0,0 @@ -From cfc627366caf52f72c943bab9cf3d7cdbace108a Mon Sep 17 00:00:00 2001 -Message-Id: <cfc627366caf52f72c943bab9cf3d7cdbace108a.1525764131.git.maciej.zenon.borzecki@canonical.com> -From: Zygmunt Krynicki <me@zygoon.pl> -Date: Tue, 8 May 2018 07:17:46 +0200 -Subject: [PATCH] cmd/libsnap: fix compile error on more restrictive gcc - (#5138) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* cmd/libsnap: fix compilation errors on gcc 8.x - -snap-confine/ns-support-test.c: In function ‘sc_test_use_fake_ns_dir’: -snap-confine/ns-support-test.c:56:24: error: cast between incompatible function types from ‘int (*)(const char *)’ to ‘void (*)(void *)’ [-Werror=cast-funct -ion-type] - g_test_queue_destroy((GDestroyNotify) unsetenv, - ^ - -libsnap-confine-private/utils-test.c: In function ‘_test_sc_nonfatal_mkpath’: -libsnap-confine-private/utils-test.c:143:23: error: cast between incompatible function types from ‘int (*)(const char *)’ to ‘void (*)(void *)’ [-Werror=cas -t-function-type] - g_test_queue_destroy((GDestroyNotify) rmdir, (char *)dirname); - ^ -libsnap-confine-private/utils-test.c:156:23: error: cast between incompatible function types from ‘int (*)(const char *)’ to ‘void (*)(void *)’ [-Werror=cas -t-function-type] - g_test_queue_destroy((GDestroyNotify) rmdir, (char *)subdirname); - -Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com> -Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com> ---- - cmd/libsnap-confine-private/locking-test.c | 8 +++++++- - cmd/libsnap-confine-private/utils-test.c | 24 ++++++++++++++++++---- - cmd/snap-confine/ns-support-test.c | 8 +++++++- - 3 files changed, 34 insertions(+), 6 deletions(-) - -diff --git a/cmd/libsnap-confine-private/locking-test.c b/cmd/libsnap-confine-private/locking-test.c -index 28dd1e72e335e26c8a54a3f3373cfb2ea3b5e0d2..3f819349ce20ed11e41975c404f76e498ca6ec96 100644 ---- a/cmd/libsnap-confine-private/locking-test.c -+++ b/cmd/libsnap-confine-private/locking-test.c -@@ -32,6 +32,12 @@ static void sc_set_lock_dir(const char *dir) - sc_lock_dir = dir; - } - -+// A variant of unsetenv that is compatible with GDestroyNotify -+static void my_unsetenv(const char *k) -+{ -+ unsetenv(k); -+} -+ - // Use temporary directory for locking. - // - // The directory is automatically reset to the real value at the end of the -@@ -50,7 +56,7 @@ static const char *sc_test_use_fake_lock_dir(void) - g_test_queue_free(lock_dir); - g_assert_cmpint(setenv("SNAP_CONFINE_LOCK_DIR", lock_dir, 0), - ==, 0); -- g_test_queue_destroy((GDestroyNotify) unsetenv, -+ g_test_queue_destroy((GDestroyNotify) my_unsetenv, - "SNAP_CONFINE_LOCK_DIR"); - g_test_queue_destroy((GDestroyNotify) rm_rf_tmp, lock_dir); - } -diff --git a/cmd/libsnap-confine-private/utils-test.c b/cmd/libsnap-confine-private/utils-test.c -index e878260622c89fc61160b749e47d9e7fc3fbc08d..83364801e9b26505c11d42317d56fe102cf31c67 100644 ---- a/cmd/libsnap-confine-private/utils-test.c -+++ b/cmd/libsnap-confine-private/utils-test.c -@@ -99,6 +99,22 @@ static void test_die_with_errno(void) - g_test_trap_assert_stderr("death message: Operation not permitted\n"); - } - -+// A variant of rmdir that is compatible with GDestroyNotify -+static void my_rmdir(const char *path) -+{ -+ if (rmdir(path) != 0) { -+ die("cannot rmdir %s", path); -+ } -+} -+ -+// A variant of chdir that is compatible with GDestroyNotify -+static void my_chdir(const char *path) -+{ -+ if (chdir(path) != 0) { -+ die("cannot change dir to %s", path); -+ } -+} -+ - /** - * Perform the rest of testing in a ephemeral directory. - * -@@ -114,9 +130,9 @@ static void g_test_in_ephemeral_dir(void) - g_assert_cmpint(err, ==, 0); - - g_test_queue_free(temp_dir); -- g_test_queue_destroy((GDestroyNotify) rmdir, temp_dir); -+ g_test_queue_destroy((GDestroyNotify) my_rmdir, temp_dir); - g_test_queue_free(orig_dir); -- g_test_queue_destroy((GDestroyNotify) chdir, orig_dir); -+ g_test_queue_destroy((GDestroyNotify) my_chdir, orig_dir); - } - - /** -@@ -130,7 +146,7 @@ static void _test_sc_nonfatal_mkpath(const gchar * dirname, - G_FILE_TEST_IS_DIR)); - // Use sc_nonfatal_mkpath to create the directory and ensure that it worked - // as expected. -- g_test_queue_destroy((GDestroyNotify) rmdir, (char *)dirname); -+ g_test_queue_destroy((GDestroyNotify) my_rmdir, (char *)dirname); - int err = sc_nonfatal_mkpath(dirname, 0755); - g_assert_cmpint(err, ==, 0); - g_assert_cmpint(errno, ==, 0); -@@ -143,7 +159,7 @@ static void _test_sc_nonfatal_mkpath(const gchar * dirname, - g_assert_cmpint(errno, ==, EEXIST); - // Now create a sub-directory of the original directory and observe the - // results. We should no longer see errno of EEXIST! -- g_test_queue_destroy((GDestroyNotify) rmdir, (char *)subdirname); -+ g_test_queue_destroy((GDestroyNotify) my_rmdir, (char *)subdirname); - err = sc_nonfatal_mkpath(subdirname, 0755); - g_assert_cmpint(err, ==, 0); - g_assert_cmpint(errno, ==, 0); -diff --git a/cmd/snap-confine/ns-support-test.c b/cmd/snap-confine/ns-support-test.c -index 542136cfb4a308abbe9898ec06c2bb913bdff00d..c67c69be7c76537866f7dbffbcf499d5aa68a4ae 100644 ---- a/cmd/snap-confine/ns-support-test.c -+++ b/cmd/snap-confine/ns-support-test.c -@@ -35,6 +35,12 @@ static void sc_set_ns_dir(const char *dir) - sc_ns_dir = dir; - } - -+// A variant of unsetenv that is compatible with GDestroyNotify -+static void my_unsetenv(const char *k) -+{ -+ unsetenv(k); -+} -+ - // Use temporary directory for namespace groups. - // - // The directory is automatically reset to the real value at the end of the -@@ -53,7 +59,7 @@ static const char *sc_test_use_fake_ns_dir(void) - g_test_queue_free(ns_dir); - g_assert_cmpint(setenv("SNAP_CONFINE_NS_DIR", ns_dir, 0), ==, - 0); -- g_test_queue_destroy((GDestroyNotify) unsetenv, -+ g_test_queue_destroy((GDestroyNotify) my_unsetenv, - "SNAP_CONFINE_NS_DIR"); - g_test_queue_destroy((GDestroyNotify) rm_rf_tmp, ns_dir); - } --- -2.17.0 - @@ -7,8 +7,8 @@ pkgname=snapd pkgdesc="Service and tools for management of snap packages." depends=('squashfs-tools' 'libseccomp' 'libsystemd') optdepends=('bash-completion: bash completion support') -pkgver=2.32.6 -pkgrel=2 +pkgver=2.32.7 +pkgrel=1 arch=('x86_64') url="https://github.com/snapcore/snapd" license=('GPL3') @@ -16,10 +16,8 @@ makedepends=('git' 'go' 'go-tools' 'libseccomp' 'libcap' 'systemd' 'xfsprogs' 'p conflicts=('snap-confine') options=('!strip' 'emptydirs') install=snapd.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/snapcore/${pkgname}/archive/$pkgver.tar.gz" - "0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch") -sha256sums=('6bc2b4c2005713cdff711c2ddb937289b95e8459091f0eb9cda9f177e81181e7' - 'df09d7a85da832781eb32acf9dafc3a41a78d3419666b0727db2921f0d93a81b') +source=("$pkgname-$pkgver.tar.gz::https://github.com/snapcore/${pkgname}/archive/$pkgver.tar.gz") +sha256sums=('672652d67fd28f388985b981c6e2fa89f32be264768b55f0ee4b79333792a0fc') _gourl=github.com/snapcore/snapd @@ -34,8 +32,6 @@ prepare() { # above describes. mkdir -p "$(dirname "$GOPATH/src/${_gourl}")" ln --no-target-directory -fs "$srcdir/$pkgname-$pkgver" "$GOPATH/src/${_gourl}" - - patch -Np1 -i "${srcdir}/0001-cmd-libsnap-fix-compile-error-on-more-restrictive-gc.patch" } build() { |