* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2017-11-29 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2017-11-29 23:19 UTC (permalink / raw
To: gentoo-commits
commit: aa84d551280c1833e8f37a23711aefd9dcf6de00
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sat Nov 18 03:08:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 23:19:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa84d551
net-irc/inspircd: Bump to 2.0.25
Closes: https://github.com/gentoo/gentoo/pull/6209
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.25-fix-path-builds.patch | 253 +++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.25.ebuild | 123 ++++++++++
3 files changed, 377 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 5100b5a4395..e9a9481ebba 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
DIST inspircd-2.0.24.tar.gz 732354 SHA256 41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40 SHA512 766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a WHIRLPOOL 3da7b2b694fd60755d3238d33090e9bc30abca3090e2552b6a9cb572c644cdc883236d39b91d1680e2500a26ef4829c98315e9975e27d5271046461569193d24
+DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
diff --git a/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
new file mode 100644
index 00000000000..debf62a15f5
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
@@ -0,0 +1,253 @@
+diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500
++++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500
+@@ -412,11 +412,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -426,7 +426,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.
+@@ -472,7 +473,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -953,7 +954,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
+@@ -965,10 +966,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 -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+--- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600
++++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also: #
+ # http://wiki.inspircd.org/Modules/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
+@@ -778,7 +778,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
+@@ -834,7 +834,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/inspircd.helpop-full.example">
++#<include file="/etc/inspircd/inspircd.helpop-full.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1284,7 +1284,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 -Nuar a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500
++++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500
+@@ -34,7 +34,7 @@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS =
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -51,9 +51,9 @@
+ 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
+
+
+@@ -75,46 +75,46 @@
+ 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
+
+@@ -134,10 +134,11 @@
+ @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
+@@ -150,10 +151,10 @@
+ @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+
+-@IFDEF T
++@IFDEF TGT
+ HEADER =
+ FOOTER = target
+- TARGET = $(T)
++ TARGET = $(TGT)
+ @ENDIF
+
+ @IFEQ $(DBGOK) 0
+@@ -228,8 +229,8 @@
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+ @-$(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
+@@ -237,9 +238,9 @@
+ @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! *"
+@@ -252,7 +253,7 @@
+ @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 -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
+--- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500
++++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500
+@@ -113,7 +113,7 @@
+ 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/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
new file mode 100644
index 00000000000..d3c92bdafc3
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs user versionator
+
+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? ( virtual/mysql )
+ 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() {
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+
+ default_src_prepare
+}
+
+src_configure() {
+ local extras=""
+
+ use geoip && extras="${extras}m_geoip.cpp,"
+ use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+ use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
+ use mysql && extras="${extras}m_mysql.cpp,"
+ use pcre && extras="${extras}m_regex_pcre.cpp,"
+ use posix && extras="${extras}m_regex_posix.cpp,"
+ use postgres && extras="${extras}m_pgsql.cpp,"
+ use sqlite && extras="${extras}m_sqlite3.cpp,"
+ use ssl && extras="${extras}m_ssl_openssl.cpp,"
+ use tre && extras="${extras}m_regex_tre.cpp,"
+
+ if [[ -n "${extras}" ]]; then
+ econf --disable-interactive --enable-extras=${extras%,}
+ fi
+
+ econf \
+ --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' '')
+}
+
+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
+
+ diropts -o"${PN}" -g"${PN}" -m0700
+ dodir "/var/lib/${PN}"
+ dodir "/var/lib/${PN}/data"
+
+ newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+
+ keepdir "/var/log/${PN}"
+
+ rm -r "${D%/}/etc/${PN}" || die
+ dodir "/etc/${PN}"
+ dodir "/etc/${PN}/aliases"
+ dodir "/etc/${PN}/modules"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "Before starting ${PN} the first time, you *must* create"
+ elog "the /etc/${PN}/${PN}.conf file."
+ 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 ! version_is_at_least "2.0.24-r1" "${pv}"; 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2018-05-30 11:43 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-05-30 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 20326abc147ddc804f0582e7da26fce08c89cf39
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sat Apr 28 02:47:12 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 30 11:43:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20326abc
net-irc/inspircd: Version bump to 2.0.26
Closes: https://github.com/gentoo/gentoo/pull/8225
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.26-fix-path-builds.patch | 257 +++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.26.ebuild | 118 ++++++++++
3 files changed, 376 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 6e5b23c59a3..c2631dcf58b 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
+DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a
diff --git a/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch
new file mode 100644
index 00000000000..da00a8491d1
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.26-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/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
new file mode 100644
index 00000000000..ead8598ef2c
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.26.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver 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? ( virtual/mysql )
+ 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}-r3.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-r3.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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2018-09-30 20:07 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-09-30 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 3c88a4bf30a966da6a351ce485b1f20c261295d5
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Sep 19 03:39:55 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 20:07:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c88a4bf
net-irc/inspircd: Remove old version
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-2.0.23-fix-path-builds.patch | 253 ---------------------
net-irc/inspircd/files/inspircd-r2.initd | 48 ----
net-irc/inspircd/files/inspircd-r3.confd | 33 ---
net-irc/inspircd/files/inspircd.confd | 5 -
.../files/{inspircd-r3.initd => inspircd.initd} | 0
net-irc/inspircd/inspircd-2.0.23.ebuild | 106 ---------
net-irc/inspircd/inspircd-2.0.25.ebuild | 4 +-
net-irc/inspircd/inspircd-2.0.26.ebuild | 4 +-
9 files changed, 4 insertions(+), 450 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index c2631dcf58b..9204c385742 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
-DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a
diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
deleted file mode 100644
index debf62a15f5..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500
-+++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500
-@@ -412,11 +412,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 -#-#-#-#-#-#-#-#-#-#
- # #
-@@ -426,7 +426,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.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -953,7 +954,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
-@@ -965,10 +966,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 -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
---- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600
-+++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also: #
- # http://wiki.inspircd.org/Modules/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
-@@ -778,7 +778,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
-@@ -834,7 +834,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/inspircd.helpop-full.example">
-+#<include file="/etc/inspircd/inspircd.helpop-full.example">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1284,7 +1284,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 -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500
-+++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500
-@@ -34,7 +34,7 @@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -pipe -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS =
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -51,9 +51,9 @@
- 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
-
-
-@@ -75,46 +75,46 @@
- 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
-
-@@ -134,10 +134,11 @@
- @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
-@@ -150,10 +151,10 @@
- @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
-
--@IFDEF T
-+@IFDEF TGT
- HEADER =
- FOOTER = target
-- TARGET = $(T)
-+ TARGET = $(TGT)
- @ENDIF
-
- @IFEQ $(DBGOK) 0
-@@ -228,8 +229,8 @@
- @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
- @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
- @-$(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
-@@ -237,9 +238,9 @@
- @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! *"
-@@ -252,7 +253,7 @@
- @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 -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500
-+++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500
-@@ -113,7 +113,7 @@
- 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-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd
deleted file mode 100644
index 653e501627e..00000000000
--- a/net-irc/inspircd/files/inspircd-r2.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"}
-INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"}
-INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"}
-INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"}
-INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"}
-INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"}
-INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"}
-INSPIRCD_OPTS=${INSPIRCD_OPTS:-""}
-
-command="/usr/bin/inspircd"
-command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\""
-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/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd
deleted file mode 100644
index af9b3fe15e2..00000000000
--- a/net-irc/inspircd/files/inspircd-r3.confd
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.confd b/net-irc/inspircd/files/inspircd.confd
index 1291f9fd552..af9b3fe15e2 100644
--- a/net-irc/inspircd/files/inspircd.confd
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -5,11 +5,6 @@
#
#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
-# Location of log file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log"
-
# 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.
diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd.initd
similarity index 100%
rename from net-irc/inspircd/files/inspircd-r3.initd
rename to net-irc/inspircd/files/inspircd.initd
diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild
deleted file mode 100644
index 78dbcfc2928..00000000000
--- a/net-irc/inspircd/inspircd-2.0.23.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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? ( virtual/mysql )
- postgres? ( dev-db/postgresql:= )
- pcre? ( dev-libs/libpcre )
- sqlite? ( >=dev-db/sqlite-3.0 )
- tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.23-fix-path-builds.patch )
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- # Patch the inspircd launcher with the inspircd user
- sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-
- default_src_prepare
-}
-
-src_configure() {
- local extras=""
-
- use geoip && extras="${extras}m_geoip.cpp,"
- use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
- use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
- use mysql && extras="${extras}m_mysql.cpp,"
- use pcre && extras="${extras}m_regex_pcre.cpp,"
- use posix && extras="${extras}m_regex_posix.cpp,"
- use postgres && extras="${extras}m_pgsql.cpp,"
- use sqlite && extras="${extras}m_sqlite3.cpp,"
- use ssl && extras="${extras}m_ssl_openssl.cpp,"
- use tre && extras="${extras}m_regex_tre.cpp,"
-
- if [[ -n "${extras}" ]]; then
- econf --disable-interactive --enable-extras=${extras%,}
- fi
-
- econf \
- --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' '')
-}
-
-src_compile() {
- emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
- emake INSTUID=${PN} DESTDIR="${D%/}" install
-
- insinto "/usr/include/${PN}"
- doins -r include/.
-
- diropts -o"${PN}" -g"${PN}" -m0700
- dodir "/var/lib/${PN}"
- dodir "/var/lib/${PN}/data"
-
- newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- keepdir "/var/log/${PN}"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- elog "Before starting ${PN} the first time, you should create"
- elog "the /etc/${PN}/${PN}.conf file."
- elog "You can find example configuration files under /etc/${PN}"
- elog "Read the ${PN}.conf.example file carefully before "
- elog "(re)starting the service."
- elog
- fi
-}
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 746628c56e7..9d65d96de88 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -90,8 +90,8 @@ src_install() {
dodir "/var/lib/${PN}"
dodir "/var/lib/${PN}/data"
- newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
keepdir "/var/log/${PN}"
diff --git a/net-irc/inspircd/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
index ead8598ef2c..9d97ed21f3a 100644
--- a/net-irc/inspircd/inspircd-2.0.26.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.26.ebuild
@@ -89,8 +89,8 @@ src_install() {
einstalldocs
- newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
keepdir "/var/log/${PN}"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2018-12-16 23:53 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 6e4e766f46a390548dc38c92e591c772d4573770
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Fri Nov 16 20:57:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 23:53:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4e766f
net-irc/inspircd: drop 2.0.26
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-2.0.26-fix-path-builds.patch | 257 ---------------------
net-irc/inspircd/inspircd-2.0.26.ebuild | 118 ----------
3 files changed, 376 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 71ffbab7d48..dbafa8a65d4 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
-DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a
DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
diff --git a/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch
deleted file mode 100644
index da00a8491d1..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-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/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
deleted file mode 100644
index 902f26ec926..00000000000
--- a/net-irc/inspircd/inspircd-2.0.26.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-07-17 14:23 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2019-07-17 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 6fab7cdcd2acc1c05a8835fab85d3ed35e248c1e
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Jul 17 04:17:23 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 14:23:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fab7cdc
net-irc/inspircd: Remove old 3.1.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12453
Signed-off-by: Michał Górny <mgorny <AT> 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 -----------
3 files changed, 392 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index b23c21ae7df..ec6f1427372 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,4 +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
DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
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
deleted file mode 100644
index 0f4738c7012..00000000000
--- a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-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
diff --git a/net-irc/inspircd/inspircd-3.1.0.ebuild b/net-irc/inspircd/inspircd-3.1.0.ebuild
deleted file mode 100644
index 98fed20a13d..00000000000
--- a/net-irc/inspircd/inspircd-3.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-07-17 14:23 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2019-07-17 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 95eb5ab6132d3da3870e1229cf6d396724b2967c
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Jul 17 04:15:53 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 14:23:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95eb5ab6
net-irc/inspircd: Bump to 3.2.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.2.0-fix-path-builds.patch | 267 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.2.0.ebuild | 131 ++++++++++
3 files changed, 399 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 7eed34b91b3..b23c21ae7df 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,4 @@
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
+DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
diff --git a/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
new file mode 100644
index 00000000000..955b2be7909
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
@@ -0,0 +1,267 @@
+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 dbd56d2fe..4a7aab514 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 3bf1c2e99..b451a2f18 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">
+@@ -868,7 +868,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -877,7 +877,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)#
+@@ -967,7 +967,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-
+@@ -1545,7 +1545,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.
+@@ -2123,7 +2123,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
+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 d77d59fa5..b28d7180d 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -210,8 +210,8 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -229,9 +229,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 $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/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 "*************************************"
+@@ -245,7 +245,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
new file mode 100644
index 00000000000..2416d94a03a
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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}/" "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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-09-01 11:50 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-09-01 11:50 UTC (permalink / raw
To: gentoo-commits
commit: b91386c792d3e2387b6c6c6e58405075e3fea986
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sun Aug 25 23:51:54 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 11:50:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91386c7
net-irc/inspircd: Bump to 3.3.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.3.0-fix-path-builds.patch | 267 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.3.0.ebuild | 128 ++++++++++
3 files changed, 396 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index ec6f1427372..345c2aeed3f 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,4 @@
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.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
+DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
diff --git a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
new file mode 100644
index 00000000000..955b2be7909
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
@@ -0,0 +1,267 @@
+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 dbd56d2fe..4a7aab514 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 3bf1c2e99..b451a2f18 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">
+@@ -868,7 +868,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -877,7 +877,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)#
+@@ -967,7 +967,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-
+@@ -1545,7 +1545,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.
+@@ -2123,7 +2123,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
+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 d77d59fa5..b28d7180d 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -210,8 +210,8 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -229,9 +229,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 $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/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 "*************************************"
+@@ -245,7 +245,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild b/net-irc/inspircd/inspircd-3.3.0.ebuild
new file mode 100644
index 00000000000..0223cc46790
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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 )
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-09-01 11:50 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-09-01 11:50 UTC (permalink / raw
To: gentoo-commits
commit: a68d056da9b8ce8e9b57ef1c29d34dc58b53fa32
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Mon Aug 26 02:24:15 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 11:50:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68d056d
net-irc/inspircd: Add 2.0.28
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.28-fix-path-builds.patch | 257 +++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.28.ebuild | 115 +++++++++
3 files changed, 373 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 345c2aeed3f..d884e77a92b 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,4 +1,5 @@
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-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
new file mode 100644
index 00000000000..da00a8491d1
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.28-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/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild
new file mode 100644
index 00000000000..41581c0c6c1
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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 )
+
+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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-10-25 18:17 Brian Evans
0 siblings, 0 replies; 17+ messages in thread
From: Brian Evans @ 2019-10-25 18:17 UTC (permalink / raw
To: gentoo-commits
commit: bd529668785ccde6d2b74600b9410512776b8d40
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 25 18:17:17 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Oct 25 18:17:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd529668
net-irc/inspircd: Drop illegal symlinks
Non-maintainer commit
Remove symlinks from files/ which are banned by policy.
Adjust ebuilds to patch the intended files.
This prevents infra problems popping up like in the last 14 hours
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch | 1 -
net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch | 1 -
net-irc/inspircd/inspircd-2.0.25.ebuild | 4 ++--
net-irc/inspircd/inspircd-2.0.28.ebuild | 2 +-
net-irc/inspircd/inspircd-3.2.0.ebuild | 2 +-
net-irc/inspircd/inspircd-3.3.0.ebuild | 2 +-
6 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
deleted file mode 120000
index a7b0dc06184..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
+++ /dev/null
@@ -1 +0,0 @@
-inspircd-2.0.27-fix-path-builds.patch
\ No newline at end of file
diff --git a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
deleted file mode 120000
index 61ed4ed2c2a..00000000000
--- a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
+++ /dev/null
@@ -1 +0,0 @@
-inspircd-3.2.0-fix-path-builds.patch
\ No newline at end of file
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 792cca4e9ae..7258f2c4e9f 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -28,7 +28,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.25-fix-path-builds.patch )
pkg_setup() {
enewgroup ${PN}
diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild
index 41581c0c6c1..86ef749f122 100644
--- a/net-irc/inspircd/inspircd-2.0.28.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch )
src_prepare() {
default
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 90aad649918..021dc47d8a8 100644
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
pkg_setup() {
enewgroup ${PN}
diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild b/net-irc/inspircd/inspircd-3.3.0.ebuild
index bf6ae574977..4661639e589 100644
--- a/net-irc/inspircd/inspircd-3.3.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.3.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-11-14 6:26 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-11-14 6:26 UTC (permalink / raw
To: gentoo-commits
commit: db84fc67caf099eb61dfcbe36d728075e462e482
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Nov 13 05:18:03 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 06:25:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db84fc67
net-irc/inspircd: Add 3.4.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.4.0-fix-path-builds.patch | 271 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.4.0.ebuild | 123 ++++++++++
3 files changed, 395 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index f198f3983b6..4236d426c24 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -2,3 +2,4 @@ DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fd
DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
+DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
diff --git a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
new file mode 100644
index 00000000000..9b1e01b5be8
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
@@ -0,0 +1,271 @@
+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 dbd56d2fe..4a7aab514 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 639f02335..ea51e9b67 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -838,7 +838,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">
+@@ -874,7 +874,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -883,7 +883,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)#
+@@ -973,7 +973,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-
+@@ -1551,7 +1551,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.
+@@ -2129,7 +2129,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
+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 1e6ba5cd0..3751937eb 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -210,9 +210,9 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
++ @-$(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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -229,10 +229,10 @@ 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 $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
++ -$(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 "*************************************"
+@@ -246,7 +246,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.4.0.ebuild b/net-irc/inspircd/inspircd-3.4.0.ebuild
new file mode 100644
index 00000000000..a33428383db
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.4.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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}"/${PN}-3.4.0-fix-path-builds.patch )
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "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
+
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-11-27 15:18 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-11-27 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 7a238c68fdfcaeed904eb6d762240abf0c72fb32
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Nov 27 06:04:51 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 15:18:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a238c68
net-irc/inspircd: Drop 2.0.25
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-2.0.25-fix-path-builds.patch | 253 ---------------------
net-irc/inspircd/inspircd-2.0.25.ebuild | 123 ----------
3 files changed, 377 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 322bbfd1d5d..6521990c498 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,4 +1,3 @@
-DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
diff --git a/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
deleted file mode 100644
index debf62a15f5..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500
-+++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500
-@@ -412,11 +412,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 -#-#-#-#-#-#-#-#-#-#
- # #
-@@ -426,7 +426,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.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -953,7 +954,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
-@@ -965,10 +966,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 -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
---- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600
-+++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also: #
- # http://wiki.inspircd.org/Modules/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
-@@ -778,7 +778,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
-@@ -834,7 +834,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/inspircd.helpop-full.example">
-+#<include file="/etc/inspircd/inspircd.helpop-full.example">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1284,7 +1284,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 -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500
-+++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500
-@@ -34,7 +34,7 @@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -pipe -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS =
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -51,9 +51,9 @@
- 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
-
-
-@@ -75,46 +75,46 @@
- 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
-
-@@ -134,10 +134,11 @@
- @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
-@@ -150,10 +151,10 @@
- @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
-
--@IFDEF T
-+@IFDEF TGT
- HEADER =
- FOOTER = target
-- TARGET = $(T)
-+ TARGET = $(TGT)
- @ENDIF
-
- @IFEQ $(DBGOK) 0
-@@ -228,8 +229,8 @@
- @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
- @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
- @-$(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
-@@ -237,9 +238,9 @@
- @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! *"
-@@ -252,7 +253,7 @@
- @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 -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500
-+++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500
-@@ -113,7 +113,7 @@
- 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/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
deleted file mode 100644
index 7258f2c4e9f..00000000000
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs user versionator
-
-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}"/${PN}-2.0.25-fix-path-builds.patch )
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- # Patch the inspircd launcher with the inspircd user
- sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-
- default_src_prepare
-}
-
-src_configure() {
- local extras=""
-
- use geoip && extras="${extras}m_geoip.cpp,"
- use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
- use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
- use mysql && extras="${extras}m_mysql.cpp,"
- use pcre && extras="${extras}m_regex_pcre.cpp,"
- use posix && extras="${extras}m_regex_posix.cpp,"
- use postgres && extras="${extras}m_pgsql.cpp,"
- use sqlite && extras="${extras}m_sqlite3.cpp,"
- use ssl && extras="${extras}m_ssl_openssl.cpp,"
- use tre && extras="${extras}m_regex_tre.cpp,"
-
- if [[ -n "${extras}" ]]; then
- econf --disable-interactive --enable-extras=${extras%,}
- fi
-
- econf \
- --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' '')
-}
-
-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
-
- diropts -o"${PN}" -g"${PN}" -m0700
- dodir "/var/lib/${PN}"
- dodir "/var/lib/${PN}/data"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- keepdir "/var/log/${PN}"
-
- rm -r "${D%/}/etc/${PN}" || die
- dodir "/etc/${PN}"
- dodir "/etc/${PN}/aliases"
- dodir "/etc/${PN}/modules"
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- elog "Before starting ${PN} the first time, you *must* create"
- elog "the /etc/${PN}/${PN}.conf file."
- 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 ! version_is_at_least "2.0.24-r1" "${pv}"; 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2019-11-27 15:18 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2019-11-27 15:18 UTC (permalink / raw
To: gentoo-commits
commit: cae8db96b1181465613bcba3daa08d0639a9e986
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Nov 27 06:13:46 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 15:18:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae8db96
net-irc/inspircd: Drop 3.2.0
Closes: https://bugs.gentoo.org/693692
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13768
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-3.2.0-fix-path-builds.patch | 267 ---------------------
net-irc/inspircd/inspircd-3.2.0.ebuild | 131 ----------
3 files changed, 399 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 6521990c498..02322461d90 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
-DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
diff --git a/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
deleted file mode 100644
index 955b2be7909..00000000000
--- a/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-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 dbd56d2fe..4a7aab514 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
- # #
-@@ -507,7 +507,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.
-@@ -543,7 +543,7 @@
- # the default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1050,13 +1050,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 3bf1c2e99..b451a2f18 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">
-@@ -868,7 +868,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 -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -877,7 +877,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)#
-@@ -967,7 +967,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-
-@@ -1545,7 +1545,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.
-@@ -2123,7 +2123,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
-similarity index 100%
-rename from docs/conf/providers/irccloud.conf.example
-rename to docs/conf/providers/irccloud.conf
-diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
-similarity index 100%
-rename from docs/conf/providers/kiwiirc-com.conf.example
-rename to docs/conf/providers/kiwiirc-com.conf
-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 d77d59fa5..b28d7180d 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -210,8 +210,8 @@ install: target
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/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) $(LOGPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -229,9 +229,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 $(EXAPATH)
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/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 "*************************************"
-@@ -245,7 +245,6 @@ 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:' $(EXAPATH)
-
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
deleted file mode 100644
index 021dc47d8a8..00000000000
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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}"/${PN}-3.2.0-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}/" "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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2020-02-04 14:34 Joonas Niilola
0 siblings, 0 replies; 17+ messages in thread
From: Joonas Niilola @ 2020-02-04 14:34 UTC (permalink / raw
To: gentoo-commits
commit: df74109f2ad83e9d42240bff6b477bcb6e6d9059
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Tue Feb 4 04:55:37 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 4 14:34:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df74109f
net-irc/inspircd: Bump to 3.5.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14546
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.5.0-fix-path-builds.patch | 346 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.5.0.ebuild | 121 +++++++
3 files changed, 468 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 02322461d90..3c3a5047987 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
+DIST inspircd-3.5.0.tar.gz 835283 BLAKE2B d070d8f299ea2460eb58062b345e9fdef04f1aa94cbedda15bc2ed9c32a7627af383a250359dc77ee6cf2c53dd1841c9a77ce0da236d0b9852c5e9d5a0964aae SHA512 64e7be4b013c418577362b33be73b8f7045f1071ccb2c4e83fdf1a96b98656a3541e20c005bc32532007da21d9ba963f534cd14d16c2e1cf8afcf34b22ffad8c
diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
new file mode 100644
index 00000000000..6f156d0cce1
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
@@ -0,0 +1,346 @@
+diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
+similarity index 100%
+rename from docs/conf/codepages/ascii.conf.example
+rename to docs/conf/codepages/ascii.conf
+diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf
+similarity index 97%
+rename from docs/conf/codepages/latin1.conf.example
+rename to docs/conf/codepages/latin1.conf
+index 3beb002fd..f5c6b98dc 100644
+--- a/docs/conf/codepages/latin1.conf.example
++++ b/docs/conf/codepages/latin1.conf
+@@ -39,4 +39,4 @@
+ <cpcase lower="222" upper="254"> # þ => Þ
+
+ # Include the ASCII rules to avoid duplication.
+-<include file="examples/codepages/ascii.conf.example">
++<include file="/etc/inspircd/codepages/ascii.conf">
+diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/rfc1459.conf.example
+rename to docs/conf/codepages/rfc1459.conf
+diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/strict-rfc1459.conf.example
+rename to docs/conf/codepages/strict-rfc1459.conf
+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 98%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index dbd56d2fe..55535b1a0 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -247,10 +247,10 @@
+ # This can be done by using <connect registered="no"> #
+
+ # To enable IRCCloud on your network uncomment this:
+-#<include file="examples/providers/irccloud.conf.example">
++#<include file="/etc/inspircd/providers/irccloud.conf">
+
+ # To enable KiwiIRC.com on your network uncomment this:
+-#<include file="examples/providers/kiwiirc-com.conf.example">
++#<include file="/etc/inspircd/providers/kiwiirc-com.conf">
+
+ # A connect class with <connect:deny> set denies connections from the specified host/IP range.
+ <connect
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -693,7 +693,7 @@
+ # messages (requires the stripcolor module).
+ # - topiclock Channel mode +t - limits changing the topic to (half)ops
+ # You can also configure this on a per-channel basis with a channel mode.
+- # See m_exemptchanops in modules.conf.example for more details.
++ # See m_exemptchanops in modules.conf for more details.
+ exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
+
+ # invitebypassmodes: This allows /INVITE to bypass other channel modes.
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 98%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+index 09b3bb3d5..22db1bdab 100644
+--- a/docs/conf/links.conf.example
++++ b/docs/conf/links.conf
+@@ -121,4 +121,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 links.conf.example without editing it is a security risk">
++<die reason="Using links.conf without editing it is a security risk">
+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 d68248163..b55d368fb 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -576,10 +576,10 @@
+ # and case mapping.
+ #
+ # You should include one of the following files to set your codepage:
+-#<include file="examples/codepages/ascii.conf.example">
+-#<include file="examples/codepages/latin1.conf.example">
+-#<include file="examples/codepages/rfc1459.conf.example">
+-#<include file="examples/codepages/strict-rfc1459.conf.example">
++#<include file="/etc/inspircd/codepages/ascii.conf">
++#<include file="/etc/inspircd/codepages/latin1.conf">
++#<include file="/etc/inspircd/codepages/rfc1459.conf">
++#<include file="/etc/inspircd/codepages/strict-rfc1459.conf">
+ #
+ # You can also define a custom codepage. For details on how to do this
+ # please refer to the docs site:
+@@ -853,7 +853,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">
+@@ -889,7 +889,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -898,7 +898,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)#
+@@ -988,7 +988,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-
+@@ -1575,7 +1575,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.
+@@ -2153,7 +2153,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 96%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index 9281cd4b9..a4ac6964b 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -23,7 +23,7 @@
+ `-.__ `----""" __.-'
+ `--..____..--'
+
+- +---- To change this see \bmotd.txt.example\x ----+
++ +---- To change this see \bmotd.txt \x ----+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x irc.inspircd.org #inspircd |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 96%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index a25d90380..68671a081 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -23,7 +23,7 @@
+ `-.__ `----""" __.-'
+ `--..____..--'
+
+- +-- To change this see \bopermotd.txt.example\x --+
++ +-- To change this see \bopermotd.txt \x --+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x 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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
+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..69a1ab50a 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="/etc/inspircd/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..c1e906ff7 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="/etc/inspircd/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 a57595c9d..42fef2563 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -220,10 +220,10 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
++ @-$(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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -240,11 +240,11 @@ 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 $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
++ -$(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 "*************************************"
+@@ -258,7 +258,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.5.0.ebuild b/net-irc/inspircd/inspircd-3.5.0.ebuild
new file mode 100644
index 00000000000..92c0dfe18f1
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.5.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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}"/${PN}-3.5.0-fix-path-builds.patch )
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "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() {
+ default
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2020-12-31 1:13 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2020-12-31 1:13 UTC (permalink / raw
To: gentoo-commits
commit: 83567ff2355ef80076990e51cc58fcef2cdf1138
Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Wed Dec 30 21:25:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 01:13:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83567ff2
net-irc/inspircd: security cleanup (drop <3.8.1)
Bug: https://bugs.gentoo.org/743205
Bug: https://bugs.gentoo.org/755851
Bug: https://bugs.gentoo.org/755854
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18885
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/inspircd/Manifest | 2 -
.../files/inspircd-2.0.27-fix-path-builds.patch | 257 -------------------
.../files/inspircd-3.4.0-fix-path-builds.patch | 271 ---------------------
net-irc/inspircd/inspircd-2.0.29.ebuild | 115 ---------
net-irc/inspircd/inspircd-3.4.0-r1.ebuild | 121 ---------
5 files changed, 766 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index c650dfb20e9..26f0ac924f9 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1 @@
-DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
-DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa
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
deleted file mode 100644
index da00a8491d1..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-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-3.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
deleted file mode 100644
index 9bf99a6e74d..00000000000
--- a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-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 dbd56d2fe..9cda4baa7 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
- # #
-@@ -507,7 +507,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.
-@@ -543,7 +543,7 @@
- # the default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1050,13 +1050,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 639f02335..ea51e9b67 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf
-@@ -838,7 +838,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">
-@@ -874,7 +874,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 -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -883,7 +883,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)#
-@@ -973,7 +973,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-
-@@ -1551,7 +1551,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.
-@@ -2129,7 +2129,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
-similarity index 100%
-rename from docs/conf/providers/irccloud.conf.example
-rename to docs/conf/providers/irccloud.conf
-diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
-similarity index 100%
-rename from docs/conf/providers/kiwiirc-com.conf.example
-rename to docs/conf/providers/kiwiirc-com.conf
-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 1e6ba5cd0..3751937eb 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -210,9 +210,9 @@ install: target
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
-+ @-$(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) $(LOGPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -229,10 +229,10 @@ 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 $(EXAPATH)
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
-+ -$(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 "*************************************"
-@@ -246,7 +246,6 @@ 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:' $(EXAPATH)
-
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- ./configure --update
diff --git a/net-irc/inspircd/inspircd-2.0.29.ebuild b/net-irc/inspircd/inspircd-2.0.29.ebuild
deleted file mode 100644
index 5e0f22ce457..00000000000
--- a/net-irc/inspircd/inspircd-2.0.29.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-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="
- acct-group/inspircd
- acct-user/inspircd
- 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}"/${PN}-2.0.27-fix-path-builds.patch )
-
-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/inspircd-3.4.0-r1.ebuild b/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
deleted file mode 100644
index 174cabeb02b..00000000000
--- a/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-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="
- acct-group/inspircd
- acct-user/inspircd
- 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}"/${PN}-3.4.0-fix-path-builds.patch )
-
-src_prepare() {
- default
-
- # Patch the inspircd launcher with the inspircd user
- sed -i -e "s/@UID@/${PN}/" "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() {
- default
-
- insinto "/usr/include/${PN}"
- doins -r include/.
-
- 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2021-03-06 0:11 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2021-03-06 0:11 UTC (permalink / raw
To: gentoo-commits
commit: b39f481d14d9ed19849cdfca9698094cb7f224fa
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Fri Mar 5 05:55:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 00:11:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39f481d
net-irc/inspircd: Add 3.9.0
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19767
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.9.0-fix-path-builds.patch | 384 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.9.0.ebuild | 121 +++++++
3 files changed, 506 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 26f0ac924f9..82f8b6b0876 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1 +1,2 @@
DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa
+DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70
diff --git a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch
new file mode 100644
index 00000000000..2c821586bbf
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch
@@ -0,0 +1,384 @@
+From 675020067b59575c3bef2185aad42f046ea0c83d Mon Sep 17 00:00:00 2001
+From: Wade Cline <wadecline@hotmail.com>
+Date: Mon, 3 Feb 2020 19:10:54 -0800
+Subject: [PATCH] Fix build paths
+
+---
+ .../{ascii.conf.example => ascii.conf} | 0
+ .../{latin1.conf.example => latin1.conf} | 2 +-
+ .../{rfc1459.conf.example => rfc1459.conf} | 0
+ ...c1459.conf.example => strict-rfc1459.conf} | 0
+ .../conf/{filter.conf.example => filter.conf} | 0
+ .../conf/{helpop.conf.example => helpop.conf} | 0
+ .../{inspircd.conf.example => inspircd.conf} | 20 +++++++++----------
+ docs/conf/{links.conf.example => links.conf} | 2 +-
+ .../{modules.conf.example => modules.conf} | 20 +++++++++----------
+ docs/conf/{motd.txt.example => motd.txt} | 2 +-
+ .../{opermotd.txt.example => opermotd.txt} | 2 +-
+ docs/conf/{opers.conf.example => opers.conf} | 2 +-
+ .../{irccloud.conf.example => irccloud.conf} | 0
+ docs/conf/{quotes.txt.example => quotes.txt} | 0
+ .../{anope.conf.example => anope.conf} | 2 +-
+ .../{atheme.conf.example => atheme.conf} | 2 +-
+ .../{generic.conf.example => generic.conf} | 0
+ make/template/main.mk | 19 +++++++++---------
+ 18 files changed, 36 insertions(+), 37 deletions(-)
+ rename docs/conf/codepages/{ascii.conf.example => ascii.conf} (100%)
+ rename docs/conf/codepages/{latin1.conf.example => latin1.conf} (97%)
+ rename docs/conf/codepages/{rfc1459.conf.example => rfc1459.conf} (100%)
+ rename docs/conf/codepages/{strict-rfc1459.conf.example => strict-rfc1459.conf} (100%)
+ rename docs/conf/{filter.conf.example => filter.conf} (100%)
+ rename docs/conf/{helpop.conf.example => helpop.conf} (100%)
+ rename docs/conf/{inspircd.conf.example => inspircd.conf} (99%)
+ rename docs/conf/{links.conf.example => links.conf} (98%)
+ rename docs/conf/{modules.conf.example => modules.conf} (99%)
+ rename docs/conf/{motd.txt.example => motd.txt} (96%)
+ rename docs/conf/{opermotd.txt.example => opermotd.txt} (96%)
+ rename docs/conf/{opers.conf.example => opers.conf} (99%)
+ rename docs/conf/providers/{irccloud.conf.example => irccloud.conf} (100%)
+ rename docs/conf/{quotes.txt.example => quotes.txt} (100%)
+ rename docs/conf/services/{anope.conf.example => anope.conf} (86%)
+ rename docs/conf/services/{atheme.conf.example => atheme.conf} (98%)
+ rename docs/conf/services/{generic.conf.example => generic.conf} (100%)
+
+diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
+similarity index 100%
+rename from docs/conf/codepages/ascii.conf.example
+rename to docs/conf/codepages/ascii.conf
+diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf
+similarity index 97%
+rename from docs/conf/codepages/latin1.conf.example
+rename to docs/conf/codepages/latin1.conf
+index 3beb002fd..f5c6b98dc 100644
+--- a/docs/conf/codepages/latin1.conf.example
++++ b/docs/conf/codepages/latin1.conf
+@@ -39,4 +39,4 @@
+ <cpcase lower="222" upper="254"> # þ => Þ
+
+ # Include the ASCII rules to avoid duplication.
+-<include file="examples/codepages/ascii.conf.example">
++<include file="/etc/inspircd/codepages/ascii.conf">
+diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/rfc1459.conf.example
+rename to docs/conf/codepages/rfc1459.conf
+diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/strict-rfc1459.conf.example
+rename to docs/conf/codepages/strict-rfc1459.conf
+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 cdfb6f3c2..f0d17ceff 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -242,7 +242,7 @@
+ # This can be done by using <connect registered="no"> #
+
+ # To enable IRCCloud on your network uncomment this:
+-#<include file="examples/providers/irccloud.conf.example">
++#<include file="/etc/inspircd/providers/irccloud.conf">
+
+ # A connect class with <connect:deny> set denies connections from the specified host/IP range.
+ <connect
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -698,7 +698,7 @@
+ # - topiclock Channel mode +t - limits changing the topic to (half)ops
+ # You can also configure this on a per-channel basis with a channel mode and
+ # even negate the configured exemptions below.
+- # See exemptchanops in modules.conf.example for more details.
++ # See exemptchanops in modules.conf for more details.
+ exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
+
+ # invitebypassmodes: This allows /INVITE to bypass other channel modes.
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 98%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+index 3b25e86f4..1208253a6 100644
+--- a/docs/conf/links.conf.example
++++ b/docs/conf/links.conf
+@@ -143,4 +143,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 links.conf.example without editing it is a security risk">
++<die reason="Using links.conf without editing it is a security risk">
+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 d236d6cb9..8c80c5352 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -617,10 +617,10 @@
+ #<module name="codepage">
+ #
+ # You should include one of the following files to set your codepage:
+-#<include file="examples/codepages/ascii.conf.example">
+-#<include file="examples/codepages/latin1.conf.example">
+-#<include file="examples/codepages/rfc1459.conf.example">
+-#<include file="examples/codepages/strict-rfc1459.conf.example">
++#<include file="/etc/inspircd/codepages/ascii.conf">
++#<include file="/etc/inspircd/codepages/latin1.conf">
++#<include file="/etc/inspircd/codepages/rfc1459.conf">
++#<include file="/etc/inspircd/codepages/strict-rfc1459.conf">
+ #
+ # You can also define a custom codepage. For details on how to do this
+ # please refer to the docs site:
+@@ -904,7 +904,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> #
+ # Furthermore, the exemptions configured in <options:exemptchanops> #
+@@ -942,7 +942,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -951,7 +951,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)#
+@@ -1041,7 +1041,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-
+@@ -1646,7 +1646,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.
+@@ -2260,7 +2260,7 @@
+ # connections in order to oper up. It is highly recommended to load
+ # this module if you use TLS (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 96%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index cd993e9a3..0687a8aa0 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -21,7 +21,7 @@
+ \__/ /(_/ \__/
+ (__/
+
+- +---- To change this see \bmotd.txt.example\x ----+
++ +---- To change this see \bmotd.txt \x ----+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x irc.inspircd.org #inspircd |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 96%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index b0d9b4816..b0d37f385 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -21,7 +21,7 @@
+ \__/ /(_/ \__/
+ (__/
+
+- +-- To change this see \bopermotd.txt.example\x --+
++ +-- To change this see \bopermotd.txt \x --+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x 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 d8c266b1f..9517b3685 100644
+--- a/docs/conf/opers.conf.example
++++ b/docs/conf/opers.conf
+@@ -182,4 +182,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+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..69a1ab50a 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="/etc/inspircd/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..c1e906ff7 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="/etc/inspircd/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 a8783aa05..de9bbaa4e 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -214,10 +214,10 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
++ @-$(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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -238,11 +238,11 @@ endif
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
++ -$(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_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
+ @echo ""
+@@ -256,7 +256,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
+--
+2.26.2
+
diff --git a/net-irc/inspircd/inspircd-3.9.0.ebuild b/net-irc/inspircd/inspircd-3.9.0.ebuild
new file mode 100644
index 00000000000..3dfa1dea335
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.9.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://www.inspircd.org/"
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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 )
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "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() {
+ default
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2021-05-28 3:14 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2021-05-28 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 8651d910c504a5685f6a33f8c82274887b431251
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sun May 23 07:26:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 03:14:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8651d910
net-irc/inspircd: Add 3.10.0
Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --force
Bug: https://bugs.gentoo.org/791589
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20942
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.10.0-fix-path-builds.patch | 493 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.10.0.ebuild | 121 +++++
3 files changed, 615 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 4e88d3d671d..0d3fc592437 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1 +1,2 @@
+DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fce04896c820a9055b17103853b0091515f8a52448ecb1accbe39eef3f49b01acbecae73894b76f91bb4b75edf821 SHA512 6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944
DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70
diff --git a/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
new file mode 100644
index 00000000000..e1def8043c5
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
@@ -0,0 +1,493 @@
+diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
+similarity index 100%
+rename from docs/conf/codepages/ascii.conf.example
+rename to docs/conf/codepages/ascii.conf
+diff --git a/docs/conf/codepages/iso-8859-1.conf.example b/docs/conf/codepages/iso-8859-1.conf.example
+deleted file mode 100644
+index 83a772600..000000000
+--- a/docs/conf/codepages/iso-8859-1.conf.example
++++ /dev/null
+@@ -1,42 +0,0 @@
+-# This file contains ISO 8859-1 codepage rules for use with the codepage module.
+-
+-<codepage name="iso-8859-1">
+-
+-<cpchars begin="192" end="214" front="yes"> # ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ
+-<cpchars begin="216" end="246" front="yes"> # ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö
+-<cpchars begin="248" end="255" front="yes"> # øùúûüýþÿ
+-
+-<cpcase lower="83" upper="223"> # ß => S
+-<cpcase lower="192" upper="224"> # à => À
+-<cpcase lower="193" upper="225"> # á => Á
+-<cpcase lower="194" upper="226"> # â => Â
+-<cpcase lower="195" upper="227"> # ã => Ã
+-<cpcase lower="196" upper="228"> # ä => Ä
+-<cpcase lower="197" upper="229"> # å => Å
+-<cpcase lower="198" upper="230"> # æ => Æ
+-<cpcase lower="199" upper="231"> # ç => Ç
+-<cpcase lower="200" upper="232"> # è => È
+-<cpcase lower="201" upper="233"> # é => É
+-<cpcase lower="202" upper="234"> # ê => Ê
+-<cpcase lower="203" upper="235"> # ë => Ë
+-<cpcase lower="204" upper="236"> # ì => Ì
+-<cpcase lower="205" upper="237"> # í => Í
+-<cpcase lower="206" upper="238"> # î => Î
+-<cpcase lower="207" upper="239"> # ï => Ï
+-<cpcase lower="208" upper="240"> # ð => Ð
+-<cpcase lower="209" upper="241"> # ñ => Ñ
+-<cpcase lower="210" upper="242"> # ò => Ò
+-<cpcase lower="211" upper="243"> # ó => Ó
+-<cpcase lower="212" upper="244"> # ô => Ô
+-<cpcase lower="213" upper="245"> # õ => Õ
+-<cpcase lower="214" upper="246"> # ö => Ö
+-<cpcase lower="216" upper="248"> # ø => Ø
+-<cpcase lower="217" upper="249"> # ù => Ù
+-<cpcase lower="218" upper="250"> # ú => Ú
+-<cpcase lower="219" upper="251"> # û => Û
+-<cpcase lower="220" upper="252"> # ü => Ü
+-<cpcase lower="221" upper="253"> # ý => Ý
+-<cpcase lower="222" upper="254"> # þ => Þ
+-
+-# Include the ASCII rules to avoid duplication.
+-<include file="examples/codepages/ascii.conf.example">
+diff --git a/docs/conf/codepages/iso-8859-2.conf.example b/docs/conf/codepages/iso-8859-2.conf.example
+deleted file mode 100644
+index df41d88fb..000000000
+--- a/docs/conf/codepages/iso-8859-2.conf.example
++++ /dev/null
+@@ -1,60 +0,0 @@
+-# This file contains ISO 8859-2 codepage rules for use with the codepage module.
+-
+-<codepage name="iso-8859-2">
+-
+-<cpchars index="161" front="yes"> # Ą
+-<cpchars index="163" front="yes"> # Ł
+-<cpchars begin="165" end="166" front="yes"> # ĽŚ
+-<cpchars begin="169" end="172" front="yes"> # ŠŞŤŹ
+-<cpchars begin="174" end="175" front="yes"> # ŽŻ
+-<cpchars index="177" front="yes"> # ą
+-<cpchars index="179" front="yes"> # ł
+-<cpchars begin="181" end="182" front="yes"> # ľś
+-<cpchars begin="185" end="188" front="yes"> # šşťź
+-<cpchars begin="190" end="214" front="yes"> # žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ
+-<cpchars begin="216" end="246" front="yes"> # ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö
+-<cpchars begin="248" end="254" front="yes"> # řůúűüýţ
+-
+-<cpcase lower="177" upper="161"> # ą => Ą
+-<cpcase lower="179" upper="163"> # ł => Ł
+-<cpcase lower="181" upper="165"> # ľ => Ľ
+-<cpcase lower="182" upper="166"> # ś => Ś
+-<cpcase lower="185" upper="169"> # š => Š
+-<cpcase lower="186" upper="170"> # ş => Ş
+-<cpcase lower="187" upper="171"> # ť => Ť
+-<cpcase lower="188" upper="172"> # ź => Ź
+-<cpcase lower="190" upper="174"> # ž => Ž
+-<cpcase lower="191" upper="175"> # ż => Ż
+-<cpcase lower="224" upper="192"> # ŕ => Ŕ
+-<cpcase lower="225" upper="193"> # á => Á
+-<cpcase lower="226" upper="194"> # â => Â
+-<cpcase lower="227" upper="195"> # ă => Ă
+-<cpcase lower="228" upper="196"> # ä => Ä
+-<cpcase lower="229" upper="197"> # ĺ => Ĺ
+-<cpcase lower="230" upper="198"> # ć => Ć
+-<cpcase lower="231" upper="199"> # ç => Ç
+-<cpcase lower="232" upper="200"> # č => Č
+-<cpcase lower="233" upper="201"> # é => É
+-<cpcase lower="234" upper="202"> # ę => Ę
+-<cpcase lower="235" upper="203"> # ë => Ë
+-<cpcase lower="236" upper="204"> # ě => Ě
+-<cpcase lower="237" upper="205"> # í => Í
+-<cpcase lower="238" upper="206"> # î => Î
+-<cpcase lower="239" upper="207"> # ď => Ď
+-<cpcase lower="240" upper="208"> # đ => Đ
+-<cpcase lower="241" upper="209"> # ń => Ń
+-<cpcase lower="242" upper="210"> # ň => Ň
+-<cpcase lower="243" upper="211"> # ó => Ó
+-<cpcase lower="244" upper="212"> # ô => Ô
+-<cpcase lower="245" upper="213"> # ő => Ő
+-<cpcase lower="246" upper="214"> # ö => Ö
+-<cpcase lower="248" upper="216"> # ř => Ř
+-<cpcase lower="249" upper="217"> # ů => Ů
+-<cpcase lower="250" upper="218"> # ú => Ú
+-<cpcase lower="251" upper="219"> # ű => Ű
+-<cpcase lower="252" upper="220"> # ü => Ü
+-<cpcase lower="253" upper="221"> # ý => Ý
+-<cpcase lower="254" upper="222"> # ţ => Ţ
+-
+-# Include the ASCII rules to avoid duplication.
+-<include file="examples/codepages/ascii.conf.example">
+diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/rfc1459.conf.example
+rename to docs/conf/codepages/rfc1459.conf
+diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/strict-rfc1459.conf.example
+rename to docs/conf/codepages/strict-rfc1459.conf
+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 f07f21cdd..a731c0c1c 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -242,7 +242,7 @@
+ # This can be done by using <connect registered="no"> #
+
+ # To enable IRCCloud on your network uncomment this:
+-#<include file="examples/providers/irccloud.conf.example">
++#<include file="/etc/inspircd/providers/irccloud.conf">
+
+ # A connect class with <connect:deny> set denies connections from the specified host/IP range.
+ <connect
+@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -507,7 +507,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.
+@@ -543,7 +543,7 @@
+ # default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -698,7 +698,7 @@
+ # - topiclock Channel mode +t - limits changing the topic to (half)ops
+ # You can also configure this on a per-channel basis with a channel mode and
+ # even negate the configured exemptions below.
+- # See exemptchanops in modules.conf.example for more details.
++ # See exemptchanops in modules.conf for more details.
+ exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
+
+ # invitebypassmodes: This allows /INVITE to bypass other channel modes.
+@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1050,13 +1050,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 98%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+index 19d770d35..32986de9d 100644
+--- a/docs/conf/links.conf.example
++++ b/docs/conf/links.conf
+@@ -143,4 +143,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 links.conf.example without editing it is a security risk">
++<die reason="Using links.conf without editing it is a security risk">
+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 6eb61cc38..feed59e18 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -617,11 +617,11 @@
+ #<module name="codepage">
+ #
+ # You should include one of the following files to set your codepage:
+-#<include file="examples/codepages/ascii.conf.example">
+-#<include file="examples/codepages/iso-8859-1.conf.example">
+-#<include file="examples/codepages/iso-8859-2.conf.example">
+-#<include file="examples/codepages/rfc1459.conf.example">
+-#<include file="examples/codepages/strict-rfc1459.conf.example">
++#<include file="/etc/inspircd/codepages/ascii.conf.example">
++#<include file="/etc/inspircd/codepages/iso-8859-1.conf.example">
++#<include file="/etc/inspircd/codepages/iso-8859-2.conf.example">
++#<include file="/etc/inspircd/codepages/rfc1459.conf.example">
++#<include file="/etc/inspircd/codepages/strict-rfc1459.conf.example">
+ #
+ # You can also define a custom codepage. For details on how to do this
+ # please refer to the docs site:
+@@ -905,7 +905,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> #
+ # Furthermore, the exemptions configured in <options:exemptchanops> #
+@@ -943,7 +943,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 -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -952,7 +952,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)#
+@@ -1042,7 +1042,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-
+@@ -1647,7 +1647,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.
+@@ -2261,7 +2261,7 @@
+ # connections in order to oper up. It is highly recommended to load
+ # this module if you use TLS (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 96%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index cd993e9a3..0687a8aa0 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -21,7 +21,7 @@
+ \__/ /(_/ \__/
+ (__/
+
+- +---- To change this see \bmotd.txt.example\x ----+
++ +---- To change this see \bmotd.txt \x ----+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x irc.inspircd.org #inspircd |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 96%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index b0d9b4816..b0d37f385 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -21,7 +21,7 @@
+ \__/ /(_/ \__/
+ (__/
+
+- +-- To change this see \bopermotd.txt.example\x --+
++ +-- To change this see \bopermotd.txt \x --+
+ | |
+ | * \bWeb:\x https://www.inspircd.org |
+ | * \bIRC:\x 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 d8c266b1f..9517b3685 100644
+--- a/docs/conf/opers.conf.example
++++ b/docs/conf/opers.conf
+@@ -182,4 +182,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/providers/dronebl.conf.example b/docs/conf/providers/dronebl.conf.example
+deleted file mode 100644
+index 72055d522..000000000
+--- a/docs/conf/providers/dronebl.conf.example
++++ /dev/null
+@@ -1,11 +0,0 @@
+-# This file contains configuration for using the dnsbl module with
+-# the DroneBL DNSBL. See https://dronebl.org/ for more information on
+-# DroneBL.
+-
+-<dnsbl name="DroneBL"
+- domain="dnsbl.dronebl.org"
+- type="record"
+- records="3,5,6,7,8,9,10,11,13,14,15,16,17,19"
+- action="zline"
+- duration="7d"
+- reason="You are listed in DroneBL. Please visit https://dronebl.org/lookup.do?ip=%ip% for more information.">
+diff --git a/docs/conf/providers/efnet-rbl.conf.example b/docs/conf/providers/efnet-rbl.conf.example
+deleted file mode 100644
+index 78dce53cb..000000000
+--- a/docs/conf/providers/efnet-rbl.conf.example
++++ /dev/null
+@@ -1,11 +0,0 @@
+-# This file contains configuration for using the dnsbl module with
+-# the EFnet RBL. See https://rbl.efnetrbl.org/ for more information
+-# on the EFnet RBL.
+-
+-<dnsbl name="EFnet RBL"
+- domain="rbl.efnetrbl.org"
+- type="record"
+- records="1,2,3,4,5"
+- action="zline"
+- duration="7d"
+- reason="You are listed in the EFnet RBL. Please visit https://rbl.efnetrbl.org/?i=%ip% for more information.">
+diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/torexit.conf.example b/docs/conf/providers/torexit.conf.example
+deleted file mode 100644
+index abc35c696..000000000
+--- a/docs/conf/providers/torexit.conf.example
++++ /dev/null
+@@ -1,12 +0,0 @@
+-# This file contains configuration for using the dnsbl module with
+-# the dan.me.uk Tor exit node DNSBL. See https://www.dan.me.uk/dnsbl
+-# for more information on the dan.me.uk Tor exit node DNSBL.
+-
+-<dnsbl name="torexit.dan.me.uk"
+- domain="torexit.dan.me.uk"
+- type="record"
+- records="100"
+- timeout="10s"
+- action="zline"
+- duration="7d"
+- reason="Tor exit nodes are not allowed on this network. See https://metrics.torproject.org/rs.html#search/%ip% for more information.">
+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..69a1ab50a 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="/etc/inspircd/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..c1e906ff7 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="/etc/inspircd/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 a8783aa05..de9bbaa4e 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -214,10 +214,10 @@ install: target
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
++ @-$(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) $(LOGPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -238,11 +238,11 @@ endif
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
++ -$(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_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
+ @echo ""
+@@ -256,7 +256,6 @@ 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:' $(EXAPATH)
+
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ ./configure --update
diff --git a/net-irc/inspircd/inspircd-3.10.0.ebuild b/net-irc/inspircd/inspircd-3.10.0.ebuild
new file mode 100644
index 00000000000..3dfa1dea335
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.10.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://www.inspircd.org/"
+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="
+ acct-group/inspircd
+ acct-user/inspircd
+ 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 )
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "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() {
+ default
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
@ 2021-05-31 8:20 Sam James
0 siblings, 0 replies; 17+ messages in thread
From: Sam James @ 2021-05-31 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 2a07167f0bb8ee125b1281c8a96a74a760ef5c82
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sat May 29 18:38:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 31 08:15:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a07167f
net-irc/inspircd: Drop 3.9.0
Bug: https://bugs.gentoo.org/791589
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21040
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-3.9.0-fix-path-builds.patch | 384 ---------------------
net-irc/inspircd/inspircd-3.9.0.ebuild | 121 -------
3 files changed, 506 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 53ada51b850..65e95bbd2e8 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
DIST inspircd-3.10.0-fix-path-builds.patch.bz2 5316 BLAKE2B 42831f5f1c442b0492dee1d49469361ca797e743399bf8cffd6069227fbaf0123ab43eda81ad0f732bed289111238e00f0e9b3351a555fc4b14f24fe18bb8251 SHA512 e1479970050dca02be092d5575077342ce3e517baf1c9b1d80e4b2a52559786dca387c685505d6c42b812c9206961eef057ad07a2f4966f9922a16a387559eb0
DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fce04896c820a9055b17103853b0091515f8a52448ecb1accbe39eef3f49b01acbecae73894b76f91bb4b75edf821 SHA512 6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944
-DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70
diff --git a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch
deleted file mode 100644
index 2c821586bbf..00000000000
--- a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 675020067b59575c3bef2185aad42f046ea0c83d Mon Sep 17 00:00:00 2001
-From: Wade Cline <wadecline@hotmail.com>
-Date: Mon, 3 Feb 2020 19:10:54 -0800
-Subject: [PATCH] Fix build paths
-
----
- .../{ascii.conf.example => ascii.conf} | 0
- .../{latin1.conf.example => latin1.conf} | 2 +-
- .../{rfc1459.conf.example => rfc1459.conf} | 0
- ...c1459.conf.example => strict-rfc1459.conf} | 0
- .../conf/{filter.conf.example => filter.conf} | 0
- .../conf/{helpop.conf.example => helpop.conf} | 0
- .../{inspircd.conf.example => inspircd.conf} | 20 +++++++++----------
- docs/conf/{links.conf.example => links.conf} | 2 +-
- .../{modules.conf.example => modules.conf} | 20 +++++++++----------
- docs/conf/{motd.txt.example => motd.txt} | 2 +-
- .../{opermotd.txt.example => opermotd.txt} | 2 +-
- docs/conf/{opers.conf.example => opers.conf} | 2 +-
- .../{irccloud.conf.example => irccloud.conf} | 0
- docs/conf/{quotes.txt.example => quotes.txt} | 0
- .../{anope.conf.example => anope.conf} | 2 +-
- .../{atheme.conf.example => atheme.conf} | 2 +-
- .../{generic.conf.example => generic.conf} | 0
- make/template/main.mk | 19 +++++++++---------
- 18 files changed, 36 insertions(+), 37 deletions(-)
- rename docs/conf/codepages/{ascii.conf.example => ascii.conf} (100%)
- rename docs/conf/codepages/{latin1.conf.example => latin1.conf} (97%)
- rename docs/conf/codepages/{rfc1459.conf.example => rfc1459.conf} (100%)
- rename docs/conf/codepages/{strict-rfc1459.conf.example => strict-rfc1459.conf} (100%)
- rename docs/conf/{filter.conf.example => filter.conf} (100%)
- rename docs/conf/{helpop.conf.example => helpop.conf} (100%)
- rename docs/conf/{inspircd.conf.example => inspircd.conf} (99%)
- rename docs/conf/{links.conf.example => links.conf} (98%)
- rename docs/conf/{modules.conf.example => modules.conf} (99%)
- rename docs/conf/{motd.txt.example => motd.txt} (96%)
- rename docs/conf/{opermotd.txt.example => opermotd.txt} (96%)
- rename docs/conf/{opers.conf.example => opers.conf} (99%)
- rename docs/conf/providers/{irccloud.conf.example => irccloud.conf} (100%)
- rename docs/conf/{quotes.txt.example => quotes.txt} (100%)
- rename docs/conf/services/{anope.conf.example => anope.conf} (86%)
- rename docs/conf/services/{atheme.conf.example => atheme.conf} (98%)
- rename docs/conf/services/{generic.conf.example => generic.conf} (100%)
-
-diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
-similarity index 100%
-rename from docs/conf/codepages/ascii.conf.example
-rename to docs/conf/codepages/ascii.conf
-diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf
-similarity index 97%
-rename from docs/conf/codepages/latin1.conf.example
-rename to docs/conf/codepages/latin1.conf
-index 3beb002fd..f5c6b98dc 100644
---- a/docs/conf/codepages/latin1.conf.example
-+++ b/docs/conf/codepages/latin1.conf
-@@ -39,4 +39,4 @@
- <cpcase lower="222" upper="254"> # þ => Þ
-
- # Include the ASCII rules to avoid duplication.
--<include file="examples/codepages/ascii.conf.example">
-+<include file="/etc/inspircd/codepages/ascii.conf">
-diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
-similarity index 100%
-rename from docs/conf/codepages/rfc1459.conf.example
-rename to docs/conf/codepages/rfc1459.conf
-diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
-similarity index 100%
-rename from docs/conf/codepages/strict-rfc1459.conf.example
-rename to docs/conf/codepages/strict-rfc1459.conf
-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 cdfb6f3c2..f0d17ceff 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -242,7 +242,7 @@
- # This can be done by using <connect registered="no"> #
-
- # To enable IRCCloud on your network uncomment this:
--#<include file="examples/providers/irccloud.conf.example">
-+#<include file="/etc/inspircd/providers/irccloud.conf">
-
- # A connect class with <connect:deny> set denies connections from the specified host/IP range.
- <connect
-@@ -494,11 +494,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 -#-#-#-#-#-#-#-#-#-#
- # #
-@@ -507,7 +507,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.
-@@ -543,7 +543,7 @@
- # default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -698,7 +698,7 @@
- # - topiclock Channel mode +t - limits changing the topic to (half)ops
- # You can also configure this on a per-channel basis with a channel mode and
- # even negate the configured exemptions below.
-- # See exemptchanops in modules.conf.example for more details.
-+ # See exemptchanops in modules.conf for more details.
- exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
-
- # invitebypassmodes: This allows /INVITE to bypass other channel modes.
-@@ -1041,7 +1041,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 #-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1050,13 +1050,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 98%
-rename from docs/conf/links.conf.example
-rename to docs/conf/links.conf
-index 3b25e86f4..1208253a6 100644
---- a/docs/conf/links.conf.example
-+++ b/docs/conf/links.conf
-@@ -143,4 +143,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 links.conf.example without editing it is a security risk">
-+<die reason="Using links.conf without editing it is a security risk">
-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 d236d6cb9..8c80c5352 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf
-@@ -617,10 +617,10 @@
- #<module name="codepage">
- #
- # You should include one of the following files to set your codepage:
--#<include file="examples/codepages/ascii.conf.example">
--#<include file="examples/codepages/latin1.conf.example">
--#<include file="examples/codepages/rfc1459.conf.example">
--#<include file="examples/codepages/strict-rfc1459.conf.example">
-+#<include file="/etc/inspircd/codepages/ascii.conf">
-+#<include file="/etc/inspircd/codepages/latin1.conf">
-+#<include file="/etc/inspircd/codepages/rfc1459.conf">
-+#<include file="/etc/inspircd/codepages/strict-rfc1459.conf">
- #
- # You can also define a custom codepage. For details on how to do this
- # please refer to the docs site:
-@@ -904,7 +904,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> #
- # Furthermore, the exemptions configured in <options:exemptchanops> #
-@@ -942,7 +942,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 -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -951,7 +951,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)#
-@@ -1041,7 +1041,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-
-@@ -1646,7 +1646,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.
-@@ -2260,7 +2260,7 @@
- # connections in order to oper up. It is highly recommended to load
- # this module if you use TLS (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 96%
-rename from docs/conf/motd.txt.example
-rename to docs/conf/motd.txt
-index cd993e9a3..0687a8aa0 100644
---- a/docs/conf/motd.txt.example
-+++ b/docs/conf/motd.txt
-@@ -21,7 +21,7 @@
- \__/ /(_/ \__/
- (__/
-
-- +---- To change this see \bmotd.txt.example\x ----+
-+ +---- To change this see \bmotd.txt \x ----+
- | |
- | * \bWeb:\x https://www.inspircd.org |
- | * \bIRC:\x irc.inspircd.org #inspircd |
-diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
-similarity index 96%
-rename from docs/conf/opermotd.txt.example
-rename to docs/conf/opermotd.txt
-index b0d9b4816..b0d37f385 100644
---- a/docs/conf/opermotd.txt.example
-+++ b/docs/conf/opermotd.txt
-@@ -21,7 +21,7 @@
- \__/ /(_/ \__/
- (__/
-
-- +-- To change this see \bopermotd.txt.example\x --+
-+ +-- To change this see \bopermotd.txt \x --+
- | |
- | * \bWeb:\x https://www.inspircd.org |
- | * \bIRC:\x 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 d8c266b1f..9517b3685 100644
---- a/docs/conf/opers.conf.example
-+++ b/docs/conf/opers.conf
-@@ -182,4 +182,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/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
-similarity index 100%
-rename from docs/conf/providers/irccloud.conf.example
-rename to docs/conf/providers/irccloud.conf
-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..69a1ab50a 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="/etc/inspircd/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..c1e906ff7 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="/etc/inspircd/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 a8783aa05..de9bbaa4e 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -214,10 +214,10 @@ install: target
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
-+ @-$(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) $(LOGPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -238,11 +238,11 @@ endif
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
-+ -$(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_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
- @echo ""
-@@ -256,7 +256,6 @@ 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:' $(EXAPATH)
-
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- ./configure --update
---
-2.26.2
-
diff --git a/net-irc/inspircd/inspircd-3.9.0.ebuild b/net-irc/inspircd/inspircd-3.9.0.ebuild
deleted file mode 100644
index 024100c3274..00000000000
--- a/net-irc/inspircd/inspircd-3.9.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://www.inspircd.org/"
-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="
- acct-group/inspircd
- acct-user/inspircd
- 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 )
-
-src_prepare() {
- default
-
- # Patch the inspircd launcher with the inspircd user
- sed -i -e "s/@UID@/${PN}/" "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() {
- default
-
- insinto "/usr/include/${PN}"
- doins -r include/.
-
- 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-05-31 8:20 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-01 11:50 [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-05-31 8:20 Sam James
2021-05-28 3:14 Sam James
2021-03-06 0:11 Sam James
2020-12-31 1:13 Sam James
2020-02-04 14:34 Joonas Niilola
2019-11-27 15:18 Joonas Niilola
2019-11-27 15:18 Joonas Niilola
2019-11-14 6:26 Joonas Niilola
2019-10-25 18:17 Brian Evans
2019-09-01 11:50 Joonas Niilola
2019-07-17 14:23 Michał Górny
2019-07-17 14:23 Michał Górny
2018-12-16 23:53 Andreas Sturmlechner
2018-09-30 20:07 Michał Górny
2018-05-30 11:43 Michał Górny
2017-11-29 23:19 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox