Date: Thursday, March 4, 2010 @ 17:09:11 Author: pierre Revision: 71159
upgpkg: openssl 0.9.8m-2 fix decoding problem with encfs Added: openssl/trunk/openssl-0.9.8m-cfb.patch Modified: openssl/trunk/PKGBUILD --------------------------+ PKGBUILD | 16 +++++++++++----- openssl-0.9.8m-cfb.patch | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-03-04 21:36:29 UTC (rev 71158) +++ PKGBUILD 2010-03-04 22:09:11 UTC (rev 71159) @@ -3,7 +3,7 @@ pkgname=openssl pkgver=0.9.8m -pkgrel=1 +pkgrel=2 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='http://www.openssl.org' @@ -12,20 +12,21 @@ optdepends=('ca-certificates') options=('!makeflags') backup=('etc/ssl/openssl.cnf') -# fix_manpages.patch from http://www.linuxfromscratch.org/patches/blfs/svn/ source=("http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz" 'openssl-0.9.8l-fix_manpages-1.patch' 'openssl-0.9.8a-no-rpath.patch' - 'openssl-0.9.8m-ca-dir.patch') + 'openssl-0.9.8m-ca-dir.patch' + 'openssl-0.9.8m-cfb.patch') md5sums=('898bf125370926d5f692a2201124f8ec' '04a6a88c2ee4badd4f8649792b73eaf3' '4738d1eaff4e9975e9a26e4f76e48318' - '1216688f46de6948ed2175e58e75c043') + '1216688f46de6948ed2175e58e75c043' + 'd7ead9cc459e5d0233d5b1e1d24380a7') build() { cd $srcdir/$pkgname-$pkgver - # avoid conflicts with other man pages + # avoid conflicts with other man pages: http://www.linuxfromscratch.org/patches/blfs/svn/ patch -p1 -i $srcdir/openssl-0.9.8l-fix_manpages-1.patch # remove rpath: http://bugs.archlinux.org/task/14367 patch -p1 -i $srcdir/openssl-0.9.8a-no-rpath.patch @@ -34,6 +35,11 @@ # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./config --prefix=/usr --openssldir=/etc/ssl shared zlib -Wa,--noexecstack + # see http://bugs.archlinux.org/task/18564 + # and http://cvs.openssl.org/chngview?cn=19336 + # will be in 0.9.8n + patch -p0 -i $srcdir/openssl-0.9.8m-cfb.patch || return 1 + make || return 1 # the test fails due to missing write permissions in /etc/ssl Added: openssl-0.9.8m-cfb.patch =================================================================== --- openssl-0.9.8m-cfb.patch (rev 0) +++ openssl-0.9.8m-cfb.patch 2010-03-04 22:09:11 UTC (rev 71159) @@ -0,0 +1,15 @@ +--- crypto/evp/evp_locl.h 2010/02/15 19:40:45 1.10.2.7 ++++ crypto/evp/evp_locl.h 2010/02/26 14:41:38 1.10.2.8 +@@ -127,9 +127,9 @@ + #define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \ + iv_len, cbits, flags, init_key, cleanup, \ + set_asn1, get_asn1, ctrl) \ +-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, \ +- (cbits + 7)/8, key_len, iv_len, \ +- flags, init_key, cleanup, set_asn1, get_asn1, ctrl) ++BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \ ++ key_len, iv_len, flags, init_key, cleanup, set_asn1, \ ++ get_asn1, ctrl) + + #define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \ + iv_len, cbits, flags, init_key, cleanup, \