X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-sasl.spec;h=a485be35db03b90f4ab5d1ea6a00b2f45cb8eae6;hb=b4e496d2d008667bd3be29ef2887db3e5485e978;hp=54765c671e12de7fd6915ea6d10ae56224329793;hpb=54dc5388bf8f9244ff7f940c63a6242bb7d43037;p=packages%2Fcyrus-sasl.git

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 54765c6..a485be3 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,59 +1,70 @@
-#
 # TODO:
 # - add ldap plugin from openldap sources
 #
 # Conditional build:
-%bcond_without	ldap	# disable LDAP support for saslauthd
-%bcond_without	gssapi	# do not enable GSSAPI support for saslauthd and build gssapi plugin
-%bcond_without	mysql	# don't build MySQL pluggin
-%bcond_without	pgsql	# do not build PostgreSQL pluggin
-%bcond_without	sqlite	# do not enable sqlite plugin
-%bcond_with	opie	# enable opie plugin
-%bcond_with	srp	# build srp pluggin
-%bcond_with	pwcheck	# build pwcheck helper (deprecated)
-%bcond_with	x509	# build x509 plugin (no sources in package???)
+%bcond_without	cryptedpw	# if you keep crypted passwords in your *sql
+%bcond_without	ldap		# disable LDAP support for saslauthd
+%bcond_without	gssapi		# do not enable GSSAPI support for saslauthd and build gssapi plugin
+%bcond_without	mysql		# don't build MySQL pluggin
+%bcond_without	pgsql		# do not build PostgreSQL pluggin
+%bcond_without	sqlite		# do not enable sqlite plugin
+%bcond_with	authlib		# enable courier-authlib (i wasn't able to test it)
+%bcond_with	opie		# enable opie plugin
+%bcond_with	srp		# build srp pluggin
+%bcond_with	pwcheck		# build pwcheck helper (deprecated)
+%bcond_with	x509		# build x509 plugin (no sources in package???)
 #
+%if %{without mysql} && %{without pgsql}
+%undefine with_cryptedpw
+%endif
+
 Summary:	The SASL library API for the Cyrus mail system
 Summary(pl):	Biblioteka Cyrus SASL
 Summary(pt_BR):	Implementação da API SASL
 Summary(ru):	âÉÂÌÉÏÔÅËÁ Cyrus SASL
 Summary(uk):	â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:		cyrus-sasl
-Version:	2.1.21
-Release:	1
+Version:	2.1.22
+Release:	3
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5:	dde02db234dea892bee298390890502e
+# Source0-md5:	45dde9d19193ae9dd388eb68b2027bc9
 Source1:	saslauthd.init
 Source2:	saslauthd.sysconfig
 Source3:	%{name}.pam
-Patch0:		%{name}-configdir.patch
-Patch1:		%{name}-nolibs.patch
-Patch2:		%{name}-lt.patch
-Patch3:		%{name}-split-sql.patch
-Patch4:		%{name}-opie.patch
-Patch5:		%{name}-gcc4.patch
+Patch0:		%{name}-nolibs.patch
+Patch1:		%{name}-lt.patch
+Patch2:		%{name}-split-sql.patch
+Patch3:		%{name}-opie.patch
+Patch4:		%{name}-gcc4.patch
+# Adapted from http://frost.ath.cx/software/cyrus-sasl-patches/dist/2.1.19/cyrus-sasl-2.1.19-checkpw.c+sql.c.patch
+Patch5:		%{name}-cryptedpw.patch
+Patch6:		%{name}-md5sum-passwords.patch
 URL:		http://asg.web.cmu.edu/sasl/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
+%{?with_authlib:BuildRequires:	courier-authlib-devel}
 BuildRequires:	db-devel
 BuildRequires:	ed
 BuildRequires:	groff
-%{?with_gssapi:BuildRequires:	heimdal-devel}
-BuildRequires:	libtool	>= 1.4
+%{?with_gssapi:BuildRequires:	heimdal-devel >= 0.7}
+BuildRequires:	libtool >= 1.4
 %{?with_mysql:BuildRequires:	mysql-devel}
-%{?with_pgsql:BuildRequires:	postgresql-devel}
-%{?with_ldap:BuildRequires:	openldap-devel}
-%{?with_sqlite:BuildRequires:	sqlite-devel}
-%{?with_opie:BuildRequires:	opie-devel}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_opie:BuildRequires:	opie-devel}
 BuildRequires:	pam-devel
+%{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	rpmbuild(macros) >= 1.268
+%{?with_sqlite:BuildRequires:	sqlite-devel}
 Requires:	pam >= 0.79.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/sasl
 
+%define		specflags	-fno-strict-aliasing
+
 %description
 This is an implementation of the SASL API, useful for adding
 authentication, authorization, and security to network protocols. The
@@ -94,7 +105,7 @@ Summary:	Header files and documentation for cyrus-sasl
 Summary(pl):	Pliki nag³ówkowe i dokumentacja dla cyrus-sasl
 Summary(pt_BR):	Exemplos e arquivos para desenvolvimento com SASL
 Summary(ru):	æÁÊÌÙ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ÂÉÂÌÉÏÔÅËÏÊ Cyrus SASL
-Summary(ru):	æÁÊÌÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú Â¦Â̦ÏÔÅËÏÀ Cyrus SASL
+Summary(uk):	æÁÊÌÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú Â¦Â̦ÏÔÅËÏÀ Cyrus SASL
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -308,11 +319,11 @@ Wtyczka dodaj
 SASL.
 
 %package opie
-Summary:        OPIE Cyrus SASL plugin
-Summary(pl):    Wtyczka OPIE do Cyrus SASL
-Summary(pt_BR): Mecanismo SASL OPIE
-Group:          Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:	OPIE Cyrus SASL plugin
+Summary(pl):	Wtyczka OPIE do Cyrus SASL
+Summary(pt_BR):	Mecanismo SASL OPIE
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description opie
 This plugin implements the SASL OPIE (One Time Password) mechanism.
@@ -337,8 +348,10 @@ Wtyczka x509 do Cyrus SASL.
 Summary:	Cyrus SASL authd
 Summary(pl):	Demon authd do Cyrus SASL
 Group:		Daemons
-Requires(post,postun):	/sbin/chkconfig
+Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	/sbin/chkconfig
+Requires:	rc-scripts
 
 %description saslauthd
 Cyrus SASL authd.
@@ -395,10 +408,10 @@ Cyrus SASL PostgreSQL plugin.
 Wtyczka PostgreSQL do Cyrus SASL.
 
 %package sqlite
-Summary:        Cyrus SQLite PostgreSQL plugin
-Summary(pl):    Wtyczka SQLite do Cyrus SASL
-Group:          Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:	Cyrus SQLite PostgreSQL plugin
+Summary(pl):	Wtyczka SQLite do Cyrus SASL
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description sqlite
 Cyrus SASL SQLite plugin.
@@ -413,7 +426,10 @@ Wtyczka SQLite do Cyrus SASL.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if %{with cryptedpw}
 %patch5 -p1
+%patch6 -p1
+%endif
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -441,10 +457,12 @@ cd saslauthd
 cd ..
 
 %configure \
+	%{?with_cryptedpw: LDFLAGS=-lcrypt} \
 	--disable-krb4 \
 	%{!?with_gssapi: --disable-gssapi} \
 	%{?with_gssapi: --enable-gssapi --with-gss_impl=heimdal} \
 	--enable-login \
+	--enable-sample \
 	--enable-sql \
 	%{?with_srp: --enable-srp} \
 	--enable-static \
@@ -452,6 +470,7 @@ cd ..
 	--with-configdir=%{_sysconfdir} \
 	--with-dblib=berkeley \
 	--with-dbpath=/var/lib/sasl2/sasl.db \
+	%{?with_authlib:--with-authdaemond=/var/spool/authdaemon/socket} \
 	%{?with_ldap: --with-ldap=%{_prefix}} \
 	%{?with_mysql: --with-mysql=%{_prefix}} \
 	%{?with_pgsql: --with-pgsql=%{_prefix}} \
@@ -474,7 +493,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
 		$RPM_BUILD_ROOT%{_mandir}/man8
 
 %{__make} install \
@@ -491,12 +510,18 @@ ln -sf libsasl2.so $RPM_BUILD_ROOT%{_libdir}/libsasl.so
 
 touch $RPM_BUILD_ROOT/var/lib/sasl2/sasl.db
 
+# create empty config
+touch $RPM_BUILD_ROOT%{_sysconfdir}/saslauthd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
 install %{SOURCE3} ./cyrus.pam
 
 install saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
 
+# sample programs for testing sasl
+libtool --mode=install cp sample/client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
+libtool --mode=install cp sample/server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -505,17 +530,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post saslauthd
 /sbin/chkconfig --add saslauthd
-if [ -f /var/lock/subsys/saslauthd ]; then
-	/etc/rc.d/init.d/saslauthd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/saslauthd start\" to start saslauthd."
-fi
+%service saslauthd restart
 
 %preun saslauthd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/saslauthd ]; then
-		/etc/rc.d/init.d/saslauthd stop 1>&2
-	fi
+	%service saslauthd stop
 	/sbin/chkconfig --del saslauthd
 fi
 
@@ -527,12 +546,17 @@ fi
 %dir %{_libdir}/sasl2
 %dir /var/lib/sasl2
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
+# sample programs to subpackage instead?
+%attr(755,root,root) %{_bindir}/sasl-sample-client
+%attr(755,root,root) %{_bindir}/sasl-sample-server
+%attr(755,root,root) %{_sbindir}/pluginviewer
 %attr(755,root,root) %{_sbindir}/sasldblistusers2
 %attr(755,root,root) %{_sbindir}/saslpasswd2
 
-%attr(640,root,mail) %ghost %config(noreplace) %verify(not mtime md5 size) /var/lib/sasl2/sasl.db
-%{_mandir}/man8/sasldblistusers2.*
-%{_mandir}/man8/saslpasswd2.*
+%attr(640,root,mail) %ghost %config(noreplace) %verify(not md5 mtime size) /var/lib/sasl2/sasl.db
+%{_mandir}/man8/pluginviewer.8*
+%{_mandir}/man8/sasldblistusers2.8*
+%{_mandir}/man8/saslpasswd2.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -624,9 +648,11 @@ fi
 %files saslauthd
 %defattr(644,root,root,755)
 %doc cyrus.pam
+%doc saslauthd/{AUTHORS,LDAP_SASLAUTHD}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/saslauthd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/saslauthd
 %attr(755,root,root) %{_sbindir}/saslauthd
 %attr(755,root,root) %{_sbindir}/testsaslauthd
 %attr(755,root,root) %{_sbindir}/saslcache
 %attr(754,root,root) /etc/rc.d/init.d/saslauthd
-%config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/saslauthd
-%{_mandir}/man8/saslauthd.*
+%{_mandir}/man8/saslauthd.8*