summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wever <weeve@gentoo.org>2005-07-09 17:08:30 +0000
committerJason Wever <weeve@gentoo.org>2005-07-09 17:08:30 +0000
commit4ec528ba8d904f9bb4527a236ee4df5bc6512048 (patch)
tree0a26a537f7b728e12e3dc25103d26a53d0cfbf46 /app-admin
parentQA: Cleaner einfo, ewarn, eerror and echo usage (diff)
downloadgentoo-2-4ec528ba8d904f9bb4527a236ee4df5bc6512048.tar.gz
gentoo-2-4ec528ba8d904f9bb4527a236ee4df5bc6512048.tar.bz2
gentoo-2-4ec528ba8d904f9bb4527a236ee4df5bc6512048.zip
Fixed bug #98450, stablized on x86 and sparc and added ~amd64 keyword.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conserver/ChangeLog6
-rw-r--r--app-admin/conserver/Manifest10
-rw-r--r--app-admin/conserver/conserver-8.1.11-r1.ebuild9
-rw-r--r--app-admin/conserver/files/conserver.pam1
-rw-r--r--app-admin/conserver/files/conserver.pam-include1
5 files changed, 16 insertions, 11 deletions
diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog
index b17abc054c8e..57a239d63c40 100644
--- a/app-admin/conserver/ChangeLog
+++ b/app-admin/conserver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/conserver
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.36 2005/05/21 23:27:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.37 2005/07/09 17:08:30 weeve Exp $
+
+ 09 Jul 2005; Jason Wever <weeve@gentoo.org> files/conserver.pam,
+ files/conserver.pam-include, conserver-8.1.11-r1.ebuild:
+ Fixed bug #98450, stablized on x86 and sparc and added ~amd64 keyword.
*conserver-8.1.11-r1 (21 May 2005)
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 97fcb3652d13..bfdf36b33cd0 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,12 +1,12 @@
MD5 7f6d03fef5412263d70b054daf7a6a8d ChangeLog 5501
-MD5 e4fbbf5cdcde8513f588bd52c6e7b184 conserver-8.1.5.ebuild 1975
+MD5 a27ffb50fc4742df4463681cb5708fc6 conserver-8.1.11-r1.ebuild 2115
MD5 d4a8757dd8fd8e596cc1e76d38ce8181 conserver-8.1.11.ebuild 2150
+MD5 e4fbbf5cdcde8513f588bd52c6e7b184 conserver-8.1.5.ebuild 1975
MD5 db109ae3e620120b654118ff198a9d0a metadata.xml 1062
-MD5 a27ffb50fc4742df4463681cb5708fc6 conserver-8.1.11-r1.ebuild 2115
MD5 a42dde46eb6704092cf513ff732d8b43 files/conserver.confd 288
MD5 bc6ee1aa7fdefaa6d2f54494deb7f920 files/conserver.initd 1172
-MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/conserver.pam 431
-MD5 f5a67a54ac210a8747b3790d28589f1d files/digest-conserver-8.1.5 67
+MD5 2e7603feaff187884dd9b1e66601f02b files/conserver.pam 382
+MD5 609774f17b0470a793fb7791278e270d files/conserver.pam-include 210
MD5 9350f4c960a6d72a525857cd3ad5b1a6 files/digest-conserver-8.1.11 68
-MD5 4b7d75b12f1bea9f349dff4c48c18b8b files/conserver.pam-include 245
MD5 9350f4c960a6d72a525857cd3ad5b1a6 files/digest-conserver-8.1.11-r1 68
+MD5 f5a67a54ac210a8747b3790d28589f1d files/digest-conserver-8.1.5 67
diff --git a/app-admin/conserver/conserver-8.1.11-r1.ebuild b/app-admin/conserver/conserver-8.1.11-r1.ebuild
index 8cb7b1a2ace1..17e3ee1adfcd 100644
--- a/app-admin/conserver/conserver-8.1.11-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.11-r1.ebuild,v 1.1 2005/05/21 23:27:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.11-r1.ebuild,v 1.2 2005/07/09 17:08:30 weeve Exp $
inherit ssl-cert eutils
@@ -10,15 +10,18 @@ SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha -ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc sparc x86"
IUSE="pam ssl tcpd debug"
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )
- debug? ( dev-libs/dmalloc )"
+ !amd64? ( debug? ( dev-libs/dmalloc ) )"
src_compile() {
+ use amd64 && \
+ einfo "debug use flag is disabled on amd64 since deps cannot be met."
+
econf \
$(use_with ssl openssl) \
$(use_with pam) \
diff --git a/app-admin/conserver/files/conserver.pam b/app-admin/conserver/files/conserver.pam
index 7c9ad5938634..8ee3b724f0ce 100644
--- a/app-admin/conserver/files/conserver.pam
+++ b/app-admin/conserver/files/conserver.pam
@@ -9,4 +9,3 @@ 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
-session optional /lib/security/pam_console.so
diff --git a/app-admin/conserver/files/conserver.pam-include b/app-admin/conserver/files/conserver.pam-include
index 9d2167793cc5..4ddcb59dad57 100644
--- a/app-admin/conserver/files/conserver.pam-include
+++ b/app-admin/conserver/files/conserver.pam-include
@@ -9,4 +9,3 @@ account include system-auth
password include system-auth
session include system-auth
-session optional pam_console.so