mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-irc/inspircd: cleanup wrt bug #545034
Package-Manager: portage-2.2.20.1
This commit is contained in:
Ian Delaney
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 $?
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user