Notification time stamped 2022-05-31 23:06:22 UTC
From 8e3d094c9636090030b4724283de566bb1955de2 Mon Sep 17 00:00:00 2001
From: Denis Fateyev <denis(a)fateyev.com>
Date: May 29 2022 13:22:08 +0000
Subject: backupninja: 1.2.1 release
---
diff --git a/.gitignore b/.gitignore
index a81f1e2..451aeb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/backupninja-1.0.1.tar.gz
/backupninja-1.1.0.tar.gz
+/backupninja-1.2.1.tar.gz
diff --git a/backupninja-1.1.0-dayofweek.patch b/backupninja-1.1.0-dayofweek.patch
deleted file mode 100644
index 1c97852..0000000
--- a/backupninja-1.1.0-dayofweek.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a0f5063e8b31df18b397a91095f33d4efe39f58e Mon Sep 17 00:00:00 2001
-From: Jerome Charaoui <jerome(a)riseup.net>
-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
deleted file mode 100644
index 1d50770..0000000
--- a/backupninja-1.1.0-padding.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f9529d1d3f3714c707f38b8e44ac72a69af5483b Mon Sep 17 00:00:00 2001
-From: Jerome Charaoui <jerome(a)riseup.net>
-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-redhat.patch b/backupninja-1.1.0-redhat.patch
deleted file mode 100644
index 03a70e4..0000000
--- a/backupninja-1.1.0-redhat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/handlers/dup.helper.in 2018-06-29 22:12:42.000000000 +0600
-+++ b/handlers/dup.helper.in 2018-12-30 04:27:40.251026730 +0600
-@@ -624,7 +624,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 2018-06-29 22:12:42.000000000 +0600
-+++ b/handlers/rdiff.helper.in 2018-12-30 04:27:40.251026730 +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
-@@ -437,7 +437,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 2018-06-29 22:12:42.000000000 +0600
-+++ b/src/ninjahelper.in 2018-12-30 04:27:40.251026730 +0600
-@@ -27,11 +27,11 @@
- ##
- require_packages() {
- for pkg in "$@"; do
-- installed=`dpkg -s $pkg | grep 'ok installed'`
-+ installed=`yum list installed $pkg 2>/dev/null | grep -i 'installed'`
- 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-whitespaces.patch b/backupninja-1.1.0-whitespaces.patch
deleted file mode 100644
index e0e1c06..0000000
--- a/backupninja-1.1.0-whitespaces.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 26521d0975affe45aa944621b6e6f32ee3a8cdde Mon Sep 17 00:00:00 2001
-From: Jerome Charaoui <jerome(a)riseup.net>
-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-1.2.1-duplicity.patch b/backupninja-1.2.1-duplicity.patch
new file mode 100644
index 0000000..9525cb1
--- /dev/null
+++ b/backupninja-1.2.1-duplicity.patch
@@ -0,0 +1,11 @@
+--- a/handlers/dup.in 2021-01-25 21:50:45.000000000 +0600
++++ b/handlers/dup.in 2022-05-27 18:19:28.948488094 +0600
+@@ -130,7 +130,7 @@
+ fi
+
+ ### duplicity version (ignore anything else than 0-9 and ".")
+-duplicity_version="`duplicity --version | @AWK@ '{print $2}' | @SED@
's/[^.[:digit:]]//g'`"
++duplicity_version="`duplicity --version | @AWK@ 'END{print $2}' | @SED@
's/[^.[:digit:]]//g'`"
+
+ ### ssh/scp/sftp options (duplicity < 0.4.3 is unsupported)
+ ## duplicity >= 0.6.17 : paramiko backend
diff --git a/backupninja-1.2.1-extbackup.patch b/backupninja-1.2.1-extbackup.patch
new file mode 100644
index 0000000..dfe6f85
--- /dev/null
+++ b/backupninja-1.2.1-extbackup.patch
@@ -0,0 +1,21 @@
+--- a/handlers/dup.in 2021-01-25 21:50:45.000000000 +0600
++++ b/handlers/dup.in 2022-05-27 18:19:28.948488094 +0600
+@@ -66,15 +66,15 @@
+ [ -n "$signpassword" ] || fatal "The signpassword option must be set
because signkey is different from encryptkey."
+ fi
+
+-if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"s3+http" ]; then
++if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"s3+http" ]]; then
+ [ -n "$awsaccesskeyid" -a -n "$awssecretaccesskey" ] || fatal
"AWS access keys must be set for S3 backups."
+ fi
+
+-if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"cf+http" ]; then
++if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"cf+http" ]]; then
+ [ -n "$cfusername" -a -n "$cfapikey" ] || fatal "Cloudfiles
access keys must be set for S3 backups."
+ fi
+
+-if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"dpbx" ]; then
++if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"dpbx" ]]; then
+ [ -n "$dropboxappkey" -a -n "$dropboxappsecret" ] || fatal
"Dropbox app ID and secret must be set for Dropbox backups."
+
+ if [ ! -n "$dropboxaccesstoken" ]; then
diff --git a/backupninja-1.2.1-redhat.patch b/backupninja-1.2.1-redhat.patch
new file mode 100644
index 0000000..71c7114
--- /dev/null
+++ b/backupninja-1.2.1-redhat.patch
@@ -0,0 +1,56 @@
+--- a/handlers/dup.helper.in 2021-01-25 21:50:45.000000000 +0600
++++ b/handlers/dup.helper.in 2022-05-27 18:19:28.948488094 +0600
+@@ -540,7 +540,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 2021-01-25 21:50:45.000000000 +0600
++++ b/handlers/rdiff.helper.in 2022-05-27 18:19:28.948488094 +0600
+@@ -190,7 +190,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
+@@ -355,7 +355,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)
+ set +o noglob
+
+--- a/src/ninjahelper.in 2021-01-25 21:50:45.000000000 +0600
++++ b/src/ninjahelper.in 2022-05-27 18:19:28.948488094 +0600
+@@ -27,11 +27,11 @@
+ ##
+ require_packages() {
+ for pkg in "$@"; do
+- installed=`dpkg -s $pkg | grep 'ok installed'`
++ installed=`yum list installed $pkg 2>/dev/null | grep -i 'installed'`
+ 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
+@@ -164,7 +164,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-duplicity-version.patch b/backupninja-duplicity-version.patch
deleted file mode 100644
index 0e933a4..0000000
--- a/backupninja-duplicity-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/handlers/dup.in 2018-06-29 22:12:42.000000000 +0600
-+++ b/handlers/dup.in 2018-12-30 04:27:43.251026730 +0600
-@@ -133,7 +133,7 @@
- fi
-
- ### duplicity version (ignore anything else than 0-9 and ".")
--duplicity_version="`duplicity --version | @AWK@ '{print $2}' | @SED@
's/[^.[:digit:]]//g'`"
-+duplicity_version="`duplicity --version | @AWK@ 'END{print $2}' | @SED@
's/[^.[:digit:]]//g'`"
-
- ### ssh/scp/sftp options (duplicity < 0.4.3 is unsupported)
- ## duplicity >= 0.6.17 : paramiko backend
diff --git a/backupninja-extbackup-fix.patch b/backupninja-extbackup-fix.patch
deleted file mode 100644
index 8ebfcdb..0000000
--- a/backupninja-extbackup-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/handlers/dup.in 2018-06-29 22:12:42.000000000 +0600
-+++ b/handlers/dup.in 2018-12-30 04:35:26.675079119 +0600
-@@ -53,13 +53,13 @@
- if [ -n "$signkey" -a -n "$encryptkey" -a "$signkey" !=
"$encryptkey" ]; then
- [ -n "$signpassword" ] || fatal "The signpassword option must be set
because signkey is different from encryptkey."
- fi
--if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"s3+http" ]; then
-+if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"s3+http" ]]; then
- [ -n "$awsaccesskeyid" -a -n "$awssecretaccesskey" ] || fatal
"AWS access keys must be set for S3 backups."
- fi
--if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"cf+http" ]; then
-+if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"cf+http" ]]; then
- [ -n "$cfusername" -a -n "$cfapikey" ] || fatal "Cloudfiles
access keys must be set for S3 backups."
- fi
--if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"dpbx" ]; then
-+if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"dpbx" ]]; then
- [ -n "$dropboxappkey" -a -n "$dropboxappsecret" ] || fatal
"Dropbox app ID and secret must be set for Dropbox backups."
-
- if [ ! -n "$dropboxaccesstoken" ]; then
diff --git a/backupninja.spec b/backupninja.spec
index f1c93ae..92017ac 100644
--- a/backupninja.spec
+++ b/backupninja.spec
@@ -1,22 +1,21 @@
Name: backupninja
-Version: 1.1.0
-Release: 9%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: Lightweight, extensible backup system
License: GPLv2
-URL:
https://0xacab.org/riseuplabs/backupninja
-Source0:
https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/...
+URL:
https://0xacab.org/liberate/backupninja
+Source0:
https://0xacab.org/liberate/backupninja/-/archive/backupninja-%{version}/...
-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
+Patch0: backupninja-1.2.1-redhat.patch
+Patch1: backupninja-1.2.1-duplicity.patch
+Patch2: backupninja-1.2.1-extbackup.patch
BuildArch: noarch
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: make
Requires: cronie
@@ -39,31 +38,30 @@ hard-linking.
%prep
-%setup -q -n backupninja-backupninja_upstream-%{version}
+%setup -q -n backupninja-backupninja-%{version}
%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
+# prepare build script
+./autogen.sh
+
# put all script 'libs' into one dir
%configure --libdir=%{_libexecdir}
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=%{buildroot}
+%make_install
mkdir -p -m 0750 %{buildroot}/%{_sysconfdir}/backup.d
%files
-%{!?_licensedir:%global license %doc}
%{_sbindir}/backupninja
%{_sbindir}/ninjahelper
%{_libexecdir}/backupninja
-%doc AUTHORS ChangeLog FAQ.md NEWS README.md TODO
+%doc AUTHORS CHANGELOG.md FAQ.md README.md TODO
%license COPYING
%config(noreplace) %{_sysconfdir}/backupninja.conf
%config(noreplace) %{_sysconfdir}/cron.d/backupninja
@@ -75,6 +73,9 @@ mkdir -p -m 0750 %{buildroot}/%{_sysconfdir}/backup.d
%changelog
+* Fri May 27 2022 Denis Fateyev <denis(a)fateyev.com> - 1.2.1-1
+- Update to 1.2.1 version
+
* Wed Jan 19 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.0-9
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index ea95bb0..b61f7c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (backupninja-1.1.0.tar.gz) =
bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
+SHA512 (backupninja-1.2.1.tar.gz) =
9a502c7659bed66c1ebc1e7f532a376282f559525a2951ed29846bb5db93a45e3a00365840f8632bb612d3bea49d77f5b7bfeec367544754a6d09fb1d28c39cc
https://src.fedoraproject.org/rpms/backupninja/c/8e3d094c9636090030b47242...