diff --git a/parallel/0001-support-MSys2.patch b/parallel/0001-support-MSys2.patch index 3150c494..e4c0a9cc 100644 --- a/parallel/0001-support-MSys2.patch +++ b/parallel/0001-support-MSys2.patch @@ -1,5 +1,5 @@ diff --git old/Makefile.in 001/Makefile.in -index 33af24d..d39833b 100644 +index b4550c4..6796ddd 100644 --- old/Makefile.in +++ 001/Makefile.in @@ -1,7 +1,7 @@ @@ -363,7 +363,7 @@ index 0000000..dee27fb +autoconf --force +automake --foreign --add-missing --copy diff --git old/configure 001/configure -index 0c763df..00b5eb4 100644 +index de1dc7f..279408c 100644 --- old/configure +++ 001/configure @@ -616,6 +616,8 @@ am__isrc @@ -584,11 +584,11 @@ index 0c763df..00b5eb4 100644 ac_aux_dir= diff --git old/configure.ac 001/configure.ac -index cb5a1b0..33e3fda 100644 +index 8672d83..76c7405 100644 --- old/configure.ac +++ 001/configure.ac @@ -1,4 +1,16 @@ - AC_INIT([parallel], [20180522], [bug-parallel@gnu.org]) + AC_INIT([parallel], [20180722], [bug-parallel@gnu.org]) + +# on MSys2 prefer msys to native programs, especially perl +# native windows perl does not work for the time being @@ -605,7 +605,7 @@ index cb5a1b0..33e3fda 100644 AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git old/src/Makefile.am 001/src/Makefile.am -index 9b5f7e4..17a5c64 100644 +index 20e5bd0..8f0c78a 100644 --- old/src/Makefile.am +++ 001/src/Makefile.am @@ -1,4 +1,6 @@ @@ -615,7 +615,7 @@ index 9b5f7e4..17a5c64 100644 +bin_SCRIPTS = $(PERL_BINS) env_parallel \ env_parallel.ash env_parallel.bash env_parallel.csh \ env_parallel.dash env_parallel.fish env_parallel.ksh \ - env_parallel.pdksh env_parallel.sh env_parallel.tcsh \ + env_parallel.mksh env_parallel.pdksh env_parallel.sh \ @@ -7,6 +9,12 @@ bin_SCRIPTS = parallel sql niceload parcat parset env_parallel \ install-exec-hook: rm $(DESTDIR)$(bindir)/sem || true @@ -630,7 +630,7 @@ index 9b5f7e4..17a5c64 100644 if DOCUMENTATION man_MANS = parallel.1 env_parallel.1 sem.1 sql.1 niceload.1 \ diff --git old/src/Makefile.in 001/src/Makefile.in -index ce1c2b8..0716192 100644 +index 392ecd5..1fdde19 100644 --- old/src/Makefile.in +++ 001/src/Makefile.in @@ -1,7 +1,7 @@ @@ -669,7 +669,7 @@ index ce1c2b8..0716192 100644 +bin_SCRIPTS = $(PERL_BINS) env_parallel \ env_parallel.ash env_parallel.bash env_parallel.csh \ env_parallel.dash env_parallel.fish env_parallel.ksh \ - env_parallel.pdksh env_parallel.sh env_parallel.tcsh \ + env_parallel.mksh env_parallel.pdksh env_parallel.sh \ @@ -615,6 +617,12 @@ uninstall-man: uninstall-man1 uninstall-man7 install-exec-hook: rm $(DESTDIR)$(bindir)/sem || true @@ -684,7 +684,7 @@ index ce1c2b8..0716192 100644 # Build documentation file if the tool to build exists. # Otherwise: Use the distributed version diff --git old/src/niceload 001/src/niceload -index f628030..485e9b2 100644 +index b17ceef..2667fff 100644 --- old/src/niceload +++ 001/src/niceload @@ -148,11 +148,8 @@ exit($::exitstatus); @@ -719,7 +719,7 @@ index f628030..485e9b2 100644 diff --git old/src/parallel 001/src/parallel -index 98062d6..563e698 100644 +index fd61160..d53bd0c 100644 --- old/src/parallel +++ 001/src/parallel @@ -442,7 +442,7 @@ sub cat_partial { @@ -731,7 +731,7 @@ index 98062d6..563e698 100644 } sub spreadstdin { -@@ -4868,11 +4868,8 @@ sub which { +@@ -5001,11 +5001,8 @@ sub which { if(not %pid_parentpid_cmd) { # Filter for SysV-style `ps` @@ -744,7 +744,7 @@ index 98062d6..563e698 100644 # BSD-style `ps` my $bsd = q(ps -o pid,ppid,command -ax); %pid_parentpid_cmd = -@@ -4888,7 +4885,7 @@ sub which { +@@ -5021,7 +5018,7 @@ sub which { 'hpux' => $sysv, 'linux' => $sysv, 'mirbsd' => $bsd, @@ -753,7 +753,7 @@ index 98062d6..563e698 100644 'MSWin32' => $sysv, 'netbsd' => $bsd, 'nto' => $sysv, -@@ -5395,7 +5392,7 @@ sub memfree_recompute { +@@ -5528,7 +5525,7 @@ sub memfree_recompute { $perlscript .= 'if($^O eq "'.$os.'") { '.$script_of{$os}.'}'; } $perlscript =~ s/[\t\n ]+/ /g; @@ -762,7 +762,7 @@ index 98062d6..563e698 100644 } return $script; } -@@ -5418,7 +5415,7 @@ sub limit { +@@ -5551,7 +5548,7 @@ sub limit { (tmp=$(tempfile); LANG=C iostat -x 1 2 > $tmp; mv $tmp $io_file) & @@ -771,7 +771,7 @@ index 98062d6..563e698 100644 for(reverse <>) { /Device:/ and last; /(\S+)$/ and $max = $max > $1 ? $max : $1; } -@@ -5445,7 +5442,7 @@ sub limit { +@@ -5578,7 +5575,7 @@ sub limit { ps ax -o state,command | grep -E '^[DOR].[^[]' | wc -l | @@ -780,7 +780,7 @@ index 98062d6..563e698 100644 }; export -f load; load %s; -@@ -5651,7 +5648,7 @@ sub swap_activity { +@@ -5784,7 +5781,7 @@ sub swap_activity { $perlscript .= 'if($^O eq "'.$os.'") { print `'.$vmstat{$os}[0].' | awk "{print ' . $vmstat{$os}[1] . '}"` }'; } @@ -789,7 +789,7 @@ index 98062d6..563e698 100644 } return $script; } -@@ -5698,7 +5695,7 @@ sub loadavg_too_high { +@@ -5831,7 +5828,7 @@ sub loadavg_too_high { # aix => "ps -ae -o state,command" # state wrong # bsd => "ps ax -o state,command" # sysv => "ps -ef -o s -o comm" @@ -798,7 +798,7 @@ index 98062d6..563e698 100644 # /(Name|Pid|Ppid|State):\s+(\S+)/ and print "$2\t";' /proc/*/status | # awk '{print $2,$1}' # dec_osf => bsd -@@ -5716,14 +5713,14 @@ sub loadavg_too_high { +@@ -5849,14 +5846,14 @@ sub loadavg_too_high { # svr5 => sysv # ultrix => ps -ax | awk '{print $3,$5}' # unixware => ps -el|awk '{print $2,$14,$15}' @@ -815,7 +815,7 @@ index 98062d6..563e698 100644 /(Name|Pid|Ppid|State):\s+(\S+)/ and print "$2\t";' /proc/*/status | awk '{print $2,$1}' }; $dummy="echo S COMMAND;echo R dummy"; -@@ -5751,7 +5748,7 @@ sub loadavg_too_high { +@@ -5884,7 +5881,7 @@ sub loadavg_too_high { 'ultrix' => "ps -ax | awk '{print \$3,\$5}'", ); print `$ps{$^O}`; @@ -824,16 +824,16 @@ index 98062d6..563e698 100644 # The command is too long for csh, so base64_wrap the command $cmd = Job::base64_wrap($ps); } -@@ -6668,7 +6665,7 @@ sub no_of_cores_hpux { - # Number of CPU cores on HP-UX - # undef if not HP-UX - my $no_of_cores = +@@ -6780,7 +6777,7 @@ sub sct_hpux() { + $cpu->{'cores'} = + ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | grep 'Locality Domain Count' | awk '{ print \$4 }'}); + $cpu->{'threads'} = - ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | perl -ne '/Processor Count\\D+(\\d+)/ and print "\$1\n"'}); + ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | $^X -ne '/Processor Count\\D+(\\d+)/ and print "\$1\n"'}); - return $no_of_cores; - } -@@ -7383,19 +7380,19 @@ sub empty_input_wrapper { + if(grep { /\d/ } values %$cpu) { + return $cpu; +@@ -7507,19 +7504,19 @@ sub empty_input_wrapper { exit ($?&127 ? 128+($?&127) : 1+$?>>8) } }); @@ -857,7 +857,7 @@ index 98062d6..563e698 100644 $Global::shell." -c ".::shell_quote_scalar($command); } } -@@ -7688,7 +7685,7 @@ sub total_failed { +@@ -7812,7 +7809,7 @@ sub total_failed { # Command to remove files and dirs (given as args) without # affecting the exit value in $?/$status. if(not $script) { @@ -866,7 +866,7 @@ index 98062d6..563e698 100644 ::spacefree(0,q{ $bash=shift; $csh=shift; -@@ -7722,7 +7719,7 @@ sub total_failed { +@@ -7846,7 +7843,7 @@ sub total_failed { # * cat > fifo # * waitpid to get the exit code from $command # * be less than 1000 chars long @@ -875,7 +875,7 @@ index 98062d6..563e698 100644 (::spacefree (0, q{ ($s,$c,$f) = @ARGV; -@@ -7837,7 +7834,7 @@ sub wrapped { +@@ -7951,7 +7948,7 @@ sub wrapped { $command = $self->sshlogin_wrap($command); if(@Global::cat_prepends) { # --pipepart: prepend: @@ -884,7 +884,7 @@ index 98062d6..563e698 100644 # sysseek(STDIN,shift,0) || die; $left = shift; # while($read = sysread(STDIN,$buf, ($left > 131072 ? 131072 : $left))){ # $left -= $read; syswrite(STDOUT,$buf); -@@ -7863,7 +7860,7 @@ sub wrapped { +@@ -7977,7 +7974,7 @@ sub wrapped { and length $command > 499) { # csh does not like words longer than 1000 (499 quoted) @@ -893,7 +893,7 @@ index 98062d6..563e698 100644 # join" ",string_zip_base64( # 'exec "'.::perl_quote_scalar($command).'"'); $command = base64_wrap("exec \"$Global::shell\",'-c',\"". -@@ -7985,7 +7982,7 @@ sub base64_wrap { +@@ -8099,7 +8096,7 @@ sub base64_wrap { # $shell_command = shell command that runs $eval_string my $eval_string = shift; return @@ -902,7 +902,7 @@ index 98062d6..563e698 100644 ::shell_quote_scalar(base64_zip_eval())." ". join" ",::shell_quote(string_zip_base64($eval_string)); } -@@ -8186,7 +8183,7 @@ sub sshlogin_wrap { +@@ -8300,7 +8297,7 @@ sub sshlogin_wrap { # csh does not deal well with $ENV with \n $self->{'sshlogin_wrap'} = base64_wrap($perl_code); } else { @@ -911,7 +911,7 @@ index 98062d6..563e698 100644 } } else { $self->{'sshlogin_wrap'} = $command; -@@ -8203,7 +8200,7 @@ sub sshlogin_wrap { +@@ -8317,7 +8314,7 @@ sub sshlogin_wrap { my $remote_command = $pwd.$envset.$bashfuncset. '@ARGV="'.::perl_quote_scalar($command).'";'. monitor_parent_sshd_script(); @@ -920,7 +920,7 @@ index 98062d6..563e698 100644 ::shell_quote_scalar($remote_command); my $dq_remote_command = ::shell_quote_scalar($quoted_remote_command); -@@ -8215,7 +8212,7 @@ sub sshlogin_wrap { +@@ -8329,7 +8326,7 @@ sub sshlogin_wrap { # csh does not deal well with > 1000 chars in one word # csh does not deal well with $ENV with \n $quoted_remote_command = @@ -929,7 +929,7 @@ index 98062d6..563e698 100644 ::shell_quote_scalar(::shell_quote_scalar(base64_zip_eval()))." ". join" ",::shell_quote(::shell_quote(string_zip_base64($remote_command))); } else { -@@ -8543,7 +8540,7 @@ sub start { +@@ -8657,7 +8654,7 @@ sub start { my $bash = ::shell_quote_scalar_default( "testfun() { rm $name; }; export -f testfun; ". @@ -938,7 +938,7 @@ index 98062d6..563e698 100644 ::shell_quote_scalar_default($script) ); # Redirect STDERR temporarily, -@@ -8755,14 +8752,14 @@ sub interactive_start { +@@ -8869,14 +8866,14 @@ sub interactive_start { ( "(".$actual_command.');'. # The triple print is needed - otherwise the testsuite fails diff --git a/parallel/PKGBUILD b/parallel/PKGBUILD index cb1a45f7..4283899d 100644 --- a/parallel/PKGBUILD +++ b/parallel/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Niklas Holm pkgname='parallel' -pkgver='20180522' +pkgver='20180722' pkgrel='1' pkgdesc='A shell tool for executing jobs in parallel' arch=('any') @@ -10,11 +10,13 @@ url='https://www.gnu.org/software/parallel/' license=('GPL3') depends=('perl') source=( - "https://ftpmirror.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "https://ftpmirror.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,".sig"} "0001-support-MSys2.patch" ) -sha1sums=('e148aebb83dd5d2fa462cb04f7274a45ff93eb92' - '19a51783dd9c2f50e6aee167a6c70ca05bad99e8') +validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888') +sha256sums=('cf0d421cd78c58741395f94f568c33a0fe409bd5f4bd45f1ae804ec2d32dc318' + 'SKIP' + '8de30ae24183a0558820314d505eabfef76431340934190f0ef15e4633da80f3') prepare() { cd "${srcdir}/${pkgname}-${pkgver}"