Import Upstream version 2.6

parent ece96bcc
This diff is collapsed.
Wilmer van der Gaast <wilmer@gaast.net>
Y Giridhar Appaji Nag <giridhar@appaji.net>
Philipp Hagemeister <phihag@phihag.de>
Joao Eriberto Mota Filho <eriberto@eriberto.pro.br>
-- Updated by Eriberto, Sat, 19 Mar 2016 23:39:30 -0300
HOW TO CONTRIBUTE TO AXEL DEVELOPMENT
## HOW TO CONTRIBUTE TO AXEL DEVELOPMENT
If you are interested to contribute to axel development, please, follow these
steps:
Axel is available at https://github.com/eribertomota/axel
1. Send a patch that fix an issue or that implement a new feature.
If you are interested in contribute to axel development, please, follow
these steps:
2. Ask for join to the Axel project in GitHub, if you want to work officially.
Note that this second step isn't compulsory.
1. Send me a patch that fix an issue or that implement a new feature.
Alternatively, you can do a 'pull request'[1] in GitHub.
[1] https://help.github.com/articles/using-pull-requests
2. Ask for join to the Axel project in GitHub, if you want to work
officially. Note that this second step is not compulsory. However,
to accept you in project, I need a minimum collaboration before.
To find issues and bugs to fix, you can check these addresses:
......@@ -21,3 +27,5 @@ To find issues and bugs to fix, you can check these addresses:
- https://bugs.gentoo.org/buglist.cgi?quicksearch=net-misc%2Faxel
If you want to join, please contact me: eriberto at eriberto.pro.br
-- Eriberto, Sun, 20 Mar 2016 16:27:53 -0300
2.6 version:
- Ivan Gimenez <ivan.gimenez@gmail.com>
commit dcce1f7
Fix compilation warnings.
Patch sent by email on 2016-03-02
Thanks a lot!
- Stephen Thirlwall
Alterate display expands to terminal width.
2.5 version:
- Barry deFreese <bdefreese@debian.org>
......
Version 2.6, 2016-03-20
[ Joao Eriberto Mota Filho ]
* Added the Brazilian Portuguese translation.
* Moved all .c and .h to new /src directory.
* Moved all .po files to new /po directory.
* Moved some files to doc/ directory.
* Renamed README.to-contribute to CONTRIBUTING.md.
* Switched the build and install system to autotools.
* Updated all copyright notices.
[ Ivan Gimenez ]
* Fix several compilation warnings.
[ Stephen Thirlwall ]
* Alterate display expands to terminal width.
Version 2.5, 2015-11-01
[ Joao Eriberto Mota Filho ] 2015-11-01
......
This diff is collapsed.
###########################
## Makefile for Axel ##
## ##
## Copyright 2001 Lintux ##
###########################
### DEFINITIONS
-include Makefile.settings
.SUFFIXES: .po .mo
# Add your translation here
MOFILES = nl.mo de.mo ru.mo zh_CN.mo ja.mo
all: $(OUTFILE)
install: install-bin install-etc install-man
uninstall: uninstall-bin uninstall-etc uninstall-man
clean:
rm -f *.o $(OUTFILE) search core *.mo
distclean: clean
rm -f Makefile.settings config.h axel-*.tar axel-*.tar.gz axel-*.tar.bz2
install-man:
mkdir -p $(DESTDIR)$(MANDIR)/man1/
cp man/axel.1 $(DESTDIR)$(MANDIR)/man1/axel.1
uninstall-man:
rm -f $(MANDIR)/man1/axel.1
install-etc:
mkdir -p $(DESTDIR)$(ETCDIR)/
cp axelrc.example $(DESTDIR)$(ETCDIR)/axelrc
uninstall-etc:
rm -f $(ETCDIR)/axelrc
### MAIN PROGRAM
$(OUTFILE): axel.o conf.o conn.o ftp.o http.o search.o tcp.o text.o
$(CC) *.o -o $(OUTFILE) $(LFLAGS) $(LDFLAGS) $(CPPFLAGS)
$(STRIP) $(OUTFILE)
.c.o:
$(CC) -c $*.c -o $*.o $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
install-bin:
mkdir -p $(DESTDIR)$(BINDIR)/
cp $(OUTFILE) $(DESTDIR)$(BINDIR)/$(OUTFILE)
uninstall-bin:
rm -f $(BINDIR)/$(OUTFILE)
tar:
version=`sed -n 's/#define AXEL_VERSION_STRING[ \t]*"\([^"]*\)"/\1/p' < axel.h` && \
tar --create --numeric-owner --owner 0 --group 0 --transform "s#^#axel-$${version}/#" "--file=axel-$${version}.tar" --exclude-vcs -- *.c *.h *.po *.1 configure Makefile axelrc.example gui API CHANGES COPYING CREDITS README && \
gzip --best < "axel-$${version}.tar" > "axel-$${version}.tar.gz" && \
bzip2 --best < "axel-$${version}.tar" > "axel-$${version}.tar.bz2"
### I18N FILES
# The following target is generating changes in original source code when
# building. It will be temporally disabled. I will fix/change/optimize it
# in future.
#
#%.po: $(wildcard *.c *.h)
# -@mv $@ $@.bak
# xgettext -k_ -o$@ *.[ch]
# @if [ -e $@.bak ]; then \
# echo -n Merging files...; \
# msgmerge -vo $@.combo $@.bak $@; \
# rm -f $@ $@.bak; \
# mv $@.combo $@; \
# fi
.po.mo: $@.po
msgfmt -vo $@ $*.po
i18n-mofiles: $(MOFILES)
install-i18n:
@echo Installing locale files...
@for i in $(MOFILES); do \
mkdir -p $(DESTDIR)$(LOCALE)/`echo $$i | cut -d. -f1`/LC_MESSAGES/; \
cp $$i $(DESTDIR)$(LOCALE)/`echo $$i | cut -d. -f1`/LC_MESSAGES/axel.mo; \
done
uninstall-i18n:
cd $(LOCALE); find . -name axel.mo -exec 'rm' '{}' ';'
SUBDIRS = src po
man_MANS = man/axel.1
clean-local:
-rm -rf autom4te.cache/ \
config.h.in~ \
po/*.gmo \
po/stamp-po
This diff is collapsed.
Axel Home:
See https://github.com/eribertomota/axel for latest information on axel
/*************************\
* Supported architectures *
\*************************/
Should compile on any decent Linux system. Additionally, it should compile
(and run) on BSD, Solaris, Darwin (Mac OS X) and Win32 (Cygwin) systems.
If the configure script does weird things on your system, please do warn me!
I test it on as many machines and OS'es as possible, but still anything can
go wrong.
/********************\
* How to install/use *
\********************/
Run the configure script (you can supply some options if you want, try
'./configure --help' for more info) and then run make. The program should
compile then. There are no special requirements for Axel. You can install
the program using 'make install' or you can just run it from the current
directory. You can copy the axelrc.example file to ~/.axelrc then, if you
want to change some of the settings.
Run the program like this:
axel ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.2/linux-2.2.20.tar.bz2
For a simple single-server-multiple-connection download, or:
axel ftp://ftp.{nl,be,de}.kernel.org/pub/linux/kernel/v2.2/linux-2.2.20.tar.bz2
If you want to use those three servers for the download. The program can do
an automatic search for FTP mirrors as well (filesearching.com), but that's
not yet perfect... Just try the -S option. (The line above should at least
work with the Bash shell. You can type all the mirrors by hand as well, if
you really want to, and/or of necessary...)
Just one other thing you should keep in mind when using this program: Some
FTP operators don't like people who use download accelerators. To quote an
administrator at Progeny.Com in a mail to me:
<quote> Additionally, I should mention that accelerated downloads are
discouraged as I consider them abusive. </quote>
And he certainly has a point.. Using more than one server at once is a fine
solution IMHO, so please use this feature if possible!
Wilmer van der Gaast. <wilmer@gaast.net>
README.md
\ No newline at end of file
......@@ -19,13 +19,14 @@ My name is Eriberto and **I am not a C developer**. I imported Axel from
its old repository[1] to GitHub (the original homepage and developers
are inactive). After this, I applied all patches found in Debian project
and other places for this program. All my initial work was registered in
CHANGES file (version 2.5). I also maintain Axel packaged in Debian[2].
ChangeLog file (version 2.5 and later releases). I also maintain Axel
packaged in Debian[2].
If you are interested to help Axel, read the README.to-contribute[3] file.
If you are interested to help Axel, read the CONTRIBUTING.md[3] file.
[1] https://alioth.debian.org/projects/axel<br>
[2] https://packages.qa.debian.org/a/axel.html<br>
[3] https://github.com/eribertomota/axel/blob/master/README.to-contribute
[3] https://github.com/eribertomota/axel/blob/master/CONTRIBUTING.md
----------------
......@@ -44,4 +45,4 @@ wget clone (and other console based programs) on byte-critical systems.
Axel was originally developed by Wilmer van der Gaast. Thanks for your
efforts. Over time, Axel got several contributions from people. Please,
see the file CREDITS.
see the files AUTHORS and CREDITS.
This diff is collapsed.
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
if test -f "$dir/lib$lib.a"; then
found=yes
lib=$dir/lib$lib.a
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
/* config.h.in. Generated from configure.ac by autoheader. */
/* "Define architecture" */
#undef ARCH
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
/* "Define /etc directory path" */
#undef ETCDIR
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
/* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
#undef HAVE_REALLOC
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */