OpenPKG Specs: bacula/bacula.patch@a2c6460cfb16

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

     1 Index: manpages/Makefile.in

     2 diff -Nau manpages/Makefile.in.orig manpages/Makefile.in

     3 --- manpages/Makefile.in.orig	2010-08-05 16:29:51.000000000 +0200

     4 +++ manpages/Makefile.in	2010-12-19 19:30:06.000000000 +0100

     5 @@ -21,23 +21,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	2010-08-05 16:29:51.000000000 +0200

    38 +++ scripts/bacula.in	2010-12-19 19:30:06.000000000 +0100

    39 @@ -14,36 +14,43 @@

    40  #  environment where they are different.

    41  #

    42  SCRIPTDIR=@scriptdir@

    43 -#

    44 +

    45  # Disable Glibc malloc checks, it doesn't help and it keeps from getting

    46  #   good dumps

    47 +#

    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: src/dird/bacula-dir.conf.in

    97 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in

    98 --- src/dird/bacula-dir.conf.in.orig	2010-08-05 16:29:51.000000000 +0200

    99 +++ src/dird/bacula-dir.conf.in	2010-12-19 19:30:06.000000000 +0100

   100    Level = Incremental

   101    Client = @basename@-fd

   102    FileSet = "Full Set"

   103 -  Schedule = "WeeklyCycle"

   104 + #Schedule = "WeeklyCycle"

   105 +  Schedule = "NEVER"

   106    Storage = File

   107    Messages = Standard

   108    Pool = File

   109 @@ -106,7 +107,7 @@

   110  #    directory to give a reasonable FileSet to backup to

   111  #    disk storage during initial testing.

   112  #

   113 -    File = @sbindir@

   114 +    File = @scriptdir@

   115    }

   117  #

   118 @@ -123,6 +124,11 @@

   119    }

   120  }

   122 +# This schedule can be used to disable automatic scheduling

   123 +Schedule {

   124 +  Name = NEVER

   125 +}

   126 +

   127  #

   128  # When to do the backups, full backup on first sunday of the month,

   129  #  differential (i.e. incremental since full) every other sunday,

OpenPKG Specs / file revision