From 80ea5396e03d8341f90474285774cd3943e72f3e Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Fri, 10 May 2019 17:08:11 +0200 Subject: [PATCH] inspircd: update to 3.0.1 --- srcpkgs/inspircd/INSTALL.msg | 2 ++ srcpkgs/inspircd/files/inspircd/run | 4 +--- srcpkgs/inspircd/template | 35 +++++++++++++++++++---------- 3 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/inspircd/INSTALL.msg diff --git a/srcpkgs/inspircd/INSTALL.msg b/srcpkgs/inspircd/INSTALL.msg new file mode 100644 index 00000000000..8f2d589b175 --- /dev/null +++ b/srcpkgs/inspircd/INSTALL.msg @@ -0,0 +1,2 @@ +You need to create a configuration file before running inspircd. +Example configuration can be found at /etc/inspircd/examples/ diff --git a/srcpkgs/inspircd/files/inspircd/run b/srcpkgs/inspircd/files/inspircd/run index 8ee069257ca..a9b6b365f97 100644 --- a/srcpkgs/inspircd/files/inspircd/run +++ b/srcpkgs/inspircd/files/inspircd/run @@ -1,5 +1,3 @@ #!/bin/sh -install -d -m0755 -o inspircd -g inspircd /run/inspircd exec chpst -u inspircd inspircd \ - --nofork --config /etc/inspircd/inspircd.conf \ - --logfile /var/log/inspircd/ircd.log + --nofork --config /etc/inspircd/inspircd.conf diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 2bc171a276a..79cfa932e21 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,7 +1,7 @@ # Template file for 'inspircd' pkgname=inspircd -version=2.0.27 -revision=3 +version=3.0.1 +revision=1 build_style=gnu-makefile hostmakedepends="perl pkg-config" makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel" @@ -10,30 +10,41 @@ maintainer="Alexander Gehrke " license="GPL-2.0-only" homepage="http://www.inspircd.org/" distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz" -checksum=6bc1956bd6a7d2d463c646f1563c99cb507f2f214e51d6ac9c70906ac27aae73 +checksum=e8668da4c8a183e86a42e9a825311b8280687481f8dc14c49f188f97d1aceef0 -system_accounts="$pkgname" -make_dirs="/var/log/inspircd 0755 ${pkgname} ${pkgname}" +system_accounts="inspircd" +inspircd_homedir="/var/lib/inspircd" +make_dirs=" + /var/log/inspircd 0750 ${pkgname} ${pkgname} + /var/lib/inspircd 0750 ${pkgname} ${pkgname}" + +pre_configure() { + if [ "$CROSS_BUILD" ]; then + # configure script runs compiled executables to check for compiler features + vsed -i '/return 0 unless.*test_file(/d' make/configure.pm + fi +} do_configure() { - ./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp,m_geoip.cpp + ./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp ./configure \ --prefix=/usr \ --config-dir=/etc/inspircd \ --log-dir=/var/log/inspircd \ --data-dir=/var/lib/inspircd \ + --manual-dir=/usr/share/man/man1 \ --module-dir=/usr/lib/${pkgname}/modules \ --binary-dir=/usr/bin \ - --uid inspircd \ - --disable-interactive \ - --enable-openssl \ - --enable-gnutls \ - --enable-epoll - sed -i 's/-ldl/& -lm/' GNUmakefile + --distribution-label voidlinux-${revision} \ + --gid 0 \ + --uid 0 \ + --disable-interactive + vsed -i 's/-ldl/& -lm/' GNUmakefile } post_install() { vsv inspircd rm ${DESTDIR}/usr/${pkgname} rm ${DESTDIR}/usr/.gdbargs + rm ${DESTDIR}/usr/inspircd.service }