Bumping to 2.3.2.9, fixing both #172650 and #246596

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc8 i686

8 files changed, 236 insertions, 10 deletions

diff --git a/net-irc/psybnc/ChangeLog b/net-irc/psybnc/ChangeLog
index 796a15e4633c..1ac30610e274 100644
--- a/net-irc/psybnc/ChangeLog
+++ b/net-irc/psybnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/psybnc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.7 2007/05/06 12:41:07 genone Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.8 2008/12/14 18:23:14 gurligebis Exp $
+
+*psybnc-2.3.2.9 (14 Dec 2008)
+
+  14 Dec 2008; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +files/psybnc-2.3.2.9-oidentd.patch, +files/oidentd.conf.psybnc,
+  +files/psybnc-oidentd.initd, metadata.xml, psybnc-2.3.2.7-r2.ebuild,
+  +psybnc-2.3.2.9.ebuild:
+  Bumping to 2.3.2.9, fixing both #172650 and #246596
 
   06 May 2007; Marius Mauch <genone@gentoo.org> psybnc-2.3.2.7-r2.ebuild:
   Replacing einfo with elog
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 40e8954cdc0d..278a2063b251 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,8 +1,13 @@
 AUX compile.diff 3231 RMD160 f484b2f3878c4a4da8033a23a26e7b0d75d93f3b SHA1 0bcf8a297512cc568718a1c569d0abbb2c800968 SHA256 e6b301659412519872948ee21958b97c57c21e248dae3d040cefcd61032764ee
+AUX oidentd.conf.psybnc 92 RMD160 690ab54b796e4959d81a23d06dd194c7a4a081c2 SHA1 be9f023fe93250e44be3dc52b94c9d16a8d61bbf SHA256 0363f6f7c2b2a39dc2b1ee3e41596adf6209bf3e770e9e7c0f13a9f6787c50dc
+AUX psybnc-2.3.2.9-oidentd.patch 237 RMD160 24cd04928d4fb503bbfbff13bad33a9475ca782c SHA1 7312415f50c9024b369d843d0b787cfc92b6ea7b SHA256 43593043db85bf3dc3f1a5162afd873ac079afcb0aff9520799b51f362a2e29f
+AUX psybnc-oidentd.initd 1050 RMD160 f56ebb0801f4193a8152a9cabd05bb2ed78b4b50 SHA1 f6e4c2f8b38d1c8b163ec991a0c683754abea4ac SHA256 3093578af23359e6f203defc49a15f3202f811d55ef239069ba2fce1eccd9d4f
 AUX psybnc.conf 313 RMD160 446813d0753d5b6d3c7592bd90f83f821a993973 SHA1 f9149567abc499474f482ad46b34a16b5bf8dd90 SHA256 e4b04c86a4a1ed910b6cf21fa834eb1eeed166bb372cffbfe9674613f68a080f
 AUX psybnc.confd 113 RMD160 106f0f680fcd5720ab7eead55b782a271627b81d SHA1 bb64a2eda5953fbdc39653c0612e26e5016dac78 SHA256 5077226f94b59e2e1874b0019d00375f17b73a77a25533275a59f18af6bf24f2
 AUX psybnc.initd 1009 RMD160 415cc2b29e9fed2f64b671527583c0666c699121 SHA1 38599f1702c2c5d411ae099cb98b0acb647b5d66 SHA256 6ca56b5cdabae78d19710f46be0524bfd451866f7aae0a9c953cab28fde5fcbd
 DIST psyBNC-2.3.2-7.tar.gz 312177 RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 SHA1 d3d06e05c447f7366761a85af204222eddb55e2d SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519
-EBUILD psybnc-2.3.2.7-r2.ebuild 3757 RMD160 7c44403784e2d2d7b56593cdfa52f2f226188df5 SHA1 4fec9900f2bff7338661f7fbef90111a89042f0f SHA256 37e70ef2bb700f9591679138b1e7d806d201bd96e10b95a89eeefd95eb10aa8b
-MISC ChangeLog 1137 RMD160 b58ed3849b50b75c98b397a3fe6c041943998f85 SHA1 bcda2f1cf976169cf931688055612eb5f82c265b SHA256 aa263cdea549da2ec9eced72eb37d172e7fd2c4317c81847275bf1a30e2ad2e5
-MISC metadata.xml 367 RMD160 aafca01b315e4aa19e1bab99902c09faa8068f5c SHA1 c644390b912576d2859097b0a4c78854dceee43b SHA256 7995a9d90742808ba93e9f868d1f59d6dd1b4055c69e760f5fce95a4de4a94f1
+DIST psyBNC-2.3.2-9.tar.gz 318676 RMD160 6e27479b9721bb6aa9f599150af3abfa9a915a2e SHA1 78266e39ed128a587b158b6195e580cb7f560f08 SHA256 9129ade198f26f7a47301d2ab5933a2844bdd187fca437f8264ae88f168e1644
+EBUILD psybnc-2.3.2.7-r2.ebuild 3757 RMD160 134c22afa8a537b0b90ab5c61e947f751c6fa08b SHA1 728298ee7b6257821a1b1c09ceeb0d214db704e3 SHA256 b04051c8f2ced5722637d2e577a85a97f6dd4d8af2a28e40fc8505af1ef12b08
+EBUILD psybnc-2.3.2.9.ebuild 4394 RMD160 f169306530a03608ee21f115fe716ad66913902c SHA1 5ed8b57f53018365923eb606a31a0d95c5b9b75d SHA256 b18b23d85a84780a23b9dddc8e4d488099e004f61a2151b1330d7c481e4a4079
+MISC ChangeLog 1453 RMD160 e5e0673931ac74aa2b77bc29b1c6d11944290aeb SHA1 236677c1fef076209338fd7059d2e3e4b130d61b SHA256 e4d76d84825b25e4c87f0df92883bb2e3d4108b6aecb165c1e7d021a9aa0eab6
+MISC metadata.xml 437 RMD160 e2a3a0b2ed164c30cedcc3dee2f9cc22d8117d38 SHA1 0e415441bfd252199d7b56962f1cc364c806af19 SHA256 e26a2c4502e66b874ad2cfdda649878114d3d3b4e825765caf60d4c4737e9517
diff --git a/net-irc/psybnc/files/oidentd.conf.psybnc b/net-irc/psybnc/files/oidentd.conf.psybnc
new file mode 100644
index 000000000000..c8e4ed67505c
--- /dev/null
+++ b/net-irc/psybnc/files/oidentd.conf.psybnc
@@ -0,0 +1,7 @@
+user psybnc {

+	default {

+		allow spoof

+		allow spoof_all

+		allow spoof_privport

+	}

+}

diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
new file mode 100644
index 000000000000..fbb4b163e3a3
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
@@ -0,0 +1,13 @@
+--- config.h.orig	2008-12-14 20:02:57.000000000 +0000
++++ config.h	2008-12-14 20:03:35.000000000 +0000
+@@ -14,6 +14,10 @@
+ 
+ #define TRANSLATE
+ 
++/* Support oIdentd */
++
++#define OIDENTD
++
+ /* Allow internal network */
+ 
+ #define INTNET
diff --git a/net-irc/psybnc/files/psybnc-oidentd.initd b/net-irc/psybnc/files/psybnc-oidentd.initd
new file mode 100644
index 000000000000..cf95c2152424
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-oidentd.initd
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/files/psybnc-oidentd.initd,v 1.1 2008/12/14 18:23:14 gurligebis Exp $
+
+depend() {
+	need net oidentd
+}
+
+check_config() {
+	if [[ ! -f ${PSYBNC_CONFIG} ]]
+	then
+	    eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ ! -d "${PSYBNC_HOME}" ]]
+	then
+	    eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ -z "${PSYBNC_USER}" ]]
+	then
+	    eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting psyBNC"
+	start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null
+	eend $?
+}
+
+stop() {
+	check_config || return 1
+	ebegin "Stopping psyBNC"
+	start-stop-daemon --stop --quiet --pidfile "${PSYBNC_HOME}"/psybnc.pid --signal 9
+	eend $?
+}
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index 4c9ad71be51f..20b6b26f444f 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -6,5 +6,8 @@
 		<email>gurligebis@gentoo.org</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
+	<use>
+		<flag name='oidentd'>Adds support for oidentd</flag>
+	</use>
 	<longdescription>psyBNC is a multi-user and multi-server gateway to IRC networks</longdescription>
 </pkgmetadata>
diff --git a/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild b/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
index d2d910ac7c75..d52b2b20259a 100644
--- a/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.3 2007/05/06 12:41:07 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.7-r2.ebuild,v 1.4 2008/12/14 18:23:14 gurligebis Exp $
 
 inherit eutils versionator toolchain-funcs
 MY_PV="$(replace_version_separator 3 -)"
@@ -26,9 +26,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/compile.diff
+	epatch "${FILESDIR}/compile.diff"
 
 	# Useless files
 	rm -f */INFO
@@ -84,7 +84,7 @@ src_install() {
 	newinitd "${FILESDIR}"/psybnc.initd psybnc
 	newconfd "${FILESDIR}"/psybnc.confd psybnc
 
-	dodoc CHANGES COPYING FAQ README SCRIPTING TODO
+	dodoc CHANGES FAQ README SCRIPTING TODO
 	docinto example-script
 	dodoc scripts/example/DEFAULT.SCRIPT
 }
diff --git a/net-irc/psybnc/psybnc-2.3.2.9.ebuild b/net-irc/psybnc/psybnc-2.3.2.9.ebuild
new file mode 100644
index 000000000000..0b8e164885d5
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.3.2.9.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9.ebuild,v 1.1 2008/12/14 18:23:14 gurligebis Exp $
+
+inherit eutils versionator toolchain-funcs flag-o-matic
+MY_PV="$(replace_version_separator 3 -)"
+PSYBNC_HOME="/var/lib/psybnc"
+
+DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks"
+HOMEPAGE="http://www.psybnc.at/index.html"
+SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="ipv6 ssl oidentd"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
+		oidentd? ( >=net-misc/oidentd-2.0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}"/"${PN}"
+
+pkg_setup() {
+	enewgroup psybnc
+	enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/compile.diff"
+
+	# add oidentd
+	use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch"
+
+	# Useless files
+	rm -f */INFO
+
+	# Prevent stripping the binary
+	sed -i -e "/@strip/ d" tools/autoconf.c
+
+	# Pretend we already have a certificate, we generate it in pkg_config
+	mkdir key
+	touch key/psybnc.cert.pem
+
+	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
+	then
+		einfo "Using existing salt.h for password encryption"
+		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
+	fi
+}
+
+src_compile() {
+	use ipv6 || rm -f tools/chkipv6.c
+	use ssl || rm -f tools/chkssl.c
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin psybnc
+
+	insinto /usr/share/psybnc
+	doins -r help lang salt.h
+	fperms 0600 /usr/share/psybnc/salt.h
+
+	insinto /etc/psybnc
+	doins "${FILESDIR}"/psybnc.conf
+
+	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
+	dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+	dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+
+	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
+	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
+	fperms 0640 /etc/psybnc/psybnc.conf
+
+	if use ssl
+	then
+		keepdir /etc/psybnc/ssl
+		dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+	else
+		# Drop SSL listener from psybnc.conf
+		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf
+	fi
+
+	if use oidentd
+	then
+		insinto /etc
+		doins "${FILESDIR}"/oidentd.conf.psybnc
+		fperms 640 /etc/oidentd.conf.psybnc
+		# install init-script with oidentd-support
+		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
+	else
+		# install init-script without oidentd-support
+		newinitd "${FILESDIR}"/psybnc.initd psybnc
+	fi
+
+	newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+	dodoc CHANGES FAQ README SCRIPTING TODO
+	docinto example-script
+	dodoc scripts/example/DEFAULT.SCRIPT
+}
+
+pkg_config() {
+	if use ssl
+	then
+		if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]
+		then
+			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
+			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
+			return
+		fi
+
+		einfo "Generating certificate request..."
+		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
+		einfo "Generating self-signed certificate..."
+		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem
+		einfo "Setting permissions on files..."
+		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
+		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
+	fi
+}
+
+pkg_postinst() {
+	if use ssl
+	then
+		elog
+		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates."
+	fi
+	if use oidentd
+	then
+		elog
+		elog "You have enabled oidentd-support. You will need to set"
+		elog "up your /etc/oident.conf file before running psybnc. An example"
+		elog "for psyBNC can be found under /etc/oident.conf.psybnc."
+	fi
+	elog
+	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
+	elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this."
+	elog
+	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
+	elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new"
+	elog "version of psyBNC. It is needed for password encryption and decryption."
+	elog
+}