pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/libgcrypt Make build on Interix, sharing some...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ae49afdf116b
branches: trunk
changeset: 490441:ae49afdf116b
user: tv <tv%pkgsrc.org@localhost>
date: Thu Mar 10 15:38:33 2005 +0000
description:
Make build on Interix, sharing some of the OS-specific oddities with _WIN32.
diffstat:
security/libgcrypt/distinfo | 7 +++--
security/libgcrypt/patches/patch-ac | 16 ++++++++++++++
security/libgcrypt/patches/patch-ae | 34 +++++++++++++++++++++++++++++-
security/libgcrypt/patches/patch-af | 40 +++++++++++++++++++++++++++++++++++-
4 files changed, 90 insertions(+), 7 deletions(-)
diffs (136 lines):
diff -r 83e980210040 -r ae49afdf116b security/libgcrypt/distinfo
--- a/security/libgcrypt/distinfo Thu Mar 10 15:37:19 2005 +0000
+++ b/security/libgcrypt/distinfo Thu Mar 10 15:38:33 2005 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.14 2005/02/24 13:10:07 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/03/10 15:38:33 tv Exp $
SHA1 (libgcrypt-1.2.1.tar.gz) = 8627d483e26e73b4cfabb4807ae8423875c37cda
RMD160 (libgcrypt-1.2.1.tar.gz) = c99e5d36a8af2e78d49b61681635997960e50360
Size (libgcrypt-1.2.1.tar.gz) = 960872 bytes
SHA1 (patch-aa) = d8f659e4aac872abb152252731fd29bdaac635e3
SHA1 (patch-ab) = bd713f7cbc6782ced8c2fd2b5541ac52d2a10fbe
+SHA1 (patch-ac) = bc846d21e3842103ec50679d69169a8472c12a66
SHA1 (patch-ad) = f32281612b51c5bb3788cf03c6f5615bdfc0d3e8
-SHA1 (patch-ae) = 4129d9231dc6dfe2f8aa1d5ca5ed2b41a5e29741
-SHA1 (patch-af) = 01f417ea1ef8c9fc133f4a833da181c848776e7d
+SHA1 (patch-ae) = 90fe2a6c71c5311ae9c32de05de5dc5849b7161b
+SHA1 (patch-af) = f62f9f5b8ebc9e5f3a2570ec609de66e2d77e587
diff -r 83e980210040 -r ae49afdf116b security/libgcrypt/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgcrypt/patches/patch-ac Thu Mar 10 15:38:33 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.4 2005/03/10 15:38:33 tv Exp $
+
+--- src/gcrypt.h.orig Wed Jan 5 08:52:55 2005
++++ src/gcrypt.h
+@@ -168,6 +168,11 @@ enum gcry_thread_option
+ #define _GCRY_PTH_SOCKADDR void
+ #define _GCRY_PTH_SOCKLEN_T int
+ #define _GCRY_PTH_MSGHDR void
++#elif defined(__INTERIX)
++#define _GCRY_PTH_FD_SET fd_set
++#define _GCRY_PTH_SOCKADDR struct sockaddr
++#define _GCRY_PTH_SOCKLEN_T int
++#define _GCRY_PTH_MSGHDR void
+ #else
+ #define _GCRY_PTH_FD_SET fd_set
+ #define _GCRY_PTH_SOCKADDR struct sockaddr
diff -r 83e980210040 -r ae49afdf116b security/libgcrypt/patches/patch-ae
--- a/security/libgcrypt/patches/patch-ae Thu Mar 10 15:37:19 2005 +0000
+++ b/security/libgcrypt/patches/patch-ae Thu Mar 10 15:38:33 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2005/01/18 13:11:38 tv Exp $
+$NetBSD: patch-ae,v 1.2 2005/03/10 15:38:33 tv Exp $
---- src/ath.h.orig 2005-01-18 08:08:14.000000000 -0500
+--- src/ath.h.orig Thu Nov 25 14:29:26 2004
+++ src/ath.h
@@ -31,6 +31,12 @@
@@ -15,3 +15,33 @@
/* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols
a prefix. */
+@@ -83,6 +89,14 @@ struct ath_ops
+ int (*connect) (int s, void *addr, socklen_t length);
+ int (*sendmsg) (int s, const void *msg, int flags);
+ int (*recvmsg) (int s, void *msg, int flags);
++#elif defined(__INTERIX)
++ ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
++ struct timeval *timeout);
++ ssize_t (*waitpid) (pid_t pid, int *status, int options);
++ int (*accept) (int s, struct sockaddr *addr, socklen_t *length_ptr);
++ int (*connect) (int s, struct sockaddr *addr, socklen_t length);
++ int (*sendmsg) (int s, const void *msg, int flags);
++ int (*recvmsg) (int s, void *msg, int flags);
+ #else
+ ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
+ struct timeval *timeout);
+@@ -117,6 +131,14 @@ ssize_t ath_select (int nfd, void *rset,
+ ssize_t ath_waitpid (pid_t pid, int *status, int options);
+ int ath_accept (int s, void *addr, int *length_ptr);
+ int ath_connect (int s, void *addr, int length);
++int ath_sendmsg (int s, const void *msg, int flags);
++int ath_recvmsg (int s, void *msg, int flags);
++#elif defined(__INTERIX)
++ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
++ struct timeval *timeout);
++ssize_t ath_waitpid (pid_t pid, int *status, int options);
++int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr);
++int ath_connect (int s, struct sockaddr *addr, socklen_t length);
+ int ath_sendmsg (int s, const void *msg, int flags);
+ int ath_recvmsg (int s, void *msg, int flags);
+ #else
diff -r 83e980210040 -r ae49afdf116b security/libgcrypt/patches/patch-af
--- a/security/libgcrypt/patches/patch-af Thu Mar 10 15:37:19 2005 +0000
+++ b/security/libgcrypt/patches/patch-af Thu Mar 10 15:38:33 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2005/01/18 13:11:38 tv Exp $
+$NetBSD: patch-af,v 1.2 2005/03/10 15:38:33 tv Exp $
---- src/ath.c.orig 2005-01-18 08:09:03.000000000 -0500
+--- src/ath.c.orig Sat Dec 18 13:31:53 2004
+++ src/ath.c
@@ -24,11 +24,6 @@
@@ -14,3 +14,39 @@
#include <sys/types.h>
#ifndef _WIN32
#include <sys/wait.h>
+@@ -300,7 +295,7 @@ ath_connect (int s, struct sockaddr *add
+
+
+ int
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__INTERIX)
+ ath_sendmsg (int s, const void *msg, int flags)
+ #else
+ ath_sendmsg (int s, const struct msghdr *msg, int flags)
+@@ -309,7 +304,7 @@ ath_sendmsg (int s, const struct msghdr
+ if (ops_set && ops.sendmsg)
+ return (*ops.sendmsg) (s, msg, flags);
+ else
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__INTERIX)
+ return -1;
+ #else
+ return sendmsg (s, msg, flags);
+@@ -318,7 +313,7 @@ ath_sendmsg (int s, const struct msghdr
+
+
+ int
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__INTERIX)
+ ath_recvmsg (int s, void *msg, int flags)
+ #else
+ ath_recvmsg (int s, struct msghdr *msg, int flags)
+@@ -327,7 +322,7 @@ ath_recvmsg (int s, struct msghdr *msg,
+ if (ops_set && ops.recvmsg)
+ return (*ops.recvmsg) (s, msg, flags);
+ else
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__INTERIX)
+ return -1;
+ #else
+ return recvmsg (s, msg, flags);
Home |
Main Index |
Thread Index |
Old Index