diff options
| author | tron <tron> | 2009-01-04 13:23:24 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-01-04 13:23:24 +0000 |
| commit | 73f4367650c877349b372e4a00903b5fbc57e917 (patch) | |
| tree | c945fe93a9dae78e2f6ac530474ebdece823989e /net | |
| parent | 50f814f63dfea5df18bea387286421c7e8f5b87c (diff) | |
| download | pkgsrc-73f4367650c877349b372e4a00903b5fbc57e917.tar.gz | |
Pullup ticket #2619 - requested by dholland
aria2: build fix
Revisions pulled up:
- net/aria2/Makefile 1.17
- net/aria2/distinfo 1.15
- net/aria2/patches/patch-aa 1.6
---
Module Name: pkgsrc
Committed By: dholland
Date: Sat Jan 3 23:11:47 UTC 2009
Modified Files:
pkgsrc/net/aria2: Makefile distinfo
Added Files:
pkgsrc/net/aria2/patches: patch-aa
Log Message:
Work around API bug in pre-christos-time_t NetBSD, where struct
timeval's seconds are "long" rather than "time_t". Passing these
seconds to localtime_r() breaks on 64-bit platforms where those types
aren't the same. Fixes PR 40323 from Andreas Burghardt.
PKGREVISION++ as a precaution, since I patched the source.
Diffstat (limited to 'net')
| -rw-r--r-- | net/aria2/Makefile | 3 | ||||
| -rw-r--r-- | net/aria2/distinfo | 3 | ||||
| -rw-r--r-- | net/aria2/patches/patch-aa | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/net/aria2/Makefile b/net/aria2/Makefile index acaa09ccaef..72e8c427de1 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2008/10/29 01:04:06 bjs Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2009/01/04 13:23:24 tron Exp $ # DISTNAME= aria2c-0.16.2 PKGNAME= ${DISTNAME:S/+/./:S/2c-/2-/} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aria2/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/aria2/distinfo b/net/aria2/distinfo index 8f96b13022e..199ecff6560 100644 --- a/net/aria2/distinfo +++ b/net/aria2/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.14 2008/10/29 01:04:06 bjs Exp $ +$NetBSD: distinfo,v 1.14.2.1 2009/01/04 13:23:24 tron Exp $ SHA1 (aria2c-0.16.2.tar.bz2) = 244d51c91771bf440009bb33c360f258913812ac RMD160 (aria2c-0.16.2.tar.bz2) = e3c124ac20501163792fe5ceb820da3d801ffc83 Size (aria2c-0.16.2.tar.bz2) = 1153881 bytes +SHA1 (patch-aa) = ef972e61740c7b95ca2441e6899ddadab45f51de diff --git a/net/aria2/patches/patch-aa b/net/aria2/patches/patch-aa new file mode 100644 index 00000000000..e44f648fa1f --- /dev/null +++ b/net/aria2/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.5.10.1 2009/01/04 13:23:24 tron Exp $ + +--- src/SimpleLogger.cc~ 2008-10-19 11:16:24.000000000 -0400 ++++ src/SimpleLogger.cc 2009-01-03 17:46:14.000000000 -0500 +@@ -147,7 +147,12 @@ void SimpleLogger::writeLog(std::ostream + gettimeofday(&tv, 0); + char datestr[27]; // 'YYYY-MM-DD hh:mm:ss.uuuuuu'+'\0' = 27 bytes + struct tm tm; ++#ifdef __NetBSD__ /* work around API bug on 64-bit platforms in netbsd<6.0 */ ++ time_t tmp = tv.tv_sec; ++ localtime_r(&tmp, &tm); ++#else + localtime_r(&tv.tv_sec, &tm); ++#endif + size_t dateLength = + strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm); + assert(dateLength <= (size_t)20); |