inspircd update pkgbuild

3 files changed, 6 insertions, 62 deletions

diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD
index 3de3d5e57..497f836d1 100644
--- a/pcr/inspircd/PKGBUILD
+++ b/pcr/inspircd/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=inspircd
-pkgver=2.0.8
-pkgrel=2
+pkgver=2.0.18
+pkgrel=1
 pkgdesc='A lightweight IRC daemon'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.inspircd.org/'
@@ -20,10 +20,9 @@ optdepends=('gnutls: m_ssl_gnutls'
             'tre: m_regex_tre')
 install=inspircd.install
 
-source=(https://github.com/downloads/inspircd/inspircd/InspIRCd-$pkgver.tar.bz2
-        inspircd.rcd inspircd.service)
-sha1sums=('c8bcbc222df40bc8110cefdb4a1fee91ad7c73d1'
-          '59c4aa6929732fb076ca2be96a01385cae9e8484'
+source=(https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz
+        inspircd.service)
+sha1sums=('40039d9be51ad28493be16b27c9f20bc7fe617a4'
           '667b28d0d086be6daad7a0c2f110c68e6526264e')
 
 build() {
@@ -53,7 +52,6 @@ build() {
 }
 
 package() {
-  install -Dm755 "${srcdir}"/inspircd.rcd "${pkgdir}"/etc/rc.d/inspircd
   install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service
   install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd"
 
diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install
index ec97113f5..2d1ce16f4 100644
--- a/pcr/inspircd/inspircd.install
+++ b/pcr/inspircd/inspircd.install
@@ -5,7 +5,7 @@ post_install() {
   echo '==> You will need to create a config file for inspircd'
   echo '==>   cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf'
   echo '==> You will need to change the pidfile. To do this you can insert the following into your config.'
-  echo '==>   <pid file="/var/run/inspircd/inspircd.pid">'
+  echo '==>   <pid file="/run/inspircd/inspircd.pid">'
   echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.'
 }
 
diff --git a/pcr/inspircd/inspircd.rcd b/pcr/inspircd/inspircd.rcd
deleted file mode 100644
index 5dbd8198e..000000000
--- a/pcr/inspircd/inspircd.rcd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  pidof /usr/sbin/inspircd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting inspircd"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      su -s /bin/sh -c '/usr/sbin/inspircd --logfile /var/log/inspircd/startup.log --config /etc/inspircd/inspircd.conf' 'inspircd' > /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon inspircd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping inspircd"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inspircd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-
-  rehash|reload)
-    kill -HUP $(get_pid)
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0