Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2013-02-21 15:37:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2013-02-08 23:26:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2013-02-21 15:37:26.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 21 14:23:55 CET 2013 - [email protected] + +- removed obsolete calls to renice and ionice in cron scripts + (bnc#804355) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/Makefile.in new/snapper-0.1.2/Makefile.in --- old/snapper-0.1.2/Makefile.in 2013-02-08 10:51:56.000000000 +0100 +++ new/snapper-0.1.2/Makefile.in 2013-02-21 14:26:52.000000000 +0100 @@ -181,6 +181,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -192,6 +195,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -217,6 +221,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -238,10 +245,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/client/Makefile.in new/snapper-0.1.2/client/Makefile.in --- old/snapper-0.1.2/client/Makefile.in 2013-02-08 10:51:56.000000000 +0100 +++ new/snapper-0.1.2/client/Makefile.in 2013-02-21 14:26:52.000000000 +0100 @@ -177,6 +177,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -188,6 +191,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -213,6 +217,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -234,10 +241,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/client/utils/Makefile.in new/snapper-0.1.2/client/utils/Makefile.in --- old/snapper-0.1.2/client/utils/Makefile.in 2013-02-08 10:51:56.000000000 +0100 +++ new/snapper-0.1.2/client/utils/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -135,6 +135,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -146,6 +149,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -171,6 +175,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -192,10 +199,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/config.h.in new/snapper-0.1.2/config.h.in --- old/snapper-0.1.2/config.h.in 2013-02-08 10:51:55.000000000 +0100 +++ new/snapper-0.1.2/config.h.in 2013-02-21 14:26:51.000000000 +0100 @@ -1,5 +1,17 @@ /* config.h.in. Generated from configure.in by autoheader. */ +/* Path of chattr program. */ +#undef CHATTRBIN + +/* Path of chsnap program. */ +#undef CHSNAPBIN + +/* Path of cp program. */ +#undef CPBIN + +/* Path of diff program. */ +#undef DIFFBIN + /* Enable Btrfs internal snapshots support */ #undef ENABLE_BTRFS @@ -46,6 +58,15 @@ */ #undef LT_OBJDIR +/* Path of lvcreate program. */ +#undef LVCREATEBIN + +/* Path of lvremove program. */ +#undef LVREMOVEBIN + +/* Path of lvs program. */ +#undef LVSBIN + /* Name of package */ #undef PACKAGE @@ -67,8 +88,14 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Path of rm program. */ +#undef RMBIN + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Path of touch program. */ +#undef TOUCHBIN + /* Version number of package */ #undef VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/configure new/snapper-0.1.2/configure --- old/snapper-0.1.2/configure 2013-02-08 10:51:54.000000000 +0100 +++ new/snapper-0.1.2/configure 2013-02-21 14:26:51.000000000 +0100 @@ -654,6 +654,15 @@ AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +LVSBIN +LVREMOVEBIN +LVCREATEBIN +CHATTRBIN +DIFFBIN +RMBIN +TOUCHBIN +CPBIN +CHSNAPBIN CXXCPP CPP OTOOL64 @@ -781,6 +790,7 @@ with_sysroot enable_libtool_lock enable_silent_rules +with_conf enable_btrfs enable_ext4 enable_lvm @@ -1444,6 +1454,8 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --with-conf Use a custom sysconfig directory (default is + /etc/sysconfig) Some influential environment variables: CXX C++ compiler command @@ -14960,6 +14972,422 @@ +# Extract the first word of "chsnap", so it can be a program name with args. +set dummy chsnap; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CHSNAPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CHSNAPBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHSNAPBIN="$CHSNAPBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CHSNAPBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_CHSNAPBIN" && ac_cv_path_CHSNAPBIN="/sbin/chsnap" + ;; +esac +fi +CHSNAPBIN=$ac_cv_path_CHSNAPBIN +if test -n "$CHSNAPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHSNAPBIN" >&5 +$as_echo "$CHSNAPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "cp", so it can be a program name with args. +set dummy cp; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CPBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_CPBIN="$CPBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CPBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_CPBIN" && ac_cv_path_CPBIN="/bin/cp" + ;; +esac +fi +CPBIN=$ac_cv_path_CPBIN +if test -n "$CPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPBIN" >&5 +$as_echo "$CPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "touch", so it can be a program name with args. +set dummy touch; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_TOUCHBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $TOUCHBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_TOUCHBIN="$TOUCHBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_TOUCHBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_TOUCHBIN" && ac_cv_path_TOUCHBIN="/usr/bin/touch" + ;; +esac +fi +TOUCHBIN=$ac_cv_path_TOUCHBIN +if test -n "$TOUCHBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCHBIN" >&5 +$as_echo "$TOUCHBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "rm", so it can be a program name with args. +set dummy rm; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_RMBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $RMBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_RMBIN="$RMBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_RMBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_RMBIN" && ac_cv_path_RMBIN="/bin/rm" + ;; +esac +fi +RMBIN=$ac_cv_path_RMBIN +if test -n "$RMBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMBIN" >&5 +$as_echo "$RMBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "diff", so it can be a program name with args. +set dummy diff; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DIFFBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DIFFBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_DIFFBIN="$DIFFBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DIFFBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_DIFFBIN" && ac_cv_path_DIFFBIN="/usr/bin/diff" + ;; +esac +fi +DIFFBIN=$ac_cv_path_DIFFBIN +if test -n "$DIFFBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFFBIN" >&5 +$as_echo "$DIFFBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "chattr", so it can be a program name with args. +set dummy chattr; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_CHATTRBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $CHATTRBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHATTRBIN="$CHATTRBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CHATTRBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_CHATTRBIN" && ac_cv_path_CHATTRBIN="/usr/bin/chattr" + ;; +esac +fi +CHATTRBIN=$ac_cv_path_CHATTRBIN +if test -n "$CHATTRBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHATTRBIN" >&5 +$as_echo "$CHATTRBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "lvcreate", so it can be a program name with args. +set dummy lvcreate; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LVCREATEBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LVCREATEBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_LVCREATEBIN="$LVCREATEBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LVCREATEBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LVCREATEBIN" && ac_cv_path_LVCREATEBIN="/sbin/lvcreate" + ;; +esac +fi +LVCREATEBIN=$ac_cv_path_LVCREATEBIN +if test -n "$LVCREATEBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LVCREATEBIN" >&5 +$as_echo "$LVCREATEBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "lvremove", so it can be a program name with args. +set dummy lvremove; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LVREMOVEBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LVREMOVEBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_LVREMOVEBIN="$LVREMOVEBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LVREMOVEBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LVREMOVEBIN" && ac_cv_path_LVREMOVEBIN="/sbin/lvremove" + ;; +esac +fi +LVREMOVEBIN=$ac_cv_path_LVREMOVEBIN +if test -n "$LVREMOVEBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LVREMOVEBIN" >&5 +$as_echo "$LVREMOVEBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "lvs", so it can be a program name with args. +set dummy lvs; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_LVSBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LVSBIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_LVSBIN="$LVSBIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LVSBIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_LVSBIN" && ac_cv_path_LVSBIN="/sbin/lvs" + ;; +esac +fi +LVSBIN=$ac_cv_path_LVSBIN +if test -n "$LVSBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LVSBIN" >&5 +$as_echo "$LVSBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + +cat >>confdefs.h <<_ACEOF +#define CHSNAPBIN "$CHSNAPBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define CPBIN "$CPBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define TOUCHBIN "$TOUCHBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define RMBIN "$RMBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define DIFFBIN "$DIFFBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define CHATTRBIN "$CHATTRBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LVCREATEBIN "$LVCREATEBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LVREMOVEBIN "$LVREMOVEBIN" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define LVSBIN "$LVSBIN" +_ACEOF + + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -15005,6 +15433,21 @@ fillupdir=/var/adm/fillup-templates + +# Check whether --with-conf was given. +if test "${with_conf+set}" = set; then : + withval=$with_conf; with_conf=$withval +else + with_conf=no +fi + + +if test "x$with_conf" != xno; then : + CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'" +else + CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'" +fi + # Check whether --enable-btrfs was given. if test "${enable_btrfs+set}" = set; then : enableval=$enable_btrfs; with_btrfs=$enableval diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/configure.in new/snapper-0.1.2/configure.in --- old/snapper-0.1.2/configure.in 2013-01-30 18:36:33.000000000 +0100 +++ new/snapper-0.1.2/configure.in 2013-02-13 12:01:32.000000000 +0100 @@ -24,6 +24,26 @@ AC_PREFIX_DEFAULT(/usr) +AC_PATH_PROG([CHSNAPBIN], [chsnap], [/sbin/chsnap]) +AC_PATH_PROG([CPBIN], [cp], [/bin/cp]) +AC_PATH_PROG([TOUCHBIN], [touch], [/usr/bin/touch]) +AC_PATH_PROG([RMBIN], [rm], [/bin/rm]) +AC_PATH_PROG([DIFFBIN], [diff], [/usr/bin/diff]) +AC_PATH_PROG([CHATTRBIN], [chattr], [/usr/bin/chattr]) +AC_PATH_PROG([LVCREATEBIN], [lvcreate], [/sbin/lvcreate]) +AC_PATH_PROG([LVREMOVEBIN], [lvremove], [/sbin/lvremove]) +AC_PATH_PROG([LVSBIN], [lvs], [/sbin/lvs]) + +AC_DEFINE_UNQUOTED([CHSNAPBIN], ["$CHSNAPBIN"], [Path of chsnap program.]) +AC_DEFINE_UNQUOTED([CPBIN], ["$CPBIN"], [Path of cp program.]) +AC_DEFINE_UNQUOTED([TOUCHBIN], ["$TOUCHBIN"], [Path of touch program.]) +AC_DEFINE_UNQUOTED([RMBIN], ["$RMBIN"], [Path of rm program.]) +AC_DEFINE_UNQUOTED([DIFFBIN], ["$DIFFBIN"], [Path of diff program.]) +AC_DEFINE_UNQUOTED([CHATTRBIN], ["$CHATTRBIN"], [Path of chattr program.]) +AC_DEFINE_UNQUOTED([LVCREATEBIN], ["$LVCREATEBIN"], [Path of lvcreate program.]) +AC_DEFINE_UNQUOTED([LVREMOVEBIN], ["$LVREMOVEBIN"], [Path of lvremove program.]) +AC_DEFINE_UNQUOTED([LVSBIN], ["$LVSBIN"], [Path of lvs program.]) + dnl Automake 1.11 enables silent compilation dnl Disable it by "configure --disable-silent-rules" or "make V=1" m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -33,6 +53,12 @@ fillupdir=/var/adm/fillup-templates +AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]), + [with_conf=$withval], [with_conf=no]) + +AS_IF([test "x$with_conf" != xno], [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'"], + [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'"]) + AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), [with_btrfs=$enableval],[with_btrfs=yes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/data/Makefile.in new/snapper-0.1.2/data/Makefile.in --- old/snapper-0.1.2/data/Makefile.in 2013-02-08 10:51:56.000000000 +0100 +++ new/snapper-0.1.2/data/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -88,6 +88,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -99,6 +102,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -124,6 +128,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -145,10 +152,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/dbus/Makefile.in new/snapper-0.1.2/dbus/Makefile.in --- old/snapper-0.1.2/dbus/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/dbus/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -137,6 +137,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -148,6 +151,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -173,6 +177,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -194,10 +201,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/doc/Makefile.in new/snapper-0.1.2/doc/Makefile.in --- old/snapper-0.1.2/doc/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/doc/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -120,6 +120,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -131,6 +134,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -156,6 +160,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -177,10 +184,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/examples/C/Makefile.in new/snapper-0.1.2/examples/C/Makefile.in --- old/snapper-0.1.2/examples/C/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/examples/C/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -123,6 +123,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -134,6 +137,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -159,6 +163,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -180,10 +187,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/examples/Makefile.in new/snapper-0.1.2/examples/Makefile.in --- old/snapper-0.1.2/examples/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/examples/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -184,6 +184,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -195,6 +198,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -220,6 +224,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -241,10 +248,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/po/Makefile.in new/snapper-0.1.2/po/Makefile.in --- old/snapper-0.1.2/po/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/po/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -88,6 +88,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -99,6 +102,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -124,6 +128,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -145,10 +152,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/scripts/Makefile.in new/snapper-0.1.2/scripts/Makefile.in --- old/snapper-0.1.2/scripts/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/scripts/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -88,6 +88,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -99,6 +102,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -124,6 +128,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -145,10 +152,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/scripts/snapper-daily new/snapper-0.1.2/scripts/snapper-daily --- old/snapper-0.1.2/scripts/snapper-daily 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/scripts/snapper-daily 2013-02-21 14:26:31.000000000 +0100 @@ -17,13 +17,6 @@ # -# be nice -# -/usr/bin/renice -n 19 -p $$ -/usr/bin/ionice -c 3 -p $$ - - -# # run snapper for all configs # for CONFIG in $SNAPPER_CONFIGS ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/scripts/snapper-hourly new/snapper-0.1.2/scripts/snapper-hourly --- old/snapper-0.1.2/scripts/snapper-hourly 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/scripts/snapper-hourly 2013-02-21 14:26:31.000000000 +0100 @@ -17,13 +17,6 @@ # -# be nice -# -/usr/bin/renice -n 19 -p $$ -/usr/bin/ionice -c 3 -p $$ - - -# # run snapper for all configs # for CONFIG in $SNAPPER_CONFIGS ; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/server/Client.h new/snapper-0.1.2/server/Client.h --- old/snapper-0.1.2/server/Client.h 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/server/Client.h 2013-02-20 11:36:31.000000000 +0100 @@ -32,7 +32,6 @@ #include <snapper/Snapper.h> #include <snapper/Snapshot.h> -#include <snapper/Factory.h> #include <snapper/Comparison.h> #include <dbus/DBusConnection.h> #include <dbus/DBusMessage.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/server/Makefile.in new/snapper-0.1.2/server/Makefile.in --- old/snapper-0.1.2/server/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/server/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -138,6 +138,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -149,6 +152,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -174,6 +178,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -195,10 +202,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/Btrfs.cc new/snapper-0.1.2/snapper/Btrfs.cc --- old/snapper-0.1.2/snapper/Btrfs.cc 2013-02-08 10:51:31.000000000 +0100 +++ new/snapper-0.1.2/snapper/Btrfs.cc 2013-02-20 11:36:31.000000000 +0100 @@ -1047,6 +1047,8 @@ { while (true) { + boost::this_thread::interruption_point(); + int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this); if (r < 0) @@ -1198,8 +1200,9 @@ y2mil("stopwatch " << stopwatch << " for comparing directories"); } - catch (const BtrfsSendReceiveException& e) + catch (const SnapperException& e) { + y2err("special btrfs cmpDirs failed, " << e.what()); y2mil("cmpDirs fallback"); snapper::cmpDirs(dir1, dir2, cb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/Ext4.cc new/snapper-0.1.2/snapper/Ext4.cc --- old/snapper-0.1.2/snapper/Ext4.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/snapper/Ext4.cc 2013-02-13 12:01:32.000000000 +0100 @@ -20,6 +20,8 @@ */ +#include "config.h" + #include <string.h> #include <sys/stat.h> #include <sys/types.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/Factory.cc new/snapper-0.1.2/snapper/Factory.cc --- old/snapper-0.1.2/snapper/Factory.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/snapper/Factory.cc 2013-02-11 15:01:34.000000000 +0100 @@ -20,7 +20,7 @@ */ -#include "auto_ptr.h" +#include <memory> #include "snapper/Factory.h" #include "snapper/Snapper.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/Lvm.cc new/snapper-0.1.2/snapper/Lvm.cc --- old/snapper-0.1.2/snapper/Lvm.cc 2013-02-06 18:06:34.000000000 +0100 +++ new/snapper-0.1.2/snapper/Lvm.cc 2013-02-13 12:01:32.000000000 +0100 @@ -20,6 +20,8 @@ */ +#include "config.h" + #include <string.h> #include <sys/stat.h> #include <sys/types.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/Makefile.in new/snapper-0.1.2/snapper/Makefile.in --- old/snapper-0.1.2/snapper/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/snapper/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -193,6 +193,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -204,6 +207,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -229,6 +233,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -250,10 +257,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/snapper/SnapperDefines.h new/snapper-0.1.2/snapper/SnapperDefines.h --- old/snapper-0.1.2/snapper/SnapperDefines.h 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/snapper/SnapperDefines.h 2013-02-13 12:01:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2004-2012] Novell, Inc. + * Copyright (c) [2004-2013] Novell, Inc. * * All Rights Reserved. * @@ -24,24 +24,12 @@ #define SNAPPER_SNAPPER_DEFINES_H -#define SYSCONFIGFILE "/etc/sysconfig/snapper" +#define SYSCONFIGFILE CONFDIR "/snapper" #define CONFIGSDIR "/etc/snapper/configs" #define CONFIGTEMPLATEDIR "/etc/snapper/config-templates" #define FILTERSDIR "/etc/snapper/filters" -#define CHSNAPBIN "/sbin/chsnap" - -#define CPBIN "/bin/cp" -#define TOUCHBIN "/usr/bin/touch" -#define RMBIN "/bin/rm" -#define DIFFBIN "/usr/bin/diff" -#define CHATTRBIN "/usr/bin/chattr" - -#define LVCREATEBIN "/sbin/lvcreate" -#define LVREMOVEBIN "/sbin/lvremove" -#define LVSBIN "/sbin/lvs" - #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-cmp/Makefile.in new/snapper-0.1.2/testsuite-cmp/Makefile.in --- old/snapper-0.1.2/testsuite-cmp/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/testsuite-cmp/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -121,6 +121,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -132,6 +135,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -157,6 +161,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -178,10 +185,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/Makefile.in new/snapper-0.1.2/testsuite-real/Makefile.in --- old/snapper-0.1.2/testsuite-real/Makefile.in 2013-02-08 10:51:57.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/Makefile.in 2013-02-21 14:26:53.000000000 +0100 @@ -192,6 +192,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHATTRBIN = @CHATTRBIN@ +CHSNAPBIN = @CHSNAPBIN@ +CPBIN = @CPBIN@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -203,6 +206,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIFFBIN = @DIFFBIN@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -228,6 +232,9 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LVCREATEBIN = @LVCREATEBIN@ +LVREMOVEBIN = @LVREMOVEBIN@ +LVSBIN = @LVSBIN@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -249,10 +256,12 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ +RMBIN = @RMBIN@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/common.cc new/snapper-0.1.2/testsuite-real/common.cc --- old/snapper-0.1.2/testsuite-real/common.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/common.cc 2013-02-20 12:46:31.000000000 +0100 @@ -6,7 +6,6 @@ #include "common.h" -#include <snapper/Factory.h> #include <snapper/Snapper.h> #include <snapper/Snapshot.h> #include <snapper/Comparison.h> @@ -38,7 +37,14 @@ initDefaultLogger(); - sh = createSnapper("testsuite"); + sh = new Snapper("testsuite"); +} + + +void +cleanup() +{ + delete sh; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/common.h new/snapper-0.1.2/testsuite-real/common.h --- old/snapper-0.1.2/testsuite-real/common.h 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/common.h 2013-02-20 12:36:34.000000000 +0100 @@ -44,6 +44,8 @@ void setup(); +void cleanup(); + void first_snapshot(); void second_snapshot(); void check_undo_statistics(unsigned int numCreate, unsigned int numModify, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/directory1.cc new/snapper-0.1.2/testsuite-real/directory1.cc --- old/snapper-0.1.2/testsuite-real/directory1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/directory1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -30,5 +30,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/error1.cc new/snapper-0.1.2/testsuite-real/error1.cc --- old/snapper-0.1.2/testsuite-real/error1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/error1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -26,5 +26,7 @@ check_undo_errors(0, 0, 1); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/error2.cc new/snapper-0.1.2/testsuite-real/error2.cc --- old/snapper-0.1.2/testsuite-real/error2.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/error2.cc 2013-02-20 12:36:34.000000000 +0100 @@ -29,5 +29,7 @@ check_undo_errors(0, 1, 0); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/error4.cc new/snapper-0.1.2/testsuite-real/error4.cc --- old/snapper-0.1.2/testsuite-real/error4.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/error4.cc 2013-02-20 12:36:34.000000000 +0100 @@ -30,5 +30,7 @@ check_undo_errors(1, 0, 0); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/missing-directory1.cc new/snapper-0.1.2/testsuite-real/missing-directory1.cc --- old/snapper-0.1.2/testsuite-real/missing-directory1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/missing-directory1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -33,5 +33,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/owner1.cc new/snapper-0.1.2/testsuite-real/owner1.cc --- old/snapper-0.1.2/testsuite-real/owner1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/owner1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -37,5 +37,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/owner2.cc new/snapper-0.1.2/testsuite-real/owner2.cc --- old/snapper-0.1.2/testsuite-real/owner2.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/owner2.cc 2013-02-20 12:36:34.000000000 +0100 @@ -32,5 +32,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/owner3.cc new/snapper-0.1.2/testsuite-real/owner3.cc --- old/snapper-0.1.2/testsuite-real/owner3.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/owner3.cc 2013-02-20 12:36:34.000000000 +0100 @@ -31,5 +31,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/permissions1.cc new/snapper-0.1.2/testsuite-real/permissions1.cc --- old/snapper-0.1.2/testsuite-real/permissions1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/permissions1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -38,5 +38,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/permissions2.cc new/snapper-0.1.2/testsuite-real/permissions2.cc --- old/snapper-0.1.2/testsuite-real/permissions2.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/permissions2.cc 2013-02-20 12:36:34.000000000 +0100 @@ -32,5 +32,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.1.2/testsuite-real/simple1.cc new/snapper-0.1.2/testsuite-real/simple1.cc --- old/snapper-0.1.2/testsuite-real/simple1.cc 2013-01-22 11:46:31.000000000 +0100 +++ new/snapper-0.1.2/testsuite-real/simple1.cc 2013-02-20 12:36:34.000000000 +0100 @@ -36,5 +36,7 @@ check_first(); + cleanup(); + exit(EXIT_SUCCESS); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
