diff options
| author |   Eray Aslan <eras@gentoo.org> | 2012-11-20 12:06:16 +0000 |
|---|---|---|
| committer | Eray Aslan <eras@gentoo.org> | 2012-11-20 12:06:16 +0000 |
| commit | e42da299e5bda980df718d15f7233f55eb641e23 (patch) | |
| tree | 3e57bd6d910a8dc41f0decdfc07800f9336a44e7 /mail-filter/opendkim | |
| parent | Remove reduntant inherit of eutils eclass (diff) | |
| download | gentoo-2-e42da299e5bda980df718d15f7233f55eb641e23.tar.gz gentoo-2-e42da299e5bda980df718d15f7233f55eb641e23.tar.bz2 gentoo-2-e42da299e5bda980df718d15f7233f55eb641e23.zip | |
Fix building on upgrade - bug #443920
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'mail-filter/opendkim')
| -rw-r--r-- | mail-filter/opendkim/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-filter/opendkim/files/opendkim-2.7.2-strl.patch | 37 | ||||
| -rw-r--r-- | mail-filter/opendkim/opendkim-2.7.2.ebuild | 3 |
3 files changed, 44 insertions, 2 deletions
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog index 0cb37483a9a4..314f05dbde67 100644 --- a/mail-filter/opendkim/ChangeLog +++ b/mail-filter/opendkim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-filter/opendkim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.51 2012/11/17 13:45:36 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.52 2012/11/20 12:06:16 eras Exp $ + + 20 Nov 2012; Eray Aslan <eras@gentoo.org> +files/opendkim-2.7.2-strl.patch, + opendkim-2.7.2.ebuild: + Fix building on upgrade - bug #443920 *opendkim-2.7.2 (17 Nov 2012) diff --git a/mail-filter/opendkim/files/opendkim-2.7.2-strl.patch b/mail-filter/opendkim/files/opendkim-2.7.2-strl.patch new file mode 100644 index 000000000000..aded4edd0bea --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.7.2-strl.patch @@ -0,0 +1,37 @@ +--- configure.ac 2012-11-14 18:08:45.000000000 +0000 ++++ configure.ac 2012-11-20 11:12:58.482147975 +0000 +@@ -186,18 +186,22 @@ + libstrl_found="no" + AC_CHECK_FUNCS([strlcat strlcpy], [strl_found="yes"], + [ +- saved_LIBS="$LIBS" +- LIBS="" +- AC_SEARCH_LIBS([strlcat], +- [strl], +- [libstrl_found="yes"], +- [strl_found="no"]) +- AC_SEARCH_LIBS([strlcpy], +- [strl], +- [libstrl_found="yes"], +- [strl_found="no"]) +- STRL_LIBS="$LIBS" +- LIBS="$saved_LIBS" ++ AC_CHECK_HEADERS([strl.h], ++ [ ++ saved_LIBS="$LIBS" ++ LIBS="" ++ AC_SEARCH_LIBS([strlcat], ++ [strl], ++ [libstrl_found="yes"], ++ [strl_found="no"]) ++ AC_SEARCH_LIBS([strlcpy], ++ [strl], ++ [libstrl_found="yes"], ++ [strl_found="no"]) ++ STRL_LIBS="$LIBS" ++ LIBS="$saved_LIBS" ++ ], ++ [strl_found="no"]) + ]) + AM_CONDITIONAL([STRL], + [test x"$strl_found" != x"yes" -a x"$libstrl_found" != x"yes"]) diff --git a/mail-filter/opendkim/opendkim-2.7.2.ebuild b/mail-filter/opendkim/opendkim-2.7.2.ebuild index 292c389d1dba..9fbad783d7c6 100644 --- a/mail-filter/opendkim/opendkim-2.7.2.ebuild +++ b/mail-filter/opendkim/opendkim-2.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.7.2.ebuild,v 1.1 2012/11/17 13:45:36 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.7.2.ebuild,v 1.2 2012/11/20 12:06:16 eras Exp $ EAPI=4 inherit eutils db-use autotools user @@ -59,6 +59,7 @@ src_prepare() { sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \ opendkim/tests/t-sign-ss-macro-value-file.lua || die + epatch "${FILESDIR}/${P}-strl.patch" eautoreconf } |