diff --git a/baselibs.conf b/baselibs.conf index 02d28a6..47837c1 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,8 @@ +libsasl2-3 cyrus-sasl cyrus-sasl-devel + requires -cyrus-sasl- + requires "libsasl2-3- = " cyrus-sasl-crammd5 cyrus-sasl-digestmd5 cyrus-sasl-gssapi diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 4ced793..d86f449 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,5 +1,33 @@ ------------------------------------------------------------------- -Sun Sep 8 21:11:27 UTC 2013 - jcnengel@googlemail.com +Sat Nov 2 20:47:58 UTC 2013 - jengelh@inai.de + +- Implement shlib packaging guidelines: make subpackage libsasl2-3. + (All other .so files are _server_ plugins AFAICS, loaded via + dlopen.) +- Ensure directories are owned by packages and thus get torn down + on package removal + +------------------------------------------------------------------- +Sat Oct 5 19:10:55 UTC 2013 - tchvatal@suse.com + +- Put back the .so files to sasl auth packages from devel file. + The .so files are read by some application instead of full path + so in order for auth to work this files must be available + +------------------------------------------------------------------- +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 + +- Removed server side service to comply with Factory rules + +------------------------------------------------------------------- +Tue Sep 3 22:07:15 UTC 2013 - jcnengel@gmail.com - Update to 2.1.26 * Modernize SASL malloc/realloc callback prototypes @@ -9,17 +37,35 @@ Sun Sep 8 21:11:27 UTC 2013 - jcnengel@googlemail.com * MINGW32 compatibility patches * Fixed broken logic in get_fqhostname() when abort_if_no_fqdn is 0 * Fixed some memory leaks in libsasl + - GSSAPI plugin: + + Fixed a segfault in gssapi.c introduced in 2.1.25. + + Code refactoring + + Added support for GSS-SPNEGO SASL mechanism (Unix only), which is also HTTP capable + - GS2 plugin: + + Updated GS2 plugin not to lose minor GSS-API status codes on errors + - DIGEST-MD5 plugin: + + Correctly send "stale" directive to prevent clients from (re)promtping for password + + Better handling of HTTP reauthentication cases + + fixed some memory leaks + - SASLDB plugin: + + Added support for BerkleyDB 5.X or later + - OTP plugin: + + Removed calling of EVP_cleanup() on plugin shutdown in order to prevent TLS from failing in calling applications + - SRP plugin: + + Removed calling of EVP_cleanup() on plugin shutdown in order to prevent TLS from failing in calling applications - saslauthd: + auth_rimap.c: qstring incorrectly appending the closing double quote, which might be causing crashes + auth_rimap.c: read the whole IMAP greeting + better error reporting from some drivers - + fixed some memory leaks + + fixed some memory leaks +- New BuildRequires for pkgconfig since pkgconfig file is generated - Removed patches that do no longer apply * cyrus-sasl-gcc4.patch (integrated upstream) * cyrus-sasl-gs2-not-overwrite-minor-error-code.dif (integrated upstream) * gssapi-null-deref.dif (integrated upstream) * Fix-abort_if_no_fqdn-behavior.patch (integrated upstream) * cyrus-sasl-db6.diff (integrated upstream) +- Move *.so files into devel package ------------------------------------------------------------------- Fri Jul 26 13:09:51 UTC 2013 - obs@botter.cc diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 0378363..3624539 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -17,20 +17,13 @@ Name: cyrus-sasl-saslauthd -BuildRequires: db-devel -BuildRequires: krb5-devel -BuildRequires: libtool -BuildRequires: mysql-devel -BuildRequires: openldap2-devel -BuildRequires: opie -BuildRequires: pam-devel -BuildRequires: postgresql-devel -Url: http://asg.web.cmu.edu/sasl/ +Version: 2.1.26 +Release: 0 Summary: The SASL Authentication Server License: BSD-4-Clause Group: Productivity/Networking/Other -Version: 2.1.26 -Release: 0 +Url: http://asg.web.cmu.edu/sasl/ + Source: ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-%{version}.tar.gz Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source @@ -42,6 +35,14 @@ Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: db-devel +BuildRequires: krb5-devel +BuildRequires: libtool +BuildRequires: mysql-devel +BuildRequires: openldap2-devel +BuildRequires: opie +BuildRequires: pam-devel +BuildRequires: postgresql-devel %description This daemon is required when using cyrus-sasl in server software that @@ -73,7 +74,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch7 -p1 %build -find . -name \*.cvsignore -print0 | xargs -0 rm -vf +find . -name "*.cvsignore" -exec rm -fv "{}" "+" autoreconf -f -i export CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS -DLDAP_DEPRECATED" %configure --with-plugindir=%{_libdir}/sasl2 \ @@ -146,10 +147,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsql.la %files -n cyrus-sasl-sqlauxprop %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libsql.so* %files -n cyrus-sasl-ldap-auxprop %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libldapdb.so* %changelog diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index d1acf54..d86f449 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Nov 2 20:47:58 UTC 2013 - jengelh@inai.de + +- Implement shlib packaging guidelines: make subpackage libsasl2-3. + (All other .so files are _server_ plugins AFAICS, loaded via + dlopen.) +- Ensure directories are owned by packages and thus get torn down + on package removal + ------------------------------------------------------------------- Sat Oct 5 19:10:55 UTC 2013 - tchvatal@suse.com diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index f58ec7f..723a476 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -17,24 +17,14 @@ Name: cyrus-sasl +%define lname libsasl2-3 Version: 2.1.26 Release: 0 -BuildRequires: db-devel -BuildRequires: krb5-mini-devel -BuildRequires: libtool -BuildRequires: openssl-devel -BuildRequires: opie -BuildRequires: pam-devel -BuildRequires: pkg-config Url: http://asg.web.cmu.edu/sasl/ -# bug437293 -%ifarch ppc64 -Obsoletes: cyrus-sasl-64bit -%endif -# Summary: Implementation of Cyrus SASL API License: BSD-4-Clause Group: Productivity/Networking/Other + Source: ftp://ftp.cyrusimap.org/%{name}/%{name}-%{version}.tar.gz Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source @@ -46,30 +36,41 @@ Patch6: cyrus-sasl-lfs.patch Patch7: fix-sasl-header.diff PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: db-devel +BuildRequires: krb5-mini-devel +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: opie +BuildRequires: pam-devel +BuildRequires: pkg-config +%ifarch ppc64 +# bug437293 +Obsoletes: cyrus-sasl-64bit +%endif %package gssapi Summary: Plugin for the GSSAPI SASL mechanism -Group: Development/Libraries/C and C++ +Group: Productivity/Networking/Other Requires: %{name} = %{version} %package crammd5 Summary: Plugin for the CRAMMD5 SASL mechanism -Group: Development/Libraries/C and C++ +Group: Productivity/Networking/Other Requires: %{name} = %{version} %package digestmd5 Summary: Plugin for the DIGESTMD5 SASL mechanism -Group: Development/Libraries/C and C++ +Group: Productivity/Networking/Other Requires: %{name} = %{version} %package otp Summary: Plugin for the OTP SASL mechanism -Group: Development/Libraries/C and C++ +Group: Productivity/Networking/Other Requires: %{name} = %{version} %package plain Summary: Plugin for the PLAIN SASL mechanism -Group: Development/Libraries/C and C++ +Group: Productivity/Networking/Other Requires: %{name} = %{version} %package ntlm @@ -95,9 +96,13 @@ Obsoletes: cyrus-sasl-devel-64bit # Summary: Cyrus SASL API Implementation, Libraries and Header Files Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %lname = %version Requires: glibc-devel +%package -n libsasl2-3 +Summary: Simple Authentication and Security Layer (SASL) library +Group: System/Libraries + %description This is the Cyrus SASL API. It can be used on the client or server side to provide authentication. See RFC 2222 for more information. @@ -145,6 +150,14 @@ This is the Cyrus SASL API implementation. It can be used on the client or server side to provide authentication. See RFC 2222 for more information. +%description -n libsasl2-3 +Simple Authentication and Security Layer (SASL) is a framework for +authentication and data security in Internet protocols. + +This is the Cyrus SASL API implementation. It can be used on the client +or server side to provide authentication. See RFC 2222 for more +information. + %prep %setup -q -n cyrus-sasl-%{version} -a 1 if [ -e %{_builddir}/%{name}-%{version}/dlcompat-*/ ] @@ -159,7 +172,7 @@ fi %patch7 -p1 %build -find . -name \*.cvsignore -print0 | xargs -0 rm -fv +find . -name "*.cvsignore" -exec rm -fv "{}" "+" autoreconf -f -i export CFLAGS="%optflags -fno-strict-aliasing" %configure --with-pic \ @@ -190,18 +203,20 @@ rm -f $RPM_BUILD_ROOT/usr/sbin/saslauthd rm -f $RPM_BUILD_ROOT/usr/sbin/testsaslauthd find "%buildroot" -type f -name "*.la" -print -delete -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%files -n %lname +%defattr(-,root,root) +%{_libdir}/libsasl2.so.3* %files %defattr(-,root,root) %dir %{_libdir}/sasl2 -%dir /etc/sasl2/ %{_libdir}/sasl2/libanonymous.so* %{_libdir}/sasl2/liblogin.so* %{_libdir}/sasl2/libsasldb.so* -%{_libdir}/libsasl2.so.* +%dir /etc/sasl2/ /usr/sbin/* /usr/bin/* %doc %{_mandir}/man3/sasl.*.gz @@ -210,40 +225,48 @@ find "%buildroot" -type f -name "*.la" -print -delete %files gssapi %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libgssapiv2.so* %files crammd5 %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libcrammd5.so* %files digestmd5 %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libdigestmd5.so* %files otp %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libotp.so* %files plain %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libplain.so* %files ntlm %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libntlm.so* %files gs2 %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libgs2.so* %files scram %defattr(-,root,root) +%dir %_libdir/sasl2/ %{_libdir}/sasl2/libscram.so* %files devel %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README doc -/usr/include/sasl +%_includedir/sasl/ %doc %{_mandir}/man3/sasl_*.gz %{_libdir}/libsasl2.so %{_libdir}/pkgconfig/*