diff --git a/Makefile.am b/Makefile.am index f3947d91..17e59a3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ web: cp -r src/*.pdf src/sphinx/build/html/* ../parallel-web/parallel cp ../parallel-web/parallel/parallel.html ../parallel-web/parallel/man.html -upload: +sig: eval `gpg-agent --daemon` # make sure $YYYYMMDD is set echo $(YYYYMMDD) | grep 20 @@ -52,6 +52,7 @@ upload: echo; \ gpg -ab -o - parallel-$(YYYYMMDD).tar.bz2; \ ) > parallel-$(YYYYMMDD).tar.bz2.sig + chmod +x parallel-$(YYYYMMDD).tar.bz2.sig (echo '#!/bin/bash'; \ echo; \ @@ -65,9 +66,16 @@ upload: echo; \ gpg -ab -o - parallel-$(YYYYMMDD).tar.bz2; \ ) > parallel-latest.tar.bz2.sig + chmod +x parallel-latest.tar.bz2.sig + make checksig - gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig - gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig +checksig: +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig + ./parallel-latest.tar.bz2.sig + ./parallel-$(YYYYMMDD).tar.bz2.sig + +upload: sig lftp --version p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous:ole=tange.dk@ftp-upload.gnu.org/incoming/ftp/ || true p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous:ole=tange.dk@ftp-upload.gnu.org/incoming/ftp/ || true diff --git a/Makefile.in b/Makefile.in index d8e5b66e..6052544e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -795,7 +795,7 @@ web: cp -r src/*.pdf src/sphinx/build/html/* ../parallel-web/parallel cp ../parallel-web/parallel/parallel.html ../parallel-web/parallel/man.html -upload: +sig: eval `gpg-agent --daemon` # make sure $YYYYMMDD is set echo $(YYYYMMDD) | grep 20 @@ -820,6 +820,7 @@ upload: echo; \ gpg -ab -o - parallel-$(YYYYMMDD).tar.bz2; \ ) > parallel-$(YYYYMMDD).tar.bz2.sig + chmod +x parallel-$(YYYYMMDD).tar.bz2.sig (echo '#!/bin/bash'; \ echo; \ @@ -833,9 +834,16 @@ upload: echo; \ gpg -ab -o - parallel-$(YYYYMMDD).tar.bz2; \ ) > parallel-latest.tar.bz2.sig + chmod +x parallel-latest.tar.bz2.sig + make checksig - gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig - gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig +checksig: +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-latest.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-$(YYYYMMDD).tar.bz2.sig + ./parallel-latest.tar.bz2.sig + ./parallel-$(YYYYMMDD).tar.bz2.sig + +upload: sig lftp --version p=`echo parallel-latest.tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous:ole=tange.dk@ftp-upload.gnu.org/incoming/ftp/ || true p=`echo parallel-$(YYYYMMDD).tar.bz2*{,.sig,.asc}`; lftp -e "put $$p; bye" ftp://anonymous:ole=tange.dk@ftp-upload.gnu.org/incoming/ftp/ || true diff --git a/NEWS b/NEWS index f856903e..d94d7180 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,15 @@ -20240822 +20241022 + +New in this release: + +* Bug fixes and man page updates. + +News about GNU Parallel: + +* <<>> + + +20240922 New in this release: diff --git a/README b/README index 6f5c666e..da6cd45d 100644 --- a/README +++ b/README @@ -57,11 +57,11 @@ document. Full installation of GNU Parallel is as simple as: - wget https://ftpmirror.gnu.org/parallel/parallel-20240822.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20240822.tar.bz2.sig - gpg parallel-20240822.tar.bz2.sig - bzip2 -dc parallel-20240822.tar.bz2 | tar xvf - - cd parallel-20240822 + wget https://ftpmirror.gnu.org/parallel/parallel-20240922.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20240922.tar.bz2.sig + gpg parallel-20240922.tar.bz2.sig + bzip2 -dc parallel-20240922.tar.bz2 | tar xvf - + cd parallel-20240922 ./configure && make && sudo make install @@ -70,11 +70,11 @@ Full installation of GNU Parallel is as simple as: If you are not root you can add ~/bin to your path and install in ~/bin and ~/share: - wget https://ftpmirror.gnu.org/parallel/parallel-20240822.tar.bz2 - wget https://ftpmirror.gnu.org/parallel/parallel-20240822.tar.bz2.sig - gpg parallel-20240822.tar.bz2.sig - bzip2 -dc parallel-20240822.tar.bz2 | tar xvf - - cd parallel-20240822 + wget https://ftpmirror.gnu.org/parallel/parallel-20240922.tar.bz2 + wget https://ftpmirror.gnu.org/parallel/parallel-20240922.tar.bz2.sig + gpg parallel-20240922.tar.bz2.sig + bzip2 -dc parallel-20240922.tar.bz2 | tar xvf - + cd parallel-20240922 ./configure --prefix=$HOME && make && make install Or if your system lacks 'make' you can simply copy src/parallel @@ -122,8 +122,8 @@ will love you for it. When using programs that use GNU Parallel to process data for publication please cite: - Tange, O. (2024, August 22). GNU Parallel 20240822 ('Southport'). - Zenodo. https://doi.org/10.5281/zenodo.13357237 + Tange, O. (2024, September 22). GNU Parallel 20240922 ('Gold Apollo AR924'). + Zenodo. https://doi.org/10.5281/zenodo.13826092 Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/configure b/configure index 04ed591c..f9956d55 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for parallel 20240822. +# Generated by GNU Autoconf 2.71 for parallel 20240922. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='parallel' PACKAGE_TARNAME='parallel' -PACKAGE_VERSION='20240822' -PACKAGE_STRING='parallel 20240822' +PACKAGE_VERSION='20240922' +PACKAGE_STRING='parallel 20240922' PACKAGE_BUGREPORT='bug-parallel@gnu.org' PACKAGE_URL='' @@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures parallel 20240822 to adapt to many kinds of systems. +\`configure' configures parallel 20240922 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1313,7 +1313,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of parallel 20240822:";; + short | recursive ) echo "Configuration of parallel 20240922:";; esac cat <<\_ACEOF @@ -1390,7 +1390,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -parallel configure 20240822 +parallel configure 20240922 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1427,7 +1427,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by parallel $as_me 20240822, which was +It was created by parallel $as_me 20240922, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2379,7 +2379,7 @@ fi # Define the identity of the package. PACKAGE='parallel' - VERSION='20240822' + VERSION='20240922' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3026,7 +3026,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by parallel $as_me 20240822, which was +This file was extended by parallel $as_me 20240922, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3090,7 +3090,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -parallel config.status 20240822 +parallel config.status 20240922 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 32137513..2379c54a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([parallel],[20240822],[bug-parallel@gnu.org]) +AC_INIT([parallel],[20240922],[bug-parallel@gnu.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ diff --git a/packager/debian/debian-template/compat b/packager/debian/debian-template/compat index 7f8f011e..48082f72 100644 --- a/packager/debian/debian-template/compat +++ b/packager/debian/debian-template/compat @@ -1 +1 @@ -7 +12 diff --git a/packager/debian/debian-template/control b/packager/debian/debian-template/control index e7fb4c11..b3781749 100644 --- a/packager/debian/debian-template/control +++ b/packager/debian/debian-template/control @@ -2,8 +2,8 @@ Source: parallel Section: utils Priority: extra Maintainer: Ole Tange -Build-Depends: debhelper (>= 5) -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 12) +Standards-Version: 4.6.0 Homepage: https://www.gnu.org/software/parallel/ Package: parallel diff --git a/packager/obs/Makefile b/packager/obs/Makefile index 91f98239..dfd83231 100644 --- a/packager/obs/Makefile +++ b/packager/obs/Makefile @@ -1,6 +1,7 @@ all: - perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' + perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' cd ../debian/ && make + cd ../.. && make sig osc rm home-tange/parallel/parallel_*.dsc || true cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home-tange/parallel/ cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home-tange/parallel/ diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files index 2a174e39..d90a3399 100644 --- a/packager/obs/home-tange/parallel/.osc/_files +++ b/packager/obs/home-tange/parallel/.osc/_files @@ -1,8 +1,9 @@ - - - - - - - + + + + + + + + diff --git a/packager/obs/home-tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec index fdcac68e..708822bd 100644 --- a/packager/obs/home-tange/parallel/.osc/parallel.spec +++ b/packager/obs/home-tange/parallel/.osc/parallel.spec @@ -1,7 +1,7 @@ Summary: Shell tool for executing jobs in parallel Name: parallel -Version: 20240822 +Version: 20240922 Release: 2.1 License: GPL-3.0-or-later Group: Productivity/File utilities diff --git a/packager/obs/home-tange/parallel/Makefile b/packager/obs/home-tange/parallel/Makefile index b97c38d4..0686f2b6 100644 --- a/packager/obs/home-tange/parallel/Makefile +++ b/packager/obs/home-tange/parallel/Makefile @@ -1,12 +1,19 @@ -all: +all: update upload monitorbuild + true + +update: # Update sha256sum s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD # Update version perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD osc diff + +upload: osc up - parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true + parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 *.sig && echo Src added OK || true osc ci -m "New release" + +monitorbuild: ### Wait for "building" state to complete echo '### Wait for "building" state' sleep 3 diff --git a/src/env_parallel.ash b/src/env_parallel.ash index 49adc19e..5b8c2464 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.bash b/src/env_parallel.bash index 75ce2671..f87743c1 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -605,7 +605,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.dash b/src/env_parallel.dash index c81c6577..8496de34 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh index 081b4998..fd07d5ed 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.mksh b/src/env_parallel.mksh index ccaf5206..7fae8a19 100644 --- a/src/env_parallel.mksh +++ b/src/env_parallel.mksh @@ -570,7 +570,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.pod b/src/env_parallel.pod index c0ebc5ae..cef01faf 100644 --- a/src/env_parallel.pod +++ b/src/env_parallel.pod @@ -275,7 +275,7 @@ Due to a bug in Bash, aliases containing newlines must be followed by a newline in the command. Some systems are not affected by this bug, but will print a warning anyway. -=head2 csh (alpha testing) +=head2 csh (beta testing) B for B breaks B<$PARALLEL>, so do not use B<$PARALLEL>. @@ -384,7 +384,7 @@ B<--session> is supported. =back -=head2 fish (beta testing) +=head2 fish =head3 Installation @@ -679,7 +679,7 @@ B<--session> is supported. =back -=head2 tcsh (alpha testing) +=head2 tcsh (beta testing) B for B breaks B<$PARALLEL>, so do not use B<$PARALLEL>. diff --git a/src/env_parallel.sh b/src/env_parallel.sh index 31fe4cb3..edbcebae 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh index 9ba7180d..bbd76251 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -601,7 +601,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then # shellcheck disable=SC2006 - echo "parset 20240823 (GNU parallel `parallel --minversion 1`)" + echo "parset 20240922 (GNU parallel `parallel --minversion 1`)" echo "Copyright (C) 2007-2024 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " diff --git a/src/niceload b/src/niceload index 23919b87..eba8be8f 100755 --- a/src/niceload +++ b/src/niceload @@ -26,7 +26,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20240823; +$Global::version = 20240922; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index 71910c42..f9e04621 100755 --- a/src/parallel +++ b/src/parallel @@ -2888,7 +2888,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20240823; + $Global::version = 20240922; $Global::progname = 'parallel'; $::name = "GNU Parallel"; $Global::infinity = 2**31; @@ -5946,8 +5946,8 @@ sub usage() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - " Tange, O. (2024, August 22). GNU Parallel 20240822 ('Southport').", - " Zenodo. https://doi.org/10.5281/zenodo.13357237", + " Tange, O. (2024, September 22). GNU Parallel 20240922 ('Gold Apollo AR924').", + " Zenodo. https://doi.org/10.5281/zenodo.13826092", "", # Before changing these lines, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice @@ -5979,8 +5979,8 @@ sub citation_notice() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - " Tange, O. (2024, August 22). GNU Parallel 20240822 ('Southport').", - " Zenodo. https://doi.org/10.5281/zenodo.13357237", + " Tange, O. (2024, September 22). GNU Parallel 20240922 ('Gold Apollo AR924').", + " Zenodo. https://doi.org/10.5281/zenodo.13826092", "", # Before changing these line, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and @@ -6106,20 +6106,20 @@ sub citation() { "If you use programs that use GNU Parallel to process data for an article in a", "scientific publication, please cite:", "", - "\@software{tange_2024_13357237,", + "\@software{tange_2024_13826092,", " author = {Tange, Ole},", - " title = {GNU Parallel 20240822 ('Southport')},", - " month = Aug,", - " year = 2023,", + " title = {GNU Parallel 20240922 ('Gold Apollo AR924')},", + " month = Sep,", + " year = 2024,", " 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.13357237},", - " url = {https://doi.org/10.5281/zenodo.13357237}", + " doi = {10.5281/zenodo.13826092},", + " url = {https://doi.org/10.5281/zenodo.13826092}", "}", "", - "(Feel free to use \\nocite{tange_2024_13357237})", + "(Feel free to use \\nocite{tange_2024_13826092})", "", # Before changing these lines, please read # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and diff --git a/src/parsort b/src/parsort index 58d1ffa8..f8a8b922 100755 --- a/src/parsort +++ b/src/parsort @@ -137,7 +137,7 @@ GetOptions( "help" => \$opt::dummy, ) || exit(255); $Global::progname = ($0 =~ m:(^|/)([^/]+)$:)[1]; -$Global::version = 20240823; +$Global::version = 20240922; if($opt::version) { version(); exit 0; } # Remove -D and --parallel=N my @s = (grep { ! /^-D$|^--parallel=\S+$/ } diff --git a/src/sql b/src/sql index d9824784..fc34fba2 100755 --- a/src/sql +++ b/src/sql @@ -670,7 +670,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20240823; + $Global::version = 20240922; $Global::progname = 'sql'; # This must be done first as this may exec myself diff --git a/testsuite/wanted-results/parallel-tutorial b/testsuite/wanted-results/parallel-tutorial index bd886e5d..ab95deb6 100644 --- a/testsuite/wanted-results/parallel-tutorial +++ b/testsuite/wanted-results/parallel-tutorial @@ -1206,7 +1206,7 @@ scientific publication, please cite: author = {Tange, Ole}, - year = 2023, + year = 2024, note = {{GNU Parallel is a general parallelizer to run multiple serial command line programs in parallel without changing them.}},