gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

net-irc/inspircd: Add v3.1.0

Browse Source 
Signed-off-by: Wade Cline <wadecline@hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12027
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Wade Cline
2019-05-13 00:09:53 -07:00
committed by Michał Górny
parent b9d492272c
commit b6bce9d64d
4 changed files with 398 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net-irc/inspircd/Manifest
View File

@@ -1,2 +1,3 @@
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
DIST inspircd-3.1.0.tar.gz 795435 BLAKE2B 86f4c62b61ea2692be4f0bba21976e738f733187640f7fa43f3e90fb29b5a6e1bd4769fcdb86f1912a43cd856f5d1d28a335c2e6e4c86db6097588247ec6e119 SHA512 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c

260
net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch Normal file
View File

@@ -0,0 +1,260 @@
diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
similarity index 100%
rename from docs/conf/filter.conf.example
rename to docs/conf/filter.conf
diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
similarity index 100%
rename from docs/conf/helpop.conf.example
rename to docs/conf/helpop.conf
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
similarity index 99%
rename from docs/conf/inspircd.conf.example
rename to docs/conf/inspircd.conf
index 9baaa5261..60e277310 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf
@@ -465,11 +465,11 @@
# This file has all the information about oper classes, types and o:lines.
# You *MUST* edit it.
-#<include file="examples/opers.conf.example">
+#<include file="/etc/inspircd/opers.conf">
# This file has all the information about server links and ulined servers.
# You *MUST* edit it if you intend to link servers.
-#<include file="examples/links.conf.example">
+#<include file="/etc/inspircd/links.conf">
#-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
# #
@@ -478,7 +478,7 @@
#
# motd - displayed on connect and when a user executes /MOTD
# Modules can also define their own files
-<files motd="examples/motd.txt.example">
+<files motd="/etc/inspircd/motd.txt">
# Example of an executable file include. Note this will be read on rehash,
# not when the command is run.
@@ -514,7 +514,7 @@
# the default of 'inspircd.pid' is used. #
# #
-#<pid file="/path/to/inspircd.pid">
+#<pid file="/var/run/inspircd/inspircd.pid">
#-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -1012,7 +1012,7 @@
# provide almost all the features of InspIRCd. :) #
# #
# The default does nothing -- we include it for simplicity for you. #
-#<include file="examples/modules.conf.example">
+#<include file="/etc/inspircd/modules.conf">
#-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -1021,13 +1021,13 @@
# exemptions for services pseudoclients: #
#
# Anope users should uncomment this:
-#<include file="examples/services/anope.conf.example">
+#<include file="/etc/inspircd/aliases/anope.conf">
#
# Atheme users should uncomment this:
-#<include file="examples/services/atheme.conf.example">
+#<include file="/etc/inspircd/aliases/atheme.conf">
#
# Users of other services should uncomment this:
-#<include file="examples/services/generic.conf.example">
+#<include file="/etc/inspircd/aliases/generic.conf">
#########################################################################
# #
diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
similarity index 100%
rename from docs/conf/links.conf.example
rename to docs/conf/links.conf
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
similarity index 99%
rename from docs/conf/modules.conf.example
rename to docs/conf/modules.conf
index bb8a74dbc..397b61295 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf
@@ -832,7 +832,7 @@
# anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, #
# censor, filter, flood, nickflood, noctcp, nonick, nonotice, #
# regmoderated, stripcolor, and topiclock. #
-# See <options:exemptchanops> in inspircd.conf.example for a more #
+# See <options:exemptchanops> in inspircd.conf for a more #
# detailed list of the restriction modes that can be exempted. #
# These are settable using: /MODE #chan +X <restriction>:<status> #
#<module name="exemptchanops">
@@ -862,7 +862,7 @@
# Your choice of regex engine must match on all servers network-wide. #
# #
# To learn more about the configuration of this module, read #
-# examples/filter.conf.example, which covers the various types of #
+# filter.conf, which covers the various types of #
# filters and shows how to add exemptions. #
# #
#-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#
@@ -871,7 +871,7 @@
# specify below the path to the filter.conf file, or define some #
# <keyword> tags. #
# #
-#<include file="examples/filter.conf.example">
+#<include file="/etc/inspircd/filter.conf">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
@@ -961,7 +961,7 @@
# If you specify to use the helpop module, then specify below the #
# path to the helpop.conf file. #
# #
-#<include file="examples/helpop.conf.example">
+#<include file="/etc/inspircd/helpop.conf">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Hide chans module: Allows users to hide their channels list from non-
@@ -1533,7 +1533,7 @@
# onoper - If on, the message is sent on /OPER, otherwise it's #
# only sent when /OPERMOTD is used. #
# #
-#<opermotd file="examples/opermotd.txt.example" onoper="yes">
+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Override module: Adds support for oper override.
@@ -2106,7 +2106,7 @@
# connections in order to oper up. It is highly recommended to load
# this module if you use SSL on your network.
# For how to use the oper features, please see the first
-# example <oper> tag in opers.conf.example.
+# example <oper> tag in opers.conf.
#
#<module name="sslinfo">
#
diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
similarity index 97%
rename from docs/conf/motd.txt.example
rename to docs/conf/motd.txt
index c5266f844..34d85d965 100644
--- a/docs/conf/motd.txt.example
+++ b/docs/conf/motd.txt
@@ -24,7 +24,7 @@
`-.__ `----""" __.-'
`--..____..--'
- ---- To change, see motd.txt.example -----
+ ---- To change, see motd.txt -----
/ \
/ * Web: https://www.inspircd.org \
| * IRC: irc.inspircd.org #inspircd |
diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
similarity index 97%
rename from docs/conf/opermotd.txt.example
rename to docs/conf/opermotd.txt
index 7e1c82f33..73ad28621 100644
--- a/docs/conf/opermotd.txt.example
+++ b/docs/conf/opermotd.txt
@@ -24,7 +24,7 @@
`-.__ `----""" __.-'
`--..____..--'
- -- To change, see opermotd.txt.example ---
+ -- To change, see opermotd.txt ---
/ \
/ * Web: https://www.inspircd.org \
| * IRC: irc.inspircd.org #inspircd |
diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
similarity index 99%
rename from docs/conf/opers.conf.example
rename to docs/conf/opers.conf
index 7cad2589c..082009da9 100644
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf
@@ -178,4 +178,4 @@
# Once you have edited this file you can remove this line. This is just to
# ensure that you don't hastily include the file without reading it.
-<die reason="Using opers.conf.example without editing it is a security risk">
+<die reason="Using opers.conf without editing it is a security risk">
diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
similarity index 100%
rename from docs/conf/quotes.txt.example
rename to docs/conf/quotes.txt
diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
similarity index 86%
rename from docs/conf/services/anope.conf.example
rename to docs/conf/services/anope.conf
index 5c8f859ff..b1179eb8c 100644
--- a/docs/conf/services/anope.conf.example
+++ b/docs/conf/services/anope.conf
@@ -2,7 +2,7 @@
# by Anope. See https://www.anope.org for more information on Anope.
# This file inherits from the generic config to avoid repetition.
-<include file="examples/services/generic.conf.example">
+<include file="examples/services/generic.conf">
# /GLOBAL <message>
# Sends a global notice.
diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
similarity index 98%
rename from docs/conf/services/atheme.conf.example
rename to docs/conf/services/atheme.conf
index d509522b8..7605251db 100644
--- a/docs/conf/services/atheme.conf.example
+++ b/docs/conf/services/atheme.conf
@@ -3,7 +3,7 @@
# information on Atheme.
# This file inherits from the generic config to avoid repetition.
-<include file="examples/services/generic.conf.example">
+<include file="examples/services/generic.conf">
# Long hand aliases for services pseudoclients.
<alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes">
diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
similarity index 100%
rename from docs/conf/services/generic.conf.example
rename to docs/conf/services/generic.conf
diff --git a/make/template/main.mk b/make/template/main.mk
index e39a24f87..e0fcbf4fc 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -207,8 +207,8 @@ install: target
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
@@ -225,9 +225,9 @@ endif
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
@@ -241,7 +241,7 @@ endif
@echo ' Data:' $(DATPATH)
@echo 'To start the ircd, run:' $(SCRPATH)/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)
GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
./configure --update

131
net-irc/inspircd/inspircd-3.1.0.ebuild Normal file
View File

@@ -0,0 +1,131 @@
# Copyright 1999-2019 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="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
RDEPEND="
dev-lang/perl
gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
ldap? ( net-nds/openldap )
maxminddb? ( dev-libs/libmaxminddb )
mbedtls? ( net-libs/mbedtls:= )
mysql? ( dev-db/mysql-connector-c:= )
pcre? ( dev-libs/libpcre )
postgres? ( dev-db/postgresql:= )
re2? ( dev-libs/re2:= )
sqlite? ( >=dev-db/sqlite-3.0 )
ssl? ( dev-libs/openssl:= )
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 gnutls && extras+="m_ssl_gnutls.cpp,"
use ldap && extras+="m_ldap.cpp,"
use maxminddb && extras+="m_geo_maxmind.cpp,"
use mbedtls && extras+="m_ssl_mbedtls.cpp,"
use mysql && extras+="m_mysql.cpp,"
use pcre && extras+="m_regex_pcre.cpp,"
use postgres && extras+="m_pgsql.cpp,"
use re2 && extras+="m_regex_re2.cpp,"
use regex-posix && extras+="m_regex_posix.cpp,"
use regex-stdlib && extras+="m_regex_stdlib.cpp,"
use sqlite && extras+="m_sqlite3.cpp,"
use ssl && extras+="m_ssl_openssl.cpp,"
use sslrehashsignal && extras+="m_sslrehashsignal.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=(
--disable-interactive
--disable-auto-extras
--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"
--manual-dir="/usr/share/man")
CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
}
src_compile() {
emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
}
src_install() {
emake DESTDIR="${D%/}" install
# Default is '0750', which causes init errors.
fperms 0755 /usr/bin/inspircd{,-genssl}
# Default is '0640', causing module load errors.
fperms -R 0755 "/usr/lib64/inspircd/modules/."
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."
fi
if ver_test "${pv}" -lt "3.0.0"; then
elog "Version 3.0 is a major upgrade which contains breaking"
elog "changes. You will need to update your configuration files."
elog "See: https://docs.inspircd.org/3/configuration-changes"
fi
done
}

9
net-irc/inspircd/metadata.xml
View File

@@ -12,16 +12,19 @@
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="maxminddb">Add support for geolocation using libMaxMindDB</flag>
<flag name="mbedtls">Add support for TLS using the mbedTLS library</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="re2">Add support for Google RE2 regular expressions library</flag>
<flag name="regex-posix">Adds support for POSIX Regular Expressions</flag>
<flag name="regex-stdlib">Add support for C++ stdlib regular expressions</flag>
<flag name="sqlite">Enable Sqlite database backend</flag>
<flag name="ssl">Enable SSL support</flag>
<flag name="sslrehashsignal">Enable rehashing SSL module by SIGUSR1</flag>
<flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag>
</use>
<upstream>