Subject: CVS commit: pkgsrc
To: None <>
From: Johnny C. Lam <>
List: pkgsrc-changes
Date: 12/14/2004 19:24:29
Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Dec 14 19:24:29 UTC 2004

Modified Files:
	pkgsrc/mail/libesmtp: distinfo
	pkgsrc/net/openvpn-current: distinfo
	pkgsrc/security/heimdal: distinfo
	pkgsrc/security/heimdal/patches: patch-ad
Removed Files:
	pkgsrc/mail/libesmtp/patches: patch-ad
	pkgsrc/net/openvpn-current/patches: patch-aa
	pkgsrc/security/heimdal/patches: patch-ah

Log Message:
Change the way that openssl/ handles the USE_OLD_DES_API flag.
The idea is to prevent needing to patch source files for packages that
use OpenSSL for DES support by ensuring that including <openssl/des.h>
will always present the old DES API.

(1) If des_old.h exists, then we're using OpenSSL>=0.9.7, and
    <openssl/des.h> already does the right thing.

(2) If des_old.h doesn't exist, then one of two things is happening:
    (a) If <openssl/des.h> is old and (only) supports the old DES API,
	then <openssl/des.h> does the right thing.
    (b) If it's NetBSD's Special(TM) one that stripped out the old DES
	support into a separate library and header (-ldes, <des.h>),
	then we create a new header <openssl/des.h> that includes the
	system one and <des.h>.

Also modify existing packages that set USE_OLD_DES_API to simply include
<openssl/des.h> instead of either <des.h> or <openssl/des_old.h> (This
step is mostly just removing unnecessary patches).

This should fix building packages that use OpenSSL's old DES API support
on non-NetBSD systems where the built-in OpenSSL is at least 0.9.7.

To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/mail/libesmtp/distinfo
cvs rdiff -r1.2 -r0 pkgsrc/mail/libesmtp/patches/patch-ad
cvs rdiff -r1.2 -r1.3 pkgsrc/net/openvpn-current/distinfo
cvs rdiff -r1.2 -r0 pkgsrc/net/openvpn-current/patches/patch-aa
cvs rdiff -r1.8 -r1.9 pkgsrc/security/heimdal/distinfo
cvs rdiff -r1.4 -r1.5 pkgsrc/security/heimdal/patches/patch-ad
cvs rdiff -r1.1 -r0 pkgsrc/security/heimdal/patches/patch-ah
cvs rdiff -r1.7 -r1.8 pkgsrc/security/openssl/

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.