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