bump the version, and update the patch

3 files changed, 26 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2fed0f29186..665cd080fea9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aria2-fast
 	pkgdesc = Aria2 Download utility with little patch to maximize aria2 download connections
-	pkgver = 1.19.0
-	pkgrel = 2
+	pkgver = 1.19.1
+	pkgrel = 1
 	url = http://aria2.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -14,10 +14,10 @@ pkgbase = aria2-fast
 	depends = ca-certificates
 	provides = aria2
 	conflicts = aria2
-	source = http://downloads.sourceforge.net/aria2/aria2-1.19.0.tar.bz2
-	source = aria2-1.16.patch
-	md5sums = ad6eb57511a05ce823e194eb71a7e9fa
-	md5sums = 8d1c33b0ff5a3611ac0f8e46ca93c48c
+	source = https://github.com/tatsuhiro-t/aria2/releases/download/release-1.19.1/aria2-1.19.1.tar.xz
+	source = aria2-fast.patch
+	md5sums = b8b72b951f3943285a4b445364b6348c
+	md5sums = 5bfc37a15ce74bbdfbfa77fb871cc2e7
 
 pkgname = aria2-fast
 
diff --git a/PKGBUILD b/PKGBUILD
index 1beb32b41b63..44a9e5b0b134 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2-fast
-pkgver=1.19.0
-pkgrel=2
+pkgver=1.19.1
+pkgrel=1
 pkgdesc='Aria2 Download utility with little patch to maximize aria2 download connections'
 arch=('i686' 'x86_64')
 url='http://aria2.sourceforge.net/'
@@ -15,12 +15,12 @@ depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 provides=('aria2')
 conflicts=('aria2')
-source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2" "aria2-1.16.patch")
+source=("https://github.com/tatsuhiro-t/aria2/releases/download/release-${pkgver}/aria2-${pkgver}.tar.xz" "aria2-fast.patch")
 
 build() {
   cd aria2-${pkgver}
 
-  patch -Np1 < ../aria2-1.16.patch
+  patch -Np1 < ../aria2-fast.patch
 
   ./configure \
     --prefix=/usr \
@@ -46,5 +46,5 @@ package() {
     ${pkgdir}/usr/share/bash-completion/completions
   rm -rf ${pkgdir}/usr/share/doc/aria2/bash_completion
 }
-md5sums=('ad6eb57511a05ce823e194eb71a7e9fa'
-         '8d1c33b0ff5a3611ac0f8e46ca93c48c')
+md5sums=('b8b72b951f3943285a4b445364b6348c'
+         '5bfc37a15ce74bbdfbfa77fb871cc2e7')
diff --git a/aria2-1.16.patch b/aria2-fast.patch
index 13d57b62fa1a..89b0a3d220f5 100644
--- a/aria2-1.16.patch
+++ b/aria2-fast.patch
@@ -1,7 +1,6 @@
-diff -Npur ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc ./src/OptionHandlerFactory.cc
---- ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc	2012-12-16 10:59:30.284471787 +0700
-+++ ./src/OptionHandlerFactory.cc	2012-12-16 11:04:24.561140718 +0700
-@@ -480,8 +480,8 @@ std::vector<OptionHandler*> OptionHandle
+--- ../aria2-1.19.1.orig/src/OptionHandlerFactory.cc	2015-09-27 23:09:47.000000000 +0800
++++ ./src/OptionHandlerFactory.cc	2015-09-29 23:24:46.406091311 +0800
+@@ -507,8 +507,8 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new NumberOptionHandler
                        (PREF_MAX_CONNECTION_PER_SERVER,
                         TEXT_MAX_CONNECTION_PER_SERVER,
@@ -12,18 +11,18 @@ diff -Npur ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc ./src/OptionHandlerFa
                         'x'));
      op->addTag(TAG_BASIC);
      op->addTag(TAG_FTP);
-@@ -546,8 +546,8 @@ std::vector<OptionHandler*> OptionHandle
+@@ -573,8 +573,8 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new UnitNumberOptionHandler
                        (PREF_MIN_SPLIT_SIZE,
                         TEXT_MIN_SPLIT_SIZE,
 -                       "20M",
--                       1024*1024, 1024*1024*1024,
+-                       1_m, 1_g,
 +                       "16K",
-+                       1024, 1024*1024*1024,
++                       1_k, 1_g,
                         'k'));
      op->addTag(TAG_BASIC);
      op->addTag(TAG_FTP);
-@@ -859,7 +859,7 @@ std::vector<OptionHandler*> OptionHandle
+@@ -976,7 +976,7 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new NumberOptionHandler
                        (PREF_CONNECT_TIMEOUT,
                         TEXT_CONNECT_TIMEOUT,
@@ -32,7 +31,7 @@ diff -Npur ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc ./src/OptionHandlerFa
                         1, 600));
      op->addTag(TAG_FTP);
      op->addTag(TAG_HTTP);
-@@ -910,7 +910,7 @@ std::vector<OptionHandler*> OptionHandle
+@@ -1027,7 +1027,7 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new NumberOptionHandler
                        (PREF_MAX_TRIES,
                         TEXT_MAX_TRIES,
@@ -41,18 +40,18 @@ diff -Npur ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc ./src/OptionHandlerFa
                         0, -1,
                         'm'));
      op->addTag(TAG_FTP);
-@@ -954,8 +954,8 @@ std::vector<OptionHandler*> OptionHandle
+@@ -1071,8 +1071,8 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new UnitNumberOptionHandler
                        (PREF_PIECE_LENGTH,
                         TEXT_PIECE_LENGTH,
 -                       "1M",
--                       1024*1024,
+-                       1_m, 1_g));
 +                       "16K",
-+                       1024,
-                        1024*1024*1024));
++                       1_k, 1_g));
      op->addTag(TAG_ADVANCED);
      op->addTag(TAG_FTP);
-@@ -982,7 +982,7 @@ std::vector<OptionHandler*> OptionHandle
+     op->addTag(TAG_HTTP);
+@@ -1098,7 +1098,7 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new NumberOptionHandler
                        (PREF_RETRY_WAIT,
                         TEXT_RETRY_WAIT,
@@ -61,7 +60,7 @@ diff -Npur ../aria2-1.16.0.ori/src/OptionHandlerFactory.cc ./src/OptionHandlerFa
                         0, 600));
      op->addTag(TAG_FTP);
      op->addTag(TAG_HTTP);
-@@ -1040,7 +1040,7 @@ std::vector<OptionHandler*> OptionHandle
+@@ -1155,7 +1155,7 @@ std::vector<OptionHandler*> OptionHandle
      OptionHandler* op(new NumberOptionHandler
                        (PREF_SPLIT,
                         TEXT_SPLIT,