Revision: 15695
http://gar.svn.sourceforge.net/gar/?rev=15695&view=rev
Author: bdwalton
Date: 2011-09-21 00:50:20 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
rsync/branches/3.1.0dev: drop all patches (now incorporated), drop patch flag,
update makesums for newer tarball
Modified Paths:
--------------
csw/mgar/pkg/rsync/branches/3.1.0dev/Makefile
csw/mgar/pkg/rsync/branches/3.1.0dev/checksums
Removed Paths:
-------------
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0001-change-xattr-tool-detection-to-use-uname-s.patch
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0002-Testsuite-Honour-PATH-when-finding-fakeroot.patch
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Honour-PATH-when-finding-sh.patch
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Use-SHELL-instead-of-bin-sh.patch
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0004-Testsuite-Extend-xattr-manipulation-for-Solaris.patch
Modified: csw/mgar/pkg/rsync/branches/3.1.0dev/Makefile
===================================================================
--- csw/mgar/pkg/rsync/branches/3.1.0dev/Makefile 2011-09-20 20:29:10 UTC
(rev 15694)
+++ csw/mgar/pkg/rsync/branches/3.1.0dev/Makefile 2011-09-21 00:50:20 UTC
(rev 15695)
@@ -17,13 +17,6 @@
MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES += 0001-change-xattr-tool-detection-to-use-uname-s.patch
-PATCHFILES += 0002-Testsuite-Honour-PATH-when-finding-fakeroot.patch
-PATCHFILES += 0003-Testsuite-Honour-PATH-when-finding-sh.patch
-PATCHFILES += 0004-Testsuite-Extend-xattr-manipulation-for-Solaris.patch
-
-VERSION_FLAG_PATCH = 1
-
VENDOR_URL = http://rsync.samba.org/
RUNTIME_DEP_PKGS_CSWrsync = CSWlibiconv2
Modified: csw/mgar/pkg/rsync/branches/3.1.0dev/checksums
===================================================================
--- csw/mgar/pkg/rsync/branches/3.1.0dev/checksums 2011-09-20 20:29:10 UTC
(rev 15694)
+++ csw/mgar/pkg/rsync/branches/3.1.0dev/checksums 2011-09-21 00:50:20 UTC
(rev 15695)
@@ -1 +1 @@
-77d1ded7dbd26eb69a5139ebd8e8d3ec rsync-3.1.0dev.tar.gz
+662c86b341e85d6678a0fb2e5c3f4db0 rsync-3.1.0dev.tar.gz
Deleted:
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0001-change-xattr-tool-detection-to-use-uname-s.patch
===================================================================
---
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0001-change-xattr-tool-detection-to-use-uname-s.patch
2011-09-20 20:29:10 UTC (rev 15694)
+++
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0001-change-xattr-tool-detection-to-use-uname-s.patch
2011-09-21 00:50:20 UTC (rev 15695)
@@ -1,60 +0,0 @@
-From caf377045493be26506f83cb7abd4fbf12c15ce5 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Thu, 15 Sep 2011 04:26:00 +0200
-Subject: [PATCH 1/5] change xattr tool detection to use uname -s
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- testsuite/chown.test | 4 ++--
- testsuite/devices.test | 4 ++--
- testsuite/xattrs.test | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/testsuite/chown.test b/testsuite/chown.test
-index d238a8f..ee1f020 100644
---- a/testsuite/chown.test
-+++ b/testsuite/chown.test
-@@ -18,8 +18,8 @@ case $0 in
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync
needs xattrs for fake device tests"
- RSYNC="$RSYNC --fake-super"
- TLS_ARGS="$TLS_ARGS --fake-super"
-- case "`xattr 2>&1 || true`" in
-- *--list:*)
-+ case "`uname -s`" in
-+ Darwin)
- chown() {
- own=$1
- shift
-diff --git a/testsuite/devices.test b/testsuite/devices.test
-index a85954b..fcd3eb0 100644
---- a/testsuite/devices.test
-+++ b/testsuite/devices.test
-@@ -19,8 +19,8 @@ case $0 in
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync
needs xattrs for fake device tests"
- RSYNC="$RSYNC --fake-super"
- TLS_ARGS="$TLS_ARGS --fake-super"
-- case "`xattr 2>&1 || true`" in
-- *--list:*)
-+ case "`uname -s`" in
-+ Darwin)
- mknod() {
- fn="$1"
- case "$2" in
-diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
-index c1846df..fd2957a 100644
---- a/testsuite/xattrs.test
-+++ b/testsuite/xattrs.test
-@@ -10,8 +10,8 @@ lnkdir="$tmpdir/lnk"
-
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is
configured without xattr support"
-
--case "`xattr 2>&1 || true`" in
--*--list:*)
-+case "`uname -s`" in
-+Darwin)
- xset() {
- xnam="$1"
- xval="$2"
---
-1.7.4.1
-
Deleted:
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0002-Testsuite-Honour-PATH-when-finding-fakeroot.patch
===================================================================
---
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0002-Testsuite-Honour-PATH-when-finding-fakeroot.patch
2011-09-20 20:29:10 UTC (rev 15694)
+++
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0002-Testsuite-Honour-PATH-when-finding-fakeroot.patch
2011-09-21 00:50:20 UTC (rev 15695)
@@ -1,60 +0,0 @@
-From 636313b2b4bce8b8f6ce99d16258f10590ebf6d1 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sat, 17 Sep 2011 15:14:23 +0200
-Subject: [PATCH 2/5] Testsuite: Honour PATH when finding fakeroot
-
-Some systems may have fakeroot, but not at /usr/bin. Use PATH to see
-if the tool is available. This will allow using fakeroot on a
-Solaris/OpenCSW stack where fakeroot is at /opt/csw/bin/fakeroot.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- testsuite/chown.test | 6 ++++--
- testsuite/devices.test | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/testsuite/chown.test b/testsuite/chown.test
-index ee1f020..5631747 100644
---- a/testsuite/chown.test
-+++ b/testsuite/chown.test
-@@ -37,12 +37,14 @@ case $0 in
- ;;
- *)
- RSYNC="$RSYNC --super"
-+ # make fakeroot detection take path into account
-+ fr="`which fakeroot 2>/dev/null`"
- case `get_testuid` in
- '') ;; # If "id" failed, try to continue...
- 0) ;;
-- *) if [ -f /usr/bin/fakeroot ]; then
-+ *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec /usr/bin/fakeroot /bin/sh "$0"
-+ exec "${fr}" /bin/sh "$0"
- fi
- ;;
- esac
-diff --git a/testsuite/devices.test b/testsuite/devices.test
-index fcd3eb0..30bc1c4 100644
---- a/testsuite/devices.test
-+++ b/testsuite/devices.test
-@@ -51,12 +51,14 @@ case $0 in
- esac
- ;;
- *)
-+ # make fakeroot detection take path into account
-+ fr="`which fakeroot 2>/dev/null`"
- case `get_testuid` in
- '') ;; # If "id" failed, try to continue...
- 0) ;;
-- *) if [ -f /usr/bin/fakeroot ]; then
-+ *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec /usr/bin/fakeroot /bin/sh $RUNSHFLAGS "$0"
-+ exec "${fr}" /bin/sh $RUNSHFLAGS "$0"
- fi
- test_skipped "Rsync needs root/fakeroot for device tests"
- ;;
---
-1.7.4.1
-
Deleted:
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Honour-PATH-when-finding-sh.patch
===================================================================
---
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Honour-PATH-when-finding-sh.patch
2011-09-20 20:29:10 UTC (rev 15694)
+++
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Honour-PATH-when-finding-sh.patch
2011-09-21 00:50:20 UTC (rev 15695)
@@ -1,59 +0,0 @@
-From a75afb3147f3be3378caeb1629611e6023b72a7b Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sat, 17 Sep 2011 15:17:39 +0200
-Subject: [PATCH 3/5] Testsuite: Honour PATH when finding sh
-
-This patch removes the hard coding of /bin/sh so that on Solaris where
-the test suite is run with /usr/xpg4/bin leading the PATH, the POSIX
-sh will be used instead of the default system shell. ($SHELL does not
-seem to be reliably set.)
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- testsuite/chown.test | 4 +++-
- testsuite/devices.test | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/chown.test b/testsuite/chown.test
-index 5631747..7038550 100644
---- a/testsuite/chown.test
-+++ b/testsuite/chown.test
-@@ -39,12 +39,14 @@ case $0 in
- RSYNC="$RSYNC --super"
- # make fakeroot detection take path into account
- fr="`which fakeroot 2>/dev/null`"
-+ # for solaris so /usr/xpg4/bin is honoured in the path
-+ shell=`which sh`
- case `get_testuid` in
- '') ;; # If "id" failed, try to continue...
- 0) ;;
- *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec "${fr}" /bin/sh "$0"
-+ exec "${fr}" "${shell}" "$0"
- fi
- ;;
- esac
-diff --git a/testsuite/devices.test b/testsuite/devices.test
-index 30bc1c4..14ed317 100644
---- a/testsuite/devices.test
-+++ b/testsuite/devices.test
-@@ -53,12 +53,14 @@ case $0 in
- *)
- # make fakeroot detection take path into account
- fr="`which fakeroot 2>/dev/null`"
-+ # for solaris so /usr/xpg4/bin is honoured in the path
-+ shell=`which sh`
- case `get_testuid` in
- '') ;; # If "id" failed, try to continue...
- 0) ;;
- *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec "${fr}" /bin/sh $RUNSHFLAGS "$0"
-+ exec "${fr}" "${shell}" $RUNSHFLAGS "$0"
- fi
- test_skipped "Rsync needs root/fakeroot for device tests"
- ;;
---
-1.7.4.1
-
Deleted:
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Use-SHELL-instead-of-bin-sh.patch
===================================================================
---
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Use-SHELL-instead-of-bin-sh.patch
2011-09-20 20:29:10 UTC (rev 15694)
+++
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0003-Testsuite-Use-SHELL-instead-of-bin-sh.patch
2011-09-21 00:50:20 UTC (rev 15695)
@@ -1,45 +0,0 @@
-From 6a031bf79b1944c19f2862d0703a9dd3864b68f6 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sun, 18 Sep 2011 00:33:37 -0400
-Subject: [PATCH 3/5] Testsuite: Use SHELL instead of /bin/sh
-
-Use $SHELL from the environment instead of hard coding /bin/sh in the
-devices and chown tests. This likely isn't necessary, but prevents
-any issues from creeping in on solaris where /usr/xpg4/bin/sh is
-required for proper test execution.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- testsuite/chown.test | 2 +-
- testsuite/devices.test | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/chown.test b/testsuite/chown.test
-index 5631747..b18db1d 100644
---- a/testsuite/chown.test
-+++ b/testsuite/chown.test
-@@ -44,7 +44,7 @@ case $0 in
- 0) ;;
- *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec "${fr}" /bin/sh "$0"
-+ exec "${fr}" "${SHELL}" "$0"
- fi
- ;;
- esac
-diff --git a/testsuite/devices.test b/testsuite/devices.test
-index 30bc1c4..349782f 100644
---- a/testsuite/devices.test
-+++ b/testsuite/devices.test
-@@ -58,7 +58,7 @@ case $0 in
- 0) ;;
- *) if [ -n "${fr}" ]; then
- echo "Let's try re-running the script under fakeroot..."
-- exec "${fr}" /bin/sh $RUNSHFLAGS "$0"
-+ exec "${fr}" "${SHELL}" $RUNSHFLAGS "$0"
- fi
- test_skipped "Rsync needs root/fakeroot for device tests"
- ;;
---
-1.7.4.1
-
Deleted:
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0004-Testsuite-Extend-xattr-manipulation-for-Solaris.patch
===================================================================
---
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0004-Testsuite-Extend-xattr-manipulation-for-Solaris.patch
2011-09-20 20:29:10 UTC (rev 15694)
+++
csw/mgar/pkg/rsync/branches/3.1.0dev/files/0004-Testsuite-Extend-xattr-manipulation-for-Solaris.patch
2011-09-21 00:50:20 UTC (rev 15695)
@@ -1,100 +0,0 @@
-From 080d69057a366a9c8e542c9d94f4e86c4938fc28 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sat, 17 Sep 2011 15:23:11 +0200
-Subject: [PATCH 4/5] Testsuite: Extend xattr manipulation for Solaris
-
-Add chown(), mknod(), xls() and xset() shell functions for Solaris so
-that we can capably test the xattr support in the rsync binary. The
-functions all use runat to manipulate the extended attribute space.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
----
- testsuite/chown.test | 11 +++++++++++
- testsuite/devices.test | 16 ++++++++++++++++
- testsuite/xattrs.test | 21 +++++++++++++++++++++
- 3 files changed, 48 insertions(+), 0 deletions(-)
-
-diff --git a/testsuite/chown.test b/testsuite/chown.test
-index b18db1d..d48de75 100644
---- a/testsuite/chown.test
-+++ b/testsuite/chown.test
-@@ -26,6 +26,17 @@ case $0 in
- xattr -s 'rsync.%stat' "100644 0,0 $own" "${@}"
- }
- ;;
-+ SunOS)
-+ chown() {
-+ own=$1
-+ shift
-+ for f in "${@}"; do
-+ runat "${f}" /usr/xpg4/bin/sh <<EOF
-+echo "100644 0,0 $own" > rsync.%stat
-+EOF
-+ done
-+ }
-+ ;;
- *)
- chown() {
- own=$1
-diff --git a/testsuite/devices.test b/testsuite/devices.test
-index 349782f..1846f2c 100644
---- a/testsuite/devices.test
-+++ b/testsuite/devices.test
-@@ -34,6 +34,22 @@ case $0 in
- xattr -s 'rsync.%stat' "$mode $maj,$min 0:0" "$fn"
- }
- ;;
-+ SunOS)
-+ mknod() {
-+ fn="$1"
-+ case "$2" in
-+ p) mode=10644 ;;
-+ c) mode=20644 ;;
-+ b) mode=60644 ;;
-+ esac
-+ maj="${3:-0}"
-+ min="${4:-0}"
-+ touch "$fn"
-+ runat "${fn}" /usr/xpg4/bin/sh <<EOF
-+echo "$mode $maj,$min 0:0" > rsync.%stat
-+EOF
-+ }
-+ ;;
- *)
- mknod() {
- fn="$1"
-diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
-index fd2957a..42492a7 100644
---- a/testsuite/xattrs.test
-+++ b/testsuite/xattrs.test
-@@ -24,6 +24,27 @@ Darwin)
- RSYNC_PREFIX='rsync'
- RUSR='rsync.nonuser'
- ;;
-+SunOS)
-+ xset() {
-+ xnam="$1"
-+ xval="$2"
-+ shift 2
-+ for f in "${@}"; do
-+ runat "${f}" /usr/xpg4/bin/sh <<EOF
-+echo "${xval}" > "${xnam}"
-+EOF
-+ done
-+ }
-+ xls() {
-+ for f in "${@}"; do
-+ runat "${f}" /usr/xpg4/bin/sh <<EOF
-+for x in *; do echo "\$x=\`cat \$x\`"; done
-+EOF
-+ done
-+ }
-+ RSYNC_PREFIX='rsync'
-+ RUSR='rsync.nonuser'
-+ ;;
- *)
- xset() {
- xnam="$1"
---
-1.7.4.1
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
