SPECS: cyrus-sasl.spec - add sasl-simple-{client, server} to main p...

Tue Sep 20 17:16:30 CEST 2005

Author: glen                         Date: Tue Sep 20 15:16:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add sasl-simple-{client,server} to main package
- add empty saslauthd.conf
- add courier-authlib bcond (not tested)
- adapterized

---- Files affected:
SPECS:
   cyrus-sasl.spec (1.142 -> 1.143) 

---- Diffs:

================================================================
Index: SPECS/cyrus-sasl.spec
diff -u SPECS/cyrus-sasl.spec:1.142 SPECS/cyrus-sasl.spec:1.143

--- SPECS/cyrus-sasl.spec:1.142	Mon Sep 12 20:25:32 2005
+++ SPECS/cyrus-sasl.spec	Tue Sep 20 17:16:22 2005
@@ -9,13 +9,14 @@
 %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	cryptedpw # if you keep crypted passwords in your *sql
 %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 !%{with mysql} && !%{with pgsql}
+%if %{without mysql} && %{without pgsql}
 %undefine with_cryptedpw
 %endif
 
@@ -26,7 +27,7 @@
 Summary(uk):	âŚÂĚŚĎÔĹËÁ Cyrus SASL
 Name:		cyrus-sasl
 Version:	2.1.21
-Release:	3
+Release:	3.5
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
@@ -44,6 +45,7 @@
 Patch6:		%{name}-cryptedpw.patch
 Patch7:		%{name}-md5sum-passwords.patch
 URL:		http://asg.web.cmu.edu/sasl/
+%{?with_authlib:BuildRequires:	courier-authlib-devel}
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	db-devel
@@ -317,11 +319,11 @@
 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.
@@ -404,10 +406,10 @@
 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.
@@ -466,6 +468,7 @@
 	--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}} \
@@ -488,7 +491,7 @@
 
 %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 \
@@ -505,12 +508,18 @@
 
 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
 
@@ -541,10 +550,13 @@
 %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}/sasldblistusers2
 %attr(755,root,root) %{_sbindir}/saslpasswd2
 
-%attr(640,root,mail) %ghost %config(noreplace) %verify(not mtime md5 size) /var/lib/sasl2/sasl.db
+%attr(640,root,mail) %ghost %config(noreplace) %verify(not md5 mtime size) /var/lib/sasl2/sasl.db
 %{_mandir}/man8/sasldblistusers2.*
 %{_mandir}/man8/saslpasswd2.*
 
@@ -638,11 +650,13 @@
 %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.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -651,6 +665,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2005/09/20 15:16:22  glen
+- add sasl-simple-{client,server} to main package
+- add empty saslauthd.conf
+- add courier-authlib bcond (not tested)
+- adapterized
+
 Revision 1.142  2005/09/12 18:25:32  hunter
 - option -H is obsolete in sasld.init. use -O
 - relase 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cyrus-sasl.spec?r1=1.142&r2=1.143&f=u


