--- a/components/rdiff-backup/Makefile Sat Apr 21 01:36:38 2012 -0700
+++ b/components/rdiff-backup/Makefile Sat Apr 21 06:47:00 2012 -0700
@@ -25,10 +25,10 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= rdiff-backup
-COMPONENT_VERSION= 1.2.1
+COMPONENT_VERSION= 1.3.3
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:4479584da1ef85814e01f59b406cadd63cd6f405
+COMPONENT_ARCHIVE_HASH= sha1:b36c9b5c06941a86210242f8213f60153a1eba28
COMPONENT_ARCHIVE_URL= http://download.savannah.gnu.org/releases/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.nongnu.org/rdiff-backup/
@@ -36,10 +36,10 @@
include $(WS_TOP)/make-rules/ips.mk
include $(WS_TOP)/make-rules/setup.py.mk
-# just build a Python 2.6 version for now, when the 2.7 modules show up, we can
-# switch
-PYTHON_VERSIONS = 2.6
-PYTHON_DATA = /usr
+## just build a Python 2.6 version for now, when the 2.7 modules show up, we can
+## switch
+#PYTHON_VERSIONS = 2.6
+#PYTHON_DATA = /usr
# common targets
--- a/components/rdiff-backup/patches/deprecation.patch Sat Apr 21 01:36:38 2012 -0700
+++ b/components/rdiff-backup/patches/deprecation.patch Sat Apr 21 06:47:00 2012 -0700
@@ -1,26 +1,16 @@
-*** rdiff-backup-1.2.1/rdiff-backup.orig Wed Oct 27 13:44:47 2010
---- rdiff-backup-1.2.1/rdiff-backup Wed Oct 27 13:45:19 2010
-***************
-*** 1,4 ****
-! #!/usr/bin/env python
- # rdiff-backup -- Mirror files while keeping incremental changes
- # Version 1.2.1 released August 24, 2008
- # Copyright (C) 2001-2005 Ben Escoto <[email protected]>
---- 1,4 ----
-! #!/usr/bin/env python -Wignore::DeprecationWarning
- # rdiff-backup -- Mirror files while keeping incremental changes
- # Version 1.2.1 released August 24, 2008
- # Copyright (C) 2001-2005 Ben Escoto <[email protected]>
-*** rdiff-backup-1.2.1/rdiff-backup-statistics.orig Wed Oct 27 13:44:58 2010
---- rdiff-backup-1.2.1/rdiff-backup-statistics Wed Oct 27 13:45:25 2010
-***************
-*** 1,4 ****
-! #!/usr/bin/python
- # rdiff-backup-statistics -- Summarize rdiff-backup statistics files
- # Version 1.2.1 released August 24, 2008
- # Copyright 2005 Dean Gaudet, Ben Escoto
---- 1,4 ----
-! #!/usr/bin/python -Wignore::DeprecationWarning
- # rdiff-backup-statistics -- Summarize rdiff-backup statistics files
- # Version 1.2.1 released August 24, 2008
- # Copyright 2005 Dean Gaudet, Ben Escoto
+--- rdiff-backup-1.3.3/rdiff-backup.orig 2012-04-20 11:25:32.426561687 -0700
++++ rdiff-backup-1.3.3/rdiff-backup 2012-04-20 11:25:59.110285172 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python -Wignore::DeprecationWarning
+ # rdiff-backup -- Mirror files while keeping incremental changes
+ # Version 1.3.3 released March 16, 2009
+ # Copyright (C) 2001-2005 Ben Escoto <[email protected]>
+--- rdiff-backup-1.3.3/rdiff-backup-statistics.orig 2012-04-20 11:25:40.987972998 -0700
++++ rdiff-backup-1.3.3/rdiff-backup-statistics 2012-04-20 11:26:11.988817234 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python -Wignore::DeprecationWarning
+ # rdiff-backup-statistics -- Summarize rdiff-backup statistics files
+ # Version 1.3.3 released March 16, 2009
+ # Copyright 2005 Dean Gaudet, Ben Escoto
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rdiff-backup/rdiff-backup-26.p5m Sat Apr 21 06:47:00 2012 -0700
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+ value=PSARC/2008/272
+
+license rdiff-backup.copyright license="GPLv2"
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/rdiff_backup
+
+file build/scripts-2.6/rdiff-backup \
+ path=usr/bin/rdiff-backup-2.6 \
+ pkg.depend.bypass-generate=.*msvcrt.*
+file build/scripts-2.6/rdiff-backup-statistics \
+ path=usr/bin/rdiff-backup-statistics-2.6
+file \
+ path=usr/lib/python2.6/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/C.so
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/FilenameMapping.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Globals.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Hardlink.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Main.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Rdiff.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Security.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/SetConnections.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/TempFile.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Time.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/__init__.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/_librsync.so
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/backup.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/compare.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/connection.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/eas_acls.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/fs_abilities.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/hash.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/increment.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/iterfile.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/lazy.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/librsync.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/log.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/longname.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/manage.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/metadata.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/regress.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/restore.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/robust.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rorpiter.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rpath.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/selection.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/static.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/statistics.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/user_group.py
+file path=usr/lib/python2.6/vendor-packages/rdiff_backup/win_acls.py
+
+link path=usr/bin/rdiff-backup target=rdiff-backup-2.6 \
+ mediator=python mediator-version=2.6
+
+link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.6 \
+ mediator=python mediator-version=2.6
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the rdiff-backup package
+depend fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ type=require
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/rdiff-backup/rdiff-backup-27.p5m Sat Apr 21 06:47:00 2012 -0700
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Local/remote mirror and incremental backup utility"
+set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+ value=PSARC/2008/272
+
+license rdiff-backup.copyright license="GPLv2"
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/rdiff_backup
+
+file build/scripts-2.7/rdiff-backup \
+ path=usr/bin/rdiff-backup-2.7 \
+ pkg.depend.bypass-generate=.*msvcrt.*
+file build/scripts-2.7/rdiff-backup-statistics \
+ path=usr/bin/rdiff-backup-statistics-2.7
+file \
+ path=usr/lib/python2.7/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/C.so
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/FilenameMapping.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Globals.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Hardlink.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Main.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Rdiff.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Security.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/SetConnections.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/TempFile.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Time.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/__init__.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/_librsync.so
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/backup.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/compare.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/connection.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/eas_acls.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/fs_abilities.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/hash.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/increment.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/iterfile.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/lazy.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/librsync.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/log.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/longname.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/manage.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/metadata.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/regress.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/restore.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/robust.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/rorpiter.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/rpath.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/selection.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/static.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/statistics.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/user_group.py
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup/win_acls.py
+
+link path=usr/bin/rdiff-backup target=rdiff-backup-2.7 \
+ mediator=python mediator-version=2.7
+
+link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.7 \
+ mediator=python mediator-version=2.7
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the rdiff-backup package
+depend fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ type=require
--- a/components/rdiff-backup/rdiff-backup.copyright Sat Apr 21 01:36:38 2012 -0700
+++ b/components/rdiff-backup/rdiff-backup.copyright Sat Apr 21 06:47:00 2012 -0700
@@ -1,3 +1,7 @@
+----------------------
+- rdiff-backup 1.3.3 -
+----------------------
+
Oracle elects to use only the GNU Lesser General Public License version
2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
where a choice of LGPL/GPL license versions are made available with the
--- a/components/rdiff-backup/rdiff-backup.p5m Sat Apr 21 01:36:38 2012 -0700
+++ b/components/rdiff-backup/rdiff-backup.p5m Sat Apr 21 06:47:00 2012 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,60 +32,24 @@
set name=org.opensolaris.arc-caseid \
value=PSARC/2008/272
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/rdiff_backup
+license rdiff-backup.copyright license="GPLv2"
+
dir path=usr/share
dir path=usr/share/doc
-dir path=usr/share/doc/rdiff-backup-1.2.1
+dir path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)
dir path=usr/share/man
dir path=usr/share/man/man1
-file path=usr/bin/rdiff-backup
-file path=usr/bin/rdiff-backup-statistics
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/__init__.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/_librsync.so
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/backup.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/C.so
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/compare.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/connection.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/eas_acls.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/FilenameMapping.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/fs_abilities.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Globals.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Hardlink.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/hash.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/increment.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/iterfile.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/lazy.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/librsync.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/log.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/longname.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Main.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/manage.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/metadata.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Rdiff.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/regress.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/restore.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/robust.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rorpiter.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/rpath.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Security.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/selection.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/SetConnections.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/static.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/statistics.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/TempFile.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/Time.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/user_group.py
-file path=usr/lib/python2.6/vendor-packages/rdiff_backup/win_acls.py
-file path=usr/share/doc/rdiff-backup-1.2.1/COPYING
-file path=usr/share/doc/rdiff-backup-1.2.1/FAQ.html
-file path=usr/share/doc/rdiff-backup-1.2.1/README
-file path=usr/share/man/man1/rdiff-backup-statistics.1
-file path=usr/share/man/man1/rdiff-backup.1
+file CHANGELOG path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/CHANGELOG
+file COPYING path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/COPYING
+file FAQ.html path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/FAQ.html
+file README path=usr/share/doc/rdiff-backup-$(COMPONENT_VERSION)/README
+file rdiff-backup-statistics.1 path=usr/share/man/man1/rdiff-backup-statistics.1
+file rdiff-backup.1 path=usr/share/man/man1/rdiff-backup.1
-license rdiff-backup.copyright license="GPLv2"
+depend fmri=backup/rdiff-backup-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26 \
+ type=conditional
+depend fmri=backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27 \
+ type=conditional