fixing a couple of bugs

5 files changed, 117 insertions, 24 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6a652bfd932e..56108a837a87 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.44 2003/09/16 22:09:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.45 2003/09/17 12:14:44 aliz Exp $
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7b-r2.euild :
+  Closing #12971 and #25461. Removing from packages.mask
 
 *openssl-0.9.7b-r2 (16 Sep 2003)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 6be64420fa91..c5a3f6f726f5 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,12 +1,14 @@
 MD5 f8e8af9137d62aef01abc127aa315a95 openssl-0.9.7b-r1.ebuild 2873
 MD5 7c732dae05a3589d0fef59bb8e29a6de openssl-0.9.6i-r2.ebuild 2934
-MD5 338f680c97d21150f061b939051a7ad8 openssl-0.9.7b-r2.ebuild 4137
+MD5 3b9b1b205b4ab46d7a516a6c32387406 openssl-0.9.7b-r2.ebuild 4348
 MD5 f02c69b1a1f0c0636a4302ac9c080dee openssl-0.9.7b.ebuild 2872
-MD5 cc0674a3e1597bf82f929a25b59f3954 ChangeLog 7727
+MD5 1188287e38eb9339aa46e43df626b60c ChangeLog 7859
 MD5 547394e575d93b1b3e0d84438e10a845 openssl-0.9.6j.ebuild 2614
 MD5 55db5f2d56b9146b7d7cae1353a0e0c4 files/digest-openssl-0.9.7b-r2 134
 MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
 MD5 ec3ece282da08b6e27d213ee22c00208 files/digest-openssl-0.9.7b-r1 67
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7b-gentoo.diff 936
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
 MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
 MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6i-gentoo.diff 1591
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
diff --git a/dev-libs/openssl/files/openssl-0.9.6j-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.6j-gentoo.diff
new file mode 100644
index 000000000000..4a1632f50a4f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.6j-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/files/openssl-0.9.7b-gentoo.diff b/dev-libs/openssl/files/openssl-0.9.7b-gentoo.diff
new file mode 100644
index 000000000000..501a946d7b2c
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7b-gentoo.diff
@@ -0,0 +1,32 @@
+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.7b-r2.ebuild b/dev-libs/openssl/openssl-0.9.7b-r2.ebuild
index b666f4f72b36..c38ba456b038 100644
--- a/dev-libs/openssl/openssl-0.9.7b-r2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7b-r2.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2003 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.7b-r2.ebuild,v 1.1 2003/09/16 22:09:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7b-r2.ebuild,v 1.2 2003/09/17 12:14:44 aliz Exp $
 
-inherit eutils
+inherit eutils flag-o-matic gcc
 
-OLD_096_PV="0.9.6j"
+if [ "$( gcc-fullversion )" == "3.3" ]; then
+	filter-flags "-fprefetch-loop-arrays"
+fi
+
+OLD_096_P="${PN}-0.9.6j"
 
 S=${WORKDIR}
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
 SRC_URI="mirror://openssl/source/${P}.tar.gz
-	mirror://openssl/source/${PN}-${OLD_096_PV}.tar.gz"
+	mirror://openssl/source/${OLD_096_P}.tar.gz"
 HOMEPAGE="http://www.openssl.org/"
 
 RDEPEND="virtual/glibc"
@@ -27,7 +31,7 @@ src_unpack() {
 	# openssl-0.9.7
 	cd ${WORKDIR}/${P}
 
-	epatch ${FILESDIR}/${PN}-0.9.7a-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	if [ "${ARCH}" = "hppa" ]; then
 	sed -i -e \
@@ -46,9 +50,9 @@ src_unpack() {
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
-		cd ${WORKDIR}/${PN}-${OLD_096_PV}
+		cd ${WORKDIR}/${OLD_096_P}
 
-	        epatch ${FILESDIR}/openssl-0.9.6i-gentoo.diff
+	        epatch ${FILESDIR}/${OLD_096_P}-gentoo.diff
 
 		case ${ARCH} in
 		mips)
@@ -79,7 +83,7 @@ src_compile() {
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
-		cd ${WORKDIR}/${PN}-${OLD_096_PV}
+		cd ${WORKDIR}/${OLD_096_P}
 
 		if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
 			SSH_TARGET="linux-sparcv8"
@@ -103,7 +107,7 @@ src_compile() {
 			./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
 		fi
 
-		einfo "Compiling ${PN}-${OLD_096_PV}"
+		einfo "Compiling ${OLD_096_P}"
 		make all || die
 	}
 }
@@ -118,6 +122,13 @@ src_install() {
 	insinto /usr/share/emacs/site-lisp
 	doins doc/c-indentation.el
 
+	# 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
+	insinto /etc/ssl/certs
+	doins certs/*.pem
+	OPENSSL=${D}/usr/bin/openssl /usr/bin/perl tools/c_rehash ${D}/etc/ssl/certs
+
 	# 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
@@ -127,22 +138,19 @@ src_install() {
 	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
-
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
-		dolib.so ${WORKDIR}/${PN}-${OLD_096_PV}/libcrypto.so.0.9.6
-		dolib.so ${WORKDIR}/${PN}-${OLD_096_PV}/libssl.so.0.9.6
+		dolib.so ${WORKDIR}/${OLD_096_P}/libcrypto.so.0.9.6
+		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6
 	}
 }
 
 pkg_postinst() {
-	einfo "You can now re-compile all packages that are linked against"
-	einfo "OpenSSL 0.9.6 by using revdep-rebuild from gentoolkit:"
-	einfo "# revdep-rebuild --soname libssl.so.0.9.6"
-	einfo "# revdep-rebuild --soname libcrypto.so.0.9.6"
-	einfo "After this, you can delete /usr/lib/libssl.so.0.9.6 and /usr/lib/libcrypto.so.0.9.6"
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		einfo "You can now re-compile all packages that are linked against"
+		einfo "OpenSSL 0.9.6 by using revdep-rebuild from gentoolkit:"
+		einfo "# revdep-rebuild --soname libssl.so.0.9.6"
+		einfo "# revdep-rebuild --soname libcrypto.so.0.9.6"
+		einfo "After this, you can delete /usr/lib/libssl.so.0.9.6 and /usr/lib/libcrypto.so.0.9.6"
+	}
 }