Notification time stamped 2022-05-31 23:06:22 UTC
From 65bd5ebe34448492252dd480047f9e88330ae19d Mon Sep 17 00:00:00 2001
From: Denis Fateyev <denis(a)fateyev.com>
Date: Dec 31 2018 00:23:42 +0000
Subject: backupninja: 1.1.0 release
---
diff --git a/.gitignore b/.gitignore
index 7a06107..a81f1e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/backupninja-1.0.1.tar.gz
+/backupninja-1.1.0.tar.gz
diff --git a/backupninja-1.1.0-redhat.patch b/backupninja-1.1.0-redhat.patch
new file mode 100644
index 0000000..03a70e4
--- /dev/null
+++ b/backupninja-1.1.0-redhat.patch
@@ -0,0 +1,56 @@
+--- 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-duplicity-version.patch b/backupninja-duplicity-version.patch
index 9bb7566..0e933a4 100644
--- a/backupninja-duplicity-version.patch
+++ b/backupninja-duplicity-version.patch
@@ -1,17 +1,11 @@
---- a/handlers/dup.in 2016-07-08 01:47:13 +0600
-+++ b/handlers/dup.in 2016-07-08 01:48:48 +0600
-@@ -109,10 +109,10 @@
+--- 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_major="`echo $duplicity_version | @AWK@ -F '.' '{print
$1}'`"
--duplicity_minor="`echo $duplicity_version | @AWK@ -F '.' '{print
$2}'`"
--duplicity_sub="`echo $duplicity_version | @AWK@ -F '.' '{print
$3}'`"
+duplicity_version="`duplicity --version | @AWK@ 'END{print $2}' | @SED@
's/[^.[:digit:]]//g'`"
-+duplicity_major="`echo \"$duplicity_version\" | @AWK@ -F '.'
'{print $1}'`"
-+duplicity_minor="`echo \"$duplicity_version\" | @AWK@ -F '.'
'{print $2}'`"
-+duplicity_sub="`echo \"$duplicity_version\" | @AWK@ -F '.'
'{print $3}'`"
### 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
index 73d75a6..8ebfcdb 100644
--- a/backupninja-extbackup-fix.patch
+++ b/backupninja-extbackup-fix.patch
@@ -1,19 +1,19 @@
---- a/handlers/dup.in 2016-07-08 01:47:13 +0600
-+++ b/handlers/dup.in 2016-07-08 01:54:02 +0600
-@@ -248,14 +248,14 @@
- execstr_source=${execstr_source//\\*/\\\\\\*}
-
- ### If desturl is an S3 URL export the AWS environment variables
+--- 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
- export AWS_ACCESS_KEY_ID="$awsaccesskeyid"
- export AWS_SECRET_ACCESS_KEY="$awssecretaccesskey"
++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 desturl is a RackSpace's CloudFiles URL export the relevant
- ### environment variables
-if [ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" ==
"cf+http" ]; then
-+if [[ "`echo $desturl | @AWK@ -F ':' '{print $1}'`" =~
'cf+http' ]]; then
- export CLOUDFILES_USERNAME="$cfusername"
- export CLOUDFILES_APIKEY="$cfapikey"
- if [ -n "$cfauthurl" ]; 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 662ca86..d30efb2 100644
--- a/backupninja.spec
+++ b/backupninja.spec
@@ -1,28 +1,24 @@
Name: backupninja
-Version: 1.0.1
-Release: 12%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Lightweight, extensible backup system
Group: Applications/System
License: GPLv2
-URL:
https://labs.riseup.net/code/projects/backupninja
-Source0:
https://labs.riseup.net/code/attachments/download/275/backupninja-1.0.1.t...
+URL:
https://0xacab.org/riseuplabs/backupninja
+Source0:
https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/...
-Patch0: backupninja-rsync-action.patch
-Patch1: backupninja-1.0.1-redhat.patch
-Patch2: backupninja-duplicity-version.patch
-Patch3: backupninja-extbackup-fix.patch
+Patch0: backupninja-1.1.0-redhat.patch
+Patch1: backupninja-duplicity-version.patch
+Patch2: backupninja-extbackup-fix.patch
BuildArch: noarch
-Requires: rdiff-backup
-Requires: logrotate
-%if 0%{?el5}
-Requires: vixie-cron
-%else
Requires: cronie
-%endif
+Requires: gawk
+Requires: logrotate
+Requires: rdiff-backup
%description
@@ -39,11 +35,10 @@ hard-linking.
%prep
-%setup -q
-%patch0 -p1 -b .rsync
-%patch1 -p1 -b .redhat
-%patch2 -p1 -b .dupver
-%patch3 -p1 -b .extbck
+%setup -q -n backupninja-backupninja_upstream-%{version}
+%patch0 -p1 -b .redhat
+%patch1 -p1 -b .dupver
+%patch2 -p1 -b .extbck
%build
# put all script 'libs' into one dir
@@ -52,24 +47,16 @@ hard-linking.
make %{?_smp_mflags}
%install
-%if 0%{?el5}
-rm -rf %{buildroot}
-%endif
make install DESTDIR=%{buildroot}
mkdir -p -m 0750 %{buildroot}/%{_sysconfdir}/backup.d
-%if 0%{?el5}
-%clean
-rm -rf %{buildroot}
-%endif
-
%files
%{!?_licensedir:%global license %doc}
%{_sbindir}/backupninja
%{_sbindir}/ninjahelper
%{_libexecdir}/backupninja
-%doc AUTHORS ChangeLog FAQ NEWS README TODO
+%doc AUTHORS ChangeLog FAQ.md NEWS README.md TODO
%license COPYING
%config(noreplace) %{_sysconfdir}/backupninja.conf
%config(noreplace) %{_sysconfdir}/cron.d/backupninja
@@ -81,6 +68,9 @@ rm -rf %{buildroot}
%changelog
+* Sun Dec 30 2018 Denis Fateyev <denis(a)fateyev.com> - 1.1.0-1
+- Update to 1.1.0 version
+
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-12
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index c68f4d7..ea95bb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afd80afa50faa79e721f77913741c31a backupninja-1.0.1.tar.gz
+SHA512 (backupninja-1.1.0.tar.gz) =
bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
https://src.fedoraproject.org/rpms/backupninja/c/65bd5ebe34448492252dd480...