pcr/inspircd: updated to 2.0.24

3 files changed, 46 insertions, 33 deletions

diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD
index d40efea85..67c807774 100644
--- a/pcr/inspircd/PKGBUILD
+++ b/pcr/inspircd/PKGBUILD
@@ -1,49 +1,56 @@
-pkgname=inspircd
-pkgver=2.0.18
-pkgrel=1
-pkgdesc='A lightweight IRC daemon'
-arch=('x86_64' 'i686')
+# Maintainer (AUR): Maxime Poulin <maxpoulin64@gmail.com>
+# Contributor (AUR): Damian Nowak <damian.nowak@atlashost.eu>
+# Contributor (AUR): Kyle Fuller <inbox@kylefuller.co.uk>
+# Contributor (AUR): jibi <jibi@paranoici.org>
+
+# parabola changes and rationale:
+#  - fixed arch array
+#  - removed redundant conflicts and provides
+
+pkgname='inspircd'
+pkgver='2.0.24'
+pkgrel='1'
+pkgdesc='A stable, modern and lightweight IRC daemon'
+arch=('x86_64' 'i686' 'armv7h')
 url='http://www.inspircd.org/'
 license=('GPL2')
 depends=('perl')
-makedepends=('pkg-config' 'libmysqlclient' 'postgresql' 'sqlite3' 'libldap' 'geoip'
-             'tre' 'gnutls' 'openssl' 'libgcrypt')
+makedepends=('pkg-config' 'libmariadbclient' 'sqlite3' 'libldap' 'geoip'
+             'gnutls' 'openssl' 'libgcrypt')
 optdepends=('gnutls: m_ssl_gnutls'
             'libgcrypt: m_ssl_gnutls'
             'openssl: m_ssl_openssl'
-            'libmysqlclient: m_mysql'
+            'libmariadbclient: m_mysql'
             'pcre: m_regex_pcre'
-            'postgresql: m_pgsql'
             'sqlite3: m_sqlite3'
             'libldap: m_ldapoper and m_ldapauth'
-            'geoip: m_geoip'
-            'tre: m_regex_tre')
-install=inspircd.install
-
-source=(https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz
-        inspircd.service)
-sha1sums=('40039d9be51ad28493be16b27c9f20bc7fe617a4'
-          '667b28d0d086be6daad7a0c2f110c68e6526264e')
+            'geoip: m_geoip')
+install='inspircd.install'
+source=("https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz"
+        'inspircd.service')
+sha512sums=('766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a'
+            '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832')
 
 build() {
-  cd "${srcdir}/inspircd"
+  cd "${srcdir}/inspircd-${pkgver}"
 
   ./configure \
     --enable-extras=m_geoip.cpp \
     --enable-extras=m_ldapauth.cpp \
     --enable-extras=m_ldapoper.cpp \
     --enable-extras=m_mysql.cpp \
-    --enable-extras=m_pgsql.cpp \
     --enable-extras=m_regex_pcre.cpp \
     --enable-extras=m_regex_posix.cpp \
-    --enable-extras=m_regex_tre.cpp \
     --enable-extras=m_sqlite3.cpp
 
   ./configure \
+    --uid=0 \
     --prefix=/usr/lib/inspircd \
-    --binary-dir=/usr/sbin \
+    --binary-dir=/usr/bin \
     --module-dir=/usr/lib/inspircd/modules \
     --config-dir=/etc/inspircd \
+    --data-dir=/var/lib/inspircd \
+    --log-dir=/var/log/inspircd \
     --enable-gnutls \
     --enable-openssl \
     --enable-epoll
@@ -53,10 +60,10 @@ build() {
 
 package() {
   install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service
-  install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd"
+  install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd" "${pkgdir}/var/lib/inspircd"
 
-  cd "${srcdir}/inspircd"
-  make DESTDIR="$pkgdir" INSTUID=141 install
+  cd "${srcdir}/inspircd-${pkgver}"
+  make DESTDIR="$pkgdir" install
 
   mkdir -p "${pkgdir}"/usr/share/inspircd
   mv "${pkgdir}"/etc/inspircd/examples "${pkgdir}"/usr/share/inspircd/examples
diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install
index 2d1ce16f4..997f72dcd 100644
--- a/pcr/inspircd/inspircd.install
+++ b/pcr/inspircd/inspircd.install
@@ -1,15 +1,21 @@
-post_install() {
+create_user() {
   getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null
-  getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false -c inspircd inspircd >/dev/null
+  getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false inspircd >/dev/null
+}
 
+post_install() {
+  create_user
   echo '==> You will need to create a config file for inspircd'
-  echo '==>   cp /etc/inspircd/inspircd.conf.example /etc/inspircd/inspircd.conf'
+  echo '==>   cp /usr/share/inspircd/examples/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="/run/inspircd/inspircd.pid">'
+  echo '==>   <pid file="/var/lib/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.'
 }
 
+post_upgrade() {
+  create_user
+}
+
 post_remove() {
-  getent passwd inspircd &>/dev/null && userdel inspircd >/dev/null
-  getent group inspircd &>/dev/null && groupdel inspircd >/dev/null
+  getent passwd inspircd &>/dev/null && userdel inspircd
 }
diff --git a/pcr/inspircd/inspircd.service b/pcr/inspircd/inspircd.service
index 83230b65c..746112986 100644
--- a/pcr/inspircd/inspircd.service
+++ b/pcr/inspircd/inspircd.service
@@ -9,9 +9,9 @@ PIDFile=/var/lib/inspircd/inspircd.pid
 ExecStart=/usr/lib/inspircd/inspircd start
 ExecReload=/usr/lib/inspircd/inspircd rehash
 ExecStop=/usr/lib/inspircd/inspircd stop
-Restart=on-failure
+Restart=always
 User=inspircd
 Group=inspircd
- 
+
 [Install]
-Alias=ircd.service
+WantedBy=multi-user.target