* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2015-09-24 2:06 Ian Delaney
0 siblings, 0 replies; 15+ messages in thread
From: Ian Delaney @ 2015-09-24 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 62aa8b0d32d1957aa1426baaaeabdcf8b28e9c90
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 02:05:19 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 02:06:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62aa8b0d
net-irc/inspircd: cleanup wrt bug #545034
Package-Manager: portage-2.2.20.1
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-2.0.18-fix-path-builds.patch | 208 ---------------------
net-irc/inspircd/files/inspircd-2.0.18-init | 39 ----
net-irc/inspircd/inspircd-2.0.18.ebuild | 109 -----------
4 files changed, 357 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index e319fcd..46b960a 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1 @@
-DIST inspircd-2.0.18.tar.gz 747846 SHA256 45168ed075e66b379cdb9bae01652a23a33304817363e519fcbb1a194783295d SHA512 64e5d71da5d96afd1261b2a771f27f0c38b505812753a636c51d604f6166ab8a49106ae2da8291ecd86f894d2cfea63e9fcb105efdd7ce137bdf083235db7021 WHIRLPOOL c86846a170705590ae8b44023feb3adaa636c7af1d9e33a0cf560b1ebe5cc14740636c82e8c65e0f12357d9863ef36a66f0efa6aa20d2780bcef5ddd53888a6b
DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
diff --git a/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch
deleted file mode 100644
index 065ff2c..0000000
--- a/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example 2014-10-26 18:05:40.000000000 +0100
-+++ b/docs/conf/inspircd.conf.example 2014-10-27 15:03:54.039999807 +0100
-@@ -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/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk 2014-10-26 18:05:40.000000000 +0100
-+++ b/make/template/main.mk 2014-10-27 15:08:05.289999800 +0100
-@@ -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,41 +75,41 @@
- 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
-
- 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
-
-@@ -128,10 +128,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
-@@ -144,10 +145,10 @@
- @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
-
--@IFDEF T
-+@IFDEF TGT
- HEADER =
- FOOTER = target
-- TARGET = $(T)
-+ TARGET = $(TGT)
- @ENDIF
-
- @IFEQ $(DBGOK) 0
-@@ -222,8 +223,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
-@@ -231,9 +232,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! *"
-@@ -246,7 +247,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 2014-10-26 18:05:40.000000000 +0100
-+++ b/make/unit-cc.pl 2014-10-27 15:08:33.819999800 +0100
-@@ -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-2.0.18-init b/net-irc/inspircd/files/inspircd-2.0.18-init
deleted file mode 100644
index 9c81a6b..0000000
--- a/net-irc/inspircd/files/inspircd-2.0.18-init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_commands="rehash version"
-
-depend() {
- need net
- provide ircd
-}
-
-start() {
- ebegin "Starting InspIRCd"
- checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd
- start-stop-daemon --start --quiet --user inspircd \
- --exec /usr/bin/inspircd -- \
- --config /etc/inspircd/inspircd.conf \
- --logfile /var/log/inspircd/ircd.log
- eend $?
-}
-
-stop() {
- ebegin "Stopping InspIRCd"
- start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
- eend $?
-}
-
-rehash() {
- ebegin "Rehashing InspIRCd"
- /usr/lib/inspircd/inspircd.launcher/inspircd rehash
- eend $?
-}
-
-version() {
- ebegin "Retrieve InspIRCd version"
- /usr/lib/inspircd/inspircd.launcher/inspircd version
- eend $?
-}
diff --git a/net-irc/inspircd/inspircd-2.0.18.ebuild b/net-irc/inspircd/inspircd-2.0.18.ebuild
deleted file mode 100644
index abeae92..0000000
--- a/net-irc/inspircd/inspircd-2.0.18.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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}"
-
-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
-
- epatch "${FILESDIR}/${P}-fix-path-builds.patch"
-}
-
-src_configure() {
- local extras=""
- local essl="--enable-openssl"
- local egnutls="--enable-gnutls"
- local dipv6="--disable-ipv6"
-
- use geoip && extras="${extras}m_geoip.cpp,"
- use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
- use ipv6 && dipv6=""
- 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,"
-
- use !ssl && essl=""
- use !gnutls && egnutls=""
-
- if [ -n "${extras}" ]; then
- ./configure --disable-interactive --enable-extras=${extras}
- fi
-
- ./configure \
- --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" \
- ${essl} ${egnutls} ${dipv6} || die
-}
-
-src_compile() {
- emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
- emake INSTUID=${PN} \
- BINPATH="${D}/usr/bin" \
- BASE="${D}/usr/$(get_libdir)/${PN}/inspircd.launcher" \
- MODPATH="${D}/usr/$(get_libdir)/${PN}/modules/" \
- CONPATH="${D}/etc/${PN}" install
-
- insinto "/usr/include/${PN}"
- doins include/*
-
- diropts -o"${PN}" -g"${PN}" -m0700
- dodir "/var/lib/${PN}"
- dodir "/var/lib/${PN}/data"
-
- newinitd "${FILESDIR}/${P}-init" "${PN}"
- keepdir "/var/log/${PN}"/
-}
-
-pkg_postinst() {
- 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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2021-05-28 3:47 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2021-05-28 3:47 UTC (permalink / raw
To: gentoo-commits
commit: 6cdc4b65290f229e928c4c67c1ff4bb29d5ffaca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 03:47:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 03:47:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc4b65
net-irc/inspircd: fix SizeViolation
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 | 3 +-
3 files changed, 3 insertions(+), 494 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 0d3fc592437..53ada51b850 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
+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.10.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
deleted file mode 100644
index e1def8043c5..00000000000
--- a/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
+++ /dev/null
@@ -1,493 +0,0 @@
-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
index 3dfa1dea335..ca68956f4dc 100644
--- a/net-irc/inspircd/inspircd-3.10.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.10.0.ebuild
@@ -8,6 +8,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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-path-builds.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -32,7 +33,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${WORKDIR}"/${P}-fix-path-builds.patch )
src_prepare() {
default
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2021-05-28 3:14 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2021-05-28 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 62d0599e45cb081e742b72116210de5116f4d5ab
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sun May 23 04:50:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 03:14:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d0599e
net-irc/inspircd: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Bug: https://bugs.gentoo.org/791589
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-3.7.0-fix-path-builds.patch | 338 ---------------------
net-irc/inspircd/inspircd-3.8.1.ebuild | 121 --------
3 files changed, 460 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 82f8b6b0876..4e88d3d671d 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1 @@
-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.7.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
deleted file mode 100644
index 92e1c4b6032..00000000000
--- a/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-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 d678b5be3..607141381 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -250,7 +250,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 @@
- # the default of 'inspircd.pid' is used. #
- # #
-
--#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
-
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -697,7 +697,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.
-@@ -1045,7 +1045,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 #-#-#-#-#-#-#-#-#-#-#-#
- # #
-@@ -1054,13 +1054,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 256ac10f9..40f5be35d 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 2e50977bd..315d376cf 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-
-@@ -1581,7 +1581,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.
-@@ -2172,7 +2172,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 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 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 9f905f970..c87da5d73 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -221,10 +221,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)
-@@ -244,11 +244,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) *.pem $(CONPATH) 2>/dev/null
- @echo ""
-@@ -263,7 +263,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.8.1.ebuild b/net-irc/inspircd/inspircd-3.8.1.ebuild
deleted file mode 100644
index 355015a8d69..00000000000
--- a/net-irc/inspircd/inspircd-3.8.1.ebuild
+++ /dev/null
@@ -1,121 +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://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}"/${PN}-3.7.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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2020-08-12 22:20 Thomas Deutschmann
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Deutschmann @ 2020-08-12 22:20 UTC (permalink / raw
To: gentoo-commits
commit: bc5463439d7f8105264dfcba83198841dfde788a
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Mon Aug 3 04:09:06 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 22:20:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc546343
net-irc/inspircd: Add v3.7.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-3.7.0-fix-path-builds.patch | 338 +++++++++++++++++++++
net-irc/inspircd/inspircd-3.7.0.ebuild | 121 ++++++++
3 files changed, 460 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index e7d8c5e5d86..9b5b8fde5f4 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,4 @@
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.6.0.tar.gz 851768 BLAKE2B e1cbad4e5f00e769e804abc432dbac24ae4c988aac690d009dd87f28d75c4229a174c1703395cae42306b45ba167268c2032a3c2533fdde8154a67f53f2e18f8 SHA512 b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630
+DIST inspircd-3.7.0.tar.gz 855041 BLAKE2B 8b65c6d29ecf448503201d6d3d9b5416775f7ea97dd3e3acb947cbfcecd4a137f5c4dfd5902f8de43c03b5c5d799acc4a833631982f9815053beec07366a7ccb SHA512 d683d54a046f9bf17ae1a7bb1e2ce94000455c0249478250fd7263f8ede12048ce3982b990bb47461a1c7d9ea5fc20836b3dd255924e72d187eb3a6d591fd51d
diff --git a/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
new file mode 100644
index 00000000000..92e1c4b6032
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
@@ -0,0 +1,338 @@
+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 d678b5be3..607141381 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -250,7 +250,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 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -697,7 +697,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.
+@@ -1045,7 +1045,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 #-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -1054,13 +1054,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 256ac10f9..40f5be35d 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 2e50977bd..315d376cf 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-
+@@ -1581,7 +1581,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.
+@@ -2172,7 +2172,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 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 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 9f905f970..c87da5d73 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -221,10 +221,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)
+@@ -244,11 +244,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) *.pem $(CONPATH) 2>/dev/null
+ @echo ""
+@@ -263,7 +263,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.7.0.ebuild b/net-irc/inspircd/inspircd-3.7.0.ebuild
new file mode 100644
index 00000000000..60448a5f4f9
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.7.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.7.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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2020-08-12 22:20 Thomas Deutschmann
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Deutschmann @ 2020-08-12 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 9626f0272df8b58e797e6fd03e3430fc4d95528c
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Mon Aug 3 04:14:06 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 22:20:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9626f027
net-irc/inspircd: Drop v3.6.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16967
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-3.5.0-fix-path-builds.patch | 346 ---------------------
net-irc/inspircd/inspircd-3.6.0.ebuild | 121 -------
3 files changed, 468 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 9b5b8fde5f4..476845bc230 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,4 +1,3 @@
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.6.0.tar.gz 851768 BLAKE2B e1cbad4e5f00e769e804abc432dbac24ae4c988aac690d009dd87f28d75c4229a174c1703395cae42306b45ba167268c2032a3c2533fdde8154a67f53f2e18f8 SHA512 b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630
DIST inspircd-3.7.0.tar.gz 855041 BLAKE2B 8b65c6d29ecf448503201d6d3d9b5416775f7ea97dd3e3acb947cbfcecd4a137f5c4dfd5902f8de43c03b5c5d799acc4a833631982f9815053beec07366a7ccb SHA512 d683d54a046f9bf17ae1a7bb1e2ce94000455c0249478250fd7263f8ede12048ce3982b990bb47461a1c7d9ea5fc20836b3dd255924e72d187eb3a6d591fd51d
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
deleted file mode 100644
index 578453934c8..00000000000
--- a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-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..665d4dfb5 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.6.0.ebuild b/net-irc/inspircd/inspircd-3.6.0.ebuild
deleted file mode 100644
index 92c0dfe18f1..00000000000
--- a/net-irc/inspircd/inspircd-3.6.0.ebuild
+++ /dev/null
@@ -1,121 +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="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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2019-05-26 10:26 Michał Górny
0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2019-05-26 10:26 UTC (permalink / raw
To: gentoo-commits
commit: b6bce9d64da768be609803ee3874d507b0dba11b
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Mon May 13 07:09:53 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 26 10:26:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6bce9d6
net-irc/inspircd: Add v3.1.0
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12027
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 +++++++++++
net-irc/inspircd/metadata.xml | 9 +-
4 files changed, 398 insertions(+), 3 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index dbafa8a65d4..7eed34b91b3 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
+DIST inspircd-3.1.0.tar.gz 795435 BLAKE2B 86f4c62b61ea2692be4f0bba21976e738f733187640f7fa43f3e90fb29b5a6e1bd4769fcdb86f1912a43cd856f5d1d28a335c2e6e4c86db6097588247ec6e119 SHA512 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c
diff --git a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
new file mode 100644
index 00000000000..0f4738c7012
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
@@ -0,0 +1,260 @@
+diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
+similarity index 100%
+rename from docs/conf/filter.conf.example
+rename to docs/conf/filter.conf
+diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
+similarity index 100%
+rename from docs/conf/helpop.conf.example
+rename to docs/conf/helpop.conf
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
+similarity index 99%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index 9baaa5261..60e277310 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -465,11 +465,11 @@
+
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-#<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
new file mode 100644
index 00000000000..98fed20a13d
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.1.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+ dev-lang/perl
+ gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+ ldap? ( net-nds/openldap )
+ maxminddb? ( dev-libs/libmaxminddb )
+ mbedtls? ( net-libs/mbedtls:= )
+ mysql? ( dev-db/mysql-connector-c:= )
+ pcre? ( dev-libs/libpcre )
+ postgres? ( dev-db/postgresql:= )
+ re2? ( dev-libs/re2:= )
+ sqlite? ( >=dev-db/sqlite-3.0 )
+ ssl? ( dev-libs/openssl:= )
+ tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+}
+
+src_configure() {
+ local extras=""
+
+ use gnutls && extras+="m_ssl_gnutls.cpp,"
+ use ldap && extras+="m_ldap.cpp,"
+ use maxminddb && extras+="m_geo_maxmind.cpp,"
+ use mbedtls && extras+="m_ssl_mbedtls.cpp,"
+ use mysql && extras+="m_mysql.cpp,"
+ use pcre && extras+="m_regex_pcre.cpp,"
+ use postgres && extras+="m_pgsql.cpp,"
+ use re2 && extras+="m_regex_re2.cpp,"
+ use regex-posix && extras+="m_regex_posix.cpp,"
+ use regex-stdlib && extras+="m_regex_stdlib.cpp,"
+ use sqlite && extras+="m_sqlite3.cpp,"
+ use ssl && extras+="m_ssl_openssl.cpp,"
+ use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
+ use tre && extras+="m_regex_tre.cpp,"
+
+ # The first configuration run enables certain "extra" InspIRCd
+ # modules, the second run generates the actual makefile.
+ if [[ -n "${extras}" ]]; then
+ ./configure --disable-interactive --enable-extras=${extras%,}
+ fi
+
+ local myconf=(
+ --disable-interactive
+ --disable-auto-extras
+ --prefix="/usr/$(get_libdir)/${PN}"
+ --config-dir="/etc/${PN}"
+ --data-dir="/var/lib/${PN}/data"
+ --log-dir="/var/log/${PN}"
+ --binary-dir="/usr/bin"
+ --module-dir="/usr/$(get_libdir)/${PN}/modules"
+ --manual-dir="/usr/share/man")
+ CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
+}
+
+src_install() {
+ emake DESTDIR="${D%/}" install
+
+ # Default is '0750', which causes init errors.
+ fperms 0755 /usr/bin/inspircd{,-genssl}
+ # Default is '0640', causing module load errors.
+ fperms -R 0755 "/usr/lib64/inspircd/modules/."
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ einstalldocs
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ keepdir "/var/log/${PN}"
+
+ diropts -o"${PN}" -g"${PN}" -m0700
+ keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You will find example configuration files under "
+ elog "/usr/share/doc/${PN}"
+ elog "Read the ${PN}.conf.example file carefully before "
+ elog "starting the service."
+ fi
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test "${pv}" -lt "2.0.24-r1"; then
+ elog "Starting with 2.0.24-r1 the daemon is no longer started"
+ elog "with the --logfile option and you are thus expected to define"
+ elog "logging in the InspIRCd configuration file if you want it."
+ fi
+ if ver_test "${pv}" -lt "3.0.0"; then
+ elog "Version 3.0 is a major upgrade which contains breaking"
+ elog "changes. You will need to update your configuration files."
+ elog "See: https://docs.inspircd.org/3/configuration-changes"
+ fi
+ done
+}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 5bcadd4c1b6..55b39da0b0e 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -12,16 +12,19 @@
para ser estable, moderno y ligero.
</longdescription>
<use>
- <flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
<flag name="gnutls">Enable TLS support</flag>
- <flag name="ipv6">Enable support for IP version 6</flag>
<flag name="ldap">Enable LDAP support</flag>
+ <flag name="maxminddb">Add support for geolocation using libMaxMindDB</flag>
+ <flag name="mbedtls">Add support for TLS using the mbedTLS library</flag>
<flag name="mysql">Enable MySQL database backend</flag>
<flag name="pcre">Adds support for Perl Compatible Regular Expressions</flag>
- <flag name="posix">Adds support for POSIX-compatible functions</flag>
<flag name="postgres">Enable PostgreSQL database backend</flag>
+ <flag name="re2">Add support for Google RE2 regular expressions library</flag>
+ <flag name="regex-posix">Adds support for POSIX Regular Expressions</flag>
+ <flag name="regex-stdlib">Add support for C++ stdlib regular expressions</flag>
<flag name="sqlite">Enable Sqlite database backend</flag>
<flag name="ssl">Enable SSL support</flag>
+ <flag name="sslrehashsignal">Enable rehashing SSL module by SIGUSR1</flag>
<flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2018-12-16 23:53 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 698bdb1067977d938c6fa0a7ff69623bb7e972fc
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Fri Nov 16 20:51:45 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=698bdb10
net-irc/inspircd: bump to 2.0.27
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10434
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.27-fix-path-builds.patch | 257 +++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.27.ebuild | 118 ++++++++++
3 files changed, 376 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 9204c385742..71ffbab7d48 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
DIST inspircd-2.0.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.27-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
new file mode 100644
index 00000000000..da00a8491d1
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
@@ -0,0 +1,257 @@
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+index d54cdc916..ee21be7f3 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf.example
+@@ -425,11 +425,11 @@
+
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -439,7 +439,8 @@
+ # motd - displayed on connect and when a user executes /MOTD
+ # rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++ rules="/etc/inspircd/rules.txt.example">
+
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -485,7 +486,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -994,7 +995,7 @@
+ # provide almost all the features of InspIRCd. :) #
+ # #
+ # The default does nothing -- we include it for simplicity for you. #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -1006,10 +1007,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+
+
+ #########################################################################
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+index c3f074b94..4b0a584bb 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf.example
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also: #
+ # https://wiki.inspircd.org/Modules/2.0/censor #
+ #
+-#<include file="conf/examples/censor.conf.example">
++#<include file="/etc/inspircd/censor.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
+@@ -790,7 +790,7 @@
+ # specify below the path to the filter.conf file, or define some #
+ # <filter> tags. #
+ # #
+-#<include file="conf/examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Gecos ban: Implements extended ban 'r', which stops anyone matching
+@@ -849,7 +849,7 @@
+ # #
+ # If you specify to use the m_helpop.so module, then specify below #
+ # the path to the helpop.conf file. #
+-#<include file="conf/examples/helpop-full.conf.example">
++#<include file="/etc/inspircd/helpop-full.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1304,7 +1304,7 @@
+ # Read the comment above <connect:allowmotdcolors> in #
+ # inspircd.conf.example for details. #
+ # #
+-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+diff --git a/make/template/main.mk b/make/template/main.mk
+index 23daa7efc..386e0138a 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -34,7 +34,7 @@ CC = @CC@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS =
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
+ INSTMODE_LIB = 0644
+
+ @IFEQ $(CC) icpc
+- CXXFLAGS += -Wshadow
++ MYCXXFLAGS += -Wshadow
+ @ELSE
+- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+
+
+@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
+ INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+- CXXFLAGS += -DDARWIN -frtti
++ MYCXXFLAGS += -DDARWIN -frtti
+ LDLIBS += -ldl
+ CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+ PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+
+-@IFNDEF D
+- D=0
++@IFNDEF DEBUGLEVEL
++ DEBUGLEVEL=0
+ @ENDIF
+
+ GCC6=@GCC6@
+ @IFEQ $(GCC6) true
+- CXXFLAGS += -fno-delete-null-pointer-checks
++ MYCXXFLAGS += -fno-delete-null-pointer-checks
+ @ENDIF
+
+ DBGOK=0
+-@IFEQ $(D) 0
+- CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++ MYCXXFLAGS += -O2
+ @IFEQ $(CC) g++
+- CXXFLAGS += -g1
++ MYCXXFLAGS += -g1
+ @ENDIF
+ HEADER = std-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+- CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++ MYCXXFLAGS += -O0 -g3 -Werror
+ HEADER = debug-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+- CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++ MYCXXFLAGS += -O2 -g3
+ HEADER = debug-header
+ DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+
+@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
+ @ENDIF
+
+ @IFDEF PURE_STATIC
+- CXXFLAGS += -DPURE_STATIC
++ MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+
+ # Default target
+@@ -151,10 +152,10 @@ TARGET = all
+ @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+
+-@IFDEF T
++@IFDEF TGT
+ HEADER =
+ FOOTER = target
+- TARGET = $(T)
++ TARGET = $(TGT)
+ @ENDIF
+
+ @IFEQ $(DBGOK) 0
+@@ -229,8 +230,8 @@ install: target
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -238,9 +239,9 @@ install: target
+ @ENDIF
+ -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ @echo ""
+ @echo "*************************************"
+ @echo "* INSTALL COMPLETE! *"
+@@ -253,7 +254,7 @@ install: target
+ @echo ' Data:' $(DATPATH)
+ @echo 'To start the ircd, run:' $(BASE)/inspircd start
+ @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+- @echo 'Examples are available at:' $(CONPATH)/examples/
++ @echo 'Examples are available at:' $(CONPATH)
+
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff --git a/make/unit-cc.pl b/make/unit-cc.pl
+index a494fb74b..2a570ec91 100755
+--- a/make/unit-cc.pl
++++ b/make/unit-cc.pl
+@@ -113,7 +113,7 @@ sub do_compile {
+ my $libs = '';
+ my $binary = $ENV{RUNCC};
+ if ($do_compile) {
+- $flags = $ENV{CXXFLAGS};
++ $flags = $ENV{MYCXXFLAGS};
+ $flags =~ s/ -pedantic// if nopedantic($file);
+ $flags .= ' ' . getcompilerflags($file);
+
diff --git a/net-irc/inspircd/inspircd-2.0.27.ebuild b/net-irc/inspircd/inspircd-2.0.27.ebuild
new file mode 100644
index 00000000000..ca3c680e39b
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.27.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+ dev-lang/perl
+ ssl? ( dev-libs/openssl:= )
+ geoip? ( dev-libs/geoip )
+ gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+ ldap? ( net-nds/openldap )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? ( dev-db/postgresql:= )
+ pcre? ( dev-libs/libpcre )
+ sqlite? ( >=dev-db/sqlite-3.0 )
+ tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+}
+
+src_configure() {
+ local extras=""
+
+ use geoip && extras+="m_geoip.cpp,"
+ use gnutls && extras+="m_ssl_gnutls.cpp,"
+ use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
+ use mysql && extras+="m_mysql.cpp,"
+ use pcre && extras+="m_regex_pcre.cpp,"
+ use posix && extras+="m_regex_posix.cpp,"
+ use postgres && extras+="m_pgsql.cpp,"
+ use sqlite && extras+="m_sqlite3.cpp,"
+ use ssl && extras+="m_ssl_openssl.cpp,"
+ use tre && extras+="m_regex_tre.cpp,"
+
+ # The first configuration run enables certain "extra" InspIRCd
+ # modules, the second run generates the actual makefile.
+ if [[ -n "${extras}" ]]; then
+ ./configure --disable-interactive --enable-extras=${extras%,}
+ fi
+
+ local myconf=(
+ --with-cc="$(tc-getCXX)"
+ --disable-interactive
+ --prefix="/usr/$(get_libdir)/${PN}"
+ --config-dir="/etc/${PN}"
+ --data-dir="/var/lib/${PN}/data"
+ --log-dir="/var/log/${PN}"
+ --binary-dir="/usr/bin"
+ --module-dir="/usr/$(get_libdir)/${PN}/modules"
+ $(usex ipv6 '' '--disable-ipv6')
+ $(usex gnutls '--enable-gnutls' '')
+ $(usex ssl '--enable-openssl' ''))
+ ./configure "${myconf[@]}"
+}
+
+src_compile() {
+ emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake INSTUID=${PN} DESTDIR="${D%/}" install
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ einstalldocs
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ keepdir "/var/log/${PN}"
+
+ diropts -o"${PN}" -g"${PN}" -m0700
+ keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You will find example configuration files under "
+ elog "/usr/share/doc/${PN}"
+ elog "Read the ${PN}.conf.example file carefully before "
+ elog "starting the service."
+ fi
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test "${pv}" -lt "2.0.24-r1"; then
+ elog "Starting with 2.0.24-r1 the daemon is no longer started"
+ elog "with the --logfile option and you are thus expected to define"
+ elog "logging in the InspIRCd configuration file if you want it."
+ break
+ fi
+ done
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2017-11-29 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-11-29 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 79f50b4817bc17f890e61b3a1c50899cfdaf4fa9
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Sat Nov 18 03:13:41 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=79f50b48
net-irc/inspircd: Remove old 2.0.24
net-irc/inspircd/Manifest | 1 -
.../files/inspircd-2.0.24-fix-path-builds.patch | 253 ---------------------
net-irc/inspircd/inspircd-2.0.24-r1.ebuild | 123 ----------
3 files changed, 377 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index e9a9481ebba..a7b18c92451 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
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.24-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
deleted file mode 100644
index debf62a15f5..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.24-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.24-r1.ebuild b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
deleted file mode 100644
index d3c92bdafc3..00000000000
--- a/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2017-10-04 9:45 Patrice Clement
0 siblings, 0 replies; 15+ messages in thread
From: Patrice Clement @ 2017-10-04 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 3ea7dc6c0571ba1b675fd6db286b88df2041437d
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Fri Sep 29 05:24:21 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 09:45:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea7dc6c
net-irc/inspircd: revbump to 2.0.24-r1.
* Install documentation with proper permissions, it was previously only
viewable by the root user.
* Remove --logfile option when starting the daemon via OpenRC, this prevents
double-logging when the user has configured logging by the more featureful
InspIRCd configuration file.
Closes: https://bugs.gentoo.org/617686
Closes: https://github.com/gentoo/gentoo/pull/5821
net-irc/inspircd/files/inspircd-r3.confd | 33 +++++++++++++++
net-irc/inspircd/files/inspircd-r3.initd | 48 ++++++++++++++++++++++
...rcd-2.0.24.ebuild => inspircd-2.0.24-r1.ebuild} | 20 ++++++---
3 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd
new file mode 100644
index 00000000000..af9b3fe15e2
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r3.confd
@@ -0,0 +1,33 @@
+# Distributed under the terms of the GNU General Public License v2
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
+
+# File used to store the PID file. Usually you won't need to touch it.
+# If you are changing PID file do not forget to set new PID file in
+# INSPIRCD_CONFIGFILE as well.
+#
+#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid"
+
+# User to run InspIRCd as
+#
+#INSPIRCD_USER="inspircd"
+#INSPIRCD_GROUP="inspircd"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we start InspIRCd without any output (quiet)
+# as user $INSPIRCD_USER and wait 1000ms after we have started the service
+# to ensure that the daemon is really up and running.
+#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# Options to collectd
+# See `/usr/bin/inspircd --help` for more details
+#INSPIRCD_OPTS=""
diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd-r3.initd
new file mode 100644
index 00000000000..4d8dac81936
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r3.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${INSPIRCD_USER:="inspircd"}
+: ${INSPIRCD_GROUP:="inspircd"}
+: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"}
+: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"}
+: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"}
+: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"}
+: ${INSPIRCD_OPTS:=""}
+
+command="/usr/bin/inspircd"
+command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\""
+command_user="${INSPIRCD_USER}"
+start_stop_daemon_args="${INSPIRCD_SSDARGS}"
+pidfile="${INSPIRCD_PIDFILE}"
+retry="${INSPIRCD_TERMTIMEOUT}"
+
+required_files="${INSPIRCD_CONFIGFILE}"
+
+name="InspIRCd"
+
+description="InspIRCd is a modular Internet Relay Chat (IRC) server."
+
+extra_commands="version"
+extra_started_commands="rehash"
+
+depend() {
+ use dns
+ provide ircd
+}
+
+start_pre() {
+ checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")"
+}
+
+rehash() {
+ ebegin "Rehashing InspIRCd"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+version() {
+ ebegin "Retrieve InspIRCd version"
+ ${command} --version
+ eend $?
+}
diff --git a/net-irc/inspircd/inspircd-2.0.24.ebuild b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
similarity index 85%
rename from net-irc/inspircd/inspircd-2.0.24.ebuild
rename to net-irc/inspircd/inspircd-2.0.24-r1.ebuild
index d7604a18517..d3c92bdafc3 100644
--- a/net-irc/inspircd/inspircd-2.0.24.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit toolchain-funcs user
+inherit toolchain-funcs user versionator
DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
HOMEPAGE="https://inspircd.github.com/"
@@ -27,6 +27,7 @@ RDEPEND="
tre? ( dev-libs/tre )"
DEPEND="${RDEPEND}"
+DOCS=( docs/. )
PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
pkg_setup() {
@@ -83,16 +84,17 @@ src_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}-r2.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
keepdir "/var/log/${PN}"
- dodoc -r docs/*
rm -r "${D%/}/etc/${PN}" || die
dodir "/etc/${PN}"
dodir "/etc/${PN}/aliases"
@@ -108,6 +110,14 @@ pkg_postinst() {
elog "/usr/share/doc/${PN}"
elog "Read the ${PN}.conf.example file carefully before "
elog "starting the service."
- elog
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] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2017-06-11 8:01 Michael Palimaka
0 siblings, 0 replies; 15+ messages in thread
From: Michael Palimaka @ 2017-06-11 8:01 UTC (permalink / raw
To: gentoo-commits
commit: ee0148bcddff08c0fb15310dcb84563c7c38e41c
Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Fri Jun 2 04:28:46 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 08:00:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0148bc
net-irc/inspircd: Version bump to 2.0.24
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.24-fix-path-builds.patch | 253 +++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.24.ebuild | 127 +++++++++++
3 files changed, 381 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 30cc793d709..5100b5a4395 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1 +1,2 @@
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
diff --git a/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
new file mode 100644
index 00000000000..debf62a15f5
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.24-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.24.ebuild b/net-irc/inspircd/inspircd-2.0.24.ebuild
new file mode 100644
index 00000000000..5caf9be08a3
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.24.ebuild
@@ -0,0 +1,127 @@
+# 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}"/${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/.
+
+ 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}"
+
+ # TODO: Globbing doesn't work; find alternative.
+ dodoc -r "${D}etc/${PN}/aliases"
+ dodoc -r "${D}etc/${PN}/modules"
+ dodoc "${D}etc/${PN}/censor.conf.example"
+ dodoc "${D}etc/${PN}/filter.conf.example"
+ dodoc "${D}etc/${PN}/helpop-full.conf.example"
+ dodoc "${D}etc/${PN}/helpop.conf.example"
+ dodoc "${D}etc/${PN}/inspircd.conf.example"
+ dodoc "${D}etc/${PN}/links.conf.example"
+ dodoc "${D}etc/${PN}/modules.conf.example"
+ dodoc "${D}etc/${PN}/motd.txt.example"
+ dodoc "${D}etc/${PN}/opermotd.txt.example"
+ dodoc "${D}etc/${PN}/opers.conf.example"
+ dodoc "${D}etc/${PN}/quotes.txt.example"
+ dodoc "${D}etc/${PN}/rules.txt.example"
+ rm -rf "${D}etc/${PN}"
+ 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."
+ elog
+ fi
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2017-03-04 6:00 Michael Palimaka
0 siblings, 0 replies; 15+ messages in thread
From: Michael Palimaka @ 2017-03-04 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 430adb8353295a60a02cde3ae6db48dd0f2e9fe2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 06:00:16 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 06:00:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430adb83
net-irc/inspircd: remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
net-irc/inspircd/Manifest | 2 -
.../inspircd-2.0.20-deprecated-tmpnam-560362.patch | 33 ---
.../files/inspircd-2.0.20-fix-path-builds.patch | 208 -----------------
.../files/inspircd-2.0.21-fix-path-builds.patch | 247 ---------------------
net-irc/inspircd/files/inspircd-2.0.21-init | 38 ----
net-irc/inspircd/files/inspircd-init | 38 ----
net-irc/inspircd/inspircd-2.0.20.ebuild | 111 ---------
net-irc/inspircd/inspircd-2.0.21.ebuild | 101 ---------
8 files changed, 778 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 7f04f914648..30cc793d709 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1 @@
-DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
-DIST inspircd-2.0.21.tar.gz 730417 SHA256 bc2f861d754754a108797699319186130ef7d909204eb56ab2c3b1ae80c9d6c5 SHA512 28f38e8195d5cb6e7c7f2c4bcff2f0fcc13fb462a26975269faf899af7228c3ece2002ee819d0d5e2242ae5687a8e198e82cace8b3ff75521a44f12ac29ade0f WHIRLPOOL e1d7ee44a4900a26c2307d431fd62e0b13a8ba56388fa3e2edb10754c6bea5426625b4008162adc203c984e36b9e99ed656622bc21aae4195574514edc9b678e
DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
diff --git a/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch b/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch
deleted file mode 100644
index 92128411014..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 79d1a436bb5c7ab40e43130495c455ffc8c682a2 Mon Sep 17 00:00:00 2001
-From: Richard Bradfield <bradfirj@fstab.me>
-Date: Wed, 22 Jul 2015 01:18:03 +0100
-Subject: [PATCH] Replace deprecated tmpnam() call
-
-From Perl 5.22 onwards, POSIX::tmpnam() has been deprecated (without the
-usual 2 year deprecation cycle), using the File::Temp module instead
-preserves compatibility while allowing compilation on 5.22 and later.
----
- make/utilities.pm | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/make/utilities.pm b/make/utilities.pm
-index ae16ce3..baba584 100644
---- a/make/utilities.pm
-+++ b/make/utilities.pm
-@@ -29,6 +29,7 @@ use warnings FATAL => qw(all);
-
- use Exporter 'import';
- use POSIX;
-+use File::Temp;
- use Getopt::Long;
- use Fcntl;
- our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
-@@ -404,7 +405,7 @@ sub translate_functions($$)
- my $tmpfile;
- do
- {
-- $tmpfile = tmpnam();
-+ $tmpfile = File::Temp::tmpnam();
- } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
- print "(Created and executed \e[1;32m$tmpfile\e[0m)\n";
- print TF $1;
diff --git a/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
deleted file mode 100644
index ea1eca65f8d..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
+++ /dev/null
@@ -1,208 +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/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,41 +75,41 @@
- 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
-
- 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
-
-@@ -129,10 +129,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
-@@ -145,10 +146,10 @@
- @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
-
--@IFDEF T
-+@IFDEF TGT
- HEADER =
- FOOTER = target
-- TARGET = $(T)
-+ TARGET = $(TGT)
- @ENDIF
-
- @IFEQ $(DBGOK) 0
-@@ -223,8 +224,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
-@@ -232,9 +233,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! *"
-@@ -247,7 +248,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-2.0.21-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.21-fix-path-builds.patch
deleted file mode 100644
index 247a4efadc6..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.21-fix-path-builds.patch
+++ /dev/null
@@ -1,247 +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,41 +75,41 @@
- 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
-
- 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
-
-@@ -129,10 +129,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
-@@ -145,10 +146,10 @@
- @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
-
--@IFDEF T
-+@IFDEF TGT
- HEADER =
- FOOTER = target
-- TARGET = $(T)
-+ TARGET = $(TGT)
- @ENDIF
-
- @IFEQ $(DBGOK) 0
-@@ -223,8 +224,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
-@@ -232,9 +233,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! *"
-@@ -247,7 +248,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-2.0.21-init b/net-irc/inspircd/files/inspircd-2.0.21-init
deleted file mode 100644
index 6356965627d..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.21-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="rehash version"
-
-depend() {
- need net
- provide ircd
-}
-
-start() {
- ebegin "Starting InspIRCd"
- checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd
- start-stop-daemon --start --quiet --user inspircd \
- --exec /usr/bin/inspircd -- \
- --config /etc/inspircd/inspircd.conf \
- --logfile /var/log/inspircd/ircd.log
- eend $?
-}
-
-stop() {
- ebegin "Stopping InspIRCd"
- start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
- eend $?
-}
-
-rehash() {
- ebegin "Rehashing InspIRCd"
- /usr/lib/inspircd/inspircd rehash
- eend $?
-}
-
-version() {
- ebegin "Retrieve InspIRCd version"
- /usr/lib/inspircd/inspircd version
- eend $?
-}
diff --git a/net-irc/inspircd/files/inspircd-init b/net-irc/inspircd/files/inspircd-init
deleted file mode 100644
index 8f09b73fd9c..00000000000
--- a/net-irc/inspircd/files/inspircd-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="rehash version"
-
-depend() {
- need net
- provide ircd
-}
-
-start() {
- ebegin "Starting InspIRCd"
- checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd
- start-stop-daemon --start --quiet --user inspircd \
- --exec /usr/bin/inspircd -- \
- --config /etc/inspircd/inspircd.conf \
- --logfile /var/log/inspircd/ircd.log
- eend $?
-}
-
-stop() {
- ebegin "Stopping InspIRCd"
- start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
- eend $?
-}
-
-rehash() {
- ebegin "Rehashing InspIRCd"
- /usr/lib/inspircd/inspircd.launcher/inspircd rehash
- eend $?
-}
-
-version() {
- ebegin "Retrieve InspIRCd version"
- /usr/lib/inspircd/inspircd.launcher/inspircd version
- eend $?
-}
diff --git a/net-irc/inspircd/inspircd-2.0.20.ebuild b/net-irc/inspircd/inspircd-2.0.20.ebuild
deleted file mode 100644
index 03344ae7d3c..00000000000
--- a/net-irc/inspircd/inspircd-2.0.20.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib 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 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}"
-
-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
-
- epatch "${FILESDIR}"/${P}-fix-path-builds.patch
- epatch "${FILESDIR}"/${P}-deprecated-tmpnam-560362.patch
-
- epatch_user
-}
-
-src_configure() {
- local extras=""
- local essl="--enable-openssl"
- local egnutls="--enable-gnutls"
- local dipv6="--disable-ipv6"
-
- use geoip && extras="${extras}m_geoip.cpp,"
- use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
- use ipv6 && dipv6=""
- 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,"
-
- use !ssl && essl=""
- use !gnutls && egnutls=""
-
- if [ -n "${extras}" ]; then
- ./configure --disable-interactive --enable-extras=${extras}
- fi
-
- ./configure \
- --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" \
- ${essl} ${egnutls} ${dipv6} || die
-}
-
-src_compile() {
- emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
- emake INSTUID=${PN} \
- BINPATH="${D}/usr/bin" \
- BASE="${D}/usr/$(get_libdir)/${PN}/inspircd.launcher" \
- MODPATH="${D}/usr/$(get_libdir)/${PN}/modules/" \
- CONPATH="${D}/etc/${PN}" install
-
- insinto "/usr/include/${PN}"
- doins include/*
-
- diropts -o"${PN}" -g"${PN}" -m0700
- dodir "/var/lib/${PN}"
- dodir "/var/lib/${PN}/data"
-
- newinitd "${FILESDIR}/${PN}-init" "${PN}"
- keepdir "/var/log/${PN}"/
-}
-
-pkg_postinst() {
- 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
-}
diff --git a/net-irc/inspircd/inspircd-2.0.21.ebuild b/net-irc/inspircd/inspircd-2.0.21.ebuild
deleted file mode 100644
index bcb140f048a..00000000000
--- a/net-irc/inspircd/inspircd-2.0.21.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 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}"/${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" \
- $(use_enable ipv6) \
- $(use_enable gnutls) \
- $(use_enable ssl openssl)
-}
-
-src_compile() {
- emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
- emake INSTUID=${PN} DESTDIR="${D}" install
-
- insinto "/usr/include/${PN}"
- doins include/*
-
- diropts -o"${PN}" -g"${PN}" -m0700
- dodir "/var/lib/${PN}"
- dodir "/var/lib/${PN}/data"
-
- newinitd "${FILESDIR}/${P}-init" "${PN}"
- keepdir "/var/log/${PN}"/
-}
-
-pkg_postinst() {
- 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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2017-02-25 23:54 Thomas Deutschmann
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Deutschmann @ 2017-02-25 23:54 UTC (permalink / raw
To: gentoo-commits
commit: e9a23e95ba54e79e60cb598b0e2d93a8f3098e07
Author: Andrew Wilcox <awilfox.gentoo <AT> foxkit <DOT> us>
AuthorDate: Sat Feb 25 23:50:50 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 23:53:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a23e95
net-irc/inspircd: Bump to v2.0.23 (bug #593290)
Notable ebuild changes:
=======================
- Rewritten runscript
Closes: https://github.com/gentoo/gentoo/pull/4035
Gentoo-Bug: https://bugs.gentoo.org/593290
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Thomas Deutschmann <whissi <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 | 49 ++++
net-irc/inspircd/files/inspircd.confd | 39 ++++
net-irc/inspircd/inspircd-2.0.23.ebuild | 107 +++++++++
5 files changed, 449 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 7541fdfbdd..7f04f91464 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
DIST inspircd-2.0.21.tar.gz 730417 SHA256 bc2f861d754754a108797699319186130ef7d909204eb56ab2c3b1ae80c9d6c5 SHA512 28f38e8195d5cb6e7c7f2c4bcff2f0fcc13fb462a26975269faf899af7228c3ece2002ee819d0d5e2242ae5687a8e198e82cace8b3ff75521a44f12ac29ade0f WHIRLPOOL e1d7ee44a4900a26c2307d431fd62e0b13a8ba56388fa3e2edb10754c6bea5426625b4008162adc203c984e36b9e99ed656622bc21aae4195574514edc9b678e
+DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
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
new file mode 100644
index 0000000000..debf62a15f
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.23-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/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd
new file mode 100644
index 0000000000..3b9528b48e
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r2.initd
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.confd b/net-irc/inspircd/files/inspircd.confd
new file mode 100644
index 0000000000..d24ad29d4d
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -0,0 +1,39 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#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.
+#
+#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/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild
new file mode 100644
index 0000000000..6f8c693048
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.23.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2016-03-26 4:52 Ian Delaney
0 siblings, 0 replies; 15+ messages in thread
From: Ian Delaney @ 2016-03-26 4:52 UTC (permalink / raw
To: gentoo-commits
commit: 86543057cd91158f05e53b816a318147d379b5c9
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 04:51:56 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 04:52:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86543057
net-irc/inspircd: bump to vn. 2.0.21
patches to bump ebuild and fix build paths sunbmitted by
the proxy maintainer via the gentoo bug. Keyword arm
intially tested fine however requires keywording in
required dep, held back for later.
Gentoo bug: #575956
Package-Manager: portage-2.2.28
net-irc/inspircd/Manifest | 1 +
.../files/inspircd-2.0.21-fix-path-builds.patch | 247 +++++++++++++++++++++
net-irc/inspircd/files/inspircd-2.0.21-init | 39 ++++
net-irc/inspircd/inspircd-2.0.21.ebuild | 102 +++++++++
4 files changed, 389 insertions(+)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 46b960a..7541fdf 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1 +1,2 @@
DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
+DIST inspircd-2.0.21.tar.gz 730417 SHA256 bc2f861d754754a108797699319186130ef7d909204eb56ab2c3b1ae80c9d6c5 SHA512 28f38e8195d5cb6e7c7f2c4bcff2f0fcc13fb462a26975269faf899af7228c3ece2002ee819d0d5e2242ae5687a8e198e82cace8b3ff75521a44f12ac29ade0f WHIRLPOOL e1d7ee44a4900a26c2307d431fd62e0b13a8ba56388fa3e2edb10754c6bea5426625b4008162adc203c984e36b9e99ed656622bc21aae4195574514edc9b678e
diff --git a/net-irc/inspircd/files/inspircd-2.0.21-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.21-fix-path-builds.patch
new file mode 100644
index 0000000..247a4ef
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.21-fix-path-builds.patch
@@ -0,0 +1,247 @@
+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,41 +75,41 @@
+ 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
+
+ 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
+
+@@ -129,10 +129,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
+@@ -145,10 +146,10 @@
+ @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+
+-@IFDEF T
++@IFDEF TGT
+ HEADER =
+ FOOTER = target
+- TARGET = $(T)
++ TARGET = $(TGT)
+ @ENDIF
+
+ @IFEQ $(DBGOK) 0
+@@ -223,8 +224,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
+@@ -232,9 +233,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! *"
+@@ -247,7 +248,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-2.0.21-init b/net-irc/inspircd/files/inspircd-2.0.21-init
new file mode 100644
index 0000000..52549e9
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.21-init
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="rehash version"
+
+depend() {
+ need net
+ provide ircd
+}
+
+start() {
+ ebegin "Starting InspIRCd"
+ checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd
+ start-stop-daemon --start --quiet --user inspircd \
+ --exec /usr/bin/inspircd -- \
+ --config /etc/inspircd/inspircd.conf \
+ --logfile /var/log/inspircd/ircd.log
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping InspIRCd"
+ start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
+ eend $?
+}
+
+rehash() {
+ ebegin "Rehashing InspIRCd"
+ /usr/lib/inspircd/inspircd rehash
+ eend $?
+}
+
+version() {
+ ebegin "Retrieve InspIRCd version"
+ /usr/lib/inspircd/inspircd version
+ eend $?
+}
diff --git a/net-irc/inspircd/inspircd-2.0.21.ebuild b/net-irc/inspircd/inspircd-2.0.21.ebuild
new file mode 100644
index 0000000..78958fc
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.21.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://www.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}"/${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" \
+ $(use_enable ipv6) \
+ $(use_enable gnutls) \
+ $(use_enable ssl openssl)
+}
+
+src_compile() {
+ emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake INSTUID=${PN} DESTDIR="${D}" install
+
+ insinto "/usr/include/${PN}"
+ doins include/*
+
+ diropts -o"${PN}" -g"${PN}" -m0700
+ dodir "/var/lib/${PN}"
+ dodir "/var/lib/${PN}/data"
+
+ newinitd "${FILESDIR}/${P}-init" "${PN}"
+ keepdir "/var/log/${PN}"/
+}
+
+pkg_postinst() {
+ 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
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2016-01-25 9:00 Patrice Clement
0 siblings, 0 replies; 15+ messages in thread
From: Patrice Clement @ 2016-01-25 9:00 UTC (permalink / raw
To: gentoo-commits
commit: e2931d12fcebf38f2f2e9f60e53603949f016b37
Author: Andrew Wilcox <AWilcox <AT> Wilcox-Tech <DOT> com>
AuthorDate: Fri Jan 22 09:02:17 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 09:02:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2931d12
net-irc/inspircd: patch tmpnam call (bug #560362)
POSIX::tmpnam() was deprecated in Perl 5.22 which causes a failure in
./configure with various combinations of USE flags enabled on systems
with 5.22 installed.
.../inspircd-2.0.20-deprecated-tmpnam-560362.patch | 33 ++++++++++++++++++++++
net-irc/inspircd/inspircd-2.0.20.ebuild | 7 +++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch b/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch
new file mode 100644
index 0000000..9212841
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.20-deprecated-tmpnam-560362.patch
@@ -0,0 +1,33 @@
+From 79d1a436bb5c7ab40e43130495c455ffc8c682a2 Mon Sep 17 00:00:00 2001
+From: Richard Bradfield <bradfirj@fstab.me>
+Date: Wed, 22 Jul 2015 01:18:03 +0100
+Subject: [PATCH] Replace deprecated tmpnam() call
+
+From Perl 5.22 onwards, POSIX::tmpnam() has been deprecated (without the
+usual 2 year deprecation cycle), using the File::Temp module instead
+preserves compatibility while allowing compilation on 5.22 and later.
+---
+ make/utilities.pm | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/make/utilities.pm b/make/utilities.pm
+index ae16ce3..baba584 100644
+--- a/make/utilities.pm
++++ b/make/utilities.pm
+@@ -29,6 +29,7 @@ use warnings FATAL => qw(all);
+
+ use Exporter 'import';
+ use POSIX;
++use File::Temp;
+ use Getopt::Long;
+ use Fcntl;
+ our @EXPORT = qw(make_rpath pkgconfig_get_include_dirs pkgconfig_get_lib_dirs pkgconfig_check_version translate_functions promptstring);
+@@ -404,7 +405,7 @@ sub translate_functions($$)
+ my $tmpfile;
+ do
+ {
+- $tmpfile = tmpnam();
++ $tmpfile = File::Temp::tmpnam();
+ } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700);
+ print "(Created and executed \e[1;32m$tmpfile\e[0m)\n";
+ print TF $1;
diff --git a/net-irc/inspircd/inspircd-2.0.20.ebuild b/net-irc/inspircd/inspircd-2.0.20.ebuild
index d2ea27a..4ae0ac3 100644
--- a/net-irc/inspircd/inspircd-2.0.20.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,7 +37,10 @@ src_prepare() {
# Patch the inspircd launcher with the inspircd user
sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
- epatch "${FILESDIR}/${P}-fix-path-builds.patch"
+ epatch "${FILESDIR}"/${P}-fix-path-builds.patch
+ epatch "${FILESDIR}"/${P}-deprecated-tmpnam-560362.patch
+
+ epatch_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
@ 2015-09-18 3:40 Ian Delaney
0 siblings, 0 replies; 15+ messages in thread
From: Ian Delaney @ 2015-09-18 3:40 UTC (permalink / raw
To: gentoo-commits
commit: d7208425f4d0843462fbf24751c6807c1098e79e
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 03:36:22 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 03:38:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7208425
net-irc/inspircd: bump to 2.0.20
New maintainer added to metadata under proxy-maintainers herd,
init file renamed to expand in any '{P}', new patch for fix-path-builds,
ebuild and patch by new maintainer via bug #545034, rm 2.0.17
Package-Manager: portage-2.2.20.1
net-irc/inspircd/Manifest | 2 +-
...patch => inspircd-2.0.20-fix-path-builds.patch} | 28 +++++++++++-----------
.../files/{inspircd-2.0.17-init => inspircd-init} | 0
...spircd-2.0.17.ebuild => inspircd-2.0.20.ebuild} | 10 ++++----
net-irc/inspircd/metadata.xml | 5 +++-
5 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 6edbc5b..e319fcd 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,2 @@
-DIST inspircd-2.0.17.tar.gz 744743 SHA256 a5d42a6568df341b67a386f93dc92ccb8e1d1308c19ea2deb4c5424b11c6dde8 SHA512 4eddc927a682794cad1e85a747eefd269aa0c6c88a373e1c38902ff689f5c02da44b31e7ec1dc1f97c08c5cc7cc26be62b32a0831ca2d53f81c5662394325a5e WHIRLPOOL af7dae1282a442332badb6254dcf10bec63a55a7dcf717c7246389ff47f051b453d5ff47edc2e635c2cbd22bafc7d6109c3c63f67dbe714e1f054c60e0905522
DIST inspircd-2.0.18.tar.gz 747846 SHA256 45168ed075e66b379cdb9bae01652a23a33304817363e519fcbb1a194783295d SHA512 64e5d71da5d96afd1261b2a771f27f0c38b505812753a636c51d604f6166ab8a49106ae2da8291ecd86f894d2cfea63e9fcb105efdd7ce137bdf083235db7021 WHIRLPOOL c86846a170705590ae8b44023feb3adaa636c7af1d9e33a0cf560b1ebe5cc14740636c82e8c65e0f12357d9863ef36a66f0efa6aa20d2780bcef5ddd53888a6b
+DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
diff --git a/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
similarity index 92%
rename from net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch
rename to net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
index a4e12bb..ea1eca6 100644
--- a/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
@@ -1,6 +1,6 @@
diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example 2014-07-24 14:24:00.000000000 +0200
-+++ b/docs/conf/inspircd.conf.example 2014-08-09 10:21:01.439999954 +0200
+--- 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.
@@ -57,8 +57,8 @@ diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
#########################################################################
diff -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk 2014-07-24 14:24:00.000000000 +0200
-+++ b/make/template/main.mk 2014-08-09 10:24:59.039999948 +0200
+--- 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@
@@ -71,7 +71,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@@ -51,9 +51,9 @@
INSTMODE_LIB = 0644
- @IFEQ $(CC) icc
+ @IFEQ $(CC) icpc
- CXXFLAGS += -Wshadow
+ MYCXXFLAGS += -Wshadow
@ELSE
@@ -106,7 +106,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
- CXXFLAGS += -O2
+@IFEQ $(DEBUGLEVEL) 0
+ MYCXXFLAGS += -O2
- @IFEQ $(CC) gcc
+ @IFEQ $(CC) g++
- CXXFLAGS += -g1
+ MYCXXFLAGS += -g1
@ENDIF
@@ -134,7 +134,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@GNU_ONLY MAKEFLAGS += --no-print-directory
-@@ -128,10 +128,11 @@
+@@ -129,10 +129,11 @@
@ENDIF
@IFDEF PURE_STATIC
@@ -148,7 +148,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
# Default target
-@@ -144,10 +145,10 @@
+@@ -145,10 +146,10 @@
@GNU_ONLY TARGET = modules/$(M:.so=).so
@ENDIF
@@ -161,7 +161,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@ENDIF
@IFEQ $(DBGOK) 0
-@@ -222,8 +223,8 @@
+@@ -223,8 +224,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)
@@ -172,7 +172,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
@IFNDEF PURE_STATIC
-@@ -231,9 +232,9 @@
+@@ -232,9 +233,9 @@
@ENDIF
-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
@@ -185,7 +185,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@echo ""
@echo "*************************************"
@echo "* INSTALL COMPLETE! *"
-@@ -246,7 +247,7 @@
+@@ -247,7 +248,7 @@
@echo ' Data:' $(DATPATH)
@echo 'To start the ircd, run:' $(BASE)/inspircd start
@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
@@ -195,9 +195,9 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
@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 2014-07-24 14:24:00.000000000 +0200
-+++ b/make/unit-cc.pl 2014-08-09 10:25:15.089999947 +0200
-@@ -97,7 +97,7 @@
+--- 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) {
diff --git a/net-irc/inspircd/files/inspircd-2.0.17-init b/net-irc/inspircd/files/inspircd-init
similarity index 100%
rename from net-irc/inspircd/files/inspircd-2.0.17-init
rename to net-irc/inspircd/files/inspircd-init
diff --git a/net-irc/inspircd/inspircd-2.0.17.ebuild b/net-irc/inspircd/inspircd-2.0.20.ebuild
similarity index 94%
rename from net-irc/inspircd/inspircd-2.0.17.ebuild
rename to net-irc/inspircd/inspircd-2.0.20.ebuild
index c1c011b..f49eb12 100644
--- a/net-irc/inspircd/inspircd-2.0.17.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,17 +12,17 @@ SRC_URI="https://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
RDEPEND="
dev-lang/perl
- ssl? ( dev-libs/openssl )
+ 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[server] )
+ postgres? ( dev-db/postgresql:= )
pcre? ( dev-libs/libpcre )
sqlite? ( >=dev-db/sqlite-3.0 )
tre? ( dev-libs/tre )"
@@ -95,7 +95,7 @@ src_install() {
dodir "/var/lib/${PN}"
dodir "/var/lib/${PN}/data"
- newinitd "${FILESDIR}/${P}-init" "${PN}"
+ newinitd "${FILESDIR}/${PN}-init" "${PN}"
keepdir "/var/log/${PN}"/
}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index b503238..903a984 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>andrew.r.wilcox+gentoo@gmail.com</email>
+ <name>Andrew Wilcox></name>
+ <description>Proxy (user) maintainer, bugs to be assigned to him</description>
</maintainer>
<longdescription lang="en">
InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-05-28 3:47 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 2:06 [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2021-05-28 3:47 Sam James
2021-05-28 3:14 Sam James
2020-08-12 22:20 Thomas Deutschmann
2020-08-12 22:20 Thomas Deutschmann
2019-05-26 10:26 Michał Górny
2018-12-16 23:53 Andreas Sturmlechner
2017-11-29 23:19 Andreas Sturmlechner
2017-10-04 9:45 Patrice Clement
2017-06-11 8:01 Michael Palimaka
2017-03-04 6:00 Michael Palimaka
2017-02-25 23:54 Thomas Deutschmann
2016-03-26 4:52 Ian Delaney
2016-01-25 9:00 Patrice Clement
2015-09-18 3:40 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox