Bump to unstable atheme-services-7.0.0_alpha11.

Package-Manager: portage-2.2.0_alpha84-r1/cvs/Linux x86_64

4 files changed, 248 insertions, 15 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index 22dfbe0fe73e..25e9fdf92bf2 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.29 2012/02/03 01:24:17 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.30 2012/02/03 02:02:37 binki Exp $
+
+*atheme-services-7.0.0_alpha11 (03 Feb 2012)
+
+  03 Feb 2012; Nathan Phillip Brink <binki@gentoo.org>
+  +atheme-services-7.0.0_alpha11.ebuild,
+  +files/atheme-services-7.0.0_alpha11-unrealircd.patch:
+  Bump to unstable atheme-services-7.0.0_alpha11.
 
   03 Feb 2012; Nathan Phillip Brink <binki@gentoo.org>
   atheme-services-6.0.9.ebuild, atheme-services-6.0.9-r1.ebuild,
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 0bde843ff55b..bf062dae5054 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -4,29 +4,32 @@ Hash: SHA512
 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
 AUX atheme-services-6.0.9-cracklib-automagic.patch 2806 RMD160 e2915f4fab7aea2d4a512ce462e8bf7fda08cb80 SHA1 8c1f28b6446e66355171c0e9badcc6424144d42a SHA256 810509891a461b2d6701c8f48519d70436cba698bf0ab098ab02cef13f0a2619
 AUX atheme-services-7.0.0_alpha11-cracklib-automagic.patch 2906 RMD160 eed1183188ddc3f94c9606e131bbd14d7f17b971 SHA1 fc65b6b2b699bdf644e900b1fe700186b796597d SHA256 b053939d5c813e790eb2d8ffb7a95430d3a38b0c09c9a6c7776b50e4215c9763
+AUX atheme-services-7.0.0_alpha11-unrealircd.patch 3953 RMD160 8802ea74b02214a0bcbfa5be5790e496aa11b7a7 SHA1 aeda7b917d505e81cd1d326f6a52fd516976202d SHA256 99762e6d01ec2ad7c147b51efaab9a3e1204dca274f5953580eb930c2038e437
 AUX atheme-services-7.0.0_alpha9-pkg-config.patch 515 RMD160 aeed772eb3f741f14b405aff145235b8ab186978 SHA1 38abf5c9ac33f5a2e25d96f191f9c2bbcbe91767 SHA256 6f43dceda07461600962e11b69d0e62e01d878f93126d98b09bfd48d2c790c7e
 AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SHA1 bedd35acca25fad59ecd067709cfe85c0ba9798d SHA256 0cdcfb95d2399e132364127429618b44ce1830a61af0a5dc5bce1179b3810f75
 DIST atheme-services-6.0.9.tar.bz2 858804 RMD160 57ed736bb1eaedb0db68e63266ee8c98674f0542 SHA1 1b463ec808d4b92d0047319cdc1e4223a9ca9481 SHA256 058616395d6d5477ac4e63fc1daa88dffb62c9cc5a9239dae5dbe54508b6aaf9
+DIST atheme-services-7.0.0-alpha11.tar.bz2 989641 RMD160 c0520292ce294f0cd0682ed39e699d03a747d0c6 SHA1 160c37a93fa19d2dae0c2daaffd07061567c633b SHA256 0b97edc89bc503c61e9aa6183be985564ee39f038c3d0565da8a92c12a3b12eb
 DIST atheme-services-7.0.0-alpha9.tar.bz2 1055265 RMD160 d86413c63c79579247904965fffa7c2b1e76d688 SHA1 28168d0b4ab36840dd3522283dca2aebbb9a56d3 SHA256 564add960be744d637573d69ee12351555696048e69505af596d767f55b0b3b6
 EBUILD atheme-services-6.0.9-r1.ebuild 2852 RMD160 92a70cea6127f935c60c9718ede4618a8b7bc535 SHA1 018775714301a96f15a11e05062a42c0ff0e4726 SHA256 d5c3bff9b7ba8b10c0bdad3af44d39907fb98680172f654a765e2c8a7ed81826
 EBUILD atheme-services-6.0.9.ebuild 2726 RMD160 0df5ce4dcaa8bf3af0b60934d4b9abb583fdff67 SHA1 ff61636a6ff27c98352550dcb7d9e7c850807cb4 SHA256 926290f55f0aaf149b54dfe8dd5f93411b77ecc9eafa6cb7e02ae68644bdaddf
+EBUILD atheme-services-7.0.0_alpha11.ebuild 3008 RMD160 0898d6820b4d87fa7a669e6926d29e777f58bbbb SHA1 0a747abefb2204d416df142bc265a5b6ed0c9fd8 SHA256 d514be782cf4a40758ee1535bc0420269f0fe5535d719338280138512b19fa72
 EBUILD atheme-services-7.0.0_alpha9.ebuild 3143 RMD160 f7e3516110a1d2e08c03f5ee8be3900e6ebcf331 SHA1 98d527cc26f4badd1fea76562e9126cee87aca1f SHA256 a88da1225d947070a6505e309b61bf2a69ede397f0b347c69450ceb7b2115297
-MISC ChangeLog 6314 RMD160 032038a1df46667ac9026342ad7aee8d5be25fa6 SHA1 d6691eefea14abcf91377443b3effd4b1851177f SHA256 fd7bdf4067057ed8cced53600eaebddcd14fe439ca4116d972304c23161ee060
+MISC ChangeLog 6564 RMD160 cbce130d34ef358c8dd47de9a1b63e3be28b9ea8 SHA1 e09a16b23d0db06fd0702899976f0061797b5e41 SHA256 46036036669a87a685d040d459ea08ceb6b865bb9e805dee9dd2ffca95e864b7
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPKzaKAAoJEHQ6UuhrqBBQnM0QAIUAqVo1VhwQKqcDjWhirtT9
-x0EgOW36lG+IcdTXhJ7bbPTPy2kB+7mWElvbj+ya072vyyTKyEaXAxulSdkB9MF1
-booXikTi6Rwkiehh5CrQpIddhCigBTYOz53tZoKmJc0uLm1hEzezxkDb/GZ70epq
-K7s/otZiuhJ8nrSbBx1fAqCr0KUhTNitm/vaQHsuG1Qj81yD0L2C07dWlb5j5B5p
-1LPO45lhnevvr5HxCnvCDGZvi3ySiAX6xjosebm1a5Gaukc2z+aKN9f2aisYASLr
-fmEw9YaGmwHzGaggeStAXUg9FwJYPJphwgLrbnpdB2lLYHG24h9XvsxaqJ4W6Dyh
-jBN/kjsJKgDO53WgjDZeymcEsSagjoj53s8Y6crM3sWbHVnIis3/JMBKiYuNUr0r
-5afgQPvu3j45rUoiuKKMXIhzD2qS7MyaJGfAmWGRqThEIqJv4C9qZZCneFQ1YwaN
-WbeiTHjHwLwZbh5aPg1Kuilx0dWMg1mcFjMoLgVJbyQSKOI8raczk4gAsBNxsccz
-GXGqIZbDT6gedn/B0ukSa+zXBPQwg5FigpL15kC7bwpjdtOZ31IcyVqkFT9i73im
-Zk3wfxL1kTWeV+fep7F65o94FX7OgT7Uz3ETUnVhPS8OHdSdHGFK9rHxtPNUfblr
-ktY1+ahiwmttxuh4KWtN
-=sO0a
+iQIcBAEBCgAGBQJPKz+IAAoJEHQ6UuhrqBBQjigP/iWx4lbiCION2HVAQUY+EvJB
+XUPK6LsVPrw8JXRpxBZf1KA22vtIP2ulLDllHbvjpvcEFXm713dkdi3YOE2SLaB2
+FJbRKxo9s8h4DLXR8fna7+PxgYdy/gzIstghhugr8hkiu5MSGCs92SSRTkqCB/G5
+kShEJsYa+oTEWioLxSgiVEX+VmT+As1e4mBA1Fk70eZdR/CnDXomfij22hJy/Zsq
++ddAWwo/H4WJBq7DwZzHO541Dpuhv8Pui2XS4SXUAOhrgMd0IR3yZ0/DDIAub/yG
+IYnxd5PEDbfRGDnTEnOZhEbWfk+BYELRKO5s7bZFyntE3gSAgG9Gn1jcKhOfTQ1s
+j82p3qU0xUWx1zN+uKkU9znGo8CU2M6uP50NzP5cHJbmu52a+ZTr08qzHLPzWxRN
+eEN820mYI3wAUm9mswPIZHk/4uUAkbvEh52TrvifBvT0nKaQtqIHpdy0pXQV359n
+FoHS2JmdUX0HJ0VDUAJH3R8eZBDeQm+yguSQJRc4/5dSXSt1Ih2m5tf8tZEA2mXa
+fnc/zVgqTWHwVGVZdSt2/RNhqvlk5kmVcrUr/smzh3WIa5sV5RhjejpKju6pUjbU
+2heKgm6LhJLU+qeHyjZJDRpbjwWvkYq1stxY2tnJ5vUG3rf+98FQuSYRSeaXfaN3
+78cJsuj522UxPuSZTmBT
+=PRdM
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild
new file mode 100644
index 000000000000..54447e0f85a5
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild,v 1.1 2012/02/03 02:02:37 binki Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic perl-module
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="http://atheme.net/"
+SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+
+RDEPEND="dev-libs/libmowgli:2
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/perl )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# the dependency calculation puts all of the .c files together and
+	# overwhelms cc1 with this flag :-(
+	filter-flags -combine
+
+	if use profile; then
+		# bug #371119
+		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
+		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
+		append-flags -nopie
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cracklib-automagic.patch
+	epatch "${FILESDIR}"/${P}-unrealircd.patch
+	eautoconf
+
+	# fix docdir
+	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
+
+	# basic logging config directive fix
+	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
+
+	# QA against bundled libs
+	rm -rf libmowgli-2 || die
+
+	# Get useful information into build.log
+	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
+}
+
+src_configure() {
+	econf \
+		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_with nls) \
+		$(use_enable profile) \
+		$(use_with perl) \
+		$(use_with pcre) \
+		$(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		newins ${conf} $(basename ${conf} .example)
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	# contributed scripts and such:
+	insinto /usr/share/doc/${PF}/contrib
+	doins contrib/*.{c,pl,php,py,rb}
+
+	if use perl; then
+		perlinfo
+		insinto "${VENDOR_LIB#${EPREFIX}}"
+		doins -r contrib/Atheme{,.pm}
+	fi
+}
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-unrealircd.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-unrealircd.patch
new file mode 100644
index 000000000000..7b5d69ed6121
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-unrealircd.patch
@@ -0,0 +1,109 @@
+From 5f64c859cba285f4207a08cc4f02dc450a5b600d Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: Mon, 28 Nov 2011 05:28:11 +0000
+Subject: [PATCH] libathemecore: Fix NULL dereference when talking to IRCds without UID support.
+
+Fixes regression caused by c14ab567552c0053cb4c5d184956d0a1a7a5d19f.
+---
+ include/users.h          |    2 +-
+ libathemecore/services.c |    6 +++---
+ libathemecore/users.c    |   12 ++++++------
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/include/users.h b/include/users.h
+index 16deee9..643a23a 100644
+--- a/include/users.h
++++ b/include/users.h
+@@ -55,7 +55,7 @@ struct user_
+ #define UF_WASENFORCED 0x00002000 /* this user was FNCed once already */
+ #define UF_DEAF        0x00004000 /* user does not receive channel msgs */
+ 
+-#define CLIENT_NAME(user)	((user)->uid[0] ? (user)->uid : (user)->nick)
++#define CLIENT_NAME(user)	((user)->uid != NULL ? (user)->uid : (user)->nick)
+ 
+ typedef struct {
+ 	user_t *u;		/* User in question. Write NULL here if you delete the user. */
+diff --git a/libathemecore/services.c b/libathemecore/services.c
+index abcd7fc..3725234 100644
+--- a/libathemecore/services.c
++++ b/libathemecore/services.c
+@@ -245,9 +245,9 @@ void services_init(void)
+ 
+ 	MOWGLI_PATRICIA_FOREACH(svs, &state, services_name)
+ 	{
+-		if (ircd->uses_uid && svs->me->uid[0] == '\0')
++		if (ircd->uses_uid && svs->me->uid == NULL)
+ 			user_changeuid(svs->me, uid_get());
+-		else if (!ircd->uses_uid && svs->me->uid[0] != '\0')
++		else if (!ircd->uses_uid && svs->me->uid != NULL)
+ 			user_changeuid(svs->me, NULL);
+ 		if (!ircd->uses_uid)
+ 			kill_id_sts(NULL, svs->nick, "Attempt to use service nick");
+@@ -311,7 +311,7 @@ void reintroduce_user(user_t *u)
+ 	/* Reintroduce with a new UID.  This avoids problems distinguishing
+ 	 * commands targeted at the old and new user.
+ 	 */
+-	if (*u->uid)
++	if (u->uid != NULL)
+ 	{
+ 		user_changeuid(u, uid_get());
+ 	}
+diff --git a/libathemecore/users.c b/libathemecore/users.c
+index 432b9ea..18a8855 100644
+--- a/libathemecore/users.c
++++ b/libathemecore/users.c
+@@ -134,7 +134,7 @@ user_t *user_add(const char *nick, const char *user, const char *host,
+ 		{
+ 			wallops("Server %s is introducing nick %s which already exists on %s",
+ 					server->name, nick, u2->server->name);
+-			if (uid != NULL && *u2->uid != '\0')
++			if (uid != NULL && u2->uid != NULL)
+ 			{
+ 				kill_id_sts(NULL, uid, "Ghost detected via nick collision (new)");
+ 				kill_id_sts(NULL, u2->uid, "Ghost detected via nick collision (old)");
+@@ -244,7 +244,7 @@ void user_delete(user_t *u, const char *comment)
+ 
+ 	mowgli_patricia_delete(userlist, u->nick);
+ 
+-	if (*u->uid)
++	if (u->uid != NULL)
+ 		mowgli_patricia_delete(uidlist, u->uid);
+ 
+ 	mowgli_node_delete(&u->snode, &u->server->userlist);
+@@ -364,13 +364,13 @@ void user_changeuid(user_t *u, const char *uid)
+ {
+ 	return_if_fail(u != NULL);
+ 
+-	if (*u->uid)
++	if (u->uid != NULL)
+ 		mowgli_patricia_delete(uidlist, u->uid);
+ 
+ 	strshare_unref(u->uid);
+ 	u->uid = strshare_get(uid);
+ 
+-	if (*u->uid)
++	if (u->uid != NULL)
+ 		mowgli_patricia_add(uidlist, u->uid, u);
+ }
+ 
+@@ -420,7 +420,7 @@ bool user_changenick(user_t *u, const char *nick, time_t ts)
+ 		slog(LG_INFO, "user_changenick(): nick collision on %s", nick);
+ 		if (u2->server == me.me)
+ 		{
+-			if (*u->uid != '\0')
++			if (u->uid != NULL)
+ 			{
+ 				/* If the changing client has a UID, our
+ 				 * client will have a UID too and the
+@@ -466,7 +466,7 @@ bool user_changenick(user_t *u, const char *nick, time_t ts)
+ 			wallops("Server %s is sending nick change from %s to %s which already exists on %s",
+ 					u->server->name, u->nick, nick,
+ 					u2->server->name);
+-			if (*u->uid != '\0' && *u2->uid != '\0')
++			if (u->uid != NULL && u2->uid != NULL)
+ 			{
+ 				kill_id_sts(NULL, u->uid, "Ghost detected via nick change collision (new)");
+ 				kill_id_sts(NULL, u2->uid, "Ghost detected via nick change collision (old)");
+-- 
+1.7.3.4
+