Date: Friday, March 3, 2017 @ 12:09:41 Author: jgc Revision: 289927 upgpkg: libsasl 2.1.26-10
Add pkgconfig file Added: libsasl/trunk/fix-pkgconfig.patch Modified: libsasl/trunk/PKGBUILD ---------------------+ PKGBUILD | 14 +++++++++----- fix-pkgconfig.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-03 11:17:05 UTC (rev 289926) +++ PKGBUILD 2017-03-03 12:09:41 UTC (rev 289927) @@ -8,7 +8,7 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.26 -pkgrel=9 +pkgrel=10 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" @@ -29,7 +29,8 @@ CVE-2013-4122.patch cyrus-sasl-sql.patch cyrus-sasl-gssapi.patch - cyrus-sasl-2.1.27-openssl-1.1.0.patch) + cyrus-sasl-2.1.27-openssl-1.1.0.patch + fix-pkgconfig.patch) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' 'f45aa8c42b32e0569ab3d14a83485b37' @@ -44,7 +45,8 @@ 'c5f0ec88c584a75c14d7f402eaeed7ef' '82c0f66fdc5c1145eb48ea9116c27931' '0363b1a0337474a57b1f75f72fe88fa3' - 'c8a385bbca9bd79910c6bda3dd02845c') + 'c8a385bbca9bd79910c6bda3dd02845c' + '409727695f9f28a3c43e340232462ff6') prepare() { cd cyrus-sasl-$pkgver @@ -59,8 +61,9 @@ patch -Np0 -i ../cyrus-sasl-sql.patch patch -Np1 -i ../cyrus-sasl-gssapi.patch patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch + patch -Np1 -i ../fix-pkgconfig.patch - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 's/libmysqlclient.a/libmysqlclient.so/' -i configure.in } build() { @@ -109,7 +112,7 @@ --enable-ntlm \ --disable-passdss \ --enable-sql \ - --with-mysql \ + --with-mysql=/usr \ --with-pgsql=/usr/lib \ --with-sqlite3=/usr/lib \ --enable-ldapdb \ @@ -130,6 +133,7 @@ conflicts=('cyrus-sasl-plugins') cd cyrus-sasl-$pkgver + make DESTDIR="$pkgdir" install-pkgconfigDATA for dir in include lib sasldb plugins utils; do pushd ${dir} make DESTDIR="${pkgdir}" install Added: fix-pkgconfig.patch =================================================================== --- fix-pkgconfig.patch (rev 0) +++ fix-pkgconfig.patch 2017-03-03 12:09:41 UTC (rev 289927) @@ -0,0 +1,27 @@ +From 3f42b7d7f3ef52056c79b31529d1a5be695c74c1 Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <i...@gnome.org> +Date: Fri, 20 Nov 2015 11:16:31 +0100 +Subject: [PATCH] Fix up pkgconfig pc file + +--- + libsasl2.pc.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libsasl2.pc.in b/libsasl2.pc.in +index 40bea37..ddad76d 100644 +--- a/libsasl2.pc.in ++++ b/libsasl2.pc.in +@@ -1,8 +1,12 @@ +-libdir = @libdir@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: Cyrus SASL + Description: Cyrus SASL implementation + URL: http://www.cyrussasl.org/ + Version: @VERSION@ ++Cflags: -I${includedir} + Libs: -L${libdir} -lsasl2 + Libs.private: @LIB_DOOR@ @SASL_DL_LIB@ @LIBS@