diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-11-30 05:41:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-11-30 05:41:15 +0000 |
| commit | d2d2c23797a0b64d03e7662fb8092a7a19be5036 (patch) | |
| tree | 391ee848f3c0f194c95829aad480be6f60c8f3d7 | |
| parent | bzcat and bunzip2 are just symlinks to bzip2 #34395 (diff) | |
| download | historical-d2d2c23797a0b64d03e7662fb8092a7a19be5036.tar.gz historical-d2d2c23797a0b64d03e7662fb8092a7a19be5036.tar.bz2 historical-d2d2c23797a0b64d03e7662fb8092a7a19be5036.zip | |
openssl 0.9.7 compile fix #34151
| -rw-r--r-- | net-misc/sslwrap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/sslwrap/files/2.0.6-openssl-0.9.7.patch | 11 | ||||
| -rw-r--r-- | net-misc/sslwrap/sslwrap-2.0.6.ebuild | 28 |
3 files changed, 29 insertions, 15 deletions
diff --git a/net-misc/sslwrap/ChangeLog b/net-misc/sslwrap/ChangeLog index caf3b6f37cf1..3ad8d283de04 100644 --- a/net-misc/sslwrap/ChangeLog +++ b/net-misc/sslwrap/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for net-misc/sslwrap # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.8 2003/02/12 08:33:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.9 2003/11/30 05:41:15 vapier Exp $ *sslwrap-2.0.6 (11 Jul 2002) + 30 Nov 2003; Mike Frysinger <vapier@gentoo.org> : + Compile fix when using openssl 0.9.7 #34151. + 10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild : Changed sed expression delimiters from / to :, closing bug #15006 by Blu3 diff --git a/net-misc/sslwrap/files/2.0.6-openssl-0.9.7.patch b/net-misc/sslwrap/files/2.0.6-openssl-0.9.7.patch new file mode 100644 index 000000000000..37ab865be44d --- /dev/null +++ b/net-misc/sslwrap/files/2.0.6-openssl-0.9.7.patch @@ -0,0 +1,11 @@ +--- s_server.c.orig 2000-10-05 22:22:52.000000000 +0400 ++++ s_server.c 2003-11-23 06:34:04.000000000 +0300 +@@ -464,7 +467,7 @@ + + if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL); + if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG); +- if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST); ++ if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE); + + if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback); + diff --git a/net-misc/sslwrap/sslwrap-2.0.6.ebuild b/net-misc/sslwrap/sslwrap-2.0.6.ebuild index 84819e3dc4ec..f720a60957c7 100644 --- a/net-misc/sslwrap/sslwrap-2.0.6.ebuild +++ b/net-misc/sslwrap/sslwrap-2.0.6.ebuild @@ -1,34 +1,34 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.6 2003/09/05 22:01:49 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6.ebuild,v 1.7 2003/11/30 05:41:15 vapier Exp $ -S=${WORKDIR}/${PN}${PV/.0./0} DESCRIPTION="TSL/SSL - Port Wrapper" -SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz - mirror://gentoo/${PN}-gentoo.tar.bz2 - http://cvs.gentoo.org/~seemant/${PN}-gentoo.tar.bz2" HOMEPAGE="http://quiltaholic.com/rickk/sslwrap/" +SRC_URI="http://quiltaholic.com/rickk/sslwrap/${PN}${PV/.0./0}.tar.gz + mirror://gentoo/${PN}-gentoo.tar.bz2" -SLOT="0" LICENSE="sslwrap" +SLOT="0" KEYWORDS="x86 sparc" DEPEND=">=dev-libs/openssl-0.9.6" +S=${WORKDIR}/${PN}${PV//.} + src_unpack () { unpack ${A} cd ${S} - cp Makefile Makefile.orig - sed -e "s:-O2:${CFLAGS}:" \ + sed -i \ + -e "s:-O2:${CFLAGS}:" \ -e "s:/usr/local/ssl/include:/usr/include/openssl:" \ - Makefile.orig > Makefile + Makefile cp ${WORKDIR}/${PN}-gentoo/*.c ${S} - - for f in *.h *.c ; do - cp ${f} ${f}.orig - sed -e "s:OPENSSL\":\"openssl\/:g" ${f}.orig > ${f} - done + has_version '=dev-libs/openssl-0.9.7*' \ + && epatch ${FILESDIR}/${PV}-openssl-0.9.7.patch + sed -i \ + -e "s:OPENSSL\":\"openssl\/:g" \ + *.h *.c } src_compile() { |