diff options
author | José María Alonso <nimiux@gentoo.org> | 2014-01-27 11:48:35 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2014-01-27 11:48:35 +0000 |
commit | a45d5d69eb1ec3dc99f2375f3b5ce4dc38f8c0b2 (patch) | |
tree | 835297d3078bc46b03410a90b215851f4effbc81 /net-irc | |
parent | Remove old development versions (diff) | |
download | gentoo-2-a45d5d69eb1ec3dc99f2375f3b5ce4dc38f8c0b2.tar.gz gentoo-2-a45d5d69eb1ec3dc99f2375f3b5ce4dc38f8c0b2.tar.bz2 gentoo-2-a45d5d69eb1ec3dc99f2375f3b5ce4dc38f8c0b2.zip |
Bump to version 2.0.15
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D628E536)
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/inspircd/ChangeLog | 8 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch | 208 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.15-init | 39 | ||||
-rw-r--r-- | net-irc/inspircd/inspircd-2.0.15.ebuild | 109 |
4 files changed, 363 insertions, 1 deletions
diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog index da7b34758cff..fa5ffa006e60 100644 --- a/net-irc/inspircd/ChangeLog +++ b/net-irc/inspircd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/inspircd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.90 2014/01/08 06:36:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.91 2014/01/27 11:48:35 nimiux Exp $ + +*inspircd-2.0.15 (27 Jan 2014) + + 27 Jan 2014; Chema Alonso <nimiux@gentoo.org> +inspircd-2.0.15.ebuild, + +files/inspircd-2.0.15-fix-path-builds.patch, +files/inspircd-2.0.15-init: + Version bump 08 Jan 2014; Mike Frysinger <vapier@gentoo.org> inspircd-2.0.13.ebuild, inspircd-2.0.14.ebuild: diff --git a/net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch new file mode 100644 index 000000000000..bc6121d2dea6 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch @@ -0,0 +1,208 @@ +diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example +--- a/docs/conf/inspircd.conf.example 2014-01-21 14:13:25.000000000 +0100 ++++ b/docs/conf/inspircd.conf.example 2014-01-27 12:07:50.189947703 +0100 +@@ -415,11 +415,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 -#-#-#-#-#-#-#-#-#-# + # # +@@ -429,7 +429,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. +@@ -475,7 +476,7 @@ + # the default of 'inspircd.pid' is used. # + # # + +-#<pid file="/path/to/inspircd.pid"> ++<pid file="/var/run/inspircd/inspircd.pid"> + + #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -957,7 +958,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 +@@ -969,10 +970,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-01-21 14:13:25.000000000 +0100 ++++ b/make/template/main.mk 2014-01-27 12:12:11.749946234 +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) icc +- 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) gcc +- 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-01-21 14:13:25.000000000 +0100 ++++ b/make/unit-cc.pl 2014-01-27 12:12:25.179946158 +0100 +@@ -97,7 +97,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.15-init b/net-irc/inspircd/files/inspircd-2.0.15-init new file mode 100644 index 000000000000..992da09f280b --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.15-init @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-init,v 1.1 2014/01/27 11:48:35 nimiux Exp $ + +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.15.ebuild b/net-irc/inspircd/inspircd-2.0.15.ebuild new file mode 100644 index 000000000000..d1e9d5a460f2 --- /dev/null +++ b/net-irc/inspircd/inspircd-2.0.15.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.15.ebuild,v 1.1 2014/01/27 11:48:35 nimiux Exp $ + +EAPI=5 + +inherit eutils multilib toolchain-funcs user + +DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" +HOMEPAGE="http://inspircd.github.com/" +SRC_URI="http://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 ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-server ) + 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 +} |