summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-01-04 11:52:56 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-01-04 11:52:56 +0000
commitca2109cbfe3c616750659c2b4df16592d7c8b9da (patch)
tree615a564e81ced4fb0afa278782bbbaad40b8ab31
parentpython bindings patch by Martin Renold (official mailing list). http://old.ho... (diff)
downloadgentoo-2-ca2109cbfe3c616750659c2b4df16592d7c8b9da.tar.gz
gentoo-2-ca2109cbfe3c616750659c2b4df16592d7c8b9da.tar.bz2
gentoo-2-ca2109cbfe3c616750659c2b4df16592d7c8b9da.zip
Removed --proxy-timeout argument, fixes bug #57732.
-rw-r--r--sys-apps/apmd/ChangeLog7
-rw-r--r--sys-apps/apmd/apmd-3.0.2-r3.ebuild4
-rw-r--r--sys-apps/apmd/apmd-3.2.0.ebuild4
-rw-r--r--sys-apps/apmd/apmd-3.2.1_p4.ebuild4
-rw-r--r--sys-apps/apmd/files/apmd.confd2
5 files changed, 12 insertions, 9 deletions
diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index a28a639c0cbf..dc8b718c6df4 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/apmd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.21 2004/09/16 16:15:47 tester Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.22 2005/01/04 11:52:56 brix Exp $
+
+ 04 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> files/apmd.confd:
+ Removed --proxy-timeout argument, fixes bug #57732.
16 Sep 2004; Olivier Crete <tester@gentoo.org> apmd-3.2.1_p4.ebuild:
Stable on x86 per request in bug 59139
diff --git a/sys-apps/apmd/apmd-3.0.2-r3.ebuild b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
index ecf88b5a1805..970904a5d991 100644
--- a/sys-apps/apmd/apmd-3.0.2-r3.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.18 2004/06/30 14:21:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r3.ebuild,v 1.19 2005/01/04 11:52:56 brix Exp $
inherit eutils
diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild
index 70ef28d5cd89..709557e460fe 100644
--- a/sys-apps/apmd/apmd-3.2.0.ebuild
+++ b/sys-apps/apmd/apmd-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.9 2004/08/24 02:46:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.10 2005/01/04 11:52:56 brix Exp $
inherit eutils
diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
index 5dd7ab452580..fc5126babf72 100644
--- a/sys-apps/apmd/apmd-3.2.1_p4.ebuild
+++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.11 2004/10/19 18:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.12 2005/01/04 11:52:56 brix Exp $
inherit eutils
diff --git a/sys-apps/apmd/files/apmd.confd b/sys-apps/apmd/files/apmd.confd
index 383f5993f8e2..f510988c8467 100644
--- a/sys-apps/apmd/files/apmd.confd
+++ b/sys-apps/apmd/files/apmd.confd
@@ -1,3 +1,3 @@
# Config file for /etc/init.d/apmd
-APMD_OPTS="-P /etc/apm/apmd_proxy --proxy-timeout 30"
+APMD_OPTS="-P /etc/apm/apmd_proxy"