[arch-commits] Commit in aria2/repos (4 files)

[Eric Bélanger]

    Date: Monday, January 4, 2010 @ 01:31:21
  Author: eric
Revision: 62185

Merged revisions 62183 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/aria2/trunk

........
  r62183 | eric | 2010-01-04 01:29:00 -0500 (Mon, 04 Jan 2010) | 2 lines
  
  upgpkg: aria2 1.8.0-1
      Upstream update, removed old patch and ChangeLog
........

Modified:
  aria2/repos/extra-x86_64/	(properties)
  aria2/repos/extra-x86_64/PKGBUILD
Deleted:
  aria2/repos/extra-x86_64/ChangeLog
  aria2/repos/extra-x86_64/aria2-1.7.1-metalink-piping.patch

-----------------------------------+
 ChangeLog                         |   26 ----------
 PKGBUILD                          |   14 +----
 aria2-1.7.1-metalink-piping.patch |   91 ------------------------------------
 3 files changed, 5 insertions(+), 126 deletions(-)


Property changes on: aria2/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /aria2/trunk:1-60896
   + /aria2/trunk:1-62184

Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2010-01-04 06:29:30 UTC (rev 62184)
+++ extra-x86_64/ChangeLog	2010-01-04 06:31:21 UTC (rev 62185)
@@ -1,26 +0,0 @@
-2009-04-02  Alexander Fehr  <pizzapunk gmail com>
-
-  * aria2-1.3.0-1:
-  New upstream release.
-
-2008-12-30  Alexander Fehr  <pizzapunk gmail com>
-
-  * aria2-1.1.2-1:
-  New upstream release.
-  Added dependency on c-ares.
-  Added dependency on ca-certificates.
-  Enabled --with-ca-bundle configure option.
-
-2008-11-26  Alexander Fehr  <pizzapunk gmail com>
-
-  * aria2-1.0.1-1:
-  New upstream release.
-  Added dependency on sqlite3.
-
-2008-09-16  Alexander Fehr  <pizzapunk gmail com>
-
-  * aria2-0.15.3-1:
-  New upstream release.
-  New maintainer.
-  Removed sha1sums.
-  Added ChangeLog.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-01-04 06:29:30 UTC (rev 62184)
+++ extra-x86_64/PKGBUILD	2010-01-04 06:31:21 UTC (rev 62185)
@@ -2,23 +2,19 @@
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=aria2
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink"
 arch=('i686' 'x86_64')
 url="http://aria2.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        aria2-1.7.1-metalink-piping.patch)
-md5sums=('ca125faf6a8fbef108184184cb70fe24'
-         'fa958d728fd0a7f002f93975f034cfd1')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('13944c95529de6846f0ab9ba09c53e3e')
+sha1sums=('96fcaf0f6d674a9ce4e55c6f17690f7f4221016b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # Fix FS17445
-  patch -Np0 -i ${srcdir}/aria2-1.7.1-metalink-piping.patch || return 1
-
   ./configure --prefix=/usr \
               --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt || return 1
   make || return 1

Deleted: extra-x86_64/aria2-1.7.1-metalink-piping.patch
===================================================================
--- extra-x86_64/aria2-1.7.1-metalink-piping.patch	2010-01-04 06:29:30 UTC (rev 62184)
+++ extra-x86_64/aria2-1.7.1-metalink-piping.patch	2010-01-04 06:31:21 UTC (rev 62185)
@@ -1,91 +0,0 @@
-Index: src/OptionHandlerFactory.cc
-===================================================================
---- src/OptionHandlerFactory.cc	(revision 1700)
-+++ src/OptionHandlerFactory.cc	(working copy)
-@@ -1184,6 +1184,7 @@
- 				   (PREF_TORRENT_FILE,
- 				    TEXT_TORRENT_FILE,
- 				    NO_DEFAULT_VALUE,
-+				    false,
- 				    'T'));
-     op->addTag(TAG_BASIC);
-     op->addTag(TAG_BITTORRENT);
-@@ -1215,6 +1216,7 @@
- 				   (PREF_METALINK_FILE,
- 				    TEXT_METALINK_FILE,
- 				    NO_DEFAULT_VALUE,
-+				    true,
- 				    'M'));
-     op->addTag(TAG_BASIC);
-     op->addTag(TAG_METALINK);
-Index: src/OptionHandlerImpl.h
-===================================================================
---- src/OptionHandlerImpl.h	(revision 1684)
-+++ src/OptionHandlerImpl.h	(working copy)
-@@ -56,6 +56,7 @@
- #include "message.h"
- #include "File.h"
- #include "FileEntry.h"
-+#include "a2io.h"
- 
- namespace aria2 {
- 
-@@ -576,24 +577,32 @@
- };
- 
- class LocalFilePathOptionHandler : public NameMatchOptionHandler {
-+private:
-+  bool _acceptStdin;
- public:
-   LocalFilePathOptionHandler
-   (const std::string& optName,
-    const std::string& description = NO_DESCRIPTION,
-    const std::string& defaultValue = NO_DEFAULT_VALUE,
-+   bool acceptStdin = false,
-    char shortName = 0):
-     NameMatchOptionHandler(optName, description, defaultValue,
- 			   OptionHandler::REQ_ARG,
--			   shortName) {}
-+			   shortName),
-+    _acceptStdin(acceptStdin) {}
- 
-   virtual void parseArg(Option& option, const std::string& optarg)
-   {
--    File f(optarg);
--    if(!f.exists() || f.isDir()) {
--      throw DL_ABORT_EX
--	(StringFormat(MSG_NOT_FILE, optarg.c_str()).str());
-+    if(_acceptStdin && optarg == "-") {
-+      option.put(_optName, DEV_STDIN);
-+    } else {
-+      File f(optarg);
-+      if(!f.exists() || f.isDir()) {
-+	throw DL_ABORT_EX
-+	  (StringFormat(MSG_NOT_FILE, optarg.c_str()).str());
-+      }
-+      option.put(_optName, optarg);
-     }
--    option.put(_optName, optarg);
-   }
-   
-   virtual std::string createPossibleValuesString() const
-Index: src/a2io.h
-===================================================================
---- src/a2io.h	(revision 1555)
-+++ src/a2io.h	(working copy)
-@@ -103,10 +103,12 @@
- # define DEV_NULL "/dev/null"
- #endif // HAVE_WINSOCK2_H
- 
--// Use 'con' instead of '/dev/stdout' in win32.
-+// Use 'con' instead of '/dev/stdin' and '/dev/stdout' in win32.
- #ifdef HAVE_WINSOCK2_H
-+# define DEV_STDIN "con"
- # define DEV_STDOUT "con"
- #else
-+# define DEV_STDIN "/dev/stdin"
- # define DEV_STDOUT "/dev/stdout"
- #endif // HAVE_WINSOCK2_H
- 
-
- 	
\ No newline at end of file