Removed --proxy-timeout argument, fixes bug #57732.

6 files changed, 22 insertions, 29 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/Manifest b/sys-apps/apmd/Manifest
index c7d84661d07e..418001219349 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a07e8b61287ca7b990e59b36e11b50dc ChangeLog 3380
-MD5 ffea8628d07ee28ec924027c597da639 apmd-3.2.1_p4.ebuild 1565
-MD5 7756ebd1dd224cf47eb9e383425daf43 apmd-3.0.2-r3.ebuild 1785
+MD5 ba231fcf8fcbc551479607d63087b8cc apmd-3.2.1_p4.ebuild 1563
+MD5 88e3463d354ae8c261776456764ad06e apmd-3.0.2-r3.ebuild 1781
+MD5 cbc58a4049aeb897ae36c29f870d79c8 apmd-3.2.0.ebuild 1912
+MD5 a962740db993f374aeb627e6f52e6acb ChangeLog 3505
 MD5 c699d919f1c3463ae0e91f2c28c8b687 metadata.xml 184
-MD5 45634ccfe5323e9934d7e41625f7fe8a apmd-3.2.0.ebuild 1915
-MD5 1a2007554d23f0bd5af71b8021915fc0 files/apmd.confd 90
-MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
-MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
-MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
-MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
-MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
+MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
+MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 bdb989641f5be7797a3232a8691ebc66 files/apmd.rc6 672
+MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
+MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
 MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBdVj+HTu7gpaalycRAhj3AKCcHGIOizhSqIBFWbRmFF580COFfQCgxF/3
-piBcWoFN1pHYwvThc+KyEzg=
-=fcUW
------END PGP SIGNATURE-----
+MD5 3492719252a335494c99444cf4d76899 files/apmd.confd 71
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"