From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AD378138334 for ; Sun, 26 May 2019 10:26:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C288DE079C; Sun, 26 May 2019 10:26:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94731E079C for ; Sun, 26 May 2019 10:26:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D3AD344054 for ; Sun, 26 May 2019 10:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C36A6566 for ; Sun, 26 May 2019 10:26:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1558866363.b6bce9d64da768be609803ee3874d507b0dba11b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/inspircd/Manifest net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch net-irc/inspircd/inspircd-3.1.0.ebuild net-irc/inspircd/metadata.xml X-VCS-Directories: net-irc/inspircd/files/ net-irc/inspircd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b6bce9d64da768be609803ee3874d507b0dba11b X-VCS-Branch: master Date: Sun, 26 May 2019 10:26:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2002fbf6-b89d-48b8-b1d1-71dfd6fe140d X-Archives-Hash: 8997f7c00a00ca4227bdb271410453d4 commit: b6bce9d64da768be609803ee3874d507b0dba11b Author: Wade Cline hotmail com> AuthorDate: Mon May 13 07:09:53 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun May 26 10:26:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bce9d6 net-irc/inspircd: Add v3.1.0 Signed-off-by: Wade Cline hotmail.com> Closes: https://github.com/gentoo/gentoo/pull/12027 Signed-off-by: Michał Górny gentoo.org> net-irc/inspircd/Manifest | 1 + .../files/inspircd-3.1.0-fix-path-builds.patch | 260 +++++++++++++++++++++ net-irc/inspircd/inspircd-3.1.0.ebuild | 131 +++++++++++ net-irc/inspircd/metadata.xml | 9 +- 4 files changed, 398 insertions(+), 3 deletions(-) diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index dbafa8a65d4..7eed34b91b3 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -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 diff --git a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch new file mode 100644 index 00000000000..0f4738c7012 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch @@ -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. +-# ++# + + # This file has all the information about server links and ulined servers. + # You *MUST* edit it if you intend to link servers. +-# ++# + + #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# + # # +@@ -478,7 +478,7 @@ + # + # motd - displayed on connect and when a user executes /MOTD + # Modules can also define their own files +- ++ + + # 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. # + # # + +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#- 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. # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -1021,13 +1021,13 @@ + # exemptions for services pseudoclients: # + # + # Anope users should uncomment this: +-# ++# + # + # Atheme users should uncomment this: +-# ++# + # + # Users of other services should uncomment this: +-# ++# + + ######################################################################### + # # +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 in inspircd.conf.example for a more # ++# See in inspircd.conf for a more # + # detailed list of the restriction modes that can be exempted. # + # These are settable using: /MODE #chan +X : # + # +@@ -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 # + # tags. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # 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. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # 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. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # 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 tag in opers.conf.example. ++# example tag in opers.conf. + # + # + # +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. +- ++ +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. +- ++ + + # /GLOBAL + # 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. +- ++ + + # Long hand aliases for services pseudoclients. + +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 diff --git a/net-irc/inspircd/inspircd-3.1.0.ebuild b/net-irc/inspircd/inspircd-3.1.0.ebuild new file mode 100644 index 00000000000..98fed20a13d --- /dev/null +++ b/net-irc/inspircd/inspircd-3.1.0.ebuild @@ -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 +} diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml index 5bcadd4c1b6..55b39da0b0e 100644 --- a/net-irc/inspircd/metadata.xml +++ b/net-irc/inspircd/metadata.xml @@ -12,16 +12,19 @@ para ser estable, moderno y ligero. - Add geoip support for country and city lookup based on IPs Enable TLS support - Enable support for IP version 6 Enable LDAP support + Add support for geolocation using libMaxMindDB + Add support for TLS using the mbedTLS library Enable MySQL database backend Adds support for Perl Compatible Regular Expressions - Adds support for POSIX-compatible functions Enable PostgreSQL database backend + Add support for Google RE2 regular expressions library + Adds support for POSIX Regular Expressions + Add support for C++ stdlib regular expressions Enable Sqlite database backend Enable SSL support + Enable rehashing SSL module by SIGUSR1 Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library