X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcyrus-sasl.git;a=blobdiff_plain;f=cyrus-sasl.spec;h=0846858961fbbf0fc99a5fe19765ba425d77a260;hp=7aa9375116abb057ee18c78f35f5b08da1f0ee3e;hb=HEAD;hpb=5b0b9f1157ec2bf907d03fc1939eeb23500c01f7

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 7aa9375..a87bdd9 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,56 +1,62 @@
-# TODO:
-# - add ldap plugin from openldap sources
 #
 # Conditional build:
 %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_without	mysql		# don't build MySQL plugin
+%bcond_without	nagios		# do not enable Nagios plugin
+%bcond_without	ntlm		# do not build NTLM plugin
+%bcond_without	pgsql		# do not build PostgreSQL plugin
+%bcond_without	sqlite		# do not enable sqlite 2 plugin
+%bcond_without	sqlite3		# do not enable sqlite 3 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	opie		# OTP plugin using opie library instead of internal code
+%bcond_with	srp		# build srp plugin
 %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
 
 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
+Summary(pl.UTF-8):	Biblioteka Cyrus SASL
+Summary(pt_BR.UTF-8):	Implementação da API SASL
+Summary(ru.UTF-8):	Библиотека Cyrus SASL
+Summary(uk.UTF-8):	Бібліотека Cyrus SASL
 Name:		cyrus-sasl
-Version:	2.1.22
-Release:	5
+Version:	2.1.28
+Release:	2
 License:	distributable
 Group:		Libraries
-Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5:	45dde9d19193ae9dd388eb68b2027bc9
+#Source0Download: https://github.com/cyrusimap/cyrus-sasl/releases
+Source0:	https://github.com/cyrusimap/cyrus-sasl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	6f228a692516f5318a64505b46966cfa
 Source1:	saslauthd.init
 Source2:	saslauthd.sysconfig
 Source3:	%{name}.pam
+Source4:	check_saslauthd.cfg
 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
 Patch7:		%{name}-db.patch
-Patch8:		%{name}-automake_1_10.patch
-URL:		http://asg.web.cmu.edu/sasl/
-BuildRequires:	autoconf >= 2.54
-BuildRequires:	automake
+Patch9:		%{name}-sizes.patch
+Patch10:	%{name}-nagios-plugin.patch
+Patch12:	%{name}-gssapi-detect.patch
+Patch14:	%{name}-ac-libs.patch
+Patch20:	%{name}-auxprop.patch
+Patch21:	0030-dont_use_la_files_for_opening_plugins.patch
+URL:		https://www.cyrusimap.org/sasl/
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
 %{?with_authlib:BuildRequires:	courier-authlib-devel}
 BuildRequires:	db-devel
 BuildRequires:	ed
 BuildRequires:	groff
-%{?with_gssapi:BuildRequires:	heimdal-devel >= 0.7}
+%{?with_gssapi:BuildRequires:	heimdal-devel}
 BuildRequires:	libtool >= 1.4
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
@@ -59,8 +65,12 @@ BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sphinx-pdg-3
 %{?with_sqlite:BuildRequires:	sqlite-devel}
+%{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3}
 Requires:	pam >= 0.79.0
+Requires:	%{name}-libs = %{version}-%{release}
+Obsoletes:	cyrus-sasl-x509 < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/sasl
@@ -76,38 +86,51 @@ work in progress.
 Note: remember to install appropriate plugins, or you won't have any
 authentication mechanisms available.
 
-%description -l pl
-Pakiet cyrus-sasl zawiera implementacjê biblioteki API SASL dla
+%description -l pl.UTF-8
+Pakiet cyrus-sasl zawiera implementację biblioteki API SASL dla
 systemu poczty elektronicznej Cyrusa. Biblioteka ta jest przydatna
-tak¿e do dodawania uwierzytelniania, autoryzacji oraz zwiêkszania
-bezpieczeñstwa protoko³ów sieciowych. Sam protokó³ SASL jest opisany w
+także do dodawania uwierzytelniania, autoryzacji oraz zwiększania
+bezpieczeństwa protokołów sieciowych. Sam protokół SASL jest opisany w
 RFC 2222; standaryzacja API jest w toku.
 
-Uwaga: aby by³y dostêpne jakiekolwiek mechanizmy autoryzacji, nale¿y
-doinstalowaæ odpowiednie wtyczki.
+Uwaga: aby były dostępne jakiekolwiek mechanizmy autoryzacji, należy
+doinstalować odpowiednie wtyczki.
 
-%description -l pt_BR
-Esta é uma implementação da API SASL, útil para acrescentar
-autenticação, autorização e seguança (criptografia) para protocolos de
-rede. O protocolo SASL está documentado na RFC 2222. A API "padrão"
-ainda está em desenvolvimento.
+%description -l pt_BR.UTF-8
+Esta é uma implementação da API SASL, útil para acrescentar
+autenticação, autorização e seguança (criptografia) para protocolos de
+rede. O protocolo SASL está documentado na RFC 2222. A API "padrão"
+ainda está em desenvolvimento.
 
-%description -l ru
-ðÁËÅÔ cyrus-sasl ÓÏÄÅÒÖÉÔ ÒÅÁÌÉÚÁÃÉÀ Cyrus SASL. SASL - ÜÔÏ Simple
-Authentication and Security Layer, ÍÅÔÏÄ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÐÏÄÄÅÒÖËÉ
-ÁÕÔÅÎÔÉËÁÃÉÉ Ë ÐÒÏÔÏËÏÌÁÍ, ÏÓÎÏ×ÁÎÎÙÍ ÎÁ ÓÏÅÄÉÎÅÎÉÑÈ.
+%description -l ru.UTF-8
+Пакет cyrus-sasl содержит реализацию Cyrus SASL. SASL - это Simple
+Authentication and Security Layer, метод для добавления поддержки
+аутентикации к протоколам, основанным на соединениях.
 
-%description -l uk
-ðÁËÅÔ cyrus-sasl ͦÓÔÉÔØ ÒÅÁ̦ÚÁæÀ Cyrus SASL. SASL - ÃÅ Simple
-Authentication and Security Layer, ÍÅÔÏÄ ÄÌÑ ÄÏÄÁÎÎÑ Ð¦ÄÔÒÉÍËÉ
-ÁÕÔÅÎÔÉËÁæ§ ÄÏ ÐÒÏÔÏËÏ̦×, ÂÁÚÏ×ÁÎÉÈ ÎÁ Ú'¤ÄÎÁÎÎÑÈ.
+%description -l uk.UTF-8
+Пакет cyrus-sasl містить реалізацію Cyrus SASL. SASL - це Simple
+Authentication and Security Layer, метод для додання підтримки
+аутентикації до протоколів, базованих на з'єднаннях.
+
+%package libs
+Summary:	cyrus-sasl library itself
+Summary(pl.UTF-8):	Sama biblioteka cyrus-sasl
+Group:		Libraries
+Requires(post,postun):	/sbin/ldconfig
+Conflicts:	cyrus-sasl < 2.1.23-8
+
+%description libs
+cyrus-sasl library itself.
+
+%description libs -l pl.UTF-8
+Sama biblioteka cyrus-sasl.
 
 %package devel
 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(uk):	æÁÊÌÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú Â¦Â̦ÏÔÅËÏÀ Cyrus SASL
+Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja dla cyrus-sasl
+Summary(pt_BR.UTF-8):	Exemplos e arquivos para desenvolvimento com SASL
+Summary(ru.UTF-8):	Файлы для программирования с библиотекой Cyrus SASL
+Summary(uk.UTF-8):	Файли для програмування з бібліотекою Cyrus SASL
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -115,47 +138,66 @@ Requires:	%{name} = %{version}-%{release}
 This includes the header files and documentation needed to develop
 applications which use SASL.
 
-%description devel -l pl
-Pliki nag³ówkowe i dokumentacja dla cyrus-sasl.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i dokumentacja dla cyrus-sasl.
 
-%description devel -l pt_BR
-Este pacote inclui os arquivos de cabeçalho e documentação necessários
+%description devel -l pt_BR.UTF-8
+Este pacote inclui os arquivos de cabeçalho e documentação necessários
 para desenvolver aplicativos que usem SASL.
 
-%description devel -l ru
-èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÉÌÏÖÅÎÉÊ,
-ÉÓÐÏÌØÚÕÀÝÉÈ Cyrus SASL.
+%description devel -l ru.UTF-8
+Хедеры и библиотеки, необходимые для разработки приложений,
+использующих Cyrus SASL.
 
-%description devel -l uk
-èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ
-×ÉËÏÒÉÓÔÏ×ÕÀÔØ Cyrus SASL.
+%description devel -l uk.UTF-8
+Хедери та бібліотеки, необхідні для розробки програм, що
+використовують Cyrus SASL.
 
 %package static
 Summary:	Static cyrus-sasl libraries
-Summary(pl):	Statyczne biblioteki cyrus-sasl
-Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ Cyrus SASL
-Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ Cyrus SASL
+Summary(pl.UTF-8):	Statyczne biblioteki cyrus-sasl
+Summary(ru.UTF-8):	Статические библиотеки Cyrus SASL
+Summary(uk.UTF-8):	Статичні бібліотеки Cyrus SASL
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static cyrus-sasl libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczne biblioteki cyrus-sasl.
 
-%description static -l ru
-óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÉÌÏÖÅÎÉÊ,
-ÉÓÐÏÌØÚÕÀÝÉÈ Cyrus SASL.
+%description static -l ru.UTF-8
+Статические библиотеки, необходимые для разработки приложений,
+использующих Cyrus SASL.
 
-%description static -l uk
-óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ
+%description static -l uk.UTF-8
+Статичні бібліотеки, необхідні для розробки програм, що використовують
 Cyrus SASL.
 
+%package anonymous
+Summary:	Anonymous Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka anonymous do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL ANONYMOUS
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description anonymous
+This plugin implements the SASL ANONYMOUS mechanism, used for
+anonymous authentication.
+
+%description anonymous -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu ANONYMOUS do Cyrus SASL. Służy do
+anonimowego uwierzytelniania.
+
+%description anonymous -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL ANONYMOUS, usado para
+autenticação anônima.
+
 %package cram-md5
 Summary:	Cram-MD5 Cyrus SASL plugin
-Summary(pl):	Wtyczka Cram-MD5 do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL CRAM-MD5
+Summary(pl.UTF-8):	Wtyczka Cram-MD5 do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL CRAM-MD5
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -165,22 +207,22 @@ mandatory-to-implement authentication mechanism for a number of
 protocols; it uses MD5 with a challenge/response system to
 authenticate the user.
 
-%description cram-md5 -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu CRAM-MD5 do Cyrus SASL. CRAM-MD5
-jest obowi±zkowym do zaimplementowania mechanizmem uwierzytelniania
-dla wielu protoko³ów; do uwierzytelnienia u¿ytkownika u¿ywa MD5 wraz z
+%description cram-md5 -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu CRAM-MD5 do Cyrus SASL. CRAM-MD5
+jest obowiązkowym do zaimplementowania mechanizmem uwierzytelniania
+dla wielu protokołów; do uwierzytelnienia użytkownika używa MD5 wraz z
 systemem challenge/response.
 
-%description cram-md5 -l pt_BR
-Este plugin implementa o mecanismo SASL CRAM-MD5. CRAM-MD5 é o
-mecanismo de autenticação obrigatório de ser implementado para vários
+%description cram-md5 -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL CRAM-MD5. CRAM-MD5 é o
+mecanismo de autenticação obrigatório de ser implementado para vários
 protocolos: ele usa MD5 com um sistema de desafio/resposta para
-autenticar o usuário.
+autenticar o usuário.
 
 %package digest-md5
 Summary:	Digest-MD5 Cyrus SASL plugin
-Summary(pl):	Wtyczka Digest-MD5 do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL DIGEST-MD5
+Summary(pl.UTF-8):	Wtyczka Digest-MD5 do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL DIGEST-MD5
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -190,68 +232,24 @@ mechanism. Although not yet finalized, this is likely to become the
 new mandatory-to-implement authentication system in all new protocols.
 It's based on the digest md5 authentication system designed for HTTP.
 
-%description digest-md5 -l pl
-Wtyczka dodaj±ca najnowsz± wersjê mechanizmu DIGEST-MD5 do Cyrus SASL.
-Pomimo tego, ¿e nie jest jeszcze ukoñczony, najprawdopodobniej stanie
-siê obowi±zkowym do zaimplementowania systemem uwierzytelniania we
-wszystkich nowych protoko³ach. Bazuje na systemie uwierzytelniania
+%description digest-md5 -l pl.UTF-8
+Wtyczka dodająca najnowszą wersję mechanizmu DIGEST-MD5 do Cyrus SASL.
+Pomimo tego, że nie jest jeszcze ukończony, najprawdopodobniej stanie
+się obowiązkowym do zaimplementowania systemem uwierzytelniania we
+wszystkich nowych protokołach. Bazuje na systemie uwierzytelniania
 Digest-MD5 zaprojektowanym dla HTTP.
 
-%description digest-md5 -l pt_BR
-Este plugin implementa a última versão da especificação do mecanismo
-SASL DIGEST-MD5. Embora ainda não esteja finalizado, DIGEST-MD5
-provavelmente será o novo sistema de autenticação obrigatório para
-protocolos novos. Ele é baseado na autenticação md5 digest
+%description digest-md5 -l pt_BR.UTF-8
+Este plugin implementa a última versão da especificação do mecanismo
+SASL DIGEST-MD5. Embora ainda não esteja finalizado, DIGEST-MD5
+provavelmente será o novo sistema de autenticação obrigatório para
+protocolos novos. Ele é baseado na autenticação md5 digest
 desenvolvida para HTTP.
 
-%package plain
-Summary:	Plain Cyrus SASL plugin
-Summary(pl):	Wtyczka plain do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL PLAIN
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description plain
-This plugin implements the SASL PLAIN mechanism. Although insecure,
-PLAIN is useful for transitioning to new security mechanisms, as this
-is the only mechanism which gives the server a copy of the user's
-password.
-
-%description plain -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu PLAIN do Cyrus SASL. Pomimo tego,
-¿e nie jest bezpieczny, PLAIN jest przydatny przy przechodzeniu na
-nowe mechanizmu bezpieczeñstwa, jako ¿e jest to jedyny mechanizm,
-który udostêpnia serwerowi kopiê has³a u¿ytkownika.
-
-%description plain -l pt_BR
-Este plugin implementa o mecanismo SASL PLAIN. Embora inseguro, este
-mecanismo é útil durante transições para novos mecanismos de
-segurança, pois é o único esquema que fornece uma cópia da senha do
-usuário para o servidor.
-
-%package anonymous
-Summary:	Anonymous Cyrus SASL plugin
-Summary(pl):	Wtyczka anonymous do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL ANONYMOUS
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description anonymous
-This plugin implements the SASL ANONYMOUS mechanism, used for
-anonymous authentication.
-
-%description anonymous -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu ANONYMOUS do Cyrus SASL. S³u¿y do
-anonimowego uwierzytelniania.
-
-%description anonymous -l pt_BR
-Este plugin implementa o mecanismo SASL ANONYMOUS, usado para
-autenticação anônima.
-
 %package gssapi
 Summary:	GSSAPI Cyrus SASL plugin
-Summary(pl):	Wtyczka GSSAPI do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL GSSAPI
+Summary(pl.UTF-8):	Wtyczka GSSAPI do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL GSSAPI
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -259,167 +257,247 @@ Requires:	%{name} = %{version}-%{release}
 This plugin implements the SASL GSSAPI mechanism, used for
 GSSAPI/Kerberos5 authentication.
 
-%description gssapi -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu SASL GSSAPI, u¿ywanego do
-uwierzytelniania z u¿yciem GSSAPI/Kerberos5.
+%description gssapi -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu SASL GSSAPI, używanego do
+uwierzytelniania z użyciem GSSAPI/Kerberos5.
 
-%description gssapi -l pt_BR
+%description gssapi -l pt_BR.UTF-8
 Este plugin implementa o mecanismo SASL GSSAPI, usado para
-autenticação Kerberos/GSSAPI.
+autenticação Kerberos/GSSAPI.
 
 %package login
 Summary:	Unsupported Login Cyrus SASL plugin
-Summary(pl):	Nie wspierana wtyczka Login do Cyrus SASL
+Summary(pl.UTF-8):	Nie wspierana wtyczka Login do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description login
 Unsupported LOGIN Cyrus SASL plugin.
 
-%description login -l pl
-Wtyczka dodaj±ca obs³ugê nie wspieranego mechanizmu LOGIN do Cyrus
+%description login -l pl.UTF-8
+Wtyczka dodająca obsługę nie wspieranego mechanizmu LOGIN do Cyrus
 SASL.
 
-%package srp
-Summary:	SRP Cyrus SASL plugin
-Summary(pl):	Wtyczka SRP do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL SRP
+%package mysql
+Summary:	Cyrus SASL MySQL plugin
+Summary(pl.UTF-8):	Wtyczka MySQL do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description srp
-This plugin implements the SASL SRP mechanism, based on the Secure
-Remote Password protocol. This mechanism performs mutual
-authentication and can provide a security layer with replay detection,
-integrity protection and/or condifentiality protection.
+%description mysql
+Cyrus SASL MySQL plugin.
 
-%description srp -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu SRP do Cyrus SASL. Bazuje na
-protokole Secure Remote Password. Ten mechanizm dokonuje wzajemnego
-uwierzytelnienia i mo¿e dodawaæ warstwê bezpieczeñstwa z wykrywaniem
-powtarzania, zabezpieczeniem integralno¶ci i/lub poufno¶ci.
+%description mysql -l pl.UTF-8
+Wtyczka MySQL do Cyrus SASL.
 
-%description srp -l pt_BR
-Este plugin implementa o mecanismo SASL SRP, baseado no protocolo SRP
-(Secure Remote Password). Este mecanismo oferece autenticação mútua
-(do cliente e do servidor) e pode prover uma camada de segurança com
-detecção de ataques de replay, garantia de integridade e/ou
-confidencialidade.
+%package ntlm
+Summary:	Cyrus SASL NTLM plugin
+Summary(pl.UTF-8):	Wtyczka NTLM do Cyrus SASL
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description ntlm
+Cyrus SASL NTLM plugin.
+
+%description ntlm -l pl.UTF-8
+Wtyczka NTLM do Cyrus SASL.
 
 %package otp
 Summary:	OTP Cyrus SASL plugin
-Summary(pl):	Wtyczka OTP do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL OTP
+Summary(pl.UTF-8):	Wtyczka OTP do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL OTP
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	cyrus-sasl-opie < %{version}
 
 %description otp
 This plugin implements the SASL OTP (One Time Password) mechanism.
 
-%description otp -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu OTP (has³a jednorazowe) do Cyrus
+%description otp -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu OTP (hasła jednorazowe) do Cyrus
 SASL.
 
-%package opie
-Summary:	OPIE Cyrus SASL plugin
-Summary(pl):	Wtyczka OPIE do Cyrus SASL
-Summary(pt_BR):	Mecanismo SASL OPIE
+%package pgsql
+Summary:	Cyrus SASL PostgreSQL plugin
+Summary(pl.UTF-8):	Wtyczka PostgreSQL do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description opie
-This plugin implements the SASL OPIE (One Time Password) mechanism.
+%description pgsql
+Cyrus SASL PostgreSQL plugin.
 
-%description opie -l pl
-Wtyczka dodaj±ca obs³ugê mechanizmu OPIE (has³a jednorazowe) do Cyrus
-SASL.
+%description pgsql -l pl.UTF-8
+Wtyczka PostgreSQL do Cyrus SASL.
 
-%package x509
-Summary:	x509 Cyrus SASL plugin
-Summary(pl):	Wtyczka x509 do Cyrus SASL
+%package plain
+Summary:	Plain Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka plain do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL PLAIN
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description x509
-x509 Cyrus SASL plugin.
+%description plain
+This plugin implements the SASL PLAIN mechanism. Although insecure,
+PLAIN is useful for transitioning to new security mechanisms, as this
+is the only mechanism which gives the server a copy of the user's
+password.
 
-%description x509 -l pl
-Wtyczka x509 do Cyrus SASL.
+%description plain -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu PLAIN do Cyrus SASL. Pomimo tego,
+że nie jest bezpieczny, PLAIN jest przydatny przy przechodzeniu na
+nowe mechanizmu bezpieczeństwa, jako że jest to jedyny mechanizm,
+który udostępnia serwerowi kopię hasła użytkownika.
 
-%package saslauthd
-Summary:	Cyrus SASL authd
-Summary(pl):	Demon authd do Cyrus SASL
-Group:		Daemons
-Requires(post,preun):	/sbin/chkconfig
+%description plain -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL PLAIN. Embora inseguro, este
+mecanismo é útil durante transições para novos mecanismos de
+segurança, pois é o único esquema que fornece uma cópia da senha do
+usuário para o servidor.
+
+%package sasldb
+Summary:	Cyrus SASL sasldb plugin
+Summary(pl.UTF-8):	Wtyczka sasldb do Cyrus SASL
+Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	/sbin/chkconfig
-Requires:	rc-scripts
 
-%description saslauthd
-Cyrus SASL authd.
+%description sasldb
+Cyrus SASL sasldb plugin.
 
-%description saslauthd -l pl
-Demon authd do Cyrus SASL.
+%description sasldb -l pl.UTF-8
+Wtyczka sasldb do Cyrus SASL.
 
-%package pwcheck
-Summary:	Cyrus SASL pwcheck helper
-Summary(pl):	Program pomocniczy pwcheck do Cyrus SASL
+%package ldapdb
+Summary:	Cyrus SASL LDAPDB plugin
+Summary(pl.UTF-8):	Wtyczka LDAPDB do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description pwcheck
-Cyrus SASL pwcheck helper.
+%description ldapdb
+Cyrus SASL ldapdb plugin.
 
-%description pwcheck -l pl
-Program pomocniczy pwcheck do Cyrus SASL.
+%description ldapdb -l pl.UTF-8
+Wtyczka ldapdb do Cyrus SASL.
 
-%package sasldb
-Summary:	Cyrus SASL sasldb plugin
-Summary(pl):	Wtyczka sasldb do Cyrus SASL
+%package passdss
+Summary:	PASSDSS Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka PASSDSS do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL PASSDSS
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description sasldb
-Cyrus SASL sasldb plugin.
+%description passdss
+This plugin implements the PASSDSS 3DES mechanism.
 
-%description sasldb -l pl
-Wtyczka sasldb do Cyrus SASL.
+%description passdss -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu PASSDSS 3DES do Cyrus SASL.
 
-%package mysql
-Summary:	Cyrus SASL MySQL plugin
-Summary(pl):	Wtyczka MySQL do Cyrus SASL
+%description passdss -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL PASSDSS 3DES.
+
+%package scram
+Summary:	SCRAM Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka SCRAM do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL SCRAM
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description mysql
-Cyrus SASL MySQL plugin.
+%description scram
+This plugin implements the SASL SCRAM-MD5 mechanism.
 
-%description mysql -l pl
-Wtyczka MySQL do Cyrus SASL.
+%description scram -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu SCRAM do Cyrus SASL.
 
-%package pgsql
-Summary:	Cyrus SASL PostgreSQL plugin
-Summary(pl):	Wtyczka PostgreSQL do Cyrus SASL
+%description scram -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL SCRAM.
+
+%package sqlite
+Summary:	Cyrus SQLite 2 PostgreSQL plugin
+Summary(pl.UTF-8):	Wtyczka SQLite 2 do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description pgsql
-Cyrus SASL PostgreSQL plugin.
+%description sqlite
+Cyrus SASL SQLite 2 plugin.
 
-%description pgsql -l pl
-Wtyczka PostgreSQL do Cyrus SASL.
+%description sqlite -l pl.UTF-8
+Wtyczka SQLite 2 do Cyrus SASL.
 
-%package sqlite
-Summary:	Cyrus SQLite PostgreSQL plugin
-Summary(pl):	Wtyczka SQLite do Cyrus SASL
+%package sqlite3
+Summary:	Cyrus SQLite 3 PostgreSQL plugin
+Summary(pl.UTF-8):	Wtyczka SQLite 3 do Cyrus SASL
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description sqlite
-Cyrus SASL SQLite plugin.
+%description sqlite3
+Cyrus SASL SQLite 3 plugin.
+
+%description sqlite3 -l pl.UTF-8
+Wtyczka SQLite 3 do Cyrus SASL.
+
+%package srp
+Summary:	SRP Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka SRP do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL SRP
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description srp
+This plugin implements the SASL SRP mechanism, based on the Secure
+Remote Password protocol. This mechanism performs mutual
+authentication and can provide a security layer with replay detection,
+integrity protection and/or condifentiality protection.
+
+%description srp -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu SRP do Cyrus SASL. Bazuje na
+protokole Secure Remote Password. Ten mechanizm dokonuje wzajemnego
+uwierzytelnienia i może dodawać warstwę bezpieczeństwa z wykrywaniem
+powtarzania, zabezpieczeniem integralności i/lub poufności.
+
+%description srp -l pt_BR.UTF-8
+Este plugin implementa o mecanismo SASL SRP, baseado no protocolo SRP
+(Secure Remote Password). Este mecanismo oferece autenticação mútua
+(do cliente e do servidor) e pode prover uma camada de segurança com
+detecção de ataques de replay, garantia de integridade e/ou
+confidencialidade.
+
+%package pwcheck
+Summary:	Cyrus SASL pwcheck helper
+Summary(pl.UTF-8):	Program pomocniczy pwcheck do Cyrus SASL
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description pwcheck
+Cyrus SASL pwcheck helper.
+
+%description pwcheck -l pl.UTF-8
+Program pomocniczy pwcheck do Cyrus SASL.
+
+%package saslauthd
+Summary:	Cyrus SASL authd
+Summary(pl.UTF-8):	Demon authd do Cyrus SASL
+Group:		Daemons
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	/sbin/chkconfig
+Requires:	rc-scripts
+
+%description saslauthd
+Cyrus SASL authd.
+
+%description saslauthd -l pl.UTF-8
+Demon authd do Cyrus SASL.
+
+%package -n nagios-plugin-check_saslauthd
+Summary:	Nagios plugin to check health of saslauthd
+Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania działania saslauthd
+Group:		Networking
+Requires:	nagios-core
+
+%description -n nagios-plugin-check_saslauthd
+Nagios plugin to check health of saslauthd.
 
-%description sqlite -l pl
-Wtyczka SQLite do Cyrus SASL.
+%description -n nagios-plugin-check_saslauthd -l pl.UTF-8
+Wtyczka Nagiosa do sprawdzania działania saslauthd.
 
 %prep
 %setup -q
@@ -427,73 +505,69 @@ Wtyczka SQLite do Cyrus SASL.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %if %{with cryptedpw}
 %patch5 -p1
 %patch6 -p1
 %endif
 %patch7 -p1
-%patch8 -p1
-
-cd doc
-echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
-ls rfc*.txt >> rfc-compliance
-rm -f rfc*.txt
-cd ..
-
-rm -rf autom4te.cache saslauthd/autom4te.cache
-# acinclude.m4 contains only old libtool.m4
-rm -f acinclude.m4 libtool config/libtool.m4 saslauthd/acinclude.m4
+%patch9 -p1
+%{?with_nagios:%patch10 -p1}
+%patch12 -p1
+%patch14 -p1
+%patch20 -p1
+%patch21 -p1
+
+# update to our paths
+sed -i -e '
+	s,/usr/local/etc/saslauthd.conf,%{_sysconfdir}/saslauthd.conf,g
+	s,/etc/saslauthd.conf,%{_sysconfdir}/saslauthd.conf,g
+	s,/var/run/saslauthd/mux,/var/lib/sasl2/mux,g
+	s,/var/state/saslauthd,/var/lib/sasl2,g
+' saslauthd/saslauthd.mdoc saslauthd/LDAP_SASLAUTHD doc/legacy/sysadmin.html
 
 %build
 %{__libtoolize}
-%{__aclocal} -I cmulocal -I config
-%{__autoheader}
-%{__automake}
+%{__aclocal} -I m4
 %{__autoconf}
-
-cd saslauthd
-%{__libtoolize}
-%{__aclocal} -I ../cmulocal -I ../config -I config
 %{__autoheader}
 %{__automake}
-%{__autoconf}
-cd ..
-
 %configure \
+	SPHINX_BUILD=/usr/bin/sphinx-build-3 \
 	%{?with_cryptedpw: LDFLAGS=-lcrypt} \
+	%{!?with_gssapi:--disable-gssapi} \
+	%{?with_gssapi:--enable-gssapi --with-gss_impl=heimdal} \
+	--enable-httpform \
 	--disable-krb4 \
-	%{!?with_gssapi: --disable-gssapi} \
-	%{?with_gssapi: --enable-gssapi --with-gss_impl=heimdal} \
+	%{?with_ldap:--enable-ldapdb} \
 	--enable-login \
+	--enable-passdss \
 	--enable-sample \
 	--enable-sql \
-	%{?with_srp: --enable-srp} \
+	%{?with_srp:--enable-srp} \
 	--enable-static \
-	--with-plugindir=%{_libdir}/sasl2 \
+	%{?with_authlib:--with-authdaemond=/var/spool/authdaemon/socket} \
 	--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}} \
-	%{?with_sqlite: --with-sqlite=%{_prefix}} \
-	%{?with_opie: --with-opie=%{_prefix}} \
+	%{?with_ldap:--with-ldap} \
+	%{?with_mysql:--with-mysql=%{_prefix}} \
+	%{?with_ntlm:--enable-ntlm} \
+	%{?with_opie:--with-opie=%{_prefix}} \
 	--with-pam \
-	%{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
-	--with-saslauthd=/var/lib/sasl2
+	%{?with_pgsql:--with-pgsql=%{_prefix}} \
+	--with-plugindir=%{_libdir}/sasl2 \
+	%{?with_pwcheck:--with-pwcheck=/var/lib/sasl2} \
+	--with-saslauthd=/var/lib/sasl2 \
+	%{?with_sqlite:--with-sqlite=%{_prefix}} \
+	%{?with_sqlite3:--with-sqlite3=%{_prefix}}
+
 %{__make}
 
 %{__make} -C saslauthd testsaslauthd
 %{__make} -C saslauthd saslcache
+%{__make} -C sample sample-client sample-server
 
-cd doc
-RFCLIST=`grep 'rfc.\+\.txt' rfc-compliance`
-for i in $RFCLIST; do
-	RFCDIR=../RFC/text/`echo $i | sed -e 's:^rfc::' -e 's:..\.txt$::' `00
-	echo -e ',s:'$i':'$RFCDIR/$i'\n,w\nq' | ed index.html
-done
+%{__rm} -rf doc/html/{_sources,objects.inv,.buildinfo}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -504,11 +578,10 @@ install -d $RPM_BUILD_ROOT{%{_bindir},/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/i
 	sasldir=%{_libdir}/sasl2 \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
-rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
 
-install utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
+cp -a utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
 
 ln -sf libsasl2.so $RPM_BUILD_ROOT%{_libdir}/libsasl.so
 
@@ -516,21 +589,29 @@ 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 -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
+cp -a %{SOURCE3} cyrus.pam
 
-install saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
+install -p 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
+libtool --mode=install cp sample/sample-client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
+libtool --mode=install cp sample/sample-server $RPM_BUILD_ROOT%{_bindir}/sasl-sample-server
+
+# package for ghost
+touch $RPM_BUILD_ROOT/var/lib/sasl2/{cache.flock,cache.mmap,mux,mux.accept,saslauthd.pid}
+
+%if %{with nagios}
+install -d $RPM_BUILD_ROOT/etc/nagios/plugins
+%{__sed} -e 's,@plugindir@,%{_libdir}/nagios/plugins,' %{SOURCE4} > $RPM_BUILD_ROOT/etc/nagios/plugins/check_saslauthd.cfg
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %post saslauthd
 /sbin/chkconfig --add saslauthd
@@ -542,36 +623,47 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del saslauthd
 fi
 
+%triggerin saslauthd -- pam
+# restart saslauthd if pam is upgraded
+# (saslauth is linked with old libpam but tries to open modules linked with new libpam)
+if [ "$2" != 1 ]; then
+	%service -q saslauthd restart
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%doc doc/{ONEWS,TODO,*.txt,*.html,*.fig,rfc-compliance}
+%doc AUTHORS COPYING ChangeLog README doc/legacy/{TODO,*.html,*.fig} doc/html
 %dir %{_sysconfdir}
 %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
-
+%dir /var/lib/sasl2
 %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 libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsasl2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsasl2.so.3
+
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsasl2.so
+%attr(755,root,root) %{_libdir}/libsasl.so
+%{_libdir}/libsasl2.la
 %{_includedir}/sasl
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_mandir}/man3/*
+%{_pkgconfigdir}/libsasl2.pc
+%{_mandir}/man3/sasl*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsasl2.a
 
 %files anonymous
 %defattr(644,root,root,755)
@@ -580,6 +672,7 @@ fi
 %if %{with gssapi}
 %files gssapi
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libgs2.so*
 %attr(755,root,root) %{_libdir}/sasl2/libgssapiv2.so*
 %endif
 
@@ -595,14 +688,26 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/liblogin.so*
 
+%if %{with mysql}
+%files mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libmysql.so*
+%endif
+
+%if %{with ntlm}
+%files ntlm
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libntlm.so*
+%endif
+
 %files otp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libotp.so*
 
-%if %{with opie}
-%files opie
+%if %{with pgsql}
+%files pgsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libopie.so*
+%attr(755,root,root) %{_libdir}/sasl2/libpgsql.so*
 %endif
 
 %files plain
@@ -613,17 +718,19 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libsasldb.so*
 
-%if %{with mysql}
-%files mysql
+%if %{with ldap}
+%files ldapdb
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libmysql.so*
+%attr(755,root,root) %{_libdir}/sasl2/libldapdb.so*
 %endif
 
-%if %{with pgsql}
-%files pgsql
+%files passdss
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libpgsql.so*
-%endif
+%attr(755,root,root) %{_libdir}/sasl2/libpassdss.so*
+
+%files scram
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libscram.so*
 
 %if %{with sqlite}
 %files sqlite
@@ -631,16 +738,16 @@ fi
 %attr(755,root,root) %{_libdir}/sasl2/libsqlite.so*
 %endif
 
-%if %{with srp}
-%files srp
+%if %{with sqlite3}
+%files sqlite3
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libsrp.so*
+%attr(755,root,root) %{_libdir}/sasl2/libsqlite3.so*
 %endif
 
-%if %{with x509}
-%files x509
+%if %{with srp}
+%files srp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libx509.so*
+%attr(755,root,root) %{_libdir}/sasl2/libsrp.so*
 %endif
 
 %if %{with pwcheck}
@@ -651,12 +758,24 @@ fi
 
 %files saslauthd
 %defattr(644,root,root,755)
-%doc cyrus.pam
-%doc saslauthd/{AUTHORS,LDAP_SASLAUTHD}
+%doc cyrus.pam saslauthd/{COPYING,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
+%ghost /var/lib/sasl2/cache.flock
+%ghost /var/lib/sasl2/cache.mmap
+%ghost /var/lib/sasl2/mux
+%ghost /var/lib/sasl2/mux.accept
+%ghost /var/lib/sasl2/saslauthd.pid
 %{_mandir}/man8/saslauthd.8*
+%{_mandir}/man8/testsaslauthd.8*
+
+%if %{with nagios}
+%files -n nagios-plugin-check_saslauthd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/nagios/plugins/check_saslauthd.cfg
+%attr(755,root,root) %{_libdir}/nagios/plugins/check_saslauthd
+%endif