[arch-commits] Commit in parallel/trunk (3 files)
Johannes Löthberg
demize at archlinux.org
Mon Dec 2 20:34:09 UTC 2019
Date: Monday, December 2, 2019 @ 20:34:09
Author: demize
Revision: 534760
upgpkg: parallel 20191122-1
Modified:
parallel/trunk/0001-Remove-citation-things.patch
parallel/trunk/0002-Remove-GNU-branding.patch
parallel/trunk/PKGBUILD
-----------------------------------+
0001-Remove-citation-things.patch | 57 ++++++++++----
0002-Remove-GNU-branding.patch | 144 ++++++++++++++++++++++++++++--------
PKGBUILD | 8 +-
3 files changed, 158 insertions(+), 51 deletions(-)
Modified: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch 2019-12-02 20:31:06 UTC (rev 534759)
+++ 0001-Remove-citation-things.patch 2019-12-02 20:34:09 UTC (rev 534760)
@@ -1,4 +1,4 @@
-From 67ad2dff4bdc73012a8724f0fc439eeefbaaf768 Mon Sep 17 00:00:00 2001
+From 1eae416754561ffc38da4c07104f48c06c56a30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
Date: Fri, 22 Mar 2019 19:03:41 +0100
Subject: [PATCH 1/2] Remove citation things
@@ -8,28 +8,39 @@
Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
- src/parallel | 232 +--------------------------------------------------
- 1 file changed, 1 insertion(+), 231 deletions(-)
+ src/parallel | 245 +--------------------------------------------------
+ 1 file changed, 3 insertions(+), 242 deletions(-)
diff --git a/src/parallel b/src/parallel
-index f41a17d..b7af99c 100755
+index 8b8359c..9cd4505 100755
--- a/src/parallel
+++ b/src/parallel
-@@ -1206,8 +1206,6 @@ sub options_hash() {
+@@ -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() {
"gnu" => \$opt::gnu,
"link|xapply" => \$opt::link,
"linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource,
- # Before changing this line, please read
-- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice
+- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice
+- # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
"bibtex|citation" => \$opt::citation,
"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite,
# Termination and retries
-@@ -1312,12 +1310,6 @@ sub parse_options(@) {
+@@ -1643,13 +1640,6 @@ sub parse_options(@) {
my @argv_before = @ARGV;
@ARGV = read_options();
- # Before changing this line, please read
- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice
+- # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
- if(defined $opt::citation) {
- citation(\@argv_before,\@ARGV);
- wait_and_exit(0);
@@ -37,7 +48,7 @@
# no-* overrides *
if($opt::nokeeporder) { $opt::keeporder = undef; }
-@@ -1544,73 +1536,6 @@ sub parse_options(@) {
+@@ -1884,78 +1874,6 @@ sub parse_options(@) {
if(defined $opt::eta) { $opt::progress = $opt::eta; }
if(defined $opt::bar) { $opt::progress = $opt::bar; }
@@ -104,14 +115,19 @@
- # the alternatives instead?
- # See a list in: 'man parallel_alternatives'
- #
-- # If you are an honest person please read the above before
-- # changing this line.
+- # If you want GNU Parallel to be maintained in the future keep
+- # this line.
- citation_notice();
+- # Seriously: *You* will be harming free software by removing the
+- # notice. You make it harder to justify spending time developing
+- # it. If you *do* remove the line, please email
+- # hallofshame at tange.dk if you want to avoid being put in a hall of
+- # shame.
-
parse_halt();
if($ENV{'PARALLEL_ENV'}) {
-@@ -4421,77 +4346,9 @@ sub usage() {
+@@ -4799,79 +4717,9 @@ sub usage() {
"",
"See 'man $Global::progname' for details",
"",
@@ -124,6 +140,7 @@
- "",
- # Before changing this line, please read
- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice
+- # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
- "This helps funding further development; AND IT WON'T COST YOU A CENT.",
- "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
- "",
@@ -154,6 +171,7 @@
- "",
- # Before changing this line, please read
- # https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice
+- # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
- "This helps funding further development; AND IT WON'T COST YOU A CENT.",
- "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
- "",
@@ -164,7 +182,7 @@
- ""
- );
- mkdir $Global::config_dir;
-- # Number of times the user has run GNU Parallel without showing
+- # Number of times the user has run GNU Parallel without showing
- # willingness to cite
- my $runs = 0;
- if(open (my $fh, "<", $Global::config_dir.
@@ -189,7 +207,7 @@
sub status(@) {
my @w = @_;
my $fh = $Global::status_fd || *STDERR;
-@@ -4543,97 +4400,10 @@ sub version() {
+@@ -4923,97 +4771,10 @@ sub version() {
"Copyright (C) 2007-2019 Ole Tange 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.",
@@ -274,7 +292,7 @@
- "",
- "If you use '--will-cite' in scripts to be run by others you are making",
- "it harder for others to see the citation notice. The development of",
-- "GNU parallel is indirectly financed through citations, so if users",
+- "GNU Parallel is indirectly financed through citations, so if users",
- "do not know they should cite then you are making it harder to finance",
- "development. However, if you pay 10000 EUR, you should feel free to",
- "use '--will-cite' in scripts.",
@@ -288,6 +306,15 @@
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.21.0
+2.24.0
Modified: 0002-Remove-GNU-branding.patch
===================================================================
--- 0002-Remove-GNU-branding.patch 2019-12-02 20:31:06 UTC (rev 534759)
+++ 0002-Remove-GNU-branding.patch 2019-12-02 20:34:09 UTC (rev 534760)
@@ -1,4 +1,4 @@
-From 8340be855ada2c8a6bdeee46df63f176ad9485ed Mon Sep 17 00:00:00 2001
+From 3832d5cc88610e725793e24298816928391ccab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at kyriasis.com>
Date: Fri, 22 Mar 2019 19:04:42 +0100
Subject: [PATCH 2/2] Remove GNU branding
@@ -10,63 +10,109 @@
Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
- src/parallel | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
+ src/parallel | 62 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/parallel b/src/parallel
-index b7af99c..222ff11 100755
+index 9cd4505..7a3fa5c 100755
--- a/src/parallel
+++ b/src/parallel
-@@ -1846,7 +1846,7 @@ sub parse_replacement_string_options() {
+@@ -1683,7 +1683,7 @@ sub parse_options(@) {
+ if(defined $opt::tmpdir) { $ENV{'TMPDIR'} = $opt::tmpdir; }
+ $ENV{'PARALLEL_RSYNC_OPTS'} = $opt::rsync_opts ||
+ $ENV{'PARALLEL_RSYNC_OPTS'} || '-rlDzR';
+- # Default: Same nice level as GNU Parallel is started at
++ # Default: Same nice level as Parallel is started at
+ $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() {
+ # Defaults:
+ $Global::version = 20191122;
+ $Global::progname = 'parallel';
+- $::name = "GNU Parallel";
++ $::name = "Parallel";
+ $Global::infinity = 2**31;
+ $Global::debug = 0;
+ $Global::verbose = 0;
+@@ -2206,7 +2206,7 @@ sub parse_replacement_string_options() {
sub parse_semaphore() {
# Semaphore defaults
# Must be done before computing number of processes and max_line_length
-- # because when running as a semaphore GNU Parallel does not read args
+- # because when running as a semaphore GNU Parallel does not read args
+ # because when running as a semaphore Parallel does not read args
# Uses:
# $opt::semaphore
# $Global::semaphore
-@@ -2665,7 +2665,7 @@ sub __RUNNING_THE_JOBS_AND_PRINTING_PROGRESS__() {}
+@@ -3035,7 +3035,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?
--# $Global::exitstatus = status code of GNU Parallel
+-# $Global::exitstatus = status code of GNU Parallel
+# $Global::exitstatus = status code of Parallel
# $Global::quoting = quote the command to run
sub init_run_jobs() {
-@@ -3620,14 +3620,14 @@ sub run_parallel() {
+@@ -3944,7 +3944,7 @@ sub setup_basefile() {
+ }
+ debug("init", "basesetup: @cmd\n");
+ my ($exitstatus,$stdout_ref,$stderr_ref) =
+- run_gnu_parallel((join "\n", at cmd),"-j0","--retries",5);
++ run_parallel((join "\n", at cmd),"-j0","--retries",5);
+ if($exitstatus) {
+ my @stdout = @$stdout_ref;
+ my @stderr = @$stderr_ref;
+@@ -3974,7 +3974,7 @@ sub cleanup_basefile() {
+ }
+ debug("init", "basecleanup: @cmd\n");
+ my ($exitstatus,$stdout_ref,$stderr_ref) =
+- run_gnu_parallel(join("\n", at cmd),"-j0","--retries",5);
++ run_parallel(join("\n", at cmd),"-j0","--retries",5);
+ if($exitstatus) {
+ my @stdout = @$stdout_ref;
+ my @stderr = @$stderr_ref;
+@@ -3983,22 +3983,22 @@ sub cleanup_basefile() {
+ }
}
- sub _run_parallel() {
-- # Run GNU Parallel
+-sub run_gnu_parallel() {
++sub run_parallel() {
+ my ($stdin, at args) = @_;
+ my $cmd = join "",map { " $_ & " } split /\n/, $stdin;
+ print $Global::original_stderr ` $cmd wait` ;
+ return 0
+ }
+
+-sub _run_gnu_parallel() {
+- # Run GNU Parallel
++sub _run_parallel() {
+ # Run Parallel
# This should ideally just fork an internal copy
# and not start it through a shell
# Input:
-- # $stdin = data to provide on stdin for GNU Parallel
+- # $stdin = data to provide on stdin for GNU Parallel
+ # $stdin = data to provide on stdin for Parallel
# @args = command line arguments
# Returns:
-- # $exitstatus = exitcode of GNU Parallel run
+- # $exitstatus = exitcode of GNU Parallel run
+ # $exitstatus = exitcode of Parallel run
# \@stdout = standard output
# \@stderr = standard error
my ($stdin, at args) = @_;
-@@ -4003,7 +4003,7 @@ sub onall($@) {
+@@ -4374,7 +4374,7 @@ sub onall($@) {
);
::debug("init", "| $0 $options\n");
open(my $parallel_fh, "|-", "$0 -0 --will-cite -j0 $options") ||
-- ::die_bug("This does not run GNU Parallel: $0 $options");
+- ::die_bug("This does not run GNU Parallel: $0 $options");
+ ::die_bug("This does not run Parallel: $0 $options");
my @joblogs;
for my $host (sort keys %Global::host) {
my $sshlogin = $Global::host{$host};
-@@ -4067,14 +4067,14 @@ sub sigpipe() {
+@@ -4438,14 +4438,14 @@ sub sigpipe() {
sub signal_children() {
# Send signal to all children process groups
-- # and GNU Parallel itself
+- # and GNU Parallel itself
+ # and Parallel itself
# Uses:
# %SIG
@@ -74,12 +120,12 @@
my $signal = shift;
debug("run", "Sending $signal ");
kill $signal, map { -$_ } keys %Global::running;
-- # Use default signal handler for GNU Parallel itself
+- # Use default signal handler for GNU Parallel itself
+ # Use default signal handler for Parallel itself
$SIG{$signal} = undef;
kill $signal, $$;
}
-@@ -4396,11 +4396,11 @@ sub version() {
+@@ -4767,11 +4767,11 @@ sub version() {
# Returns: N/A
print join
("\n",
@@ -93,37 +139,71 @@
);
}
-@@ -4415,7 +4415,7 @@ sub show_limits() {
+@@ -4786,7 +4786,7 @@ sub show_limits() {
}
sub embed() {
-- # Give an embeddable version of GNU Parallel
+- # Give an embeddable version of GNU Parallel
+ # Give an embeddable version of Parallel
# Tested with: bash, zsh, ksh, ash, dash, sh
my $randomstring = "cut-here-".join"",
map { (0..9,"a".."z","A".."Z")[rand(62)] } (1..20);
-@@ -4460,9 +4460,9 @@ sub embed() {
+@@ -4831,9 +4831,9 @@ sub embed() {
";
print q!
--# Embedded GNU Parallel created with --embed
+-# Embedded GNU Parallel created with --embed
+# Embedded Parallel created with --embed
parallel() {
-- # Start GNU Parallel without leaving temporary files
+- # Start GNU Parallel without leaving temporary files
+ # Start Parallel without leaving temporary files
#
# Not all shells support 'perl <(cat ...)'
# This is a complex way of doing:
-@@ -5891,7 +5891,7 @@ sub loadavg($) {
+@@ -4844,7 +4844,7 @@ parallel() {
+ # [1]+ Done cat
+
+ # Make a temporary fifo that perl can read from
+- _fifo_with_GNU_Parallel_source=`perl -e 'use POSIX qw(mkfifo);
++ _fifo_with_Parallel_source=`perl -e 'use POSIX qw(mkfifo);
+ do {
+ $f = "/tmp/parallel-".join"",
+ map { (0..9,"a".."z","A".."Z")[rand(62)] } (1..5);
+@@ -4853,9 +4853,9 @@ parallel() {
+ print $f;'`
+ # Put source code into temporary file
+ # so it is easy to copy to the fifo
+- _file_with_GNU_Parallel_source=`mktemp`;
++ _file_with_Parallel_source=`mktemp`;
+ !,
+- "cat <<'$randomstring' > \$_file_with_GNU_Parallel_source\n",
++ "cat <<'$randomstring' > \$_file_with_Parallel_source\n",
+ @source,
+ $randomstring,"\n",
+ q!
+@@ -4863,10 +4863,10 @@ parallel() {
+ # and remove the file and fifo ASAP
+ # 'sh -c' is needed to avoid
+ # [1]+ Done cat
+- sh -c "(rm $_file_with_GNU_Parallel_source; cat >$_fifo_with_GNU_Parallel_source; rm $_fifo_with_GNU_Parallel_source) < $_file_with_GNU_Parallel_source &"
++ sh -c "(rm $_file_with_Parallel_source; cat >$_fifo_with_Parallel_source; rm $_fifo_with_Parallel_source) < $_file_with_Parallel_source &"
+
+ # Read the source from the fifo
+- perl $_fifo_with_GNU_Parallel_source "$@"
++ perl $_fifo_with_Parallel_source "$@"
+ }
+ !,
+ @env_parallel_source,
+@@ -6308,7 +6308,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
-- # several minutes. This is needed so GNU Parallel will at most start one job
+- # several minutes. This is needed so GNU Parallel will at most start one job
+ # several minutes. This is needed so Parallel will at most start one job
# that will push the load over the limit.
#
# Returns:
-@@ -8110,8 +8110,8 @@ sub base64_zip_eval() {
+@@ -8476,8 +8476,8 @@ sub base64_zip_eval() {
# Returns:
# $script = 1-liner for perl -e
my $script = ::spacefree(0,q{
@@ -134,11 +214,11 @@
$chld = $SIG{CHLD};
$SIG{CHLD} = "IGNORE";
# Search for bzip2. Not found => use default path
-@@ -8163,13 +8163,13 @@ sub base64_eval($) {
+@@ -8529,13 +8529,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
-- # to make it clear that this is a GNU Parallel command
+- # to make it clear that this is a GNU Parallel command
+ # to make it clear that this is a Parallel command
# when looking at the process table.
# Returns:
@@ -151,15 +231,15 @@
my $eval = decode_base64(join"", at ARGV);
eval $eval;
});
-@@ -10794,7 +10794,7 @@ sub get($) {
+@@ -11201,7 +11201,7 @@ sub get($) {
my $ret = $self->{'arg_sub_queue'}->get();
if($ret) {
if(grep { index($_->orig(),"\0") > 0 } @$ret) {
-- # Allow for \0 in position 0 because GNU Parallel uses "\0noarg"
+- # Allow for \0 in position 0 because GNU Parallel uses "\0noarg"
+ # Allow for \0 in position 0 because Parallel uses "\0noarg"
# to mean no-string
::warning("A NUL character in the input was replaced with \\0.",
"NUL cannot be passed through in the argument list.",
--
-2.21.0
+2.24.0
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-02 20:31:06 UTC (rev 534759)
+++ PKGBUILD 2019-12-02 20:34:09 UTC (rev 534760)
@@ -4,7 +4,7 @@
# Contributor: Peter Simons <simons at cryp.to>
pkgname=parallel
-pkgver=20190722
+pkgver=20191122
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=('d07817630a0f64e2267fb8aa7ade71ea9cf20f25'
+sha1sums=('0cfb88b080c6711d2eaa8960e4fc8cc22c4501ef'
'SKIP'
- '550f849763d158146931609a1ba9c480cb00fe7e'
- 'c412f8e040283a00c58e44b89fecfe7daa54ea2a')
+ '50a4e5fe39ab1bd39e0ee0ee2f1faced0c6c2262'
+ 'd46fc3ac0cfffcc0a5595a19c763ed5663b4f9d3')
validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
prepare() {
More information about the arch-commits
mailing list