Version bump. Closes bug #48965 and bug #41919. Switched from mkunrealircd-cert to ssl-cert.eclass.

9 files changed, 134 insertions, 93 deletions

diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index 2fd0e5eda503..ba782bc49334 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/unrealircd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.14 2004/06/24 23:09:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.15 2004/07/24 00:17:37 swegener Exp $
+
+*unrealircd-3.2.1 (24 Jul 2004)
+
+  24 Jul 2004; Sven Wegener <swegener@gentoo.org> -files/mkunrealircd-cert,
+  files/unrealircd.confd, files/unrealircd.rc, +unrealircd-3.2.1.ebuild,
+  -unrealircd-3.2_rc2.ebuild:
+  Version bump. Closes bug #48965 and bug #41919. Switched from
+  mkunrealircd-cert to ssl-cert.eclass.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> unrealircd-3.1.5.1.ebuild,
   unrealircd-3.1.6.ebuild, unrealircd-3.2_rc2.ebuild:
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 98ec140dfc65..1826b7a9614d 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,13 +1,12 @@
-MD5 bd2b20e66682f4a143eb7279be88c70d unrealircd-3.1.5.1.ebuild 1962
-MD5 f9a856e5a3fd5dee5a9b7fe176de34e1 unrealircd-3.1.6.ebuild 1966
 MD5 6d6cd04f01fed7a0ed4b20085ae080d7 ChangeLog 1904
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 b4ce3771b47787c3a25b3def50ff8af4 unrealircd-3.2_rc2.ebuild 1949
-MD5 0dad0c60d488427cea52123d99bcc683 files/unrealircd.confd 511
-MD5 397ab04f9c06bf15f9ff57e4b81242ac files/mkunrealircd-cert 312
-MD5 0e5e4e0c025911074b2673b9a040aa57 files/digest-unrealircd-3.1.6 68
+MD5 bd2b20e66682f4a143eb7279be88c70d unrealircd-3.1.5.1.ebuild 1962
+MD5 f9a856e5a3fd5dee5a9b7fe176de34e1 unrealircd-3.1.6.ebuild 1966
+MD5 f58f2a9d979bf292a2879641d7871588 unrealircd-3.2.1.ebuild 2717
+MD5 5470c8e18506b99b25d63039b6b37f3a files/3.1.5.1-Config.patch 554
 MD5 5470c8e18506b99b25d63039b6b37f3a files/3.1.6-Config.patch 554
 MD5 4aacbe2a257a52f6adf3628142d5fa22 files/digest-unrealircd-3.1.5.1 71
-MD5 6ba11e14d26198f34c3570ab12297706 files/digest-unrealircd-3.2_rc2 66
-MD5 5470c8e18506b99b25d63039b6b37f3a files/3.1.5.1-Config.patch 554
-MD5 024bd8efd19ed26ef4514aaba01774ec files/unrealircd.rc 516
+MD5 0e5e4e0c025911074b2673b9a040aa57 files/digest-unrealircd-3.1.6 68
+MD5 568bdab4b57d2bb1f4f735c0bf66469a files/unrealircd.confd 499
+MD5 f338b95aac437ad1d2b1501150c4ea2b files/unrealircd.rc 521
+MD5 973bf222cdc1696d8ff91b30c1198fba files/digest-unrealircd-3.2.1 64
diff --git a/net-irc/unrealircd/files/digest-unrealircd-3.2.1 b/net-irc/unrealircd/files/digest-unrealircd-3.2.1
new file mode 100644
index 000000000000..97de2ae29e96
--- /dev/null
+++ b/net-irc/unrealircd/files/digest-unrealircd-3.2.1
@@ -0,0 +1 @@
+MD5 ebe56fd42fc229681f527932eaa173cc Unreal3.2.1.tar.gz 1614434
diff --git a/net-irc/unrealircd/files/digest-unrealircd-3.2_rc2 b/net-irc/unrealircd/files/digest-unrealircd-3.2_rc2
deleted file mode 100644
index 603de01d596d..000000000000
--- a/net-irc/unrealircd/files/digest-unrealircd-3.2_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b7f946f0e9a48628ce5ee6f2cbf080f Unreal3.2-RC2.tar.gz 1427055
diff --git a/net-irc/unrealircd/files/mkunrealircd-cert b/net-irc/unrealircd/files/mkunrealircd-cert
deleted file mode 100644
index 33db9b1a2a89..000000000000
--- a/net-irc/unrealircd/files/mkunrealircd-cert
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-openssl req -new -config /etc/unrealircd/ssl.cnf -out /etc/unrealircd/server.req.pem -keyout /etc/unrealircd/server.key.pem -nodes
-openssl req -x509 -config /etc/unrealircd/ssl.cnf -days 365 -in /etc/unrealircd/server.req.pem -key /etc/unrealircd/server.key.pem -out /etc/unrealircd/server.cert.pem
diff --git a/net-irc/unrealircd/files/unrealircd.confd b/net-irc/unrealircd/files/unrealircd.confd
index ce93122b1d7b..922d9922abef 100644
--- a/net-irc/unrealircd/files/unrealircd.confd
+++ b/net-irc/unrealircd/files/unrealircd.confd
@@ -1,15 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd,v 1.3 2004/07/14 23:48:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.confd,v 1.4 2004/07/24 00:17:37 swegener Exp $
 
 # user to run unrealircd as
-UNREALIRCD_USER="UserBlah"
+UNREALIRCD_USER="unrealircd"
 
 # extra options to pass to unrealircd ...
 # useful if you want to specify conf files other
 # than the default
 #
-# [-f config]
 # [-h servername]
 # [-p portnumber]
 # [-x loglevel]
diff --git a/net-irc/unrealircd/files/unrealircd.rc b/net-irc/unrealircd/files/unrealircd.rc
index 47c710087fdc..c832fd0ea077 100644
--- a/net-irc/unrealircd/files/unrealircd.rc
+++ b/net-irc/unrealircd/files/unrealircd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.3 2004/07/14 23:48:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/files/unrealircd.rc,v 1.4 2004/07/24 00:17:37 swegener Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 start() {
 	ebegin "Starting unrealircd"
 	start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \
-		--chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS}
+		--chuid ${UNREALIRCD_USER} -- ${UNREALIRCD_OPTS} &>&1
 	eend $?
 }
 
diff --git a/net-irc/unrealircd/unrealircd-3.2.1.ebuild b/net-irc/unrealircd/unrealircd-3.2.1.ebuild
new file mode 100644
index 000000000000..4653693528fe
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.2.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.1.ebuild,v 1.1 2004/07/24 00:17:37 swegener Exp $
+
+inherit eutils ssl-cert
+
+MY_P=Unreal${PV}
+
+DESCRIPTION="aimed to be an advanced (not easy) IRCd"
+HOMEPAGE="http://www.unrealircd.com/"
+SRC_URI="http://www.gower.net/unrealircd/${MY_P}.tar.gz
+	ftp://unreal.secure-tech.net/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/Unreal3.2
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "s:ircd\.pid:/var/run/unrealircd/ircd.pid:" \
+		-e "s:ircd\.log:/var/log/unrealircd/ircd.log:" \
+		-e "s:debug\.log:/var/log/unrealircd/debug.log:" \
+		-e "s:ircd\.tune:/var/lib/unrealircd/ircd.tune:" \
+		include/config.h
+}
+
+src_compile() {
+	econf \
+		--enable-hub \
+		--with-listen=5 \
+		--with-dpath=${D}/etc/unrealircd \
+		--with-spath=/usr/bin/unrealircd \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-bufferpool=18 \
+		--with-hostname=${HOSTNAME} \
+		--with-permissions=0600 \
+		--with-fd-setsize=1024 \
+		--enable-dynamic-linking \
+		`use_enable zlib ziplinks` \
+		`use_enable ssl` \
+		|| die "econf failed"
+
+	sed -i \
+		-e s:${D}:: \
+		include/setup.h
+
+	emake IRCDDIR=/etc/unrealircd || die "emake failed"
+}
+
+src_install() {
+	keepdir /var/{lib,log,run}/unrealircd
+
+	newbin src/ircd unrealircd
+
+	exeinto /usr/lib/unrealircd/modules
+	doexe src/modules/*.so
+
+	dodir /etc/unrealircd
+	dosym /var/lib/unrealircd /etc/unrealircd/tmp
+
+	insinto /etc/unrealircd
+	doins badwords.*.conf help.conf spamfilter.conf
+	newins doc/example.conf unrealircd.conf
+
+	use ssl \
+		&& docert server.cert \
+		&& dosym server.cert.key /etc/unrealircd/server.key.pem
+
+	sed -i \
+		-e s:src/modules:/usr/lib/unrealircd/modules: \
+		-e s:ircd\\.log:/var/log/unrealircd/ircd.log: \
+		${D}/etc/unrealircd/unrealircd.conf
+
+	dodoc Changes Donation Unreal.nfo
+	dohtml doc/*.html
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/unrealircd.rc unrealircd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/unrealircd.confd unrealircd
+
+	fperms 700 /etc/unrealircd
+}
+
+pkg_postinst() {
+	enewuser unrealircd
+	chown unrealircd \
+		${ROOT}/{etc,var/{lib,log,run}}/unrealircd \
+		${ROOT}/etc/unrealircd/server.cert.{key,pem}
+
+	einfo
+	einfo "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	einfo
+	einfo "You can find example cron scripts here:"
+	einfo "   /usr/share/doc/${PF}/ircd.cron"
+	einfo "   /usr/share/doc/${PF}/ircdchk"
+	einfo
+	einfo "You can also use /etc/init.d/unrealircd to start at boot"
+	einfo
+}
diff --git a/net-irc/unrealircd/unrealircd-3.2_rc2.ebuild b/net-irc/unrealircd/unrealircd-3.2_rc2.ebuild
deleted file mode 100644
index cd311710c16d..000000000000
--- a/net-irc/unrealircd/unrealircd-3.2_rc2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2_rc2.ebuild,v 1.4 2004/06/24 23:09:40 agriffis Exp $
-
-inherit eutils
-
-MY_P=Unreal3.2-RC2
-DESCRIPTION="aimed to be an advanced (not easy) IRCd"
-HOMEPAGE="http://www.unrealircd.com/"
-SRC_URI="http://www.gower.net/unrealircd/${MY_P}.tar.gz
-	ftp://unreal.secure-tech.net/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )
-	>=sys-apps/sed-4"
-
-S=${WORKDIR}/Unreal3.2
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	rm -f .CHANGES.NEW .RELEASE.NOTES
-#	epatch ${FILESDIR}/${PV}-Config.patch
-#	sed -i 's:^ID_CVS.*::' src/res_mkquery.c
-
-#	cp Config{,.orig}
-#	sed -e "s:GENTOO_CFLAGS:${CFLAGS}:" \
-#		Config.orig > Config
-}
-
-src_compile() {
-	./Config -quick || die "configure failed"
-	make RES="res_init.o res_comp.o res_mkquery.o" \
-		|| die "compiling failed"
-}
-
-src_install() {
-	newbin src/ircd unrealircd || die
-
-	insinto /etc/unrealircd
-	doins badwords.*.conf
-	insinto /etc/unrealircd/networks
-	doins networks/{template.network,unrealircd.conf}
-
-	rm -rf ircdcron/CVS
-	rm -rf doc/CVS
-	rm -rf doc/technical/CVS
-	dodoc doc/* Changes Donation Unreal.nfo ircdcron/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/unrealircd.rc unrealircd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/unrealircd.confd unrealircd
-}
-
-pkg_postinst() {
-	einfo "UnrealIRCD will not run until you do a few things ..."
-	echo
-	einfo "Setup /etc/unrealircd/unrealircd.conf"
-	einfo "      see /etc/unrealircd/template.network for more info"
-	einfo "Setup /etc/unrealircd/ircd.conf"
-	einfo "      see /usr/share/doc/${PF}/example.conf.gz for more info"
-	echo
-	einfo "You can find example cron scripts here:"
-	einfo "   /usr/share/doc/${PF}/ircd.cron"
-	einfo "   /usr/share/doc/${PF}/ircdchk"
-	echo
-	einfo "You can also use /etc/init.d/unrealircd to start at boot"
-	echo
-}