bacula/bacula.patch

Sun, 03 Apr 2011 13:34:55 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sun, 03 Apr 2011 13:34:55 +0200
changeset 337
f71e028eb3e2
parent 213
117704011216
child 577
e3c6a8f912f4
permissions
-rw-r--r--

Correct and improve several packaging aspects including...
Correct datadir path for python modules, correct jar(1) path for
building libgcj classes, strip libexecdir path of version numbers,
improve name of oblbld build path, clean whitespace from as(1) and
ld(1) GNU detection, remove seemingly discarded '--with-local-prefix'
configure argument, and correct hardcoded lto plugin libtool archive
dependency information.

Most importantly, correct IA32 architecture detection logic in
config.gcc to correctly emit SSE2 instructions conditionally, leading
to the removal of all '-march' bootstrap options and replacement with
unconditional (for IA32/AMD64) '-mtune=native' options. Comments and
buildtime warnings are corrected appropriately. In theory these changes
cause a more portable, orthoganal, and optimal bootstrap to be built.

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

mercurial