diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
| commit | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (patch) | |
| tree | af56a7953cb3e5e4619535b1509b85fec5408505 /core/openssl/PKGBUILD | |
| parent | 32ead4093d89e260920e5bb604e7eeeeff26e725 (diff) | |
| parent | 85ca6bfccdec6939881572fb1154f1a07d54937c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
testing/at-spi2-core/PKGBUILD
testing/brasero/PKGBUILD
testing/brasero/brasero.install
testing/cheese/PKGBUILD
testing/cheese/cheese.install
testing/clutter/PKGBUILD
testing/eog/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/gdm-autologin.pam
testing/gdm/gdm-fingerprint.pam
testing/gdm/gdm-password.pam
testing/gdm/gdm-smartcard.pam
testing/gedit/PKGBUILD
testing/gedit/gedit.install
testing/glib-networking/PKGBUILD
testing/glib-networking/glib-networking.install
testing/gnome-online-accounts/PKGBUILD
testing/gnome-screenshot/PKGBUILD
testing/gnome-system-log/PKGBUILD
testing/gnome-system-monitor/PKGBUILD
testing/gnome-system-monitor/gnome-system-monitor.install
testing/gobject-introspection/PKGBUILD
testing/gucharmap/PKGBUILD
testing/gucharmap/gucharmap.install
testing/libsoup/PKGBUILD
testing/nautilus/PKGBUILD
testing/nautilus/nautilus.install
testing/tomboy/PKGBUILD
testing/tomboy/tomboy.install
testing/vinagre/PKGBUILD
testing/vinagre/vinagre.install
testing/vino/PKGBUILD
testing/vino/vino.install
Diffstat (limited to 'core/openssl/PKGBUILD')
| -rw-r--r-- | core/openssl/PKGBUILD | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 4835d5941..9cf6d19c7 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $ +# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl @@ -6,7 +6,7 @@ _ver=1.0.1 # use a pacman compatible version scheme # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgver=$_ver -pkgrel=2 +pkgrel=3 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64' 'mips64el') url='https://www.openssl.org' @@ -20,13 +20,15 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'no-rpath.patch' 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch' - 'disable-tls12-client.patch') + 'disable-tls12-client.patch' + 'vpaes.patch') md5sums=('134f168bc2a8333f19f81d684841710b' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' 'd7115f0cc44df346d7b68c681819f94b' '3bf51be3a1bbd262be46dc619f92aa90' - '26432b9d7af63c63828b6405c9185400') + '26432b9d7af63c63828b6405c9185400' + '55ad53e8ec3db1db6978af55e3ce1b5d') build() { cd $srcdir/$pkgname-$_ver @@ -40,6 +42,8 @@ build() { 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 |