rpms/pdsh/devel pdsh-2.16-ARG_MAX.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 pdsh.spec, 1.10, 1.11 sources, 1.4, 1.5

Thu Aug 28 15:33:18 UTC 2008

Author: spot

Update of /cvs/pkgs/rpms/pdsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31653

Modified Files:
	.cvsignore pdsh.spec sources 
Added Files:
	pdsh-2.16-ARG_MAX.patch 
Log Message:
update to 2.16, fix license tag

pdsh-2.16-ARG_MAX.patch:

--- NEW FILE pdsh-2.16-ARG_MAX.patch ---
diff -up pdsh-2.16/src/pdsh/xpopen.c.BAD pdsh-2.16/src/pdsh/xpopen.c
--- pdsh-2.16/src/pdsh/xpopen.c.BAD	2008-08-28 11:05:44.000000000 -0400
+++ pdsh-2.16/src/pdsh/xpopen.c	2008-08-28 11:15:09.000000000 -0400
@@ -28,12 +28,19 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <limits.h>             /* ARG_MAX */
+
 #if	HAVE_UNISTD_H
 #include <unistd.h>             /* for R_OK, access() */
+# if defined(_SC_ARG_MAX)
+#  if defined(ARG_MAX)
+#     undef ARG_MAX
+#  endif
+#  define ARG_MAX sysconf (_SC_ARG_MAX)
+# endif
 #endif
 
-#include <stdio.h>
-#include <limits.h>             /* ARG_MAX */
 #include <sys/wait.h>           /* waitpid() */
 #include <string.h>             /* strcmp() */
 #include <stdlib.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jul 2006 23:29:23 -0000	1.4
+++ .cvsignore	28 Aug 2008 15:32:47 -0000	1.5
@@ -1 +1 @@
-pdsh-2.11.tar.gz
+pdsh-2.16.tar.bz2


Index: pdsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/pdsh.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pdsh.spec	19 Feb 2008 10:17:53 -0000	1.10
+++ pdsh.spec	28 Aug 2008 15:32:48 -0000	1.11
@@ -1,22 +1,22 @@
 Name: pdsh
-Version: 2.11
-Release: 6%{?dist}
-
+Version: 2.16
+Release: 1%{?dist}
 Summary: Parallel remote shell program
-
-License: GPL
+License: GPLv2+
 Url: http://sourceforge.net/projects/pdsh/
 Group: System Environment/Base
-Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.bz2
+# Filed upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2080721&group_id=33530&atid=408635
+Patch0: pdsh-2.16-ARG_MAX.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pdsh-rcmd
 
-#
 # Enabling and disabling pdsh options
 #  defaults:
-#  enabled:  readline, rsh, ssh, dshgroup, netgroups
+#  enabled:  readline, rsh, ssh, dshgroup, netgroups, debug
 #  disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines,
-#            nodeupdown
+#            nodeupdown, slurm
 #
 #  To build the various module subpackages, pass --with <pkg> on
 #   the rpmbuild command line (if your rpm is a recent enough version)
@@ -24,48 +24,30 @@
 #  Similarly, to disable various pdsh options pass --without <pkg> on
 #   the rpmbuild command line.
 #
-#  This specfile also supports passing the --with and --without through
+#  This specfile used to support passing the --with and --without through
 #   the environment variables PDSH_WITH_OPTIONS and PDSH_WITHOUT_OPTIONS.
 #   e.g. PDSH_WITH_OPTIONS="qshell genders" rpmbuild ....
-#
-%define _without_env ${PDSH_WITHOUT_OPTIONS}
-%define _with_env ${PDSH_WITH_OPTIONS} 
-%define dstr "%%%%"define
-%define check() echo %_%{1}_env|grep -qw %%1 && echo %dstr _%{1}_%%1 --%{1}-%%1
-%{expand: %%define pdsh_with() %%((%{check with})||(%{check without}))%%{nil}}
-%define def() %%{!?_%{2}_%1: %%{!?_%{3}_%1: %%global _%{2}_%1 --%{2}-%1}}
-
-%{expand: %pdsh_with ssh}
-%{expand: %def ssh with without}
-%{expand: %pdsh_with rsh}
-%{expand: %def rsh with without}
-%{expand: %pdsh_with dshgroups}
-%{expand: %def dshgroups with without}
-%{expand: %pdsh_with netgroup}
-%{expand: %def netgroup with without}
-
-%{expand: %pdsh_with mrsh}
-%{expand: %def mrsh without with}
-%{expand: %pdsh_with qshell}
-%{expand: %def qshell without with}
-%{expand: %pdsh_with mqshell}
-%{expand: %def mqshell without with}
-%{expand: %pdsh_with xcpu}
-%{expand: %def xcpu without with}
-%{expand: %pdsh_with genders}
-%{expand: %def genders without with}
-%{expand: %pdsh_with nodeattr}
-%{expand: %def nodeattr without with}
-%{expand: %pdsh_with nodeupdown}
-%{expand: %def nodeupdown without with}
-%{expand: %pdsh_with machines}
-%{expand: %def machines without with}
-%{expand: %pdsh_with slurm}
-%{expand: %def slurm without with}
-%{expand: %pdsh_with rms}
-%{expand: %def rms without with}
-%{expand: %pdsh_with debug}
-%{expand: %def debug without with}
+#   Unfortunately, new rpm doesn't tolerate such nonsense, so it doesn't work anymore.
+
+# Read: If neither macro exists, then add the default definition.
+# These are default ENABLED.
+%{!?_with_readline: %{!?_without_readline: %define _with_readline --with-readline}}
+%{!?_with_rsh: %{!?_without_rsh: %define _with_rsh --with-rsh}}
+%{!?_with_ssh: %{!?_without_ssh: %define _with_ssh --with-ssh}}
+%{!?_with_dshgroups: %{!?_without_dshgroups: %define _with_dshgroups --with-dshgroups}}
+%{!?_with_netgroups: %{!?_without_netgroups: %define _with_netgroups --with-netgroups}}
+%{!?_with_debug: %{!?_without_debug: %define _with_debug --with-debug}}
+# These are default DISABLED.
+%{!?_with_rms: %{!?_without_rms: %define _without_rms --without-rms}}
+%{!?_with_mrsh: %{!?_without_mrsh: %define _without_mrsh --without-mrsh}}
+%{!?_with_qshell: %{!?_without_qshell: %define _without_qshell --without-qshell}}
+%{!?_with_mqshell: %{!?_without_mqshell: %define _without_mqshell --without-mqshell}}
+%{!?_with_xcpu: %{!?_without_xcpu: %define _without_xcpu --without-xcpu}}
+%{!?_with_genders: %{!?_without_genders: %define _without_genders --without-genders}}
+%{!?_with_nodeattr: %{!?_without_nodeattr: %define _without_nodeattr --without-nodeattr}}
+%{!?_with_machines: %{!?_without_machines: %define _without_machines --without-machines}}
+%{!?_with_nodeupdown: %{!?_without_nodeupdown: %define _without_rms --without-nodeupdown}}
+%{!?_with_slurm: %{!?_without_slurm: %define _without_slurm --without-slurm}}
 
 #
 # If "--with debug" is set compile with --enable-debug
@@ -77,49 +59,43 @@
   %define _enable_debug --enable-debug
 %endif
 
-
+# Macro controlled BuildRequires
 %{?_with_qshell:BuildRequires: qsnetlibs}
 %{?_with_mqshell:BuildRequires: qsnetlibs}
 BuildRequires: readline-devel
 %{?_with_nodeupdown:BuildRequires: whatsup}
 %{?_with_genders:BuildRequires: genders > 1.0}
 
-##############################################################################
-# Pdsh description
-
 %description
 Pdsh is a multithreaded remote shell client which executes commands
 on multiple remote hosts in parallel.  Pdsh can use several different
 remote shell services, including standard "rsh", Kerberos IV, and ssh.
-##############################################################################
 
 %package qshd
 Summary: Remote shell daemon for pdsh/qshell/Elan3
 Group:   System Environment/Base
-Requires:  xinetd
+Requires(post):  xinetd
+
 %description qshd
 Remote shell service for running Quadrics Elan3 jobs under pdsh.
 Sets up Elan capabilities and environment variables needed by Quadrics
 MPICH executables.
-##############################################################################
 
 %package mqshd
 Summary: Remote shell daemon for pdsh/mqshell/Elan3
 Group:   System Environment/Base
-Requires:  xinetd
+Requires(post):  xinetd
+
 %description mqshd
 Remote shell service for running Quadrics Elan3 jobs under pdsh with
 mrsh authentication.  Sets up Elan capabilities and environment variables 
 needed by Quadrics MPICH executables.
-##############################################################################
 
-#
-# Module packages:
-#
 %package   rcmd-rsh
 Summary:   Provides bsd rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
+
 %description rcmd-rsh
 Pdsh module for bsd rcmd functionality. Note: This module
 requires that the pdsh binary be installed setuid root.
@@ -129,6 +105,7 @@
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Requires:  openssh-clients
+
 %description rcmd-ssh
 Pdsh module for ssh rcmd functionality.
 
@@ -137,6 +114,7 @@
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Conflicts: pdsh-rcmd-mqshell
+
 %description rcmd-qshell
 Pdsh module for running QsNet MPI jobs. Note: This module
 requires that the pdsh binary be installed setuid root.
@@ -145,6 +123,7 @@
 Summary:   Provides mrsh rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
+
 %description rcmd-mrsh
 Pdsh module for mrsh rcmd functionality.
 
@@ -153,6 +132,7 @@
 Group:     System Environment/Base
 Provides:  pdsh-rcmd
 Conflicts: pdsh-rcmd-qshell
+
 %description rcmd-mqshell
 Pdsh module for mqshell rcmd functionality.
 
@@ -160,6 +140,7 @@
 Summary:   Provides xcpu rcmd capability to pdsh
 Group:     System Environment/Base
 Provides:  pdsh-xcpu
+
 %description rcmd-xcpu
 Pdsh module for xcpu rcmd functionality.
 
@@ -169,6 +150,7 @@
 Requires:  genders >= 1.1
 Conflicts: pdsh-mod-nodeattr
 Conflicts: pdsh-mod-machines
+
 %description mod-genders
 Pdsh module for libgenders functionality.
 
@@ -178,6 +160,7 @@
 Requires:  genders 
 Conflicts: pdsh-mod-genders
 Conflicts: pdsh-mod-machines
+
 %description mod-nodeattr
 Pdsh module for genders functionality using the nodeattr program.
 
@@ -185,6 +168,7 @@
 Summary:   Provides libnodeupdown support for pdsh
 Group:     System Environment/Base
 Requires:  whatsup
+
 %description mod-nodeupdown
 Pdsh module providing -v functionality using libnodeupdown.
 
@@ -192,6 +176,7 @@
 Summary:   Provides RMS support for pdsh
 Group:     System Environment/Base
 Requires:  qsrmslibs
+
 %description mod-rms
 Pdsh module providing support for gathering the list of target nodes
 from an allocated RMS resource.
@@ -201,12 +186,14 @@
 Group:     System Environment/Base
 Conflicts: pdsh-mod-genders
 Conflicts: pdsh-mod-nodeattr
+
 %description mod-machines
 Pdsh module for gathering list of all target nodes from a machines file.
 
 %package   mod-dshgroup
 Summary:   Provides dsh-style group file support for pdsh
 Group:     System Environment/Base
+
 %description mod-dshgroup
 Pdsh module providing dsh (Dancer's shell) style "group" file support.
 Provides -g groupname and -X groupname options to pdsh.
@@ -214,6 +201,7 @@
 %package   mod-netgroup
 Summary:   Provides netgroup support for pdsh
 Group:     System Environment/Base
+
 %description mod-netgroup
 Pdsh module providing support for targeting hosts based on netgroup.
 Provides -g groupname and -X groupname options to pdsh.
@@ -222,23 +210,19 @@
 Summary:   Provides support for running pdsh under SLURM allocations
 Group:     System Environment/Base
 Requires:  slurm
+
 %description mod-slurm
 Pdsh module providing support for gathering the list of target nodes
 from an allocated SLURM job.
 
-
-
-##############################################################################
-
 %prep
-%setup
-
-##############################################################################
+%setup -q
+%patch0 -p1 -b .ARG_MAX
 
 %build
-%configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \
+%configure \
     %{?_enable_debug}       \
-        %{?_with_rsh}           \
+    %{?_with_rsh}           \
     %{?_without_rsh}        \
     %{?_with_ssh}           \
     %{?_without_ssh}        \
@@ -272,7 +256,6 @@
 # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled
 # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 make CFLAGS="$RPM_OPT_FLAGS"
-##############################################################################
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -288,118 +271,102 @@
 # .la's don't need to be packaged.
 rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a
 
-##############################################################################
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
-##############################################################################
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS DISCLAIMER README.KRB4 README.modules README.QsNet
 %{_bindir}/pdsh
 %{_bindir}/pdcp
 %{_bindir}/dshbak
+%{_bindir}/rpdcp
+%{_libdir}/pdsh/execcmd.so
 %{_mandir}/man1/*
-##############################################################################
 
 %if %{?_with_rsh:1}%{!?_with_rsh:0}
 %files rcmd-rsh
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/xrcmd.*
 %endif
-##############################################################################
 
 %if %{?_with_ssh:1}%{!?_with_ssh:0}
 %files rcmd-ssh
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/sshcmd.*
 %endif
-##############################################################################
 
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files rcmd-qshell
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/qcmd.*
 %endif
-##############################################################################
 
 %if %{?_with_mrsh:1}%{!?_with_mrsh:0}
 %files rcmd-mrsh
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/mcmd.*
 %endif
-##############################################################################
 
 %if %{?_with_mqshell:1}%{!?_with_mqshell:0}
 %files rcmd-mqshell
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/mqcmd.*
 %endif
-##############################################################################
 
 %if %{?_with_xcpu:1}%{!?_with_xcpu:0}
 %files rcmd-xcpu
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/xcpucmd.*
 %endif
-##############################################################################
 
 %if %{?_with_genders:1}%{!?_with_genders:0}
 %files mod-genders
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/pdsh/genders.*
 %endif
-##############################################################################
 
 %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0}
 %files mod-nodeattr
 %defattr(-,root,root)
 %{_libdir}/pdsh/nodeattr.*
 %endif
-##############################################################################
 
 %if %{?_with_nodeupdown:1}%{!?_with_nodeupdown:0}
 %files mod-nodeupdown
 %defattr(-,root,root)
 %{_libdir}/pdsh/nodeupdown.*
 %endif
-##############################################################################
 
 %if %{?_with_rms:1}%{!?_with_rms:0}
 %files mod-rms
 %defattr(-,root,root)
 %{_libdir}/pdsh/rms.*
 %endif
-##############################################################################
 
 %if %{?_with_machines:1}%{!?_with_machines:0}
 %files mod-machines
 %defattr(-,root,root)
 %{_libdir}/pdsh/machines.*
 %endif
-##############################################################################
 
 %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0}
 %files mod-dshgroup
 %defattr(-,root,root)
 %{_libdir}/pdsh/dshgroup.*
 %endif
-##############################################################################
 
 %if %{?_with_netgroup:1}%{!?_with_netgroup:0}
 %files mod-netgroup
 %defattr(-,root,root)
 %{_libdir}/pdsh/netgroup.*
 %endif
-##############################################################################
 
 %if %{?_with_slurm:1}%{!?_with_slurm:0}
 %files mod-slurm
 %defattr(-,root,root)
 %{_libdir}/pdsh/slurm.*
 %endif
-##############################################################################
 
 %if %{?_with_qshell:1}%{!?_with_qshell:0}
 %files qshd
@@ -414,7 +381,6 @@
 %{_initrddir}/xinetd reload
 
 %endif
-##############################################################################
 
 %if %{?_with_mqshell:1}%{!?_with_mqshell:0}
 %files mqshd
@@ -429,10 +395,14 @@
 %{_initrddir}/xinetd reload
 
 %endif
-##############################################################################
-
 
 %changelog
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16-1
+- attempt to make this package suck... less.
+- fix license tag
+- update to 2.16
+- fix compile against glibc 2.8 (ARG_MAX not defined)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.11-6
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdsh/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jul 2006 23:29:23 -0000	1.4
+++ sources	28 Aug 2008 15:32:48 -0000	1.5
@@ -1 +1 @@
-b67af953de2a86ad90b9a13e97fba89e  pdsh-2.11.tar.gz
+44a6905b56eabe7efda9f399699b0b11  pdsh-2.16.tar.bz2


