From 34a6e1e2b4ca7fb8ffe973951031f9b925bf0462 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 11 Feb 2018 01:14:52 +0000
Subject: [PATCH] libtasn1: bump to 4.13, add debuginfo. (#2207)

---
 ...tasn1-4.12.recipe => libtasn1-4.13.recipe} | 24 ++++++++++++-------
 ...1-4.12.patchset => libtasn1-4.13.patchset} |  6 ++---
 2 files changed, 19 insertions(+), 11 deletions(-)
 rename dev-libs/libtasn1/{libtasn1-4.12.recipe => libtasn1-4.13.recipe} (67%)
 rename dev-libs/libtasn1/patches/{libtasn1-4.12.patchset => libtasn1-4.13.patchset} (91%)

diff --git a/dev-libs/libtasn1/libtasn1-4.12.recipe b/dev-libs/libtasn1/libtasn1-4.13.recipe
similarity index 67%
rename from dev-libs/libtasn1/libtasn1-4.12.recipe
rename to dev-libs/libtasn1/libtasn1-4.13.recipe
index 17cec423b..113df0339 100644
--- a/dev-libs/libtasn1/libtasn1-4.12.recipe
+++ b/dev-libs/libtasn1/libtasn1-4.13.recipe
@@ -4,20 +4,24 @@ DESCRIPTION="The Libtasn1 library provides Abstract Syntax Notation One \
 structures management, and Distinguished Encoding Rules (DER, as per \
 X.690) encoding and decoding functions."
 HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-COPYRIGHT="2002-2017 Free Software Foundation, Inc."
+COPYRIGHT="2002-2018 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v2.1
 	GNU GPL v3"
-REVISION="2"
-SOURCE_URI="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$portVersion.tar.gz"
-CHECKSUM_SHA256="6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753"
+REVISION="1"
+SOURCE_URI="https://ftpmirror.gnu.org/libtasn1/libtasn1-$portVersion.tar.gz"
+CHECKSUM_SHA256="7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca"
 PATCHES="libtasn1-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="6.5.5"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 4"
+
 PROVIDES="
-	libtasn1$secondaryArchSuffix = $portVersion compat >= 4
-	lib:libtasn1$secondaryArchSuffix = 6.5.4 compat >= 6
+	libtasn1$secondaryArchSuffix = $portVersionCompat
+	lib:libtasn1$secondaryArchSuffix = $libVersionCompat
 	cmd:asn1Coding$secondaryArchSuffix
 	cmd:asn1Decoding$secondaryArchSuffix
 	cmd:asn1Parser$secondaryArchSuffix
@@ -27,8 +31,8 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libtasn1${secondaryArchSuffix}_devel = $portVersion compat >= 4
-	devel:libtasn1$secondaryArchSuffix = 6.5.4 compat >= 6
+	libtasn1${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libtasn1$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libtasn1$secondaryArchSuffix == $portVersion base
@@ -49,6 +53,9 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libtasn1$secondaryArchSuffix \
+	"$libDir"/libtasn1.so.$libVersion
+
 BUILD()
 {
 	runConfigure ./configure --disable-gcc-warnings
@@ -60,6 +67,7 @@ INSTALL()
 	make install
 
 	rm $libDir/libtasn1.la
+	rm -f "$infoDir"/dir
 
 	prepareInstalledDevelLibs libtasn1
 	fixPkgconfig
diff --git a/dev-libs/libtasn1/patches/libtasn1-4.12.patchset b/dev-libs/libtasn1/patches/libtasn1-4.13.patchset
similarity index 91%
rename from dev-libs/libtasn1/patches/libtasn1-4.12.patchset
rename to dev-libs/libtasn1/patches/libtasn1-4.13.patchset
index 3f48e87e2..f5c194279 100644
--- a/dev-libs/libtasn1/patches/libtasn1-4.12.patchset
+++ b/dev-libs/libtasn1/patches/libtasn1-4.13.patchset
@@ -5,11 +5,11 @@ Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
 
 
 diff --git a/lib/libtasn1.h b/lib/libtasn1.h
-index 626b11e..06e0307 100644
+index ea26b78..d41ac8e 100644
 --- a/lib/libtasn1.h
 +++ b/lib/libtasn1.h
 @@ -47,7 +47,11 @@ extern "C"
- #define ASN1_VERSION "4.12"
+ #define ASN1_VERSION "4.13"
  
  #if defined(__GNUC__) && !defined(ASN1_INTERNAL_BUILD)
 +# if defined(__GNUC_PATCHLEVEL)
@@ -21,5 +21,5 @@ index 626b11e..06e0307 100644
  #  define _ASN1_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
  # endif
 -- 
-2.15.1
+2.16.1