X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-sasl.spec;h=072e74dbea83bdf09d17b94c6f524cbf83023863;hb=5883f0b6b0d1443eb13475d87ebb9fdfeaeb972e;hp=5cbf6ddb63082deaff3b4bc7429c6cf6c8d6fb1b;hpb=5675d3ba112e632c21326b25a312b24315d24521;p=packages%2Fcyrus-sasl.git

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 5cbf6dd..072e74d 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,131 +1,185 @@
-#
 # TODO:
 # - add ldap plugin from openldap sources
 #
 # Conditional build:
-# _with_srp		- build srp pluggin
-# _without_myslq	- don't build mysql pluggin
-# _without_ldap		- disable LDAP support for sasluthd
+%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
+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.13
-Release:	0.2
+Version:	2.1.23
+Release:	10
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 1114d59d970791932e96de8557472672
+# Source0-md5:	2eb0e48106f0e9cd8001e654f267ecbc
 Source1:	saslauthd.init
 Source2:	saslauthd.sysconfig
 Source3:	%{name}.pam
-Patch0:		%{name}-configdir.patch
-Patch1:		%{name}-nolibs.patch
-Patch2:		%{name}-lt14d.patch
-Patch3:		%{name}-do_dlopen.patch
+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
+Patch9:		%{name}-digest-commas.patch
+Patch10:	%{name}-keytab.patch
+Patch11:	%{name}-sizes.patch
+Patch12:	%{name}-nagios-plugin.patch
+Patch13:	%{name}-parallel-make.patch
+Patch14:	%{name}-gssapi-detect.patch
+Patch15:		%{name}-saslauthd-httpform-urlescape.patch
 URL:		http://asg.web.cmu.edu/sasl/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1:1.7
+%{?with_authlib:BuildRequires:	courier-authlib-devel}
 BuildRequires:	db-devel
 BuildRequires:	ed
-BuildRequires:	libtool	>= 1.4
-%{!?_without_mysql:BuildRequires: mysql-devel}
-%{!?_without_ldap:BuildRequires: openldap-devel}
-BuildRequires:	openssl-devel >= 0.9.7
+BuildRequires:	groff
+%{?with_gssapi:BuildRequires:	heimdal-devel}
+BuildRequires:	libtool >= 1.4
+%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
+BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_opie:BuildRequires:	opie-devel}
 BuildRequires:	pam-devel
-Requires(post):	/sbin/ldconfig
+%{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	rpmbuild(macros) >= 1.268
+%{?with_sqlite:BuildRequires:	sqlite-devel}
+Requires:	pam >= 0.79.0
+Requires:	%{name}-libs = %{version}-%{release}
 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
 SASL protocol itself is documented in rfc2222; the API standard is a
 work in progress.
 
-%description -l pl
-Pakiet cyrus-sasl zawiera implementacjê biblioteki API SASL dla
+Note: remember to install appropriate plugins, or you won't have any
+authentication mechanisms available.
+
+%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.
 
-%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.
+Uwaga: aby były dostępne jakiekolwiek mechanizmy autoryzacji, należy
+doinstalować odpowiednie wtyczki.
+
+%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.UTF-8
+Пакет 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 -l ru
-ðÁËÅÔ cyrus-sasl ÓÏÄÅÒÖÉÔ ÒÅÁÌÉÚÁÃÉÀ Cyrus SASL. SASL - ÜÔÏ Simple
-Authentication and Security Layer, ÍÅÔÏÄ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÐÏÄÄÅÒÖËÉ
-ÁÕÔÅÎÔÉËÁÃÉÉ Ë ÐÒÏÔÏËÏÌÁÍ, ÏÓÎÏ×ÁÎÎÙÍ ÎÁ ÓÏÅÄÉÎÅÎÉÑÈ.
+%description libs
+cyrus-sasl library itself.
 
-%description -l uk
-ðÁËÅÔ cyrus-sasl ͦÓÔÉÔØ ÒÅÁ̦ÚÁæÀ Cyrus SASL. SASL - ÃÅ Simple
-Authentication and Security Layer, ÍÅÔÏÄ ÄÌÑ ÄÏÄÁÎÎÑ Ð¦ÄÔÒÉÍËÉ
-ÁÕÔÅÎÔÉËÁæ§ ÄÏ ÐÒÏÔÏËÏ̦×, ÂÁÚÏ×ÁÎÉÈ ÎÁ Ú'¤ÄÎÁÎÎÑÈ.
+%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(ru):	æÁÊÌÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú Â¦Â̦ÏÔÅËÏÀ 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}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 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}
+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 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}
+Requires:	%{name} = %{version}-%{release}
 
 %description cram-md5
 This plugin implements the SASL CRAM-MD5 mechanism. CRAM-MD5 is the
@@ -133,24 +187,24 @@ 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}
+Requires:	%{name} = %{version}-%{release}
 
 %description digest-md5
 This plugin implements the latest draft of the SASL DIGEST-MD5
@@ -158,26 +212,26 @@ 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
+Summary(pl.UTF-8):	Wtyczka plain do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL PLAIN
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description plain
 This plugin implements the SASL PLAIN mechanism. Although insecure,
@@ -185,56 +239,75 @@ 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 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.
 
-%description plain -l pt_BR
+%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.
+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
+Summary(pl.UTF-8):	Wtyczka anonymous do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL ANONYMOUS
 Group:		Libraries
-Requires:	%{name} = %{version}
+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
+%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
+%description anonymous -l pt_BR.UTF-8
 Este plugin implementa o mecanismo SASL ANONYMOUS, usado para
-autenticação anônima.
+autenticação anônima.
+
+%package gssapi
+Summary:	GSSAPI Cyrus SASL plugin
+Summary(pl.UTF-8):	Wtyczka GSSAPI do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL GSSAPI
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description gssapi
+This plugin implements the SASL GSSAPI mechanism, used for
+GSSAPI/Kerberos5 authentication.
+
+%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.UTF-8
+Este plugin implementa o mecanismo SASL GSSAPI, usado para
+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}
+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
+Summary(pl.UTF-8):	Wtyczka SRP do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL SRP
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description srp
 This plugin implements the SASL SRP mechanism, based on the Secure
@@ -242,100 +315,166 @@ 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
-Wtyczka dodaj±ca obs³ugê mechanizmu SRP do Cyrus SASL. Bazuje na
+%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.
+uwierzytelnienia i może dodawać warstwę bezpieczeństwa z wykrywaniem
+powtarzania, zabezpieczeniem integralności i/lub poufności.
 
-%description srp -l pt_BR
+%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
+(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 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}
+Requires:	%{name} = %{version}-%{release}
 
 %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.UTF-8):	Wtyczka OPIE do Cyrus SASL
+Summary(pt_BR.UTF-8):	Mecanismo SASL OPIE
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description opie
+This plugin implements the SASL OPIE (One Time Password) mechanism.
+
+%description opie -l pl.UTF-8
+Wtyczka dodająca obsługę mechanizmu OPIE (hasła jednorazowe) do Cyrus
 SASL.
 
 %package x509
 Summary:	x509 Cyrus SASL plugin
-Summary(pl):	Wtyczka x509 do Cyrus SASL
+Summary(pl.UTF-8):	Wtyczka x509 do Cyrus SASL
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description x509
 x509 Cyrus SASL plugin.
 
-%description x509 -l pl
+%description x509 -l pl.UTF-8
 Wtyczka x509 do Cyrus SASL.
 
 %package saslauthd
 Summary:	Cyrus SASL authd
-Summary(pl):	Demon authd do Cyrus SASL
-Group:		Libraries
-Requires(post,postun):	/sbin/chkconfig
-Requires:	%{name} = %{version}
+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
+%description saslauthd -l pl.UTF-8
 Demon authd do Cyrus SASL.
 
 %package pwcheck
 Summary:	Cyrus SASL pwcheck helper
-Summary(pl):	Program pomocniczy pwcheck do Cyrus SASL
+Summary(pl.UTF-8):	Program pomocniczy pwcheck do Cyrus SASL
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description pwcheck
 Cyrus SASL pwcheck helper.
 
-%description pwcheck -l pl
+%description pwcheck -l pl.UTF-8
 Program pomocniczy pwcheck do Cyrus SASL.
 
 %package sasldb
 Summary:	Cyrus SASL sasldb plugin
-Summary(pl):	Wtyczka sasldb do Cyrus SASL
+Summary(pl.UTF-8):	Wtyczka sasldb do Cyrus SASL
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description sasldb
 Cyrus SASL sasldb plugin.
 
-%description sasldb -l pl
+%description sasldb -l pl.UTF-8
 Wtyczka sasldb do Cyrus SASL.
 
 %package mysql
-Summary:	Cyrus SASL mysql plugin
-Summary(pl):	Wtyczka mysql do Cyrus SASL
+Summary:	Cyrus SASL MySQL plugin
+Summary(pl.UTF-8):	Wtyczka MySQL do Cyrus SASL
 Group:		Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
-Cyrus SASL mysql plugin.
+Cyrus SASL MySQL plugin.
+
+%description mysql -l pl.UTF-8
+Wtyczka MySQL do Cyrus SASL.
+
+%package pgsql
+Summary:	Cyrus SASL PostgreSQL plugin
+Summary(pl.UTF-8):	Wtyczka PostgreSQL do Cyrus SASL
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description pgsql
+Cyrus SASL PostgreSQL plugin.
+
+%description pgsql -l pl.UTF-8
+Wtyczka PostgreSQL do Cyrus SASL.
+
+%package sqlite
+Summary:	Cyrus SQLite PostgreSQL plugin
+Summary(pl.UTF-8):	Wtyczka SQLite do Cyrus SASL
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description sqlite
+Cyrus SASL SQLite plugin.
 
-%description mysql -l pl
-Wtyczka mysql do Cyrus SASL.
+%description sqlite -l pl.UTF-8
+Wtyczka SQLite 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 -n nagios-plugin-check_saslauthd -l pl.UTF-8
+Wtyczka Nagiosa do sprawdzania działania saslauthd.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%if %{with cryptedpw}
+%patch5 -p1
+%patch6 -p1
+%endif
+%patch7 -p1
+%patch8 -p1
+%patch9 -p2
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p0
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -343,9 +482,19 @@ ls rfc*.txt >> rfc-compliance
 rm -f rfc*.txt
 cd ..
 
-%build
+rm -rf autom4te.cache saslauthd/autom4te.cache
 # acinclude.m4 contains only old libtool.m4
-rm -f acinclude.m4 config/missing
+rm -f acinclude.m4 libtool config/libtool.m4 saslauthd/acinclude.m4
+
+# 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.8 saslauthd/saslauthd.mdoc saslauthd/LDAP_SASLAUTHD doc/sysadmin.html
+
+%build
 %{__libtoolize}
 %{__aclocal} -I cmulocal -I config
 %{__autoheader}
@@ -353,113 +502,155 @@ rm -f acinclude.m4 config/missing
 %{__autoconf}
 
 cd saslauthd
-	%{__aclocal} -I ../cmulocal -I ../config -I config
-	%{__autoheader}
-	%{__automake}
-	%{__autoconf}
+%{__libtoolize}
+%{__aclocal} -I ../cmulocal -I ../config -I config
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 cd ..
 
-LDFLAGS="%{rpmldflags} -ldl"; export LDFLAGS
 %configure \
-	--enable-static \
+	%{?with_cryptedpw: LDFLAGS=-lcrypt} \
+	--disable-krb4 \
+	%{!?with_gssapi: --disable-gssapi} \
+	%{?with_gssapi: --enable-gssapi --with-gss_impl=heimdal} \
 	--enable-login \
-	%{?_with_srp:--enable-srp} \
-	%{?!_without_mysql: --with-mysql=%{_prefix}} \
-	%{?!_without_ldap: --with-ldap=%{_prefix}} \
-	%{?_with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
-	--with-saslauthd=/var/lib/sasl2 \
-	--with-pam \
+	--enable-sample \
+	--enable-httpform \
+	--enable-sql \
+	%{?with_srp: --enable-srp} \
+	--enable-static \
+	--with-plugindir=%{_libdir}/sasl2 \
+	--with-configdir=%{_sysconfdir} \
 	--with-dblib=berkeley \
 	--with-dbpath=/var/lib/sasl2/sasl.db \
-	--with-configdir=%{_sysconfdir} \
-	--disable-krb4 \
-	--disable-gssapi
+	%{?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-pam \
+	%{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
+	--with-saslauthd=/var/lib/sasl2
 %{__make}
 
+%{__make} -C saslauthd testsaslauthd
+%{__make} -C saslauthd saslcache
+%{__make} -C sample sample-client sample-server
+
 cd doc
-RFCLIST=`grep 'rfc.\+\.txt' rfc-compliance`
+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
-cd ..
 
 %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 \
+	sasldir=%{_libdir}/sasl2 \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
 
-install {utils,saslauthd}/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+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
 
 touch $RPM_BUILD_ROOT/var/lib/sasl2/sasl.db
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install %{SOURCE3} ./cyrus.pam
+# create empty config
+touch $RPM_BUILD_ROOT%{_sysconfdir}/saslauthd.conf
+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 -p saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
+
+# sample programs for testing sasl
+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}
+
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
-echo "Remember to install appropriate plugins, or you won't have any mechs available."
-
-%postun -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %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
 
+%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}
 %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*
 
-%attr(640,root,mail) %ghost %config(noreplace) %verify(not mtime md5 size) /var/lib/sasl2/sasl.db
-%{_mandir}/man8/sasldblistusers2.*
-%{_mandir}/man8/saslpasswd2.*
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsasl2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsasl2.so.2
 
 %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/*
+%{_mandir}/man3/sasl*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsasl2.a
 
 %files anonymous
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libanonymous.so*
 
+%if %{with gssapi}
+%files gssapi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libgssapiv2.so*
+%endif
+
 %files cram-md5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libcrammd5.so*
@@ -476,6 +667,12 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libotp.so*
 
+%if %{with opie}
+%files opie
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libopie.so*
+%endif
+
 %files plain
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libplain.so*
@@ -484,25 +681,37 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libsasldb.so*
 
-%if %{!?_without_mysql:1}%{?_without_mysql:0}
+%if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/sasl2/libmysql*.so*
+%attr(755,root,root) %{_libdir}/sasl2/libmysql.so*
+%endif
+
+%if %{with pgsql}
+%files pgsql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libpgsql.so*
 %endif
 
-%if %{?_with_srp:1}%{?!_with_srp:0}
+%if %{with sqlite}
+%files sqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/sasl2/libsqlite.so*
+%endif
+
+%if %{with srp}
 %files srp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libsrp.so*
 %endif
 
-%if %{?_with_x509:1}%{?!_with_x509:0}
+%if %{with x509}
 %files x509
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl2/libx509.so*
 %endif
 
-%if %{?_with_pwcheck:1}%{?!_with_pwcheck:0}
+%if %{with pwcheck}
 %files pwcheck
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/pwcheck
@@ -511,7 +720,21 @@ 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.*
+%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*
+
+%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