summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé María Alonso <nimiux@gentoo.org>2012-07-07 12:35:20 +0000
committerJosé María Alonso <nimiux@gentoo.org>2012-07-07 12:35:20 +0000
commit317e2c80fe8b6bc4245f7411641ca120c0b10fce (patch)
treea22895feec1786017e0827e96db68436b1c1e6d7 /net-irc/inspircd
parentKeyword ~mips (diff)
downloadgentoo-2-317e2c80fe8b6bc4245f7411641ca120c0b10fce.tar.gz
gentoo-2-317e2c80fe8b6bc4245f7411641ca120c0b10fce.tar.bz2
gentoo-2-317e2c80fe8b6bc4245f7411641ca120c0b10fce.zip
[net-irc/inspircd] Revision bump to 2.0.7.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'net-irc/inspircd')
-rw-r--r--net-irc/inspircd/ChangeLog8
-rw-r--r--net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch165
-rw-r--r--net-irc/inspircd/files/inspircd-2.0.7-init38
-rw-r--r--net-irc/inspircd/inspircd-2.0.7.ebuild107
4 files changed, 317 insertions, 1 deletions
diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index aa898bb00035..f12ab912cd33 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-irc/inspircd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.50 2012/06/23 17:16:04 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.51 2012/07/07 12:35:20 nimiux Exp $
+
+*inspircd-2.0.7 (07 Jul 2012)
+
+ 07 Jul 2012; Chema Alonso <nimiux@gentoo.org> +inspircd-2.0.7.ebuild,
+ +files/inspircd-2.0.7-fix-path-builds.patch, +files/inspircd-2.0.7-init:
+ Revision bump to 2.0.7
23 Jun 2012; Chema Alonso <nimiux@gentoo.org> inspircd-2.0.6_rc1.ebuild,
+files/inspircd-2.0.6_rc1-gcc-4.7.patch, metadata.xml:
diff --git a/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch
new file mode 100644
index 000000000000..26d6ff27b999
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch
@@ -0,0 +1,165 @@
+diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example 2012-07-01 22:54:27.000000000 +0200
++++ b/docs/conf/inspircd.conf.example 2012-07-05 19:38:16.299999762 +0200
+@@ -404,11 +404,11 @@
+
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/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/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+
+ #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -418,7 +418,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/inspircd.motd.example" rules="conf/inspircd.rules.example">
++<files motd="/etc/inspircd/inspircd.motd.example"
++ rules="/etc/inspircd/inspircd.rules.example">
+
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -464,7 +465,7 @@
+ # the default of 'inspircd.pid' is used. #
+ # #
+
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # #
+@@ -937,7 +938,7 @@
+ # provide almost all the features of InspIRCd. :) #
+ # #
+ # The default does nothing -- we include it for simplicity for you. #
+-<include file="conf/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
+@@ -949,10 +950,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/modules/modules.conf.unreal">
++#<include file="/etc/inspircd/modules/modules.conf.unreal">
+
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/modules/modules.conf.charybdis">
++#<include file="/etc/inspircd/modules/modules.conf.charybdis">
+
+
+ #########################################################################
+diff -Nur a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk 2012-07-01 22:54:27.000000000 +0200
++++ b/make/template/main.mk 2012-07-05 20:13:44.789999705 +0200
+@@ -80,22 +80,22 @@
+ CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+
+-@IFNDEF D
+- D=0
++@IFNDEF DEBUGLEVEL
++ DEBUGLEVEL=0
+ @ENDIF
+
+ DBGOK=0
+-@IFEQ $(D) 0
++@IFEQ $(DEBUGLEVEL) 0
+ CXXFLAGS += -O2 -g1
+ HEADER = std-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
++@IFEQ $(DEBUGLEVEL) 1
+ CXXFLAGS += -O0 -g3 -Werror
+ HEADER = debug-header
+ DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
++@IFEQ $(DEBUGLEVEL) 2
+ CXXFLAGS += -O2 -g3
+ HEADER = debug-header
+ DBGOK=1
+@@ -137,10 +137,10 @@
+ @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+
+-@IFDEF T
++@IFDEF TGT
+ HEADER =
+ FOOTER = target
+- TARGET = $(T)
++ TARGET = $(TGT)
+ @ENDIF
+
+ @IFEQ $(DBGOK) 0
+@@ -215,8 +215,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
+@@ -224,9 +224,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/*.conf.* $(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/*.conf.* $(CONPATH)/modules
+ @echo ""
+ @echo "*************************************"
+ @echo "* INSTALL COMPLETE! *"
+@@ -238,7 +238,7 @@
+ @echo ' Modules:' $(MODPATH)
+ @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 -Nur a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
+--- a/src/modules/m_xline_db.cpp 2012-07-01 22:54:27.000000000 +0200
++++ b/src/modules/m_xline_db.cpp 2012-07-05 19:42:57.689999753 +0200
+@@ -88,7 +88,7 @@
+ * -- w00t
+ */
+ ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
+- f = fopen("data/xline.db.new", "w");
++ f = fopen("/var/lib/inspircd/data/xline.db.new", "w");
+ if (!f)
+ {
+ ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
+@@ -136,7 +136,7 @@
+ }
+
+ // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
+- if (rename("data/xline.db.new", "data/xline.db") < 0)
++ if (rename("/var/lib/inspircd/data/xline.db.new", "/var/lib/inspircd/data/xline.db") < 0)
+ {
+ ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
+ ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
+@@ -152,7 +152,7 @@
+ char linebuf[MAXBUF];
+ unsigned int lineno = 0;
+
+- f = fopen("data/xline.db", "r");
++ f = fopen("/var/lib/inspircd/data/xline.db", "r");
+ if (!f)
+ {
+ if (errno == ENOENT)
diff --git a/net-irc/inspircd/files/inspircd-2.0.7-init b/net-irc/inspircd/files/inspircd-2.0.7-init
new file mode 100644
index 000000000000..3180e5c14815
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.7-init
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.7-init,v 1.1 2012/07/07 12:35:20 nimiux Exp $
+
+extra_commands="rehash version"
+
+depend() {
+ need net
+ provide ircd
+}
+
+start() {
+ ebegin "Starting InspIRCd"
+ start-stop-daemon --start --quiet --user inspircd \
+ --exec /usr/bin/inspircd -- \
+ --config /etc/inspircd/inspircd.conf \
+ --logfile /var/log/inspircd/ircd.log &> /dev/null
+ 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 &> /dev/null
+ eend $?
+}
+
+version() {
+ ebegin "Retrieve InspIRCd version"
+ /usr/lib/inspircd/inspircd.launcher/inspircd version
+ eend $?
+}
diff --git a/net-irc/inspircd/inspircd-2.0.7.ebuild b/net-irc/inspircd/inspircd-2.0.7.ebuild
new file mode 100644
index 000000000000..8e44e2de8f8a
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.7.ebuild,v 1.1 2012/07/07 12:35:20 nimiux Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://inspircd.github.com/"
+SRC_URI="http://github.com/inspircd/inspircd/downloads/InspIRCd-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql postgres sqlite ssl"
+
+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 )
+ sqlite? ( >=dev-db/sqlite-3.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+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}/${PF}-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 ldap && extras="${extras}m_ldapauth.cpp,"
+ use mysql && extras="${extras}m_mysql.cpp,"
+ use postgres && extras="${extras}m_pgsql.cpp,"
+ use sqlite && extras="${extras}m_sqlite3.cpp,"
+ use ssl && extras="${extras}m_ssl_openssl.cpp,"
+
+ # allow inspircd to be built by root
+ touch .force-root-ok || die
+
+ if [ -n "${extras}" ]; then
+ ./configure --disable-interactive \
+ --enable-extras=${extras} || die
+ fi
+
+ use !ssl && essl=""
+ use !gnutls && egnutls=""
+ use ipv6 && dipv6=""
+
+ ./configure \
+ --disable-interactive \
+ --prefix="/usr/$(get_libdir)/${PN}" \
+ --config-dir="/etc/${PN}" \
+ --binary-dir="/usr/bin" \
+ --module-dir="/usr/$(get_libdir)/${PN}/modules" \
+ ${essl} ${egnutls} ${dipv6} || die
+}
+
+src_compile() {
+ append-cxxflags -Iinclude -fPIC
+ emake 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}"
+ dodir "/var/run/${PN}" "/var/lib/${PN}/data"
+
+ newinitd "${FILESDIR}/${PF}-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 starting "
+ elog "the service."
+ elog
+}