diff options
| author | obache <obache> | 2013-09-30 05:44:33 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-09-30 05:44:33 +0000 |
| commit | decbabfeb01ec22f3899cc3065a891bd3c7c7a40 (patch) | |
| tree | 6372f79ddb62c2a936475858d78d85348ea2bf04 /security | |
| parent | 2e9be90bc8447eb2dbedb70ecdaa9d07093c3ebd (diff) | |
| download | pkgsrc-decbabfeb01ec22f3899cc3065a891bd3c7c7a40.tar.gz | |
sync the fix with upstream.
Diffstat (limited to 'security')
| -rw-r--r-- | security/cyrus-sasl/distinfo | 4 | ||||
| -rw-r--r-- | security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c | 27 |
2 files changed, 20 insertions, 11 deletions
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 5c4508c20dd..13a2893ff59 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2012/12/20 22:52:37 joerg Exp $ +$NetBSD: distinfo,v 1.25 2013/09/30 05:44:33 obache Exp $ SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8 Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes SHA1 (patch-include_sasl.h) = db40d75998075a5e347209b776230540c54c9e35 SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20 -SHA1 (patch-saslauthd_auth__rimap.c) = 6bc9fc13b0dfe14eb524e5fffe910fab74073be9 +SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed diff --git a/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c b/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c index 95202f58b98..3d86f729874 100644 --- a/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c +++ b/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c @@ -1,15 +1,24 @@ -$NetBSD: patch-saslauthd_auth__rimap.c,v 1.2 2012/12/19 10:46:56 obache Exp $ +$NetBSD: patch-saslauthd_auth__rimap.c,v 1.3 2013/09/30 05:44:33 obache Exp $ -* include sys/time.h form `struct timeval' - https://bugzilla.cyrusimap.org/show_bug.cgi?id=3758 +* Added missing include files for struct timeval + http://git.cyrusimap.org/cyrus-sasl/commit/?id=f2e77ab1ac01f611d71ae56ff7635a46b930ef8e --- saslauthd/auth_rimap.c.orig 2012-10-12 14:05:48.000000000 +0000 +++ saslauthd/auth_rimap.c -@@ -71,6 +71,7 @@ - #include <syslog.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <sys/time.h> - #include <netinet/in.h> +@@ -75,6 +75,16 @@ #include <arpa/inet.h> #include <signal.h> + #include <netdb.h> ++#if TIME_WITH_SYS_TIME ++# include <sys/time.h> ++# include <time.h> ++#else ++# if HAVE_SYS_TIME_H ++# include <sys/time.h> ++# else ++# include <time.h> ++# endif ++#endif + + #include "auth_rimap.h" + #include "utils.h" |