Non-maintainer-commit: Security bump (bug #215704). Ebuild created by

  satmd (bug #218880). Moved user creation to preinst step (bug #217042) and
  introduced some new features, such as LDAP authentication.
Package-Manager: portage-2.1.5_rc4

6 files changed, 137 insertions, 256 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 7eb374ec5107..394a397d6713 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.20 2008/04/22 16:37:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.21 2008/04/23 19:04:01 rbu Exp $
+
+*inspircd-1.1.19 (23 Apr 2008)
+
+  23 Apr 2008; Robert Buchholz <rbu@gentoo.org> -inspircd-1.1.12.ebuild,
+  -inspircd-1.1.13.ebuild, -inspircd-1.1.13-r1.ebuild,
+  +inspircd-1.1.19.ebuild:
+  Non-maintainer-commit: Security bump (bug #215704). Ebuild created by
+  satmd (bug #218880). Moved user creation to preinst step (bug #217042) and
+  introduced some new features, such as LDAP authentication.
 
   22 Apr 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Update maintainer info.
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index ef43f8984298..aa09c190694d 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,9 @@
 AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
 DIST InspIRCd-1.0.7.tar.bz2 337187 RMD160 a7387cf88f08f0e9487d25db79d88cde9e9c8283 SHA1 5c8a35b11928c6ad85d905b1bc34de096aa2cf11 SHA256 0ce029e92a0a1713de1d0665d1143295a054a8d925fa724795d709493a8b8d7f
-DIST InspIRCd-1.1.12.tar.bz2 501185 RMD160 eabaa1dc351c71978e6b5a0548fad3b17f888ede SHA1 d9128ea358fd385d92c37e039ac9d2ae80da99d1 SHA256 a904613bfe4efce901dc25a20960258322d652724ece58a45f6a6afaf6f3ca9f
-DIST InspIRCd-1.1.13.tar.bz2 502275 RMD160 a7fd87f2e5a9a7942c9f425180430b6bd9273a51 SHA1 ae3fc3ee13671a068d6085f7ff852e368bbbe568 SHA256 ab79fd03fd588e3820d70ede7339d8646ff35676f1c70266be252df7315e8e26
 DIST InspIRCd-1.1.14.tar.bz2 504766 RMD160 ee48f16b0360ef2ae397d8eb5a5c36027f47cc4d SHA1 a85bbdf5ef11ae44de69eb4df4cacc39a52e7a9e SHA256 de7c3fcf15bcab3a3bd9e41233854322022cdd1e0207fdd0f26d7e608209cf39
+DIST InspIRCd-1.1.19.tar.bz2 505193 RMD160 c1f6230286c28c889060b961ea272f306eab8170 SHA1 d5ba49126585efc91d9c5021c76d56b067d3cc8e SHA256 4e1394749096e92ac976160c8d82a2017e718d5edd0a86f6049b3d473023c64e
 EBUILD inspircd-1.0.7-r1.ebuild 3169 RMD160 fb15af7b8a61ba76ad2c767553dc644e0d2671ed SHA1 00271b5391f101caa04c4ee9870f2db10c6bc8f5 SHA256 5c5d69907141f0a8b96acda7a2f45b6a3bbba3a6735efc10e0c7b906010b31f5
-EBUILD inspircd-1.1.12.ebuild 2423 RMD160 46d30ecf98fdc524b79b084d42b646f17e83f78b SHA1 8d1e34df6a4e73f9b9e5022287eaf65c9903be75 SHA256 4928f01dc98133bb7b446c983e4278bfed14568fd8afdc547f96dba853d64127
-EBUILD inspircd-1.1.13-r1.ebuild 2429 RMD160 15470f5ce7980818e7c1776ecf71cf3efa090539 SHA1 6a5d3673fe87767b61decf9b21e87d362d6e98c5 SHA256 a9bdbdfc92da16d4f7fac1dbcb0d72502a3d107e9e70fadde50d45afe60f7c5e
-EBUILD inspircd-1.1.13.ebuild 2423 RMD160 c3c918a8821ed4da9043fa86ee430056ee02469b SHA1 adf3783bfdbd5fb9c8883c46c4403465d83b833a SHA256 0ee0c39bd89eeaedf33c2f7839604db10aff0c1974c1c3b2bb907e4758b1250c
 EBUILD inspircd-1.1.14.ebuild 2411 RMD160 ef780d64c9c7d86a96a18903c9cd3d0e857fc195 SHA1 bc78c7d7b302c9fd4eee6b924c9dcb2f4b536007 SHA256 bcc42a4f593940f5853f65e7128471f9decda576a5318c8659b68e4db2483015
-MISC ChangeLog 3844 RMD160 192e1464ba59cd391ba34ffcca700b42280bd938 SHA1 d3e0d4b053514bbdf11741b52a97d7260431c91f SHA256 42e7ff32cd81f2f2686afa237911e6849908340bcf653dd7501f559bdbda1b73
+EBUILD inspircd-1.1.19.ebuild 3174 RMD160 5b476c4dc2a6ebe0dd704277f61e363cdd841064 SHA1 24c42d2b011a60866508b50249b52b0c0329b905 SHA256 d5fe54e3387cf4222df1cbc4f36820583ef9106d3a91803e2280c60f49f7d8bd
+MISC ChangeLog 4242 RMD160 d71157aee225551db87c059e9fef1de1f110cd40 SHA1 625bda555355b17aff4cb86d1d2fb910696cd4cb SHA256 9c0e76fdc6ea322c07c9363feb5bddccecf8d1c20bd9adb1f6479fa363a1de89
 MISC metadata.xml 480 RMD160 a7f46d231afa8d0a27c6eb7a68b518b74cd6e669 SHA1 c88ce58e2548ba9c54f488a2be824cdb3b98093a SHA256 656302f39316b0648249e5dc270a334f71687f813ff69a5b6597c4c72ffdf2fa
diff --git a/net-irc/inspircd/inspircd-1.1.12.ebuild b/net-irc/inspircd/inspircd-1.1.12.ebuild
deleted file mode 100644
index 7ee8ea46b0a2..000000000000
--- a/net-irc/inspircd/inspircd-1.1.12.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.12.ebuild,v 1.1 2007/09/20 19:41:13 hansmi Exp $
-
-inherit eutils toolchain-funcs multilib # subversion
-
-IUSE="openssl gnutls ipv6 kernel_linux"
-
-DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
-HOMEPAGE="http://www.inspircd.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="
-	>=sys-devel/gcc-3.3.0
-	>=dev-lang/perl-5.8
-	openssl? ( >=dev-libs/openssl-0.9.7d )
-	gnutls? ( >=net-libs/gnutls-1.3.0 )"
-DEPEND="${RDEPEND}"
-SRC_URI="mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
-#ESVN_REPO_URI="http://svn.inspircd.org/repository/trunk/inspircd"
-#ESVN_PROJECT="inspircd"
-
-S="${WORKDIR}/inspircd"
-
-pkg_setup() {
-	enewgroup inspircd
-	enewuser inspircd -1 -1 -1 inspircd
-}
-
-src_compile() {
-	local myconf=""
-
-	# Write a configuration file
-	# we don't use econf.
-	USE_SSL="$(use_enable openssl)"
-	use gnutls && USE_SSL="$(use_enable gnutls)"
-	USE_SOCKET_ENGINE="--enable-epoll"
-	./configure $(use_enable ipv6) --enable-remote-ipv6 ${USE_SSL} \
-	${USE_SOCKET_ENGINE} \
-	--prefix="/usr/$(get_libdir)/inspircd" \
-	--config-dir="/etc/inspircd" --bin-dir="/usr/bin" \
-	--library-dir="/usr/$(get_libdir)/inspircd" \
-	--module-dir="/usr/$(get_libdir)/inspircd/modules" \
-	|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# the inspircd buildsystem does not create these, it's configure script
-	# does. so, we have to at this point to make sure they are there.
-	dodir /usr/$(get_libdir)/inspircd
-	dodir /usr/$(get_libdir)/inspircd/modules
-	dodir /etc/inspircd
-	dodir /var/log/inspircd
-	dodir /usr/include/inspircd
-
-	emake install \
-		LIBPATH="${D}/usr/$(get_libdir)/inspircd/" \
-		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
-		CONPATH="${D}/etc/inspircd" \
-		BINPATH="${D}/usr/bin" \
-		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
-
-	insinto /usr/include/inspircd/
-	doins "${S}"/include/*
-
-	newinitd "${FILESDIR}"/init.d_inspircd inspircd
-}
-
-pkg_postinst() {
-	chown -R inspircd:inspircd "${ROOT}"/etc/inspircd
-	chmod 700 "${ROOT}"/etc/inspircd
-
-	chmod 750 "${ROOT}"/var/log/inspircd
-	chown -R inspircd:inspircd "${ROOT}"/var/log/inspircd
-
-	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/inspircd
-	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/inspircd
-
-	chmod -R 755 "${ROOT}"/usr/bin/inspircd
-}
diff --git a/net-irc/inspircd/inspircd-1.1.13-r1.ebuild b/net-irc/inspircd/inspircd-1.1.13-r1.ebuild
deleted file mode 100644
index 637ddf91c153..000000000000
--- a/net-irc/inspircd/inspircd-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.13-r1.ebuild,v 1.1 2007/10/05 20:29:07 hansmi Exp $
-
-inherit eutils toolchain-funcs multilib # subversion
-
-IUSE="openssl gnutls ipv6 kernel_linux"
-
-DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
-HOMEPAGE="http://www.inspircd.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="
-	>=sys-devel/gcc-3.3.0
-	>=dev-lang/perl-5.8
-	openssl? ( >=dev-libs/openssl-0.9.7d )
-	gnutls? ( >=net-libs/gnutls-1.3.0 )"
-DEPEND="${RDEPEND}"
-SRC_URI="mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
-#ESVN_REPO_URI="http://svn.inspircd.org/repository/trunk/inspircd"
-#ESVN_PROJECT="inspircd"
-
-S="${WORKDIR}/inspircd"
-
-pkg_setup() {
-	enewgroup inspircd
-	enewuser inspircd -1 -1 -1 inspircd
-}
-
-src_compile() {
-	local myconf=""
-
-	# Write a configuration file
-	# we don't use econf.
-	USE_SSL="$(use_enable openssl)"
-	use gnutls && USE_SSL="$(use_enable gnutls)"
-	USE_SOCKET_ENGINE="--enable-epoll"
-	./configure $(use_enable ipv6) --enable-remote-ipv6 ${USE_SSL} \
-	${USE_SOCKET_ENGINE} \
-	--prefix="/usr/$(get_libdir)/inspircd" \
-	--config-dir="/etc/inspircd" --binary-dir="/usr/bin" \
-	--library-dir="/usr/$(get_libdir)/inspircd" \
-	--module-dir="/usr/$(get_libdir)/inspircd/modules" \
-	|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# the inspircd buildsystem does not create these, it's configure script
-	# does. so, we have to at this point to make sure they are there.
-	dodir /usr/$(get_libdir)/inspircd
-	dodir /usr/$(get_libdir)/inspircd/modules
-	dodir /etc/inspircd
-	dodir /var/log/inspircd
-	dodir /usr/include/inspircd
-
-	emake install \
-		LIBPATH="${D}/usr/$(get_libdir)/inspircd/" \
-		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
-		CONPATH="${D}/etc/inspircd" \
-		BINPATH="${D}/usr/bin" \
-		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
-
-	insinto /usr/include/inspircd/
-	doins "${S}"/include/*
-
-	newinitd "${FILESDIR}"/init.d_inspircd inspircd
-}
-
-pkg_postinst() {
-	chown -R inspircd:inspircd "${ROOT}"/etc/inspircd
-	chmod 700 "${ROOT}"/etc/inspircd
-
-	chmod 750 "${ROOT}"/var/log/inspircd
-	chown -R inspircd:inspircd "${ROOT}"/var/log/inspircd
-
-	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/inspircd
-	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/inspircd
-
-	chmod -R 755 "${ROOT}"/usr/bin/inspircd
-}
diff --git a/net-irc/inspircd/inspircd-1.1.13.ebuild b/net-irc/inspircd/inspircd-1.1.13.ebuild
deleted file mode 100644
index ecf9049a87fb..000000000000
--- a/net-irc/inspircd/inspircd-1.1.13.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.13.ebuild,v 1.1 2007/10/03 21:22:25 hansmi Exp $
-
-inherit eutils toolchain-funcs multilib # subversion
-
-IUSE="openssl gnutls ipv6 kernel_linux"
-
-DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
-HOMEPAGE="http://www.inspircd.org"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="
-	>=sys-devel/gcc-3.3.0
-	>=dev-lang/perl-5.8
-	openssl? ( >=dev-libs/openssl-0.9.7d )
-	gnutls? ( >=net-libs/gnutls-1.3.0 )"
-DEPEND="${RDEPEND}"
-SRC_URI="mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
-#ESVN_REPO_URI="http://svn.inspircd.org/repository/trunk/inspircd"
-#ESVN_PROJECT="inspircd"
-
-S="${WORKDIR}/inspircd"
-
-pkg_setup() {
-	enewgroup inspircd
-	enewuser inspircd -1 -1 -1 inspircd
-}
-
-src_compile() {
-	local myconf=""
-
-	# Write a configuration file
-	# we don't use econf.
-	USE_SSL="$(use_enable openssl)"
-	use gnutls && USE_SSL="$(use_enable gnutls)"
-	USE_SOCKET_ENGINE="--enable-epoll"
-	./configure $(use_enable ipv6) --enable-remote-ipv6 ${USE_SSL} \
-	${USE_SOCKET_ENGINE} \
-	--prefix="/usr/$(get_libdir)/inspircd" \
-	--config-dir="/etc/inspircd" --bin-dir="/usr/bin" \
-	--library-dir="/usr/$(get_libdir)/inspircd" \
-	--module-dir="/usr/$(get_libdir)/inspircd/modules" \
-	|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# the inspircd buildsystem does not create these, it's configure script
-	# does. so, we have to at this point to make sure they are there.
-	dodir /usr/$(get_libdir)/inspircd
-	dodir /usr/$(get_libdir)/inspircd/modules
-	dodir /etc/inspircd
-	dodir /var/log/inspircd
-	dodir /usr/include/inspircd
-
-	emake install \
-		LIBPATH="${D}/usr/$(get_libdir)/inspircd/" \
-		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
-		CONPATH="${D}/etc/inspircd" \
-		BINPATH="${D}/usr/bin" \
-		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
-
-	insinto /usr/include/inspircd/
-	doins "${S}"/include/*
-
-	newinitd "${FILESDIR}"/init.d_inspircd inspircd
-}
-
-pkg_postinst() {
-	chown -R inspircd:inspircd "${ROOT}"/etc/inspircd
-	chmod 700 "${ROOT}"/etc/inspircd
-
-	chmod 750 "${ROOT}"/var/log/inspircd
-	chown -R inspircd:inspircd "${ROOT}"/var/log/inspircd
-
-	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/inspircd
-	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/inspircd
-
-	chmod -R 755 "${ROOT}"/usr/bin/inspircd
-}
diff --git a/net-irc/inspircd/inspircd-1.1.19.ebuild b/net-irc/inspircd/inspircd-1.1.19.ebuild
new file mode 100644
index 000000000000..58a764f457ce
--- /dev/null
+++ b/net-irc/inspircd/inspircd-1.1.19.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.19.ebuild,v 1.1 2008/04/23 19:04:01 rbu Exp $
+
+inherit eutils toolchain-funcs multilib # subversion
+
+DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
+HOMEPAGE="http://www.inspircd.org/"
+SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2
+mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="openssl gnutls ipv6 kernel_linux mysql postgres sqlite zlib ldap"
+
+RDEPEND="
+	dev-lang/perl
+	openssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/inspircd"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local SQL=0
+	cd src/modules
+
+	if use zlib ; then
+		cp extra/m_ziplink.cpp .
+	fi
+	if use openssl || use gnutls ; then
+		cp extra/m_sslinfo.cpp .
+		cp extra/m_ssl_oper_cert.cpp
+	fi
+
+	if use ldap ; then
+		cp extra/m_ldapauth.cpp .
+	fi
+
+	if use mysql ; then
+		SQL=1
+		cp extra/m_mysql.cpp .
+	fi
+	if use postgres ; then
+		SQL=1
+		cp extra/m_pgsql.cpp .
+	fi
+	if use sqlite ; then
+		SQL=1
+		cp extra/m_sqlite3.cpp .
+	fi
+	if [ ${SQL} -eq 1 ] ; then
+		cp extra/m_sql{auth.cpp,log.cpp,oper.cpp,utils.cpp,utils.h,v2.h} .
+	fi
+}
+
+src_compile() {
+
+	# ./configure doesn't know --disable-gnutls, -ipv6 and -openssl options,
+	# so should be used only --enable-like.
+	local myconf=""
+	use gnutls  && myconf="--enable-gnutls"
+	use myconf  && myconf="${myconf} --enable-ipv6 --enable-remote-ipv6"
+	use openssl && myconf="${myconf} --enable-openssl"
+
+	./configure ${myconf} \
+		--enable-epoll \
+		--prefix="/usr/$(get_libdir)/inspircd" \
+		--config-dir="/etc/inspircd" \
+		--binary-dir="/usr/bin" \
+		--library-dir="/usr/$(get_libdir)/inspircd" \
+		--module-dir="/usr/$(get_libdir)/inspircd/modules" \
+		|| die "configure failed"
+	./configure -modupdate || die "modupdate failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# the inspircd buildsystem does not create these, its configure script
+	# does. so, we have to make sure they are there.
+	dodir /usr/$(get_libdir)/inspircd
+	dodir /usr/$(get_libdir)/inspircd/modules
+	dodir /etc/inspircd
+	dodir /var/log/inspircd
+	dodir /usr/include/inspircd
+
+	emake install \
+		LIBPATH="${D}/usr/$(get_libdir)/inspircd/" \
+		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
+		CONPATH="${D}/etc/inspircd" \
+		BINPATH="${D}/usr/bin" \
+		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
+
+	insinto /usr/include/inspircd/
+	doins "${S}"/include/*
+
+	newinitd "${FILESDIR}"/init.d_inspircd inspircd
+
+	keepdir "/var/log/inspircd/"
+}
+
+pkg_postinst() {
+	enewgroup inspircd
+	enewuser inspircd -1 -1 -1 inspircd
+	chown -R inspircd:inspircd "${ROOT}"/etc/inspircd
+	chmod 700 "${ROOT}"/etc/inspircd
+
+	chmod 750 "${ROOT}"/var/log/inspircd
+	chown -R inspircd:inspircd "${ROOT}"/var/log/inspircd
+
+	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/inspircd
+	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/inspircd
+
+	chmod -R 755 "${ROOT}"/usr/bin/inspircd
+}