mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-irc/inspircd: Bump to 2.0.25
Closes: https://github.com/gentoo/gentoo/pull/6209
This commit is contained in:
Wade Cline
committed by
Andreas Sturmlechner
Andreas Sturmlechner
parent
65b567f152
commit
aa84d55128
@@ -1,2 +1,3 @@
|
||||
DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
|
||||
DIST inspircd-2.0.24.tar.gz 732354 SHA256 41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40 SHA512 766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a WHIRLPOOL 3da7b2b694fd60755d3238d33090e9bc30abca3090e2552b6a9cb572c644cdc883236d39b91d1680e2500a26ef4829c98315e9975e27d5271046461569193d24
|
||||
DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
|
||||
|
||||
253
net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
Normal file
253
net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
Normal file
@@ -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);
|
||||
|
||||
123
net-irc/inspircd/inspircd-2.0.25.ebuild
Normal file
123
net-irc/inspircd/inspircd-2.0.25.ebuild
Normal file
@@ -0,0 +1,123 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit toolchain-funcs user versionator
|
||||
|
||||
DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
|
||||
HOMEPAGE="https://inspircd.github.com/"
|
||||
SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
|
||||
|
||||
RDEPEND="
|
||||
dev-lang/perl
|
||||
ssl? ( dev-libs/openssl:= )
|
||||
geoip? ( dev-libs/geoip )
|
||||
gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
|
||||
ldap? ( net-nds/openldap )
|
||||
mysql? ( virtual/mysql )
|
||||
postgres? ( dev-db/postgresql:= )
|
||||
pcre? ( dev-libs/libpcre )
|
||||
sqlite? ( >=dev-db/sqlite-3.0 )
|
||||
tre? ( dev-libs/tre )"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( docs/. )
|
||||
PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 -1 ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Patch the inspircd launcher with the inspircd user
|
||||
sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
|
||||
|
||||
default_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local extras=""
|
||||
|
||||
use geoip && extras="${extras}m_geoip.cpp,"
|
||||
use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
|
||||
use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
|
||||
use mysql && extras="${extras}m_mysql.cpp,"
|
||||
use pcre && extras="${extras}m_regex_pcre.cpp,"
|
||||
use posix && extras="${extras}m_regex_posix.cpp,"
|
||||
use postgres && extras="${extras}m_pgsql.cpp,"
|
||||
use sqlite && extras="${extras}m_sqlite3.cpp,"
|
||||
use ssl && extras="${extras}m_ssl_openssl.cpp,"
|
||||
use tre && extras="${extras}m_regex_tre.cpp,"
|
||||
|
||||
if [[ -n "${extras}" ]]; then
|
||||
econf --disable-interactive --enable-extras=${extras%,}
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-cc="$(tc-getCXX)" \
|
||||
--disable-interactive \
|
||||
--prefix="/usr/$(get_libdir)/${PN}" \
|
||||
--config-dir="/etc/${PN}" \
|
||||
--data-dir="/var/lib/${PN}/data" \
|
||||
--log-dir="/var/log/${PN}" \
|
||||
--binary-dir="/usr/bin" \
|
||||
--module-dir="/usr/$(get_libdir)/${PN}/modules" \
|
||||
$(usex ipv6 '' '--disable-ipv6') \
|
||||
$(usex gnutls '--enable-gnutls' '') \
|
||||
$(usex ssl '--enable-openssl' '')
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTUID=${PN} DESTDIR="${D%/}" install
|
||||
|
||||
insinto "/usr/include/${PN}"
|
||||
doins -r include/.
|
||||
|
||||
einstalldocs
|
||||
|
||||
diropts -o"${PN}" -g"${PN}" -m0700
|
||||
dodir "/var/lib/${PN}"
|
||||
dodir "/var/lib/${PN}/data"
|
||||
|
||||
newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
|
||||
newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
|
||||
|
||||
keepdir "/var/log/${PN}"
|
||||
|
||||
rm -r "${D%/}/etc/${PN}" || die
|
||||
dodir "/etc/${PN}"
|
||||
dodir "/etc/${PN}/aliases"
|
||||
dodir "/etc/${PN}/modules"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]]; then
|
||||
# This is a new installation
|
||||
elog "Before starting ${PN} the first time, you *must* create"
|
||||
elog "the /etc/${PN}/${PN}.conf file."
|
||||
elog "You will find example configuration files under "
|
||||
elog "/usr/share/doc/${PN}"
|
||||
elog "Read the ${PN}.conf.example file carefully before "
|
||||
elog "starting the service."
|
||||
fi
|
||||
local pv=""
|
||||
for pv in ${REPLACING_VERSIONS}; do
|
||||
if ! version_is_at_least "2.0.24-r1" "${pv}"; then
|
||||
elog "Starting with 2.0.24-r1 the daemon is no longer started"
|
||||
elog "with the --logfile option and you are thus expected to define"
|
||||
elog "logging in the InspIRCd configuration file if you want it."
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
Reference in New Issue
Block a user