summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWade Cline <wadecline@hotmail.com>2018-04-27 19:47:12 -0700
committerMichał Górny <mgorny@gentoo.org>2018-05-30 13:43:48 +0200
commit20326abc147ddc804f0582e7da26fce08c89cf39 (patch)
treed2349f0d9db2b06e94be288626bf77293825cbf7 /net-irc
parentdev-embedded/libjaylink: amd64 stable (diff)
downloadgentoo-20326abc147ddc804f0582e7da26fce08c89cf39.tar.gz
gentoo-20326abc147ddc804f0582e7da26fce08c89cf39.tar.bz2
gentoo-20326abc147ddc804f0582e7da26fce08c89cf39.zip
net-irc/inspircd: Version bump to 2.0.26
Closes: https://github.com/gentoo/gentoo/pull/8225
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/inspircd/Manifest1
-rw-r--r--net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch257
-rw-r--r--net-irc/inspircd/inspircd-2.0.26.ebuild118
3 files changed, 376 insertions, 0 deletions
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 6e5b23c59a3e..c2631dcf58b2 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
+DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a
diff --git a/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch
new file mode 100644
index 000000000000..da00a8491d1f
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.26-fix-path-builds.patch
@@ -0,0 +1,257 @@
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+index d54cdc916..ee21be7f3 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf.example
+@@ -425,11 +425,11 @@
+
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -439,7 +439,8 @@
+ # motd - displayed on connect and when a user executes /MOTD
+ # rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++ rules="/etc/inspircd/rules.txt.example">
+
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -485,7 +486,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -994,7 +995,7 @@
+ # provide almost all the features of InspIRCd. :) #
+ # #
+ # The default does nothing -- we include it for simplicity for you. #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -1006,10 +1007,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+
+
+ #########################################################################
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+index c3f074b94..4b0a584bb 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf.example
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also: #
+ # https://wiki.inspircd.org/Modules/2.0/censor #
+ #
+-#<include file="conf/examples/censor.conf.example">
++#<include file="/etc/inspircd/censor.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
+@@ -790,7 +790,7 @@
+ # specify below the path to the filter.conf file, or define some #
+ # <filter> tags. #
+ # #
+-#<include file="conf/examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Gecos ban: Implements extended ban 'r', which stops anyone matching
+@@ -849,7 +849,7 @@
+ # #
+ # If you specify to use the m_helpop.so module, then specify below #
+ # the path to the helpop.conf file. #
+-#<include file="conf/examples/helpop-full.conf.example">
++#<include file="/etc/inspircd/helpop-full.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1304,7 +1304,7 @@
+ # Read the comment above <connect:allowmotdcolors> in #
+ # inspircd.conf.example for details. #
+ # #
+-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+diff --git a/make/template/main.mk b/make/template/main.mk
+index 23daa7efc..386e0138a 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -34,7 +34,7 @@ CC = @CC@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS =
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
+ INSTMODE_LIB = 0644
+
+ @IFEQ $(CC) icpc
+- CXXFLAGS += -Wshadow
++ MYCXXFLAGS += -Wshadow
+ @ELSE
+- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+
+
+@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
+ INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+- CXXFLAGS += -DDARWIN -frtti
++ MYCXXFLAGS += -DDARWIN -frtti
+ LDLIBS += -ldl
+ CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+ PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+
+-@IFNDEF D
+- D=0
++@IFNDEF DEBUGLEVEL
++ DEBUGLEVEL=0
+ @ENDIF
+
+ GCC6=@GCC6@
+ @IFEQ $(GCC6) true
+- CXXFLAGS += -fno-delete-null-pointer-checks
++ MYCXXFLAGS += -fno-delete-null-pointer-checks
+ @ENDIF
+
+ DBGOK=0
+-@IFEQ $(D) 0
+- CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++ MYCXXFLAGS += -O2
+ @IFEQ $(CC) g++
+- CXXFLAGS += -g1
++ MYCXXFLAGS += -g1
+ @ENDIF
+ HEADER = std-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+- CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++ MYCXXFLAGS += -O0 -g3 -Werror
+ HEADER = debug-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+- CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++ MYCXXFLAGS += -O2 -g3
+ HEADER = debug-header
+ DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+
+@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
+ @ENDIF
+
+ @IFDEF PURE_STATIC
+- CXXFLAGS += -DPURE_STATIC
++ MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+
+ # Default target
+@@ -151,10 +152,10 @@ TARGET = all
+ @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+
+-@IFDEF T
++@IFDEF TGT
+ HEADER =
+ FOOTER = target
+- TARGET = $(T)
++ TARGET = $(TGT)
+ @ENDIF
+
+ @IFEQ $(DBGOK) 0
+@@ -229,8 +230,8 @@ install: target
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
+ @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -238,9 +239,9 @@ install: target
+ @ENDIF
+ -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ @echo ""
+ @echo "*************************************"
+ @echo "* INSTALL COMPLETE! *"
+@@ -253,7 +254,7 @@ install: target
+ @echo ' Data:' $(DATPATH)
+ @echo 'To start the ircd, run:' $(BASE)/inspircd start
+ @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+- @echo 'Examples are available at:' $(CONPATH)/examples/
++ @echo 'Examples are available at:' $(CONPATH)
+
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff --git a/make/unit-cc.pl b/make/unit-cc.pl
+index a494fb74b..2a570ec91 100755
+--- a/make/unit-cc.pl
++++ b/make/unit-cc.pl
+@@ -113,7 +113,7 @@ sub do_compile {
+ my $libs = '';
+ my $binary = $ENV{RUNCC};
+ if ($do_compile) {
+- $flags = $ENV{CXXFLAGS};
++ $flags = $ENV{MYCXXFLAGS};
+ $flags =~ s/ -pedantic// if nopedantic($file);
+ $flags .= ' ' . getcompilerflags($file);
+
diff --git a/net-irc/inspircd/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
new file mode 100644
index 000000000000..ead8598ef2c7
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.26.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+ dev-lang/perl
+ ssl? ( dev-libs/openssl:= )
+ geoip? ( dev-libs/geoip )
+ gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )
+ pcre? ( dev-libs/libpcre )
+ sqlite? ( >=dev-db/sqlite-3.0 )
+ tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+
+ # Patch the inspircd launcher with the inspircd user
+ sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+}
+
+src_configure() {
+ local extras=""
+
+ use geoip && extras+="m_geoip.cpp,"
+ use gnutls && extras+="m_ssl_gnutls.cpp,"
+ use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
+ use mysql && extras+="m_mysql.cpp,"
+ use pcre && extras+="m_regex_pcre.cpp,"
+ use posix && extras+="m_regex_posix.cpp,"
+ use postgres && extras+="m_pgsql.cpp,"
+ use sqlite && extras+="m_sqlite3.cpp,"
+ use ssl && extras+="m_ssl_openssl.cpp,"
+ use tre && extras+="m_regex_tre.cpp,"
+
+ # The first configuration run enables certain "extra" InspIRCd
+ # modules, the second run generates the actual makefile.
+ if [[ -n "${extras}" ]]; then
+ ./configure --disable-interactive --enable-extras=${extras%,}
+ fi
+
+ local myconf=(
+ --with-cc="$(tc-getCXX)"
+ --disable-interactive
+ --prefix="/usr/$(get_libdir)/${PN}"
+ --config-dir="/etc/${PN}"
+ --data-dir="/var/lib/${PN}/data"
+ --log-dir="/var/log/${PN}"
+ --binary-dir="/usr/bin"
+ --module-dir="/usr/$(get_libdir)/${PN}/modules"
+ $(usex ipv6 '' '--disable-ipv6')
+ $(usex gnutls '--enable-gnutls' '')
+ $(usex ssl '--enable-openssl' ''))
+ ./configure "${myconf[@]}"
+}
+
+src_compile() {
+ emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake INSTUID=${PN} DESTDIR="${D%/}" install
+
+ insinto "/usr/include/${PN}"
+ doins -r include/.
+
+ einstalldocs
+
+ newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+
+ keepdir "/var/log/${PN}"
+
+ diropts -o"${PN}" -g"${PN}" -m0700
+ keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You will find example configuration files under "
+ elog "/usr/share/doc/${PN}"
+ elog "Read the ${PN}.conf.example file carefully before "
+ elog "starting the service."
+ fi
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test "${pv}" -lt "2.0.24-r1"; then
+ elog "Starting with 2.0.24-r1 the daemon is no longer started"
+ elog "with the --logfile option and you are thus expected to define"
+ elog "logging in the InspIRCd configuration file if you want it."
+ break
+ fi
+ done
+}