%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(ru.UTF-8): Библиотека Cyrus SASL
Summary(uk.UTF-8): Бібліотека Cyrus SASL
Name: cyrus-sasl
-Version: 2.1.22
-Release: 14
+Version: 2.1.23
+Release: 10
License: distributable
Group: Libraries
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz
-# Source0-md5: 45dde9d19193ae9dd388eb68b2027bc9
+# Source0-md5: 2eb0e48106f0e9cd8001e654f267ecbc
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
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 >= 2.54
-BuildRequires: automake
+BuildRequires: automake >= 1:1.7
%{?with_authlib:BuildRequires: courier-authlib-devel}
BuildRequires: db-devel
BuildRequires: ed
BuildRequires: groff
-%{?with_gssapi:BuildRequires: krb5-devel}
+%{?with_gssapi:BuildRequires: heimdal-devel}
BuildRequires: libtool >= 1.4
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
BuildRequires: openssl-devel >= 0.9.7d
%{?with_opie:BuildRequires: opie-devel}
BuildRequires: pam-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
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.UTF-8): Pliki nagłówkowe i dokumentacja dla 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
%patch0 -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
# acinclude.m4 contains only old libtool.m4
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
%{?with_cryptedpw: LDFLAGS=-lcrypt} \
--disable-krb4 \
%{!?with_gssapi: --disable-gssapi} \
- %{?with_gssapi: --enable-gssapi --with-gss_impl=mit} \
+ %{?with_gssapi: --enable-gssapi --with-gss_impl=heimdal} \
--enable-login \
--enable-sample \
+ --enable-httpform \
--enable-sql \
%{?with_srp: --enable-srp} \
--enable-static \
%{__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
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
rm -f $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
# 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}
+
+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 -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post saslauthd
/sbin/chkconfig --add saslauthd
/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
# 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(755,root,root) %{_libdir}/libsasl2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsasl2.so.2
-%dir %{_libdir}/sasl2
-%dir %{_sysconfdir}
%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.2
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsasl2.so
%files saslauthd
%defattr(644,root,root,755)
-%doc cyrus.pam saslauthd/{AUTHORS,LDAP_SASLAUTHD}
+%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
+%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
projects / packages / cyrus-sasl.git / blobdiff