• file
• revisions
• annotate
• diff
• comparison
• raw

bacula/bacula.patch@f4a0b439d0fb (annotated)

bacula/bacula.patch

Fri, 15 Oct 2010 19:06:09 +0200

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Fri, 15 Oct 2010 19:06:09 +0200

changeset 263

f4a0b439d0fb

parent 213

117704011216

child 577

e3c6a8f912f4

permissions

-rw-r--r--

Correct shared library and plugin link logic, as well as informal text.
Update file server URL, update build resource estimations, correct RPATH
logic, allow for qmake(1) static to shared library changes via CONFIG
argument, correct documentation broken title and index links, correct
shared library install path, install only one set of (correct) plugins,
install the designer shared library (as required by QtCreator), announce
features related to shared linking using qmake(1), and correclty
substitute hard coded paths in prl and la library files.

michael@20	1	Index: manpages/Makefile.in
michael@21	2	diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
michael@21	3	--- manpages/Makefile.in.orig 2007-04-24 17:47:01.000000000 +0200
michael@21	4	+++ manpages/Makefile.in 2008-11-19 22:55:01.066689027 +0100
michael@20	5	@@ -20,23 +20,21 @@
michael@20	6	install:
michael@20	7	$(MKDIR) $(DESTDIR)/$(mandir)/man8
michael@20	8	for I in ${MAN8}; \
michael@20	9	- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
michael@20	10	- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
michael@20	11	- rm -f $$I.gz); \
michael@20	12	+ do \
michael@20	13	+ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
michael@20	14	done
michael@20	15	$(MKDIR) $(DESTDIR)/$(mandir)/man1
michael@20	16	for I in ${MAN1}; \
michael@20	17	- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
michael@20	18	- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
michael@20	19	- rm -f $$I.gz); \
michael@20	20	+ do \
michael@20	21	+ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
michael@20	22	done
michael@20	23
michael@20	24	uninstall:
michael@20	25	for I in ${MAN8}; \
michael@20	26	- do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
michael@20	27	+ do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
michael@20	28	done
michael@20	29	for I in ${MAN1}; \
michael@20	30	- do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
michael@20	31	+ do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
michael@20	32	done
michael@20	33
michael@220	34	clean:
michael@20	35	Index: scripts/bacula.in
michael@21	36	diff -Nau scripts/bacula.in.orig scripts/bacula.in
michael@220	37	--- scripts/bacula.in.orig 2008-07-24 17:02:06.000000000 +0200
michael@220	38	+++ scripts/bacula.in 2009-09-17 00:40:53.423969596 +0200
michael@220	39	@@ -13,37 +13,43 @@
michael@21	40	# easier to "steal" this code for the development
michael@21	41	# environment where they are different.
michael@20	42	#
michael@21	43	-SCRIPTDIR=@scriptdir@
michael@21	44	+SCRIPTDIR=@libexecdir@
michael@220	45	#
michael@220	46	# Disable Glibc malloc checks, it doesn't help and it keeps from getting
michael@220	47	# good dumps
michael@220	48	MALLOC_CHECK_=0
michael@220	49	export MALLOC_CHECK_
michael@20	50
michael@21	51	-case "$1" in
michael@20	52	+action=$1
michael@20	53	+debug=$2
michael@20	54	+[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
michael@20	55	+[ -n "$4" ] && enable_sd=$4 || enable_sd=yes
michael@20	56	+[ -n "$5" ] && enable_fd=$5 || enable_fd=yes
michael@21	57	+
michael@21	58	+case "$action" in
michael@20	59	start)
michael@20	60	- [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@20	61	- [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20	62	- [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@21	63	+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@21	64	+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20	65	+ [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@20	66	;;
michael@20	67
michael@20	68	stop)
michael@20	69	# Stop the FD first so that SD will fail jobs and update catalog
michael@20	70	- [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20	71	- [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@20	72	- [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@220	73	+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@213	74	+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20	75	+ [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@20	76	;;
michael@20	77
michael@20	78	restart)
michael@20	79	- $0 stop
michael@213	80	+ $0 stop $debug $enable_dir $enable_sd $enable_fd
michael@20	81	sleep 2
michael@20	82	- $0 start
michael@20	83	+ $0 start $debug $enable_dir $enable_sd $enable_fd
michael@20	84	;;
michael@20	85
michael@20	86	status)
michael@20	87	- [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
michael@20	88	- [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
michael@20	89	- [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
michael@21	90	+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
michael@21	91	+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
michael@20	92	+ [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
michael@20	93	;;
michael@20	94
michael@20	95	*)
michael@20	96	Index: scripts/btraceback.in
michael@21	97	diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
michael@21	98	--- scripts/btraceback.in.orig 2008-06-01 10:49:00.000000000 +0200
michael@21	99	+++ scripts/btraceback.in 2008-11-19 23:09:44.305993544 +0100
michael@142	100	@@ -13,6 +13,9 @@
michael@142	101	WD="@working_dir@"
michael@20	102	if test `uname -s` = SunOS ; then
michael@142	103	gcore -o ${WD}/${PNAME} $2
michael@20	104	+fi
michael@20	105	+if test `uname -s` = SunOS &&
michael@20	106	+ test -n `which dbx 2>/dev/null` ; then
michael@142	107	dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1
michael@142	108	cat ${WD}/bacula.$$.traceback \
michael@20	109	| @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
michael@20	110	Index: src/dird/bacula-dir.conf.in
michael@21	111	diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
michael@220	112	--- src/dird/bacula-dir.conf.in.orig 2009-07-15 19:05:40.000000000 +0200
michael@220	113	+++ src/dird/bacula-dir.conf.in 2009-09-17 00:45:04.055970595 +0200
michael@20	114	@@ -29,7 +29,8 @@
michael@20	115	Level = Incremental
michael@220	116	Client = @basename@-fd
michael@20	117	FileSet = "Full Set"
michael@20	118	- Schedule = "WeeklyCycle"
michael@20	119	+ #Schedule = "WeeklyCycle"
michael@20	120	+ Schedule = "NEVER"
michael@20	121	Storage = File
michael@20	122	Messages = Standard
michael@20	123	Pool = Default
michael@20	124	@@ -109,7 +110,7 @@
michael@20	125	# directory to give a reasonable FileSet to backup to
michael@20	126	# disk storage during initial testing.
michael@20	127	#
michael@220	128	- File = @sbindir@
michael@20	129	+ File = @scriptdir@
michael@20	130	}
michael@20	131
michael@20	132	#
michael@220	133	@@ -126,6 +127,11 @@
michael@20	134	}
michael@20	135	}
michael@20	136
michael@20	137	+# This schedule can be used to disable automatic scheduling
michael@20	138	+Schedule {
michael@20	139	+ Name = NEVER
michael@20	140	+}
michael@20	141	+
michael@20	142	#
michael@20	143	# When to do the backups, full backup on first sunday of the month,
michael@20	144	# differential (i.e. incremental since full) every other sunday,