Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • debian
  • fix/dont_save_partition_table_of_mapper_devices
  • fix_11285
  • master
  • pristine-tar
  • upstream
  • backupninja-0.3.4
  • backupninja-0.4.0
  • backupninja-0.4.1
  • backupninja-0.4.2
  • backupninja-0.4.4
  • backupninja-0.5
  • backupninja-0.7
  • backupninja-0.8
  • backupninja-0.9
  • backupninja-0.9.1
  • backupninja-0.9.10
  • backupninja-0.9.2
  • backupninja-0.9.3
  • backupninja-0.9.4
  • backupninja-0.9.5
  • backupninja-0.9.6
  • backupninja-0.9.7
  • backupninja-0.9.8
  • backupninja-0.9.8.1
  • backupninja-0.9.9
  • backupninja-1.0
  • backupninja-1.0-rc1
  • backupninja-1.0.1
  • backupninja-1.0.2
  • backupninja_debian/0.9.10-1
  • backupninja_debian/0.9.10-2
  • backupninja_debian/0.9.9-1
  • backupninja_debian/1.0-1
  • backupninja_debian/1.0.1-1
  • backupninja_debian/1.0.1-2
  • backupninja_debian/1.0.2-1
  • backupninja_debian/1.0_rc1-1
  • backupninja_upstream/0.9.10
  • backupninja_upstream/1.0
  • backupninja_upstream/1.0.1
  • backupninja_upstream/1.0.2
  • backupninja_upstream/1.0_rc1
43 results

Target

Select target project
No results found
Select Git revision
  • backupninja.conf.d
  • borg-custom-init-options
  • borg-sftp-support
  • borg-ssh-keygen
  • debian
  • expand_pruning_options
  • maethor-master-patch-46063
  • maethor-master-patch-70558
  • mariaback_full-intial
  • master
  • nap-initial
  • pristine-tar
  • stretch-backports
  • systemd_integration
  • upstream
  • when-override
  • backupninja-0.3.4
  • backupninja-0.4.0
  • backupninja-0.4.1
  • backupninja-0.4.2
  • backupninja-0.4.4
  • backupninja-0.5
  • backupninja-0.7
  • backupninja-0.8
  • backupninja-0.9
  • backupninja-0.9.1
  • backupninja-0.9.10
  • backupninja-0.9.2
  • backupninja-0.9.3
  • backupninja-0.9.4
  • backupninja-0.9.5
  • backupninja-0.9.6
  • backupninja-0.9.7
  • backupninja-0.9.8
  • backupninja-0.9.8.1
  • backupninja-0.9.9
  • backupninja-1.0
  • backupninja-1.0-rc1
  • backupninja-1.0.1
  • backupninja-1.0.2
  • backupninja-1.1.0
  • backupninja-1.2.0
  • backupninja-1.2.0-rc1
  • backupninja-1.2.1
  • backupninja-1.2.2
  • backupninja_debian/0.9.10-1
  • backupninja_debian/0.9.10-2
  • backupninja_debian/0.9.9-1
  • backupninja_debian/1.0-1
  • backupninja_debian/1.0.1-1
  • backupninja_debian/1.0.1-2
  • backupninja_debian/1.0.2-1
  • backupninja_debian/1.0_rc1-1
  • backupninja_debian/1.1.0-1
  • backupninja_debian/1.2.0-1
  • backupninja_debian/1.2.1-1
  • backupninja_debian/1.2.2-1
  • backupninja_upstream/0.9.10
  • backupninja_upstream/1.0
  • backupninja_upstream/1.0.1
  • backupninja_upstream/1.0.2
  • backupninja_upstream/1.0_rc1
  • backupninja_upstream/1.1.0
  • backupninja_upstream/1.2.0
  • backupninja_upstream/1.2.1
  • backupninja_upstream/1.2.2
66 results
Show changes

Commits on Source 114

14 additional commits have been omitted to prevent performance issues.
33 files
+ 10275
715
Compare changes
  • Side-by-side
  • Inline

Files

.gitignore

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line
Makefile.in
aclocal.m4
autom4te.cache/
configure
etc/Makefile.in
examples/Makefile.in
handlers/Makefile.in
install-sh
lib/Makefile.in
man/Makefile.in
missing
src/Makefile.in
Makefile
backupninja.spec
config.log
config.status
etc/Makefile
etc/backupninja.conf
etc/cron.d/backupninja
etc/logrotate.d/backupninja
examples/Makefile
handlers/Makefile
handlers/dup
handlers/dup.helper
handlers/ldap
handlers/ldap.helper
handlers/maildir
handlers/makecd
handlers/makecd.helper
handlers/mysql
handlers/mysql.helper
handlers/pgsql
handlers/pgsql.helper
handlers/rdiff
handlers/rdiff.helper
handlers/rsync
handlers/sh
handlers/svn
handlers/sys
handlers/sys.helper
handlers/tar
handlers/tar.helper
handlers/trac
lib/Makefile
lib/easydialog
lib/parseini
lib/tools
lib/vserver
man/Makefile
src/Makefile
src/backupninja
src/ninjahelper

Makefile.in

0 → 100644
+784 −0

File added.

Preview size limit exceeded, changes collapsed.

RELEASE.md

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line
Upstream
========

* update version in `configure.in`

* update first line of `ChangeLog`

* commit:

        git commit configure.in ChangeLog \
            -m "Releasing backupninja $VERSION"

* create the tarball:

        git tag -s "backupninja-$VERSION" \
            -m "Releasing backupninja $VERSION"
        ./autogen.sh
        ./configure
        make dist

* compare the content of the generated tarball with the content of the
  previous one

* `mv backupninja-$VERSION.tar.gz ../tarballs/`

* cleanup: `make distclean`

* sign the release:

        cd ../tarballs
        gpg --armor --detach-sign backupninja-$VERSION.tar.gz

* upload the generated tarball and detached signature to
  https://0xacab.org/riseuplabs/backupninja/

* push master branch and tags:

        git push origin master --follow-tags

* announce on the backupninja mailing-list

Debian
======

        ln -s backupninja-$VERSION.tar.gz backupninja_$VERSION.orig.tar.gz
        cd ../git
        git checkout debian
        gbp import-orig --upstream-vcs-tag="backupninja-$VERSION" \
            ../tarballs/backupninja-$VERSION.tar.gz
        gbp dch --auto
        dch -e
        git commit debian/changelog -m "Releasing backupninja ($DEBIAN_VERSION) to Debian unstable"
        git tag -s -m "Releasing backupninja ($DEBIAN_VERSION) to Debian unstable" backupninja_debian/$DEBIAN_VERSION
        gbp buildpackage

* push the `debian` branch
* publish the source package somewhere
* ask someone listed in the `Uploaders` control field to review and upload
* push the tag, once uploaded to Debian

aclocal.m4

0 → 100644
+740 −0

File added.

Preview size limit exceeded, changes collapsed.

backupninja.spec

0 → 100644
+65 −0
Original line number Diff line number Diff line
%define name    backupninja
%define version 1.0.2

Summary:    Backupninja backup tool
Name:       %{name}
Version:    %{version}
Release:    1
License:    GPL
Group:      Applications/System
URL:        https://0xacab.org/riseuplabs/backupninja
Source:     %{name}-%{version}.tar.gz
Requires:   bash, gawk, rdiff-backup, gzip
Provides:   %{name}
Packager:   Petr Klima <Petr.Klima@madeta-group.cz>
BuildRoot:  %{_tmppath}/%{name}-%{version}
Prefix:     %{_prefix}

%description
Modular rdiff.backup tool

%prep
%setup -q

%build
%configure
make

%install
rm -rf ${buildroot}
%makeinstall
mkdir -p "%{buildroot}%{_sysconfdir}/backup.d"
mkdir -p "%{buildroot}%{_localstatedir}/backups"
mkdir -p "%{buildroot}%{_localstatedir}/log"
touch "%{buildroot}%{_localstatedir}/log/backupninja.log"

%clean
rm -fr %{buildroot}

%files
%defattr(-,root,root,-)
%{_sbindir}/*
%{_datadir}/backupninja/*
%{_libdir}/backupninja/*

%config %{_sysconfdir}/cron.d/backupninja
%config %{_sysconfdir}/logrotate.d/backupninja

%config(noreplace) %{_sysconfdir}/backupninja.conf
%dir %{_localstatedir}/backups

%ghost %{_localstatedir}/log/backupninja.log

%doc AUTHORS COPYING ChangeLog INSTALL.md NEWS README.md
%{_mandir}/man1/*
%{_mandir}/man5/*

%defattr(0640,root,root,0750)
%dir %{_sysconfdir}/backup.d


%changelog
* Sun Oct 14 2007 Adam Monsen <haircut@gmail.com> 0.9.5-1
- use cleanup steps during %install and %clean
* Mon Apr 29 2002 Petr Klima <Petr.Klima@madeta-group.cz> 0.7.0
- first RPM release

configure

0 → 100755
+3912 −0

File added.

Preview size limit exceeded, changes collapsed.

debian/NEWS

0 → 100644
+78 −0
Original line number Diff line number Diff line
backupninja (1.0~rc1-1) unstable; urgency=low

  duplicity 0.6.17 and later has moved to a new sftp/scp backend
  which no longer uses sftp/scp client programs, but instead relies on
  paramiko, a Python ssh+sftp implementation.

  Therefore, the sshoptions option of the backupninja duplicity handler
  cannot be used for anything but the one supported by this new backend:
  -oIdentityfile=some_key_file -- all other ssh options are ignored.

 -- intrigeri <intrigeri@debian.org>  Fri, 27 Apr 2012 23:07:11 +0200

backupninja (0.9.10-1) unstable; urgency=low

  Being severely broken for ages (see #596935), LDAP support was removed upstream.
  It will come back once this code has found itself a maintainer.
  Interested? Get in touch!

 -- intrigeri <intrigeri+debian@boum.org>  Fri, 23 Sep 2011 17:32:11 +0200

backupninja (0.9.8-1) unstable; urgency=low

  * duplicity 0.6.01 and later defaults to using an archive (cache)
    directory, which was previously opt-in. Starting with backupninja
    0.9.8, the backupninja duplicity handler puts this cache into
    /var/cache/backupninja/duplicity unless specified by the user with
    the "options" setting the *.dup job.
    When backups have been performed with backupninja older than 0.9.8 in
    conjunction with duplicity 0.6.01 or later, e.g. when using Sid or
    Squeeze at certain times of the Squeeze release cycle, cache files
    were probably saved into /root/.cache/duplicity; one may want to
    delete these files, or rather save bandwidth and just move the cache
    directory to the new location:

      mkdir -p /var/cache/backupninja
      mv /root/.cache/duplicity /var/cache/backupninja/

    It is probably desirable to exclude this cache directory from
    duplicity backup sets to avoid some kind of reentrant backup problem.

 -- Micah Anderson <micah@riseup.net>  Sun, 12 Sep 2010 19:58:49 +0200

backupninja (0.9.4-1) unstable; urgency=low

  * duplicity: Old (pre-0.9.4) example.dup file used to give false
    information about the way the GnuPG-related options are used.
    Please read the new /usr/share/doc/backupninja/examples/example.dup
    file, and update your own configuration files if needed.

  * duplicity, rdiff: symlinks and globbing support in
    include/exclude/vsinclude was unclear and did not work in all
    situations, with weird behavious, due to incompatibilities
    between various readlink versions in this field. This has been made
    clear eventually: globbing is fully supported again, whereas no
    attempt is done to dereference symlinks anymore. 
    Please read the new /usr/share/doc/backupninja/examples/example.dup
    or /usr/share/doc/backupninja/examples/example.rdiff file, and update
    your own configuration files if needed.

  * duplicity: duplicity now uses sftp, which does not support all scp
    command line options; you thus have to convert the sshoptions setting
    in your *.dup configuration files, to sftp-compatible syntax; for
    example, you can replace:
      sshoptions = -i /root/.ssh/id_dsa_duplicity
    with:
      sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity

 -- Micah Anderson <micah@riseup.net>  Fri,  6 Oct 2006 13:04:45 -0600

backupninja (0.9.2-1) unstable; urgency=low

  WARNING FOR DUPLICITY USERS

  Old (pre-0.9.2) example.dup file used to give false information about the way
  the GnuPG-related options are used. Please read the new example.dup file, and
  update your own configuration files if needed.

 -- Micah Anderson <micah@riseup.net>  Thu, 29 Dec 2005 14:21:48 -0500
+4 −0
Original line number Diff line number Diff line
usr/lib
usr/sbin
usr/share/backupninja
etc/backup.d
+12 −0
Original line number Diff line number Diff line
examples/example.dup
examples/example.maildir
examples/example.makecd
examples/example.mysql
examples/example.pgsql
examples/example.rdiff
examples/example.rsync
examples/example.sh
examples/example.svn
examples/example.sys
examples/example.trac
debian/backupninja/etc/backupninja.conf
+6 −0
Original line number Diff line number Diff line
# Policy §10.9 wants 0755 or 2770 but since secrets could be stored there
# we want this only accessed by root, and optionally by the "admingroup"
# defined in backupninja.conf
non-standard-dir-perm etc/backup.d/ 2770 != 0755
# The first occurrence is for the handler, the 2nd is for the package
spelling-error-in-description rsync rsync (duplicate word) rsync
+32 −0
Original line number Diff line number Diff line
#!/bin/sh
set -e

# Remove the erroneous /etc/logrotate.d/backupninja directory if it exists

if [ -d /etc/logrotate.d/backupninja ] 
then
	rm -f /etc/logrotate.d/backupninja/backupninja
	rmdir /etc/logrotate.d/backupninja
	if [ $? -ne 0 ]
	then 
		cat << EOF

The /etc/logrotate.d/backupninja directory was created incorrectly by an earlier 
version of this package. When trying to remove this directory file(s) were found
inside this directory. There should be no files in this directory at all. 
Installation of this package will not proceed until you have cleaned this 
directory out.

EOF
	
		exit 1
	fi
fi

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0

debian/changelog

0 → 100644
+809 −0

File added.

Preview size limit exceeded, changes collapsed.

debian/compat

0 → 100644
+1 −0
Original line number Diff line number Diff line
10

debian/control

0 → 100644
+59 −0
Original line number Diff line number Diff line
Source: backupninja
Section: admin
Priority: optional
Maintainer: Debian backupninja maintainers <pkg-backupninja@lists.riseup.net>
Uploaders: Micah Anderson <micah@riseup.net>, intrigeri <intrigeri@debian.org>
Build-Depends:
 debhelper (>= 10)
Build-Conflicts: autoconf2.13
Standards-Version: 4.0.0
Homepage: https://0xacab.org/riseuplabs/backupninja
Vcs-Browser: https://0xacab.org/riseuplabs/backupninja/tree/debian
Vcs-Git: https://0xacab.org/riseuplabs/backupninja.git

Package: backupninja
Architecture: all
Depends:
 gawk | mawk,
 dialog,
 bash (>=2.05b-26),
 bsd-mailx | mailx | mailutils,
 ${misc:Depends}
Suggests:
 bzip2,
 debconf-utils,
 duplicity,
 genisoimage,
 fdisk | util-linux (<< 2.29.2-3~),
 hwinfo,
 mdadm,
 rdiff-backup,
 rsync,
 subversion,
 trickle,
 wodim
Description: lightweight, extensible meta-backup system
 Backupninja lets you drop simple config files in /etc/backup.d to
 coordinate system backups. Backupninja is a master of many arts,
 including incremental remote filesystem backup, and MySQL backup.
 By creating simple drop-in handler scripts, backupninja can learn new skills.
 Backupninja is a silent flower blossom death strike to lost data.
 .
 In addition to backing up regular files, Backupninja has handlers to ease 
 backing up: Maildir, MySQL, PostgreSQL, SVN, Trac, hardware and system
 information, as well as the output from custom shell scripts.
 .
 Backupninja currently supports common backup utilities, easing their 
 configuration, currently supported are: rdiff-backup, duplicity, rsync
 and CD/DVD.
 .
 Most handlers have their own dependencies/recommendations, shown in brackets
 below:
 .
  - dup [duplicity, trickle]
  - rdiff [rdiff-backup]
  - sys [debconf-utils, hwinfo, mdadm]
  - makecd [genisoimage, wodim]
  - rsync [rsync]
  - svn [subversion]
  - tar [bzip2]

debian/copyright

0 → 100644
+34 −0
Original line number Diff line number Diff line
This was turned into a debian package by Micah Anderson <micah@riseup.net> on
Sat, 18 Sep 2004 16:03:11 -0500.

The upstream source was obtained from
https://0xacab.org/riseuplabs/backupninja

The Git repository can be viewed at
https://0xacab.org/riseuplabs/backupninja/tree/debian

backupninja was originally written by elijah@riseup.net, for a full list of
authors see AUTHORS.

Copyright (C) 2004-2010 Riseup Networks
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
		 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
	  
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to:

        Free Software Foundation, Inc. 
	51 Franklin St, Fifth Floor
	Boston, MA 02110-1301, USA.

On Debian GNU/Linux systems, the complete text of the GNU General Public
License can be found in the /usr/share/common-licenses' directory.

debian/docs

0 → 100644
+2 −0
Original line number Diff line number Diff line
README
AUTHORS

debian/gbp.conf

0 → 100644
+6 −0
Original line number Diff line number Diff line
[DEFAULT]
upstream-branch = upstream
debian-branch = debian
upstream-tag = backupninja_upstream/%(version)s
debian-tag = backupninja_debian/%(version)s
pristine-tar = True

debian/rules

0 → 100755
+30 −0
Original line number Diff line number Diff line
#!/usr/bin/make -f
# -*- makefile -*-

PACKAGE = backupninja
TMP = $(CURDIR)/debian/$(PACKAGE)

%:
	dh $@

override_dh_auto_configure:
	dh_auto_configure -- \
	   --libdir=\$${prefix}/lib \
	   --libexecdir=\$${prefix}/lib

override_dh_auto_install:
	dh_auto_install
	chmod a-x $(TMP)/usr/lib/backupninja/parseini
	chmod a-x $(TMP)/usr/lib/backupninja/vserver
	rm $(TMP)/usr/share/backupninja/example.*

override_dh_compress:
	dh_compress -Xexample

override_dh_fixperms:
	dh_fixperms
	chmod 2770 $(TMP)/etc/backup.d

override_dh_installchangelogs:
	dh_installchangelogs ChangeLog

debian/source/format

0 → 100644
+1 −0
Original line number Diff line number Diff line
3.0 (quilt)
+5 −0
Original line number Diff line number Diff line
# Upstream does not publish any tarball other than GitLab-generated ones,
# that should not be imported directly via uscan and gbp import-orig,
# so debian/watch is voluntarily not provided in order to avoid malformed
# imports.
backupninja: debian-watch-file-is-missing

debian/source/options

0 → 100644
+1 −0
Original line number Diff line number Diff line
extend-diff-ignore = "(^|/)(aclocal.m4|config\.sub|config\.guess|configure|install-sh|Makefile|Makefile.in|missing)$"