Correct broken pam file (#210785).

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

7 files changed, 38 insertions, 313 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/Manifest b/net-misc/quagga/Manifest
index 24c8c5358141..6939554cf5ec 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,22 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 AUX ospf6d.init 919 RMD160 91c936a210daf94e3742bbbd6f77484afe4c4cb5 SHA1 6448dcb15084b9ac7663cf0e7fd95f4602430c93 SHA256 13be35acbad48120fca1e39fd9ad6e99894280f47bc516396147051329704891
 AUX ospfd.init 910 RMD160 4863d2a89ce0450efed37458b432f8d4ec8e33a5 SHA1 512cddcda3b6813f92778f44e07552ae483e78a5 SHA256 b20cf9046f5c9687aeda2be4f7160d1f1f941c63d865b767f156d1b8471d8c59
 AUX quagga.env 25 RMD160 2ea6666fbacfdcc125283dcd4a5f6bae089f5392 SHA1 42aad9b84a949f13bfb708659290ec1f0de6eff4 SHA256 12aeda71c607c4830fda6042daf19353a9187e062a8ad998e5a2bd3e52773297
-AUX quagga.pam 1145 RMD160 02452574f53453a50b4561468122960ecf262ae8 SHA1 0b5ee96110867eef537cfee95354a813f331ddae SHA256 3ed1c8d7bd02727c889064e8cda58e9aa7f301e40a5af18b71e92e214465ebcd
+AUX quagga.pam 975 RMD160 df2433b76a16f2c8747f9569e88ed90c9c1f2bae SHA1 bfcd1bbbd4162fd70541f0d754a0e5a818025bc9 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70
 AUX ripd.init 900 RMD160 ef99fa34951c47a29b1147a9b1226692f239ec8b SHA1 b89e411a64013e88cfcd2f898025f66a9593445a SHA256 6212f0bb45d849087fdb6c0d4cbc3b0f3e651907cb844576c17d161dbf10fda5
 AUX ripngd.init 920 RMD160 7d484a8342cc1142fd8ee88080f8f9281fde3461 SHA1 5c31e1fecdea1a55461ea3550702bfd225b2101c SHA256 7183b0bbf9ab9144635fada4e03f73dd58bac246600ee7f007f06150db48d044
 AUX zebra.conf 371 RMD160 618332506925b73df1fa66b80cc6aea3a6cdebb3 SHA1 a4c7a7741a1900ab0c10e070715ee17568e57f40 SHA256 291bf052f3b1175c4c04c7ed7e3528acbd5143048da49b4fad3769ba2eedd26d
 AUX zebra.init 1013 RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 SHA1 462d7e255f01fb9615f99526976cef209ea332e7 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236
-DIST quagga-0.98.6-patches-20070412.tar.gz 21339 RMD160 25263a2f4393f6610076f4292003e7bf83ef1b3a SHA1 26ecd5ac98a2f6db7e0edc199c186a79ebf9c166 SHA256 d5f713f1720b59910731236b2b5babe8d2a7bc1074114c16e00e41d504a4c01e
 DIST quagga-0.98.6-patches-20070912.tar.gz 21385 RMD160 4c4286700e5cb9d45366d59c76ca22c74fcbdb1a SHA1 a9f24b09e582aa828b5ba4bbaf616818f1db1b7a SHA256 e7292a65145e66bb30ff51b221486006d8abc2b4a587520feebc7f3f0e1e17f0
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
-DIST quagga-0.99.7-patches-20070912.tar.gz 48489 RMD160 61110ffbcf7c516865a97883fb1fc07574d17f5f SHA1 91edda24298e4273fc14422f9e22bd130830436a SHA256 46bc5cc8225f6413ee08c32f7d54eed784454aab6785437001d398443ae8ffbc
-DIST quagga-0.99.7.tar.gz 2350372 RMD160 f7ae94f2b5f4782efa7b70bd59924492618133fe SHA1 da2d690275e38bb58841edc265ba3bd154b10dd2 SHA256 fd258e4503646129ca77f6fe9c16b69f36f320256768b84dbabd2e4915ab8eb4
 DIST quagga-0.99.9-patches-20070913.tar.gz 51990 RMD160 c6c9582c47e1ff362e39f873c03b85a02f5e8253 SHA1 b656a790e1b961b34d712b862a06c50da748b241 SHA256 532c5ea6b7d2ada6e88fd92fc0d4c5cce2b48794bed0d8a9d09e070d433b91e3
 DIST quagga-0.99.9.tar.gz 2341067 RMD160 c7ad68d0c728d13c1917ec727aa113e3ec60728f SHA1 bb28ffde585a3c757d883fd75dcc1d5f3a1afe70 SHA256 92abf44c5239c8a18762cf27cafd03b46d581f180bc411706314b8b8d1e94db0
-EBUILD quagga-0.98.6-r2.ebuild 5164 RMD160 54b1309d6ae110b3771d5957b523b0b5acc41d81 SHA1 b27af6dc24e44b32b2e0a05c3f37d3cc05cdfa4e SHA256 993d536720958a1b046d7383afddfa90fc9a9229a650c2e0fd7e728cefcd6fad
-EBUILD quagga-0.98.6-r3.ebuild 5303 RMD160 ef9cc5aa56e33837bcb55c5089c63fa8d1d5daff SHA1 8d8dd3a14e1adcb272b9731c8f19099208896e9f SHA256 d710c65e18425d4956ef41bcfaf699aff4b6050f749f7ea5769320b2b005d00a
-EBUILD quagga-0.99.7-r1.ebuild 4766 RMD160 11fc30acc56ab5a90a363ce2cfa01335cb7ec5af SHA1 eff366c6157878d4428be6e2ca6e079130477c23 SHA256 c2bfe3a496d154696309753b9975a49574ecd785784e867d5c9fac8b30c1275b
-EBUILD quagga-0.99.9.ebuild 4714 RMD160 bbe72cab1f7103a482029753388a7bf06f7a1d42 SHA1 000903bc7201cb5e396541e99cd70d388a04594b SHA256 4abba503d5e8b21e9386be024a33da8f170bf86662fe28085f22fd7204d8219c
-MISC ChangeLog 16435 RMD160 2cb53a1de159d5c938deae5d881f2f8ee98eac4b SHA1 e079834534f12615393501794c52a6d27b51fb3a SHA256 5bae0c91abe7088b11b1c160540bc52e02964cf493b427f0e50499eb80bb065b
+EBUILD quagga-0.98.6-r4.ebuild 5303 RMD160 a5babd5106c1dd5835669ea2918ef60eb2773d03 SHA1 8fc783bd0e49a83662022eed07f3c706a576d251 SHA256 dfc8507a6ed67702a27fad2886b82898241da1520c041a4759f20e8cbb339586
+EBUILD quagga-0.99.9-r1.ebuild 4717 RMD160 99a302c696852d81b3f97ac5de65780b7a6e72c4 SHA1 a0349480d31c7d773776da333852a13a62952112 SHA256 54ff7cebf675ea6640f1f82788d0ed9ae53e6f6469fd28c958df4d72ee614e79
+MISC ChangeLog 16763 RMD160 39bed4e26046a96534a681b577d48c3d1da17169 SHA1 5cf4bff88a5c9c64160ec0ca5a31157fd01b744a SHA256 bb5040401e5b0428245536d873786976aa54ae067fbd46b62fbacf9687f9d673
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAke7uHEACgkQ+fWpoTWIA9GSogCdHDESjBvZWUdLWI9HSzPvdI+K
+2SAAnicfTGiswk++QthQBHdgpl6XHUFX
+=zu3n
+-----END PGP SIGNATURE-----
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"