rpms/cyrus-sasl
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 2.1.20

Browse Source 
- build with mysqlclient10 instead of mysql-devel
This commit is contained in:
Nalin Dahyabhai 2004-11-01 18:31:52 +00:00
parent 56df74c1ed
commit 9a7e009e2c
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1,3 +1,5 @@
cyrus-sasl-1.5.28.tar.gz
cyrus-sasl-2.1.19.tar.gz
db-4.2.52.tar.gz
cyrus-sasl-2.1.20.tar.gz
cyrus-sasl-2.1.20.tar.gz.sig

28
cyrus-sasl.spec
View File

@ -10,8 +10,8 @@
Summary: The Cyrus SASL library.
Name: cyrus-sasl
Version: 2.1.19
Release: 3
Version: 2.1.20
Release: 1
License: Freely Distributable
Group: System Environment/Libraries
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@ -36,19 +36,18 @@ Patch4: cyrus-sasl-1.5.28-saslauthd2.patch
%endif
Patch5: cyrus-sasl-2.1.7-gdbm.patch
Patch6: cyrus-sasl-2.1.10-des.patch
Patch7: cyrus-sasl-2.1.17-gssapi-dynamic.patch
Patch7: cyrus-sasl-2.1.20-gssapi-dynamic.patch
Patch9: cyrus-sasl-2.1.17-saslauthd1.patch
Patch10: cyrus-sasl-2.1.18-db_bundle.patch
Patch10: cyrus-sasl-2.1.20-db_bundle.patch
Patch11: cyrus-sasl-2.1.18-no_rpath.patch
Patch12: cyrus-sasl-1.5.28-env.patch
Patch13: cyrus-sasl-2.1.19-env.patch
Buildroot: %{_tmppath}/%{name}-root
%if %{includev1}
BuildPrereq: gdbm-devel
%endif
BuildPrereq: autoconf, automake, libtool
BuildPrereq: krb5-devel >= 1.2, openssl-devel, pam-devel, pkgconfig
BuildPrereq: mysql-devel, postgresql-devel
BuildPrereq: mysqlclient10-devel, postgresql-devel
Prereq: /sbin/ldconfig, chkconfig, /sbin/service
%description
@ -146,9 +145,9 @@ done
#%patch9 -p1 -b .saslauthd1
%patch10 -p1 -b .db_bundle
%patch11 -p1 -b .no_rpath
%patch13 -p1 -b .env
# FIXME - this is just weird
rm config/ltconfig config/libtool.m4
rm -fr autom4te.cache
libtoolize -f -c
aclocal -I config -I cmulocal
automake -a -c -f
@ -158,6 +157,7 @@ autoconf -f
pushd saslauthd
# FIXME - this is just weird
rm config/ltconfig
rm -fr autom4te.cache
libtoolize -f -c
aclocal -I config -I ../cmulocal -I ../config
automake -a -c -f
@ -220,7 +220,7 @@ pushd cyrus-sasl-%{cs1_version}
--enable-static --enable-staticdlopen --with-pic --enable-shared \
--with-plugindir=%{_plugindir} \
--disable-krb4 \
--enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
--enable-gssapi${krb5_prefix:+=${krb5_prefix}} --enable-gss_mutexes \
--with-rc4 \
--with-dblib=gdbm \
--with-saslauthd=/var/run/saslauthd --without-pwcheck \
@ -235,8 +235,10 @@ popd
%endif
# Find the SQL libraries used needed by the SQL auxprop plugin.
SQL_CFLAGS=`mysql_config --cflags`" -I"`pg_config --includedir`
SQL_LIBS=`mysql_config --libs`" -L"`pg_config --libdir`""
mysql_config=%{_libdir}/mysql3/mysql/mysql_config
pg_config=pg_config
SQL_CFLAGS=`${mysql_config} --cflags`" -I"`${pg_config} --includedir`
SQL_LIBS=`${mysql_config} --libs`" -L"`${pg_config} --libdir`""
SQL_CFLAGS=`eval echo "$SQL_CFLAGS" | sed -e 's,-I%{_includedir}[^/],,g' -e 's,-I%{_includedir}$,,g'`
SQL_LIBS=`eval echo "$SQL_LIBS" | sed -e 's,-L%{_libdir}[^/],,g' -e 's,-L%{_libdir}$,,g'`
SQL_LDFLAGS=`eval echo "$SQL_LIBS" | sed -e 's,-[^L][^ ]*,,g'`
@ -518,6 +520,12 @@ fi
#%{_sbindir}/saslauthd2-checkpass
%changelog
* Mon Nov 1 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-1
- build with mysqlclient10 instead of mysql-devel (#TBD)
* Wed Oct 27 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-0
- update to 2.1.20, including the fix for CAN-2004-0884
* Thu Oct 5 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-3
- use notting's fix for incorrect patch for CAN-2004-0884 for 1.5.28

4
sources
View File

@ -1,3 +1,3 @@
60710be040801e9aff7353563b636518 cyrus-sasl-1.5.28.tar.gz
ea76410ad88fa7b6c17a6aac424382c9 cyrus-sasl-2.1.19.tar.gz
cbc77517c9278cdb47613ce8cb55779f db-4.2.52.tar.gz
268ead27f4ac39bcfe17d9e38e0f2977 cyrus-sasl-2.1.20.tar.gz
d4ab532887be315f59746ab74de690a4 cyrus-sasl-2.1.20.tar.gz.sig