[Frugalware-git] wipv: krb5-1.7-6-i686

[VÖRÖSKŐI András]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=06bf1d21b6b64e0bdb30868288505c50a35a6632

commit 06bf1d21b6b64e0bdb30868288505c50a35a6632
Author: VÖRÖSKŐI András <voros...@frugalware.org>
Date:   Sat Jun 26 17:35:29 2010 +0200

krb5-1.7-6-i686

rebuilt with openssl>=1.0.0

diff --git a/source/lib-extra/krb5/FrugalBuild 
b/source/lib-extra/krb5/FrugalBuild
index 1c6dfe9..794b620 100644
--- a/source/lib-extra/krb5/FrugalBuild
+++ b/source/lib-extra/krb5/FrugalBuild
@@ -3,11 +3,11 @@

pkgname=krb5
pkgver=1.7
-pkgrel=5
+pkgrel=6
pkgdesc="Kerberos: The Network Authentication Protocol"
url="http://web.mit.edu/kerberos/";
license="MIT licence"
-depends=('e2fsprogs' 'db')
+depends=('e2fsprogs' 'db' 'openssl>=1.0.0')
makedepends=('perl')
#makedepends=('postgresql>=8.2.1' 'mysql>=5.1.34')
rodepends=("libkrb5=$pkgver")
@@ -15,9 +15,10 @@ archs=('i686' 'ppc' 'x86_64')
groups=('lib-extra')
up2date="echo $pkgver"
source=(http://web.mit.edu/kerberos/dist/$pkgname/$pkgver/$pkgname-$pkgver-signed.tar
 \
-       CVE-2010-0628.patch)
+       CVE-2010-0628.patch openssl.diff)
sha1sums=('0fe1b1cf9f8d4f5f5d7fdaf89326baf5c5adbc66' \
-          'cf5c69909e5f1edc745f222f62f6dc676a150778')
+          'cf5c69909e5f1edc745f222f62f6dc676a150778' \
+          'b35d8c4ec016d49a015f002e9345c23ae31126d2')
#signature=($source.asc)
#signatures=(http://web.mit.edu/kerberos/www/$pkgname-$pkgver/$pkgname-$pkgver.sig)

diff --git a/source/lib-extra/krb5/openssl.diff 
b/source/lib-extra/krb5/openssl.diff
new file mode 100644
index 0000000..3a265c7
--- /dev/null
+++ b/source/lib-extra/krb5/openssl.diff
@@ -0,0 +1,16 @@
+diff -u -N -r22534 -r22871
+--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 
(.../pkinit_crypto_openssl.c)   (revision 22534)
++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 
(.../pkinit_crypto_openssl.c)   (revision 22871)
+@@ -3624,7 +3624,11 @@
+     if (buf == NULL)
+       goto cleanup;
+
+-    retval = EVP_PKEY_decrypt(buf, data, (int)data_len, pkey);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    retval = EVP_PKEY_decrypt_old(buf, data, (int)data_len, pkey);
++#else
++     retval = EVP_PKEY_decrypt(buf, data, (int)data_len, pkey);
++#endif
+     if (retval <= 0) {
+       pkiDebug("unable to decrypt received data (len=%d)\n", data_len);
+       goto cleanup;

_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git