Version bump to 2.0.6_rc1

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

5 files changed, 308 insertions, 2 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index cfddfa52ff37..33019df2b3bb 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.46 2012/04/04 11:52:38 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.47 2012/04/12 20:17:22 nimiux Exp $
+
+*inspircd-2.0.6_rc1 (12 Apr 2012)
+
+  12 Apr 2012; Chema Alonso <nimiux@gentoo.org> +inspircd-2.0.6_rc1.ebuild,
+  +files/inspircd-2.0.6-init, +files/inspircd-2.0.6_rc1-fix-path-builds.patch:
+  Version bump to 2.0.6_rc1
 
 *inspircd-2.0.5-r2 (04 Apr 2012)
 
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 5a7c8cfc123b..61d70f9f449f 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,18 +1,36 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
 AUX inspircd-2.0.5-r1-fix-make-config.patch 3967 RMD160 189944c41944ad4e35a8d9ed5334652ad2242af4 SHA1 d0538be470e462785fe645adbe86d8fc5449b03c SHA256 2b7d9ac477190c521d1e8b2a9d1a81aa87c8f54322af68ddf31d814485f388aa
 AUX inspircd-2.0.5-r1-init 884 RMD160 ec73c88838aed3de86d74952b16846f47ec9d721 SHA1 f137809459e728d2b1861dda7aff623049faf67d SHA256 750c68cee92603b99b5f0f28ac7655555bab583b86d50f44d23676facdfe089c
 AUX inspircd-2.0.5-r2-fix-paths-build.patch 6004 RMD160 a3ea8bb281f5d3ca23ecfd5cfbd501e70cb33f0c SHA1 8e08c24b38ca253924ddeaee621f75c202111147 SHA256 099a6715ccacfd49dafcd46a0003eaf239c512dd6e9ffed69dfb1256e58a2309
+AUX inspircd-2.0.6-init 881 RMD160 e279fe91f213fb56851b63c676e3b96d868bd275 SHA1 95c4bc05f41691261e9ee5cc7eb0e0c0029d598e SHA256 b4a70f07020cddb8190126ff063a8e698bfc0e13a8fedd555ba3167da13cac68
+AUX inspircd-2.0.6_rc1-fix-path-builds.patch 4821 RMD160 49f20cf1c7b25e56f710da2056f5c69a094d3071 SHA1 ad31f729e0258304c5b60556097f8da2fc83e8b9 SHA256 0d332c24166aae07a5d7be5b6faf3ea14a4c0354889670989ba8475d1ff4ea76
 AUX inspircd-fix-config.patch 2656 RMD160 988ba38a32cc8da5c566326a02f362eaf7dc02f1 SHA1 3f94c4ea95ac5c11d717f02b82d64a398f212377 SHA256 ab88c2ef4b4670283a2e3f4c32d4fd212b508ab53899ee1694bb71df5f9d96a1
 AUX inspircd-init.d 754 RMD160 6bb390cf0bdcc10892886be7dbc7b1c40aecbe14 SHA1 fa4faa440dd85c0225ef343f12ba4e63f364bf4c SHA256 041986c91a218c1cdc4d88f78da915990dd4de565c9b3cca3cf2fb15ef38db8f
 DIST InspIRCd-1.2.8.tar.bz2 637194 RMD160 e2581b194419add2fe2918263a6d1d545cf8a4d0 SHA1 201d83459eddc899143b10c768378059c2669ae1 SHA256 fa856ddb6d7ab2b4dc6aa6b0f58bbb2360823ce296d4e9dd0f18d630d8c7cee5
 DIST InspIRCd-2.0.3.tar.bz2 579960 RMD160 1ebe6b060b7db6be0697a71bbba59a48772aa9b9 SHA1 fc68d8322110fd882d0ffc426a5ff3b81677bd12 SHA256 f3d89a2a37137948c7f4e5b40f6670a0129327b66a3442d233c1026151d06182
 DIST InspIRCd-2.0.4.tar.bz2 579791 RMD160 896736403fd7a219438c94e1b519d6d854b977aa SHA1 8160b229c3ec18f4d496067e9134db1f44a21c26 SHA256 19c5ff6b52b4b5f9f18ec63de28618dee31c634b0bcecedadcd6a5c6e310fb1e
 DIST InspIRCd-2.0.5.tar.bz2 575852 RMD160 01c339bb2e9d7a6b0ac71b1e6e39927a29bd4172 SHA1 2f316e33e1e53b70513fd55089206fe13f4287fa SHA256 425bf79ae1348b398ce6d2348f6cc8baeebe8125f62337e98c136942223f4fc6
+DIST InspIRCd-2.0.6rc1.tar.bz2 576727 RMD160 d0fa9c6ed5bfe822681cc9f54697f942ba441c69 SHA1 40e23e2a4407632281538776488fb6bbee582e5b SHA256 9c3c7385cb7f62224750c6dc3dcc3c26cfaabedbdb5d7f4fc56636d031cde0d1
 EBUILD inspircd-1.2.8.ebuild 3372 RMD160 c11629cadbd2454297cbb24de8a24f6933f9692c SHA1 abbda33b957474fe66a17bd799e3cfea840d5ad0 SHA256 221f5ec40bf3b23bfffd85059509aa8819ad6c332dd18b4148035caeebc0063b
 EBUILD inspircd-2.0.3.ebuild 3517 RMD160 15739f4de675339089e81bb1b7867e9ce6a982fd SHA1 b73bf1e6e573a3a7123c8df33a27fd2758f64d31 SHA256 7a8c434d8e354fceb267ac22adc5ca233d591abda4afccadb387b47c2d612ecb
 EBUILD inspircd-2.0.4.ebuild 3517 RMD160 28b949471498f488313d1550247195a80ca2fc28 SHA1 61f767c47825715f5ff5769eea394ac1d27118f4 SHA256 28123b7d4aee666617fa4efcb736eedbb94936fcc24fb09f0a2179ae09f1685c
 EBUILD inspircd-2.0.5-r1.ebuild 2824 RMD160 c6f904bf7801c4bba301d65e0141e6511f29d5af SHA1 40511a20d151cc925ef3a185fa0dd963062219ee SHA256 75414d9322a17bf971cfb38c4eb4a887a45bc3c6b3ef1f2d91670e527a2a18a3
 EBUILD inspircd-2.0.5-r2.ebuild 2836 RMD160 f8d44d3a6e13c987b2bd61355b429b83a91bd7be SHA1 75a9bcd5086d9e40bd2617aad958b0bc28e2514d SHA256 8e1cdc756e2f32e79fc6a0c8607067cd84d724afb51e78e4ae460ffb35adc158
 EBUILD inspircd-2.0.5.ebuild 3230 RMD160 03a18afeb1b6128e2d32cecd0d5c2d5f88739324 SHA1 5b6d1ce6605826d14f851454e842be35df26239f SHA256 83bb52a4f4ffc57ecc89493389e6679d9304c746827e7b76ecfdf054e855913a
-MISC ChangeLog 8604 RMD160 b02bbcae3adfeec5e5a6b6e6a8de17362116c800 SHA1 d050c3be9e3c5c1a5145a5feb880f5b342c9aa9f SHA256 f3ebaa9db0fc26953de5e00dc6bbbeeefafb33b7087579881b05db8c05885708
+EBUILD inspircd-2.0.6_rc1.ebuild 2965 RMD160 0f12588bf6e62dc983c713cf0f7ebb4a2934a2a5 SHA1 5dd44ff59505a25d5a86f48ed018e03d53d9a248 SHA256 b85ca9ff925a0465f46c01e73066a51536373797d545472f2e5c14537ba5d0ca
+MISC ChangeLog 8823 RMD160 a7c5aa3a1a6779252bcc6c9ba0dd7e5cca3ec5f0 SHA1 40c600525f629eec0a81809f3c79366acbf4b481 SHA256 18363ec80771b63e68084613afca6877a833cea723a947837cf66484374e5af5
 MISC metadata.xml 910 RMD160 4d07c259e86ccc476ac921bee4cd0fdeac8379f9 SHA1 e42067b72bca0590cbde7212990c5de279083382 SHA256 77777a194d0e0eb697a0f0dd57b9bdc3b64dae3c021930f77035611b4fdda9f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJPhziXAAoJEA2sAkrWKOU20gwIAJR+hdNn0Sltk1g4IHpZvMDd
+A6XoVBwBcz5lCTqZ4vyYd2ToZkzOgMVVVAfLcDlB+JvJRmXDnbfQMacI58YRgI7b
+nt4gAiRR5vL9xZsvVQ3zAgHqt2uwnXYO4dtuM75Cz8Aw0tgrMySBw4xYwvsDqPYF
+n2MPjy/zSXwk1BxXNsdTBzPUI+fUv9oMbvcBIK3WuwOrPOohsH41W0gjiXJdF9uS
+A5HqlONaG06z2/YUS+1/ME8c+WNioUpIpAThuuN9YHUMF33S3Mpe3ozqiI2+YJnc
+vknUB+eK6x0uM3x6iaDyZVJ81WAX2ZlM2TWSLmIpVvHki1DLCDSsZFw6ChWaP5E=
+=G5VY
+-----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.6-init b/net-irc/inspircd/files/inspircd-2.0.6-init
new file mode 100644
index 000000000000..97696e1b9b61
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.6-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.6-init,v 1.1 2012/04/12 20:17:22 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/files/inspircd-2.0.6_rc1-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.6_rc1-fix-path-builds.patch
new file mode 100644
index 000000000000..cece33665ebe
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.6_rc1-fix-path-builds.patch
@@ -0,0 +1,132 @@
+diff -Nur a/docs/inspircd.conf.example b/docs/inspircd.conf.example
+--- a/docs/inspircd.conf.example	2012-04-09 15:38:53.000000000 +0200
++++ b/docs/inspircd.conf.example	2012-04-12 20:37:48.669878206 +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 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -912,7 +913,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
+@@ -924,10 +925,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-04-09 15:38:53.000000000 +0200
++++ b/make/template/main.mk	2012-04-12 20:37:48.669878206 +0200
+@@ -54,22 +54,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
+@@ -111,10 +111,10 @@
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+diff -Nur a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
+--- a/src/modules/m_xline_db.cpp	2012-04-09 15:38:53.000000000 +0200
++++ b/src/modules/m_xline_db.cpp	2012-04-12 20:37:48.669878206 +0200
+@@ -92,7 +92,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);
+@@ -133,7 +133,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);
+@@ -149,7 +149,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/inspircd-2.0.6_rc1.ebuild b/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
new file mode 100644
index 000000000000..df4cae4a8778
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
@@ -0,0 +1,112 @@
+# 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.6_rc1.ebuild,v 1.1 2012/04/12 20:17:22 nimiux Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib versionator
+
+MY_PV="$(delete_version_separator 3)"
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://www.inspircd.org/"
+SRC_URI="http://github.com/inspircd/inspircd/downloads/InspIRCd-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ipv6 ldap mysql postgres sqlite ssl"
+
+RDEPEND="
+	dev-lang/perl
+	ssl? ( dev-libs/openssl )
+	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 ssl && 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,"
+
+	# 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 /etc/"${PN}"/modules
+	doins docs/modules/*
+
+	insinto /etc/"${PN}"/aliases
+	doins docs/aliases/*
+
+	insinto /usr/include/"${PN}"
+	doins include/*
+
+	diropts -o"${PN}" -g"${PN}"
+	dodir /var/run/"${PN}" /var/lib/"${PN}"/data
+
+	newinitd "${FILESDIR}/${PN}-$(get_version_component_range 1-3)-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
+}