summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatol Pomozov2018-05-17 11:12:20 -0700
committerAnatol Pomozov2018-05-17 11:12:20 -0700
commitde53b1a5a4e050c9af1ade19ca756f924d9e8e42 (patch)
tree70a6853dd297cddfd91299f8e4bec837e72ee608
parentb0852aad876cda12171ba9d8eccbaba6e3fcacaf (diff)
downloadaur-de53b1a5a4e050c9af1ade19ca756f924d9e8e42.tar.gz
updpkg
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD22
-rw-r--r--donotredefine_signals.patch16
3 files changed, 32 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 460ae00d0530..c7883fc02807 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
pkgbase = minijail
pkgdesc = Tool to run a process in jailed environment
- pkgver = R41.6680
+ pkgver = 55.8872
pkgrel = 1
- url = https://chromium.googlesource.com/chromiumos/platform/minijail
- arch = i686
+ url = https://chromium.googlesource.com/aosp/platform/external/minijail
arch = x86_64
license = custom:chromiumos
depends = libcap
- source = https://chromium.googlesource.com/chromiumos/platform2/+archive/refs/heads/release-R41-6680.B.tar.gz
- sha1sums = SKIP
+ source = https://chromium.googlesource.com/aosp/platform/external/minijail/+archive/refs/heads/release-R55-8872.B.tar.gz
+ source = donotredefine_signals.patch
+ sha1sums = f0d7efaba4e7f096a68638f97603ee11191a83da
+ sha1sums = 83115d9e67cfbf47c964b89c84381fab54689b37
pkgname = minijail
diff --git a/PKGBUILD b/PKGBUILD
index 1a450338adeb..2b1961eae395 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,37 @@
pkgname=minijail
pkgdesc='Tool to run a process in jailed environment'
-pkgver=R41.6680
-_tag=release-${pkgver/\./-}.B
+pkgver=55.8872
+_tag=release-R${pkgver/\./-}.B
pkgrel=1
-arch=(i686 x86_64)
-url='https://chromium.googlesource.com/chromiumos/platform/minijail'
+arch=(x86_64)
+url='https://chromium.googlesource.com/aosp/platform/external/minijail'
license=('custom:chromiumos')
depends=(libcap)
-source=(https://chromium.googlesource.com/chromiumos/platform2/+archive/refs/heads/$_tag.tar.gz)
-sha1sums=('SKIP')
+source=(https://chromium.googlesource.com/aosp/platform/external/minijail/+archive/refs/heads/$_tag.tar.gz
+ donotredefine_signals.patch)
+sha1sums=('f0d7efaba4e7f096a68638f97603ee11191a83da'
+ '83115d9e67cfbf47c964b89c84381fab54689b37')
prepare() {
- cd minijail
- sed 's/-Werror//' -i common.mk
+ patch -p1 < donotredefine_signals.patch
}
build() {
- cd minijail
CC=gcc make
}
check() {
- cd minijail
CC=gcc make tests
for t in `ls *_unittest`; do ./$t; done
}
package() {
- cd minijail
install -m755 -D minijail0 "$pkgdir"/usr/bin/minijail0
install -m755 -D libminijail.so "$pkgdir"/usr/lib/libminijail.so
install -m755 -D libminijailpreload.so "$pkgdir"/usr/lib/libminijailpreload.so
install -m644 -D libminijail.h "$pkgdir"/usr/include/libminijail.h
install -m644 -D minijail0.1 "$pkgdir"/usr/share/man/man1/minijail0.1
install -m644 -D minijail0.5 "$pkgdir"/usr/share/man/man5/minijail0.5
- install -m644 -D ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ install -m644 -D NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
}
diff --git a/donotredefine_signals.patch b/donotredefine_signals.patch
new file mode 100644
index 000000000000..66e5a2810a09
--- /dev/null
+++ b/donotredefine_signals.patch
@@ -0,0 +1,16 @@
+diff --git a/signal_handler.c b/signal_handler.c
+index 5a5ae9c..083d8df 100644
+--- a/signal_handler.c
++++ b/signal_handler.c
+@@ -8,11 +8,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
+-#include <asm/siginfo.h>
+-#define __have_siginfo_t 1
+-#define __have_sigval_t 1
+-#define __have_sigevent_t 1
+-
+ #include <signal.h>
+ #include <string.h>
+