[arch-commits] Commit in parallel/trunk (3 files)
Johannes Löthberg
demize at archlinux.org
Wed Apr 24 18:18:17 UTC 2019
Date: Wednesday, April 24, 2019 @ 18:18:16
Author: demize
Revision: 453410
upgpkg: parallel 20190422-1
Modified:
parallel/trunk/0001-Remove-citation-things.patch
parallel/trunk/0002-Remove-GNU-branding.patch
parallel/trunk/PKGBUILD
-----------------------------------+
0001-Remove-citation-things.patch | 54 +++++++++++++++++++++++-------------
0002-Remove-GNU-branding.patch | 8 ++---
PKGBUILD | 8 ++---
3 files changed, 43 insertions(+), 27 deletions(-)
Modified: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch 2019-04-24 18:15:24 UTC (rev 453409)
+++ 0001-Remove-citation-things.patch 2019-04-24 18:18:16 UTC (rev 453410)
@@ -1,4 +1,4 @@
-From e53f497bdd17ea5f6947d3b4af5d44c54b2978f5 Mon Sep 17 00:00:00 2001
+From 67ad2dff4bdc73012a8724f0fc439eeefbaaf768 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,11 +8,11 @@
Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
- src/parallel | 218 +--------------------------------------------------
- 1 file changed, 1 insertion(+), 217 deletions(-)
+ src/parallel | 232 +--------------------------------------------------
+ 1 file changed, 1 insertion(+), 231 deletions(-)
diff --git a/src/parallel b/src/parallel
-index 27a07c1..8e4437a 100755
+index f41a17d..b7af99c 100755
--- a/src/parallel
+++ b/src/parallel
@@ -1206,8 +1206,6 @@ sub options_hash() {
@@ -37,7 +37,7 @@
# no-* overrides *
if($opt::nokeeporder) { $opt::keeporder = undef; }
-@@ -1544,59 +1536,6 @@ sub parse_options(@) {
+@@ -1544,73 +1536,6 @@ sub parse_options(@) {
if(defined $opt::eta) { $opt::progress = $opt::eta; }
if(defined $opt::bar) { $opt::progress = $opt::bar; }
@@ -52,6 +52,18 @@
- # https://www.slideshare.net/NadiaEghbal/consider-the-maintainer
- # https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/
- #
+- # If you want GNU Parallel to be maintained in the future, and not
+- # just wither away like so many other free software tools, you
+- # need to help finance the development.
+- #
+- # The citation notice is a simple way of doing so, as citations
+- # makes it possible to me to get a job where I can maintain GNU
+- # Parallel as part of the job.
+- #
+- # This means you can help financing development
+- #
+- # WITHOUT PAYING A SINGLE CENT!
+- #
- # Before implementing the citation notice it was discussed with
- # the users:
- # https://lists.gnu.org/archive/html/parallel/2013-11/msg00006.html
@@ -68,9 +80,10 @@
- #
- # Please note that GPL version 3 gives you the right to fork GNU
- # Parallel under a new name, but it does not give you the right to
-- # distribute modified copies with the citation notice disabled
-- # under the name GNU Parallel. To do that you need to be the owner
-- # of the GNU Parallel trademark. The xt:Commerce case shows this.
+- # distribute modified copies with the citation notice disabled in
+- # a way where the software can be confused with GNU Parallel. To
+- # do that you need to be the owner of the GNU Parallel
+- # trademark. The xt:Commerce case shows this.
- #
- # Description of the xt:Commerce case in OLG Duesseldorf
- # http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx
@@ -91,13 +104,14 @@
- # the alternatives instead?
- # See a list in: 'man parallel_alternatives'
- #
-- # Please read the above before changing this line.
+- # If you are an honest person please read the above before
+- # changing this line.
- citation_notice();
-
parse_halt();
if($ENV{'PARALLEL_ENV'}) {
-@@ -4407,77 +4346,9 @@ sub usage() {
+@@ -4421,77 +4346,9 @@ sub usage() {
"",
"See 'man $Global::progname' for details",
"",
@@ -175,7 +189,7 @@
sub status(@) {
my @w = @_;
my $fh = $Global::status_fd || *STDERR;
-@@ -4529,95 +4400,8 @@ sub version() {
+@@ -4543,97 +4400,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.",
@@ -184,9 +198,10 @@
- "Web site: http://www.gnu.org/software/${Global::progname}\n",
- "When using programs that use GNU Parallel to process data for publication",
- "please cite as described in 'parallel --citation'.\n",
-- );
--}
--
++ "GNU $Global::progname comes with no warranty.\n",
+ );
+ }
+
-sub citation() {
- # Returns: N/A
- my ($all_argv_ref,$argv_options_removed_ref) = @_;
@@ -230,8 +245,7 @@
- "If you send a copy of your published article to tange\@gnu.org, it will be",
- "mentioned in the release notes of next version of GNU Parallel.",
- ""
-+ "GNU $Global::progname comes with no warranty.\n",
- );
+- );
- while(not grep { -e "$_/will-cite" } @Global::config_dirs) {
- print "\nType: 'will cite' and press enter.\n> ";
- my $input = <STDIN>;
@@ -269,9 +283,11 @@
- }
- }
- }
- }
-
+-}
+-
sub show_limits() {
+ # Returns: N/A
+ print("Maximal size of command: ",Limits::Command::real_max_length(),"\n",
--
-2.20.1
+2.21.0
Modified: 0002-Remove-GNU-branding.patch
===================================================================
--- 0002-Remove-GNU-branding.patch 2019-04-24 18:15:24 UTC (rev 453409)
+++ 0002-Remove-GNU-branding.patch 2019-04-24 18:18:16 UTC (rev 453410)
@@ -1,4 +1,4 @@
-From 9d77b065c2ccd1611f12fd2b30bd2dcc8464aa8e Mon Sep 17 00:00:00 2001
+From 8340be855ada2c8a6bdeee46df63f176ad9485ed 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
@@ -14,7 +14,7 @@
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/parallel b/src/parallel
-index 8e4437a..eb2dd48 100755
+index b7af99c..222ff11 100755
--- a/src/parallel
+++ b/src/parallel
@@ -1846,7 +1846,7 @@ sub parse_replacement_string_options() {
@@ -151,7 +151,7 @@
my $eval = decode_base64(join"", at ARGV);
eval $eval;
});
-@@ -10792,7 +10792,7 @@ sub get($) {
+@@ -10794,7 +10794,7 @@ sub get($) {
my $ret = $self->{'arg_sub_queue'}->get();
if($ret) {
if(grep { index($_->orig(),"\0") > 0 } @$ret) {
@@ -161,5 +161,5 @@
::warning("A NUL character in the input was replaced with \\0.",
"NUL cannot be passed through in the argument list.",
--
-2.20.1
+2.21.0
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-24 18:15:24 UTC (rev 453409)
+++ PKGBUILD 2019-04-24 18:18:16 UTC (rev 453410)
@@ -4,7 +4,7 @@
# Contributor: Peter Simons <simons at cryp.to>
pkgname=parallel
-pkgver=20190322
+pkgver=20190422
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=('35bb143b0f344257c22486f8d8d6970ea61a3f7b'
+sha1sums=('921e0469fe655ca3f583d836b7d614c8cbebfad8'
'SKIP'
- 'd1384410e9dcff114021a3087d59fc9ac571ab97'
- 'b97516acb21e1f95f33ade1bb058e13a8c5fdeb8')
+ '550f849763d158146931609a1ba9c480cb00fe7e'
+ 'c412f8e040283a00c58e44b89fecfe7daa54ea2a')
validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
prepare() {
More information about the arch-commits
mailing list