summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-05-22 06:00:11 +0000
committerjoerg <joerg@pkgsrc.org>2012-05-22 06:00:11 +0000
commitcdb8b79c808edcb123c39606ed22152a3f541414 (patch)
tree0c8aa2d777528f6bea4c0119d6438414634a5525 /security
parent3025a767d1f1bb9d660f8df92806c9d4e34aa247 (diff)
downloadpkgsrc-cdb8b79c808edcb123c39606ed22152a3f541414.tar.gz
Fix build on NetBSD/amd64, if the kernel was built on a host with 386 in
its name.
Diffstat (limited to 'security')
-rw-r--r--security/openssl/distinfo4
-rw-r--r--security/openssl/patches/patch-aa16
2 files changed, 9 insertions, 11 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 4db22207dcc..43a28688cd7 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.89 2012/05/11 13:27:26 taca Exp $
+$NetBSD: distinfo,v 1.90 2012/05/22 06:00:11 joerg Exp $
SHA1 (openssl-0.9.8x.tar.gz) = 8c3be5160513c0af1e558d3f932390ecb16f59e9
RMD160 (openssl-0.9.8x.tar.gz) = 18a805c177af1667a05104e87acbff97a420864c
Size (openssl-0.9.8x.tar.gz) = 3782486 bytes
-SHA1 (patch-aa) = eb25505e8a745eb5ba85f857b0f9302fd5e9bda1
+SHA1 (patch-aa) = c4b27857698c108fe495fe65ea8857b77e89a655
SHA1 (patch-ac) = 6ff4a20440666f5c520837e10547091e1bee2208
SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 41e46f5453f..06c17a14c8c 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.24 2010/08/18 11:20:56 wiz Exp $
+$NetBSD: patch-aa,v 1.25 2012/05/22 06:00:11 joerg Exp $
---- config.orig 2010-03-09 17:08:24.000000000 +0000
+--- config.orig 2011-07-15 19:59:31.000000000 +0000
+++ config
@@ -49,6 +49,7 @@ done
# First get uname entries that we use below
@@ -21,16 +21,14 @@ $NetBSD: patch-aa,v 1.24 2010/08/18 11:20:56 wiz Exp $
Linux:[2-9].*)
echo "${MACHINE}-whatever-linux2"; exit 0
;;
-@@ -210,12 +215,16 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -210,12 +215,12 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
echo "${MACHINE}-whatever-freebsd"; exit 0
;;
+- NetBSD:*:*:*386*)
+- echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
+ DragonFly:*)
+ echo "${MACHINE}-whatever-dragonfly"; exit 0
-+ ;;
-+
- NetBSD:*:*:*386*)
- echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
;;
NetBSD:*)
@@ -39,7 +37,7 @@ $NetBSD: patch-aa,v 1.24 2010/08/18 11:20:56 wiz Exp $
;;
OpenBSD:*)
-@@ -661,13 +670,18 @@ case "$GUESSOS" in
+@@ -661,13 +666,18 @@ case "$GUESSOS" in
;;
*-*-sunos4) OUT="sunos-$CC" ;;
@@ -60,7 +58,7 @@ $NetBSD: patch-aa,v 1.24 2010/08/18 11:20:56 wiz Exp $
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
libc=/usr/lib/libc.so
else # OpenBSD
-@@ -680,6 +694,8 @@ case "$GUESSOS" in
+@@ -680,6 +690,8 @@ case "$GUESSOS" in
esac ;;
*-*-*bsd*) OUT="BSD-generic32" ;;