25638244 Update pdsh to version 2.31
authorRich Burridge <rich.burridge@oracle.com>
Wed, 15 Mar 2017 12:37:58 -0700
changeset 7756 a14f5c91f91a
parent 7755 3352127505f1
child 7757 b1ac9348d4f0
25638244 Update pdsh to version 2.31
components/pdsh/Makefile
components/pdsh/TESTING
components/pdsh/depend.mk
components/pdsh/patches/find-genders-lib.patch
components/pdsh/test/results-64.master
--- a/components/pdsh/Makefile	Wed Mar 15 12:27:11 2017 -0700
+++ b/components/pdsh/Makefile	Wed Mar 15 12:37:58 2017 -0700
@@ -27,15 +27,16 @@
 include $(WS_MAKE_RULES)/shared-targets.mk
 
 COMPONENT_NAME=		pdsh
-COMPONENT_VERSION=	2.29
-COMPONENT_PROJECT_URL=	https://code.google.com/archive/p/pdsh
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_VERSION=	2.31
+COMPONENT_PROJECT_URL=	https://github.com/grondo/pdsh
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:57f0903bf782afe00874267b59e0f4adefa79da4c48d0257c5ae2bef02f87fcf
-COMPONENT_ARCHIVE_URL=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+    sha256:0ee066ce395703285cf4f6cf00b54b7097d12457a4b1c146bc6f33d8ba73caa7
+COMPONENT_ARCHIVE_URL=	https://github.com/grondo/$(COMPONENT_NAME)/archive/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	13274
 
-TPNO=			29495
+TPNO=			33966
 
 # Old version in SFW was not version-locked, so cannot be upgraded to, so
 # do not publish.
@@ -59,21 +60,12 @@
 	-e 's|need_relink=yes|need_relink=not_on_solaris|g' \
 	libtool)
 
-# Delete this when build servers are installed with genders
-GENDERS_BASE = $(WS_COMPONENTS)/genders/build/prototype/$(MACH)
-GENDERS_INC_DIR += -I$(GENDERS_BASE)/usr/include
-GENDERS_LD_OPTIONS += -L$(GENDERS_BASE)/usr/lib/$(MACH64)
-
-CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS) $(GENDERS_INC_DIR)"
-CONFIGURE_ENV += GENDERS_LD_OPTIONS="$(GENDERS_LD_OPTIONS)"
-CONFIGURE_ENV += LDFLAGS="$(LDFLAGS) $(GENDERS_LD_OPTIONS)"
-
 CONFIGURE_OPTIONS +=	--with-genders
 CONFIGURE_OPTIONS +=	--with-readline
 CONFIGURE_OPTIONS +=	--with-ssh
 CONFIGURE_OPTIONS +=	--without-rsh
 
-COMPONENT_TEST_ENV +=   PATH="/usr/gnu/bin:/usr/bin"
+COMPONENT_TEST_ENV =   PATH="/usr/gnu/bin:/usr/bin:$(PATH)"
 COMPONENT_TEST_DIR =	$(@D)/tests
 
 COMPONENT_TEST_TRANSFORMS += \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pdsh/TESTING	Wed Mar 15 12:37:58 2017 -0700
@@ -0,0 +1,8 @@
+Several of the pdsh tests fail when run on the Userland build machines
+(such as strax and slitheen) from directories under /builds/<username>/
+with:
+
+  [email protected]: "/builds": World writable and sticky bit is not set
+
+so make sure that you run "gmake test" from a Userland workspace which
+is not world writable and the sticky bit is not set.
--- a/components/pdsh/depend.mk	Wed Mar 15 12:27:11 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-pdsh:	genders
--- a/components/pdsh/patches/find-genders-lib.patch	Wed Mar 15 12:27:11 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-Until the genders package is available on Userland build machines, then we
-need to get libgenders.so from the prototype area of the built genders
-component. Unfortunately there are no configure smarts to allow this to
-be easily done.
-
-This patch will not be sent upstream. When genders is on the Userland build
-machines then this patch can be removed, along with the CONFIGURE_ENV line
-in the component Makefile.
-
---- pdsh-2.29/configure.orig	2016-07-24 16:55:41.644998411 -0700
-+++ pdsh-2.29/configure	2016-07-24 17:05:14.064517775 -0700
[email protected]@ -24937,7 +24937,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgenders  $LIBS"
-+LIBS="$GENDERS_LD_OPTIONS -lgenders  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
[email protected]@ -25024,7 +25024,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgenders  $LIBS"
-+LIBS="$GENDERS_LD_OPTIONS -lgenders  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
--- a/components/pdsh/test/results-64.master	Wed Mar 15 12:27:11 2017 -0700
+++ b/components/pdsh/test/results-64.master	Wed Mar 15 12:37:58 2017 -0700
@@ -9,6 +9,7 @@
 ok 8 - pdsh -V works
 ok 9 - pdsh -L works
 ok 10 - pdsh -h works
+not ok - 11 rcmd/exec module is built
 ok 11 - rcmd/exec module is built
 ok 12 - pdsh -N option works
 ok 13 # skip -u option is functional (missing LONGTESTS)
@@ -21,7 +22,7 @@
 ok 20 - -b enables batch mode
 ok 21 - pdsh -N option works
 # still have 1 known breakage(s)
-# passed all remaining 20 test(s)
+# failed 1 among remaining 20 test(s)
 *** t0002-internal.sh ***
 ok 1 - working xstrerrorcat
 ok 2 - working pipecmd
@@ -105,11 +106,7 @@
 *** t1003-slurm.sh ***
 # passed all 0 test(s)
 *** t2000-exec.sh ***
-ok 1 - exec module works
-ok 2 - exec cmd substitution works 
-ok 3 - exec module works in interactive mode
-ok 4 - exec cmd susbstitution works interactive mode
-# passed all 4 test(s)
+# passed all 0 test(s)
 *** t2001-ssh.sh ***
 # passed all 0 test(s)
 *** t2002-mrsh.sh ***
@@ -128,21 +125,22 @@
 ok 11 - dshbak properly joins 9,10
 ok 12 - issue 33: dshbak does not coalesce 09,10
 ok 13 - issue 33: dshbak does not coalesce 099,100
-ok 14 - dshbak -d functionality
-ok 15 - dshbak -f functionality
+not ok - 14 dshbak -d functionality
+not ok - 15 dshbak -f functionality
 ok 16 - dshbak -f without -d fails
 ok 17 - dshbak -d fails when output dir does not exist
 ok 18 - dshbak -d fails gracefully for non-writable dir
 # still have 1 known breakage(s)
-# passed all remaining 17 test(s)
+# failed 2 among remaining 17 test(s)
 *** t6036-long-output-lines.sh ***
 ok 1 - pdsh does not truncate very long lines
 ok 2 - pdsh does not truncate even longer lines
 # passed all 2 test(s)
 pdsh test suite complete.
-106/112 tests passed.
+99/108 tests passed.
 2 broken tests failed as expected.
-2 tests failed.
+1 broken test now fixed.
+5 tests failed.
 1 test skipped.
 FAIL: runtests.sh
 ===================