Fixed permissions on generated SSL certificates, fixes bug #150685

(Portage version: 2.1.2_pre3-r2)

4 files changed, 103 insertions, 1 deletions

diff --git a/net-irc/psybnc/ChangeLog b/net-irc/psybnc/ChangeLog
index a1649a2fcf07..5fb4ee49e11e 100644
--- a/net-irc/psybnc/ChangeLog
+++ b/net-irc/psybnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/psybnc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.2 2006/09/21 15:19:43 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.3 2006/10/18 15:17:02 gurligebis Exp $
+
+*psybnc-2.3.2.7-r1 (18 Oct 2006)
+
+  18 Oct 2006; Bjarke Istrup Pedersen <gurligebis@gentoo.org>:
+    Fixed permissions on generated SSL certificates, fixes bug #150685 .
 
 *psybnc-2.3.2.7 (28 Aug 2006)
 
diff --git a/net-irc/psybnc/files/digest-psybnc-2.3.2.7-r1 b/net-irc/psybnc/files/digest-psybnc-2.3.2.7-r1
new file mode 100644
index 000000000000..d521eb7e80b0
--- /dev/null
+++ b/net-irc/psybnc/files/digest-psybnc-2.3.2.7-r1
@@ -0,0 +1,3 @@
+MD5 c475f14b1b3a9280a123142e6e344dd8 psyBNC-2.3.2-7.tar.gz 312177
+RMD160 6a7311a3219fa005219a815bbbac188c315bd2b2 psyBNC-2.3.2-7.tar.gz 312177
+SHA256 be38468b374b0470a5728b154527019b7d613c90dc23a93053fda7cdd93f6519 psyBNC-2.3.2-7.tar.gz 312177
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.7-r1-gentoo.diff b/net-irc/psybnc/files/psybnc-2.3.2.7-r1-gentoo.diff
new file mode 100644
index 000000000000..2b24e8693a1b
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.7-r1-gentoo.diff
@@ -0,0 +1,11 @@
+--- tools/autoconf.c	2004-05-07 01:33:25.956597616 +0200
++++ tools/autoconf.c	2004-05-07 01:33:43.075995072 +0200
+@@ -462,7 +462,7 @@
+ 	    fprintf(makefile,"	@echo \"* for the sake of correct Cert-Checking   *\"\n");
+ 	    fprintf(makefile,"	@echo \"*******************************************\"\n");
+ 	    fprintf(makefile,"	@echo \"Generating certificate request .. \"\n");
+-	    fprintf(makefile,"	@%s req -new -config src/ssl.cnf -out key/psybnc.req.pem \\\n",sslbin);
++	    fprintf(makefile,"	@%s req -batch -new -config src/ssl.cnf -out key/psybnc.req.pem \\\n",sslbin);
+ 	    fprintf(makefile,"      	-keyout key/psybnc.key.pem -nodes\n");
+ 	    fprintf(makefile,"	@echo \"Generating self-signed certificate .. \"\n");
+ 	    fprintf(makefile,"	@%s req -x509 -days 365 -in key/psybnc.req.pem \\\n",sslbin);
diff --git a/net-irc/psybnc/psybnc-2.3.2.7-r1.ebuild b/net-irc/psybnc/psybnc-2.3.2.7-r1.ebuild
new file mode 100644
index 000000000000..e83d55b08e24
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.3.2.7-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/10/18 15:17:02 gurligebis Exp $
+
+inherit eutils versionator
+MY_PV=$(replace_version_separator 3 '-')
+S=${WORKDIR}/${PN}
+INSTALLDIR="/opt/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="~x86 ~amd64"
+IUSE=""
+DEPEND=">=dev-libs/openssl-0.9.7d"
+
+pkg_setup() {
+	enewgroup psybnc
+	enewuser psybnc -1 -1 ${INSTALLDIR} psybnc
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodoc CHANGES COPYING FAQ README SCRIPTING TODO
+	dodir ${INSTALLDIR}/help ${INSTALLDIR}/key ${INSTALLDIR}/lang ${INSTALLDIR}/log ${INSTALLDIR}/motd ${INSTALLDIR}/scripts
+
+	insinto ${INSTALLDIR}/help
+	doins help/*
+	insinto ${INSTALLDIR}/key
+	doins key/*
+	insinto ${INSTALLDIR}/lang
+	doins lang/*
+	insinto ${INSTALLDIR}/log
+	doins log/*
+	insinto ${INSTALLDIR}/motd
+	doins motd/*
+	insinto	${INSTALLDIR}/scripts
+	doins scripts/*
+	insinto ${INSTALLDIR}
+	doins ${FILESDIR}/psybnc.conf config.h
+
+	exeinto ${INSTALLDIR}
+	doexe psybnc
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/psybnc.initd psybnc
+	insinto /etc/conf.d
+	newins ${FILESDIR}/psybnc.confd psybnc
+
+	chown -R psybnc:psybnc ${D}/${INSTALLDIR}
+}
+
+pkg_config() {
+	einfo "Generating certificate request..."
+	openssl req -new -out ${INSTALLDIR}/key/psybnc.req.pem -keyout ${INSTALLDIR}/key/psybnc.key.pem -nodes
+	einfo "Generating self-signed certificate..."
+	openssl req -x509 -days 365 -in ${INSTALLDIR}/key/psybnc.req.pem -key ${INSTALLDIR}/key/psybnc.key.pem -out ${INSTALLDIR}/key/psybnc.cert.pem
+	einfo "Generating fingerprint..."
+	openssl x509 -subject -dates -fingerprint -noout -in ${INSTALLDIR}/key/psybnc.cert.pem
+	einfo "Setting permissions on files..."
+	chmod 0640 ${INSTALLDIR}/key/psybnc.key.pem
+	chmod 0640 ${INSTALLDIR}/key/psybnc.req.pem
+	chmod 0640 ${INSTALLDIR}/key/psybnc.cert.pem
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Please run \"emerge --config =psybnc-${PVR}\" to create SSL certificates for your system."
+	einfo "You can connect to the bnc on port 23998, user=gentoo, pass=gentoo,"
+	einfo "please edit the psybnc configuration in ${INSTALLDIR}/psybnc.conf to change this."
+	einfo ""
+}