Hello community, here is the log from the commit of package axel for openSUSE:Factory checked in at 2020-04-07 10:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/axel (Old) and /work/SRC/openSUSE:Factory/.axel.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "axel" Tue Apr 7 10:28:46 2020 rev:8 rq:791570 version:2.17.7 Changes: -------- --- /work/SRC/openSUSE:Factory/axel/axel.changes 2019-10-27 13:41:55.669333107 +0100 +++ /work/SRC/openSUSE:Factory/.axel.new.3248/axel.changes 2020-04-07 10:28:53.842334553 +0200 @@ -1,0 +2,11 @@ +Sun Mar 29 19:28:39 UTC 2020 - Sebastian Wagner <[email protected]> + +- update to version 2.17.7: + - Buildsystem fixes + - Fixed release date for man-pages on BSD + - Explicitly close TCP sockets on SSL connections too + - Fixed HTTP basic auth header generation + - Changed the default progress report to "alternate output mode" + - Improved English in README.md + +------------------------------------------------------------------- Old: ---- axel-2.17.6.tar.xz New: ---- axel-2.17.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ axel.spec ++++++ --- /var/tmp/diff_new_pack.nSxpY4/_old 2020-04-07 10:28:54.674335478 +0200 +++ /var/tmp/diff_new_pack.nSxpY4/_new 2020-04-07 10:28:54.674335478 +0200 @@ -1,7 +1,7 @@ # # spec file for package axel # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %{!?license: %global license %doc} Name: axel -Version: 2.17.6 +Version: 2.17.7 Release: 0 Summary: Lightweight Download Accelerator License: GPL-2.0-or-later Group: Productivity/Networking/Other -Url: https://github.com/axel-download-accelerator/axel +URL: https://github.com/axel-download-accelerator/axel Source: https://github.com/axel-download-accelerator/axel/releases/download/v%{version}/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(openssl) ++++++ axel-2.17.6.tar.xz -> axel-2.17.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/ChangeLog new/axel-2.17.7/ChangeLog --- old/axel-2.17.6/ChangeLog 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/ChangeLog 2020-01-26 13:10:38.000000000 +0100 @@ -1,3 +1,28 @@ +Version: 2.17.7, 2020-01-26 + + [ Ismael Luceno ] + +* Buildsystem fixes +* Fixed release date for man-pages on BSD + + [ Park Ju Hyung ] + +* Explicitly close TCP sockets on SSL connections too + + [ Shankar ] + +* Fixed HTTP basic auth header generation + + [ Terry ] + +* Changed the default progress report to "alternate output mode" + + [ retnikt ] + +* Improved English in README.md + + + Version: 2.17.6, 2019-08-29 [ Ismael Luceno ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/Makefile.in new/axel-2.17.7/Makefile.in --- old/axel-2.17.6/Makefile.in 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/Makefile.in 2020-01-26 13:10:38.000000000 +0100 @@ -341,6 +341,7 @@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ +RELDATE_PRETTY = @RELDATE_PRETTY@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -410,6 +411,7 @@ doc/axelrc.example doc/axel.txt dist_man_MANS = doc/axel.1 PACKAGE_DESC = lightweight command line download accelerator +doc_reldate = @RELDATE_PRETTY@ MSG = echo '==>' ERR = ! echo '!!! ERROR:' axel_SOURCES = \ @@ -1108,11 +1110,10 @@ .txt.1: - read _ P_DATE _ < $(top_srcdir)/VERSION && \ tmp=$$(mktemp tmpXXXXXX) && \ > "$$tmp" \ txt2man -t "$(<:.txt=)" -s 1 \ - -d "$$(date -d"$$P_DATE" '+%B %_d, %Y')" \ + -d "$(doc_reldate)" \ -P "$(PACKAGE_NAME)" \ -r "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ -v "$(PACKAGE_DESC)" $< &&\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/README.md new/axel-2.17.7/README.md --- old/axel-2.17.6/README.md 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/README.md 2020-01-26 13:10:38.000000000 +0100 @@ -4,13 +4,14 @@ ## 1. Help this project ## -Axel needs your help. **If you are a programmer** and if you wants to +Axel needs your help. **If you are a programmer** and want to help a nice project, this is your opportunity. Axel was imported from its old repository[1] to GitHub (the original homepage and developers are inactive). -If you are interested to help Axel, read the [CONTRIBUTING.md](CONTRIBUTING.md) file. +If you are interested in helping Axel, please read the +[CONTRIBUTING.md](CONTRIBUTING.md) file. Additionally, there is a group to discuss and to coordinate the development process[3]. You can also find other developers in the @@ -31,9 +32,7 @@ Axel supports HTTP, HTTPS, FTP and FTPS protocols. -Axel was originally developed by Wilmer van der Gaast. Thanks for your -efforts. Over time, Axel got several contributions from people. Please, -see AUTHORS and CREDITS files in source code. +Thanks to the original developer of Axel, Wilmer van der Gaast, and everyone else who has contributed to it. ## Building from source ## @@ -116,4 +115,4 @@ ## License ## -Axel is under GPL-2+ with OpenSSL exception. +Axel is licensed under GPL-2+ with the OpenSSL exception. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/VERSION new/axel-2.17.7/VERSION --- old/axel-2.17.6/VERSION 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/VERSION 2020-01-26 13:10:38.000000000 +0100 @@ -1 +1 @@ -2.17.6 2019-08-29T19:39:14Z +2.17.7 2020-01-26T12:10:38Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/acinclude.m4 new/axel-2.17.7/acinclude.m4 --- old/axel-2.17.6/acinclude.m4 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/acinclude.m4 2020-01-26 13:10:38.000000000 +0100 @@ -31,7 +31,17 @@ # --------------------------------------------------------------------- AC_DEFUN_ONCE([AXEL_VER_READ], [_AC_INIT_LITERAL([$1]) -m4_define([_AXEL_VERSION], m4_quote(m4_bpatsubst(m4_quote(_AXEL_READL([$1],1)), [ .*]))) +m4_define([_AXEL_RELSTR], + m4_quote(_AXEL_READL([$1], 1))) +m4_define([_AXEL_RELDATE], + m4_quote( + m4_bpatsubst( + m4_quote( + m4_bpatsubst( + m4_quote(_AXEL_RELSTR), + [[^ ]* ])), [ .*]))) +m4_define([_AXEL_VERSION], + m4_quote(m4_bpatsubst(m4_quote(_AXEL_RELSTR), [ .*]))) m4_define([_AXEL_COMMIT], m4_quote(_AXEL_GIT_HEAD)) m4_define([_AXEL_VERSUF], [m4_if(m4_quote(_AXEL_COMMIT),,, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/configure new/axel-2.17.7/configure --- old/axel-2.17.6/configure 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/configure 2020-01-26 13:10:38.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for axel 2.17.6. +# Generated by GNU Autoconf 2.69 for axel 2.17.7. # # Report bugs to <https://github.com/axel-download-accelerator/axel/issues>. # @@ -592,8 +592,8 @@ # Identity of this package. PACKAGE_NAME='axel' PACKAGE_TARNAME='axel' -PACKAGE_VERSION='2.17.6' -PACKAGE_STRING='axel 2.17.6' +PACKAGE_VERSION='2.17.7' +PACKAGE_STRING='axel 2.17.7' PACKAGE_BUGREPORT='https://github.com/axel-download-accelerator/axel/issues' PACKAGE_URL= @@ -638,6 +638,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +RELDATE_PRETTY PTHREAD_CFLAGS PTHREAD_LIBS PTHREAD_CC @@ -1324,7 +1325,7 @@ # 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 axel 2.17.6 to adapt to many kinds of systems. +\`configure' configures axel 2.17.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1394,7 +1395,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of axel 2.17.6:";; + short | recursive ) echo "Configuration of axel 2.17.7:";; esac cat <<\_ACEOF @@ -1507,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -axel configure 2.17.6 +axel configure 2.17.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1995,7 +1996,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by axel $as_me 2.17.6, which was +It was created by axel $as_me 2.17.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2863,7 +2864,7 @@ # Define the identity of the package. PACKAGE='axel' - VERSION='2.17.6' + VERSION='2.17.7' cat >>confdefs.h <<_ACEOF @@ -7318,7 +7319,7 @@ else - as_fn_error $? "$ac_func is required." "$LINENO" 5 + as_fn_error $? "$ac_header is required." "$LINENO" 5 fi @@ -9891,6 +9892,15 @@ ;; esac +# BSD vs GNU date +if date -j >/dev/null 2>&1; then + pdate() { date -j -f '%Y-%m-%dT%H:%M:%SZ' "$@"; } +else + pdate() { date -d "$@"; } +fi +RELDATE_PRETTY=$(pdate '2020-01-26T12:10:38Z' '+%B %e, %Y') + + # etc path cat >>confdefs.h <<_ACEOF @@ -10436,7 +10446,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by axel $as_me 2.17.6, which was +This file was extended by axel $as_me 2.17.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10502,7 +10512,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -axel config.status 2.17.6 +axel config.status 2.17.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/configure.ac new/axel-2.17.7/configure.ac --- old/axel-2.17.6/configure.ac 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/configure.ac 2020-01-26 13:10:38.000000000 +0100 @@ -66,7 +66,7 @@ sys/time.h \ unistd.h \ ],, [ - AC_MSG_ERROR([$ac_func is required.]) + AC_MSG_ERROR([$ac_header is required.]) ]) # Checks for typedefs, structures, and compiler characteristics. @@ -145,6 +145,15 @@ ;; esac +# BSD vs GNU date +if date -j >/dev/null 2>&1; then + pdate() { date -j -f '%Y-%m-%dT%H:%M:%SZ' "$@"; } +else + pdate() { date -d "$@"; } +fi +RELDATE_PRETTY=$(pdate '_AXEL_RELDATE' '+%B %e, %Y') +AC_SUBST([RELDATE_PRETTY]) + # etc path AC_DEFINE_UNQUOTED([ETCDIR], ["/etc"], ["Define /etc directory path"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/doc/Makefile.am new/axel-2.17.7/doc/Makefile.am --- old/axel-2.17.6/doc/Makefile.am 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/doc/Makefile.am 2020-01-26 13:10:38.000000000 +0100 @@ -5,13 +5,13 @@ dist_man_MANS = doc/axel.1 PACKAGE_DESC = lightweight command line download accelerator +doc_reldate = @RELDATE_PRETTY@ .txt.1: - read _ P_DATE _ < $(top_srcdir)/VERSION && \ tmp=$$(mktemp tmpXXXXXX) && \ > "$$tmp" \ txt2man -t "$(<:.txt=)" -s 1 \ - -d "$$(date -d"$$P_DATE" '+%B %_d, %Y')" \ + -d "$(doc_reldate)" \ -P "$(PACKAGE_NAME)" \ -r "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ -v "$(PACKAGE_DESC)" $< &&\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/axel.pot new/axel-2.17.7/po/axel.pot --- old/axel-2.17.6/po/axel.pot 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/axel.pot 2020-01-26 13:10:38.000000000 +0100 @@ -154,7 +154,7 @@ msgid "Error in %s line %i.\n" msgstr "" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "" @@ -199,17 +199,17 @@ msgid "Error writing command %s\n" msgstr "" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/de.po new/axel-2.17.7/po/de.po --- old/axel-2.17.6/po/de.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/de.po 2020-01-26 13:10:38.000000000 +0100 @@ -174,7 +174,7 @@ msgid "Error in %s line %i.\n" msgstr "Fehler in %s Zeile %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "Umgebungsvariable HOME zu lang!\n" @@ -219,17 +219,17 @@ msgid "Error writing command %s\n" msgstr "Fehler beim Schreiben des Befehls %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Verbindung geschlossen.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "Ungültige Proxy-Angabe: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Verbindung verloren beim Schreiben.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/es.po new/axel-2.17.7/po/es.po --- old/axel-2.17.6/po/es.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/es.po 2020-01-26 13:10:38.000000000 +0100 @@ -175,7 +175,7 @@ msgid "Error in %s line %i.\n" msgstr "Error en %s línea %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "Variable de entorno HOME demasiado larga\n" @@ -220,17 +220,17 @@ msgid "Error writing command %s\n" msgstr "Error escribiendo el comando %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Conexión desaparecida.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "Cadena de proxy inválida: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Conexión desaparecida al escribir.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/id_ID.po new/axel-2.17.7/po/id_ID.po --- old/axel-2.17.6/po/id_ID.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/id_ID.po 2020-01-26 13:10:38.000000000 +0100 @@ -177,7 +177,7 @@ msgid "Error in %s line %i.\n" msgstr "Galat di %s baris %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "HOME env variabel terlalu panjang!\n" @@ -222,17 +222,17 @@ msgid "Error writing command %s\n" msgstr "Galat menulis perintah %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Koneksi hilang.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "String proxy tidak valid: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Koneksi hilang saat menulis.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/it.po new/axel-2.17.7/po/it.po --- old/axel-2.17.6/po/it.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/it.po 2020-01-26 13:10:38.000000000 +0100 @@ -176,7 +176,7 @@ msgid "Error in %s line %i.\n" msgstr "Errore in %s linea %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, fuzzy, c-format msgid "HOME env variable too long\n" msgstr "Nome del file troppo lungo!\n" @@ -221,17 +221,17 @@ msgid "Error writing command %s\n" msgstr "Errore nella scrittura del comando %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Connessione terminata.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "Stringa proxy non valida: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Connessione terminata durante la scrittura.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/ja.po new/axel-2.17.7/po/ja.po --- old/axel-2.17.6/po/ja.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/ja.po 2020-01-26 13:10:38.000000000 +0100 @@ -176,7 +176,7 @@ msgid "Error in %s line %i.\n" msgstr "%s の %i 行目でエラー。\n" -#: src/conf.c:266 +#: src/conf.c:269 #, fuzzy, c-format msgid "HOME env variable too long\n" msgstr "ファイル名が長すぎます!\n" @@ -221,17 +221,17 @@ msgid "Error writing command %s\n" msgstr "コマンド %s を書く際にエラー\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "接続が失われています。\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "無効なプロキシストリング: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, fuzzy, c-format msgid "Connection gone while writing.\n" msgstr "接続が失われています。\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/nl.po new/axel-2.17.7/po/nl.po --- old/axel-2.17.6/po/nl.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/nl.po 2020-01-26 13:10:38.000000000 +0100 @@ -169,7 +169,7 @@ msgid "Error in %s line %i.\n" msgstr "Fout in %s regel %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "" @@ -214,17 +214,17 @@ msgid "Error writing command %s\n" msgstr "Fout bij het schrijven van commando %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Verbinding gesloten.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "Ongeldige proxy string: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Verbinding is verdwenen tijdens het schrijven.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/pt_BR.po new/axel-2.17.7/po/pt_BR.po --- old/axel-2.17.6/po/pt_BR.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/pt_BR.po 2020-01-26 13:10:38.000000000 +0100 @@ -177,7 +177,7 @@ msgid "Error in %s line %i.\n" msgstr "Erro em %s linha %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "Variável HOME muito longa\n" @@ -222,17 +222,17 @@ msgid "Error writing command %s\n" msgstr "Erro ao escrever comando %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Conexão perdida.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "String de proxy inválida: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "Conexão perdida enquanto escrevia no disco.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/ru.po new/axel-2.17.7/po/ru.po --- old/axel-2.17.6/po/ru.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/ru.po 2020-01-26 13:10:38.000000000 +0100 @@ -172,7 +172,7 @@ msgid "Error in %s line %i.\n" msgstr "Ошибка в файле %s линия %i.\n" -#: src/conf.c:266 +#: src/conf.c:269 #, c-format msgid "HOME env variable too long\n" msgstr "Слишком длинная переменная среды HOME\n" @@ -217,17 +217,17 @@ msgid "Error writing command %s\n" msgstr "Ошибка записи команды %s\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "Соединение пропало.\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "Некорректная стока прокси: %s\n" -#: src/http.c:237 +#: src/http.c:239 #, fuzzy, c-format msgid "Connection gone while writing.\n" msgstr "Соединение пропало.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/po/zh_CN.po new/axel-2.17.7/po/zh_CN.po --- old/axel-2.17.6/po/zh_CN.po 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/po/zh_CN.po 2020-01-26 13:10:38.000000000 +0100 @@ -174,7 +174,7 @@ msgid "Error in %s line %i.\n" msgstr "%s 中第 %i 行出错。\n" -#: src/conf.c:266 +#: src/conf.c:269 #, fuzzy, c-format msgid "HOME env variable too long\n" msgstr "文件名太长！\n" @@ -219,17 +219,17 @@ msgid "Error writing command %s\n" msgstr "写命令 %s 出错\n" -#: src/ftp.c:319 src/http.c:249 +#: src/ftp.c:319 src/http.c:251 #, c-format msgid "Connection gone.\n" msgstr "连接丢失。\n" -#: src/http.c:114 +#: src/http.c:116 #, c-format msgid "Invalid proxy string: %s\n" msgstr "代理字符串无效：%s\n" -#: src/http.c:237 +#: src/http.c:239 #, c-format msgid "Connection gone while writing.\n" msgstr "写入时连接丢失。\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/src/conf.c new/axel-2.17.7/src/conf.c --- old/axel-2.17.6/src/conf.c 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/src/conf.c 2020-01-26 13:10:38.000000000 +0100 @@ -230,7 +230,6 @@ conf->buffer_size = 5120; conf->max_speed = 0; conf->verbose = 1; - conf->alternate_output = 0; conf->insecure = 0; conf->no_clobber = 0; @@ -251,6 +250,10 @@ conf->interfaces->next = conf->interfaces; + /* Detect if stdout is a tty, set the default indicator to alternate. + Otherwise, keep it to original.*/ + conf->alternate_output = isatty(STDOUT_FILENO); + if ((s2 = getenv("http_proxy")) || (s2 = getenv("HTTP_PROXY"))) strlcpy(conf->http_proxy, s2, sizeof(conf->http_proxy)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/src/http.c new/axel-2.17.7/src/http.c --- old/axel-2.17.6/src/http.c 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/src/http.c 2020-01-26 13:10:38.000000000 +0100 @@ -72,8 +72,10 @@ const char *auth[] = { user, ":", pass, NULL }; const char **p = auth; - while (*p && **p) { + while (*p) { char a = chain_next(&p); + if (!a) + break; *token++ = base64_encode[a >> 2]; char b = chain_next(&p); *token++ = base64_encode[((a & 3) << 4) | (b >> 4)]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.17.6/src/tcp.c new/axel-2.17.7/src/tcp.c --- old/axel-2.17.6/src/tcp.c 2019-08-29 21:39:14.000000000 +0200 +++ new/axel-2.17.7/src/tcp.c 2020-01-26 13:10:38.000000000 +0100 @@ -221,9 +221,9 @@ if (tcp->ssl != NULL) { ssl_disconnect(tcp->ssl); tcp->ssl = NULL; - } else -#endif /* HAVE_SSL */ - close(tcp->fd); + } +#endif + close(tcp->fd); tcp->fd = -1; } }
