diff options
author | obache <obache> | 2011-02-06 11:31:18 +0000 |
---|---|---|
committer | obache <obache> | 2011-02-06 11:31:18 +0000 |
commit | 67c71b47106c8aad18e89db9848edc06a5c74fbc (patch) | |
tree | 3eccb197c73d4eacb2cf3399374c12299e79f2b6 /security/openssh | |
parent | 2ad90c8a88a820a8a1f0519d8e0507f397f9ae79 (diff) | |
download | pkgsrc-67c71b47106c8aad18e89db9848edc06a5c74fbc.tar.gz |
Fixes build on SUA.
* header file location of libbind is differ than SFU.
* treat all Interxi as same, not only interix3.
Diffstat (limited to 'security/openssh')
-rw-r--r-- | security/openssh/Makefile | 10 | ||||
-rw-r--r-- | security/openssh/distinfo | 6 | ||||
-rw-r--r-- | security/openssh/patches/patch-aa | 4 | ||||
-rw-r--r-- | security/openssh/patches/patch-ab | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 024fce9d76c..3270b83d39d 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.197 2010/06/11 20:41:41 martti Exp $ +# $NetBSD: Makefile,v 1.198 2011/02/06 11:31:18 obache Exp $ DISTNAME= openssh-5.5p1 PKGNAME= openssh-5.5.1 @@ -46,11 +46,17 @@ PLIST_SRC= # empty # OpenSSH on Interix has some important caveats MESSAGE_SRC= ${.CURDIR}/MESSAGE.Interix -BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind +BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind CONFIGURE_ENV+= ac_cv_func_openpty=no CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large +.if exists(/usr/local/include/bind/resolv.h) CPPFLAGS+= -I/usr/local/include/bind +BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind +.elif exists(/usr/local/bind/include/resolv.h) +CPPFLAGS+= -I/usr/local/bind/include +BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include +.endif LDFLAGS+= -L/usr/local/lib/bind LIBS+= -lbind -ldb -lcrypt diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 3da2a096f4d..8a2bd1f4bec 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.77 2010/06/15 03:11:52 taca Exp $ +$NetBSD: distinfo,v 1.78 2011/02/06 11:31:18 obache Exp $ SHA1 (openssh-5.5p1-hpn13v9.diff.gz) = 8601fabf0067ff9c59501dc0006ad3853dbb3de0 RMD160 (openssh-5.5p1-hpn13v9.diff.gz) = bb9d44589018030fa3102898f85f4dfd7032d2f0 @@ -6,8 +6,8 @@ Size (openssh-5.5p1-hpn13v9.diff.gz) = 22657 bytes SHA1 (openssh-5.5p1.tar.gz) = 361c6335e74809b26ea096b34062ba8ff6c97cd6 RMD160 (openssh-5.5p1.tar.gz) = 7cee614112b691da5daac9f2579becba2409b727 Size (openssh-5.5p1.tar.gz) = 1097574 bytes -SHA1 (patch-aa) = 508d47bb19f746acc29d3659f5140ee13cc4f848 -SHA1 (patch-ab) = b93e976f71a358637c6a50bc70073755cbe3e230 +SHA1 (patch-aa) = 6c4796dae7dc618e173cd4594ec7be4c5ac8be1c +SHA1 (patch-ab) = 9380dc2c941997925f8f310af5a19be5260d1d1e SHA1 (patch-ac) = 5c63cb47ffb556a15f685011bc3291d2219613dc SHA1 (patch-ad) = a02e5a24fee128d925939785c06f3fa985fc6f2f SHA1 (patch-ae) = 4ec1007b03d4bf28ddd1dcfdf2ec7c5295a69df5 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index 9d5807e3bce..cd728673f23 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.46 2010/06/11 20:41:42 martti Exp $ +$NetBSD: patch-aa,v 1.47 2011/02/06 11:31:18 obache Exp $ --- configure.orig 2010-04-16 03:17:11.000000000 +0300 +++ configure 2010-06-09 21:30:29.000000000 +0300 @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.46 2010/06/11 20:41:42 martti Exp $ ;; esac ;; -+*-*-interix3) ++*-*-interix*) + cat >>confdefs.h <<\_ACEOF +#define HAVE_INTERIX 1 +_ACEOF diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab index db3c963f681..7daacc3b715 100644 --- a/security/openssh/patches/patch-ab +++ b/security/openssh/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.28 2010/06/11 20:41:42 martti Exp $ +$NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $ --- configure.ac.orig 2010-04-10 15:58:01.000000000 +0300 +++ configure.ac 2010-06-09 21:32:22.000000000 +0300 @@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.28 2010/06/11 20:41:42 martti Exp $ ;; esac ;; -+*-*-interix3*) ++*-*-interix*) + AC_DEFINE(HAVE_INTERIX) + AC_DEFINE(DISABLE_FD_PASSING) + AC_DEFINE(DISABLE_SHADOW) |