diff options
| author | cheusov <cheusov> | 2011-12-10 20:50:51 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2011-12-10 20:50:51 +0000 |
| commit | 4205e24d83b602ebd7744c8b2257d5465bb37d12 (patch) | |
| tree | 2df0120eaef926cc9e1a1bd2c17b036878367a74 /security | |
| parent | e23fee524cbea5dcbfd3e39a1e75f84c4a62e569 (diff) | |
| download | pkgsrc-4205e24d83b602ebd7744c8b2257d5465bb37d12.tar.gz | |
Fix build failure on Solaris (PR 28226).
Diffstat (limited to 'security')
| -rw-r--r-- | security/putty/Makefile | 5 | ||||
| -rw-r--r-- | security/putty/distinfo | 4 | ||||
| -rw-r--r-- | security/putty/patches/patch-ad | 24 |
3 files changed, 26 insertions, 7 deletions
diff --git a/security/putty/Makefile b/security/putty/Makefile index fec2876630d..ea28a5fae1f 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:38 obache Exp $ +# $NetBSD: Makefile,v 1.22 2011/12/10 20:50:51 cheusov Exp $ # DISTNAME= putty-0.60 @@ -43,5 +43,8 @@ CFLAGS+= -DOMIT_UTMP CFLAGS+= -DBSD_PTYS .endif +LDFLAGS.SunOS+= -lsocket -lnsl +CFLAGS.SunOS+= -DBSD_COMP + .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/putty/distinfo b/security/putty/distinfo index ff2e81ab93b..f54306e019f 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2009/02/25 18:08:01 roy Exp $ +$NetBSD: distinfo,v 1.9 2011/12/10 20:50:51 cheusov Exp $ SHA1 (putty-0.60.tar.gz) = 8d99f8f1077b7ab25f014126b5d812a1ad55ce37 RMD160 (putty-0.60.tar.gz) = 9c56ee4d2d05f5b1079c65f19a5d9d06b596aba3 Size (putty-0.60.tar.gz) = 1743711 bytes SHA1 (patch-aa) = 4949b10698c445fa16a28a8818c7448959f45135 SHA1 (patch-ac) = 61cc8640417931a04152d4f4a1d6daa420d85496 -SHA1 (patch-ad) = b90f5fc8ebd7bb1227dc18ed93afe104e5e40490 +SHA1 (patch-ad) = 02b6d4a1869e40cf891f2ff8710b2aa27b5b23ba SHA1 (patch-ae) = 82bd150f0dfb59eda57e4d9bca7abfc8093090a9 SHA1 (patch-af) = 549688da80048f57530f23d59799c04f09ddbdca SHA1 (patch-ag) = 2012609deff68e4931538b1a987c02b532bf04be diff --git a/security/putty/patches/patch-ad b/security/putty/patches/patch-ad index f3ecb7f6164..86fc24f932b 100644 --- a/security/putty/patches/patch-ad +++ b/security/putty/patches/patch-ad @@ -1,8 +1,24 @@ -$NetBSD: patch-ad,v 1.2 2005/04/13 16:45:46 rillig Exp $ +$NetBSD: patch-ad,v 1.3 2011/12/10 20:50:51 cheusov Exp $ ---- unix/uxnet.c.orig 2005-04-06 23:12:47.000000000 +0200 -+++ unix/uxnet.c 2005-04-06 23:13:06.000000000 +0200 -@@ -443,10 +443,10 @@ +--- unix/uxnet.c.orig 2006-12-09 15:44:31.000000000 +0000 ++++ unix/uxnet.c +@@ -17,6 +17,15 @@ + #include <netdb.h> + #include <sys/un.h> + ++/* This is a hack for solaris, it keeps SIOCATMARK here. */ ++#ifndef SIOCATMARK ++#include <sys/sockio.h> ++#endif ++/* For Unix flavors that don't define INADDR_NONE */ ++#ifndef INADDR_NONE ++#define INADDR_NONE 0xffffffff ++#endif ++ + #define DEFINE_PLUG_METHOD_MACROS + #include "putty.h" + #include "network.h" +@@ -448,10 +457,10 @@ static int try_connect(Actual_Socket soc #endif struct sockaddr_in a; struct sockaddr_un au; |