ports/126313: [PATCH] sysutils/rdiff-backup: update to 1.2.0
peter.schuller at infidyne.com
peter.schuller at infidyne.com
Wed Aug 6 20:10:03 UTC 2008
>Number: 126313
>Category: ports
>Synopsis: [PATCH] sysutils/rdiff-backup: update to 1.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 06 20:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: peter.schuller at infidyne.com
>Release: FreeBSD 7.0-RELEASE-p1 amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Sun Jul 27 18:56:49 CEST 2008
>Description:
Okay. So rdiff-backup has released the first new stable version in a
long time, with the previous development branch becoming
stable. Noteworthy facts:
* 1.1.16 introduced a non-backwards compatible change, which means
that relative to the current ports version 1.1.15, the 1.2.0 is
incompatible. However, being development releases, we'll just have
to live with that - though personally I'd suggest a /usr/ports/UPDATING
entry about this.
* rdiff-backup 1.0 is still useful for interoperating with others systems
that don't have new versions, or for that matter with FreeBSD systems
were upgrading is a chore (in part due to changed archive formats)
* rdiff-backup-devel is likely to remain relevant as they plan to diverege
quite alot, among other things moving to 2.6 and 3.0
So as a result, my suggestion/plan is:
* Update sysutils/rdiff-backup to 1.2.0
* Update sysutils/rdiff-backup-devel to 1.2.0 as well since keeping the old
-devel around does not seem consistent with what is typically done.
* Create sysutils/rdiff-backup10 port will will stay with 1.0.5, to provide a
backwards compatible upgrade path for users.
This PR contains the diff to update rdiff-backup to 1.2.0. When I get
a PR number from GNATS, I will submit separate PR:s for
rdiff-backup-devel and rdiff-backup10 aswell, referencing this PR.
- Update to 1.2.0
Port maintainer (vd at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- rdiff-backup-1.2.0,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/rdiff-backup.orig/Makefile /usr/ports/sysutils/rdiff-backup/Makefile
--- /usr/ports/sysutils/rdiff-backup.orig/Makefile 2008-06-06 16:03:18.000000000 +0200
+++ /usr/ports/sysutils/rdiff-backup/Makefile 2008-08-06 21:51:54.930544493 +0200
@@ -1,13 +1,12 @@
-# New ports collection makefile for: rdiff-backup
-# Date created: Wed Jun 11 19:53:46 CEST 2003
-# Whom: Gerhard Häring <gh at ghaering.de>
+# New ports collection makefile for: rdiff-backup-devel
+# Date created: 10 Nov 2005
+# Whom: Vasil Dimov <vd at datamax.bg>
#
-# $FreeBSD: ports/sysutils/rdiff-backup/Makefile,v 1.18 2008/06/06 14:03:18 edwin Exp $
+# $FreeBSD: ports/sysutils/rdiff-backup-devel/Makefile,v 1.14 2008/06/06 14:03:18 edwin Exp $
#
PORTNAME= rdiff-backup
-PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.2.0
PORTEPOCH= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
@@ -22,21 +21,24 @@
LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync
+CONFLICTS= rdiff-backup10-[0-9]*
CONFLICTS= rdiff-backup-devel-[0-9]*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
-MAN1= rdiff-backup.1
+MAN1= rdiff-backup.1 rdiff-backup-statistics.1
DOCFILES= CHANGELOG README COPYING FAQ.html
post-install:
- ${INSTALL_MAN} ${WRKSRC}/rdiff-backup.1 ${PREFIX}/man/man1
+.for man in ${MAN1}
+ ${INSTALL_MAN} ${WRKSRC}/${man} ${PREFIX}/man/man1
+.endfor
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for doc in ${DOCFILES}
+ ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
.endfor
.endif
diff -ruN --exclude=CVS /usr/ports/sysutils/rdiff-backup.orig/distinfo /usr/ports/sysutils/rdiff-backup/distinfo
--- /usr/ports/sysutils/rdiff-backup.orig/distinfo 2006-11-14 08:20:21.000000000 +0100
+++ /usr/ports/sysutils/rdiff-backup/distinfo 2008-08-06 21:14:36.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (rdiff-backup-1.0.5.tar.gz) = fa2a165fa07a94be52c52e3545bc7758
-SHA256 (rdiff-backup-1.0.5.tar.gz) = 30e99e762162b3698c2c4fbd04d7c7d5fcb08accf200ef886be560226faf5a50
-SIZE (rdiff-backup-1.0.5.tar.gz) = 152215
+MD5 (rdiff-backup-1.2.0.tar.gz) = 65597d2d1ce12efe9ab2fa20cd029e0c
+SHA256 (rdiff-backup-1.2.0.tar.gz) = 2e9f8485f7dd662ec043e29101db4c80b83a56ef80a349d1f0bc7d73fc4e60fa
+SIZE (rdiff-backup-1.2.0.tar.gz) = 187974
diff -ruN --exclude=CVS /usr/ports/sysutils/rdiff-backup.orig/files/patch-setup.py /usr/ports/sysutils/rdiff-backup/files/patch-setup.py
--- /usr/ports/sysutils/rdiff-backup.orig/files/patch-setup.py 2003-07-03 10:32:25.000000000 +0200
+++ /usr/ports/sysutils/rdiff-backup/files/patch-setup.py 2008-08-06 21:24:47.000000000 +0200
@@ -1,8 +1,8 @@
---- setup.py.orig Thu Jun 26 15:27:30 2003
-+++ setup.py Thu Jul 3 15:09:19 2003
-@@ -41,6 +41,10 @@
- if '-lrsync' in LIBS:
- libname = []
+--- setup.py.orig 2008-08-06 21:24:28.756047734 +0200
++++ setup.py 2008-08-06 21:24:18.122056264 +0200
+@@ -58,6 +58,10 @@
+ 'zipfile': None
+ })
+LOCALBASE = os.getenv("LOCALBASE", "/usr/local")
+include_dirs = ["%s/include" % LOCALBASE]
@@ -11,20 +11,21 @@
setup(name="rdiff-backup",
version=version_string,
description="Local/remote mirroring+incremental backup",
-@@ -51,12 +55,9 @@
+@@ -68,14 +72,8 @@
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']),
++ include_dirs=include_dirs,
++ library_dirs=library_dirs,
+ libraries=libname,
+ extra_link_args=lflags_arg)],
+- scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+- data_files = [('share/man/man1', ['rdiff-backup.1',
+- 'rdiff-backup-statistics.1']),
- ('share/doc/rdiff-backup-%s' % (version_string,),
-- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])
-+)
-
+- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
+- **extra_options)
+-
++ scripts = ['rdiff-backup', 'rdiff-backup-statistics'])
diff -ruN --exclude=CVS /usr/ports/sysutils/rdiff-backup.orig/pkg-descr /usr/ports/sysutils/rdiff-backup/pkg-descr
--- /usr/ports/sysutils/rdiff-backup.orig/pkg-descr 2005-10-08 09:09:49.000000000 +0200
+++ /usr/ports/sysutils/rdiff-backup/pkg-descr 2006-01-04 10:27:54.000000000 +0100
@@ -9,4 +9,6 @@
rdiff-backup and ssh to securely back a hard drive up to a remote location,
and only the differences will be transmitted.
+This is the development version of rdiff-backup.
+
WWW: http://www.nongnu.org/rdiff-backup/
diff -ruN --exclude=CVS /usr/ports/sysutils/rdiff-backup.orig/pkg-plist /usr/ports/sysutils/rdiff-backup/pkg-plist
--- /usr/ports/sysutils/rdiff-backup.orig/pkg-plist 2005-10-08 09:09:49.000000000 +0200
+++ /usr/ports/sysutils/rdiff-backup/pkg-plist 2008-08-06 21:29:24.000000000 +0200
@@ -1,4 +1,5 @@
bin/rdiff-backup
+bin/rdiff-backup-statistics
%%PYTHON_SITELIBDIR%%/rdiff_backup/C.so
%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyc
@@ -34,6 +35,9 @@
%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyo
%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyo
@@ -43,6 +47,9 @@
%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyo
%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyo
@@ -58,6 +65,9 @@
%%PYTHON_SITELIBDIR%%/rdiff_backup/log.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyo
%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyo
@@ -91,6 +101,9 @@
%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py
%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc
%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
--- rdiff-backup-1.2.0,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list