Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Imhof (tantive)" <tantive@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-power/apcupsd/files/3.14.3: apcupsd.in.patch apcupsd.initd etc.patch hal-ups-policy.patch no-parallel.patch
Date: Thu, 08 May 2008 19:37:54
Message-Id: E1JuBw6-000482-ML@stork.gentoo.org
1 tantive 08/05/08 19:37:50
2
3 Added: apcupsd.in.patch apcupsd.initd etc.patch
4 hal-ups-policy.patch no-parallel.patch
5 Log:
6 Version bumped. Closes #208188. Added -j1 to emake, should fix #176339.
7 (Portage version: 2.1.5_rc7)
8 (Signed Manifest commit)
9
10 Revision Changes Path
11 1.1 sys-power/apcupsd/files/3.14.3/apcupsd.in.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.in.patch?rev=1.1&content-type=text/plain
15
16 Index: apcupsd.in.patch
17 ===================================================================
18 --- platforms/gentoo/apcupsd.in
19 +++ platforms/gentoo/apcupsd.in
20 @@ -6,6 +6,12 @@
21 APCPID=@PIDDIR@/apcupsd.pid
22 APCUPSD=@sbindir@/apcupsd
23
24 +depend() {
25 + after hotplug
26 + after usb
27 + after net
28 +}
29 +
30 start() {
31 rm -f /etc/apcupsd/powerfail
32 ebegin "Starting APC UPS daemon"
33
34
35
36 1.1 sys-power/apcupsd/files/3.14.3/apcupsd.initd
37
38 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.initd?rev=1.1&view=markup
39 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.initd?rev=1.1&content-type=text/plain
40
41 Index: apcupsd.initd
42 ===================================================================
43 #!/sbin/runscript
44 # Copyright 2007 Gentoo Foundation
45 # Distributed under the terms of the GNU General Public License v2
46 # $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/files/3.14.3/apcupsd.initd,v 1.1 2008/05/08 19:37:50 tantive Exp $
47
48 INSTANCE="${SVCNAME#*.}"
49 if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "apcupsd" ]; then
50 INSTANCE="apcupsd"
51 fi
52
53 depend() {
54 use net
55 }
56
57 start() {
58 rm -f /etc/apcupsd/powerfail
59
60 export SERVICE="${SVCNAME}"
61
62 ebegin "Starting APC UPS daemon"
63 start-stop-daemon \
64 --start --pidfile "/var/run/${SVCNAME}.pid" \
65 --exec /sbin/apcupsd -- \
66 -f "/etc/apcupsd/${INSTANCE}.conf" \
67 -P "/var/run/${SVCNAME}.pid"
68 eend $?
69 }
70
71 stop() {
72 ebegin "Stopping APC UPS daemon"
73 start-stop-daemon \
74 --stop --pidfile "/var/run/${SVCNAME}.pid" \
75 --exec /sbin/apcupsd
76 eend $?
77 }
78
79
80
81 1.1 sys-power/apcupsd/files/3.14.3/etc.patch
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/etc.patch?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/etc.patch?rev=1.1&content-type=text/plain
85
86 Index: etc.patch
87 ===================================================================
88 *** platforms/etc.bak/changeme.in 2007-02-18 14:58:16.000000000 +0100
89 --- platforms/etc/changeme.in 2007-02-18 15:01:36.000000000 +0100
90 ***************
91 *** 13,18 ****
92 --- 13,19 ----
93 #
94 (
95 echo "Subject: $MSG"
96 + echo "To: $SYSADMIN"
97 echo " "
98 echo "$MSG"
99 echo " "
100 *** platforms/etc.bak/commfailure.in 2007-02-18 14:58:16.000000000 +0100
101 --- platforms/etc/commfailure.in 2007-02-18 15:01:56.000000000 +0100
102 ***************
103 *** 13,18 ****
104 --- 13,19 ----
105 #
106 (
107 echo "Subject: $MSG"
108 + echo "To: $SYSADMIN"
109 echo " "
110 echo "$MSG"
111 echo " "
112 *** platforms/etc.bak/commok.in 2007-02-18 14:58:16.000000000 +0100
113 --- platforms/etc/commok.in 2007-02-18 15:02:24.000000000 +0100
114 ***************
115 *** 13,18 ****
116 --- 13,19 ----
117 #
118 (
119 echo "Subject: $MSG"
120 + echo "To: $SYSADMIN"
121 echo " "
122 echo "$MSG"
123 echo " "
124 *** platforms/etc.bak/offbattery.in 2007-02-18 14:58:16.000000000 +0100
125 --- platforms/etc/offbattery.in 2007-02-18 15:04:43.000000000 +0100
126 ***************
127 *** 13,18 ****
128 --- 13,19 ----
129 #
130 (
131 echo "Subject: $MSG"
132 + echo "To: $SYSADMIN"
133 echo " "
134 echo "$MSG"
135 echo " "
136 *** platforms/etc.bak/onbattery.in 2007-02-18 14:58:16.000000000 +0100
137 --- platforms/etc/onbattery.in 2007-02-18 15:04:47.000000000 +0100
138 ***************
139 *** 13,18 ****
140 --- 13,19 ----
141 #
142 (
143 echo "Subject: $MSG"
144 + echo "To: $SYSADMIN"
145 echo " "
146 echo "$MSG"
147 echo " "
148
149
150
151
152 1.1 sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch
153
154 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch?rev=1.1&view=markup
155 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/hal-ups-policy.patch?rev=1.1&content-type=text/plain
156
157 Index: hal-ups-policy.patch
158 ===================================================================
159 --- apcupsd-3.14.3.orig/platforms/80-apcupsd-ups-policy.fdi 2008-04-29 09:57:34.000000000 +0200
160 +++ apcupsd-3.14.3/platforms/80-apcupsd-ups-policy.fdi 2008-04-29 09:58:51.000000000 +0200
161 @@ -2,7 +2,7 @@
162 <!-- Disable hald-addon-hid-ups for any APC UPS so Apcupsd can own the device -->
163 <deviceinfo version="0.2">
164 <device>
165 - <match key="info.addons" type="strlist">hald-addon-hid-ups</match>
166 + <match key="info.addons" contains="hald-addon-hid-ups">
167 <match key="@info.parent:info.bus" string="usb">
168 <match key="@info.parent:usb.vendor_id" int="1309">
169 <match key="@info.parent:usb.product_id" int="2">
170
171
172
173 1.1 sys-power/apcupsd/files/3.14.3/no-parallel.patch
174
175 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/no-parallel.patch?rev=1.1&view=markup
176 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-power/apcupsd/files/3.14.3/no-parallel.patch?rev=1.1&content-type=text/plain
177
178 Index: no-parallel.patch
179 ===================================================================
180 upstream forces this cruft
181
182 --- autoconf/targets.mak
183 +++ autoconf/targets.mak
184 @@ -5,6 +5,8 @@
185 #
186 # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@×××××××××××××××.it>
187
188 +.NOTPARALLEL:
189 +
190 # Tell versions [3.59,3.63) of GNU make not to export all variables.
191 # Otherwise a system limit (for SysV at least) may be exceeded.
192 .NOEXPORT:
193
194
195
196 --
197 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups