diff --git a/lib32-openssl/PKGBUILD b/lib32-openssl/PKGBUILD index 944c2c0..01d5314 100644 --- a/lib32-openssl/PKGBUILD +++ b/lib32-openssl/PKGBUILD @@ -1,6 +1,6 @@ _pkgbasename=openssl pkgname=lib32-$_pkgbasename -_ver=1.0.2e +_ver=1.0.2f # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -16,12 +16,11 @@ source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5' +validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491) +md5sums=('b3bf73f507172be9292ea2a8c28b659d' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') -# Matt Caswell -validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') prepare() { cd $srcdir/$_pkgbasename-$_ver @@ -33,34 +32,36 @@ prepare() { } build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd $srcdir/$_pkgbasename-$_ver + cd $srcdir/$_pkgbasename-$_ver - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ - shared zlib linux-elf "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ + shared zlib \ + linux-elf \ + "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" - make MAKEDEPPROG="${CC}" depend - make + make MAKEDEPPROG="${CC}" depend + make } check() { - cd $srcdir/$_pkgbasename-$_ver - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - patch -p0 -R -i $srcdir/ca-dir.patch - make test - patch -p0 -i $srcdir/ca-dir.patch + cd $srcdir/$_pkgbasename-$_ver + # the test fails due to missing write permissions in /etc/ssl + # revert this patch for make test + patch -p0 -R -i $srcdir/ca-dir.patch + make test + patch -p0 -i $srcdir/ca-dir.patch } package() { - cd $srcdir/$_pkgbasename-$_ver - make INSTALL_PREFIX=$pkgdir install_sw - - rm -rf "${pkgdir}"/{usr/{include,bin},etc} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" + cd $srcdir/$_pkgbasename-$_ver + make INSTALL_PREFIX=$pkgdir install_sw + + rm -rf ${pkgdir}/{usr/{include,bin},etc} + mkdir -p $pkgdir/usr/share/licenses + ln -s $_pkgbasename $pkgdir/usr/share/licenses/$pkgname }