diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
| commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
| tree | a472ad2701076586f54fbd0859fe2e5c8311184b /core/openssl | |
| parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
| parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'core/openssl')
| -rw-r--r-- | core/openssl/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 0d566886c..a0343e153 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 153454 2012-03-14 16:44:04Z pierre $ +# $Id: PKGBUILD 153962 2012-03-21 06:20:46Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.0h +_ver=1.0.1 # use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +# 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') @@ -19,7 +20,8 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'no-rpath.patch' 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch') -md5sums=('a5bc483c570f2ac3758ce5c19b667fab' +md5sums=('134f168bc2a8333f19f81d684841710b' + 'efbe93c11747fed52e60567819409d8a' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' 'd7115f0cc44df346d7b68c681819f94b' @@ -41,6 +43,7 @@ build() { case "${CARCH}" in 'x86_64') openssltarget='linux-x86_64' ;; + optflags='enable-ec_nistp_64_gcc_128' 'i686') openssltarget='linux-elf' ;; 'mips64el') @@ -52,7 +55,7 @@ build() { # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 \ + shared zlib enable-md2 ${optflags} \ "${openssltarget}" \ -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" |