From 5ec68eede2c9e697cdfaafc9528b9b016fa4b212 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Tue, 19 Jun 2018 17:27:34 +0200 Subject: [PATCH] release 0.19.0 --- CHANGES | 144 ++++++++++++++++++++++++++++++++++------- COPYRIGHT | 2 +- Makefile.in | 25 ++++--- README.md | 14 ++-- VERSION | 2 +- aclocal.m4 | 38 +++++------ configure | 38 +++++++---- conftools/install-sh | 25 ++++--- conftools/missing | 6 +- doc/znapzendzetup.pod | 19 +----- lib/Makefile.in | 5 +- man/znapzend.1 | 2 +- man/znapzendzetup.1 | 2 +- man/znapzendztatz.1 | 2 +- thirdparty/Makefile.in | 5 +- 15 files changed, 223 insertions(+), 106 deletions(-) diff --git a/CHANGES b/CHANGES index e52b3f1e..d2151f79 100644 --- a/CHANGES +++ b/CHANGES @@ -1,52 +1,138 @@ -commit af533d252c65893c73ec11f8e8d93b7d28b491df +commit 972c74daed1d09b83f88b65483f86ad46a4f4592 +Author: Manuel Oetiker +Date: Fri Jun 15 09:27:00 2018 +0200 + + increasing the buffersize (#361) + + there are warnings from mbuffer: + "mbuffer: warning: high value of number of blocks(10696): increase block size for better performance" + with 256k mbuffer is happy. + +commit 1a4e66aa9dab4f14e0ffb5a92fdf230f82c7dee7 +Author: Randy Wilkey <37119201+rwilkey@users.noreply.github.com> +Date: Mon May 14 22:31:00 2018 -0700 + + changes for macOS Startup (#358) + + These changes are proposed as a solution to issue #356 and maybe issue #322. + + 1. Change znapzend startup behavior to die if no zfs snap or backup sets are found. + 2. Update init directory to add a launchd template and modify README.md to explain use. + 3. Update main README.md to mention XCode command-line tools requirement. + +commit 4b11c69e8c258d11fb51427e9dd92bd2e2e705ca +Author: Jim Klimov +Date: Fri May 11 11:40:50 2018 +0200 + + README.md : Z-spelling + +commit 188541126aee242f6e573b6a52d803b68e134af9 +Author: Phil! Gold +Date: Thu May 10 12:51:52 2018 -0400 + + System V init script. + +commit f274a4afe27515c07992b4f8eab790103f7d7078 +Author: Phil! Gold +Date: Wed May 9 15:24:16 2018 -0400 + + Allow use of /etc/default/znapzend for extra znapzend parameters in init files. + +commit bc68fa11036373854c7ebe04eeaf2cf97f157b0d +Author: Phil! Gold +Date: Wed May 9 15:00:41 2018 -0400 + + Link to RPM spec file. + +commit 1e815a84ead0b52db26bbe59955f4319250248fc +Author: Jim Klimov +Date: Wed May 9 11:09:49 2018 +0200 + + README.md : wrap some long lines + +commit ab776dddacf8ba5a6829bec6e09a79056c96abd4 +Author: Jim Klimov +Date: Tue May 8 11:06:30 2018 +0200 + + znapzend.xml.in : do not go into maintenance if "zfs" coredumps + +commit 1dc773fa61a7a31f5430e210670165234c68ded8 +Author: Jim Klimov +Date: Mon May 7 12:15:09 2018 +0200 + + README.md : Clarify about recursive (no-prune) being a feature in certain point of view + +commit 38cbe9c4063451665d164a607f76262c295414b9 +Author: Jim Klimov +Date: Mon May 7 12:12:38 2018 +0200 + + README.md : Troubleshooting with "znapzendzetup list" + +commit a5e56efc865f372f78e2b607af3d7e745f314951 +Author: Jim Klimov +Date: Sat May 5 14:34:10 2018 +0200 + + znapzendzetup.pod : warn about current lack of support for pruning of recursive configurations + +commit aac8e8017478d351cf3530decfcd4884431d182a +Author: Jim Klimov +Date: Sat May 5 13:30:11 2018 +0200 + + README.md : warn about current lack of support for pruning of recursive configurations + +commit 67ac09d09bd14bdb56f06a44c551d2409be6a81e +Author: Jim Klimov +Date: Sat May 5 13:56:52 2018 +0200 + + Problem: unclear sizing of mbuffer + + Solution: give a ballpark number, address issues #335 and #347 + + Signed-off-by: Jim Klimov + +commit 3f00ce3d8c123460b7c529efebb20d59e7a79693 Author: Jim Klimov Date: Sat May 5 13:38:34 2018 +0200 znapzendzetup.pod : HUP can be sent via SMF refresh or systemctl/upstart reload keywords -commit 578d0d8c9047d8ab109e59f3565c2020cb34cfee +commit d12a47b46832e66170d560c32a1f81fca8513fc2 Author: Jim Klimov Date: Sat May 5 13:33:10 2018 +0200 znapzendzetup.pod : typo fix -commit 70cddb5de524570cf0e29b767f58e50047eefad9 +commit 79d5799b2207e1e91aeabccdf038e95179aac635 Author: Jim Klimov Date: Sat May 5 13:32:59 2018 +0200 znapzendzetup.pod : clarify in help text that SRC and DST are verbatim :) -commit 7d3094df965cc4f71336aaa86b13e35a7f4d9c1f +commit b2dfe67f044c68661cb253d46f1d99796ba8a0c8 +Author: Jim Klimov +Date: Sat May 5 13:31:20 2018 +0200 + + README.md znapzendzetup.pod : note about 64-bit mbuffer + +commit d777eb841482b0cbd0dec67433819b315e142d0d Author: Jim Klimov Date: Sat May 5 13:32:25 2018 +0200 README.md : add a bit of troubleshooting pointers -commit e8901bbff5a308c7667c5d266e06cf829c89b3c5 +commit b2f5ff4fbd277a58b3c4b7a9596bcc9712cff1fe Author: Jim Klimov Date: Sat May 5 13:32:05 2018 +0200 README.md : link to init/README.md -commit 1e1814af915c7c23ae6e136059122cd21317db89 -Author: Jim Klimov -Date: Sat May 5 13:31:20 2018 +0200 - - README.md znapzendzetup.pod : note about 64-bit mbuffer - -commit 960469801d8db8579a760ec05b87e1d2610febca -Author: Jim Klimov -Date: Sat May 5 13:30:11 2018 +0200 - - README.md : warn about current lack of support for pruning of recursive configurations - -commit ba1531645ed0ecf46c6bb4d547505ba3f23a2ac7 +commit bfd5eb578b4b358ffc3c4cd20e0804448e152be4 Author: Jim Klimov -Date: Sat May 5 13:04:56 2018 +0200 +Date: Sat May 5 13:39:44 2018 +0200 - configure.ac + Regenerated autotools files with bootstrap.sh -commit eb418c3670c37daf053be72f3a131b6c72446cdd +commit 7b9556c5d608aebdf32864a9ee649199a93dcc40 Author: Jim Klimov Date: Fri May 4 22:18:46 2018 +0200 @@ -162,6 +248,20 @@ Date: Tue Feb 6 14:14:03 2018 +0000 the respective pre-command returns a non-zero exit code or is killed by a signal. +commit 94105035cf9a9d635b4f2a9d55a367311f9510f1 +Author: Tobias Oetiker +Date: Fri Dec 29 21:52:37 2017 +0100 + + Update README.md + +commit 41deffd297aaf50ac853e4dd11fa15ea0a996bbc +Author: testbird +Date: Thu Dec 28 17:03:15 2017 +0100 + + Update README.md + + https://github.com/oetiker/znapzend/issues/312 + commit a15ab81197bb018cf1e7f8e894ecf74c808d8b30 Author: Dylan Powers Date: Mon Oct 16 16:15:23 2017 -0700 @@ -325,7 +425,7 @@ Date: Mon Dec 19 15:55:34 2016 +0000 Fix trivial typos commit 3d41cdd8871053ce183209ee7f8f0fbd1e3e4db7 -Author: Дмитрий Глушенок +Author: Дмитрий Глушенок Date: Thu Dec 1 15:15:18 2016 +0300 Changed SMF dependency to multi-user diff --git a/COPYRIGHT b/COPYRIGHT index 31840ac9..6f8fd6e2 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -3,7 +3,7 @@ znapzend - A ZFS backup system Copyright by Dominik Hassler, Tobias Oetiker and the other people listed in the AUTHORS file. -2018-04-13 +2018-06-19 All rights reserved. diff --git a/Makefile.in b/Makefile.in index f1d585cd..bc6441ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -100,8 +100,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = init/znapzend.service init/znapzend.upstart \ - init/znapzend.xml +CONFIG_CLEAN_FILES = init/znapzend.service init/znapzend.sysv \ + init/znapzend.upstart init/znapzend.xml \ + init/org.znapzend.plist CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -195,9 +196,12 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/conftools/install-sh \ $(top_srcdir)/conftools/missing \ + $(top_srcdir)/init/org.znapzend.plist.in \ $(top_srcdir)/init/znapzend.service.in \ + $(top_srcdir)/init/znapzend.sysv.in \ $(top_srcdir)/init/znapzend.upstart.in \ $(top_srcdir)/init/znapzend.xml.in AUTHORS README \ + conftools/config.guess conftools/config.sub \ conftools/install-sh conftools/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -326,6 +330,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -394,10 +399,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): init/znapzend.service: $(top_builddir)/config.status $(top_srcdir)/init/znapzend.service.in cd $(top_builddir) && $(SHELL) ./config.status $@ +init/znapzend.sysv: $(top_builddir)/config.status $(top_srcdir)/init/znapzend.sysv.in + cd $(top_builddir) && $(SHELL) ./config.status $@ init/znapzend.upstart: $(top_builddir)/config.status $(top_srcdir)/init/znapzend.upstart.in cd $(top_builddir) && $(SHELL) ./config.status $@ init/znapzend.xml: $(top_builddir)/config.status $(top_srcdir)/init/znapzend.xml.in cd $(top_builddir) && $(SHELL) ./config.status $@ +init/org.znapzend.plist: $(top_builddir)/config.status $(top_srcdir)/init/org.znapzend.plist.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -650,7 +659,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -676,7 +685,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -694,7 +703,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -704,7 +713,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/README.md b/README.md index b75b0493..546ccb2a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -ZnapZend 0.18.0 +ZnapZend 0.19.0 =============== [![Build Status](https://travis-ci.org/oetiker/znapzend.svg?branch=master)](https://travis-ci.org/oetiker/znapzend) @@ -53,10 +53,10 @@ get them from the command line (Terminal app) with: With that in place you can now utter: ```sh -wget https://github.com/oetiker/znapzend/releases/download/v0.18.0/znapzend-0.18.0.tar.gz -tar zxvf znapzend-0.18.0.tar.gz -cd znapzend-0.18.0 -./configure --prefix=/opt/znapzend-0.18.0 +wget https://github.com/oetiker/znapzend/releases/download/v0.19.0/znapzend-0.19.0.tar.gz +tar zxvf znapzend-0.19.0.tar.gz +cd znapzend-0.19.0 +./configure --prefix=/opt/znapzend-0.19.0 ``` If configure finds anything noteworthy, it will tell you about it. If any @@ -72,7 +72,7 @@ Optionally (but recommended) put symbolic links to the installed binaries in the system PATH. ```sh -for x in /opt/znapzend-0.18.0/bin/*; do ln -s $x /usr/local/bin; done +for x in /opt/znapzend-0.19.0/bin/*; do ln -s $x /usr/local/bin; done ``` Packages @@ -181,4 +181,4 @@ And if you have a contribution, please send a pull request. Enjoy! Dominik Hassler & Tobi Oetiker -2018-04-13 +2018-06-19 diff --git a/VERSION b/VERSION index 66333910..1cf0537c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.18.0 +0.19.0 diff --git a/aclocal.m4 b/aclocal.m4 index f0b06d68..e385028f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -143,7 +143,7 @@ fi])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -340,7 +340,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -361,7 +361,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -383,7 +383,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -418,7 +418,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -457,7 +457,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -486,7 +486,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -505,7 +505,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -586,7 +586,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -646,7 +646,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -674,7 +674,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -693,7 +693,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/configure b/configure index df512549..f7348a83 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for znapzend 0.18.0. +# Generated by GNU Autoconf 2.69 for znapzend 0.19.0. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='znapzend' PACKAGE_TARNAME='znapzend' -PACKAGE_VERSION='0.18.0' -PACKAGE_STRING='znapzend 0.18.0' +PACKAGE_VERSION='0.19.0' +PACKAGE_STRING='znapzend 0.19.0' PACKAGE_BUGREPORT='tobi@oetiker.ch' PACKAGE_URL='' @@ -658,6 +658,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -730,6 +731,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -982,6 +984,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1119,7 +1130,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1232,7 +1243,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures znapzend 0.18.0 to adapt to many kinds of systems. +\`configure' configures znapzend 0.19.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1272,6 +1283,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1298,7 +1310,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of znapzend 0.18.0:";; + short | recursive ) echo "Configuration of znapzend 0.19.0:";; esac cat <<\_ACEOF @@ -1392,7 +1404,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -znapzend configure 0.18.0 +znapzend configure 0.19.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1409,7 +1421,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by znapzend $as_me 0.18.0, which was +It was created by znapzend $as_me 0.19.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2280,7 +2292,7 @@ fi # Define the identity of the package. PACKAGE='znapzend' - VERSION='0.18.0' + VERSION='0.19.0' cat >>confdefs.h <<_ACEOF @@ -3080,7 +3092,7 @@ _ACEOF -ac_config_files="$ac_config_files Makefile thirdparty/Makefile lib/Makefile init/znapzend.service init/znapzend.upstart init/znapzend.xml" +ac_config_files="$ac_config_files Makefile thirdparty/Makefile lib/Makefile init/znapzend.service init/znapzend.sysv init/znapzend.upstart init/znapzend.xml init/org.znapzend.plist" @@ -3644,7 +3656,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by znapzend $as_me 0.18.0, which was +This file was extended by znapzend $as_me 0.19.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3697,7 +3709,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -znapzend config.status 0.18.0 +znapzend config.status 0.19.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3814,8 +3826,10 @@ do "thirdparty/Makefile") CONFIG_FILES="$CONFIG_FILES thirdparty/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "init/znapzend.service") CONFIG_FILES="$CONFIG_FILES init/znapzend.service" ;; + "init/znapzend.sysv") CONFIG_FILES="$CONFIG_FILES init/znapzend.sysv" ;; "init/znapzend.upstart") CONFIG_FILES="$CONFIG_FILES init/znapzend.upstart" ;; "init/znapzend.xml") CONFIG_FILES="$CONFIG_FILES init/znapzend.xml" ;; + "init/org.znapzend.plist") CONFIG_FILES="$CONFIG_FILES init/org.znapzend.plist" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/conftools/install-sh b/conftools/install-sh index 0360b79e..59990a10 100755 --- a/conftools/install-sh +++ b/conftools/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -324,34 +324,41 @@ do # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 then if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` case $ls_ld_tmpdir in d????-?r-*) different_mode=700;; d????-?--*) different_mode=755;; *) false;; esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" } } then posix_mkdir=: fi - rmdir "$tmpdir/d" "$tmpdir" + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi trap '' 0;; esac;; @@ -496,6 +503,6 @@ done # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/conftools/missing b/conftools/missing index c6e37958..f62bbae3 100755 --- a/conftools/missing +++ b/conftools/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ exit $st # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff --git a/doc/znapzendzetup.pod b/doc/znapzendzetup.pod index ec6c786a..dc1794c3 100644 --- a/doc/znapzendzetup.pod +++ b/doc/znapzendzetup.pod @@ -45,19 +45,13 @@ where 'command' is one of the following: man -Note that in commands above, "SRC" and "DST" are verbatim key words, and -the dst key is a number of destination configuration (e.g. --dst=0) which -you can see in zfs dataset properties or using the B function. - =head1 DESCRIPTION Use znapzendsetup to configure your backup tasks. The cli is modled after the zfs commandline. After modifying the configuration, send a HUP signal to your znapzend daemon -for it to re-read the configuration. If you use a service framework integration -for znapzend, you can use the appropriate "refresh" or "reload" command for -managing the service instance, or even "restart" it. +for it to re-read the configuration. Below a few notes on main commands. @@ -100,13 +94,6 @@ a different pool) or remote. When adding multiple B entries, each will get labled for later identification, optionally you can specify your own label. -Note that while you can specify recursive confgurations, at this time it -is an all-or-nothing proposition: all datasets under the one you have -explicitly configured will be recursively handled according to its schedule. -Currently there is no support for pruning the tree ("I do not want to track -that sub-sub-dataset") nor for overriding configuration of a parent dataset -at a deeper leveled child dataset. - =over =item B<--tsformat>=I @@ -137,8 +124,6 @@ separator. =item B<--mbuffer>=I Specify the path to your copy of the mbuffer utility. -If you intend to use large (multi-gigabyte) buffers, be sure to specify -the path to a 64-bit build of the utility. =item B<--mbuffer>=I @@ -207,7 +192,7 @@ the B function understands the following options =item B<--dst>=I -to only remove a destination, specify the key of the destination. Use the +to only remove a destination, specify the key of the destionation. Use the B function to see the keys. =back diff --git a/lib/Makefile.in b/lib/Makefile.in index d72d0d43..768fbed2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -236,6 +236,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/man/znapzend.1 b/man/znapzend.1 index 9c9094e6..aafa2286 100644 --- a/man/znapzend.1 +++ b/man/znapzend.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZEND 1" -.TH ZNAPZEND 1 "2018-04-13" "0.18.0" "znapzend" +.TH ZNAPZEND 1 "2018-04-13" "0.19.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/znapzendzetup.1 b/man/znapzendzetup.1 index 0e487999..cef4e4e2 100644 --- a/man/znapzendzetup.1 +++ b/man/znapzendzetup.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZENDZETUP 1" -.TH ZNAPZENDZETUP 1 "2018-04-13" "0.18.0" "znapzend" +.TH ZNAPZENDZETUP 1 "2018-04-13" "0.19.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/znapzendztatz.1 b/man/znapzendztatz.1 index 9f48d404..7504a15f 100644 --- a/man/znapzendztatz.1 +++ b/man/znapzendztatz.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ZNAPZENDZTATZ 1" -.TH ZNAPZENDZTATZ 1 "2018-04-13" "0.18.0" "znapzend" +.TH ZNAPZENDZTATZ 1 "2018-04-13" "0.19.0" "znapzend" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/thirdparty/Makefile.in b/thirdparty/Makefile.in index 55384011..49d16b44 100644 --- a/thirdparty/Makefile.in +++ b/thirdparty/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -203,6 +203,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@