Date: Sunday, May 10, 2020 @ 19:35:50 Author: demize Revision: 626201
upgpkg: parallel 20200322-1 Modified: parallel/trunk/0001-Remove-citation-things.patch parallel/trunk/0002-Remove-GNU-branding.patch parallel/trunk/PKGBUILD -----------------------------------+ 0001-Remove-citation-things.patch | 40 ++++++++--------------------- 0002-Remove-GNU-branding.patch | 49 ++++++++++++++++++------------------ PKGBUILD | 8 ++--- 3 files changed, 40 insertions(+), 57 deletions(-) Modified: 0001-Remove-citation-things.patch =================================================================== --- 0001-Remove-citation-things.patch 2020-05-10 19:12:25 UTC (rev 626200) +++ 0001-Remove-citation-things.patch 2020-05-10 19:35:50 UTC (rev 626201) @@ -1,4 +1,4 @@ -From 1eae416754561ffc38da4c07104f48c06c56a30c Mon Sep 17 00:00:00 2001 +From 7283e27213e016eeecfddc8d394fa2630a6da3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <[email protected]> Date: Fri, 22 Mar 2019 19:03:41 +0100 Subject: [PATCH 1/2] Remove citation things @@ -8,23 +8,14 @@ Signed-off-by: Johannes Löthberg <[email protected]> --- - src/parallel | 245 +-------------------------------------------------- - 1 file changed, 3 insertions(+), 242 deletions(-) + src/parallel | 241 +-------------------------------------------------- + 1 file changed, 1 insertion(+), 240 deletions(-) diff --git a/src/parallel b/src/parallel -index 8b8359c..9cd4505 100755 +index 21eb3dc..e8ae7b0 100755 --- a/src/parallel +++ b/src/parallel -@@ -504,7 +504,7 @@ sub pipe_shard_setup() { - } else { - $script = sharder_script(); - } -- -+ - # cat foo | sharder sep col fifo1 fifo2 fifo3 ... fifoN - - if($shardbin =~ /^[a-z_][a-z_0-9]*(\s|$)/i) { -@@ -1534,9 +1534,6 @@ sub options_hash() { +@@ -1609,9 +1609,6 @@ sub options_hash() { "gnu" => \$opt::gnu, "link|xapply" => \$opt::link, "linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource, @@ -34,7 +25,7 @@ "bibtex|citation" => \$opt::citation, "wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite, # Termination and retries -@@ -1643,13 +1640,6 @@ sub parse_options(@) { +@@ -1718,13 +1715,6 @@ sub parse_options(@) { my @argv_before = @ARGV; @ARGV = read_options(); @@ -48,7 +39,7 @@ # no-* overrides * if($opt::nokeeporder) { $opt::keeporder = undef; } -@@ -1884,78 +1874,6 @@ sub parse_options(@) { +@@ -1959,78 +1949,6 @@ sub parse_options(@) { if(defined $opt::eta) { $opt::progress = $opt::eta; } if(defined $opt::bar) { $opt::progress = $opt::bar; } @@ -127,7 +118,7 @@ parse_halt(); if($ENV{'PARALLEL_ENV'}) { -@@ -4799,79 +4717,9 @@ sub usage() { +@@ -4874,79 +4792,9 @@ sub usage() { "", "See 'man $Global::progname' for details", "", @@ -207,8 +198,8 @@ sub status(@) { my @w = @_; my $fh = $Global::status_fd || *STDERR; -@@ -4923,97 +4771,10 @@ sub version() { - "Copyright (C) 2007-2019 Ole Tange and Free Software Foundation, Inc.", +@@ -4999,97 +4847,10 @@ sub version() { + "Foundation, Inc.", "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>", "This is free software: you are free to change and redistribute it.", - "GNU $Global::progname comes with no warranty.", @@ -306,15 +297,6 @@ sub show_limits() { # Returns: N/A print("Maximal size of command: ",Limits::Command::real_max_length(),"\n", -@@ -10391,7 +10152,7 @@ sub push($) { - push @{$self->{'arg_list'}}, $record; - # Make @arg available for {= =} - *Arg::arg = $self->{'arg_list_flat_orig'}; -- -+ - my $quote_arg = ($Global::quote_replace and not $Global::quoting); - for my $perlexpr (keys %{$self->{'replacecount'}}) { - if($perlexpr =~ /^(\d+) /) { -- -2.24.0 +2.26.2 Modified: 0002-Remove-GNU-branding.patch =================================================================== --- 0002-Remove-GNU-branding.patch 2020-05-10 19:12:25 UTC (rev 626200) +++ 0002-Remove-GNU-branding.patch 2020-05-10 19:35:50 UTC (rev 626201) @@ -1,4 +1,4 @@ -From 3832d5cc88610e725793e24298816928391ccab0 Mon Sep 17 00:00:00 2001 +From 053a577963192e699bcbe715672d15d84f46e8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <[email protected]> Date: Fri, 22 Mar 2019 19:04:42 +0100 Subject: [PATCH 2/2] Remove GNU branding @@ -14,10 +14,10 @@ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/parallel b/src/parallel -index 9cd4505..7a3fa5c 100755 +index e8ae7b0..502cebb 100755 --- a/src/parallel +++ b/src/parallel -@@ -1683,7 +1683,7 @@ sub parse_options(@) { +@@ -1758,7 +1758,7 @@ sub parse_options(@) { if(defined $opt::tmpdir) { $ENV{'TMPDIR'} = $opt::tmpdir; } $ENV{'PARALLEL_RSYNC_OPTS'} = $opt::rsync_opts || $ENV{'PARALLEL_RSYNC_OPTS'} || '-rlDzR'; @@ -26,9 +26,9 @@ $opt::nice ||= eval { getpriority(0,0) } || 0; if(defined $opt::help) { usage(); exit(0); } if(defined $opt::embed) { embed(); exit(0); } -@@ -1991,7 +1991,7 @@ sub init_globals() { +@@ -2066,7 +2066,7 @@ sub init_globals() { # Defaults: - $Global::version = 20191122; + $Global::version = 20200322; $Global::progname = 'parallel'; - $::name = "GNU Parallel"; + $::name = "Parallel"; @@ -35,7 +35,7 @@ $Global::infinity = 2**31; $Global::debug = 0; $Global::verbose = 0; -@@ -2206,7 +2206,7 @@ sub parse_replacement_string_options() { +@@ -2281,7 +2281,7 @@ sub parse_replacement_string_options() { sub parse_semaphore() { # Semaphore defaults # Must be done before computing number of processes and max_line_length @@ -44,7 +44,7 @@ # Uses: # $opt::semaphore # $Global::semaphore -@@ -3035,7 +3035,7 @@ sub __RUNNING_THE_JOBS_AND_PRINTING_PROGRESS__() {} +@@ -3110,7 +3110,7 @@ sub __RUNNING_THE_JOBS_AND_PRINTING_PROGRESS__() {} # $Global::total_started = total number of jobs started # $Global::joblog = filehandle of joblog # $Global::debug = Is debugging on? @@ -53,7 +53,7 @@ # $Global::quoting = quote the command to run sub init_run_jobs() { -@@ -3944,7 +3944,7 @@ sub setup_basefile() { +@@ -4019,7 +4019,7 @@ sub setup_basefile() { } debug("init", "basesetup: @cmd\n"); my ($exitstatus,$stdout_ref,$stderr_ref) = @@ -62,7 +62,7 @@ if($exitstatus) { my @stdout = @$stdout_ref; my @stderr = @$stderr_ref; -@@ -3974,7 +3974,7 @@ sub cleanup_basefile() { +@@ -4049,7 +4049,7 @@ sub cleanup_basefile() { } debug("init", "basecleanup: @cmd\n"); my ($exitstatus,$stdout_ref,$stderr_ref) = @@ -71,7 +71,7 @@ if($exitstatus) { my @stdout = @$stdout_ref; my @stderr = @$stderr_ref; -@@ -3983,22 +3983,22 @@ sub cleanup_basefile() { +@@ -4058,22 +4058,22 @@ sub cleanup_basefile() { } } @@ -99,7 +99,7 @@ # \@stdout = standard output # \@stderr = standard error my ($stdin,@args) = @_; -@@ -4374,7 +4374,7 @@ sub onall($@) { +@@ -4449,7 +4449,7 @@ sub onall($@) { ); ::debug("init", "| $0 $options\n"); open(my $parallel_fh, "|-", "$0 -0 --will-cite -j0 $options") || @@ -108,7 +108,7 @@ my @joblogs; for my $host (sort keys %Global::host) { my $sshlogin = $Global::host{$host}; -@@ -4438,14 +4438,14 @@ sub sigpipe() { +@@ -4513,14 +4513,14 @@ sub sigpipe() { sub signal_children() { # Send signal to all children process groups @@ -125,13 +125,14 @@ $SIG{$signal} = undef; kill $signal, $$; } -@@ -4767,11 +4767,11 @@ sub version() { +@@ -4842,12 +4842,12 @@ sub version() { # Returns: N/A print join ("\n", - "GNU $Global::progname $Global::version", + "$Global::progname $Global::version", - "Copyright (C) 2007-2019 Ole Tange and Free Software Foundation, Inc.", + "Copyright (C) 2007-2020 Ole Tange, http://ole.tange.dk and Free Software", + "Foundation, Inc.", "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>", "This is free software: you are free to change and redistribute it.", - "GNU $Global::progname comes with no warranty.\n", @@ -139,7 +140,7 @@ ); } -@@ -4786,7 +4786,7 @@ sub show_limits() { +@@ -4862,7 +4862,7 @@ sub show_limits() { } sub embed() { @@ -148,7 +149,7 @@ # Tested with: bash, zsh, ksh, ash, dash, sh my $randomstring = "cut-here-".join"", map { (0..9,"a".."z","A".."Z")[rand(62)] } (1..20); -@@ -4831,9 +4831,9 @@ sub embed() { +@@ -4907,9 +4907,9 @@ sub embed() { "; print q! @@ -160,7 +161,7 @@ # # Not all shells support 'perl <(cat ...)' # This is a complex way of doing: -@@ -4844,7 +4844,7 @@ parallel() { +@@ -4920,7 +4920,7 @@ parallel() { # [1]+ Done cat # Make a temporary fifo that perl can read from @@ -169,7 +170,7 @@ do { $f = "/tmp/parallel-".join"", map { (0..9,"a".."z","A".."Z")[rand(62)] } (1..5); -@@ -4853,9 +4853,9 @@ parallel() { +@@ -4929,9 +4929,9 @@ parallel() { print $f;'` # Put source code into temporary file # so it is easy to copy to the fifo @@ -181,7 +182,7 @@ @source, $randomstring,"\n", q! -@@ -4863,10 +4863,10 @@ parallel() { +@@ -4939,10 +4939,10 @@ parallel() { # and remove the file and fifo ASAP # 'sh -c' is needed to avoid # [1]+ Done cat @@ -194,7 +195,7 @@ } !, @env_parallel_source, -@@ -6308,7 +6308,7 @@ sub loadavg($) { +@@ -6384,7 +6384,7 @@ sub loadavg($) { # Recompute a new one in the background # The load average is computed as the number of processes waiting for disk # or CPU right now. So it is the server load this instant and not averaged over @@ -203,7 +204,7 @@ # that will push the load over the limit. # # Returns: -@@ -8476,8 +8476,8 @@ sub base64_zip_eval() { +@@ -8552,8 +8552,8 @@ sub base64_zip_eval() { # Returns: # $script = 1-liner for perl -e my $script = ::spacefree(0,q{ @@ -214,7 +215,7 @@ $chld = $SIG{CHLD}; $SIG{CHLD} = "IGNORE"; # Search for bzip2. Not found => use default path -@@ -8529,13 +8529,13 @@ sub base64_eval($) { +@@ -8605,13 +8605,13 @@ sub base64_eval($) { # Will be wrapped in ' so single quote is forbidden. # Spaces are stripped so spaces cannot be significant. # The funny 'use IPC::Open3'-syntax is to avoid spaces and @@ -231,7 +232,7 @@ my $eval = decode_base64(join"",@ARGV); eval $eval; }); -@@ -11201,7 +11201,7 @@ sub get($) { +@@ -11285,7 +11285,7 @@ sub get($) { my $ret = $self->{'arg_sub_queue'}->get(); if($ret) { if(grep { index($_->orig(),"\0") > 0 } @$ret) { @@ -241,5 +242,5 @@ ::warning("A NUL character in the input was replaced with \\0.", "NUL cannot be passed through in the argument list.", -- -2.24.0 +2.26.2 Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-10 19:12:25 UTC (rev 626200) +++ PKGBUILD 2020-05-10 19:35:50 UTC (rev 626201) @@ -4,7 +4,7 @@ # Contributor: Peter Simons <[email protected]> pkgname=parallel -pkgver=20191122 +pkgver=20200322 pkgrel=1 pkgdesc='A shell tool for executing jobs in parallel' arch=('any') @@ -14,10 +14,10 @@ source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig} 0001-Remove-citation-things.patch 0002-Remove-GNU-branding.patch) -sha1sums=('0cfb88b080c6711d2eaa8960e4fc8cc22c4501ef' +sha1sums=('073ff02f6140f8a7ccfcd695e09895a6e9720559' 'SKIP' - '50a4e5fe39ab1bd39e0ee0ee2f1faced0c6c2262' - 'd46fc3ac0cfffcc0a5595a19c763ed5663b4f9d3') + '8b6c47736cd827f3a826dbceb03925678c3d2080' + '0f61b5e584063daa7c7be08734fdec10acba36d6') validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888') prepare() {
