Bump to unrealircd-3.2.10.1.

Package-Manager: portage-2.2.0_alpha176-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x743A52E86BA81050

3 files changed, 233 insertions, 15 deletions

diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index 6ffa9ac50039..a6b12030acb2 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/unrealircd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.104 2013/05/11 16:04:57 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.105 2013/05/22 01:37:43 binki Exp $
+
+*unrealircd-3.2.10.1 (22 May 2013)
+
+  22 May 2013; Nathan Phillip Brink <binki@gentoo.org>
+  +unrealircd-3.2.10.1.ebuild:
+  Bump to unrealircd-3.2.10.1.
 
   11 May 2013; Nathan Phillip Brink <binki@gentoo.org>
   unrealircd-3.2.10-r1.ebuild, unrealircd-3.2.9.ebuild:
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 1013e95130f4..2aec6cde913d 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,26 +4,28 @@ Hash: SHA256
 AUX unrealircd-3.2.9-disabled-stacked-extbans.patch 800 SHA256 b4005233ead9a7af056a4c33281ffcda3027cfd3af617e39b1de5438162863bc SHA512 586f59bf47e1fbe422979efd6219a7f8d9c1f648a342110910e26be6e8407383dc16af30a9791fde58712b21e4e216fa2f5b7ccfb001bc893f934f831031002d WHIRLPOOL 54ca41b6f129ea125f4fa23259edcb096d5eaedd0b00faf9f5a8f6254ab8085f5894881ce275a15e7a85382302ada1c04de2b1075ad4be5cab9207b9c2f58146
 AUX unrealircd.confd-r1 1339 SHA256 d06a0d17b12171f7b83c8e9ab5ecb84ab5a98a0310b12f3eb969a5046a26f70a SHA512 88bff1811e86034eff6327e88fd95b6dd3cb243ee9dc6aab0d01dcf690b9d18f88ae4f3fe13e5a0728e6220e0dc7d0601a125c30cc914dbb242201a4bde2d751 WHIRLPOOL b25b05944af47b672c4603c1f11cc7e29abf2d0e9f7074815da6a8ab76650590ce0fc3d5d61bd97ec4ab283b50e2274799e1344389f6e6fc372d5ab3a9560fe6
 AUX unrealircd.initd 1253 SHA256 5eb5be0b5d4d0ea3edb0b3829fe787401f3a1d8c51bbcde52fa612630b561fca SHA512 57aa1028bc2fb65894e71feb57669ec238c884475456b0a8eaac6b117835a905e5a24275bdd4400b327a662c99b06887e2c701ca077420ca6e140227d04181cd WHIRLPOOL 312f31f3c52c94f1228b955e63c79e7fbbc10eb7d6cce98a39521d8df89a5506068de7420f1d73302d801ac32ed7f6e018c29dc52e2011bec63a72fec01e516d
+DIST Unreal3.2.10.1.tar.gz 3135615 SHA256 79843002413a42deabed7d1471abc15944c94d3a41f02fcebc3601e50d282036 SHA512 cfa1d1be4a4e585f9d2c85320d07977f7b354b33cfb3b6e5a488ff079eaae613659817e9f4ac0c6d25f6edb1fb8fd80e009ed9df7b94b8e1c409d696da4a2e93 WHIRLPOOL 932dbc8e141f913d9511c5490a96c6825967f6a23cd4f1774e3aa8a61791c5d0245de2cfabcda87f2c125881c2a860d0f89cbf446b449adf6cc0190c14241358
 DIST Unreal3.2.10.tar.gz 3132312 SHA256 91a6fb61072fae60ad4620b1c45ad594b4c636871e838e75f1cc9dbe261c5df2 SHA512 fdd656ff014e74d2213bf52fb56f73abcfebdb201e1fa4ef5f4ef76e99fbee4ae128458c718a57beff49cbc132dd1b4408ffb137a080327d12f190a74e9d4712 WHIRLPOOL 28f39831c16720c97a7415e2a07b4a853f3f1526d77d8441f3f19956d5a9531ca93bbea33c1d8d62d33547db240f2f52651b303d73ea56a2c6871ddba49f459a
 DIST Unreal3.2.9.tar.gz 3064571 SHA256 3f581a331825d9179f5367ea6367dd0dc71c7ba615ac3c0134332086bee0e1d8 SHA512 6f18c2e9282c2417d34fa4ace8be183394ec896abcb9f9b0d87fb61013360a6281fb151a73b03379c5fcc1f30235ba6c3420c709df273cf1887f8e7d95d6a686 WHIRLPOOL e589a4c02de158e14b9e52a4297a73b1c107a724e13526447907714d7eee4f21a7a8d70f8f301a137847dc6cb83f6424d0c128a9b9a526ef0ce0d09f675dc874
 EBUILD unrealircd-3.2.10-r1.ebuild 6628 SHA256 0da7a06c1b6504cecdc3f2b60e4e44833df815dc063e2833daa96e89a61a3f69 SHA512 af3247d953e2d496cc1e699939937180ee96de1439c8e3084e0edabc3060092b488a44742cb86d4f3f502dfb672c23ff43cff8b84e17dddaadc0fa1879d0f6de WHIRLPOOL 23420f1848b3cfe27c5ed717a42aed2885f38dc81b7bddb29f98f77ee6744b209d1b40d1859c32d25420104ae067c28a446b9c4a9a2cf1ea08d9bbffcfeb7aab
+EBUILD unrealircd-3.2.10.1.ebuild 6627 SHA256 3d606a97bdecca9a67e7df2641f130a1b6942162b09c9ecf2c9cfbcac2c6a578 SHA512 f1f2eaf8a45289503533fdcc47a660e8f94d8af48a574f8353880047d0ca7ea1afe75a95f96363bf8328d241b16c24c6c22223b99630ecf3e906b06991eb527e WHIRLPOOL 46e1e1e12adbf90c8ad9aec7d0526e04a36be209461fb1c44566fc55a1b7b84ef2472e29d27b178ad503b4b1b70e98f8841d7131b06e7eec1945cc99d78c1d61
 EBUILD unrealircd-3.2.9.ebuild 4692 SHA256 7671095f6293f9c88796404fc109c492868df16203623d4deb6fe2bf2a5ab077 SHA512 b2d3844dce1e34d3d1c47226460c918b205390844be94eced163a25d7f8779161c7f07e4fd6ee2dcb7ed9593088bd60f2b04077941622049d7f233b36bbec8a8 WHIRLPOOL 9474b939e30e9a9a8b44a10f47b64394db25cd8fee03664c41d14418ad4fc61a0c4399f7a22108f4a3bc2d0612295c6db34d0dccea259013200bf753413e0aaa
-MISC ChangeLog 15959 SHA256 6d3b338fa148747a7a5c5dc77e34f968e77458d5b91b5a9c902df79d8d87fed1 SHA512 b20aa7e59657171e50d7a993b087153f4a429aaf955cc85ca6101c14619eff89103fea7e820f36b7bc66f961c81b62d4c0acc97880af27eec127dab2ca599f4f WHIRLPOOL aca8ead554d64fd67fecb686f73b346063879ab4917613212ff38533bf4e1308c752af89465f2670d506d370c9f0472508837f20b45f1de8668e61ca189f800e
+MISC ChangeLog 16113 SHA256 9516a14623276cebb2e5b9fc1bfa5ddf6684da05cf129cc69abd826481e583d3 SHA512 18ffe5ef4061356b3535f13e7cc262298c64d794e27a4d24523141d28917c5c64ae86a7f7fecca351e3497528b4a466164309610c3428dd26cbc002c1b9b9b09 WHIRLPOOL 63249d244247904788ee3efd835f9526567ee6ef7714365675e5a1924a04921c091eea19000d5f6e0d4954ce442d95a9614807594b238a22944b66f9ef7a1906
 MISC metadata.xml 1206 SHA256 ef13b97c20ebb2a78aeb354c28a8d56a2492e97c77d6a8df326f4acad5498ba5 SHA512 b2d2e0ac3d6a6fab210c9a4e32a75ee7fe69b21c7801b77feffa26c6fa3fb034928d58cfce8a011606e054d118d2bde51a742a55b19735a71b7599b2f5de552f WHIRLPOOL 3235a2b69ddc27e73e43df66b6969e762665ba6798a4447ee8a077fce2939e34c0b705c972965329991ec04168b68cc3b419fbabecdbc294e99dcf174cb258d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRjmwuAAoJEHQ6UuhrqBBQhooQAIkBA9PpQ3LJmADxLYdb4YNr
-wvN4TLc8vp/y+yhjQdIYo6/WY1ZiAqvrCvTd0lQllDA7Od2kasHUY188o1K0xX4M
-E0Ir9JH1AvI2yxI2NATgoUuRuagxSY4IY6q1+/yAWB/ZP4go0jdSIbMePSgUBdxe
-3SaRYS1cyDfi1DPwiNAGrU1LKMPpXgTuWGJ1qaAzK8VAjyQybpA2rgR2UOMX9zeQ
-zbtvVpZkPYccVoX7q2UznyNNNbdiUxyqh6qNg3uIOW/nz2UUj2aLI1HUO4HPYhv9
-WmWzkcrA3Ugew/ntbvkZ9Rmgm/WgzeIFNkMmZPOK9uiRL6uKHrO5vahUZArvaGoW
-DMw+2m8RlHriJgeC2zwcr9pkbDKVSRuEIbcI7ZrZCZZl447Ljc8b/j1tDNioe7wI
-SK6XoQaXAY0bN6JxoLAaKmTKvN1U2aM483Z8rDqrQOZZlaR+MrPZZ1KZN/3exHk3
-D/+iODa/pvn9FtPiypmFfapPBhT1haWc6/yhaSvQjSNPxfoduCTg7w5gZ8AsiBPl
-HD5Fiqut/83Y/or4S3AEP/wt+PHugCtcogWzJdyTUGHSHPcEJB2XmUbAKWSmQS1e
-WtiGsUUsYSAf7LNELru1XiyvCWVXK+zKXHAcl+qoIkRyHPlx7Eca4nZ4JKtHOC2L
-U5NcgCVG3gQnJt3JSRDK
-=L9RC
+iQIcBAEBCAAGBQJRnCF+AAoJEHQ6UuhrqBBQdREP/1ucfe/5M6uV8gz0rQ0bh2Br
+QyZeA8Bd1BKnmfgyeKS3R0k7wJHhrNp78zkkWCJKuBCmG9pQsHp9i8O72c6HiShr
+c1dCCkW9qVKk1yw8dPZXeuBLRKklzMMQpYHAYcG0o5zDKJEmSz8wIPZ2biw4hw4n
+FrJwjKbhUbNx1Lhq2C1RJhUiRvK7lC9DAJtBousJNqx6yJIx2O2vygF+kcxX+b4I
+dF+MOtOCK8PCKfea2pTbun1Byhen9UWlKeBjOeXvjMYnWp3SG+HWJvFmksJ9Zxhw
+V2MwjmvBsQZwEddJff1SOA95su+Tyytn2jYm+cncLUTe64hobwhJKF/GCMUpltdK
+mR3OdPxey/rzohiiNj/GEnGhSm5m4mI0UrD98ohaq5fNaWqqXuZeKowZggjEyqsd
+kbkSNsuCLa7V31fKPxrwkImTL2SS3loZIR3ZHAxRnowDAhV2HFgRDy65c4zo8GDH
+CaWEgf67SD5YGnkXMRhlinpgz0LitPlIWIF+0iME8mfGj75ahqhsY1bV6qKoVO6g
+5Zkjl3eu8nf6m/owj9I9Tm+bfyq0nlT1t2trmzwZ7Kz9+tPR1atgkj8L/XG5iVwk
+vEC3/GOU95rSWk1uwbDDXfKPq4ZaN7tokNy/YVjjU9RftjHWBmG47mkcQyL8J2+A
+h2jJv8xYqErWtjgTI2kJ
+=YsoB
 -----END PGP SIGNATURE-----
diff --git a/net-irc/unrealircd/unrealircd-3.2.10.1.ebuild b/net-irc/unrealircd/unrealircd-3.2.10.1.ebuild
new file mode 100644
index 000000000000..50d839fc96b4
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.2.10.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.10.1.ebuild,v 1.1 2013/05/22 01:37:43 binki Exp $
+
+EAPI=4
+
+inherit eutils ssl-cert versionator multilib user
+
+MY_P=Unreal${PV/_/-}
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="http://www.unrealircd.com/"
+SRC_URI="http://www.unrealircd.com/downloads/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="curl ipv6 +extban-stacking +operoverride operoverride-verify +prefixaq
+	showlistmodes shunnotices ssl topicisnuhost +usermod zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )
+	curl? ( || ( net-misc/curl[ares]
+		net-misc/curl[adns] ) )
+	dev-libs/tre
+	>=net-dns/c-ares-1.7"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	virtual/pkgconfig"
+
+S=${WORKDIR}/Unreal$(get_version_component_range 1-3)
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm extras/*.gz || die
+
+	sed -i \
+		-e "s:ircd\.pid:${EPREFIX}/var/run/unrealircd/ircd.pid:" \
+		-e "s:ircd\.log:${EPREFIX}/var/log/unrealircd/ircd.log:" \
+		-e "s:debug\.log:${EPREFIX}/var/log/unrealircd/debug.log:" \
+		-e "s:ircd\.tune:${EPREFIX}/var/lib/unrealircd/ircd.tune:" \
+		include/config.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--with-listen=5 \
+		--with-dpath="${EPREFIX}"/etc/unrealircd \
+		--with-spath="${EPREFIX}"/usr/bin/unrealircd \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-bufferpool=18 \
+		--with-permissions=0600 \
+		--with-fd-setsize=1024 \
+		--with-system-cares \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable prefixaq) \
+		$(use_enable ssl ssl "${EPREFIX}"/usr) \
+		$(use_enable zlib ziplinks "${EPREFIX}"/usr) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+	keepdir /var/{lib,log}/unrealircd
+
+	newbin src/ircd unrealircd
+
+	exeinto /usr/$(get_libdir)/unrealircd/modules
+	doexe src/modules/*.so
+
+	dodir /etc/unrealircd
+	dosym /var/lib/unrealircd /etc/unrealircd/tmp
+
+	insinto /etc/unrealircd
+	doins {badwords.*,help,spamfilter,dccallow}.conf
+	newins doc/example.conf unrealircd.conf
+
+	insinto /etc/unrealircd/aliases
+	doins aliases/*.conf
+
+	local so_suffix=so
+	[[ ${CHOST} == -*mingw* ]] && so_suffix=dll
+	sed -i \
+		-e s:src/modules:"${EPREFIX}"/usr/$(get_libdir)/unrealircd/modules: \
+		-e '/loadmodule.*\.'${so_suffix}'/s;^//;;' \
+		-e s:ircd\\.log:"${EPREFIX}"/var/log/unrealircd/ircd.log: \
+		"${ED}"/etc/unrealircd/unrealircd.conf \
+		|| die
+
+	dodoc \
+		Changes Donation Unreal.nfo \
+		ircdcron/{ircd.cron,ircdchk} \
+		|| die "dodoc failed"
+	dohtml doc/*.html
+
+	newinitd "${FILESDIR}"/unrealircd.initd unrealircd
+	newconfd "${FILESDIR}"/unrealircd.confd-r1 unrealircd
+
+	# config should be read-only
+	fperms -R 0640 /etc/unrealircd{,/aliases}
+	fperms 0750 /etc/unrealircd{,/aliases}
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/{lib,log}/unrealircd
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/unrealircd
+}
+
+pkg_preinst() {
+	# Must pre-create directories; otherwise their permissions are lost
+	# on installation.
+
+	# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
+	#
+	# Ensure that directories are created with the correct permissions
+	# before portage tries to merge them to the filesystem because,
+	# otherwise, those directories are installed world-readable.
+	#
+	# If this is a first-time install, create those directories with
+	# correct permissions before installing. Otherwise, update
+	# permissions—but only if we are replacing an unrealircd ebuild at
+	# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
+	# file permissions correctly, so no need for recursive
+	# chmoding/chowning.
+	_unrealircd_dir_permissions() {
+		local user=${1} group=${2} mode=${3} dir v
+		shift 3
+		while dir=${1} && shift; do
+			if [[ ! -d "${EROOT}${dir}" ]]; then
+				ebegin "Creating ${EROOT}${dir} with correct permissions"
+				install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
+				eend ${?}
+			elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
+					# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
+					# existing permissions.
+					version_is_at_least "${v}" 3.2.10 && break
+				done; then
+				ebegin "Correcting permissions of ${EROOT}${dir} left by ${CATEGORY}/${PN}-${v}"
+				chmod "${mode}" "${EROOT}${dir}" \
+					&& chown ${user}:${group} "${EROOT}${dir}" \
+					|| die "Unable to correct permissions of ${EROOT}${dir}"
+				eend ${?}
+			fi
+		done
+	}
+
+	# unrealircd only needs to be able to read files in /etc/unrealircd.
+	_unrealircd_dir_permissions root unrealircd 0750 etc/unrealircd{,/aliases}
+
+	# unrealircd needs to be able to create files in /var/lib/unrealircd
+	# and /var/log/unrealircd.
+	_unrealircd_dir_permissions root unrealircd 0770 var/{lib,log}/unrealircd
+}
+
+pkg_postinst() {
+	# Move docert call from scr_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if use ssl ; then
+		if [[ ! -f "${EROOT}"/etc/unrealircd/server.cert.key ]]; then
+			install_cert /etc/unrealircd/server.cert
+			chown unrealircd "${EROOT}"/etc/unrealircd/server.cert.*
+			chmod 0640 "${EROOT}"/etc/unrealircd/server.cert.*
+			ln -snf server.cert.key "${EROOT}"/etc/unrealircd/server.key.pem
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/unrealircd/unrealircd.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(unrealircd -k 2>&1 | tail -n 3)
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can find example cron scripts here:"
+	elog "   /usr/share/doc/${PF}/ircd.cron.gz"
+	elog "   /usr/share/doc/${PF}/ircdchk.gz"
+	elog
+	elog "You can also use /etc/init.d/unrealircd to start at boot"
+}