Version bump

4 files changed, 110 insertions, 1 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 5cc0d3375529..417e872943b7 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.17 2002/12/13 10:56:29 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.18 2002/12/16 14:59:14 aliz Exp $
+
+*openssl-0.9.6h (16 Dec 2002)
+
+  16 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Masked in packages.mask. NOT binary compatible with g so it will break things
+  unless you re-emerge does packages failing.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6h b/dev-libs/openssl/files/digest-openssl-0.9.6h
new file mode 100644
index 000000000000..c4b36493f441
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.6h
@@ -0,0 +1 @@
+MD5 621bef36ad61012bb71945a1cb449073 openssl-0.9.6h.tar.gz 2178290
diff --git a/dev-libs/openssl/files/openssl-0.9.6h-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6h-gentoo.diff
new file mode 100644
index 000000000000..4a1632f50a4f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6h-gentoo.diff
@@ -0,0 +1,48 @@
+diff -r -c -C 2 openssl-0.9.6g-orig/crypto/des/fcrypt.c openssl-0.9.6g/crypto/des/fcrypt.c
+*** openssl-0.9.6g-orig/crypto/des/fcrypt.c	Thu Sep 26 15:20:47 2002
+--- openssl-0.9.6g/crypto/des/fcrypt.c	Thu Sep 26 15:21:24 2002
+***************
+*** 62,66 ****
+  	DES_LONG Eswap0, DES_LONG Eswap1);
+  
+! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
+  char *crypt(const char *buf, const char *salt)
+  	{
+--- 62,66 ----
+  	DES_LONG Eswap0, DES_LONG Eswap1);
+  
+! #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN) && !defined(__GLIBC__)
+  char *crypt(const char *buf, const char *salt)
+  	{
+diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile openssl-0.9.6g/test/Makefile
+*** openssl-0.9.6g-orig/test/Makefile	Thu Sep 26 15:20:47 2002
+--- openssl-0.9.6g/test/Makefile	Thu Sep 26 15:23:26 2002
+***************
+*** 28,32 ****
+  DLIBCRYPTO= ../libcrypto.a
+  DLIBSSL= ../libssl.a
+! LIBCRYPTO= -L.. -lcrypto
+  LIBSSL= -L.. -lssl
+  
+--- 28,32 ----
+  DLIBCRYPTO= ../libcrypto.a
+  DLIBSSL= ../libssl.a
+! LIBCRYPTO= -L.. -lcrypto -lcrypt
+  LIBSSL= -L.. -lssl
+  
+diff -r -c -C 2 openssl-0.9.6g-orig/test/Makefile.ssl openssl-0.9.6g/test/Makefile.ssl
+*** openssl-0.9.6g-orig/test/Makefile.ssl	Thu Sep 26 15:20:47 2002
+--- openssl-0.9.6g/test/Makefile.ssl	Thu Sep 26 15:23:26 2002
+***************
+*** 28,32 ****
+  DLIBCRYPTO= ../libcrypto.a
+  DLIBSSL= ../libssl.a
+! LIBCRYPTO= -L.. -lcrypto
+  LIBSSL= -L.. -lssl
+  
+--- 28,32 ----
+  DLIBCRYPTO= ../libcrypto.a
+  DLIBSSL= ../libssl.a
+! LIBCRYPTO= -L.. -lcrypto -lcrypt
+  LIBSSL= -L.. -lssl
+  
diff --git a/dev-libs/openssl/openssl-0.9.6h.ebuild b/dev-libs/openssl/openssl-0.9.6h.ebuild
new file mode 100644
index 000000000000..a7e62585a9a7
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.6h.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6h.ebuild,v 1.1 2002/12/16 14:59:14 aliz Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+SRC_URI="http://www.openssl.org/source/${P}.tar.gz"
+HOMEPAGE="http://www.openssl.org/"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND} >=sys-devel/perl-5"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc "
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+
+	cp Configure Configure.orig
+	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
+}
+
+src_compile() {
+	./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+	# i think parallel make has problems
+	make all || die
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
+	dodoc CHANGES* FAQ LICENSE NEWS README
+	dodoc doc/*.txt
+	dohtml doc/*
+	insinto /usr/share/emacs/site-lisp
+	doins doc/c-indentation.el
+
+	# The man pages rand.3 and passwd.1 conflict with other packages
+	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
+	cd ${D}/usr/share/man/man1
+	mv passwd.1 ssl-passwd.1
+	ln -sf ssl-passwd.1 openssl-passwd.1
+	cd ${D}/usr/share/man/man3
+	mv rand.3 ssl-rand.3
+	ln -sf ssl-rand.3 openssl-rand.3
+
+	# create the certs directory.  Previous openssl builds
+	# would need to create /usr/lib/ssl/certs but this looks
+	# to be the more FHS compliant setup... -raker
+	dodir /etc/ssl/certs
+
+}
+