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.4.2: bacula-sd-init bacula-dir-conf bacula-fd-conf bacula-dir-init bacula-sd-conf bacula-fd-init bacula-default-configs.patch bacula-gnomesu2gksu.diff
Date: Tue, 29 Jul 2008 12:00:51
Message-Id: E1KNnsl-0003mt-HQ@stork.gentoo.org
1 wschlich 08/07/29 12:00:47
2
3 Added: bacula-sd-init bacula-dir-conf bacula-fd-conf
4 bacula-dir-init bacula-sd-conf bacula-fd-init
5 bacula-default-configs.patch
6 bacula-gnomesu2gksu.diff
7 Log:
8 version bump
9 (Portage version: 2.1.5.6)
10
11 Revision Changes Path
12 1.1 app-backup/bacula/files/2.4.2/bacula-sd-init
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-sd-init?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-sd-init?rev=1.1&content-type=text/plain
16
17 Index: bacula-sd-init
18 ===================================================================
19 #!/sbin/runscript
20 # Copyright 1999-2008 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.4.2/bacula-sd-init,v 1.1 2008/07/29 12:00:46 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.4.2/bacula-dir-conf
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-conf?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-conf?rev=1.1&content-type=text/plain
48
49 Index: bacula-dir-conf
50 ===================================================================
51 # Copyright 1999-2008 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-conf,v 1.1 2008/07/29 12:00:46 wschlich Exp $
54
55 # Config file for /etc/init.d/bacula-dir
56
57 # If the database server where you store your bacula catalog
58 # is on a different machine, please set this to 0.
59 LOCAL_DB=1
60
61 # Options for the director daemon.
62 # The DIR can be run as a non-root user, however
63 # please ensure that this user has proper permissions to
64 # access your backup devices.
65 DIR_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-dir.conf"
66
67
68
69 1.1 app-backup/bacula/files/2.4.2/bacula-fd-conf
70
71 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-conf?rev=1.1&view=markup
72 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-conf?rev=1.1&content-type=text/plain
73
74 Index: bacula-fd-conf
75 ===================================================================
76 # Copyright 1999-2008 Gentoo Foundation
77 # Distributed under the terms of the GNU General Public License v2
78 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-conf,v 1.1 2008/07/29 12:00:46 wschlich Exp $
79
80 # Config file for /etc/init.d/bacula-fd
81
82 # Options for the file daemon.
83 FD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-fd.conf"
84
85
86
87 1.1 app-backup/bacula/files/2.4.2/bacula-dir-init
88
89 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-init?rev=1.1&view=markup
90 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-init?rev=1.1&content-type=text/plain
91
92 Index: bacula-dir-init
93 ===================================================================
94 #!/sbin/runscript
95 # Copyright 1999-2008 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-dir-init,v 1.1 2008/07/29 12:00:46 wschlich Exp $
98
99 depend() {
100 need net
101 if [ "${LOCAL_DB}" -eq 1 ]; then
102 need "%database%"
103 fi
104 use dns bacula-fd bacula-sd
105 }
106
107 start() {
108 ebegin "Starting bacula director"
109 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \
110 -- ${DIR_OPTIONS}
111 eend $?
112 }
113
114 stop() {
115 ebegin "Stopping bacula director"
116 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid
117 eend $?
118 }
119
120
121
122 1.1 app-backup/bacula/files/2.4.2/bacula-sd-conf
123
124 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-sd-conf?rev=1.1&view=markup
125 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-sd-conf?rev=1.1&content-type=text/plain
126
127 Index: bacula-sd-conf
128 ===================================================================
129 # Copyright 1999-2008 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-sd-conf,v 1.1 2008/07/29 12:00:46 wschlich Exp $
132
133 # Config file for /etc/init.d/bacula-sd
134
135 # Options for the storage daemon.
136 # The SD can be run as a non-root user, however
137 # please ensure that this user has proper permissions to
138 # access your backup devices.
139 SD_OPTIONS="-u root -g bacula -c /etc/bacula/bacula-sd.conf"
140
141
142
143 1.1 app-backup/bacula/files/2.4.2/bacula-fd-init
144
145 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-init?rev=1.1&view=markup
146 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-init?rev=1.1&content-type=text/plain
147
148 Index: bacula-fd-init
149 ===================================================================
150 #!/sbin/runscript
151 # Copyright 1999-2008 Gentoo Foundation
152 # Distributed under the terms of the GNU General Public License v2
153 # $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-fd-init,v 1.1 2008/07/29 12:00:46 wschlich Exp $
154
155 depend() {
156 need net
157 use dns
158 }
159
160 start() {
161 ebegin "Starting bacula file daemon"
162 start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \
163 -- ${FD_OPTIONS}
164 eend $?
165 }
166
167 stop() {
168 ebegin "Stopping bacula file daemon"
169 start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid
170 eend $?
171 }
172
173
174
175 1.1 app-backup/bacula/files/2.4.2/bacula-default-configs.patch
176
177 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-default-configs.patch?rev=1.1&view=markup
178 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-default-configs.patch?rev=1.1&content-type=text/plain
179
180 Index: bacula-default-configs.patch
181 ===================================================================
182 --- console/console.c 2008-08-11 23:50:20.000000000 +0200
183 +++ console/console.c 2008-06-09 11:25:27.000000000 +0200
184 @@ -105,7 +105,7 @@
185 static int execcmd(FILE *input, BSOCK *UA_sock);
186
187
188 -#define CONFIG_FILE "bconsole.conf" /* default configuration file */
189 +#define CONFIG_FILE "/etc/bacula/bconsole.conf" /* default configuration file */
190
191 static void usage()
192 {
193 --- dird/dird.c 2008-08-11 23:49:40.000000000 +0200
194 +++ dird/dird.c 2008-06-07 16:46:43.000000000 +0200
195 @@ -85,7 +85,7 @@
196 extern URES res_all;
197 #endif
198
199 -#define CONFIG_FILE "bacula-dir.conf" /* default configuration file */
200 +#define CONFIG_FILE "/etc/bacula/bacula-dir.conf" /* default configuration file */
201
202 static void usage()
203 {
204 --- filed/filed.c 2008-08-11 23:51:18.000000000 +0200
205 +++ filed/filed.c 2008-06-07 16:46:43.000000000 +0200
206 @@ -50,7 +50,7 @@
207 void *start_heap;
208
209
210 -#define CONFIG_FILE "bacula-fd.conf" /* default config file */
211 +#define CONFIG_FILE "/etc/bacula/bacula-fd.conf" /* default config file */
212
213 char *configfile = NULL;
214 static bool foreground = false;
215 --- gnome2-console/console.c 2008-08-11 23:50:45.000000000 +0200
216 +++ gnome2-console/console.c 2008-06-07 16:46:43.000000000 +0200
217 @@ -93,7 +93,7 @@
218 static guint initial;
219 static int numdir = 0;
220
221 -#define CONFIG_FILE "./bgnome-console.conf" /* default configuration file */
222 +#define CONFIG_FILE "/etc/bacula/bgnome-console.conf" /* default configuration file */
223
224 static void usage()
225 {
226 --- qt-console/main.cpp 2008-08-11 23:55:10.000000000 +0200
227 +++ qt-console/main.cpp 2008-06-07 16:46:43.000000000 +0200
228 @@ -46,7 +46,7 @@
229 static void usage();
230 static int check_resources();
231
232 -#define CONFIG_FILE "./bat.conf" /* default configuration file */
233 +#define CONFIG_FILE "/etc/bacula/bat.conf" /* default configuration file */
234
235 /* Static variables */
236 static char *configfile = NULL;
237 --- stored/bcopy.c 2008-08-11 23:54:48.000000000 +0200
238 +++ stored/bcopy.c 2008-06-07 16:46:43.000000000 +0200
239 @@ -57,7 +57,7 @@
240 static uint32_t jobs = 0;
241 static DEV_BLOCK *out_block;
242
243 -#define CONFIG_FILE "bacula-sd.conf"
244 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
245 char *configfile = NULL;
246 STORES *me = NULL; /* our Global resource */
247 bool forge_on = false; /* proceed inspite of I/O errors */
248 --- stored/bextract.c 2008-08-11 23:45:44.000000000 +0200
249 +++ stored/bextract.c 2008-06-07 16:46:43.000000000 +0200
250 @@ -64,7 +64,7 @@
251 static uint32_t wsize; /* write size */
252 static uint64_t fileAddr = 0; /* file write address */
253
254 -#define CONFIG_FILE "bacula-sd.conf"
255 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
256 char *configfile = NULL;
257 STORES *me = NULL; /* our Global resource */
258 bool forge_on = false;
259 --- stored/bls.c 2008-08-11 23:46:05.000000000 +0200
260 +++ stored/bls.c 2008-06-07 16:46:43.000000000 +0200
261 @@ -59,7 +59,7 @@
262 static uint32_t num_files = 0;
263 static ATTR *attr;
264
265 -#define CONFIG_FILE "bacula-sd.conf"
266 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
267 char *configfile = NULL;
268 STORES *me = NULL; /* our Global resource */
269 bool forge_on = false;
270 --- stored/bscan.c 2008-08-11 23:46:26.000000000 +0200
271 +++ stored/bscan.c 2008-06-18 21:29:26.000000000 +0200
272 @@ -100,7 +100,7 @@
273 static int num_media = 0;
274 static int num_files = 0;
275
276 -#define CONFIG_FILE "bacula-sd.conf"
277 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
278 char *configfile = NULL;
279 STORES *me = NULL; /* our Global resource */
280 bool forge_on = false; /* proceed inspite of I/O errors */
281 --- stored/btape.c 2008-08-11 23:46:59.000000000 +0200
282 +++ stored/btape.c 2008-06-07 16:46:43.000000000 +0200
283 @@ -98,7 +98,7 @@
284
285
286 /* Static variables */
287 -#define CONFIG_FILE "bacula-sd.conf"
288 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf"
289 char *configfile = NULL;
290
291 #define MAX_CMD_ARGS 30
292 --- stored/stored.c 2008-08-11 23:54:32.000000000 +0200
293 +++ stored/stored.c 2008-06-23 11:58:34.000000000 +0200
294 @@ -52,7 +52,7 @@
295
296 extern "C" void *device_initialization(void *arg);
297
298 -#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
299 +#define CONFIG_FILE "/etc/bacula/bacula-sd.conf" /* Default config file */
300
301 /* Global variables exported */
302 char OK_msg[] = "3000 OK\n";
303 --- tray-monitor/tray-monitor.c 2008-08-11 23:49:13.000000000 +0200
304 +++ tray-monitor/tray-monitor.c 2008-06-07 16:46:43.000000000 +0200
305 @@ -104,7 +104,7 @@
306
307 PangoFontDescription *font_desc = NULL;
308
309 -#define CONFIG_FILE "./tray-monitor.conf" /* default configuration file */
310 +#define CONFIG_FILE "/etc/bacula/tray-monitor.conf" /* default configuration file */
311
312 static void usage()
313 {
314
315
316
317 1.1 app-backup/bacula/files/2.4.2/bacula-gnomesu2gksu.diff
318
319 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-gnomesu2gksu.diff?rev=1.1&view=markup
320 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/files/2.4.2/bacula-gnomesu2gksu.diff?rev=1.1&content-type=text/plain
321
322 Index: bacula-gnomesu2gksu.diff
323 ===================================================================
324 diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in
325 --- bacula-2.2.4.orig/scripts/bacula.desktop.gnome1.xsu.in 2008-04-18 19:06:43.000000000 +0200
326 +++ bacula-2.2.4/scripts/bacula.desktop.gnome1.xsu.in 2008-10-10 23:34:42.000000000 +0200
327 @@ -2,7 +2,7 @@
328 Name=Bacula Console
329 Comment=Bacula Director Console
330 Icon=/usr/share/pixmaps/bacula.png
331 -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."
332 +Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
333 Terminal=false
334 Type=Application
335 Encoding=UTF-8
336 diff -urN bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in
337 --- bacula-2.2.4.orig/scripts/bacula.desktop.gnome2.xsu.in 2008-04-18 19:06:43.000000000 +0200
338 +++ bacula-2.2.4/scripts/bacula.desktop.gnome2.xsu.in 2008-10-10 23:32:44.000000000 +0200
339 @@ -2,7 +2,7 @@
340 Name=Bacula Console
341 Comment=Bacula Director Console
342 Icon=/usr/share/pixmaps/bacula.png
343 -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."
344 +Exec=gksu -u root -m 'Bacula Console needs to be run with superuser privileges' "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf"
345 Terminal=false
346 Type=Application
347 Encoding=UTF-8
348 diff -urN bacula-2.2.4.orig/scripts/bat.desktop.xsu.in bacula-2.2.4/scripts/bat.desktop.xsu.in
349 --- bacula-2.2.4.orig/scripts/bat.desktop.xsu.in 2008-04-29 15:48:18.000000000 +0200
350 +++ bacula-2.2.4/scripts/bat.desktop.xsu.in 2008-10-10 23:33:57.000000000 +0200
351 @@ -2,7 +2,7 @@
352 Name=Bacula Administration Tool
353 Comment=Bacula Director Console
354 Icon=/usr/share/pixmaps/bat_icon.png
355 -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."
356 +Exec=gksu -u root -m 'Bacula Administration Tool needs to be run with superuser privileges' "@sbindir@/bat -c @sysconfdir@/bat.conf"
357 Terminal=false
358 Type=Application
359 Encoding=UTF-8
360 diff -urN bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in bacula-2.2.4/scripts/wxconsole.desktop.xsu.in
361 --- bacula-2.2.4.orig/scripts/wxconsole.desktop.xsu.in 2008-04-29 15:11:37.000000000 +0200
362 +++ bacula-2.2.4/scripts/wxconsole.desktop.xsu.in 2008-10-10 23:34:06.000000000 +0200
363 @@ -2,7 +2,7 @@
364 Name=Bacula WX Console
365 Comment=Bacula Director Console
366 Icon=/usr/share/pixmaps/wxwin16x16.xpm
367 -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."
368 +Exec=gksu -u root -m 'Bacula WX Console needs to be run with superuser privileges' "@sbindir@/bwx-console -c @sysconfdir@/bwx-console.conf"
369 Terminal=false
370 Type=Application
371 Encoding=UTF-8