summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/gpgme/Makefile2
-rw-r--r--security/gpgme/buildlink2.mk19
-rw-r--r--security/kth-krb4/Makefile2
-rw-r--r--security/kth-krb4/PLIST2
-rw-r--r--security/kth-krb4/buildlink.mk2
-rw-r--r--security/kth-krb4/buildlink2.mk30
-rw-r--r--security/libdes/buildlink2.mk20
-rw-r--r--security/openssl/MESSAGE2
-rw-r--r--security/openssl/Makefile2
-rw-r--r--security/openssl/PLIST.common2
-rw-r--r--security/openssl/PLIST.darwin2
-rw-r--r--security/openssl/PLIST.netbsd2
-rw-r--r--security/openssl/buildlink.mk2
-rw-r--r--security/openssl/buildlink2.mk99
-rw-r--r--security/openssl/distinfo2
-rw-r--r--security/openssl/files/patch-netbsd-1.4.22
-rw-r--r--security/openssl/patches/patch-aa2
-rw-r--r--security/openssl/patches/patch-ab2
-rw-r--r--security/openssl/patches/patch-ac2
-rw-r--r--security/openssl/patches/patch-ad2
-rw-r--r--security/openssl/patches/patch-ae2
-rw-r--r--security/openssl/patches/patch-af2
22 files changed, 186 insertions, 18 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 4e6bc068bd7..9fe5cbaa280 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/05/11 20:10:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 19:23:15 jlam Exp $
DISTNAME= gpgme-0.3.0
CATEGORIES= security
diff --git a/security/gpgme/buildlink2.mk b/security/gpgme/buildlink2.mk
new file mode 100644
index 00000000000..5a7e79906d0
--- /dev/null
+++ b/security/gpgme/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:15 jlam Exp $
+
+.if !defined(GPGME_BUILDLINK2_MK)
+GPGME_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= gpgme
+BUILDLINK_DEPENDS.gpgme?= gpgme>=0.3.0
+BUILDLINK_PKGSRCDIR.gpgme?= ../../security/gpgme
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.gpgme=gpgme
+BUILDLINK_PREFIX.gpgme_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.gpgme+= include/gpgme.h
+BUILDLINK_FILES.gpgme+= lib/libgpgme.*
+
+BUILDLINK_TARGETS+= gpgme-buildlink
+
+gpgme-buildlink: _BUILDLINK_USE
+
+.endif # GPGME_BUILDLINK2_MK
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 36c598401a9..5dcc5fede8c 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/02 11:41:15 agc Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:23:15 jlam Exp $
#
DISTNAME= krb4-1.1.1
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index d7fb7f6256e..58cfb3645a6 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/17 11:02:05 martti Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:15 jlam Exp $
bin/afslog
bin/compile_et
bin/ftp
diff --git a/security/kth-krb4/buildlink.mk b/security/kth-krb4/buildlink.mk
index 6270e04e105..bebee1d5bf5 100644
--- a/security/kth-krb4/buildlink.mk
+++ b/security/kth-krb4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 20:41:16 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:23:16 jlam Exp $
#
# This Makefile fragment is included by packages that use kth-krb4.
#
diff --git a/security/kth-krb4/buildlink2.mk b/security/kth-krb4/buildlink2.mk
new file mode 100644
index 00000000000..c840c623526
--- /dev/null
+++ b/security/kth-krb4/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:16 jlam Exp $
+
+.if !defined(KTHKRB4_BUILDLINK2_MK)
+KTHKRB4_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= kth-krb4
+BUILDLINK_DEPENDS.kth-krb4?= kth-krb4>=1.1.1
+BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.kth-krb4=kth-krb4
+BUILDLINK_PREFIX.kth-krb4_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.kth-krb4= include/kerberosIV/*
+BUILDLINK_FILES.kth-krb4+= lib/libacl.*
+BUILDLINK_FILES.kth-krb4+= lib/libcom_err.*
+BUILDLINK_FILES.kth-krb4+= lib/libdes.*
+BUILDLINK_FILES.kth-krb4+= lib/libkadm.*
+BUILDLINK_FILES.kth-krb4+= lib/libkafs.*
+BUILDLINK_FILES.kth-krb4+= lib/lib/libkdb.*
+BUILDLINK_FILES.kth-krb4+= lib/libkrb.*
+BUILDLINK_FILES.kth-krb4+= lib/libotp.*
+BUILDLINK_FILES.kth-krb4+= lib/libroken.*
+BUILDLINK_FILES.kth-krb4+= lib/libsl.*
+BUILDLINK_FILES.kth-krb4+= lib/libss.*
+
+BUILDLINK_TARGETS+= kth-krb4-buildlink
+
+kth-krb4-buildlink: _BUILDLINK_USE
+
+.endif # KTHKRB4_BUILDLINK2_MK
diff --git a/security/libdes/buildlink2.mk b/security/libdes/buildlink2.mk
new file mode 100644
index 00000000000..8e2e757e685
--- /dev/null
+++ b/security/libdes/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:16 jlam Exp $
+
+.if !defined(LIBDES_BUILDLINK2_MK)
+LIBDES_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= libdes
+BUILDLINK_DEPENDS.libdes?= libdes-4.04b
+BUILDLINK_PKGSRCDIR.libdes?= ../../security/libdes
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.libdes=libdes
+BUILDLINK_PREFIX.libdes_DEFAULT= ${LOCALBASE}
+
+BUILDLINK_FILES.libdes= include/libdes.h
+BUILDLINK_FILES.libdes+= lib/libdes.a
+
+BUILDLINK_TARGETS+= libdes-buildlink
+
+libdes-buildlink: _BUILDLINK_USE
+
+.endif # LIBDES_BUILDLINK2_MK
diff --git a/security/openssl/MESSAGE b/security/openssl/MESSAGE
index 0de241e9aa0..ed18f5fec81 100644
--- a/security/openssl/MESSAGE
+++ b/security/openssl/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/08/09 14:35:55 jlam Exp $
+$NetBSD: MESSAGE,v 1.4 2002/08/25 19:23:16 jlam Exp $
If upgrading from SSLeay, you will need to copy your ssleay.cnf (used for
creating certificate requests with "ca") into "${PKG_SYSCONFDIR}/openssl.cnf".
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6edef48bcd3..96452ea35a8 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2002/08/19 16:00:06 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2002/08/25 19:23:17 jlam Exp $
DISTNAME= openssl-0.9.6g
SVR4_PKGNAME= ossl
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 4ea81ae87f5..700e3eb91cf 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2002/08/09 14:45:05 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2002/08/25 19:23:17 jlam Exp $
bin/openssl
bin/c_hash
bin/c_info
diff --git a/security/openssl/PLIST.darwin b/security/openssl/PLIST.darwin
index 94899b82d2e..c0dbfa6d7c5 100644
--- a/security/openssl/PLIST.darwin
+++ b/security/openssl/PLIST.darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.darwin,v 1.2 2002/08/04 15:47:44 fredb Exp $
+@comment $NetBSD: PLIST.darwin,v 1.3 2002/08/25 19:23:17 jlam Exp $
lib/libcrypto.300.0.dylib
lib/libcrypto.300.dylib
lib/libcrypto.dylib
diff --git a/security/openssl/PLIST.netbsd b/security/openssl/PLIST.netbsd
index 6080dbb4d21..a74cf5af8ba 100644
--- a/security/openssl/PLIST.netbsd
+++ b/security/openssl/PLIST.netbsd
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.netbsd,v 1.2 2002/08/04 15:47:44 fredb Exp $
+@comment $NetBSD: PLIST.netbsd,v 1.3 2002/08/25 19:23:17 jlam Exp $
lib/libcrypto.so
lib/libcrypto.so.300
lib/libcrypto.so.300.0
diff --git a/security/openssl/buildlink.mk b/security/openssl/buildlink.mk
index eb93bfa1ec3..18ecbf6db6d 100644
--- a/security/openssl/buildlink.mk
+++ b/security/openssl/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.19 2002/08/16 19:41:14 agc Exp $
+# $NetBSD: buildlink.mk,v 1.20 2002/08/25 19:23:17 jlam Exp $
#
# This Makefile fragment is included by packages that use OpenSSL.
#
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
new file mode 100644
index 00000000000..03b0d6bfa55
--- /dev/null
+++ b/security/openssl/buildlink2.mk
@@ -0,0 +1,99 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:17 jlam Exp $
+#
+# Optionally define USE_OPENSSL_VERSION to the mininum OpenSSL version
+# number in <openssl/opensslv.h>, i.e. 0x0090600fL, etc.
+
+.if !defined(OPENSSL_BUILDLINK2_MK)
+OPENSSL_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+# OpenSSL version numbers from <openssl/opensslv.h>
+OPENSSL_VERSION_095A= 0x0090581fL
+OPENSSL_VERSION_096= 0x0090600fL
+OPENSSL_VERSION_096A= 0x0090601fL
+OPENSSL_VERSION_096B= 0x0090602fL
+OPENSSL_VERSION_096D= 0x0090604fL
+OPENSSL_VERSION_096E= 0x0090605fL
+OPENSSL_VERSION_096F= 0x0090606fL
+OPENSSL_VERSION_096G= 0x0090607fL
+
+# Check for a usable installed version of OpenSSL. Version must be greater
+# than 0.9.6f, or else contain a fix for the 2002-07-30 security advisory.
+# If a usable version isn't present, then use the pkgsrc OpenSSL package.
+#
+_NEED_OPENSSL= YES
+
+_OPENSSLV_H= /usr/include/openssl/opensslv.h
+_SSL_H= /usr/include/openssl/ssl.h
+
+.if exists(${_OPENSSLV_H}) && exists(${_SSL_H})
+_IN_TREE_OPENSSL_HAS_FIX!= \
+ ${AWK} 'BEGIN { ans = "NO" } \
+ /SSL_R_SSL2_CONNECTION_ID_TOO_LONG/ { ans = "YES" } \
+ END { print ans; exit 0 }' ${_SSL_H}
+
+. if ${_IN_TREE_OPENSSL_HAS_FIX} == "YES"
+USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096F}
+. else
+USE_OPENSSL_VERSION?= ${OPENSSL_VERSION_096G}
+. endif
+
+_OPENSSL_VERSION!= ${AWK} '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \
+ ${_OPENSSLV_H}
+
+# There never was a package for this; only the in-tree openssl had it.
+#_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096F} # OpenSSL 0.9.6f
+#BUILDLINK_DEPENDS.openssl= openssl>=0.9.6f
+
+. if ${USE_OPENSSL_VERSION} == ${OPENSSL_VERSION_096G} # OpenSSL 0.9.6g
+_VALID_SSL_VERSIONS= ${OPENSSL_VERSION_096G}
+BUILDLINK_DEPENDS.openssl= openssl>=0.9.6g
+. else
+_VALID_SSL_VERSIONS+= ${OPENSSL_VERSION_096G}
+. endif
+
+. for PATTERN in ${_VALID_SSL_VERSIONS}
+. if ${_OPENSSL_VERSION:M${PATTERN}} != ""
+_NEED_OPENSSL= NO
+. endif
+. endfor
+.endif # exists(${_OPENSSLV_H}) && exists(${_SSL_H})
+
+BUILDLINK_DEPENDS.openssl?= openssl>=0.9.6g
+BUILDLINK_PKGSRCDIR.openssl?= ../../security/openssl
+
+.if ${_NEED_OPENSSL} == "YES"
+BUILDLINK_PACKAGES+= openssl
+EVAL_PREFIX+= BUILDLINK_PREFIX.openssl=openssl
+BUILDLINK_PREFIX.openssl_DEFAULT= ${LOCALBASE}
+SSLBASE= ${BUILDLINK_PREFIX.openssl}
+.else
+BUILDLINK_PREFIX.openssl= /usr
+SSLBASE= /usr
+.endif
+
+.if defined(PKG_SYSCONFDIR.openssl)
+SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs
+.elif ${OPSYS} == "NetBSD"
+SSLCERTS= /etc/openssl/certs
+.else
+SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs
+.endif
+BUILD_DEFS+= SSLBASE SSLCERTS
+
+BUILDLINK_FILES.openssl= bin/openssl
+BUILDLINK_FILES.openssl+= include/openssl/*
+BUILDLINK_FILES.openssl+= lib/libRSAglue.*
+BUILDLINK_FILES.openssl+= lib/libcrypto.*
+BUILDLINK_FILES.openssl+= lib/libssl.*
+
+.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
+. include "../../security/rsaref/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+= openssl-buildlink
+
+openssl-buildlink: _BUILDLINK_USE
+
+.endif # OPENSSL_BUILDLINK2_MK
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index c01b87045da..99c00c7d20d 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/08/19 18:34:54 fredb Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 19:23:18 jlam Exp $
SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
diff --git a/security/openssl/files/patch-netbsd-1.4.2 b/security/openssl/files/patch-netbsd-1.4.2
index 50980767ad3..ef99a2edf87 100644
--- a/security/openssl/files/patch-netbsd-1.4.2
+++ b/security/openssl/files/patch-netbsd-1.4.2
@@ -1,4 +1,4 @@
-$NetBSD: patch-netbsd-1.4.2,v 1.1 2002/08/15 19:22:11 fredb Exp $
+$NetBSD: patch-netbsd-1.4.2,v 1.2 2002/08/25 19:23:18 jlam Exp $
Revert the addition of strlcpy() and strlcat(), for NetBSD-1.4.2.
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 668ecb5ed79..a0e88f13417 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2002/08/10 04:50:32 fredb Exp $
+$NetBSD: patch-aa,v 1.11 2002/08/25 19:23:18 jlam Exp $
--- config.orig Sun Jun 16 05:32:14 2002
+++ config
diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab
index 832c6b4da1c..fb832f12047 100644
--- a/security/openssl/patches/patch-ab
+++ b/security/openssl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ab,v 1.9 2002/08/25 19:23:18 jlam Exp $
--- crypto/opensslv.h.orig Tue Jul 30 05:34:28 2002
+++ crypto/opensslv.h
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 7d4791a7270..2b5dddb5daf 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/08/19 18:34:56 fredb Exp $
+$NetBSD: patch-ac,v 1.8 2002/08/25 19:23:18 jlam Exp $
--- Configure.orig Thu Aug 8 16:12:40 2002
+++ Configure
diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad
index c1d46b8488c..6ab9b9ae7b9 100644
--- a/security/openssl/patches/patch-ad
+++ b/security/openssl/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ad,v 1.7 2002/08/25 19:23:19 jlam Exp $
--- apps/Makefile.ssl.orig Tue Jul 30 04:29:57 2002
+++ apps/Makefile.ssl
diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae
index 99febec539e..808d4a29d36 100644
--- a/security/openssl/patches/patch-ae
+++ b/security/openssl/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2002/08/04 15:47:46 fredb Exp $
+$NetBSD: patch-ae,v 1.6 2002/08/25 19:23:19 jlam Exp $
--- tools/Makefile.ssl.orig Thu Apr 29 16:52:08 1999
+++ tools/Makefile.ssl
diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
index 0e7569c24b0..5d84ef8a886 100644
--- a/security/openssl/patches/patch-af
+++ b/security/openssl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2002/08/10 04:50:33 fredb Exp $
+$NetBSD: patch-af,v 1.6 2002/08/25 19:23:19 jlam Exp $
--- Makefile.org.orig Fri Aug 9 06:43:56 2002
+++ Makefile.org
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 01:38:17 +0000