[arch-commits] Commit in snap-confine/trunk (PKGBUILD fix_CONFINEMENT_TESTS.patch)

[Timothy Redaelli]

    Date: Thursday, July 7, 2016 @ 08:40:49
  Author: tredaelli
Revision: 182451

upgpkg: snap-confine 1.0.35-1

Modified:
  snap-confine/trunk/PKGBUILD
Deleted:
  snap-confine/trunk/fix_CONFINEMENT_TESTS.patch

-----------------------------+
 PKGBUILD                    |   16 ++++------------
 fix_CONFINEMENT_TESTS.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-07 07:53:10 UTC (rev 182450)
+++ PKGBUILD	2016-07-07 08:40:49 UTC (rev 182451)
@@ -3,7 +3,7 @@
 # Contributor: Zygmunt Krynicki <me at zygoon dot pl>
 
 pkgname=snap-confine
-pkgver=1.0.34
+pkgver=1.0.35
 pkgrel=1
 pkgdesc="Confinement system for snap applications"
 arch=('i686' 'x86_64')
@@ -12,20 +12,12 @@
 depends=('bash' 'libseccomp' 'libsystemd')
 makedepends=('python-docutils' 'systemd')
 checkdepends=('indent' 'shellcheck')
-source=("https://github.com/snapcore/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
-        fix_CONFINEMENT_TESTS.patch)
-md5sums=('28e2264289fcc7e8a63d74940c0f057f'
-         '99b461650909139c33e5a24d4b51470b')
+source=("https://github.com/snapcore/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('d4e1f8e978d4ce07eb07f394174af185')
 
-prepare() {
+build() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/fix_CONFINEMENT_TESTS.patch"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  autoreconf -i
   # Confinement is disabled because arch doesn't yet have all the supporting
   # kernel patches. Rootfs is core snap is enabled because that is the
   # preferred way to create runtime environment for snaps. Nvidia support is

Deleted: fix_CONFINEMENT_TESTS.patch
===================================================================
--- fix_CONFINEMENT_TESTS.patch	2016-07-07 07:53:10 UTC (rev 182450)
+++ fix_CONFINEMENT_TESTS.patch	2016-07-07 08:40:49 UTC (rev 182451)
@@ -1,22 +0,0 @@
-From 09510d4cb594e3741ca056ea66144dba0d7a5147 Mon Sep 17 00:00:00 2001
-From: Timothy Redaelli <timothy.redaelli at gmail.com>
-Date: Fri, 1 Jul 2016 14:46:22 +0200
-Subject: [PATCH] Fix check for CONFINEMENT_TESTS
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fecd20c..c7572fc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -60,7 +60,7 @@ AM_CONDITIONAL([SECCOMP], [test "x$enable_seccomp" = "xyes"])
- 
- # Enable older tests only when confinement is enabled and we're building for PC
- # The tests are of smaller value as we port more and more tests to spread.
--AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && (test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686")])
-+AM_CONDITIONAL([CONFINEMENT_TESTS], [test "x$enable_apparmor" = "xyes" && test "x$enable_seccomp" = "xyes" && ((test "x$host_cpu" = "xx86_64" && test "x$build_cpu" = "xx86_64") || (test "x$host_cpu" = "xi686" && test "x$build_cpu" = "xi686"))])
- 
- # Check if seccomp userspace library is available
- AS_IF([test "x$enable_seccomp" = "xyes"], [