Date: Sunday, January 23, 2022 @ 08:07:06
Author: grawlinson
Revision: 1113546
upgpkg: parallel 20220122-1
* New upstream release.
* Replace patch file with sed script for removing GNU branding.
Modified:
parallel/trunk/0001-Remove-citation-things.patch
parallel/trunk/PKGBUILD
Deleted:
parallel/trunk/0002-Remove-GNU-branding.patch
-----------------------------------+
0001-Remove-citation-things.patch | 39 ++---
0002-Remove-GNU-branding.patch | 263 ------------------------------------
PKGBUILD | 46 ++++--
3 files changed, 50 insertions(+), 298 deletions(-)
Modified: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch 2022-01-23 06:30:56 UTC (rev 1113545)
+++ 0001-Remove-citation-things.patch 2022-01-23 08:07:06 UTC (rev 1113546)
@@ -1,6 +1,6 @@
--- a/src/parallel
+++ b/src/parallel
-@@ -1624,11 +1624,6 @@ sub options_hash() {
+@@ -1654,11 +1654,6 @@ sub options_hash() {
"gnu" => \$opt::gnu,
"link|xapply" => \$opt::link,
"linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource,
@@ -8,11 +8,11 @@
- #
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
- # You accept to be put in a public hall of shame by removing
-- # the lines.
+- # these lines.
"bibtex|citation" => \$opt::citation,
"wc|willcite|will-cite|nn|nonotice|no-notice" => \$opt::willcite,
# Termination and retries
-@@ -1783,15 +1778,6 @@ sub parse_options(@) {
+@@ -1815,15 +1810,6 @@ sub parse_options(@) {
my @argv_before = @ARGV;
@ARGV = read_options();
@@ -28,7 +28,7 @@
# no-* overrides *
if($opt::nokeeporder) { $opt::keeporder = undef; }
-@@ -2072,81 +2058,6 @@ sub parse_options(@) {
+@@ -2104,81 +2090,6 @@ sub parse_options(@) {
if(defined $opt::eta) { $opt::progress = $opt::eta; }
if(defined $opt::bar) { $opt::progress = $opt::bar; }
@@ -110,7 +110,7 @@
parse_halt();
if($ENV{'PARALLEL_ENV'}) {
-@@ -5073,83 +4984,9 @@ sub usage() {
+@@ -5110,83 +5021,9 @@ sub usage() {
"",
"GNU Parallel can do much more. See 'man $Global::progname' for
details",
"",
@@ -118,14 +118,14 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- " Tange, O. (2021, December 22). GNU Parallel 20211222
('Støjberg').",
-- " Zenodo. https://doi.org/10.5281/zenodo.5797028";,
+- " Tange, O. (2022, January 22). GNU Parallel 20220122 ('20
years').",
+- " Zenodo. https://doi.org/10.5281/zenodo.5893336";,
- "",
- # Before changing these lines, 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
- # You accept to be put in a public hall of shame by removing
-- # the lines.
+- # these lines.
- "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.",
- "",
@@ -151,14 +151,14 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- " Tange, O. (2021, December 22). GNU Parallel 20211222
('Støjberg').",
-- " Zenodo. https://doi.org/10.5281/zenodo.5797028";,
+- " Tange, O. (2022, January 22). GNU Parallel 20220122 ('20
years').",
+- " Zenodo. https://doi.org/10.5281/zenodo.5893336";,
- "",
- # Before changing these line, please read
- #
https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice and
- #
https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
- # You accept to be put in a public hall of shame by
-- # removing the lines.
+- # removing these lines.
- "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.",
- "",
@@ -194,7 +194,7 @@
sub status(@) {
my @w = @_;
my $fh = $Global::status_fd || *STDERR;
-@@ -5214,97 +5051,7 @@ sub version() {
+@@ -5251,97 +5088,7 @@ sub version() {
"This is free software: you are free to change and redistribute it.",
"GNU $Global::progname comes with no warranty.",
"",
@@ -220,26 +220,26 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- "\@software{tange_2021_5797028,",
+- "\@software{tange_2022_5893336,",
- " author = {Tange, Ole},",
-- " title = {GNU Parallel 20211222 ('Støjberg')},",
-- " month = Dec,",
+- " title = {GNU Parallel 20220122 ('20 years')},",
+- " month = Jan,",
- " year = 2021,",
- " note = {{GNU Parallel is a general parallelizer to run",
- " multiple serial command line programs in
parallel",
- " without changing them.}},",
- " publisher = {Zenodo},",
-- " doi = {10.5281/zenodo.5797028},",
-- " url = {https://doi.org/10.5281/zenodo.5797028}";,
+- " doi = {10.5281/zenodo.5893336},",
+- " url = {https://doi.org/10.5281/zenodo.5893336}";,
- "}",
- "",
-- "(Feel free to use \\nocite{tange_2021_5797028})",
+- "(Feel free to use \\nocite{tange_2022_5893336})",
- "",
- # Before changing these lines, please read
- #
https://www.gnu.org/software/parallel/parallel_design.html#Citation-notice and
- #
https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
- # You accept to be put in a public hall of shame by removing
-- # the lines.
+- # these lines.
- "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.",
- "",
@@ -292,4 +292,3 @@
}
sub show_limits() {
-
Deleted: 0002-Remove-GNU-branding.patch
===================================================================
--- 0002-Remove-GNU-branding.patch 2022-01-23 06:30:56 UTC (rev 1113545)
+++ 0002-Remove-GNU-branding.patch 2022-01-23 08:07:06 UTC (rev 1113546)
@@ -1,263 +0,0 @@
---- a/src/parallel
-+++ b/src/parallel
-@@ -1750,7 +1750,7 @@ sub parse_parset() {
- ("@illegal is an invalid variable name.",
- "Variable names must be letter followed by letters or digits.",
- "Usage:",
-- " parset varname GNU Parallel options and command");
-+ " parset varname Parallel options and command");
- wait_and_exit(255);
- }
- if($var_or_assoc eq "assoc") {
-@@ -1839,7 +1839,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); }
-@@ -2177,7 +2177,7 @@ sub init_globals() {
- # Defaults:
- $Global::version = 20211122;
- $Global::progname = 'parallel';
-- $::name = "GNU Parallel";
-+ $::name = "Parallel";
- $Global::infinity = 2**31;
- $Global::debug = 0;
- $Global::verbose = 0;
-@@ -2426,7 +2426,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 Parallel does not read args
- # Uses:
- # $opt::semaphore
- # $Global::semaphore
-@@ -3257,7 +3257,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 Parallel
- # $Global::quoting = quote the command to run
-
- sub init_run_jobs() {
-@@ -4170,7 +4170,7 @@ sub setup_basefile() {
- }
- debug("init", "basesetup: @cmd\n");
- my ($exitstatus,$stdout_ref,$stderr_ref) =
-- run_gnu_parallel((join "\n",@cmd),"-j0","--retries",5);
-+ run_parallel((join "\n",@cmd),"-j0","--retries",5);
- if($exitstatus) {
- my @stdout = @$stdout_ref;
- my @stderr = @$stderr_ref;
-@@ -4200,7 +4200,7 @@ sub cleanup_basefile() {
- }
- debug("init", "basecleanup: @cmd\n");
- my ($exitstatus,$stdout_ref,$stderr_ref) =
-- run_gnu_parallel(join("\n",@cmd),"-j0","--retries",5);
-+ run_parallel(join("\n",@cmd),"-j0","--retries",5);
- if($exitstatus) {
- my @stdout = @$stdout_ref;
- my @stderr = @$stderr_ref;
-@@ -4209,22 +4209,22 @@ sub cleanup_basefile() {
- }
- }
-
--sub run_gnu_parallel() {
-+sub run_parallel() {
- my ($stdin,@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 Parallel
- # @args = command line arguments
- # Returns:
-- # $exitstatus = exitcode of GNU Parallel run
-+ # $exitstatus = exitcode of Parallel run
- # \@stdout = standard output
- # \@stderr = standard error
- my ($stdin,@args) = @_;
-@@ -4614,7 +4614,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 Parallel: $0 $options");
- my @joblogs;
- for my $host (sort keys %Global::host) {
- my $sshlogin = $Global::host{$host};
-@@ -4678,14 +4678,14 @@ sub sigpipe() {
-
- sub signal_children() {
- # Send signal to all children process groups
-- # and GNU Parallel itself
-+ # and Parallel itself
- # Uses:
- # %SIG
- # Returns: N/A
- 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 Parallel itself
- $SIG{$signal} = undef;
- kill $signal, $$;
- }
-@@ -4982,7 +4982,7 @@ sub usage() {
- "--recend str Record end separator for --pipe.",
- "--recstart str Record start separator for --pipe.",
- "",
-- "GNU Parallel can do much more. See 'man $Global::progname' for
details",
-+ "Parallel can do much more. See 'man $Global::progname' for details",
- "",
- "",);
- }
-@@ -5044,12 +5044,12 @@ sub version() {
- # Returns: N/A
- print join
- ("\n",
-- "GNU $Global::progname $Global::version",
-+ "$Global::progname $Global::version",
- "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free
Software",
- "Foundation, Inc.",
- "License GPLv3+: GNU GPL version 3 or later
<https://gnu.org/licenses/gpl.html>",
- "This is free software: you are free to change and redistribute it.",
-- "GNU $Global::progname comes with no warranty.",
-+ "$Global::progname comes with no warranty.",
- "",
- );
- }
-@@ -5065,7 +5065,7 @@ sub show_limits() {
- }
-
- sub embed() {
-- # 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);
-@@ -5110,9 +5110,9 @@ sub embed() {
- ";
-
- print q!
--# Embedded GNU Parallel created with --embed
-+# Embedded Parallel created with --embed
- parallel() {
-- # 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:
-@@ -5123,7 +5123,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);
-@@ -5132,9 +5132,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!
-@@ -5142,10 +5142,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,
-@@ -5157,7 +5157,7 @@ env_parallel --session
- env_parallel -k echo ::: Put your code here
- parset p,y,c,h -k echo ::: Put your code here
- echo $p $y $c $h
--echo You can also activate GNU Parallel for interactive use by:
-+echo You can also activate Parallel for interactive use by:
- echo . "$0"
- !;
- } else {
-@@ -6727,7 +6727,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 Parallel will at most start one job
- # that will push the load over the limit.
- #
- # Returns:
-@@ -9054,8 +9054,8 @@ sub base64_zip_eval() {
- # Returns:
- # $script = 1-liner for perl -e
- my $script = ::spacefree(0,q{
-- @GNU_Parallel = split /_/, "use_IPC::Open3;_use_MIME::Base64";
-- eval"@GNU_Parallel";
-+ @Parallel = split /_/, "use_IPC::Open3;_use_MIME::Base64";
-+ eval"@Parallel";
- $chld = $SIG{CHLD};
- $SIG{CHLD} = "IGNORE";
- # Search for bzip2. Not found => use default path
-@@ -9107,13 +9107,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 Parallel command
- # when looking at the process table.
- # Returns:
- # $script = 1-liner for perl -e
- my $script = ::spacefree(0,q{
-- @GNU_Parallel=("use","IPC::Open3;","use","MIME::Base64");
-- eval "@GNU_Parallel";
-+ @Parallel=("use","IPC::Open3;","use","MIME::Base64");
-+ eval "@Parallel";
- my $eval = decode_base64(join"",@ARGV);
- eval $eval;
- });
-@@ -10959,7 +10959,7 @@ sub slot($) {
- # To be safe assume all arguments are one-char
- # The max_len is cached between runs, but if the size of
- # the environment is different we need to recompute the
-- # usable max length for this run of GNU Parallel
-+ # usable max length for this run of Parallel
- # See https://unix.stackexchange.com/a/604943/2972
- if(not $darwin_max_len) {
- my $envc = (keys %ENV);
-@@ -12154,7 +12154,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 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.",
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-01-23 06:30:56 UTC (rev 1113545)
+++ PKGBUILD 2022-01-23 08:07:06 UTC (rev 1113546)
@@ -6,34 +6,47 @@
pkgbase=parallel
pkgname=('parallel' 'parallel-docs')
-pkgver=20211222
+pkgver=20220122
pkgrel=1
pkgdesc='A shell tool for executing jobs in parallel'
arch=('any')
url='https://www.gnu.org/software/parallel/'
license=('GPL3')
-source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
- 0001-Remove-citation-things.patch
- 0002-Remove-GNU-branding.patch)
-sha512sums=('864d9e9ab690008d0900544c409cef28758ff24a74ca4909ad7ada877ad7fd308995a929f626618ad6779daeaf44d13dda6c7aae274bbf66b8053d6d10ea809a'
+source=(
+ "https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig}
+ '0001-Remove-citation-things.patch'
+)
+sha512sums=('8466e3a37930fdb1b77f8976bef6875f12cd57423d82afded9e30c6a15fd2361b6c50991f43c4a6d61d354d11a5f6da3344da72b1efc67fb7eda30a5242b1873'
'SKIP'
-
'0857bb0639fc79a81bd9bc2a35008f80898f3314d26f0138195aeee54f3ff14ef257db32c8b322ac93ed5bd52b2196ce636550c08b57ab9ac1a0c191f09550fd'
-
'304fc64ce5b5b664bdd1480da54863c061940f5f6255d13462f3bec5ff742636f34769650c64875dc7dda7c552b7ba6ee63f8fea1aa914f6d2210f2d49a2ba7b')
-b2sums=('f2258632ab4a8f0a13dcf7e617155a30eda32f792d2dcda3d31a0e0515d06546df42abd369e17badfd1ab5ec5099d390ee42bd70fbd603c98a974db142940b32'
+
'579c776fce963558b079b79aed2e4d9404e01ff990f91d57a28b4584a06e8abb38659b68a1d465652ba112c4c1a74c1a5389c6f7f1c259a7401b80d490225b4b')
+b2sums=('5a4d37442aa7319e8ea4b18a0b29ea8a69a4b235a938bd26e76e977da12c6d8f2cf1ce6bda2fff41b14f39750dadd6d60e58cf80cab82eaf9eb8f71e4b997a63'
'SKIP'
-
'1b32ab5d4dc3999197eda525e8a46aca1d5fba5a8ebbf639b6d977d98bd00f2abe0533f4b0fee3aedc9eca31907ff61ca99ffff496099a0be0589aa6ad3deb5c'
-
'684576067936f30e24a00c0283b961f56451eb8924a26c6f426a23521b1e272890772e51d817de7386ebf6863c5f8ba9c5598d17d56f3df1875f4b36bcee13d3')
+
'716255ec10b1811b70e8c3012157e55c0cc01c80bf78ce89e321e313e7ee410f6c9a68afc3607e56c1181e940798265dd54ec3a2b7f5b748e5d930d48e476302')
validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
prepare() {
- cd parallel-$pkgver
+ cd "$pkgbase-$pkgver"
+
+ # remove citation warnings
patch -p1 <"$srcdir"/0001-Remove-citation-things.patch
- patch -p1 <"$srcdir"/0002-Remove-GNU-branding.patch
+
+ # remove gnu branding
+ sed \
+ --in-place \
+ --regexp-extended \
+ --expression 's/GNU\s{1,3}Parallel/Parallel/g' \
+ --expression 's/run_gnu_parallel/run_parallel/g' \
+ --expression 's/with_GNU_Parallel/with_Parallel/g' \
+ --expression 's/GNU \$Global::progname/\$Global::progname/g' \
+ --expression 's/@GNU_Parallel/@Parallel/g' \
+ src/parallel
}
build() {
- cd parallel-$pkgver
+ cd "$pkgbase-$pkgver"
+
./configure --prefix=/usr
+
make
}
@@ -40,8 +53,11 @@
package_parallel() {
depends=('perl' 'procps')
- cd parallel-$pkgver
+ cd "$pkgbase-$pkgver"
+
make DESTDIR="$pkgdir" install
+
+ # split documentation out of main package
mv "$pkgdir/usr/share/doc" docs
}
@@ -48,7 +64,7 @@
package_parallel-docs() {
pkgdesc+=' (documentation)'
- cd parallel-$pkgver
+ cd "$pkgbase-$pkgver"
install -vd "$pkgdir/usr/share/doc"
mv -v docs/* "$pkgdir/usr/share/doc"
