Updated package to versin 1.8.5

3 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22a24b221b1b..2dfebddbdf73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ccs-tools
 	pkgdesc = TOMOYO Linux 1.8.x userspace tools
-	pkgver = 1.8.3.20140601
+	pkgver = 1.8.5
 	pkgrel = 1
 	url = http://tomoyo.sourceforge.jp/
 	install = ccs-tools.install
@@ -8,12 +8,12 @@ pkgbase = ccs-tools
 	license = GPL
 	depends = ncurses
 	conflicts = tomoyo-tools
-	source = http://sourceforge.jp/frs/redir.php?f=/tomoyo/49693/ccs-tools-1.8.3-20140601.tar.gz
+	source = http://sourceforge.jp/frs/redir.php?f=/tomoyo/49693/ccs-tools-1.8.5-20170102.tar.gz
 	source = ccs-auditd.service
 	source = tomoyo.logrotate
-	sha512sums = 3e4d3a0abaa2bebcad7388522bcd40a2979a6579ce271e2d61fc37c4a47f5b010ae730658c975c17c9917a28a5e1fb95361931ab757e9cd7c18d3cd8e55c7f29
-	sha512sums = 4052b12950027a45ae7b061fb8da20fd3abca567f38aa8aefb0f2b9b77decd3c14f7f543ced315e065ca885dee431dd424602434a84f07fbbf3c8d7100b26164
-	sha512sums = 8965822d88ce23eb6a0ed9f2be98cab703d3baa0235d31edb7ae053206f7a30a65ce737bb55570aabe6dd81ca5e2c3516e25078eea44fd8410417cedf00a0667
+	sha256sums = 06628d95debe97dd65d7412f9ab288d7368751056537cec0a08701db29c4443b
+	sha256sums = ea447aaaed7fdc9ed6b08d5c256237cd8f2ea74a6f157829613af5b3a3b18bfa
+	sha256sums = d88cdc21bb68a7e2abf0512f10dc56e57db7ca172e179d0fb50998ccf3caf648
 
 pkgname = ccs-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index aff70069d52a..eaee1e30afaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
-#! /bin/bash
+# Maintainer: Deon Spengler <deon at spengler dot co dot za>
 # Maintainer: jorge_barroso <jorge.barroso.11@gmail.com>
 
 pkgname=ccs-tools
-_basever=1.8.3
-_timestamp=20140601
-pkgver=${_basever}.${_timestamp}
+_timestamp=20170102
+pkgver=1.8.5
 pkgrel=1
 pkgdesc='TOMOYO Linux 1.8.x userspace tools'
 arch=('any')
@@ -13,13 +12,12 @@ license=('GPL')
 depends=('ncurses')
 conflicts=('tomoyo-tools')
 install=ccs-tools.install
-_url_ccs="http://sourceforge.jp/frs/redir.php?f=/tomoyo/49693"
-source=("${_url_ccs}/${pkgname}-${_basever}-${_timestamp}.tar.gz"
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/49693/${pkgname}-${pkgver}-${_timestamp}.tar.gz"
         "ccs-auditd.service"
         "tomoyo.logrotate")
-sha512sums=('3e4d3a0abaa2bebcad7388522bcd40a2979a6579ce271e2d61fc37c4a47f5b010ae730658c975c17c9917a28a5e1fb95361931ab757e9cd7c18d3cd8e55c7f29'
-            '4052b12950027a45ae7b061fb8da20fd3abca567f38aa8aefb0f2b9b77decd3c14f7f543ced315e065ca885dee431dd424602434a84f07fbbf3c8d7100b26164'
-            '8965822d88ce23eb6a0ed9f2be98cab703d3baa0235d31edb7ae053206f7a30a65ce737bb55570aabe6dd81ca5e2c3516e25078eea44fd8410417cedf00a0667')
+sha256sums=('06628d95debe97dd65d7412f9ab288d7368751056537cec0a08701db29c4443b'
+            'ea447aaaed7fdc9ed6b08d5c256237cd8f2ea74a6f157829613af5b3a3b18bfa'
+            'd88cdc21bb68a7e2abf0512f10dc56e57db7ca172e179d0fb50998ccf3caf648')
             
 build() {
   cd "${srcdir}/ccs-tools"
@@ -29,7 +27,7 @@ build() {
 package() {
   cd "${srcdir}/ccs-tools"
 
-  make INSTALLDIR="${pkgdir}" install
+  make INSTALLDIR="${pkgdir}" USRSBINDIR=/usr/bin SBINDIR=/usr/bin install
 
   # place example programs in /usr/share/ccs/examples
   install -m755 -d "${pkgdir}/usr/share/ccs/examples"
@@ -38,9 +36,9 @@ package() {
   done
 
   # install systemd service
-  install -m755 -d "${pkgdir}/lib/systemd/system"
+  install -m755 -d "${pkgdir}/usr/lib/systemd/system"
   install -m644 "${srcdir}/ccs-auditd.service" \
-	  "${pkgdir}/lib/systemd/system/ccs-auditd.service"
+	  "${pkgdir}/usr/lib/systemd/system/ccs-auditd.service"
 
   # install logrotate file
   install -m755 -d "${pkgdir}/etc/logrotate.d"
@@ -48,4 +46,4 @@ package() {
 
   # create log folder
   install -m700 -d "${pkgdir}/var/log/tomoyo"
-}
\ No newline at end of file
+}
diff --git a/ccs-auditd.service b/ccs-auditd.service
index 0bcb0bd1f3a7..1344d682a96a 100644
--- a/ccs-auditd.service
+++ b/ccs-auditd.service
@@ -3,8 +3,8 @@ Description=TOMOYO Linux Auditing Daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ccs-auditd
-ExecRestart=/bin/kill -HUP $MAINPID
+ExecStart=/usr/bin/ccs-auditd
+ExecRestart=/usr/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target