diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-16 09:02:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-16 09:02:56 +0000 |
| commit | 70772f3b8ec25c0dc026f6c7a93900c2ffbd168b (patch) | |
| tree | 272def2d6c79dd6121a7214477aeaf335e854efe /main | |
| parent | 7e627bdde2a552773df6db0e37f1d0a1d297cdce (diff) | |
| download | aports-70772f3b8ec25c0dc026f6c7a93900c2ffbd168b.tar.bz2 aports-70772f3b8ec25c0dc026f6c7a93900c2ffbd168b.tar.xz | |
main/cyrus-sasl: handle PIC properly
Diffstat (limited to 'main')
| -rw-r--r-- | main/cyrus-sasl/APKBUILD | 6 | ||||
| -rw-r--r-- | main/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch | 27 |
2 files changed, 32 insertions, 1 deletions
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD index b8c72fb4a0..1ef87b3f79 100644 --- a/main/cyrus-sasl/APKBUILD +++ b/main/cyrus-sasl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cyrus-sasl pkgver=2.1.26 -pkgrel=1 +pkgrel=2 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)" url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" arch="all" @@ -13,6 +13,7 @@ makedepends="db-dev openssl-dev heimdal-dev autoconf automake libtool" source="ftp://ftp.cyrusimap.org/$pkgname/$pkgname-$pkgver.tar.gz saslauthd.initd + cyrus-sasl-2.1.25-avoid_pic_overwrite.patch cyrus-sasl-2.1.26-size_t.patch " @@ -72,10 +73,13 @@ libsasl() { md5sums="a7f4e5e559a0e37b3ffc438c9456e425 cyrus-sasl-2.1.26.tar.gz 30d7a8cf31448a9ad2bfa632c3ed9659 saslauthd.initd +085acdc345bcce896f3eea8956cc0892 cyrus-sasl-2.1.25-avoid_pic_overwrite.patch bcaafcbc79054e8356217213d6eda16d cyrus-sasl-2.1.26-size_t.patch" sha256sums="8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 cyrus-sasl-2.1.26.tar.gz 334ec4c797d0aeceaab08412170a5f41aeb52211df67a95b249d61d5f4908f75 saslauthd.initd +80cb9cf22b0507b503ff0cf6c5946a44eb5c3808e0a77e66d56d5a53e5e76fa7 cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b85b20bdd25b42098e07a8ba7e435f02b5cd882dcf69572c4d32de4a5e4f41bb cyrus-sasl-2.1.26-size_t.patch" sha512sums="78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 cyrus-sasl-2.1.26.tar.gz f5a33202046b51f5dcf416321838cb2d338696da68d9735e187fe1547a5bdebe988d981ab324a69c79532b6d39011bb0ea38d16852ae7577da3ceb5b49ddd8c9 saslauthd.initd +033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5 cyrus-sasl-2.1.25-avoid_pic_overwrite.patch fe4c3e6d5230eb50b9e6885129760a12e7bce316b41a3e58b2c550fa83526b91205cd827f7d1367751313559875d32982b95b024b1a22300ac5b35214e7c2b78 cyrus-sasl-2.1.26-size_t.patch" diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/main/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch new file mode 100644 index 0000000000..2e5b1750d0 --- /dev/null +++ b/main/cyrus-sasl/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch @@ -0,0 +1,27 @@ +Author: Fabian Fagerholm <fabbe@debian.org> +Description: This patch makes sure the non-PIC version of libsasldb.a, which +is created out of non-PIC objects, is not going to overwrite the PIC version, +which is created out of PIC objects. The PIC version is placed in .libs, and +the non-PIC version in the current directory. This ensures that both non-PIC +and PIC versions are available in the correct locations. +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -78,7 +78,7 @@ endif + + libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) + @echo adding static plugins and dependencies +- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) ++ $(AR) cru $@ $(SASL_STATIC_OBJS) + @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ + if test ! -f $$i; then continue; fi; . $$i; \ + for j in $$dependency_libs foo; do \ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = + EXTRA_libsasldb_a_SOURCES = + + libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) +- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) ++ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) + + |