diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index d5e62e8..551c0ac 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -39,6 +39,7 @@ Patch: cyrus-sasl.dif Patch1: shared_link_on_ppc.patch Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch +Patch7: fix-sasl-header.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,6 +72,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch3 -p1 %patch5 -p1 %patch6 +%patch7 -p1 %build find . -name \*.cvsignore -print0 | xargs -0 rm -vf diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index b21879f..2bec3c7 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 29 08:11:05 UTC 2013 - tittiatcoke@gmail.com + +- Add patch fix-sasl-header.diff to resolve build issues that + are failing due to typedef 'sasl_malloc_t' is initialized. + (see gentoo#458870, fedora#906519) + ------------------------------------------------------------------- Wed Sep 11 07:16:23 UTC 2013 - jcnengel@gmail.com diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 616b69b..130fb6a 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -43,6 +43,7 @@ Patch: cyrus-sasl.dif Patch1: shared_link_on_ppc.patch Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch +Patch7: fix-sasl-header.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -155,6 +156,7 @@ fi %patch1 %patch5 -p1 %patch6 +%patch7 -p1 %build find . -name \*.cvsignore -print0 | xargs -0 rm -fv diff --git a/fix-sasl-header.diff b/fix-sasl-header.diff new file mode 100644 index 0000000..3529ed4 --- /dev/null +++ b/fix-sasl-header.diff @@ -0,0 +1,12 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); +