Update to 0.18.4

Changelog:

aria2 1.18.4
============

Release Note
------------

This release adds new RPC authorization mechanism using --rpc-secret
option.  The existing --rpc-user and --rpc-passwd options are now
deprecated, and all applications using RPC API is strongly encouraged
to migrate to the new mechanism.  See RPC INTERFACE section in aria2
manual page for the details.  The new RPC method, aria2.saveSession,
was added, which tells aria2 server to save session file immediately.
There are several enhancements and bug fixes.  See the changes for the
details.

Changes
-------

* Added support for RPC channel encryption in aria2rpc

  Patch from David Macek

* Add aria2.saveSession RPC method

  This method saves the current session to a file specified by
  --save-session option. This method returns "OK" if it succeeds.

* Add numStoppedTotal key to aria2.getGlobalStat() RPC method response

  It shows the number of stopped downloads in the current session and
  not capped by --max-download-result option. On the other hand, the
  existing numStopped key also shows the number of stopped downloads,
  but it is capped by --max-download-result option.

* Better handling of 30x HTTP status codes

  Reference: http://greenbytes.de/tech/tc/httpredirects/

* Implement new RPC authorization using --rpc-secret option

  Add future deprecation warning to --rpc-user and --rpc-passwd.  Warn
  if neither --rpc-secret nor a combination of --rpc-user/rpc-passwd
  is set.

* Add --enable-color option to enable/disable terminal color output

* Add DSCP support

* gnutls: Don't fail handshake if returned error is not fatal

* Add workaround GnuTLS bug with OCSP status extension and
  non-blocking socket

  GnuTLS version 3.1.3 - 3.1.18 and 3.2.0 - 3.2.8, inclusive, has this
  bug. For these versions, we disable OCSP status extension.

* Make GnuTLS log level dependent on the aria2 ones


aria2 1.18.3
============

Release Note
------------

This release fixes the bug which may cause assertion failure after
multi-file downloads (e.g., multi-file metalink or torrent) are
performed several times due to the bad handling of --bt-max-open-files
option.

Changes
-------

* Fix crash if unpause failed before assigning BtProgressInfoFile
  object

* Enable and check PIE in makerelease-osx

* Fix bug that numOpenFile_ is not reduced when MultiDiskAdaptor is
  deleted

  This bug caused assertion error in
  RequestGroupMan::ensureMaxOpenFileLimit

4 files changed, 8 insertions, 39 deletions

diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index a95da47903a..0aeb08e178a 100644
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2014/02/19 09:44:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2014/03/29 04:15:09 ryoon Exp $
 #
 
-DISTNAME=	aria2-1.18.2
-PKGREVISION=	1
+DISTNAME=	aria2-1.18.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/aria2/distinfo b/net/aria2/distinfo
index 357216b95ed..e595da93ee6 100644
--- a/net/aria2/distinfo
+++ b/net/aria2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.34 2014/01/08 16:32:30 ryoon Exp $
+$NetBSD: distinfo,v 1.35 2014/03/29 04:15:09 ryoon Exp $
 
-SHA1 (aria2-1.18.2.tar.bz2) = 2f04a17567e6b793420a517b3fb0511f12c76289
-RMD160 (aria2-1.18.2.tar.bz2) = 9abeeecf7327211fce63f1a1fb49fe895fa39923
-Size (aria2-1.18.2.tar.bz2) = 2099416 bytes
-SHA1 (patch-configure) = 2c65fb587d9c52518104f3f1c1ad9102a6e107be
+SHA1 (aria2-1.18.4.tar.bz2) = 389829028d8e95f08d42a3bef00ab3237a4b246f
+RMD160 (aria2-1.18.4.tar.bz2) = 5fca6714becdb7fa813bb214215592b0930ce490
+Size (aria2-1.18.4.tar.bz2) = 2107532 bytes
diff --git a/net/aria2/options.mk b/net/aria2/options.mk
index 78ea96fc20a..52a3fd89540 100644
--- a/net/aria2/options.mk
+++ b/net/aria2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2013/07/14 15:03:14 rodent Exp $
+# $NetBSD: options.mk,v 1.15 2014/03/29 04:15:09 ryoon Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.aria2
 
@@ -7,7 +7,7 @@ PKG_OPTIONS_REQUIRED_GROUPS=	ssl
 
 PKG_SUPPORTED_OPTIONS=		nls sqlite
 PKG_SUGGESTED_OPTIONS=		nls sqlite ssl
-PLIST_VARS=			nls
+PLIST_VARS+=			nls
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/aria2/patches/patch-configure b/net/aria2/patches/patch-configure
deleted file mode 100644
index 0ed64ae0d27..00000000000
--- a/net/aria2/patches/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2014/01/08 16:32:30 ryoon Exp $
-
---- configure.orig	2013-12-26 15:44:21.000000000 +0000
-+++ configure
-@@ -19872,13 +19872,13 @@ See \`config.log' for more details" "$LI
- fi
- 
- use_md=""
--if test "x$have_appletls" == "xyes"; then
-+if test "x$have_appletls" = "xyes"; then
-   use_md="apple"
- 
- $as_echo "#define USE_APPLE_MD 1" >>confdefs.h
- 
- else
--  if test "x$have_wintls" == "xyes"; then
-+  if test "x$have_wintls" = "xyes"; then
-     use_md="windows"
- 
- $as_echo "#define USE_WINDOWS_MD 1" >>confdefs.h
-@@ -19913,7 +19913,7 @@ $as_echo "#define USE_INTERNAL_MD 1" >>c
- fi
- 
- # Define variables based on the result of the checks for libraries.
--if test "x$have_appletls" = "xyes" || test "x$have_wintls" == "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then
-+if test "x$have_appletls" = "xyes" || test "x$have_wintls" = "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then
-   have_ssl="yes"
- 
- $as_echo "#define ENABLE_SSL 1" >>confdefs.h