From dabfb3562f3489e6ec90d2b9aa132642ef839fe8 Mon Sep 17 00:00:00 2001
From: schwarz <schwarz@pkgsrc.org>
Date: Sat, 27 Jan 2007 22:57:35 +0000
Subject: * added a patch to ensure compatibility with IRIX 5 (Changes says it
 is al- ready included with that release of OpenSSH, but in fact it is not) *
 removed hacks.mk which is no longer necessary with that version of OpenSSH

---
 security/openssh/distinfo         |  3 ++-
 security/openssh/hacks.mk         | 15 ---------------
 security/openssh/patches/patch-at | 12 ++++++++++++
 3 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 100644 security/openssh/hacks.mk
 create mode 100644 security/openssh/patches/patch-at

(limited to 'security/openssh')

diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 7f048a11010..df9004e8884 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2007/01/20 10:03:39 taca Exp $
+$NetBSD: distinfo,v 1.60 2007/01/27 22:57:35 schwarz Exp $
 
 SHA1 (openssh-4.5p1-hpn12v14.diff.gz) = 8bea17b13e7e91135785f4222252c28d08c9c887
 RMD160 (openssh-4.5p1-hpn12v14.diff.gz) = 1f937174d5418d578da5d9dfab16b5cc8960efc5
@@ -25,6 +25,7 @@ SHA1 (patch-ap) = 2c0c092637661328046b71292a7412d09e92bb2a
 SHA1 (patch-aq) = a619b57361b04d5ab3d41375c18f7b99d71c8b34
 SHA1 (patch-ar) = fce4dc1011a124f02b8e14980cda1d633b36aa7d
 SHA1 (patch-as) = 19660f5983931ea3b053e6f4289cf6fae2ce50f3
+SHA1 (patch-at) = 1053afa04babc82374d7356aa0cc5fa55cf184e2
 SHA1 (patch-au) = 6cfdfc531e2267017a15e66ea48c7ecfa2a3926f
 SHA1 (patch-av) = 00f54c3fae7318b278b16bd0b01881a90bd31365
 SHA1 (patch-aw) = 2a88b7563c6f52163c6c5f716e437ecaea613a30
diff --git a/security/openssh/hacks.mk b/security/openssh/hacks.mk
deleted file mode 100644
index 584370a649a..00000000000
--- a/security/openssh/hacks.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: hacks.mk,v 1.2 2006/10/31 03:31:19 taca Exp $
-
-.if !defined(OPENSSH_HACKS_MK)
-OPENSSH_HACKS_MK=	# defined
-
-### [Sun May 14 15:09:28 CDT 2006 : schwarz]
-### work around a definition conflict for _res present in openssh
-### 4.3p1 and 4.3p2 (should be fixed with later releases)
-###
-.if !empty(LOWER_OPSYS:Mirix5*)
-PKG_HACKS+=		_res-conflict
-CPPFLAGS+=		-D_res=_compat_res
-.endif
-
-.endif
diff --git a/security/openssh/patches/patch-at b/security/openssh/patches/patch-at
new file mode 100644
index 00000000000..77aa3cf9259
--- /dev/null
+++ b/security/openssh/patches/patch-at
@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.5 2007/01/27 22:57:35 schwarz Exp $
+
+--- packet.c.orig	2007-01-27 20:39:52.000000000 +0100
++++ packet.c	2007-01-27 20:39:38.000000000 +0100
+@@ -47,7 +47,6 @@
+ # include <sys/time.h>
+ #endif
+ 
+-#include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <arpa/inet.h>
-- 
cgit v1.2.3