Here is an update for rdiff-backup, bringing it up to the newest version
(1.2.8). It has been working well for me for the past week or so.
The main attractions of the new version include actually being
supported, SHA1 checksums on the backups, and much better support for
ACLs (when backing up *to* OpenBSD, obviously).
Unfortunately, this release breaks compatibility with 1.0.*, including
the last ported version (1.0.5). People who upgrade will still be able
to access their old backups, but rdiff-backup must be updated on all
machines at once. Does this merit keeping the old version as well or a
mention on current.html (I guess not, rdiff-backup is not used by as
many people as, say, PostgreSQL - and the recovery is easier)?
I'm willing to maintain the current version, and, should 1.0.5 be kept,
1.0.5.
As always, please test and commit.
Joachim
Index: Makefile
===================================================================
RCS file: /usr/obsd-repos/ports/sysutils/rdiff-backup/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 12 Oct 2009 23:52:08 -0000 1.7
+++ Makefile 15 Nov 2009 16:19:33 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2009/10/12 23:52:08 naddy Exp $
COMMENT= incremental backup
-DISTNAME= rdiff-backup-1.0.5
-PKGNAME= ${DISTNAME}p3
+DISTNAME= rdiff-backup-1.2.8
CATEGORIES= sysutils
HOMEPAGE= http://www.nongnu.org/rdiff-backup/
+MAINTAINER= Joachim Schipper <[email protected]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /usr/obsd-repos/ports/sysutils/rdiff-backup/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 Aug 2007 10:23:51 -0000 1.1.1.1
+++ distinfo 15 Nov 2009 16:03:04 -0000
@@ -1,5 +1,5 @@
-MD5 (rdiff-backup-1.0.5.tar.gz) = +ioWX6B6lL5SxS41Rbx3WA==
-RMD160 (rdiff-backup-1.0.5.tar.gz) = ILAglvLawEwG12M3EmJSodhPS40=
-SHA1 (rdiff-backup-1.0.5.tar.gz) = TTPvPZNTLOF0ZyjixWh9o1T6/Ow=
-SHA256 (rdiff-backup-1.0.5.tar.gz) =
MOmediFis2mMLE+9BNfH1fywiszyAO+Ia+VgIm+vWlA=
-SIZE (rdiff-backup-1.0.5.tar.gz) = 152215
+MD5 (rdiff-backup-1.2.8.tar.gz) = GpTcU3/PdNajqAvSeAjnew==
+RMD160 (rdiff-backup-1.2.8.tar.gz) = 9/t6iUr+F7SVYRo3OMhSY65ysrU=
+SHA1 (rdiff-backup-1.2.8.tar.gz) = FP/k9bRqipbe1TbB0Drl6F+q4xg=
+SHA256 (rdiff-backup-1.2.8.tar.gz) =
DZGoW0CUkRb6iq8V2hZcNKLRVEmzy+AcgCY5ExCslds=
+SIZE (rdiff-backup-1.2.8.tar.gz) = 196526
Index: patches/patch-setup_py
===================================================================
RCS file: /usr/obsd-repos/ports/sysutils/rdiff-backup/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 31 Aug 2007 13:14:39 -0000 1.2
+++ patches/patch-setup_py 15 Nov 2009 16:17:39 -0000
@@ -1,33 +1,26 @@
$OpenBSD: patch-setup_py,v 1.2 2007/08/31 13:14:39 jsg Exp $
---- setup.py.orig Sun Nov 12 18:32:01 2006
-+++ setup.py Fri Aug 31 22:59:39 2007
-@@ -41,6 +41,10 @@ if os.name == 'posix':
- if '-lrsync' in LIBS:
- libname = []
+--- setup.py.orig Mon Mar 16 15:36:21 2009
++++ setup.py Sun Nov 15 17:17:32 2009
+@@ -12,7 +12,8 @@ if sys.version_info[:2] < (2,2):
+ # Defaults
+ lflags_arg = []
+ libname = ['rsync']
+-incdir_list = libdir_list = None
++incdir_list = [os.path.join(os.getenv("LOCALBASE", "/usr/local"), 'include')]
++libdir_list = [os.path.join(os.getenv("LOCALBASE", "/usr/local"), 'lib')]
+ extra_options = {}
-+LOCALBASE = os.getenv("LOCALBASE", "/usr/local")
-+include_dirs = ["%s/include" % LOCALBASE]
-+library_dirs = ["%s/lib" % LOCALBASE]
-+
- setup(name="rdiff-backup",
- version=version_string,
- description="Local/remote mirroring+incremental backup",
-@@ -51,12 +55,11 @@ setup(name="rdiff-backup",
- ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),
- Extension("rdiff_backup._librsync",
-
["_librsyncmodule.c"],
--
include_dirs=incdir_list,
--
library_dirs=libdir_list,
-- libraries=libname,
--
extra_link_args=lflags_arg)],
-+ libraries=["rsync"],
-+
include_dirs=include_dirs,
-+
library_dirs=library_dirs)],
- scripts = ['rdiff-backup'],
-- data_files = [('share/man/man1', ['rdiff-backup.1']),
+ if os.name == 'posix' or os.name == 'nt':
+@@ -73,9 +74,9 @@ setup(name="rdiff-backup",
+ libraries=libname,
+
extra_link_args=lflags_arg)],
+ scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+- data_files = [('share/man/man1', ['rdiff-backup.1',
++ data_files = [('man/man1', ['rdiff-backup.1',
+
'rdiff-backup-statistics.1']),
- ('share/doc/rdiff-backup-%s' %
(version_string,),
-- ['CHANGELOG', 'COPYING', 'README',
'FAQ.html'])])
-+ data_files = [('man/man1', ['rdiff-backup.1']),
+- ['CHANGELOG', 'COPYING', 'README',
'FAQ.html'])],
+ ('share/doc/rdiff-backup',
-+ ['CHANGELOG', 'FAQ.html'])])
++ ['CHANGELOG', 'FAQ.html'])],
+ **extra_options)
Index: pkg/PLIST
===================================================================
RCS file: /usr/obsd-repos/ports/sysutils/rdiff-backup/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 31 Aug 2007 13:14:39 -0000 1.2
+++ pkg/PLIST 15 Nov 2009 16:29:27 -0000
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.2 2007/08/31 13:14:39 jsg Exp $
%%SHARED%%
bin/rdiff-backup
+bin/rdiff-backup-statistics
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/
+...@comment @filerm
lib/python${MODPY_VERSION}/site-packages/rdiff_backup-1.2.8-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/FilenameMapping.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/FilenameMapping.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/Globals.py
@@ -24,12 +26,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/backup.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/backup.pyc
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/compare.py
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/compare.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/connection.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/connection.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/eas_acls.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/eas_acls.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/fs_abilities.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/fs_abilities.pyc
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/hash.py
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/hash.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/increment.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/increment.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/iterfile.py
@@ -40,6 +46,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/librsync.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/log.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/log.pyc
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/longname.py
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/longname.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/manage.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/manage.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/metadata.py
@@ -62,6 +70,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/statistics.pyc
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/user_group.py
lib/python${MODPY_VERSION}/site-packages/rdiff_backup/user_group.pyc
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/win_acls.py
+lib/python${MODPY_VERSION}/site-packages/rdiff_backup/win_acls.pyc
+...@man man/man1/rdiff-backup-statistics.1
@man man/man1/rdiff-backup.1
share/doc/rdiff-backup/
share/doc/rdiff-backup/CHANGELOG
