Gentoo Archives: gentoo-commits

From: "Wolfram Schlich (wschlich)" <wschlich@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-backup/bacula/files/2.2.4: bacula-sd-init bacula-all-init bacula-fd-init bacula-dir-init bacula-all-conf bacula-sd-conf bacula-fd-conf bacula-default-configs.patch bacula-dir-conf bacula-gnomesu2gksu.diff
Date: Thu, 11 Oct 2007 00:22:52
Message-Id: E1Iflfh-00034f-N3@stork.gentoo.org
1 wschlich 07/10/11 00:13:01
2
3 Added: bacula-sd-init bacula-all-init bacula-fd-init
4 bacula-dir-init bacula-all-conf bacula-sd-conf
5 bacula-fd-conf bacula-default-configs.patch
6 bacula-dir-conf bacula-gnomesu2gksu.diff
7 Log:
8 version bump wrt bug #188477
9 (Portage version: 2.1.3.7)
10
11 Revision Changes Path
12 1.1 app-backup/bacula/files/2.2.4/bacula-sd-init
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-init?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-init?rev=1.1&content-type=text/plain
16
17 Index: bacula-sd-init
18 ===================================================================
19 #!/sbin/runscript
20 # Copyright 1999-2007 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-init,v 1.1 2007/10/11 00:13:01 wschlich Exp $
23
24 depend() {
25 need net
26 use dns
27 }
28
29 start() {
30 ebegin "Starting bacula storage daemon"
31 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
32 -- ${SD_OPTIONS}
33 eend $?
34 }
35
36 stop() {
37 ebegin "Stopping bacula storage daemon"
38 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid
39 eend $?
40 }
41
42
43
44 1.1 app-backup/bacula/files/2.2.4/bacula-all-init
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-init?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-init?rev=1.1&content-type=text/plain
48
49 Index: bacula-all-init
50 ===================================================================
51 #!/sbin/runscript
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-init,v 1.1 2007/10/11 00:13:01 wschlich Exp $
55
56 depend() {
57 need net
58 if [ ${LOCAL_DB} -eq 1 ]; then
59 need "%database%"
60 fi
61 use dns
62 }
63
64 start() {
65 local retval
66 declare -i retval=0
67 for s in ${SERVICES} ; do
68 case ${s} in
69 sd)
70 ebegin "Starting bacula storage daemon"
71 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \
72 -- ${SD_OPTIONS}
73 let retval+=$?
74 ;;
75 fd)
76 ebegin "Starting bacula file daemon"
77 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
78 -- ${FD_OPTIONS}
79 let retval+=$?
80 ;;
81 dir)
82 ebegin "Starting bacula director"
83 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
84 -- ${DIR_OPTIONS}
85 let retval+=$?
86 ;;
87 *)
88 eerror "Unrecognized service found in SERVICES: '${s}'"
89 ;;
90 esac
91 done
92 eend ${retval}
93 }
94
95 stop() {
96 local retval
97 declare -i retval=0
98 for s in ${SERVICES} ; do
99 case ${s} in
100 sd)
101 ebegin "Stopping bacula storage daemon"
102 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid
103 let retval+=$?
104 ;;
105 fd)
106 ebegin "Stopping bacula file daemon"
107 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
108 let retval+=$?
109 ;;
110 dir)
111 ebegin "Stopping bacula director"
112 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
113 let retval+=$?
114 ;;
115 *)
116 eerror "Unrecognized service found in SERVICES: '${s}'"
117 ;;
118 esac
119 done
120 eend ${retval}
121 }
122
123
124
125 1.1 app-backup/bacula/files/2.2.4/bacula-fd-init
126
127 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-init?rev=1.1&view=markup
128 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-init?rev=1.1&content-type=text/plain
129
130 Index: bacula-fd-init
131 ===================================================================
132 #!/sbin/runscript
133 # Copyright 1999-2007 Gentoo Foundation
134 # Distributed under the terms of the GNU General Public License v2
135 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-init,v 1.1 2007/10/11 00:13:01 wschlich Exp $
136
137 depend() {
138 need net
139 use dns
140 }
141
142 start() {
143 ebegin "Starting bacula file daemon"
144 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
145 -- ${FD_OPTIONS}
146 eend $?
147 }
148
149 stop() {
150 ebegin "Stopping bacula file daemon"
151 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
152 eend $?
153 }
154
155
156
157 1.1 app-backup/bacula/files/2.2.4/bacula-dir-init
158
159 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-init?rev=1.1&view=markup
160 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-init?rev=1.1&content-type=text/plain
161
162 Index: bacula-dir-init
163 ===================================================================
164 #!/sbin/runscript
165 # Copyright 1999-2007 Gentoo Foundation
166 # Distributed under the terms of the GNU General Public License v2
167 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-init,v 1.1 2007/10/11 00:13:01 wschlich Exp $
168
169 depend() {
170 need net
171 if [ ${LOCAL_DB} -eq 1 ]; then
172 need "%database%"
173 fi
174 use dns
175 }
176
177 start() {
178 ebegin "Starting bacula director"
179 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
180 -- ${DIR_OPTIONS}
181 eend $?
182 }
183
184 stop() {
185 ebegin "Stopping bacula director"
186 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
187 eend $?
188 }
189
190
191
192 1.1 app-backup/bacula/files/2.2.4/bacula-all-conf
193
194 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-conf?rev=1.1&view=markup
195 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-conf?rev=1.1&content-type=text/plain
196
197 Index: bacula-all-conf
198 ===================================================================
199 # Copyright 1999-2007 Gentoo Foundation
200 # Distributed under the terms of the GNU General Public License v2
201 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-all-conf,v 1.1 2007/10/11 00:13:01 wschlich Exp $
202
203 # Config file for /etc/init.d/bacula
204
205 # Add the daemons you want to run:
206 # dir - Director (Master Control Program)
207 # fd - File Daemon (Client)
208 # sd - Storage Daemon
209 SERVICES="%services%"
210
211 # If the database server where you store your bacula catalog
212 # is on a different machine, please set this to 0.
213 LOCAL_DB=1
214
215 # Options for each daemon.
216 # The DIR and SD can be run as a non-root user, however
217 # please ensure that this user has proper permissions to
218 # access your backup devices.
219 SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
220 FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
221 DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
222
223
224
225 1.1 app-backup/bacula/files/2.2.4/bacula-sd-conf
226
227 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-conf?rev=1.1&view=markup
228 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-conf?rev=1.1&content-type=text/plain
229
230 Index: bacula-sd-conf
231 ===================================================================
232 # Copyright 1999-2007 Gentoo Foundation
233 # Distributed under the terms of the GNU General Public License v2
234 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-sd-conf,v 1.1 2007/10/11 00:13:01 wschlich Exp $
235
236 # Config file for /etc/init.d/bacula-sd
237
238 # Options for the storage daemon.
239 # The SD can be run as a non-root user, however
240 # please ensure that this user has proper permissions to
241 # access your backup devices.
242 SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
243
244
245
246 1.1 app-backup/bacula/files/2.2.4/bacula-fd-conf
247
248 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-conf?rev=1.1&view=markup
249 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-conf?rev=1.1&content-type=text/plain
250
251 Index: bacula-fd-conf
252 ===================================================================
253 # Copyright 1999-2007 Gentoo Foundation
254 # Distributed under the terms of the GNU General Public License v2
255 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-fd-conf,v 1.1 2007/10/11 00:13:01 wschlich Exp $
256
257 # Config file for /etc/init.d/bacula-fd
258
259 # Options for the file director.
260 FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
261
262
263
264 1.1 app-backup/bacula/files/2.2.4/bacula-default-configs.patch
265
266 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-default-configs.patch?rev=1.1&view=markup
267 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-default-configs.patch?rev=1.1&content-type=text/plain
268
269 Index: bacula-default-configs.patch
270 ===================================================================
271 --- console/console.c 2007-08-11 23:50:20.000000000 +0200
272 +++ console/console.c 2007-06-09 11:25:27.000000000 +0200
273 @@ -105,7 +105,7 @@
274 static int execcmd(FILE *input, BSOCK *UA_sock);
275
276
277 -#define CONFIG_FILE "bconsole.conf" /* default configuration file */
278 +#define CONFIG_FILE "/etc/bacula/bconsole.conf" /* default configuration file */
279
280 static void usage()
281 {
282 --- dird/dird.c 2007-08-11 23:49:40.000000000 +0200
283 +++ dird/dird.c 2007-06-07 16:46:43.000000000 +0200
284 @@ -85,7 +85,7 @@
285 extern URES res_all;
286 #endif
287
288 -#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
289 +#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
290
291 static void usage()
292 {
293 --- filed/filed.c 2007-08-11 23:51:18.000000000 +0200
294 +++ filed/filed.c 2007-06-07 16:46:43.000000000 +0200
295 @@ -50,7 +50,7 @@
296 void *start_heap;
297
298
299 -#define CONFIG_FILE "bacula-fd.conf" /* default config file */
300 +#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
301
302 char *configfile = NULL;
303 static bool foreground = false;
304 --- gnome2-console/console.c 2007-08-11 23:50:45.000000000 +0200
305 +++ gnome2-console/console.c 2007-06-07 16:46:43.000000000 +0200
306 @@ -93,7 +93,7 @@
307 static guint initial;
308 static int numdir = 0;
309
310 -#define CONFIG_FILE "./bgnome-console.conf" /* default configuration file */
311 +#define CONFIG_FILE "/etc/bacula/bgnome-console.conf" /* default configuration file */
312
313 static void usage()
314 {
315 --- qt-console/main.cpp 2007-08-11 23:55:10.000000000 +0200
316 +++ qt-console/main.cpp 2007-06-07 16:46:43.000000000 +0200
317 @@ -46,7 +46,7 @@
318 static void usage();
319 static int check_resources();
320
321 -#define CONFIG_FILE "./bat.conf" /* default configuration file */
322 +#define CONFIG_FILE "/etc/bacula/bat.conf" /* default configuration file */
323
324 /* Static variables */
325 static char *configfile = NULL;
326 --- stored/bcopy.c 2007-08-11 23:54:48.000000000 +0200
327 +++ stored/bcopy.c 2007-06-07 16:46:43.000000000 +0200
328 @@ -57,7 +57,7 @@
329 static uint32_t jobs = 0;
330 static DEV_BLOCK *out_block;
331
332 -#define CONFIG_FILE "bacula-sd.conf"
333 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
334 char *configfile = NULL;
335 STORES *me = NULL; /* our Global resource */
336 bool forge_on = false; /* proceed inspite of I/O errors */
337 --- stored/bextract.c 2007-08-11 23:45:44.000000000 +0200
338 +++ stored/bextract.c 2007-06-07 16:46:43.000000000 +0200
339 @@ -64,7 +64,7 @@
340 static uint32_t wsize; /* write size */
341 static uint64_t fileAddr = 0; /* file write address */
342
343 -#define CONFIG_FILE "bacula-sd.conf"
344 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
345 char *configfile = NULL;
346 STORES *me = NULL; /* our Global resource */
347 bool forge_on = false;
348 --- stored/bls.c 2007-08-11 23:46:05.000000000 +0200
349 +++ stored/bls.c 2007-06-07 16:46:43.000000000 +0200
350 @@ -59,7 +59,7 @@
351 static uint32_t num_files = 0;
352 static ATTR *attr;
353
354 -#define CONFIG_FILE "bacula-sd.conf"
355 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
356 char *configfile = NULL;
357 STORES *me = NULL; /* our Global resource */
358 bool forge_on = false;
359 --- stored/bscan.c 2007-08-11 23:46:26.000000000 +0200
360 +++ stored/bscan.c 2007-06-18 21:29:26.000000000 +0200
361 @@ -100,7 +100,7 @@
362 static int num_media = 0;
363 static int num_files = 0;
364
365 -#define CONFIG_FILE "bacula-sd.conf"
366 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
367 char *configfile = NULL;
368 STORES *me = NULL; /* our Global resource */
369 bool forge_on = false; /* proceed inspite of I/O errors */
370 --- stored/btape.c 2007-08-11 23:46:59.000000000 +0200
371 +++ stored/btape.c 2007-06-07 16:46:43.000000000 +0200
372 @@ -98,7 +98,7 @@
373
374
375 /* Static variables */
376 -#define CONFIG_FILE "bacula-sd.conf"
377 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
378 char *configfile = NULL;
379
380 #define MAX_CMD_ARGS 30
381 --- stored/stored.c 2007-08-11 23:54:32.000000000 +0200
382 +++ stored/stored.c 2007-06-23 11:58:34.000000000 +0200
383 @@ -52,7 +52,7 @@
384
385 extern "C" void *device_initialization(void *arg);
386
387 -#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
388 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf" /* Default config file */
389
390 /* Global variables exported */
391 char OK_msg[] = "3000 OK\n";
392 --- tray-monitor/tray-monitor.c 2007-08-11 23:49:13.000000000 +0200
393 +++ tray-monitor/tray-monitor.c 2007-06-07 16:46:43.000000000 +0200
394 @@ -104,7 +104,7 @@
395
396 PangoFontDescription *font_desc = NULL;
397
398 -#define CONFIG_FILE "./tray-monitor.conf" /* default configuration file */
399 +#define CONFIG_FILE "/etc/bacula/tray-monitor.conf" /* default configuration file */
400
401 static void usage()
402 {
403
404
405
406 1.1 app-backup/bacula/files/2.2.4/bacula-dir-conf
407
408 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-conf?rev=1.1&view=markup
409 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-conf?rev=1.1&content-type=text/plain
410
411 Index: bacula-dir-conf
412 ===================================================================
413 # Copyright 1999-2007 Gentoo Foundation
414 # Distributed under the terms of the GNU General Public License v2
415 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-dir-conf,v 1.1 2007/10/11 00:13:01 wschlich Exp $
416
417 # Config file for /etc/init.d/bacula-dir
418
419 # If the database server where you store your bacula catalog
420 # is on a different machine, please set this to 0.
421 LOCAL_DB=1
422
423 # Options for the director daemon.
424 # The DIR can be run as a non-root user, however
425 # please ensure that this user has proper permissions to
426 # access your backup devices.
427 DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
428
429
430
431 1.1 app-backup/bacula/files/2.2.4/bacula-gnomesu2gksu.diff
432
433 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-gnomesu2gksu.diff?rev=1.1&view=markup
434 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.2.4/bacula-gnomesu2gksu.diff?rev=1.1&content-type=text/plain
435
436 Index: bacula-gnomesu2gksu.diff
437 ===================================================================
438 diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in
439 --- bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in 2007-04-18 19:06:43.000000000 +0200
440 +++ bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in 2007-10-10 23:34:42.000000000 +0200
441 @@ -2,7 +2,7 @@
442 Name=Bacula Console
443 Comment=Bacula Director Console
444 Icon=/usr/share/pixmaps/bacula.png
445 -Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
446 +Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
447 Terminal=false
448 Type=Application
449 Encoding=UTF-8
450 diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in
451 --- bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in 2007-04-18 19:06:43.000000000 +0200
452 +++ bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in 2007-10-10 23:32:44.000000000 +0200
453 @@ -2,7 +2,7 @@
454 Name=Bacula Console
455 Comment=Bacula Director Console
456 Icon=/usr/share/pixmaps/bacula.png
457 -Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
458 +Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
459 Terminal=false
460 Type=Application
461 Encoding=UTF-8
462 diff -urN bacula-2.2.4.orig/scripts/bat.desktop.xsu.in bacula-2.2.4/scripts/bat.desktop.xsu.in
463 --- bacula-2.2.4.orig/scripts/bat.desktop.xsu.in 2007-04-29 15:48:18.000000000 +0200
464 +++ bacula-2.2.4/scripts/bat.desktop.xsu.in 2007-10-10 23:33:57.000000000 +0200
465 @@ -2,7 +2,7 @@
466 Name=Bacula Administration Tool
467 Comment=Bacula Director Console
468 Icon=/usr/share/pixmaps/bat_icon.png
469 -Exec=gnomesu -t "Query" -c "@sbindir@/bat -c @sysconfdir@/bat.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
470 +Exec=gksu -u root -m 'Bacula Administration Tool needs to be run with superuser privileges' "@sbindir@/bat -c @sysconfdir@/bat.conf"
471 Terminal=false
472 Type=Application
473 Encoding=UTF-8
474 diff -urN bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in bacula-2.2.4/scripts/wxconsole.desktop.xsu.in
475 --- bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in 2007-04-29 15:11:37.000000000 +0200
476 +++ bacula-2.2.4/scripts/wxconsole.desktop.xsu.in 2007-10-10 23:34:06.000000000 +0200
477 @@ -2,7 +2,7 @@
478 Name=Bacula WX Console
479 Comment=Bacula Director Console
480 Icon=/usr/share/pixmaps/wxwin16x16.xpm
481 -Exec=gnomesu -t "Query" -c "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf" -d -e -m "In order to run the bacula wx console as root, ^additional information is required."
482 +Exec=gksu -u root -m 'Bacula WX Console needs to be run with superuser privileges' "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf"
483 Terminal=false
484 Type=Application
485 Encoding=UTF-8
486
487
488
489 --
490 gentoo-commits@g.o mailing list