From 85a83991f5401a3aa0600d29d4a60f5e4685eee7 Mon Sep 17 00:00:00 2001 From: Denis Fateyev Date: Apr 15 2020 20:30:47 +0000 Subject: backupninja: update patch set for 1.1.0 version --- diff --git a/backupninja-1.0.1-redhat.patch b/backupninja-1.0.1-redhat.patch deleted file mode 100644 index 459c701..0000000 --- a/backupninja-1.0.1-redhat.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/handlers/dup.helper.in 2012-06-30 00:35:47.000000000 +0600 -+++ b/handlers/dup.helper.in 2014-11-17 00:49:52.172966826 +0600 -@@ -588,7 +588,7 @@ - - # Global variables whose '*' shall not be expanded - set -o noglob -- dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*" -+ dup_default_includes="/var/spool/cron /var/backups /etc /root /home /usr/local/*bin" - dup_default_excludes="/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads /var/cache/backupninja/duplicity" - set +o noglob - ---- a/handlers/rdiff.helper.in 2012-06-30 00:35:47.000000000 +0600 -+++ b/handlers/rdiff.helper.in 2014-11-17 00:49:12.383983427 +0600 -@@ -243,7 +243,7 @@ - if [ "$rdiff_user" = "root" ]; then - booleanBox "install rdiff-backup?" "It seems like the remote machine does not have rdiff-backup installed, I can attempt to install rdiff-backup on the remote machine.\n\n\nDo you want me to attempt this now?" - if [ $? = 0 ]; then -- ssh $rdiff_user@$rdiff_host 'apt-get install rdiff-backup' -+ ssh $rdiff_user@$rdiff_host 'yum install rdiff-backup' - result=$? - echo "Hit return to continue." - read -@@ -414,7 +414,7 @@ - - # Global variables whose '*' shall not be expanded - set -o noglob -- rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*) -+ rdiff_includes=(/var/spool/cron /var/backups /etc /root /home /usr/local/*bin) - rdiff_excludes=(/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads /var/cache/backupninja/duplicity) - rdiff_vsincludes= - set +o noglob ---- a/src/ninjahelper.in 2012-06-30 00:35:47.000000000 +0600 -+++ b/src/ninjahelper.in 2014-11-17 00:03:26.113218022 +0600 -@@ -27,11 +27,11 @@ - ## - require_packages() { - for pkg in "$@"; do -- installed=`dpkg -s $pkg | grep 'ok installed'` -+ installed=`yum list installed $pkg >/dev/null 2>&1` - if [ -z "$installed" ]; then - booleanBox "install $pkg?" "This backup action requires package $pkg. Do you want to install it now?" - if [ $? = 0 ]; then -- apt-get install $pkg -+ yum install $pkg - echo "hit return to continue...." - read - fi -@@ -166,7 +166,7 @@ - echo -n "(yes/no): " - read install - if [ "$install" == "yes" ]; then -- apt-get install dialog -+ yum install dialog - break - elif [ "$install" == "no" ]; then - exit diff --git a/backupninja-1.1.0-dayofweek.patch b/backupninja-1.1.0-dayofweek.patch new file mode 100644 index 0000000..1c97852 --- /dev/null +++ b/backupninja-1.1.0-dayofweek.patch @@ -0,0 +1,25 @@ +From a0f5063e8b31df18b397a91095f33d4efe39f58e Mon Sep 17 00:00:00 2001 +From: Jerome Charaoui +Date: Fri, 13 Jul 2018 10:08:02 -0400 +Subject: [PATCH] Fix warning about malformed day component in 'when' + +--- + src/backupninja.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backupninja.in b/src/backupninja.in +index 77afbfd..d6a1045 100755 +--- a/src/backupninja.in ++++ b/src/backupninja.in +@@ -226,7 +226,7 @@ function isnow() { + if [ "$whendayofweek" != "$nowdayofweek" ]; then + whendayofweek=${whendayofweek%s} + if [ "$whendayofweek" != "$nowdayofweek" ]; then +- if [ "$whendayofweek" != "mondays" -a "$whendayofweek" != "tuesdays" -a "$whendayofweek" != "wednesdays" -a "$whendayofweek" != "thursdays" -a "$whendayofweek" != "fridays" -a "$whendayofweek" != "saturdays" -a "$whendayofweek" != "sundays" ]; then ++ if [ "$whendayofweek" != "monday" -a "$whendayofweek" != "tuesday" -a "$whendayofweek" != "wednesday" -a "$whendayofweek" != "thursday" -a "$whendayofweek" != "friday" -a "$whendayofweek" != "saturday" -a "$whendayofweek" != "sunday" ]; then + warning "The day in the 'when' option in the configuration is malformed. Please read the README for examples." + fi + if [ "$at" != "at" ]; then +-- +2.24.1 + diff --git a/backupninja-1.1.0-padding.patch b/backupninja-1.1.0-padding.patch new file mode 100644 index 0000000..1d50770 --- /dev/null +++ b/backupninja-1.1.0-padding.patch @@ -0,0 +1,45 @@ +From f9529d1d3f3714c707f38b8e44ac72a69af5483b Mon Sep 17 00:00:00 2001 +From: Jerome Charaoui +Date: Fri, 13 Jul 2018 21:49:06 -0400 +Subject: [PATCH] Remove zero-padding from nowday and whenday (fixes #9397) + +This fixes cases where the day component of the when parameter resolved +to a non-zero padded integer under 10, such as "when = 1st at 01" + +The comparison against the nowday variable failed consistently since +the date command format used always returned a zero-padded two digit +integer. + +The solution chosen is to avoid generating nowday with zero-padding and +remove any zero-padding from whenday parameter using a more thorough +sed pattern which now also removes any non-alphanumeric characters from +the string. +--- + src/backupninja.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/backupninja.in b/src/backupninja.in +index d6a1045..6da7237 100755 +--- a/src/backupninja.in ++++ b/src/backupninja.in +@@ -186,7 +186,7 @@ function tolower() { + + # simple to integer function + function toint() { +- echo "$1" | tr -d '[:alpha:]' ++ echo "$1" | @SED@ 's/[^0-9]//g;s/^0\+//' + } + + # +@@ -202,7 +202,7 @@ function toint() { + # we grab the current time once, since processing + # all the configs might take more than an hour. + nowtime=`LC_ALL=C date +%H` +-nowday=`LC_ALL=C date +%d` ++nowday=`LC_ALL=C date +%-d` + nowdayofweek=`LC_ALL=C date +%A` + nowdayofweek=`tolower "$nowdayofweek"` + +-- +2.24.1 + diff --git a/backupninja-1.1.0-whitespaces.patch b/backupninja-1.1.0-whitespaces.patch new file mode 100644 index 0000000..e0e1c06 --- /dev/null +++ b/backupninja-1.1.0-whitespaces.patch @@ -0,0 +1,32 @@ +From 26521d0975affe45aa944621b6e6f32ee3a8cdde Mon Sep 17 00:00:00 2001 +From: Jerome Charaoui +Date: Fri, 13 Jul 2018 10:07:10 -0400 +Subject: [PATCH] Whitespace fixes + +--- + src/backupninja.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/backupninja.in b/src/backupninja.in +index ef8fc2d..77afbfd 100755 +--- a/src/backupninja.in ++++ b/src/backupninja.in +@@ -234,13 +234,13 @@ function isnow() { + fi + if [[ "$whentimeoriginal" != @([0-9][0-9])?(:[0-9][0-9]) ]]; then + warning "The time in the 'when' option in the configuration is malformed or does not exist. Please read the README for examples." +- fi ++ fi + return 0 + fi + fi + elif [ "$whenday" != "$nowday" ]; then + if [ "$whenday" -lt 1 -o "$whenday" -gt 31 ]; then +- warning "The numeric value of the day in the 'when' option in the configuration does not match a day. Please read the README for examples." ++ warning "The numeric value of the day in the 'when' option in the configuration does not match a day. Please read the README for examples." + fi + if [ -z "$whentime" ]; then + warning "The 'when' variable in the configuration file is malformed. You either didn't specify the day or the time. Please read the README for eamples." +-- +2.24.1 + diff --git a/backupninja-rsync-action.patch b/backupninja-rsync-action.patch deleted file mode 100644 index 33a26d4..0000000 --- a/backupninja-rsync-action.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/handlers/rsync.in -+++ b/handlers/rsync.in -@@ -1136,9 +1136,10 @@ for SECTION in $include; do - set_dest - - info "Syncing $SECTION on $dest_path..." -- debug $nice $rsync ${rsync_options[@]} $filelist_flag $excludes $batch_option $orig $dest_path -+ command="$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path" -+ debug $nice su -c "$command" - set_pipefail -- $nice su -c "$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path" | tee -a $log -+ $nice su -c "$command" | tee -a $log - - check_rsync_exit_status $? - restore_pipefail diff --git a/backupninja.spec b/backupninja.spec index da70a88..f0e5bde 100644 --- a/backupninja.spec +++ b/backupninja.spec @@ -1,7 +1,7 @@ Name: backupninja Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight, extensible backup system License: GPLv2 @@ -11,6 +11,9 @@ Source0: https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstrea Patch0: backupninja-1.1.0-redhat.patch Patch1: backupninja-duplicity-version.patch Patch2: backupninja-extbackup-fix.patch +Patch3: backupninja-1.1.0-whitespaces.patch +Patch4: backupninja-1.1.0-dayofweek.patch +Patch5: backupninja-1.1.0-padding.patch BuildArch: noarch @@ -38,6 +41,9 @@ hard-linking. %patch0 -p1 -b .redhat %patch1 -p1 -b .dupver %patch2 -p1 -b .extbck +%patch3 -p1 -b .wspace +%patch4 -p1 -b .dayswk +%patch5 -p1 -b .paddng %build # put all script 'libs' into one dir @@ -67,6 +73,9 @@ mkdir -p -m 0750 %{buildroot}/%{_sysconfdir}/backup.d %changelog +* Wed Apr 15 2020 Denis Fateyev - 1.1.0-5 +- Update patch set for backupninja-1.1.0 + * Tue Jan 28 2020 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild