Commit f90908fe authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

Imported Upstream version 1.15.2

parent ec49d03a
This diff is collapsed.
......@@ -2,7 +2,8 @@ SUBDIRS = po intl lib deps src doc test
ACLOCAL_AMFLAGS = -I m4 --install
EXTRA_DIST = config.rpath
EXTRA_DIST = config.rpath mingw-config android-config android-make\
build_osx_release.sh
dist_doc_DATA = README README.rst README.html
......
# Makefile.in generated by automake 1.11.3 from Makefile.am.
# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
......@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
......@@ -83,6 +100,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
......@@ -165,6 +187,7 @@ ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
ARIA2_STATIC = @ARIA2_STATIC@
ASCIIDOC = @ASCIIDOC@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
......@@ -363,7 +386,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = po intl lib deps src doc test
ACLOCAL_AMFLAGS = -I m4 --install
EXTRA_DIST = config.rpath
EXTRA_DIST = config.rpath mingw-config android-config android-make\
build_osx_release.sh
dist_doc_DATA = README README.rst README.html
dist_noinst_DATA = LICENSE.OpenSSL
all: config.h
......@@ -432,8 +457,11 @@ distclean-libtool:
-rm -f libtool config.lt
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
......@@ -618,13 +646,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
fi; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
$(am__make_dryrun) \
|| test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
......
aria2 1.15.2
============
Release Note
------------
This release fixes several critical bugs. It also adds new features
such as TLS SNI and CORS support. The --file--allocation option now
take another value trunc. The new option --enalbe-mmap was added.
aria2 now uses system-wide SSL/TLS certificates by default, which
eliminates the requirement to specify --ca-certificate option.
Changes
-------
* Catch exception from Socket::getPeerInfo() when pooling connection.
Socket::getPeerInfo() may fail if its TCP connection has already
disconnected. In this case, we log this error. The success or
failure of pooling connection should not affect the later execution
of the program. This bug may cause segmentation fault if
Socket::getPeerInfo() throws exception during pooling connection
after successful tracker request.
* Fixed assertion error if --retry-wait is used. In
CreateRequestCommand, if Request object returned from getRequest()
is still sleeping, CreateRequestCommand pools it back but still
holds its reference. This makes assertion error in
UnknownLengthPieceStroage::hasMissingUnusedPiece() from
AbstractCommand::execute().
* Added new file allocation method called 'trunc'. --file-allocation
option can now take new value 'trunc'. 'trunc' uses ftruncate()
system call or platform-specific counterpart to truncate a file to a
specified length.
* Use int64_t instead of off_t. Using off_t, at least, in DiskAdaptor
layer is problematic because torrent can contain under 2GiB files
but total sum of those files may exceed 2GiB limit, which makes
off_t overflow in 32 bit system without large file support. So we
use int64_t in API. We'll check the file length before download so
that it does not exceed max off_t.
* Added TLS SNI support.
* Rewritten timegm replacement function. The algorithm is based on
Python 2.7 calendar.timegm.
* Use system-wide certificates for SSL. Use system-wide certificates
for SSL. For GnuTLS it requires the latest version, 3.0.20. OpenSSL
had it for longer. This means that if SSL library is properly
configured to locate system-wide certificates store, the user don't
have to use --ca-certificate option. Also packagers don't have to
use --with-ca-bundle configure option. Patch from Cristian Morales
Vega
* Fixed base64::decode() return "" if input ends with garbage and no
padding.
* Changed default Peer ID prefix. The new Peer ID prefix is
"A2-$MAJOR-$MINOR-$MICRO-", where $MAJOR, $MINOR and $MICRO are the
major version, the minor version and the micro version
respectively. For instance, 1.15.2 release of aria2 will use
"A2-1-15-2-".
* Don't percent-decode filename value in Content-Disposition. We only
percent-decode filename* value in Content-Disposition because the
encoding is fully specified. But since filename value is not, so we
just accept it as is.
* Don't sum in-flight piece which does not intersect filtered ranges.
When calculating completed length, don't sum the completed length of
piece which does not intersect filtered ranges.
* Fixed segmentation fault when logger failed to open log file.
* Added ARIA2_STATIC precious variable to configure option. To build
statically linked aria2 binary, give ARIA2_STATIC=yes to configure,
like this:
$ ./configure ARIA2_STATIC=yes
* Use PRId64 for int64_t format specifier
* Handle the case when MINGW32 vsnprintf returns -1. MINGW32 vsnprintf
returns -1 if output is truncated. Increased buffer for vsnprintf
in WinConsoleFile and fmt.
* Added --enable-mmap option. If this option is used, map files into
memory using mmap(2). This option is experimental.
* Added CORS preflight request support in RPC interface. This change
is based on the patch from binux.
aria2 1.15.1
============
......
This diff is collapsed.
......@@ -184,20 +184,35 @@ Also you need `Sphinx <http://sphinx.pocoo.org/>`_ to build man page.
If you are building aria2 for Mac OS X, take a look at
build_osx_release.sh, which builds OSX universal binary DMG.
The quickest way to build aria2 is just type following commands::
The quickest way to build aria2 is first run configure script::
$ ./configure
To build statically linked aria2, use ``ARIA2_STATIC=yes``
command-line option::
$ ./configure ARIA2_STATIC=yes
After configuration is done, run ``make`` to compile the program::
$ make
See `Cross-compiling Windows binary`_ to create Windows binary. See
`Cross-compiling Android binary`_ to create Android binary.
The configure script checks available libraries and enables the features
as much as possible because all the features are enabled by default.
Since 1.1.0, aria2 checks the certificate of HTTPS servers by default.
If you build with HTTPS support, I recommend to supply the path to the
CA bundle file. For example, in Debian the path to CA bundle file is
'/etc/ssl/certs/ca-certificates.crt' (in ca-certificates package). This
may vary depending on your distribution. You can give it to
configure script using ``--with-ca-bundle option``::
If you build with OpenSSL or the recent version of GnuTLS which has
``gnutls_certificate_set_x509_system_trust()`` function and the
library is properly configured to locate the system-wide CA
certificates store, aria2 will automatically load those certificates
at the startup. If it is not the case, I recommend to supply the path
to the CA bundle file. For example, in Debian the path to CA bundle
file is '/etc/ssl/certs/ca-certificates.crt' (in ca-certificates
package). This may vary depending on your distribution. You can give
it to configure script using ``--with-ca-bundle option``::
$ ./configure --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
$ make
......@@ -220,6 +235,83 @@ aria2 uses CppUnit for automated unit testing. To run the unit test::
$ make check
Cross-compiling Windows binary
------------------------------
In this section, we describe how to build Windows binary using
mingw-w64 cross-compiler on Debian Linux.
Basically, after compiling and installing depended libraries, you can
do cross-compile just passing appropriate ``--host`` option and
specifying ``CPPFLAGS``, ``LDFLAGS`` and ``PKG_CONFIG_LIBDIR``
variables to configure. For convenience and lowering our own
development cost, we provide easier way to configure the build
settings.
``mingw-config`` script is a configure script wrapper for mingw-w64.
We use it to create official Windows build. This script assumes
following libraries have been built for cross-compile:
* c-ares
* openssl
* expat
* sqlite3
* zlib
* cppunit
Some environment variables can be adjusted to change build settings:
``HOST``
cross-compile to build programs to run on ``HOST``. It defaults to
``i686-w64-mingw32``. To build 64bit binary, specify
``x86_64-w64-mingw32``.
``PREFIX``
Prefix to the directory where dependent libraries are installed. It
defaults to ``/usr/local/$HOST``. ``-I$PREFIX/include`` will be
added to ``CPPFLAGS``. ``-L$PREFIX/lib`` will be added to
``LDFLAGS``. ``$PREFIX/lib/pkgconfig`` will be set to
``PKG_CONFIG_LIBDIR``.
For example, to build 64bit binary do this::
$ HOST=x86_64-w64-mingw32 ./mingw-config
Cross-compiling Android binary
------------------------------
In this section, we describe how to build Android binary using Android
NDK cross-compiler on Debian Linux.
``android-config`` script is a configure script wrapper for Android
build. We use it to create official Android build. This script
assumes the following libraries have been built for cross-compile:
* c-ares
* openssl
* expat
When building the above libraries, make sure that disable shared
library and enable only static library. We are going to link those
libraries statically.
We use zlib which comes with Android NDK, so we don't have to build it
by ourselves.
``android-config`` assumes following points:
* Android NDK toolchain is installed under ``$ANDROID_HOME``. Refer
to "3/ Invoking the compiler (the easy way):" section in Android NDK
``docs/STANDALONE-TOOLCHAIN.html`` to install custom toolchain.
* The dependant libraries must be installed under
``$ANDROID_HOME/usr/local``.
Before running ``android-config`` and ``android-make``,
``$ANDOIRD_HOME`` environment variable must be set to point to the
correct path.
After ``android-config``, run ``android-make`` to compile sources.
Building documentation
----------------------
......@@ -260,9 +352,9 @@ DHT
~~~
aria2 supports mainline compatible DHT. By default, the routing table
for IPv4 DHT is saved to $HOME/.aria2/dht.dat and the routing table
for IPv6 DHT is saved to $HOME/.aria2/dht6.dat. aria2 uses same port
number to listen on for both IPv4 and IPv6 DHT.
for IPv4 DHT is saved to ``$HOME/.aria2/dht.dat`` and the routing
table for IPv6 DHT is saved to ``$HOME/.aria2/dht6.dat``. aria2 uses
same port number to listen on for both IPv4 and IPv6 DHT.
Other things should be noted
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......@@ -348,6 +440,27 @@ References
* http://aria2.sourceforge.net/
* http://sourceforge.net/apps/trac/aria2/wiki
* https://github.com/tatsuhiro-t/aria2
* `RFC 959 FILE TRANSFER PROTOCOL (FTP) <http://tools.ietf.org/html/rfc959>`_
* `RFC 1738 Uniform Resource Locators (URL) <http://tools.ietf.org/html/rfc1738>`_
* `RFC 2428 FTP Extensions for IPv6 and NATs <http://tools.ietf.org/html/rfc2428>`_
* `RFC 2616 Hypertext Transfer Protocol -- HTTP/1.1 <http://tools.ietf.org/html/rfc2616>`_
* `RFC 3659 Extensions to FTP <http://tools.ietf.org/html/rfc3659>`_
* `RFC 3986 Uniform Resource Identifier (URI): Generic Syntax <http://tools.ietf.org/html/rfc3986>`_
* `RFC 4038 Application Aspects of IPv6 Transition <http://tools.ietf.org/html/rfc4038>`_
* `RFC 5854 The Metalink Download Description Format <http://tools.ietf.org/html/rfc5854>`_
* `RFC 6249 Metalink/HTTP: Mirrors and Hashes <http://tools.ietf.org/html/rfc6249>`_
* `RFC 6265 HTTP State Management Mechanism <http://tools.ietf.org/html/rfc6265>`_
* `RFC 6455 The WebSocket Protocol <http://tools.ietf.org/html/rfc6455>`_
* `The BitTorrent Protocol Specification <http://www.bittorrent.org/beps/bep_0003.html>`_
* `BitTorrent: DHT Protocol <http://www.bittorrent.org/beps/bep_0005.html>`_
* `BitTorrent: Fast Extension <http://www.bittorrent.org/beps/bep_0006.html>`_
* `BitTorrent: IPv6 Tracker Extension <http://www.bittorrent.org/beps/bep_0007.html>`_
* `BitTorrent: Extension for Peers to Send Metadata Files <http://www.bittorrent.org/beps/bep_0009.html>`_
* `BitTorrent: Extension Protocol <http://www.bittorrent.org/beps/bep_0010.html>`_
* `BitTorrent: Multitracker Metadata Extension <http://www.bittorrent.org/beps/bep_0012.html>`_
* `BitTorrent: WebSeed - HTTP/FTP Seeding (GetRight style) <http://www.bittorrent.org/beps/bep_0019.html>`_
* `BitTorrent: Private Torrents <http://www.bittorrent.org/beps/bep_0027.html>`_
* `BitTorrent: BitTorrent DHT Extensions for IPv6 <http://www.bittorrent.org/beps/bep_0032.html>`_
* `BitTorrent: Message Stream Encryption <http://wiki.vuze.com/w/Message_Stream_Encryption>`_
* `Kademlia: A Peer-to-peer Information System Based on the XOR Metric <http://pdos.csail.mit.edu/~petar/papers/maymounkov-kademlia-lncs.pdf>`_
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
......@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [],
m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl
[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
#!/bin/sh
# aria2 - The high speed download utility
#
# Copyright (C) 2012 Tatsuhiro Tsujikawa
#
# 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 of the License, 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, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of portions of this program with the
# OpenSSL library under certain conditions as described in each
# individual source file, and distribute linked combinations
# including the two.
# You must obey the GNU General Public License in all respects
# for all of the code used other than OpenSSL. If you modify
# file(s) with this exception, you may extend this exception to your
# version of the file(s), but you are not obligated to do so. If you
# do not wish to do so, delete this exception statement from your
# version. If you delete this exception statement from all source
# files in the program, then also delete it here.
if [ -z "$ANDROID_HOME" ]; then
echo 'No $ANDROID_HOME specified.'
exit 1
fi
PREFIX=$ANDROID_HOME/usr/local
TOOLCHAIN=$ANDROID_HOME/toolchain
PATH=$TOOLCHAIN/bin:$PATH
./configure \
--host=arm-linux-androideabi \
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
--disable-nls \
--without-gnutls \
--with-openssl --with-openssl-prefix=$PREFIX \
--without-sqlite3 \
--without-libxml2 \
--with-libexpat --with-libexpat-prefix=$PREFIX \
--with-libcares --with-libcares-prefix=$PREFIX \
--with-libz --with-libz-prefix=$PREFIX \
CXXFLAGS="-Os -g" \
CFLAGS="-Os -g" \
LDFLAGS="-L$PREFIX/lib" \
PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
ZLIB_LIBS="-lz" \
ZLIB_CFLAGS="-I$TOOLCHAIN/sysroot/usr/include"
# ZLIB_LIBS and ZLIB_CFLAGS are needed because aria2 configure script
# checks zlib availability using pkg-config, but android toochain does
# not provide pkg-config file. We need to specify these variables
# manually.
#!/bin/sh
# aria2 - The high speed download utility
#
# Copyright (C) 2012 Tatsuhiro Tsujikawa
#
# 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 of the License, 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, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# In addition, as a special exception, the copyright holders give
# permission to link the code of portions of this program with the
# OpenSSL library under certain conditions as described in each
# individual source file, and distribute linked combinations
# including the two.
# You must obey the GNU General Public License in all respects
# for all of the code used other than OpenSSL. If you modify
# file(s) with this exception, you may extend this exception to your
# version of the file(s), but you are not obligated to do so. If you
# do not wish to do so, delete this exception statement from your
# version. If you delete this exception statement from all source
# files in the program, then also delete it here.
if [ -z "$ANDROID_HOME" ]; then
echo 'No $ANDROID_HOME specified.'
exit 1
fi
TOOLCHAIN=$ANDROID_HOME/toolchain
PATH=$TOOLCHAIN/bin:$PATH
make "$@"
#!/bin/bash
# Generate an OSX universal binary (32+64b intel) DMG with Installer & DMG
#
# This script is supposed to be run from the aria2 source directory.
# It has to be run on an OSX 10.6 host with Developer Tools installed.
#
# Additionally, Macports must be installed with the following packages:
#
# autoconf autoconf213 autogen +universal automake coreutils +universal
# gettext +universal gmake +universal icu +universal
# libgcrypt +universal libxml2 +universal m4 +universal
# openssl +universal pkgconfig +universal c-ares +universal zlib +universal
#
# Author: renaud gaudin
# path definitions.
A2_VERSION=`cat config.h |grep "define VERSION" | cut -f 2 -d '"' -`
CURRENT_DIR=`pwd`
PACKAGE_ROOT=${CURRENT_DIR}/aria_build
BUILD_TARGET=${PACKAGE_ROOT}/usr
PACKAGE_RESOURCES=${CURRENT_DIR}/osx_resources
TARGET_NAME=aria2-${A2_VERSION}
PKG_NAME=${TARGET_NAME}.pkg
DMG_NAME=${TARGET_NAME}.dmg
UNINST_NAME="Uninstall aria2.applescript"
DMG_SKEL=aria2_dmg
# build aria2 mostly static
mkdir -p $BUILD_TARGET
export ZLIB_LIBS="/opt/local/lib/libz.a"
export OPENSSL_LIBS="-L/usr/lib -lssl -L/usr/lib -lcrypto"
export LIBCARES_LIBS="/opt/local/lib/libcares.a"
export CPPFLAGS="-I/opt/local/include"
export LDFLAGS="-static-libstdc++"
export LIBS="/opt/local/lib/libintl.a /opt/local/lib/libcrypto.a /opt/local/lib/libiconv.a"
CC="gcc -arch i386 -arch x86_64" CXX="g++ -arch i386 -arch x86_64" CPP="gcc -E" CXXCPP="g++ -E" ./configure --without-libxml2 --without-gnutls --prefix=$BUILD_TARGET --without-libgcrypt --without-libnettle --without-libgmp --enable-bittorrent --enable-metalink --enable-epoll --with-libexpat --with-openssl
make
# install into our target
make install
# create pkg installer
mkdir -p ${PACKAGE_RESOURCES}
cp -av README.html ${PACKAGE_RESOURCES}/Welcome.html
cp -av COPYING ${PACKAGE_RESOURCES}/License.txt
cp -av NEWS ${PACKAGE_RESOURCES}/ReadMe.txt
rm -rf ${PKG_NAME}
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --root ${PACKAGE_ROOT} --id aria2 --version ${A2_VERSION} --title "aria2" --domain system --resources ${PACKAGE_RESOURCES} --out ${PKG_NAME}
# create uninstaller tool
DEL_STR=`find ${PACKAGE_ROOT}/ -type f | sed -e "s,$PACKAGE_ROOT,sudo rm -f ," | tr '\n' ' ; '`
echo "(do shell script \"mkdir -p /var/db/sudo/$USER; touch /var/db/sudo/$USER\" with administrator privileges) & (do shell script \"${DEL_STR}\")" > "$UNINST_NAME"
# create dmg with installer and uninstall inside
rm -rf ${DMG_SKEL}
mkdir -p ${DMG_SKEL}
cp -av ${PKG_NAME} ${DMG_SKEL}/
cp -av "${UNINST_NAME}" ${DMG_SKEL}/
rm -f ${DMG_NAME}
hdiutil create -megabytes 20 -fs HFS+ -volname aria2 -nospotlight -srcfolder ${DMG_SKEL} ${DMG_NAME}
......@@ -204,6 +204,10 @@
/* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID
/* Define to 1 if you have the `gnutls_certificate_set_x509_system_trust'
function. */
#undef HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST
/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
......@@ -750,6 +754,11 @@
# endif
#endif
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
......
......@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2012-02-10'
timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -225,6 +225,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
;;
-lynx*5)
os=-lynxos5
;;