From d22d67bd0ba51ef328d53159368ed027a9d5a874 Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Mon, 20 Jun 2011 16:55:57 +0000 Subject: net-irc/inspircd: Version bump. Rename patches / init files. (Portage version: 2.2.0_alpha41/cvs/Linux x86_64) --- net-irc/inspircd/ChangeLog | 12 ++- .../inspircd/files/inspircd-2.0.3-fix-config.patch | 58 ----------- net-irc/inspircd/files/inspircd-2.0.3-init.d | 32 ------ net-irc/inspircd/files/inspircd-fix-config.patch | 58 +++++++++++ net-irc/inspircd/files/inspircd-init.d | 32 ++++++ net-irc/inspircd/inspircd-2.0.3.ebuild | 6 +- net-irc/inspircd/inspircd-2.0.4.ebuild | 116 +++++++++++++++++++++ 7 files changed, 220 insertions(+), 94 deletions(-) delete mode 100644 net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch delete mode 100644 net-irc/inspircd/files/inspircd-2.0.3-init.d create mode 100644 net-irc/inspircd/files/inspircd-fix-config.patch create mode 100644 net-irc/inspircd/files/inspircd-init.d create mode 100644 net-irc/inspircd/inspircd-2.0.4.ebuild (limited to 'net-irc/inspircd') diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog index e3c40031c505..7ba5fa0ce392 100644 --- a/net-irc/inspircd/ChangeLog +++ b/net-irc/inspircd/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-irc/inspircd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.37 2011/05/11 11:51:29 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.38 2011/06/20 16:55:57 c1pher Exp $ + +*inspircd-2.0.4 (20 Jun 2011) + + 20 Jun 2011; Dane Smith inspircd-2.0.3.ebuild, + -files/inspircd-2.0.3-fix-config.patch, -files/inspircd-2.0.3-init.d, + +inspircd-2.0.4.ebuild, +files/inspircd-fix-config.patch, + +files/inspircd-init.d: + Version bump. Move -2.0.3-fix-config patch and -2.0.3-init.d to + ${PN}-fix-config.patch and ${PN}-init.d. Change 2.0.3.ebuild to + use new patch and init file. 11 May 2011; Dane Smith inspircd-2.0.3.ebuild: Fix use of || die in subshell in ebuild. No revbump. diff --git a/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch b/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch deleted file mode 100644 index 5ca12fa4d56f..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nur a/docs/inspircd.conf.example b/docs/inspircd.conf.example ---- a/docs/inspircd.conf.example 2011-02-02 03:25:41.000000000 +0100 -+++ b/docs/inspircd.conf.example 2011-04-06 22:30:03.591000071 +0200 -@@ -402,11 +402,11 @@ - - # This file has all the information about oper classes, types and o:lines. - # You *MUST* edit it. -- -+ - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. -- -+ - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -416,7 +416,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 -- -+ - - # Example of an executable file include. Note this will be read on rehash, - # not when the command is run. -@@ -462,7 +463,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -908,7 +909,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # -- -+ - - # Here are some pre-built modules.conf files that closely match the - # default configurations of some popular IRCd's. You still may want to -@@ -920,10 +921,10 @@ - # recommended that you make your own modules file based on modules.conf.example. - - # Settings similar to UnrealIRCd defaults. --# -+# - - # Settings similar to Charybdis IRCd defaults. --# -+# - - - ######################################################################### diff --git a/net-irc/inspircd/files/inspircd-2.0.3-init.d b/net-irc/inspircd/files/inspircd-2.0.3-init.d deleted file mode 100644 index 75eb54b8e088..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.3-init.d +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 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.3-init.d,v 1.1 2011/04/26 14:22:31 c1pher Exp $ - -opts="${opts} rehash" - -depend() { - need net - provide ircd -} - -start() { - ebegin "Starting InspIRCd" - start-stop-daemon --start --quiet --chuid 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 $? -} diff --git a/net-irc/inspircd/files/inspircd-fix-config.patch b/net-irc/inspircd/files/inspircd-fix-config.patch new file mode 100644 index 000000000000..5ca12fa4d56f --- /dev/null +++ b/net-irc/inspircd/files/inspircd-fix-config.patch @@ -0,0 +1,58 @@ +diff -Nur a/docs/inspircd.conf.example b/docs/inspircd.conf.example +--- a/docs/inspircd.conf.example 2011-02-02 03:25:41.000000000 +0100 ++++ b/docs/inspircd.conf.example 2011-04-06 22:30:03.591000071 +0200 +@@ -402,11 +402,11 @@ + + # This file has all the information about oper classes, types and o:lines. + # You *MUST* edit it. +- ++ + + # This file has all the information about server links and ulined servers. + # You *MUST* edit it if you intend to link servers. +- ++ + + #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# + # # +@@ -416,7 +416,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 +- ++ + + # Example of an executable file include. Note this will be read on rehash, + # not when the command is run. +@@ -462,7 +463,7 @@ + # the default of 'inspircd.pid' is used. # + # # + +-# ++ + + #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -908,7 +909,7 @@ + # provide almost all the features of InspIRCd. :) # + # # + # The default does nothing -- we include it for simplicity for you. # +- ++ + + # Here are some pre-built modules.conf files that closely match the + # default configurations of some popular IRCd's. You still may want to +@@ -920,10 +921,10 @@ + # recommended that you make your own modules file based on modules.conf.example. + + # Settings similar to UnrealIRCd defaults. +-# ++# + + # Settings similar to Charybdis IRCd defaults. +-# ++# + + + ######################################################################### diff --git a/net-irc/inspircd/files/inspircd-init.d b/net-irc/inspircd/files/inspircd-init.d new file mode 100644 index 000000000000..e766cce697f0 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-init.d @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-init.d,v 1.1 2011/06/20 16:55:57 c1pher Exp $ + +opts="${opts} rehash" + +depend() { + need net + provide ircd +} + +start() { + ebegin "Starting InspIRCd" + start-stop-daemon --start --quiet --chuid 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 $? +} diff --git a/net-irc/inspircd/inspircd-2.0.3.ebuild b/net-irc/inspircd/inspircd-2.0.3.ebuild index a6b19de943e5..a1c6076cd1b8 100644 --- a/net-irc/inspircd/inspircd-2.0.3.ebuild +++ b/net-irc/inspircd/inspircd-2.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.6 2011/05/11 11:51:29 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.7 2011/06/20 16:55:57 c1pher Exp $ EAPI=2 inherit eutils multilib flag-o-matic @@ -42,7 +42,7 @@ src_prepare() { sed -i 's/\$(D)/\$(DEBUGLEVEL)/' ${makefiletpl} || die "sed failed" sed -i 's/\$(T)/\$(TGT)/' ${makefiletpl} || die "sed failed" - epatch "${FILESDIR}"/${P}-fix-config.patch + epatch "${FILESDIR}"/${PN}-fix-config.patch } src_configure() { @@ -101,7 +101,7 @@ src_install() { diropts -oinspircd -ginspircd dodir "/var/run/inspircd" || die "Creating run directory failed" - newinitd "${FILESDIR}"/${P}-init.d inspircd \ + newinitd "${FILESDIR}"/${PN}-init.d inspircd \ || die "Installing inspircd init script failed" keepdir "/var/log/inspircd/" } diff --git a/net-irc/inspircd/inspircd-2.0.4.ebuild b/net-irc/inspircd/inspircd-2.0.4.ebuild new file mode 100644 index 000000000000..e4a08be50944 --- /dev/null +++ b/net-irc/inspircd/inspircd-2.0.4.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.4.ebuild,v 1.1 2011/06/20 16:55:57 c1pher Exp $ + +EAPI=2 +inherit eutils multilib flag-o-matic + +DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" +HOMEPAGE="http://www.inspircd.org/" +SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openssl gnutls ipv6 mysql postgres sqlite ldap" + +RDEPEND=" + dev-lang/perl + openssl? ( dev-libs/openssl ) + gnutls? ( net-libs/gnutls ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-server ) + sqlite? ( >=dev-db/sqlite-3.0 )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/inspircd" + +pkg_setup() { + enewgroup inspircd + enewuser inspircd -1 -1 -1 inspircd +} + +src_prepare() { + # The makefile template defines variables (D and T) used by the + # ebuild system. Changing them to safe names. + local makefiletpl="${S}/make/template/main.mk" + + sed -i 's/IFNDEF D/IFNDEF DEBUGLEVEL/' ${makefiletpl} || die "sed failed" + sed -i 's/IFDEF T/IFDEF TGT/' ${makefiletpl} || die "sed failed" + sed -i 's/D=0/DEBUGLEVEL=0/' ${makefiletpl} || die "sed failed" + sed -i 's/\$(D)/\$(DEBUGLEVEL)/' ${makefiletpl} || die "sed failed" + sed -i 's/\$(T)/\$(TGT)/' ${makefiletpl} || die "sed failed" + + epatch "${FILESDIR}"/${PN}-fix-config.patch +} + +src_configure() { + local extras="" + local dipv6="--disable-ipv6" + + use openssl && extras="${extras}m_ssl_openssl.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 ipv6 && dipv6="" + + # allow inspircd to be built by root + touch .force-root-ok || die + + if [ -n "${extras}" ]; then + ./configure --disable-interactive \ + --enable-extras=${extras} || die "configure failed" + fi + + ./configure \ + $(use_enable openssl) \ + $(use_enable gnutls) \ + --disable-interactive \ + --prefix="/usr/$(get_libdir)/inspircd" \ + --config-dir="/etc/inspircd" \ + --binary-dir="/usr/bin" \ + --module-dir="/usr/$(get_libdir)/inspircd/modules" \ + ${dipv6} || die "configure failed" +} + +src_compile() { + append-flags -Iinclude -fPIC + emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed" +} + +src_install() { + emake INSTUID=inspircd \ + BINPATH="${D}/usr/bin" \ + BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher" \ + MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \ + CONPATH="${D}/etc/inspircd" install || die "emake install failed" + + insinto /etc/inspircd/modules + doins docs/modules/* || die "Installing inspircd modules failed" + + insinto /etc/inspircd/aliases + doins docs/aliases/* || die "Installing inspircd aliases failed" + + insinto /usr/include/inspircd/ + doins include/* || die "Installing inspircd include files failed" + + diropts -oinspircd -ginspircd + dodir "/var/run/inspircd" || die "Creating run directory failed" + + newinitd "${FILESDIR}"/${PN}-init.d inspircd \ + || die "Installing inspircd init script failed" + keepdir "/var/log/inspircd/" +} + +pkg_postinst() { + elog "Before starting inspircd the first time you should create" + elog "the /etc/inspircd/inspircd.conf file." + elog "You can find example configuration files under /etc/inspircd." + elog "Read the inspircd.conf.example file carefully before starting " + elog "the service." + elog +} -- cgit v1.2.3-65-gdbad