From b95e4a49960ba7fa3ab2d54ec6fd0f9e2cd4066e Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 24 Jul 2019 12:00:27 +0300 Subject: [PATCH] libtasn1: Update to 4.14 --- libtasn1/PKGBUILD | 15 ++++++++++----- libtasn1/libtasn1-3.3-msys2.patch | 28 ++-------------------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/libtasn1/PKGBUILD b/libtasn1/PKGBUILD index 9da84d2e..0d703664 100644 --- a/libtasn1/PKGBUILD +++ b/libtasn1/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=libtasn1 pkgname=('libtasn1' 'libtasn1-devel') -pkgver=4.13 +pkgver=4.14 pkgrel=1 pkgdesc="A library for Abstract Syntax Notation One (ASN.1) and Distinguish Encoding Rules (DER) manipulation" arch=('i686' 'x86_64') @@ -11,21 +11,26 @@ url="https://www.gnu.org/software/libtasn1/" makedepends=('gcc' 'texinfo' 'make' 'patch') source=(https://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig} libtasn1-3.3-msys2.patch) -sha256sums=('7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca' +sha256sums=('9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08' 'SKIP' - 'd6934f9cc97d01df148cf879961a96cb41e8874d31b4f89d0b80247aabbc4143') + '2dc2d5e57773307f1d09656f81075f8b425ff80ef3c0c7404f9a631f92bc2bfc') validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' '1F42418905D8206AA754CCDC29EE58B996865171') prepare() { cd ${pkgname}-${pkgver} patch -p1 -i $srcdir/libtasn1-3.3-msys2.patch - autoreconf -i + autoreconf -fiv } build() { cd ${pkgname}-${pkgver} - ./configure --build=${CHOST} --prefix=/usr + ./configure \ + --build=${CHOST} \ + --prefix=/usr \ + --enable-shared \ + --enable-static + make make DESTDIR=$srcdir/dest install } diff --git a/libtasn1/libtasn1-3.3-msys2.patch b/libtasn1/libtasn1-3.3-msys2.patch index 0a068ad9..0690d8c3 100644 --- a/libtasn1/libtasn1-3.3-msys2.patch +++ b/libtasn1/libtasn1-3.3-msys2.patch @@ -29,30 +29,6 @@ diff -Naur libtasn1-3.3-orig/build-aux/config.guess libtasn1-3.3/build-aux/confi + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) + echo x86_64-unknown-msys + exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; -diff -Naur libtasn1-3.3-orig/gl/m4/malloc.m4 libtasn1-3.3/gl/m4/malloc.m4 ---- libtasn1-3.3-orig/gl/m4/malloc.m4 2013-03-24 09:16:44.000000000 +0000 -+++ libtasn1-3.3/gl/m4/malloc.m4 2013-04-25 09:54:50.157226600 +0000 -@@ -30,7 +30,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -diff -Naur libtasn1-3.3-orig/gl/m4/realloc.m4 libtasn1-3.3/gl/m4/realloc.m4 ---- libtasn1-3.3-orig/gl/m4/realloc.m4 2013-03-24 09:16:44.000000000 +0000 -+++ libtasn1-3.3/gl/m4/realloc.m4 2013-04-25 09:55:08.762695300 +0000 -@@ -30,7 +30,7 @@ - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;;