- ac 2.5x fix, pl translations

- again: use /var/lib, not /var/state
- changed /var/lib/sasl/sasl.db perms to 600 (see system log)
- release 5

Changed files:
    cyrus-sasl.spec -> 1.45

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index ac39ba951d166069ecee70cdd775ab112d5ee2f0..06d84921ed599807959f86cec8c4e90c8c325e78 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -3,16 +3,20 @@
 # x509 - build x509 pluggin
 # srp - build srp pluggin
 #
-Summary:       The SASL library API for the Cyrus mail system.
+Summary:       The SASL library API for the Cyrus mail system
+Summary(pl):   Biblioteka Cyrus SASL
 Name:          cyrus-sasl
 Version:       1.5.27
-Release:       4
+Release:       5
 LIcense:       Distributable
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
 Source1:       saslauthd.init
 Source2:       saslauthd.sysconfig
@@ -21,8 +25,9 @@ Patch0:               %{name}-configdir.patch
 Patch1:                %{name}-des.patch
 Patch2:                %{name}-mysql-ldap.patch
 Patch3:                %{name}-saslauthd.patch
-#Patch4:               http://www.imasy.or.jp/~ume/ipv6/cyrus-sasl-1.5.24-ipv6-20010321.diff.gz
+#Patch4:       http://www.imasy.or.jp/~ume/ipv6/cyrus-sasl-1.5.24-ipv6-20010321.diff.gz
 Patch4:                %{name}-ipv6.patch
+Patch5:                %{name}-ac25x.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: db3-devel >= 3.1.17-8
@@ -46,135 +51,213 @@ systemu poczty elektronicznej Cyrusa.
 
 %package devel
 Summary:       Header files and documentation for cyrus-sasl
+Summary(pl):   Pliki nag³ówkowe i dokumentacja dla cyrus-sasl
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description devel
 Header files and documentation for cyrus-sasl.
 
+%description devel -l pl
+Pliki nag³ówkowe i dokumentacja dla cyrus-sasl.
+
 %package static
 Summary:       Static cyrus-sasl libraries
-Group:         Libraries
-Group(de):     Libraries
-Group(es):     Bibliotecas
-Group(fr):     Librairies
-Group(pl):     Biblioteki
+Summary(pl):   Statyczne biblioteki cyrus-sasl
+Group:         Development/Libraries
+Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
+Group(fr):     Development/Librairies
+Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
 Static cyrus-sasl libraries.
 
+%description static -l pl
+Statyczne biblioteki cyrus-sasl.
+
 %package cram-md5
-Summary:       Cram-MD5 Cyrus SASL pluggin
+Summary:       Cram-MD5 Cyrus SASL plugin
+Summary(pl):   Wtyczka Cram-MD5 do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description cram-md5
-Cram-MD5 Cyrus SASL pluggin.
+Cram-MD5 Cyrus SASL plugin.
+
+%description cram-md5 -l pl
+Wtyczka Cram-MD5 do Cyrus SASL.
 
 %package digest-md5
-Summary:       Digest-MD5 Cyrus SASL pluggin
+Summary:       Digest-MD5 Cyrus SASL plugin
+Summary(pl):   Wtyczka Digest-MD5 do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description digest-md5
-Digest-MD5 Cyrus SASL pluggin.
+Digest-MD5 Cyrus SASL plugin.
+
+%description digest-md5 -l pl
+Wtyczka Digest-MD5 do Cyrus SASL.
 
 %package plain
-Summary:       Plain Cyrus SASL pluggin
+Summary:       Plain Cyrus SASL plugin
+Summary(pl):   Wtyczka plain do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description plain
-Plain Cyrus SASL pluggin.
+Plain Cyrus SASL plugin.
+
+%description plain -l pl
+Wtyczka plain do Cyrus SASL.
 
 %package anonymous
-Summary:       Anonymous Cyrus SASL pluggin
+Summary:       Anonymous Cyrus SASL plugin
+Summary(pl):   Wtyczka anonymous do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description anonymous
-Anonymous Cyrus SASL pluggin.
+Anonymous Cyrus SASL plugin.
+
+%description anonymous -l pl
+Wtyczka anonymous do Cyrus SASL.
 
 %package login
-Summary:       Unsupported Login Cyrus SASL pluggin
+Summary:       Unsupported Login Cyrus SASL plugin
+Summary(pl):   Wtyczka Unsupported Login do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description login
-Unsupported Login Cyrus SASL pluggin.
+Unsupported Login Cyrus SASL plugin.
+
+%description login -l pl
+Wtyczka Unsupported Login do Cyrus SASL.
 
 %package srp
-Summary:       SRP Cyrus SASL pluggin
+Summary:       SRP Cyrus SASL plugin
+Summary(pl):   Wtyczka SRP do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description srp
-SRP Cyrus SASL pluggin.
+SRP Cyrus SASL plugin.
+
+%description srp -l pl
+Wtyczka SRP do Cyrus SASL.
 
 %package x509
-Summary:       x509 Cyrus SASL pluggin
+Summary:       x509 Cyrus SASL plugin
+Summary(pl):   Wtyczka x509 do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description x509
-x509 Cyrus SASL pluggin.
+x509 Cyrus SASL plugin.
+
+%description x509 -l pl
+Wtyczka x509 do Cyrus SASL.
 
 %package saslauthd
 Summary:       Cyrus SASL authd
+Summary(pl):   Demon authd do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description saslauthd
 Cyrus SASL authd.
 
+%description saslauthd -l pl
+Demon authd do Cyrus SASL.
+
 %package pwcheck
 Summary:       Cyrus SASL pwcheck helper
+Summary(pl):   Program pomocniczy pwcheck do Cyrus SASL
 Group:         Libraries
 Group(de):     Libraries
 Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description pwcheck
 Cyrus SASL pwcheck helper.
 
+%description pwcheck -l pl
+Program pomocniczy pwcheck do Cyrus SASL.
+
 %prep
 %setup  -q
 %patch0 -p1
@@ -182,6 +265,7 @@ Cyrus SASL pwcheck helper.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 rm -f config/missing
@@ -196,10 +280,10 @@ LDFLAGS="%{rpmldflags} -ldl"; export LDFLAGS
        --enable-login \
        %{?_with_srp:--enable-srp} \
        %{?_with_x509:--enable-x509} \
-       %{?_with_mysql: --with-mysql=/usr} \
-       %{?_with_ldap: --with-ldap=/usr} \
-       %{?_with_pwcheck: --with-pwcheck=/var/state/sasl} \
-       --with-saslauthd=/var/state/sasl \
+       %{?_with_mysql: --with-mysql=%{_prefix}} \
+       %{?_with_ldap: --with-ldap=%{_prefix}} \
+       %{?_with_pwcheck: --with-pwcheck=/var/lib/sasl} \
+       --with-saslauthd=/var/lib/sasl \
        --with-pam \
        --with-dblib=berkeley \
        --with-dbpath=/var/lib/sasl/sasl.db \
@@ -208,7 +292,7 @@ LDFLAGS="%{rpmldflags} -ldl"; export LDFLAGS
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/{state,lib}/sasl,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,pam.d}}
+install -d $RPM_BUILD_ROOT{/var/lib/sasl,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,pam.d}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -218,7 +302,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/cyrus
 
-%{__gzip} -9nf COPYING testing.txt NEWS TODO README doc/*.txt doc/*.html 
+gzip -9nf COPYING testing.txt NEWS TODO README doc/*.txt doc/*.html 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -247,13 +331,11 @@ fi
 %dir %{_sysconfdir}
 %dir %{_libdir}/sasl
 %dir /var/lib/sasl
-%dir /var/state/sasl
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-#%attr(755,root,root) %{_libdir}/sasl/lib*.so*
 %attr(755,root,root) %{_sbindir}/sasldblistusers
 %attr(755,root,root) %{_sbindir}/saslpasswd
 
-%config(noreplace) %verify(not mtime md5 size) /var/lib/sasl/sasl.db
+%attr(600,root,root) %config(noreplace) %verify(not mtime md5 size) /var/lib/sasl/sasl.db
 %{_mandir}/man[18]/*
 %doc *.gz doc/*.gz
 
@@ -263,61 +345,51 @@ fi
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 %{_libdir}/sasl/lib*.a
 
-
 %files cram-md5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libcrammd5.so*
 
-
 %files digest-md5
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libdigestmd5.so*
 
-
 %files plain
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libplain.so*
 
-
 %files anonymous
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libanonymous.so*
 
-
 %files login
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/liblogin.so*
 
-
 %if %{?_with_srp:1}%{?!_with_srp:0}
 %files srp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libsrp.so*
 %endif
 
-
 %if %{?_with_x509:1}%{?!_with_x509:0}
 %files x509
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/sasl/libx509.so*
 %endif
 
-
 %if %{?_with_pwcheck:1}%{?!_with_pwcheck:0}
 %files pwcheck
-%defattr(644,root,root,755) 
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/pwcheck
 %endif
 
-
 %files saslauthd
-%defattr(644,root,root,755) 
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/saslauthd
 %attr(755,root,root) /etc/rc.d/init.d/saslauthd
 %config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/saslauthd