Date: Thursday, December 2, 2010 @ 14:59:34
Author: pierre
Revision: 101931
upgpkg: openssl 1.0.0.c-1
upstream update
Modified:
openssl/trunk/PKGBUILD
Deleted:
openssl/trunk/fix-t1_lib.patch
------------------+
PKGBUILD | 14 +++++---------
fix-t1_lib.patch | 16 ----------------
2 files changed, 5 insertions(+), 25 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-02 19:12:09 UTC (rev 101930)
+++ PKGBUILD 2010-12-02 19:59:34 UTC (rev 101931)
@@ -2,10 +2,10 @@
# Maintainer: Pierre Schmitz <pie...@archlinux.de>
pkgname=openssl
-_ver=1.0.0b
+_ver=1.0.0c
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=1
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer
Security'
arch=('i686' 'x86_64')
url='https://www.openssl.org'
@@ -17,13 +17,11 @@
source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz";
'fix-manpages.patch'
'no-rpath.patch'
- 'ca-dir.patch'
- 'fix-t1_lib.patch')
-md5sums=('104deb3b7e6820cae6de3f49ba0ff2b0'
+ 'ca-dir.patch')
+md5sums=('ff8fb85610aef328315a9decbb2712e4'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
- '3bf51be3a1bbd262be46dc619f92aa90'
- 'e2fd8f26386defadc7d93d11c9b90e05')
+ '3bf51be3a1bbd262be46dc619f92aa90')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
@@ -38,8 +36,6 @@
patch -p0 -i $srcdir/no-rpath.patch
# set ca dir to /etc/ssl by default
patch -p0 -i $srcdir/ca-dir.patch
- # See http://cvs.openssl.org/chngview?cn=19998
- patch -p1 -i $srcdir/fix-t1_lib.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 -Wa,--noexecstack
Deleted: fix-t1_lib.patch
===================================================================
--- fix-t1_lib.patch 2010-12-02 19:12:09 UTC (rev 101930)
+++ fix-t1_lib.patch 2010-12-02 19:59:34 UTC (rev 101931)
@@ -1,16 +0,0 @@
-Index: openssl/ssl/t1_lib.c
-RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
-rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u
'/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
---- t1_lib.c 2010/11/16 13:26:24 1.64.2.15
-+++ t1_lib.c 2010/11/16 22:41:07 1.64.2.16
-@@ -779,8 +779,8 @@
- {
- if(s->session->tlsext_ecpointformatlist)
- {
-- *al = TLS1_AD_DECODE_ERROR;
-- return 0;
-+
OPENSSL_free(s->session->tlsext_ecpointformatlist);
-+ s->session->tlsext_ecpointformatlist =
NULL;
- }
- s->session->tlsext_ecpointformatlist_length = 0;
- if ((s->session->tlsext_ecpointformatlist =
OPENSSL_malloc(ecpointformatlist_length)) == NULL)
