From 68a6696b871225b6a59a6ece8e6b493ee2b71ae7 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Fri, 26 Oct 2018 10:15:38 +0100 Subject: [PATCH] haskell/haskell-Crypto: Updated for version 4.2.5.1. Signed-off-by: David Spencer --- haskell/haskell-Crypto/haskell-Crypto.SlackBuild | 15 ++++++++------- haskell/haskell-Crypto/haskell-Crypto.info | 8 ++++---- haskell/haskell-Crypto/slack-desc | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/haskell/haskell-Crypto/haskell-Crypto.SlackBuild b/haskell/haskell-Crypto/haskell-Crypto.SlackBuild index 6cfc2da6dd..9026dd3f81 100644 --- a/haskell/haskell-Crypto/haskell-Crypto.SlackBuild +++ b/haskell/haskell-Crypto/haskell-Crypto.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for haskell-Crypto # Copyright 2014 Google Inc, Germany +# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,7 +34,7 @@ GHC_VERSION=$(ghc --numeric-version) if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +45,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -71,16 +72,16 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup configure \ --prefix=/usr \ - --enable-shared \ - --enable-library-profiling \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ + --enable-shared \ + --enable-library-profiling \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup build @@ -101,8 +102,8 @@ cp -a CryptoHomePage.html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/haskell/haskell-Crypto/haskell-Crypto.info b/haskell/haskell-Crypto/haskell-Crypto.info index e633e3d216..ff317abcca 100644 --- a/haskell/haskell-Crypto/haskell-Crypto.info +++ b/haskell/haskell-Crypto/haskell-Crypto.info @@ -1,10 +1,10 @@ PRGNAM="haskell-Crypto" VERSION="4.2.5.1" -HOMEPAGE="http://hackage.haskell.org/package/Crypto" -DOWNLOAD="http://hackage.haskell.org/package/Crypto-4.2.5.1/Crypto-4.2.5.1.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/Crypto" +DOWNLOAD="https://hackage.haskell.org/package/Crypto-4.2.5.1/Crypto-4.2.5.1.tar.gz" MD5SUM="e1ec7d91e888107f2544064456f8eb36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="haskell-HUnit haskell-QuickCheck" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/haskell/haskell-Crypto/slack-desc b/haskell/haskell-Crypto/slack-desc index 44665faf22..3b7133d5c1 100644 --- a/haskell/haskell-Crypto/slack-desc +++ b/haskell/haskell-Crypto/slack-desc @@ -16,4 +16,4 @@ haskell-Crypto: Support for Word128, Word192 and Word256 and Beyond, PKCS5 Paddi haskell-Crypto: Various Encryption Modes e.g. Cipher Block Chaining all in one haskell-Crypto: package, with HUnit and QuickCheck tests, and examples. haskell-Crypto: -haskell-Crypto: http://hackage.haskell.org/package/Crypto +haskell-Crypto: https://hackage.haskell.org/package/Crypto