From 7ffd26e2f442dbe97a37ff548e46d92fa95a0cf0 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 18 Nov 2009 10:46:58 +0000 Subject: [PATCH] Clifford Wolf: Subject: [PATCH 3/4] Updated wvstreams (4.6) diff --git a/package/esden/wvstreams/openssl-hotfix.patch b/package/esden/wvstreams/openssl-hotfix.patch deleted file mode 100644 index 9c78c1b..0000000 [2009090203025627766] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9494 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/esden/wvstreams/openssl-hotfix.patch | 55 -------------------- package/esden/wvstreams/wvstreams.desc | 4 +- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 package/esden/wvstreams/openssl-hotfix.patch diff --git a/package/esden/wvstreams/openssl-hotfix.patch b/package/esden/wvstreams/openssl-hotfix.patch deleted file mode 100644 index 9c78c1b75..000000000 --- a/package/esden/wvstreams/openssl-hotfix.patch +++ /dev/null @@ -1,55 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/esden/wvstreams/openssl-hotfix.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./crypto/wvx509.cc.orig 2004-11-18 15:15:05.000000000 +0100 -+++ ./crypto/wvx509.cc 2005-07-19 14:35:09.000000000 +0200 -@@ -1162,12 +1162,19 @@ - else - { - void *ext_data = NULL; -+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL -+ const unsigned char **ext_value_data; -+ ext_value_data = (const_cast -+ (&ext->value->data)); -+#else -+ unsigned char **ext_value_data = &ext->value->data; -+#endif - if (method->it) -- ext_data = ASN1_item_d2i(NULL, &ext->value->data, -+ ext_data = ASN1_item_d2i(NULL, ext_value_data, - ext->value->length, - ASN1_ITEM_ptr(method->it)); - else -- ext_data = method->d2i(NULL, &ext->value->data, -+ ext_data = method->d2i(NULL, ext_value_data, - ext->value->length); - - if (method->i2s) ---- ./crypto/wvtripledes.cc.orig 2004-11-18 15:15:05.000000000 +0100 -+++ ./crypto/wvtripledes.cc 2005-07-19 14:35:09.000000000 +0200 -@@ -102,7 +102,8 @@ - // ECB works 64bits at a time - while (len >= 8) - { --#if OPENSSL_VERSION_NUMBER >= 0x0090705FL -+#if OPENSSL_VERSION_NUMBER >= 0x0090705fL \ -+ && OPENSSL_VERSION_NUMBER < 0x0090800fL - DES_ecb3_encrypt(data, crypt, - &deskey1, &deskey2, &deskey3, - mode == ECBEncrypt ? DES_ENCRYPT : DES_DECRYPT); diff --git a/package/esden/wvstreams/wvstreams.desc b/package/esden/wvstreams/wvstreams.desc index da0ad5b96..64b5462e5 100644 --- a/package/esden/wvstreams/wvstreams.desc +++ b/package/esden/wvstreams/wvstreams.desc @@ -35,8 +35,8 @@ [L] LGPL [S] Stable -[V] 4.0.1 +[V] 4.6 [P] X --?--5---9 207.700 -[D] 4234230421 wvstreams-4.0.1.tar.gz http://open.nit.ca/download/ +[D] 3175529268 wvstreams-4.6.tar.gz http://wvstreams.googlecode.com/files/