diff options
| author | fredb <fredb@pkgsrc.org> | 2002-08-15 19:22:10 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-08-15 19:22:10 +0000 |
| commit | 5677c8890c92ef17f327bb0a9c6375ba5f356721 (patch) | |
| tree | f49b1715fee3cde1cf5d010a42d89dc7487e20ed /security | |
| parent | ae89e1a1e111fc8d5a56c843fbc4ff26ca3b39f4 (diff) | |
| download | pkgsrc-5677c8890c92ef17f327bb0a9c6375ba5f356721.tar.gz | |
Revert Makefile,v.1.56, as the NetBSD patches were causing intractable
problems for Solaris. Instead, handle patch for NetBSD-1.4.2 specially.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 25 | ||||
| -rw-r--r-- | security/openssl/distinfo | 3 | ||||
| -rw-r--r-- | security/openssl/files/patch-netbsd-1.4.2 (renamed from security/openssl/patches/patch-ag) | 4 |
3 files changed, 20 insertions, 12 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index f20d2bb5c38..390b81d832b 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2002/08/10 11:08:18 fredb Exp $ +# $NetBSD: Makefile,v 1.57 2002/08/15 19:22:10 fredb Exp $ DISTNAME= openssl-0.9.6g SVR4_PKGNAME= ossl @@ -9,9 +9,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.openssl.org/ COMMENT= Secure Socket Layer and cryptographic library -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCHFILES= openssl-0.9.6g-20020810-netbsd.patch.gz - USE_PERL5= build CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* base64-[0-9]* \ @@ -50,8 +47,22 @@ test: all .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCHFILES= openssl-0.9.6g-20020810-netbsd.patch.gz + PKG_SYSCONFDIR.${PKGBASE}?= /etc/openssl -.endif + +. if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so) +IGNORE= ${PKGNAME} requires shared object support +. endif + +# This hack goes away, once we formally de-support NetBSD-1.4.2. +. if ${OS_VERSION:M1.4.[12]} != "" +post-patch: + ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-netbsd-1.4.2 +. endif # ${OS_VERSION} matches 1.4.[12] + +.endif # ${OPSYS} == "NetBSD" .if ${OPSYS} == "Darwin" LD_PATH_VARNAME= DYLD_LIBRARY_PATH @@ -59,10 +70,6 @@ LD_PATH_VARNAME= DYLD_LIBRARY_PATH LD_PATH_VARNAME= LD_LIBRARY_PATH .endif -.if ${OPSYS} == "NetBSD" && !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so) -IGNORE= ${PKGNAME} requires shared object support -.endif - .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES DEPENDS= rsaref-2.0p3:../../security/rsaref CONFIGURE_ARGS+= rsaref diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 070e093db7c..40f27857351 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2002/08/10 04:50:32 fredb Exp $ +$NetBSD: distinfo,v 1.12 2002/08/15 19:22:10 fredb Exp $ SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes @@ -10,4 +10,3 @@ SHA1 (patch-ac) = 7d63a98d7df20065da443084f41413eb98911b14 SHA1 (patch-ad) = ee8283d5537edce1bb60470c616ebabfda0aa084 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288 SHA1 (patch-af) = fd470396c5f54ea2d333df44504c03e7c6c8dc96 -SHA1 (patch-ag) = be064cc8207512e91bccfe7968758b88cb29e966 diff --git a/security/openssl/patches/patch-ag b/security/openssl/files/patch-netbsd-1.4.2 index 014f0b494e7..50980767ad3 100644 --- a/security/openssl/patches/patch-ag +++ b/security/openssl/files/patch-netbsd-1.4.2 @@ -1,4 +1,6 @@ -$NetBSD: patch-ag,v 1.6 2002/08/10 04:50:33 fredb Exp $ +$NetBSD: patch-netbsd-1.4.2,v 1.1 2002/08/15 19:22:11 fredb Exp $ + +Revert the addition of strlcpy() and strlcat(), for NetBSD-1.4.2. --- crypto/rand/randfile.c.orig Fri Aug 9 22:31:54 2002 +++ crypto/rand/randfile.c |