diff --git a/cyrus-sasl-2.1.22-gcc44.patch b/cyrus-sasl-2.1.22-gcc44.patch new file mode 100644 index 0000000..381c618 --- /dev/null +++ b/cyrus-sasl-2.1.22-gcc44.patch @@ -0,0 +1,22 @@ +Index: plugins/digestmd5.c +=================================================================== +--- plugins/digestmd5.c.orig 2006-05-17 18:46:17.000000000 +0200 ++++ plugins/digestmd5.c 2009-03-02 21:00:49.000000000 +0100 +@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 1b9f7e9..bec36d9 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 21:28:09 CET 2009 - crrodriguez@suse.de + +- fix build with GCC 4.4 +- remove all "la" files + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 7494555..4b8ba3f 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd (Version 2.1.22) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Provides: cyrus-sasl:/usr/sbin/saslauthd Provides: cyrus-sasl2:/usr/sbin/saslauthd Summary: The SASL Authentication Server Version: 2.1.22 -Release: 182 +Release: 183 Source: cyrus-sasl-%{version}.tar.bz2 Source1: cyrus-sasl-rc.tar.bz2 Patch: cyrus-sasl-%{version}.dif @@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/sasl2/libldapdb.so* %changelog +* Mon Mar 02 2009 crrodriguez@suse.de +- fix build with GCC 4.4 +- remove all "la" files * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index 1b9f7e9..bec36d9 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 21:28:09 CET 2009 - crrodriguez@suse.de + +- fix build with GCC 4.4 +- remove all "la" files + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 3a78ebc..b3d9393 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl (Version 2.1.22) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: cyrus-sasl Version: 2.1.22 -Release: 173 +Release: 174 BuildRequires: db-devel krb5-devel openssl-devel opie pam-devel Obsoletes: cyrus-sasl2 <= %{version} Provides: cyrus-sasl2 = %{version} @@ -41,6 +41,7 @@ Patch: cyrus-sasl-%{version}.dif Patch1: shared_link_on_ppc.patch Patch2: cyrus-sasl-gcc4.patch Patch3: cyrus-sasl-implicitfunc.dif +Patch4: cyrus-sasl-2.1.22-gcc44.patch PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -211,7 +212,7 @@ Authors: tech-transfer@andrew.cmu.edu %prep -%setup -n cyrus-sasl-%{version} -a 1 +%setup -q -n cyrus-sasl-%{version} -a 1 if [ -e %{_builddir}/%{name}-%{version}/dlcompat-*/ ] then echo "dlcompat contains potential legal risks." @@ -221,6 +222,7 @@ fi %patch1 %patch2 %patch3 -p1 +%patch4 %build find . -name \*.cvsignore -print0 | xargs -0 rm -fv @@ -240,12 +242,9 @@ autoconf cd - export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" export CPPFLAGS=-I/usr/include/heimdal -./configure --libdir=%{_libdir} \ - --with-plugindir=%{_libdir}/sasl2 \ - --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=%{_mandir} \ +%configure --with-pic \ + --with-plugindir=%{_libdir}/sasl2 \ + --with-configdir=/etc/sasl2/:%{_libdir}/sasl2 \ --with-saslauthd=/var/run/sasl2/ \ --enable-pam \ --enable-sample \ @@ -255,7 +254,7 @@ export CPPFLAGS=-I/usr/include/heimdal --enable-krb4=no \ --enable-sql=no \ --with-devrandom=/dev/urandom -make sasldir=%{_libdir}/sasl2 +%{__make} %{?jobs:-j%jobs} sasldir=%{_libdir}/sasl2 %install make DESTDIR=$RPM_BUILD_ROOT sasldir=%{_libdir}/sasl2 install @@ -274,7 +273,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/* rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/saslauthd* rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd rm -f $RPM_BUILD_ROOT/usr/sbin/testsaslauthd -find $RPM_BUILD_ROOT/%{_libdir}/sasl2 -name "*.la" | xargs rm -f +find $RPM_BUILD_ROOT -type f -name "*.la" -exec %{__rm} -fv {} + %post -p /sbin/ldconfig @@ -329,9 +328,11 @@ rm -rf $RPM_BUILD_ROOT /usr/include/sasl %doc %{_mandir}/man3/sasl_*.gz %{_libdir}/libsasl2.so -%{_libdir}/libsasl2.la %changelog +* Mon Mar 02 2009 crrodriguez@suse.de +- fix build with GCC 4.4 +- remove all "la" files * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293)