commit: c11396cd1a98485402ef4575075ec268b41cf5c5 parent: 667820fa39af17ee64e040d489ccbbaa836f5198 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sat, 19 Jan 2019 00:52:01 +0100 net-irc/inspircd: Import from ::gentooDiffstat:
| A | net-irc/inspircd/Manifest | 1 | + |
| A | net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch | 257 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | net-irc/inspircd/files/inspircd.confd | 33 | +++++++++++++++++++++++++++++++++ |
| A | net-irc/inspircd/files/inspircd.initd | 48 | ++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | net-irc/inspircd/inspircd-2.0.27.ebuild | 118 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | net-irc/inspircd/metadata.xml | 34 | ++++++++++++++++++++++++++++++++++ |
6 files changed, 491 insertions(+), 0 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest @@ -0,0 +1 @@ +DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd diff --git a/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch @@ -0,0 +1,257 @@ +diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example +index d54cdc916..ee21be7f3 100644 +--- a/docs/conf/inspircd.conf.example ++++ b/docs/conf/inspircd.conf.example +@@ -425,11 +425,11 @@ + + # This file has all the information about oper classes, types and o:lines. + # You *MUST* edit it. +-<include file="conf/examples/opers.conf.example"> ++<include file="/etc/inspircd/opers.conf.example"> + + # This file has all the information about server links and ulined servers. + # You *MUST* edit it if you intend to link servers. +-<include file="conf/examples/links.conf.example"> ++<include file="/etc/inspircd/links.conf.example"> + + #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# + # # +@@ -439,7 +439,8 @@ + # motd - displayed on connect and when a user executes /MOTD + # rules - displayed when the user executes /RULES + # Modules can also define their own files +-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example"> ++<files motd="/etc/inspircd/motd.txt.example" ++ rules="/etc/inspircd/rules.txt.example"> + + # Example of an executable file include. Note this will be read on rehash, + # not when the command is run. +@@ -485,7 +486,7 @@ + # the default of 'inspircd.pid' is used. # + # # + +-#<pid file="/path/to/inspircd.pid"> ++<pid file="/var/run/inspircd/inspircd.pid"> + + #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -994,7 +995,7 @@ + # provide almost all the features of InspIRCd. :) # + # # + # The default does nothing -- we include it for simplicity for you. # +-<include file="conf/examples/modules.conf.example"> ++<include file="/etc/inspircd/modules.conf.example"> + + # Here are some pre-built modules.conf files that closely match the + # default configurations of some popular IRCd's. You still may want to +@@ -1006,10 +1007,10 @@ + # recommended that you make your own modules file based on modules.conf.example. + + # Settings similar to UnrealIRCd defaults. +-#<include file="conf/examples/modules/unrealircd.conf.example"> ++#<include file="/etc/inspircd/modules/unrealircd.conf.example"> + + # Settings similar to Charybdis IRCd defaults. +-#<include file="conf/examples/modules/charybdis.conf.example"> ++#<include file="/etc/inspircd/modules/charybdis.conf.example"> + + + ######################################################################### +diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example +index c3f074b94..4b0a584bb 100644 +--- a/docs/conf/modules.conf.example ++++ b/docs/conf/modules.conf.example +@@ -315,7 +315,7 @@ + # specify some censor tags. See also: # + # https://wiki.inspircd.org/Modules/2.0/censor # + # +-#<include file="conf/examples/censor.conf.example"> ++#<include file="/etc/inspircd/censor.conf.example"> + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # CGI:IRC module: Adds support for automatic host changing in CGI:IRC +@@ -790,7 +790,7 @@ + # specify below the path to the filter.conf file, or define some # + # <filter> tags. # + # # +-#<include file="conf/examples/filter.conf.example"> ++#<include file="/etc/inspircd/filter.conf.example"> + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Gecos ban: Implements extended ban 'r', which stops anyone matching +@@ -849,7 +849,7 @@ + # # + # If you specify to use the m_helpop.so module, then specify below # + # the path to the helpop.conf file. # +-#<include file="conf/examples/helpop-full.conf.example"> ++#<include file="/etc/inspircd/helpop-full.conf.example"> + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Hide chans module: Allows users to hide their channels list from non- +@@ -1304,7 +1304,7 @@ + # Read the comment above <connect:allowmotdcolors> in # + # inspircd.conf.example for details. # + # # +-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false"> ++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false"> + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Override module: Adds support for oper override. +diff --git a/make/template/main.mk b/make/template/main.mk +index 23daa7efc..386e0138a 100644 +--- a/make/template/main.mk ++++ b/make/template/main.mk +@@ -34,7 +34,7 @@ CC = @CC@ + SYSTEM = @SYSTEM@ + BUILDPATH = @BUILD_DIR@ + SOCKETENGINE = @SOCKETENGINE@ +-CXXFLAGS = -pipe -fPIC -DPIC ++MYCXXFLAGS = -pipe -fPIC -DPIC + LDLIBS = -pthread -lstdc++ + LDFLAGS = + CORELDFLAGS = -rdynamic -L. $(LDFLAGS) +@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755 + INSTMODE_LIB = 0644 + + @IFEQ $(CC) icpc +- CXXFLAGS += -Wshadow ++ MYCXXFLAGS += -Wshadow + @ELSE +- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall ++ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall + @ENDIF + + +@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644 + INSTALL = ginstall + @ENDIF + @IFEQ $(SYSTEM) darwin +- CXXFLAGS += -DDARWIN -frtti ++ MYCXXFLAGS += -DDARWIN -frtti + LDLIBS += -ldl + CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS) + PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) + @ENDIF + @IFEQ $(SYSTEM) interix +- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include ++ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include + @ENDIF + +-@IFNDEF D +- D=0 ++@IFNDEF DEBUGLEVEL ++ DEBUGLEVEL=0 + @ENDIF + + GCC6=@GCC6@ + @IFEQ $(GCC6) true +- CXXFLAGS += -fno-delete-null-pointer-checks ++ MYCXXFLAGS += -fno-delete-null-pointer-checks + @ENDIF + + DBGOK=0 +-@IFEQ $(D) 0 +- CXXFLAGS += -O2 ++@IFEQ $(DEBUGLEVEL) 0 ++ MYCXXFLAGS += -O2 + @IFEQ $(CC) g++ +- CXXFLAGS += -g1 ++ MYCXXFLAGS += -g1 + @ENDIF + HEADER = std-header + DBGOK=1 + @ENDIF +-@IFEQ $(D) 1 +- CXXFLAGS += -O0 -g3 -Werror ++@IFEQ $(DEBUGLEVEL) 1 ++ MYCXXFLAGS += -O0 -g3 -Werror + HEADER = debug-header + DBGOK=1 + @ENDIF +-@IFEQ $(D) 2 +- CXXFLAGS += -O2 -g3 ++@IFEQ $(DEBUGLEVEL) 2 ++ MYCXXFLAGS += -O2 -g3 + HEADER = debug-header + DBGOK=1 + @ENDIF + FOOTER = finishmessage + +-CXXFLAGS += -Iinclude ++MYCXXFLAGS += -Iinclude + + @GNU_ONLY MAKEFLAGS += --no-print-directory + +@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude + @ENDIF + + @IFDEF PURE_STATIC +- CXXFLAGS += -DPURE_STATIC ++ MYCXXFLAGS += -DPURE_STATIC + @ENDIF + +-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS ++MYCXXFLAGS += $(CXXFLAGS) ++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS + @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC + + # Default target +@@ -151,10 +152,10 @@ TARGET = all + @GNU_ONLY TARGET = modules/$(M:.so=).so + @ENDIF + +-@IFDEF T ++@IFDEF TGT + HEADER = + FOOTER = target +- TARGET = $(T) ++ TARGET = $(TGT) + @ENDIF + + @IFEQ $(DBGOK) 0 +@@ -229,8 +230,8 @@ install: target + @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH) + @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) +- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases +- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases ++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) + [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) + @IFNDEF PURE_STATIC +@@ -238,9 +239,9 @@ install: target + @ENDIF + -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases +- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH) ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases ++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules + @echo "" + @echo "*************************************" + @echo "* INSTALL COMPLETE! *" +@@ -253,7 +254,7 @@ install: target + @echo ' Data:' $(DATPATH) + @echo 'To start the ircd, run:' $(BASE)/inspircd start + @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf +- @echo 'Examples are available at:' $(CONPATH)/examples/ ++ @echo 'Examples are available at:' $(CONPATH) + + @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh) + @BSD_ONLY RCS_FILES = src/version.sh +diff --git a/make/unit-cc.pl b/make/unit-cc.pl +index a494fb74b..2a570ec91 100755 +--- a/make/unit-cc.pl ++++ b/make/unit-cc.pl +@@ -113,7 +113,7 @@ sub do_compile { + my $libs = ''; + my $binary = $ENV{RUNCC}; + if ($do_compile) { +- $flags = $ENV{CXXFLAGS}; ++ $flags = $ENV{MYCXXFLAGS}; + $flags =~ s/ -pedantic// if nopedantic($file); + $flags .= ' ' . getcompilerflags($file); + diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd @@ -0,0 +1,33 @@ +# Distributed under the terms of the GNU General Public License v2 + +# Location of configuration file. Modify if you don't like the standard +# one. +# +#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf" + +# File used to store the PID file. Usually you won't need to touch it. +# If you are changing PID file do not forget to set new PID file in +# INSPIRCD_CONFIGFILE as well. +# +#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid" + +# User to run InspIRCd as +# +#INSPIRCD_USER="inspircd" +#INSPIRCD_GROUP="inspircd" + +# You can use this configuration option to pass additional options to the +# start-stop-daemon, see start-stop-daemon(8) for more details. +# Per default we start InspIRCd without any output (quiet) +# as user $INSPIRCD_USER and wait 1000ms after we have started the service +# to ensure that the daemon is really up and running. +#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000" + +# The termination timeout (start-stop-daemon parameter "retry") ensures +# that the service will be terminated within a given time (25 + 5 seconds +# per default) when you are stopping the service. +#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5" + +# Options to collectd +# See `/usr/bin/inspircd --help` for more details +#INSPIRCD_OPTS="" diff --git a/net-irc/inspircd/files/inspircd.initd b/net-irc/inspircd/files/inspircd.initd @@ -0,0 +1,48 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +: ${INSPIRCD_USER:="inspircd"} +: ${INSPIRCD_GROUP:="inspircd"} +: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"} +: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"} +: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"} +: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"} +: ${INSPIRCD_OPTS:=""} + +command="/usr/bin/inspircd" +command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\"" +command_user="${INSPIRCD_USER}" +start_stop_daemon_args="${INSPIRCD_SSDARGS}" +pidfile="${INSPIRCD_PIDFILE}" +retry="${INSPIRCD_TERMTIMEOUT}" + +required_files="${INSPIRCD_CONFIGFILE}" + +name="InspIRCd" + +description="InspIRCd is a modular Internet Relay Chat (IRC) server." + +extra_commands="version" +extra_started_commands="rehash" + +depend() { + use dns + provide ircd +} + +start_pre() { + checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" +} + +rehash() { + ebegin "Rehashing InspIRCd" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} + +version() { + ebegin "Retrieve InspIRCd version" + ${command} --version + eend $? +} diff --git a/net-irc/inspircd/inspircd-2.0.27.ebuild b/net-irc/inspircd/inspircd-2.0.27.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs user + +DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" +HOMEPAGE="https://inspircd.github.com/" +SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" + +RDEPEND=" + dev-lang/perl + ssl? ( dev-libs/openssl:= ) + geoip? ( dev-libs/geoip ) + gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:= ) + pcre? ( dev-libs/libpcre ) + sqlite? ( >=dev-db/sqlite-3.0 ) + tre? ( dev-libs/tre )" +DEPEND="${RDEPEND}" + +DOCS=( docs/. ) +PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch ) + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} -1 -1 -1 ${PN} +} + +src_prepare() { + default + + # Patch the inspircd launcher with the inspircd user + sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die +} + +src_configure() { + local extras="" + + use geoip && extras+="m_geoip.cpp," + use gnutls && extras+="m_ssl_gnutls.cpp," + use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp," + use mysql && extras+="m_mysql.cpp," + use pcre && extras+="m_regex_pcre.cpp," + use posix && extras+="m_regex_posix.cpp," + use postgres && extras+="m_pgsql.cpp," + use sqlite && extras+="m_sqlite3.cpp," + use ssl && extras+="m_ssl_openssl.cpp," + use tre && extras+="m_regex_tre.cpp," + + # The first configuration run enables certain "extra" InspIRCd + # modules, the second run generates the actual makefile. + if [[ -n "${extras}" ]]; then + ./configure --disable-interactive --enable-extras=${extras%,} + fi + + local myconf=( + --with-cc="$(tc-getCXX)" + --disable-interactive + --prefix="/usr/$(get_libdir)/${PN}" + --config-dir="/etc/${PN}" + --data-dir="/var/lib/${PN}/data" + --log-dir="/var/log/${PN}" + --binary-dir="/usr/bin" + --module-dir="/usr/$(get_libdir)/${PN}/modules" + $(usex ipv6 '' '--disable-ipv6') + $(usex gnutls '--enable-gnutls' '') + $(usex ssl '--enable-openssl' '')) + ./configure "${myconf[@]}" +} + +src_compile() { + emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake INSTUID=${PN} DESTDIR="${D%/}" install + + insinto "/usr/include/${PN}" + doins -r include/. + + einstalldocs + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + keepdir "/var/log/${PN}" + + diropts -o"${PN}" -g"${PN}" -m0700 + keepdir "/var/lib/${PN}/data" +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + elog "You will find example configuration files under " + elog "/usr/share/doc/${PN}" + elog "Read the ${PN}.conf.example file carefully before " + elog "starting the service." + fi + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test "${pv}" -lt "2.0.24-r1"; then + elog "Starting with 2.0.24-r1 the daemon is no longer started" + elog "with the --logfile option and you are thus expected to define" + elog "logging in the InspIRCd configuration file if you want it." + break + fi + done +} diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>contact@hacktivis.me</email> + <name>Haelwenn (lanodan) Monnier</name> + </maintainer> + <longdescription lang="en"> + InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ + for Linux, BSD, Windows and Mac OS X systems which was created from + scratch to be stable, modern and lightweight. + </longdescription> + <longdescription lang="es"> + InspIRCd es un servidor Internet Relay Chat (IRC) escrito en C++ + para sistemas Linux, BSD, Windows y Mac OS X que se creó desde cero + para ser estable, moderno y ligero. + </longdescription> + <use> + <flag name="geoip">Add geoip support for country and city lookup based on IPs</flag> + <flag name="gnutls">Enable TLS support</flag> + <flag name="ipv6">Enable support for IP version 6</flag> + <flag name="ldap">Enable LDAP support</flag> + <flag name="mysql">Enable MySQL database backend</flag> + <flag name="pcre">Adds support for Perl Compatible Regular Expressions</flag> + <flag name="posix">Adds support for POSIX-compatible functions</flag> + <flag name="postgres">Enable PostgreSQL database backend</flag> + <flag name="sqlite">Enable Sqlite database backend</flag> + <flag name="ssl">Enable SSL support</flag> + <flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag> + </use> + <upstream> + <remote-id type="github">inspircd/inspircd</remote-id> + </upstream> +</pkgmetadata>