Correct broken pam file (#210785).

(Portage version: 2.1.3.19, RepoMan options: --force)

6 files changed, 24 insertions, 304 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index dec0571e2155..0af57b7fbdcd 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for net-misc/quagga
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.69 2007/09/26 05:51:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.70 2008/02/20 05:19:32 mrness Exp $
+
+*quagga-0.99.9-r1 (20 Feb 2008)
+*quagga-0.98.6-r4 (20 Feb 2008)
+
+  20 Feb 2008; Alin Năstac <mrness@gentoo.org> files/quagga.pam,
+  -quagga-0.98.6-r2.ebuild, -quagga-0.98.6-r3.ebuild,
+  +quagga-0.98.6-r4.ebuild, -quagga-0.99.7-r1.ebuild, -quagga-0.99.9.ebuild,
+  +quagga-0.99.9-r1.ebuild:
+  Correct broken pam file (#210785).
 
   26 Sep 2007; Alin Năstac <mrness@gentoo.org> quagga-0.98.6-r3.ebuild,
   quagga-0.99.9.ebuild:
diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam
index c188f9683880..9a91ad852fbd 100644
--- a/net-misc/quagga/files/quagga.pam
+++ b/net-misc/quagga/files/quagga.pam
@@ -4,12 +4,12 @@
 ##### if running quagga as root:
 # Only allow root (and possibly wheel) to use this because enable access
 # is unrestricted.
-auth       sufficient   /lib/security/pam_rootok.so
+auth       sufficient   pam_rootok.so
 
 # Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth       sufficient   /lib/security/pam_wheel.so trust use_uid
+#auth       sufficient   pam_wheel.so trust use_uid
 # Uncomment the following line to require a user to be in the "wheel" group.
-#auth       required     /lib/security/pam_wheel.so use_uid
+#auth       required     pam_wheel.so use_uid
 ###########################################################
 
 # If using quagga privileges and with a seperate group for vty access, then
@@ -17,9 +17,10 @@ auth       sufficient   /lib/security/pam_rootok.so
 # check for valid user/password, eg:
 #
 # only allow local users.
-#auth       required     /lib/security/pam_securetty.so
-#auth       required     /lib/security/pam_stack.so service=system-auth
-#auth       required     /lib/security/pam_nologin.so
-#account    required     /lib/security/pam_stack.so service=system-auth
-#password   required     /lib/security/pam_stack.so service=system-auth
-#session    required     /lib/security/pam_stack.so service=system-auth
+#auth       required     pam_securetty.so
+#auth       include      system-auth
+#auth       required     pam_nologin.so
+#account    include      system-auth
+#password   include      system-auth
+#session    include      system-auth
+#session    optional     pam_console.so
diff --git a/net-misc/quagga/quagga-0.98.6-r2.ebuild b/net-misc/quagga/quagga-0.98.6-r2.ebuild
deleted file mode 100644
index 687f364bf958..000000000000
--- a/net-misc/quagga/quagga-0.98.6-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r2.ebuild,v 1.8 2007/06/26 02:34:46 mr_bones_ Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20070412.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ppc s390 sparc x86"
-IUSE="ipv6 snmp pam tcpmd5 bgpclassless ospfapi realms fix-connected-rt multipath tcp-zebra"
-RESTRICT="userpriv"
-
-DEPEND=">=sys-libs/libcap-1.10-r5
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-
-src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
-
-	cd "${S}" || die "source dir not found"
-	# Fix security quagga bug 355
-	epatch "${WORKDIR}/patch/bgpd-bug-355.diff"
-	#Patch to fix RIP authentication problem in 0.98.6 (#132353)
-	#DO NOT USE IT IN ANY OTHER VERSIONS!
-	epatch "${WORKDIR}/patch/ripd-show-ifaces.diff"
-
-	# TCP MD5 for BGP patch for Linux (RFC 2385) - http://hasso.linux.ee/doku.php/english:network:rfc2385
-	use tcpmd5 && epatch "${WORKDIR}/patch/ht-20050321-0.98.2-bgp-md5.patch"
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp.patch"
-
-	# Connected route fix (Amir Guindehi) - http://voidptr.sboost.org/quagga/amir-connected-route.patch.bz2
-	# Dependant on the use flag 'fix-connected-rt' because it seems that more peoples have troubles
-	# with this than having a benefit.
-	# This patch fixes a bad behavior of the Linux kernel routing packets to interfaces which are
-	# down. Folks with PtP interfaces and VLans report troubles with this patch. Enable it again
-	# if you get a problem because your kernel routes packets to a downed interface.
-	use fix-connected-rt && epatch "${WORKDIR}/patch/amir-connected-route.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	# regenerate configure and co if we touch .ac or .am files
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--disable-static --enable-dynamic"
-
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use snmp && myconf="${myconf} --enable-snmp"
-	use pam && myconf="${myconf} --with-libpam"
-	use tcpmd5 && myconf="${myconf} --enable-tcp-md5"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-	use tcp-zebra && myconf="${myconf} --enable-tcp-zebra"
-
-	econf \
-		--enable-nssa \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	keepdir /var/run/quagga || die
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-
-	if use tcpmd5; then
-		echo
-		ewarn "TCP MD5 for BGP needs a patched kernel!"
-		einfo "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
-	fi
-
-	if use ipv6; then
-		echo
-		ewarn "This version of quagga contains a netlink race condition fix that triggered a kernel bug"
-		ewarn "which affects IPv6 users who have a kernel version < 2.6.13-rc6."
-		einfo "See following links for more info:"
-		einfo "   http://lists.quagga.net/pipermail/quagga-dev/2005-June/003507.html"
-		einfo "   http://bugzilla.quagga.net/show_bug.cgi?id=196"
-	fi
-}
diff --git a/net-misc/quagga/quagga-0.98.6-r3.ebuild b/net-misc/quagga/quagga-0.98.6-r4.ebuild
index 59a7fe2d87f0..35375bbcc2ca 100644
--- a/net-misc/quagga/quagga-0.98.6-r3.ebuild
+++ b/net-misc/quagga/quagga-0.98.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r3.ebuild,v 1.9 2008/01/10 08:41:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.98.6-r4.ebuild,v 1.1 2008/02/20 05:19:32 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
diff --git a/net-misc/quagga/quagga-0.99.7-r1.ebuild b/net-misc/quagga/quagga-0.99.7-r1.ebuild
deleted file mode 100644
index 30d9a67b9b6a..000000000000
--- a/net-misc/quagga/quagga-0.99.7-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.7-r1.ebuild,v 1.1 2007/09/12 07:25:05 mrness Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils multilib autotools linux-info
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20070912.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
-IUSE="ipv6 snmp pam tcpmd5 bgpas4 bgpclassless ospfapi realms multipath tcp-zebra"
-RESTRICT="userpriv"
-
-DEPEND=">=sys-libs/libcap-1.10-r5
-	snmp? ( net-analyzer/net-snmp )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use tcpmd5 ; then
-		get_version || get_running_version
-	fi
-	return 0
-}
-
-src_unpack() {
-	unpack ${A} || die "failed to unpack sources"
-	cd "${S}" || die "source dir not found"
-	epatch "${WORKDIR}/patch/${P}-link-libcap.patch"
-
-	# AS4 support (original found at http://quagga.ncc.eurodata.de)
-	use bgpas4 && epatch "${WORKDIR}/patch/quagga-cvs20070307-as4-v05_adapted.patch"
-
-	if use tcpmd5 ; then
-		if kernel_is lt 2 6 20 ; then
-			# TCP MD5 for BGP patch for Linux (RFC 2385)
-			# original found at http://hasso.linux.ee/doku.php/english:network:rfc2385
-			epatch "${WORKDIR}/patch/ht-20050321-${PV}-bgp-md5_adapted.patch"
-		else
-			# TCP MD5 in-kernel support for kernels >=2.6.20 (by Leigh Brown)
-			# original found at http://www.solinno.co.uk/md5sig/quagga_linux-2.6.20_md5sig.diff
-			epatch "${WORKDIR}/patch/quagga_linux-2.6.20_md5sig_adapted.diff"
-		fi
-	fi
-
-	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && epatch "${WORKDIR}/patch/ht-20040304-classless-bgp_adapted.patch"
-
-	# Realms support (Calin Velea) - http://vcalinus.gemenii.ro/quaggarealms.html
-	use realms && epatch "${WORKDIR}/patch/${P}-realms.diff"
-
-	# Security patches
-	epatch "${WORKDIR}/patch/${P}-backports.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--disable-static --enable-dynamic"
-
-	use ipv6 \
-			&& myconf="${myconf} --enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" \
-			|| myconf="${myconf} --disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use ospfapi \
-			&& myconf="${myconf} --enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-	use snmp && myconf="${myconf} --enable-snmp"
-	use pam && myconf="${myconf} --with-libpam"
-	use tcpmd5 && myconf="${myconf} --enable-tcp-md5"
-	use realms && myconf="${myconf} --enable-realms"
-	use multipath && myconf="${myconf} --enable-multipath=0"
-	use tcp-zebra && myconf="${myconf} --enable-tcp-zebra"
-
-	econf \
-		--enable-nssa \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--enable-vtysh \
-		--sysconfdir=/etc/quagga \
-		--enable-exampledir=/etc/quagga/samples \
-		--localstatedir=/var/run/quagga \
-		--libdir=/usr/$(get_libdir)/quagga \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall \
-		localstatedir="${D}/var/run/quagga" \
-		sysconfdir="${D}/etc/quagga" \
-		exampledir="${D}/etc/quagga/samples" \
-		libdir="${D}/usr/$(get_libdir)/quagga" || die "make install failed"
-
-	keepdir /var/run/quagga
-
-	local i MY_SERVICES_LIST="zebra ripd ospfd bgpd"
-	use ipv6 && MY_SERVICES_LIST="${MY_SERVICES_LIST} ripngd ospf6d"
-	for i in ${MY_SERVICES_LIST} ; do
-		newinitd "${FILESDIR}/${i}.init" ${i} || die "failed to install ${i} init.d script"
-	done
-	newconfd "${FILESDIR}/zebra.conf" zebra || die "failed to install zebra conf.d script"
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/quagga.pam" quagga
-	fi
-
-	newenvd "${FILESDIR}/quagga.env" 99quagga
-}
-
-pkg_preinst() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0770 -o root -g quagga "${ROOT}/etc/quagga"
-	install -d -m0755 -o quagga -g quagga "${ROOT}/var/run/quagga"
-
-	einfo "Sample configuration files can be found in /etc/quagga/samples."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-
-	if use tcpmd5; then
-		echo
-		if kernel_is lt 2 6 20; then
-			ewarn "TCP MD5 for BGP needs a patched kernel!"
-			ewarn "See http://hasso.linux.ee/doku.php/english:network:rfc2385 for more info."
-		else
-			CONFIG_CHECK="~TCP_MD5SIG"
-			local ERROR_TCP_MD5SIG="CONFIG_TCP_MD5SIG:\t missing TCP MD5 signature support (RFC2385)"
-
-			check_extra_config
-		fi
-	fi
-}
diff --git a/net-misc/quagga/quagga-0.99.9.ebuild b/net-misc/quagga/quagga-0.99.9-r1.ebuild
index c6a994c5d1f2..4d0236ab0fcf 100644
--- a/net-misc/quagga/quagga-0.99.9.ebuild
+++ b/net-misc/quagga/quagga-0.99.9-r1.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-misc/quagga/quagga-0.99.9.ebuild,v 1.2 2007/09/26 05:51:54 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.9-r1.ebuild,v 1.1 2008/02/20 05:19:32 mrness Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"