diff options
| author | wiz <wiz@pkgsrc.org> | 2003-04-17 12:32:32 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-04-17 12:32:32 +0000 |
| commit | f65dbbe2f2c06b59e08cef96afa58a7df184a860 (patch) | |
| tree | d4ede03c6e4b03cb3b46305c3cde09fff58e57e4 /security | |
| parent | 8d24782cfc53110124edcb07cca410012553a583 (diff) | |
| download | pkgsrc-f65dbbe2f2c06b59e08cef96afa58a7df184a860.tar.gz | |
Remove a paragraph with the following comment:
# This hack goes away, once we formally de-support NetBSD-1.4.x.
We did that half a year ago.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 14 | ||||
| -rw-r--r-- | security/openssl/files/patch-netbsd-1.4.2 | 37 |
2 files changed, 1 insertions, 50 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 814c36832c9..786dcf79577 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2003/03/21 18:40:48 seb Exp $ +# $NetBSD: Makefile,v 1.68 2003/04/17 12:32:32 wiz Exp $ DISTNAME= openssl-0.9.6g PKGREVISION= 2 @@ -58,18 +58,6 @@ PKG_SYSCONFDIR.${PKGBASE}?= /etc/openssl . if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so) PKG_FAIL_REASON= ${PKGNAME} requires shared object support . endif - -# This hack goes away, once we formally de-support NetBSD-1.4.x. -. if ${OS_VERSION:M1.4.[123]*} != "" -CONFIGURE_ARGS= no-shared --openssldir=${PKG_SYSCONFDIR} --prefix=${PREFIX} -PLIST_SRC= ${PLIST_RSAREF} ${PKGDIR}/PLIST.common - -. 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 # ${OS_VERSION} matches 1.4.[123] - .endif # ${OPSYS} == "NetBSD" .if ${OPSYS} == "Darwin" diff --git a/security/openssl/files/patch-netbsd-1.4.2 b/security/openssl/files/patch-netbsd-1.4.2 deleted file mode 100644 index ef99a2edf87..00000000000 --- a/security/openssl/files/patch-netbsd-1.4.2 +++ /dev/null @@ -1,37 +0,0 @@ -$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. - ---- crypto/rand/randfile.c.orig Fri Aug 9 22:31:54 2002 -+++ crypto/rand/randfile.c -@@ -225,9 +225,10 @@ - - if (OPENSSL_issetugid() == 0) - s=getenv("RANDFILE"); -- if (s != NULL && *s && strlen(s) + 1 < size) -+ if (s != NULL) - { -- strlcpy(buf,s,size); -+ strncpy(buf,s,size-1); -+ buf[size-1]='\0'; - ret=buf; - } - else -@@ -240,13 +241,13 @@ - s = DEFAULT_HOME; - } - #endif -- if (s != NULL && *s && (strlen(s)+strlen(RFILE)+2 < size)) -+ if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size)) - { -- strlcpy(buf,s,size); -+ strcpy(buf,s); - #ifndef VMS -- strlcat(buf,"/",size); -+ strcat(buf,"/"); - #endif -- strlcat(buf,RFILE,size); -+ strcat(buf,RFILE); - ret=buf; - } - else |