+#
+# Conditional build:
+%bcond_without ldap # do not include LDAP support
+
Summary: Courier authentication library
Summary(pl.UTF-8): Biblioteka uwierzytelniania Couriera
Name: courier-authlib
-Version: 0.59
-Release: 0.1
-License: GPL
+Version: 0.71.4
+Release: 1
+License: GPL v3 with OpenSSL exception
Group: Networking/Daemons
-Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: dbfc58a17149fd0f8c0983662ecc8ba8
+Source0: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+# Source0-md5: 9c0a5657760065c4a49fcb7fc8b4b0e1
Source1: %{name}.init
-Patch0: %{name}-build.patch
-Patch1: %{name}-md5sum-passwords.patch
-Patch2: %{name}-authdaemonrc.patch
-Patch3: %{name}-nostatic.patch
-Patch4: %{name}-ltdl.patch
+Patch0: %{name}-md5sum-passwords.patch
+Patch1: %{name}-authdaemonrc.patch
+Patch2: %{name}-nostatic.patch
URL: http://www.courier-mta.org/authlib/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.63
BuildRequires: automake
+# just for librfc822.la, which is finally not used
+BuildRequires: courier-unicode-devel >= 2.1
BuildRequires: db-devel
BuildRequires: expect
-BuildRequires: libltdl-devel
-BuildRequires: libtool
+# just for librfc822.la, which is finally not used
+BuildRequires: libidn-devel >= 0.0.0
+BuildRequires: libltdl-devel >= 2:2
+BuildRequires: libtool >= 2:2
BuildRequires: mysql-devel
-BuildRequires: openldap-devel >= 2.3.0
+%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
BuildRequires: pam-devel
+BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: rpmbuild(macros) >= 1.304
+BuildRequires: sqlite3-devel >= 3
BuildRequires: sysconftool
BuildRequires: zlib-devel
-Requires(post,postun): /sbin/ldconfig
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: /sbin/chkconfig
Requires: rc-scripts
-Obsoletes: sqwebmail-auth-cram
-Obsoletes: sqwebmail-auth-pam
-Obsoletes: sqwebmail-auth-pwd
-Obsoletes: sqwebmail-auth-shadow
+Obsoletes: sqwebmail-auth-cram < 5
+Obsoletes: sqwebmail-auth-pam < 5
+Obsoletes: sqwebmail-auth-pwd < 5
+Obsoletes: sqwebmail-auth-shadow < 5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define schemadir /usr/share/openldap/schema
+# refers to tcpremoteip variable from daemon
+%define skip_post_check_so libauthpam.so.*
+
%description
The Courier authentication library provides authentication services
for other Courier applications.
dla innych aplikacji Couriera.
%package libs
-Summary: Courier authentication library
-Summary(pl.UTF-8): Biblioteka uwierzytelniania Couriera
+Summary: Courier authentication libraries
+Summary(pl.UTF-8): Biblioteki uwierzytelniania Couriera
Group: Libraries
-Requires(post,postun): /sbin/ldconfig
%description libs
-The Courier authentication library provides authentication services
+The Courier authentication libraries provide authentication services
for other Courier applications.
-This package contains libcourierauth.so which client programs link
-against.
-
%description libs -l pl.UTF-8
-Biblioteka uwierzytelniania Couriera dostarcza usługi uwierzytelniania
-dla innych aplikacji Couriera.
+Biblioteki uwierzytelniania Couriera dostarczają usługi
+uwierzytelniania dla innych aplikacji Couriera.
%package devel
-Summary: Development files for the Courier authentication library
-Summary(pl.UTF-8): Pliki programistyczne dla biblioteki uwierzytelniania Couriera
+Summary: Development files for the Courier authentication libraries
+Summary(pl.UTF-8): Pliki programistyczne dla bibliotek uwierzytelniania Couriera
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-authldap = %{version}-%{release}
-Requires: %{name}-authmysql = %{version}-%{release}
-Requires: %{name}-authpgsql = %{version}-%{release}
-Requires: %{name}-userdb = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package contains the development files needed to compile Courier
-packages that use this authentication library. Install this package in
-order to build the rest of the Courier packages. After they are built
-and installed this package can be removed. Files in this package are
-not needed at runtime.
+packages that use this authentication libraries. Install this package
+in order to build the rest of the Courier packages. After they are
+built and installed this package can be removed. Files in this package
+are not needed at runtime.
%description devel -l pl.UTF-8
Ten pakiet zawiera pliki programistyczne potrzebne do kompilacji
-pakietów Couriera używających biblioteki uwierzytelniania. Należy go
-zainstalować aby zbudować resztę pakietów Couriera. Po ich zbudowaniu
+pakietów Couriera używających bibliotek uwierzytelniania. Należy go
+zainstalować, aby zbudować resztę pakietów Couriera. Po ich zbudowaniu
i zainstalowaniu ten pakiet można usunąć. Pliki z tego pakietu nie są
potrzebne w czasie działania programów.
+%package authcustom
+Summary: Custom module for the Courier authentication library
+Summary(pl.UTF-8): Moduł custom dla biblioteki uwierzytelniania Couriera
+Group: Networking/Daemons
+Requires(pre,postun): sed >= 4.0
+Requires: %{name} = %{version}-%{release}
+
+%description authcustom
+Custom module for the Courier authentication library.
+
+%description authcustom -l pl.UTF-8
+Moduł custom dla biblioteki uwierzytelniania Couriera.
+
%package authldap
Summary: LDAP support for the Courier authentication library
Summary(pl.UTF-8): Obsługa LDAP dla biblioteki uwierzytelniania Couriera
Group: Networking/Daemons
Requires(pre,postun): sed >= 4.0
Requires: %{name} = %{version}-%{release}
-Obsoletes: courier-authldap
-Obsoletes: courier-imap-authldap
-Obsoletes: sqwebmail-auth-ldap
+Obsoletes: courier-authldap < 0.49
+Obsoletes: courier-imap-authldap < 4
+Obsoletes: sqwebmail-auth-ldap < 5
%description authldap
This package installs LDAP support for the Courier authentication
Group: Networking/Daemons
Requires(pre,postun): sed >= 4.0
Requires: %{name} = %{version}-%{release}
-Obsoletes: courier-authmysql
-Obsoletes: courier-imap-authmysql
-Obsoletes: sqwebmail-auth-mysql
+Obsoletes: courier-authmysql < 0.49
+Obsoletes: courier-imap-authmysql < 4
+Obsoletes: sqwebmail-auth-mysql < 5
%description authmysql
This package installs MySQL support for the Courier authentication
Couriera. Należy go zainstalować aby móc uwierzytelniać się z użyciem
MySQL.
+%package authpam
+Summary: PAM module for the Courier authentication library
+Summary(pl.UTF-8): Moduł PAM dla biblioteki uwierzytelniania Couriera
+Group: Networking/Daemons
+Requires(pre,postun): sed >= 4.0
+Requires: %{name} = %{version}-%{release}
+
+%description authpam
+PAM module for the Courier authentication library.
+
+%description authpam -l pl.UTF-8
+Moduł PAM dla biblioteki uwierzytelniania Couriera.
+
%package authpgsql
Summary: PostgreSQL support for the Courier authentication library
Summary(pl.UTF-8): Obsługa PostgreSQL dla biblioteki uwierzytelniania Couriera
Group: Networking/Daemons
Requires(pre,postun): sed >= 4.0
Requires: %{name} = %{version}-%{release}
-Obsoletes: courier-authpgsql
-Obsoletes: courier-imap-authpgsql
-Obsoletes: sqwebmail-auth-pgsql
+Obsoletes: courier-authpgsql < 0.49
+Obsoletes: courier-imap-authpgsql < 4
+Obsoletes: sqwebmail-auth-pgsql < 5
%description authpgsql
This package installs PostgreSQL support for the Courier
Couriera. Należy go zainstalować aby móc uwierzytelniać się z użyciem
PostgreSQL.
-%package userdb
+%package authpipe
+Summary: External authentication module that communicates via pipes
+Summary(pl.UTF-8): Zewnętrzny moduł uwierzytelniający komunikujący się przez potoki
+Group: Networking/Daemons
+Requires(pre,postun): sed >= 4.0
+Requires: %{name} = %{version}-%{release}
+Obsoletes: courier-authlib-pipe < 0.59.1-2
+
+%description authpipe
+This package installs the authpipe module, which is a generic plugin
+that enables authentication requests to be serviced by an external
+program, then communicates through messages on stdin and stdout.
+
+%description authpipe -l pl.UTF-8
+Pakiet ten instaluje moduł authpipe, który jest ogólną wtyczką
+umożliwiającą obsługę żądań uwierzytelnienia przez zewnętrzny program
+komunikujący się poprzez wiadomości wysyłane na stdin i stdout.
+
+%package authsqlite
+Summary: SQLite support for the Courier authentication library
+Summary(pl.UTF-8): Obsługa SQLite dla biblioteki uwierzytelniania Couriera
+Group: Networking/Daemons
+Requires(pre,postun): sed >= 4.0
+Requires: %{name} = %{version}-%{release}
+
+%description authsqlite
+This package installs SQLite support for the Courier authentication
+library. Install this package in order to be able to authenticate
+using SQLite.
+
+%description authsqlite -l pl.UTF-8
+Ten pakiet dodaje obsługę SQLite do biblioteki uwierzytelniania
+Couriera. Należy go zainstalować aby móc uwierzytelniać się z użyciem
+SQLite.
+
+%package authuserdb
Summary: Userdb support for the Courier authentication library
Summary(pl.UTF-8): Obsługa userdb dla biblioteki uwierzytelniania Couriera
Group: Networking/Daemons
Requires(pre,postun): sed >= 4.0
Requires: %{name} = %{version}-%{release}
-Obsoletes: courier-imap-userdb
-Obsoletes: sqwebmail-auth-userdb
+Obsoletes: courier-authlib-userdb < 0.59.1-2
+Obsoletes: courier-imap-userdb < 4
+Obsoletes: sqwebmail-auth-userdb < 5
-%description userdb
+%description authuserdb
This package installs the userdb support for the Courier
authentication library. Userdb is a simple way to manage virtual mail
accounts using a GDBM-based database file.
Install this package in order to be able to authenticate with userdb.
-%description userdb -l pl.UTF-8
+%description authuserdb -l pl.UTF-8
Ten pakiet dodaje obsługę userdb do biblioteki uwierzytelniania
Couriera. Userdb to prosty sposób zarządzania wirtualnymi kontami
pocztowymi przy użyciu pliku bazy danych opartej na GDBM.
Należy go zainstalować aby móc uwierzytelniać się z użyciem userdb.
-%package pipe
-Summary: External authentication module that communicates via pipes
-Summary(pl.UTF-8): Zewnętrzny moduł uwierzytelniający komunikujący się przez potoki
-Group: Networking/Daemons
-Requires(pre,postun): sed >= 4.0
-Requires: %{name} = %{version}-%{release}
-
-%description pipe
-This package installs the authpipe module, which is a generic plugin
-that enables authentication requests to be serviced by an external
-program, then communicates through messages on stdin and stdout.
-
-%description pipe -l pl.UTF-8
-Pakiet ten instaluje moduł authpipe, który jest ogólną wtyczką
-umożliwiającą obsługę żądań uwierzytelnienia przez zewnętrzny program
-komunikujący się poprzez wiadomości wysyłane na stdin i stdout.
-
%package -n openldap-schema-courier
Summary: Courier LDAP schema
Summary(pl.UTF-8): Schemat LDAP Couriera
Requires(post,postun): sed >= 4.0
Requires: openldap-servers
Requires: sed >= 4.0
+BuildArch: noarch
%description -n openldap-schema-courier
This package contains Courier authldap.schema for openldap.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-rm -rf libltdl
%build
-for d in . gdbmobj bdbobj md5 sha1 libhmac makedat userdb; do
-cd $d
- %{__libtoolize}
+%{__libtoolize}
+OLDDIR=`pwd`
+find -type f -a -name configure.ac | while read FILE; do
+ cd "$(dirname "$FILE")"
+
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-cd -
+
+ cd "$OLDDIR"
done
%configure \
+ --disable-ltdl-install \
+ --disable-static \
+ %{!?with_ldap:--without-authldap} \
--with-db=db \
--with-mailuser=daemon \
--with-mailgroup=daemon
-%{__make} \
+%{__make} -j1 \
LDFLAGS="%{rpmldflags} -lcrypt"
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/authlib/userdb,%{schemadir},%{_bindir}}
+# with no_la patch .so files are opened directly
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/courier-authlib/*.la
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-authlib
-install authldap.schema $RPM_BUILD_ROOT%{schemadir}/courier.schema
-install makedat/makedat $RPM_BUILD_ROOT%{_bindir}/makedat
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/authlib/userdb,%{schemadir},%{_bindir}}
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-authlib
+cp -p authldap.schema $RPM_BUILD_ROOT%{schemadir}/courier.schema
+install -p libs/makedat/makedat $RPM_BUILD_ROOT%{_bindir}/makedat
# make config files
./sysconftool $RPM_BUILD_ROOT%{_sysconfdir}/authlib/*.dist
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/authlib/*.dist
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/authlib/*.dist
touch $RPM_BUILD_ROOT%{_localstatedir}/spool/authdaemon/socket
-# remove static library - for now
-rm $RPM_BUILD_ROOT%{_libdir}/courier-authlib/*.a
-
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig %{_libexecdir}/courier-authlib
/sbin/chkconfig --add courier-authlib
%service courier-authlib restart "authlib daemon"
%service courier-authlib stop
fi
-%postun
-/sbin/ldconfig %{_libexecdir}/courier-authlib
-
-%post libs
-/sbin/ldconfig %{_libexecdir}/courier-authlib
+%post authcustom
+if [ "$1" = 1 ]; then
+ # add to authmodulelist list if package is first installed
+ %{__sed} -i -e '/^authmodulelist=/{/\bauthcustom\b/!s/"$/ authcustom"/}' /etc/authlib/authdaemonrc
+fi
+%service -q courier-authlib restart
-%postun libs
-/sbin/ldconfig %{_libexecdir}/courier-authlib
+%postun authcustom
+if [ "$1" = 0 ]; then
+ # remove from authmodulelist if package is removed
+ %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthldap\b \?//}' /etc/authlib/authdaemonrc
+fi
+%service -q courier-authlib restart
%post authldap
if [ "$1" = 1 ]; then
# add to authmodulelist list if package is first installed
%{__sed} -i -e '/^authmodulelist=/{/\bauthldap\b/!s/"$/ authldap"/}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
%postun authldap
# remove from authmodulelist if package is removed
%{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthldap\b \?//}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
%post authmysql
# add to authmodulelist list if package is first installed
%{__sed} -i -e '/^authmodulelist=/{/\bauthmysql\b/!s/"$/ authmysql"/}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
%postun authmysql
# remove from authmodulelist if package is removed
%{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthmysql\b \?//}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
+%service -q courier-authlib restart
+
+%post authpam
+if [ "$1" = 1 ]; then
+ # add to authmodulelist list if package is first installed
+ %{__sed} -i -e '/^authmodulelist=/{/\bauthpam\b/!s/"$/ authpam"/}' /etc/authlib/authdaemonrc
+fi
+%service -q courier-authlib restart
+
+%postun authpam
+if [ "$1" = 0 ]; then
+ # remove from authmodulelist if package is removed
+ %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthpam\b \?//}' /etc/authlib/authdaemonrc
+fi
%service -q courier-authlib restart
%post authpgsql
# add to authmodulelist list if package is first installed
%{__sed} -i -e '/^authmodulelist=/{/\bauthpgsql\b/!s/"$/ authpgsql"/}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
%postun authpgsql
# remove from authmodulelist if package is removed
%{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthpgsql\b \?//}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
-%post userdb
+%post authpipe
if [ "$1" = 1 ]; then
# add to authmodulelist list if package is first installed
- %{__sed} -i -e '/^authmodulelist=/{/\buserdb\b/!s/"$/ userdb"/}' /etc/authlib/authdaemonrc
+ %{__sed} -i -e '/^authmodulelist=/{/\bpipe\b/!s/"$/ pipe"/}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
-%postun userdb
+%postun authpipe
if [ "$1" = 0 ]; then
# remove from authmodulelist if package is removed
- %{__sed} -i -e '/^authmodulelist=/{s/ \?\buserdb\b \?//}' /etc/authlib/authdaemonrc
+ %{__sed} -i -e '/^authmodulelist=/{s/ \?\bpipe\b \?//}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
-%post pipe
+%post authsqlite
if [ "$1" = 1 ]; then
# add to authmodulelist list if package is first installed
- %{__sed} -i -e '/^authmodulelist=/{/\bpipe\b/!s/"$/ pipe"/}' /etc/authlib/authdaemonrc
+ %{__sed} -i -e '/^authmodulelist=/{/\bauthsqlite\b/!s/"$/ authsqlite"/}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
-%postun pipe
+%postun authsqlite
if [ "$1" = 0 ]; then
# remove from authmodulelist if package is removed
- %{__sed} -i -e '/^authmodulelist=/{s/ \?\bpipe\b \?//}' /etc/authlib/authdaemonrc
+ %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthsqlite\b \?//}' /etc/authlib/authdaemonrc
+fi
+%service -q courier-authlib restart
+
+%post authuserdb
+if [ "$1" = 1 ]; then
+ # add to authmodulelist list if package is first installed
+ %{__sed} -i -e '/^authmodulelist=/{/\buserdb\b/!s/"$/ userdb"/}' /etc/authlib/authdaemonrc
+fi
+%service -q courier-authlib restart
+
+%postun authuserdb
+if [ "$1" = 0 ]; then
+ # remove from authmodulelist if package is removed
+ %{__sed} -i -e '/^authmodulelist=/{s/ \?\buserdb\b \?//}' /etc/authlib/authdaemonrc
fi
-/sbin/ldconfig %{_libexecdir}/courier-authlib
%service -q courier-authlib restart
%post -n openldap-schema-courier
-%openldap_schema_register %{schemadir}/courier.schema -d nis,cosine
+%openldap_schema_register %{schemadir}/courier.schema -d misc,nis,cosine
%service -q ldap restart
%postun -n openldap-schema-courier
%service -q courier-authlib restart
fi
-%triggerin -n %{name}-userdb -- courier < 0.48
+%triggerin -n %{name}-authuserdb -- courier < 0.48
if [ -d /etc/courier/userdb ]; then
mv -f /etc/courier/userdb/* /etc/authlib/userdb
makeuserdb
makeuserdb
fi
-%triggerin -n %{name}-userdb -- courier-imap-userdb < 4.0.0
+%triggerin -n %{name}-authuserdb -- courier-imap-userdb < 4.0.0
if [ -d /etc/courier-imap/userdb ]; then
mv -f /etc/courier-imap/userdb/* /etc/authlib/userdb
makeuserdb
makeuserdb
fi
-%triggerin -n %{name}-userdb -- sqwebmail-auth-userdb < 5.0.0
+%triggerin -n %{name}-authuserdb -- sqwebmail-auth-userdb < 5.0.0
if [ -d /etc/sqwebmail/userdb ]; then
mv -f /etc/sqwebmail/userdb/* /etc/authlib/userdb
makeuserdb
%dir %{_sysconfdir}/authlib
%attr(754,root,root) /etc/rc.d/init.d/courier-authlib
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authdaemonrc
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/courier-authlib
+%endif
%attr(755,root,root) %{_libexecdir}/courier-authlib/authdaemond
%attr(755,root,root) %{_libexecdir}/courier-authlib/authsystem.passwd
%attr(755,root,root) %{_libexecdir}/courier-authlib/makedatprog
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthcustom.so.*.*.*
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthpam.so.*.*.*
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libcourierauthcommon.so.*.*.*
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libcourierauthsasl.so.*.*.*
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libcourierauthsaslclient.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthcustom.la
-%{_libexecdir}/courier-authlib/libauthpam.la
-%{_libexecdir}/courier-authlib/libcourierauth.la
-%{_libexecdir}/courier-authlib/libcourierauthcommon.la
-%{_libexecdir}/courier-authlib/libcourierauthsasl.la
-%{_libexecdir}/courier-authlib/libcourierauthsaslclient.la
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthcustom.so
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthpam.so
%attr(770,root,daemon) %dir %{_localstatedir}/spool/authdaemon
%attr(777,root,root) %ghost %{_localstatedir}/spool/authdaemon/socket
%attr(755,root,root) %{_sbindir}/authdaemond
%attr(755,root,root) %{_sbindir}/authpasswd
%attr(755,root,root) %{_sbindir}/authtest
%attr(755,root,root) %{_sbindir}/courierlogger
-%{_mandir}/man1/*
+%{_mandir}/man1/authpasswd.1*
+%{_mandir}/man1/authtest.1*
+%{_mandir}/man1/courierlogger.1*
%files libs
%defattr(644,root,root,755)
-%dir %{_libexecdir}/courier-authlib
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libcourierauth.so.*.*.*
+%dir %{_libdir}/courier-authlib
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauth.so.*
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthcommon.so.*
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsasl.so.*
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsaslclient.so.*
%files devel
%defattr(644,root,root,755)
%doc authlib.html auth_*.html
%attr(755,root,root) %{_bindir}/courierauthconfig
-%{_includedir}/*
-%{_mandir}/man3/*
-%attr(755,root,root) %{_libexecdir}/courier-authlib/*.so
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauth.so
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthcommon.so
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsasl.so
+%attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsaslclient.so
+%{_includedir}/courierauth*.h
+%{_mandir}/man3/auth_*.3*
+%{_mandir}/man3/authlib.3*
+
+%files authcustom
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthcustom.so*
+%if %{with ldap}
%files authldap
%defattr(644,root,root,755)
%doc authldap.schema README.ldap
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authldaprc
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthldap.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthldap.la
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthldap.so*
+%endif
%files authmysql
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authmysqlrc
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthmysql.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthmysql.la
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthmysql.so*
+
+%files authpam
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthpam.so*
%files authpgsql
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authpgsqlrc
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthpgsql.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthpgsql.la
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthpgsql.so*
+
+%files authpipe
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthpipe.so*
-%files userdb
+%files authsqlite
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authsqliterc
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthsqlite.so*
+
+%files authuserdb
%defattr(644,root,root,755)
%attr(700,root,root) %dir %{_sysconfdir}/authlib/userdb
%attr(755,root,root) %{_sbindir}/makeuserdb
%attr(755,root,root) %{_sbindir}/userdb
%attr(755,root,root) %{_sbindir}/userdb-test-cram-md5
%attr(755,root,root) %{_sbindir}/userdbpw
-%attr(755,root,root) %{_sbindir}/vchkpw2userdb
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthuserdb.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthuserdb.la
-%{_mandir}/man8/*userdb*
-
-%files pipe
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/courier-authlib/libauthpipe.so.*.*.*
-%{_libexecdir}/courier-authlib/libauthpipe.la
+%attr(755,root,root) %{_libdir}/courier-authlib/libauthuserdb.so*
+%{_mandir}/man8/makeuserdb.8*
+%{_mandir}/man8/pw2userdb.8*
+%{_mandir}/man8/userdb.8*
+%{_mandir}/man8/userdbpw.8*
+%if %{with ldap}
%files -n openldap-schema-courier
%defattr(644,root,root,755)
-%{schemadir}/*.schema
+%{schemadir}/courier.schema
+%endif