Update to akari-1.0.36

4 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f89f5e42975..f0a73d3a7be6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = akari
 	pkgdesc = TOMOYO Linux 1.8.x Module for the Linux kernel
-	pkgver = 1.0.35
+	pkgver = 1.0.36
 	pkgrel = 1
-	url = http://akari.sourceforge.jp/
+	url = http://akari.osdn.jp/
 	install = akari.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = linux
-	makedepends = linux-headers>=4.9
-	makedepends = linux-headers<4.10
+	makedepends = linux-headers>=4.10
+	makedepends = linux-headers<4.11
 	optdepends = ccs-tools>=1.8.5
 	conflicts = ccs-tools<1.8.5
-	noextract = akari--20161229.tar.gz
-	source = http://sourceforge.jp/frs/redir.php?f=/akari/49272/akari-1.0.35-20161229.tar.gz
+	noextract = akari-1.0.36-20170417.tar.gz
+	source = http://osdn.jp/frs/redir.php?f=/akari/49272/akari-1.0.36-20170417.tar.gz
+	source = http://osdn.jp/frs/redir.php?f=/akari/49272/akari-1.0.36-20170417.tar.gz.asc
 	source = activation_trigger.patch
-	sha256sums = 57630f2a3c342ad60b2dce4ab4846ac6a1f03d4bc343185fe5796dcb12a83665
+	validpgpkeys = 43C83369623D7AD3A96C2FC7425F128D0C64F52A
+	sha256sums = 5cabe2b31a50cb6b49f0ea089d6ecb4384fa00afc53f8bf825c54caffc1dfe2c
+	sha256sums = SKIP
 	sha256sums = 55d86a0d602631129298887fa63c1396ed6c6229965efcdbdc549ee159a39702
 
 pkgname = akari
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7682df5b90a7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+# Ignore downloaded sources and keys
+*.xz
+*.tar
+*.tar.*
+*.sign
+
+# ignore src and pkg directories
+pkg/*
+src/*
diff --git a/PKGBUILD b/PKGBUILD
index c03175d4d586..90085a1141bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,35 @@
 # Maintainer: Deon Spengler <deon at spengler dot co dot za>
+# Contributor: FlyingWombat <alari128mm at gmail dot com>
 # Contributor: jorge_barroso <jorge.barroso.11 at gmail dot com>
 
 pkgname=akari
-pkgver=1.0.35
-_timestamp=20161229
-_extramodules=extramodules-4.9-ARCH
+pkgver=1.0.36
+_timestamp=20170417
+_extramodules=extramodules-4.10-ARCH
 _ccstoolsver=1.8.5
 pkgrel=1
 pkgdesc='TOMOYO Linux 1.8.x Module for the Linux kernel'
 arch=('i686' 'x86_64')
-url='http://akari.sourceforge.jp/'
+url='http://akari.osdn.jp/'
 license=('GPL')
-makedepends=('linux' 'linux-headers>=4.9' 'linux-headers<4.10')
+makedepends=('linux' 'linux-headers>=4.10' 'linux-headers<4.11')
 optdepends=("ccs-tools>=${_ccstoolsver}")
 conflicts=("ccs-tools<${_ccstoolsver}")
-install=akari.install
-source=(http://sourceforge.jp/frs/redir.php?f=/akari/49272/${pkgname}-${pkgver}-${_timestamp}.tar.gz
+install=${pkgname}.install
+source=("http://osdn.jp/frs/redir.php?f=/akari/49272/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
+        "http://osdn.jp/frs/redir.php?f=/akari/49272/${pkgname}-${pkgver}-${_timestamp}.tar.gz.asc"
         activation_trigger.patch)
-sha256sums=('57630f2a3c342ad60b2dce4ab4846ac6a1f03d4bc343185fe5796dcb12a83665'
+sha256sums=('5cabe2b31a50cb6b49f0ea089d6ecb4384fa00afc53f8bf825c54caffc1dfe2c'
+            'SKIP'
             '55d86a0d602631129298887fa63c1396ed6c6229965efcdbdc549ee159a39702')
-noextract=("${pkgname}-${_pkgver}-${_timestamp}.tar.gz")
+noextract=("${pkgname}-${pkgver}-${_timestamp}.tar.gz")
+validpgpkeys=('43C83369623D7AD3A96C2FC7425F128D0C64F52A')
 
 prepare() {
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
   cp -a "/usr/lib/modules/${_kernver}/build" "${srcdir}"
   cd "${srcdir}/build"
-  tar -xf "${srcdir}/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
+  tar -zxf "${srcdir}/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
   patch -p2 -i "${srcdir}/activation_trigger.patch"
 }
 
diff --git a/akari.install b/akari.install
index 99b3ea60bb8b..e75a3aa138e7 100644
--- a/akari.install
+++ b/akari.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.9-ARCH'
+    EXTRAMODULES='extramodules-4.10-ARCH'
     depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
     echo "In order to use akari module append \"init=/sbin/ccs-init\""
     echo "to the kernel boot options and reboot the system to activate"