Kiwi IRC v0.9.4

2 files changed, 47 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b14c7371d55a..afdde9438f8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,23 @@
 # Maintainer: Jack Allnutt <jack@allnutt.eu>
 pkgname=kiwiirc
-pkgver=0.9.2
+pkgver=0.9.4
 pkgrel=1
 pkgdesc="A hand-crafted web-based IRC client that you can enjoy"
 arch=('any')
 url="https://kiwiirc.com/"
 license=('AGPL3')
-depends=('nodejs>=0.10.0', 'npm')
+depends=('nodejs>=4.0.0', 'npm')
 makedepends=('git')
 options=('emptydirs' '!strip')
-install=('kiwiirc.install')
+install='kiwiirc.install'
 backup=('etc/kiwiirc/config.js')
 source=(https://github.com/prawnsalad/KiwiIRC/archive/v$pkgver.tar.gz
     'kiwi.patch'
-    'kiwi.patch.2'
     'kiwiirc.service'
     'kiwiirc.conf.sysusers'
     'kiwiirc.conf.tmpfiles')
-md5sums=('d0c34961067b41da944fa0dae2db283d'
-         '88e6837254d192eb300a3974eeb5d588'
-         '7da1e40fdaa46d73f9deaecfeef26068'
+md5sums=('1a06e33088ca6ed89f857f7687470761'
+         '14a75cab7c10f2dd17856ab5a99d3bfc'
          'bcb28ddb7f0bcc3be830b8045969eb2c'
          '593da856bcf9036bc51380b74d9df394'
          '803080337de27be8921edd76f15c763c')
@@ -29,8 +27,7 @@ build() {
     cp kiwiirc.conf.sysusers "$srcdir/KiwiIRC-$pkgver/"
     cp kiwiirc.conf.tmpfiles "$srcdir/KiwiIRC-$pkgver/"
     cd "$srcdir/KiwiIRC-$pkgver"
-    patch -p1 -l < ../kiwi.patch
-    patch -p1 -l < ../kiwi.patch.2
+    git apply --whitespace=fix ../kiwi.patch
     npm -q install
     npm -q dedupe
 }
diff --git a/kiwi.patch b/kiwi.patch
index 41b02689f18d..7172544717ca 100644
--- a/kiwi.patch
+++ b/kiwi.patch
@@ -1,5 +1,18 @@
+ config.example.js                     | 6 +++---
+ kiwi                                  | 7 +------
+ server/helpers/launcher.js            | 9 ++++++++-
+ server_modules/client_file_watcher.js | 4 ++--
+ server_modules/control.js             | 4 ++--
+ server_modules/dnsbl.js               | 2 +-
+ server_modules/example.js             | 2 +-
+ server_modules/force_https.js         | 2 +-
+ server_modules/proxychecker.js        | 2 +-
+ server_modules/stats.js               | 2 +-
+ server_modules/web_agent_debugger.js  | 2 +-
+ 11 files changed, 21 insertions(+), 19 deletions(-)
+
 diff --git a/config.example.js b/config.example.js
-index f432409..1049700 100644
+index 452b13c..57ad499 100644
 --- a/config.example.js
 +++ b/config.example.js
 @@ -6,7 +6,7 @@ conf.group = "";
@@ -46,11 +59,36 @@ index ddcdfdf..dca2dcc 100755
  ret=$?
  
  exit $ret
+diff --git a/server/helpers/launcher.js b/server/helpers/launcher.js
+index d25a3a3..bff8623 100644
+--- a/server/helpers/launcher.js
++++ b/server/helpers/launcher.js
+@@ -1,5 +1,5 @@
+ var kiwi_app = '../kiwi.js';
+-var pidfile = '../../kiwiirc.pid';
++var pidfile = '/run/kiwiirc/kiwiirc.pid';
+ var pidfile_arg;
+ 
+ // Check if a pidfile has been set as an argument
+@@ -16,6 +16,13 @@ if (process.argv.indexOf('-p') > -1) {
+     }
+ }
+ 
++try {
++    process.setgid('kiwiirc');
++    process.setuid('kiwiirc');
++} catch (e) {
++    console.error('Cannot switch to user kiwiirc. Try running as root.')
++    process.exit();
++}
+ 
+ var daemon = require('daemonize2').setup({
+     main: kiwi_app,
 diff --git a/server_modules/client_file_watcher.js b/server_modules/client_file_watcher.js
-index 2c3a017..47ad093 100644
+index 2c3a017..d0601ae 100644
 --- a/server_modules/client_file_watcher.js
 +++ b/server_modules/client_file_watcher.js
-@@ -6,12 +6,12 @@
+@@ -6,7 +6,7 @@
  
  var fs = require('fs');
  var path = require('path');