diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-21 10:14:45 +0200 |
| commit | 564593462ea4dd96fbe4842469b7a0da920a13f2 (patch) | |
| tree | 18b2e3b9ece473535048dc17c7282662427e6108 /core/openssl | |
| parent | 81cc989543d935f11be84b3fb0696a57c2d9abd2 (diff) | |
| parent | 905dec08e7144fe77aad1161778a6c3b74ff305c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
extra/scim/PKGBUILD
extra/vim/PKGBUILD
testing/cogl/PKGBUILD
testing/kmod/PKGBUILD
testing/rhythmbox/PKGBUILD
Diffstat (limited to 'core/openssl')
| -rw-r--r-- | core/openssl/PKGBUILD | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 9cf6d19c7..0ba2aaa30 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z pierre $ +# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1 +_ver=1.0.1a # use a pacman compatible version scheme -# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgver=$_ver -pkgrel=3 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +#pkgver=$_ver +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64' 'mips64el') url='https://www.openssl.org' @@ -18,17 +18,11 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' - 'gnu-linux-mips64el-gcc.patch' - 'ca-dir.patch' - 'disable-tls12-client.patch' - 'vpaes.patch') -md5sums=('134f168bc2a8333f19f81d684841710b' + 'ca-dir.patch') +md5sums=('a0104320c0997cd33e18b8ea798609d1' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - 'd7115f0cc44df346d7b68c681819f94b' - '3bf51be3a1bbd262be46dc619f92aa90' - '26432b9d7af63c63828b6405c9185400' - '55ad53e8ec3db1db6978af55e3ce1b5d') + '3bf51be3a1bbd262be46dc619f92aa90') build() { cd $srcdir/$pkgname-$_ver @@ -40,12 +34,6 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - # workaround for PR#2771 - patch -p1 -i $srcdir/disable-tls12-client.patch - # fix for PR#2775 - patch -p1 -i $srcdir/vpaes.patch - -# patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch case "${CARCH}" in 'x86_64') @@ -54,9 +42,6 @@ build() { 'i686') openssltarget='linux-elf' ;; 'mips64el') -# ./config - # Broken. - # openssltarget='gnu-linux-mips64el-gcc' ;; openssltarget='linux-generic32' ;; esac |