From: Jakub Bogusz Date: Mon, 19 Mar 2018 20:35:13 +0000 (+0100) Subject: - updated to 0.68.0 X-Git-Tag: auto/th/courier-authlib-0.68.0-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcourier-authlib.git;a=commitdiff_plain;h=48b54e20ad8293f979eb5d47bc8147dfdbaa09b4 - updated to 0.68.0 - updated md5sum-passwords,nostatic patches - removed outdated ltdl patch - add no_la patch, drop .la files --- diff --git a/courier-authlib-ltdl.patch b/courier-authlib-ltdl.patch deleted file mode 100644 index 6501c38..0000000 --- a/courier-authlib-ltdl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u courier-authlib-0.65.0.orig/Makefile.am courier-authlib-0.65.0/Makefile.am ---- courier-authlib-0.65.0.orig/Makefile.am 2013-08-04 10:43:06.000000000 +0000 -+++ courier-authlib-0.65.0/Makefile.am 2013-08-04 10:46:20.512179254 +0000 -@@ -4,7 +4,7 @@ - - AUTOMAKE_OPTIONS=dist-bzip2 - --SUBDIRS=gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb unicode rfc822 random128 liblock liblog -+SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb unicode rfc822 random128 liblock liblog - - INCLUDES = $(LTDLINCL) - diff --git a/courier-authlib-md5sum-passwords.patch b/courier-authlib-md5sum-passwords.patch index 11a1142..21ca448 100644 --- a/courier-authlib-md5sum-passwords.patch +++ b/courier-authlib-md5sum-passwords.patch @@ -14,9 +14,8 @@ diff -ur courier-authlib-0.56.orig/checkpasswordmd5.c courier-authlib-0.56/check } return (-1); } -diff -ur courier-authlib-0.56.orig/md5/md5.h courier-authlib-0.56/md5/md5.h ---- courier-authlib-0.56.orig/md5/md5.h 2002-12-12 05:23:58.000000000 +0100 -+++ courier-authlib-0.56/md5/md5.h 2005-08-09 12:26:27.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/md5/md5.h 2002-12-12 05:23:58.000000000 +0100 ++++ courier-authlib-0.68.0/md5/libs/md5.h 2005-08-09 12:26:27.000000000 +0200 @@ -56,6 +56,7 @@ const char *md5_hash_courier(const char *); @@ -25,9 +24,8 @@ diff -ur courier-authlib-0.56.orig/md5/md5.h courier-authlib-0.56/md5/md5.h #ifdef __cplusplus } ; -diff -ur courier-authlib-0.56.orig/md5/md5_hash.c courier-authlib-0.56/md5/md5_hash.c ---- courier-authlib-0.56.orig/md5/md5_hash.c 2002-12-12 05:23:58.000000000 +0100 -+++ courier-authlib-0.56/md5/md5_hash.c 2005-08-09 12:24:05.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/md5/md5_hash.c 2002-12-12 05:23:58.000000000 +0100 ++++ courier-authlib-0.68.0/libs/md5/md5_hash.c 2005-08-09 12:24:05.000000000 +0200 @@ -11,6 +11,8 @@ static const char base64tab[]= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/courier-authlib-no_la.patch b/courier-authlib-no_la.patch new file mode 100644 index 0000000..401778f --- /dev/null +++ b/courier-authlib-no_la.patch @@ -0,0 +1,23 @@ +--- courier-authlib-0.68.0/authdaemond.c.orig 2017-01-28 03:57:11.000000000 +0100 ++++ courier-authlib-0.68.0/authdaemond.c 2018-03-19 19:12:27.664936669 +0100 +@@ -114,7 +114,10 @@ + + fprintf(stderr, "INFO: Installing %s\n", buf); + p += i; +- h=lt_dlopenext(buf); ++ sprintf(buf2, "courier_%s_init", buf+3); ++ ++ strcat(buf, ".so"); ++ h=lt_dlopen(buf); + + if (h == NULL) + { +@@ -122,8 +125,6 @@ + continue; + } + +- sprintf(buf2, "courier_%s_init", buf+3); +- + pt=lt_dlsym(h, buf2); + if (pt == NULL) + { diff --git a/courier-authlib-nostatic.patch b/courier-authlib-nostatic.patch index 239769c..c212b8d 100644 --- a/courier-authlib-nostatic.patch +++ b/courier-authlib-nostatic.patch @@ -1,6 +1,5 @@ -diff -ur courier-authlib-0.60.5.orig/bdbobj/Makefile.am courier-authlib-0.60.5/bdbobj/Makefile.am ---- courier-authlib-0.60.5.orig/bdbobj/Makefile.am 2008-05-08 18:00:52.000000000 +0200 -+++ courier-authlib-0.60.5/bdbobj/Makefile.am 2008-05-29 15:33:05.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/bdbobj/Makefile.am 2008-05-08 18:00:52.000000000 +0200 ++++ courier-authlib-0.68.0/libs/bdbobj/Makefile.am 2008-05-29 15:33:05.000000000 +0200 @@ -20,7 +20,6 @@ testbdb_DEPENDENCIES=libbdbobj.la @@ -9,9 +8,8 @@ diff -ur courier-authlib-0.60.5.orig/bdbobj/Makefile.am courier-authlib-0.60.5/b check-am: $(srcdir)/testsuite | cmp -s - $(srcdir)/testsuite.txt -diff -ur courier-authlib-0.60.5.orig/gdbmobj/Makefile.am courier-authlib-0.60.5/gdbmobj/Makefile.am ---- courier-authlib-0.60.5.orig/gdbmobj/Makefile.am 2008-05-08 18:00:52.000000000 +0200 -+++ courier-authlib-0.60.5/gdbmobj/Makefile.am 2008-05-29 15:33:36.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/gdbmobj/Makefile.am 2008-05-08 18:00:52.000000000 +0200 ++++ courier-authlib-0.68.0/libs/gdbmobj/Makefile.am 2008-05-29 15:33:36.000000000 +0200 @@ -20,7 +20,6 @@ testgdbm_DEPENDENCIES=libgdbmobj.la @@ -20,9 +18,8 @@ diff -ur courier-authlib-0.60.5.orig/gdbmobj/Makefile.am courier-authlib-0.60.5/ check-am: $(srcdir)/testsuite | cmp -s - $(srcdir)/testsuite.txt -diff -ur courier-authlib-0.60.5.orig/libhmac/Makefile.am courier-authlib-0.60.5/libhmac/Makefile.am ---- courier-authlib-0.60.5.orig/libhmac/Makefile.am 2007-07-21 22:12:29.000000000 +0200 -+++ courier-authlib-0.60.5/libhmac/Makefile.am 2008-05-29 15:33:27.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/libhmac/Makefile.am 2007-07-21 22:12:29.000000000 +0200 ++++ courier-authlib-0.68.0/libs/libhmac/Makefile.am 2008-05-29 15:33:27.000000000 +0200 @@ -15,12 +15,10 @@ md5hmactest_SOURCES=md5hmactest.c md5hmactest_DEPENDENCIES=libhmac.la @hashlibs@ @@ -36,9 +33,8 @@ diff -ur courier-authlib-0.60.5.orig/libhmac/Makefile.am courier-authlib-0.60.5/ EXTRA_DIST=md5hmactest.txt sha1hmactest.txt -diff -ur courier-authlib-0.60.5.orig/liblock/Makefile.am courier-authlib-0.60.5/liblock/Makefile.am ---- courier-authlib-0.60.5.orig/liblock/Makefile.am 2007-07-21 22:12:29.000000000 +0200 -+++ courier-authlib-0.60.5/liblock/Makefile.am 2008-05-29 15:33:02.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/liblock/Makefile.am 2007-07-21 22:12:29.000000000 +0200 ++++ courier-authlib-0.68.0/libs/liblock/Makefile.am 2008-05-29 15:33:02.000000000 +0200 @@ -32,7 +32,6 @@ lockmail_SOURCES=lockmail.c lockmail_DEPENDENCIES=liblock.la ../numlib/libnumlib.la @@ -47,28 +43,25 @@ diff -ur courier-authlib-0.60.5.orig/liblock/Makefile.am courier-authlib-0.60.5/ noinst_DATA=lockmail.html lockmail.1 EXTRA_DIST=lockfcntl.c lockflock.c locklockf.c locktest.c $(noinst_DATA) -diff -ur courier-authlib-0.60.5.orig/liblog/Makefile.am courier-authlib-0.60.5/liblog/Makefile.am ---- courier-authlib-0.60.5.orig/liblog/Makefile.am 2007-08-30 03:53:08.000000000 +0200 -+++ courier-authlib-0.60.5/liblog/Makefile.am 2008-05-29 15:33:30.000000000 +0200 -@@ -13,7 +13,6 @@ +--- courier-authlib-0.68.0/liblog/Makefile.am.orig 2018-03-18 18:44:52.505942103 +0100 ++++ courier-authlib-0.68.0/liblog/Makefile.am 2018-03-18 18:45:27.955941698 +0100 +@@ -12,7 +12,6 @@ courierlogger_SOURCES=logger.c - courierlogger_DEPENDENCIES=../liblock/liblock.la ../numlib/libnumlib.la - courierlogger_LDADD=../liblock/liblock.la ../numlib/libnumlib.la + courierlogger_DEPENDENCIES=../libs/liblock/liblock.la ../libs/numlib/libnumlib.la + courierlogger_LDADD=../libs/liblock/liblock.la ../libs/numlib/libnumlib.la -courierlogger_LDFLAGS=-static if HAVE_SGML - courierlogger.html: courierlogger.sgml ../docbook/sgml2html -diff -ur courier-authlib-0.60.5.orig/makedat/Makefile.am courier-authlib-0.60.5/makedat/Makefile.am ---- courier-authlib-0.60.5.orig/makedat/Makefile.am 2008-05-08 18:00:53.000000000 +0200 -+++ courier-authlib-0.60.5/makedat/Makefile.am 2008-05-29 15:33:21.000000000 +0200 + courierlogger.html: courierlogger.sgml ../libs/docbook/sgml2html +--- courier-authlib-0.68.0.orig/libs/makedat/Makefile.am 2008-05-08 18:00:53.000000000 +0200 ++++ courier-authlib-0.68.0/libs/makedat/Makefile.am 2008-05-29 15:33:21.000000000 +0200 @@ -11,4 +11,3 @@ makedatprog_SOURCES=makedatprog.c makedatprog_DEPENDENCIES=@dblibrary@ makedatprog_LDADD=@dblibrary@ -makedatprog_LDFLAGS=-static -diff -ur courier-authlib-0.60.5.orig/Makefile.am courier-authlib-0.60.5/Makefile.am ---- courier-authlib-0.60.5.orig/Makefile.am 2008-05-08 19:20:38.000000000 +0200 -+++ courier-authlib-0.60.5/Makefile.am 2008-05-29 15:32:56.000000000 +0200 +--- courier-authlib-0.68.0.orig/Makefile.am 2008-05-08 19:20:38.000000000 +0200 ++++ courier-authlib-0.68.0/Makefile.am 2008-05-29 15:32:56.000000000 +0200 @@ -346,7 +346,6 @@ authdaemontest_SOURCES=authdaemontest.c authdaemontest_DEPENDENCIES=libcourierauthcommon.la @@ -77,9 +70,8 @@ diff -ur courier-authlib-0.60.5.orig/Makefile.am courier-authlib-0.60.5/Makefile authmksock_SOURCES=authmksock.c authmksock_LDADD=@NETLIBS@ -diff -ur courier-authlib-0.60.5.orig/md5/Makefile.am courier-authlib-0.60.5/md5/Makefile.am ---- courier-authlib-0.60.5.orig/md5/Makefile.am 2007-07-21 22:12:29.000000000 +0200 -+++ courier-authlib-0.60.5/md5/Makefile.am 2008-05-29 15:32:59.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/md5/Makefile.am 2007-07-21 22:12:29.000000000 +0200 ++++ courier-authlib-0.68.0/libs/md5/Makefile.am 2008-05-29 15:32:59.000000000 +0200 @@ -21,7 +21,6 @@ md5test_SOURCES=md5test.c md5test_DEPENDENCIES=libmd5.la @@ -88,25 +80,23 @@ diff -ur courier-authlib-0.60.5.orig/md5/Makefile.am courier-authlib-0.60.5/md5/ EXTRA_DIST=md5test.txt hmac.c -diff -ur courier-authlib-0.60.5.orig/rfc822/Makefile.am courier-authlib-0.60.5/rfc822/Makefile.am ---- courier-authlib-0.60.5.orig/rfc822/Makefile.am 2007-07-21 22:12:29.000000000 +0200 -+++ courier-authlib-0.60.5/rfc822/Makefile.am 2008-05-29 15:33:14.000000000 +0200 +--- courier-authlib-0.68.0/libs/rfc822/Makefile.am.orig 2018-03-18 18:47:57.425939991 +0100 ++++ courier-authlib-0.68.0/libs/rfc822/Makefile.am 2018-03-18 18:49:04.825939219 +0100 @@ -25,12 +25,10 @@ testsuite_SOURCES=testsuite.c - testsuite_DEPENDENCIES=librfc822.la ../unicode/libunicode.la - testsuite_LDADD=librfc822.la ../unicode/libunicode.la + testsuite_DEPENDENCIES=librfc822.la + testsuite_LDADD=librfc822.la -lcourier-unicode -testsuite_LDFLAGS=-static reftest_SOURCES=reftest.c imaprefs.h - reftest_DEPENDENCIES=librfc822.la ../unicode/libunicode.la - reftest_LDADD=librfc822.la ../unicode/libunicode.la + reftest_DEPENDENCIES=librfc822.la + reftest_LDADD=librfc822.la -lcourier-unicode -reftest_LDFLAGS=-static EXTRA_DIST=testsuite.txt reftest.txt $(BUILT_SOURCES) -diff -ur courier-authlib-0.60.5.orig/sha1/Makefile.am courier-authlib-0.60.5/sha1/Makefile.am ---- courier-authlib-0.60.5.orig/sha1/Makefile.am 2007-07-21 22:12:29.000000000 +0200 -+++ courier-authlib-0.60.5/sha1/Makefile.am 2008-05-29 15:33:33.000000000 +0200 +--- courier-authlib-0.68.0.orig/libs/sha1/Makefile.am 2007-07-21 22:12:29.000000000 +0200 ++++ courier-authlib-0.68.0/libs/sha1/Makefile.am 2008-05-29 15:33:33.000000000 +0200 @@ -20,7 +20,6 @@ testsuite_SOURCES=testsuite.c testsuite_DEPENDENCIES=libsha1.la @@ -115,9 +105,8 @@ diff -ur courier-authlib-0.60.5.orig/sha1/Makefile.am courier-authlib-0.60.5/sha EXTRA_DIST=testsuite.txt hmac.c -diff -ur courier-authlib-0.60.5.orig/userdb/Makefile.am courier-authlib-0.60.5/userdb/Makefile.am ---- courier-authlib-0.60.5.orig/userdb/Makefile.am 2008-05-08 19:20:40.000000000 +0200 -+++ courier-authlib-0.60.5/userdb/Makefile.am 2008-05-29 15:33:17.000000000 +0200 +--- courier-authlib-0.68.0.orig/userdb/Makefile.am 2008-05-08 19:20:40.000000000 +0200 ++++ courier-authlib-0.68.0/userdb/Makefile.am 2008-05-29 15:33:17.000000000 +0200 @@ -17,7 +17,6 @@ userdbpw_SOURCES=userdbpw.c diff --git a/courier-authlib.spec b/courier-authlib.spec index 7f3b522..c8fa96f 100644 --- a/courier-authlib.spec +++ b/courier-authlib.spec @@ -5,33 +5,37 @@ Summary: Courier authentication library Summary(pl.UTF-8): Biblioteka uwierzytelniania Couriera Name: courier-authlib -Version: 0.65.0 -Release: 4 +Version: 0.68.0 +Release: 1 License: GPL v3 with OpenSSL exception Group: Networking/Daemons Source0: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2 -# Source0-md5: e9287e33b0e70ea3745517b4d719948d +# Source0-md5: 50b67ed13de80eb83ad50e57d8023433 Source1: %{name}.init Patch0: %{name}-md5sum-passwords.patch Patch1: %{name}-authdaemonrc.patch Patch2: %{name}-nostatic.patch -Patch3: %{name}-ltdl.patch +Patch3: %{name}-no_la.patch URL: http://www.courier-mta.org/authlib/ BuildRequires: autoconf >= 2.63 BuildRequires: automake +# just for librfc822.la, which is finally not used +BuildRequires: courier-unicode-devel >= 2.0 BuildRequires: db-devel BuildRequires: expect +# for librfc822.la +BuildRequires: libidn-devel >= 0.0.0 BuildRequires: libltdl-devel >= 2:2 BuildRequires: libtool >= 2:2 BuildRequires: mysql-devel %{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} BuildRequires: pam-devel +BuildRequires: pkgconfig BuildRequires: postgresql-devel BuildRequires: rpmbuild(macros) >= 1.304 BuildRequires: sqlite3-devel BuildRequires: sysconftool BuildRequires: zlib-devel -Requires(post,postun): /sbin/ldconfig Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{version}-%{release} Requires: /sbin/chkconfig @@ -56,7 +60,6 @@ dla innych aplikacji Couriera. Summary: Courier authentication library Summary(pl.UTF-8): Biblioteka uwierzytelniania Couriera Group: Libraries -Requires(post,postun): /sbin/ldconfig %description libs The Courier authentication library provides authentication services @@ -238,21 +241,14 @@ Ten pakiet zawiera schemat Couriera authldap.schema dla openldapa. %patch3 -p1 %build -# Change Makefile.am files and force recreate Makefile.in's. +%{__libtoolize} OLDDIR=`pwd` -find -type f -a \( -name configure.in -o -name configure.ac \) | while read FILE; do - cd "`dirname "$FILE"`" +find -type f -a -name configure.ac | while read FILE; do + cd "$(dirname "$FILE")" - if [ -f Makefile.am ]; then - sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am - fi - - %{__libtoolize} %{__aclocal} %{__autoconf} - if grep -q AC_CONFIG_HEADER configure.in; then - %{__autoheader} - fi + %{__autoheader} %{__automake} cd "$OLDDIR" @@ -260,6 +256,7 @@ done %configure \ --disable-ltdl-install \ + --disable-static \ %{!?with_ldap:--without-authldap} \ --with-db=db \ --with-mailuser=daemon \ @@ -274,11 +271,13 @@ rm -rf $RPM_BUILD_ROOT %{__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 -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 makedat/makedat $RPM_BUILD_ROOT%{_bindir}/makedat +install -p libs/makedat/makedat $RPM_BUILD_ROOT%{_bindir}/makedat # make config files ./sysconftool $RPM_BUILD_ROOT%{_sysconfdir}/authlib/*.dist @@ -286,14 +285,10 @@ install -p makedat/makedat $RPM_BUILD_ROOT%{_bindir}/makedat 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 %{_libdir}/courier-authlib /sbin/chkconfig --add courier-authlib %service courier-authlib restart "authlib daemon" @@ -304,21 +299,11 @@ if [ "$1" = "0" ]; then %service courier-authlib stop fi -%postun -/sbin/ldconfig %{_libdir}/courier-authlib - -%post libs -/sbin/ldconfig %{_libdir}/courier-authlib - -%postun libs -/sbin/ldconfig %{_libdir}/courier-authlib - %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 %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authldap @@ -326,7 +311,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthldap\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post authmysql @@ -334,7 +318,6 @@ if [ "$1" = 1 ]; then # add to authmodulelist list if package is first installed %{__sed} -i -e '/^authmodulelist=/{/\bauthmysql\b/!s/"$/ authmysql"/}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authmysql @@ -342,7 +325,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthmysql\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post authpgsql @@ -350,7 +332,6 @@ if [ "$1" = 1 ]; then # add to authmodulelist list if package is first installed %{__sed} -i -e '/^authmodulelist=/{/\bauthpgsql\b/!s/"$/ authpgsql"/}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authpgsql @@ -358,7 +339,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthpgsql\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post authpipe @@ -366,7 +346,6 @@ if [ "$1" = 1 ]; then # add to authmodulelist list if package is first installed %{__sed} -i -e '/^authmodulelist=/{/\bpipe\b/!s/"$/ pipe"/}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authpipe @@ -374,7 +353,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\bpipe\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post authsqlite @@ -382,7 +360,6 @@ if [ "$1" = 1 ]; then # add to authmodulelist list if package is first installed %{__sed} -i -e '/^authmodulelist=/{/\bauthsqlite\b/!s/"$/ authsqlite"/}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authsqlite @@ -390,7 +367,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\bauthsqlite\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post authuserdb @@ -398,7 +374,6 @@ 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 -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %postun authuserdb @@ -406,7 +381,6 @@ if [ "$1" = 0 ]; then # remove from authmodulelist if package is removed %{__sed} -i -e '/^authmodulelist=/{s/ \?\buserdb\b \?//}' /etc/authlib/authdaemonrc fi -/sbin/ldconfig %{_libdir}/courier-authlib %service -q courier-authlib restart %post -n openldap-schema-courier @@ -574,25 +548,17 @@ fi %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) %{_libdir}/courier-authlib/libauthcustom.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthcustom.so.0 %attr(755,root,root) %{_libdir}/courier-authlib/libauthpam.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthpam.so.0 %attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthcommon.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libcourierauthcommon.so.0 %attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsasl.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libcourierauthsasl.so.0 %attr(755,root,root) %{_libdir}/courier-authlib/libcourierauthsaslclient.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libcourierauthsaslclient.so.0 -%{_libdir}/courier-authlib/libauthcustom.la -%{_libdir}/courier-authlib/libauthpam.la -%{_libdir}/courier-authlib/libcourierauth.la -%{_libdir}/courier-authlib/libcourierauthcommon.la -%{_libdir}/courier-authlib/libcourierauthsasl.la -%{_libdir}/courier-authlib/libcourierauthsaslclient.la %attr(770,root,daemon) %dir %{_localstatedir}/spool/authdaemon %attr(777,root,root) %ghost %{_localstatedir}/spool/authdaemon/socket %attr(755,root,root) %{_sbindir}/authdaemond @@ -608,7 +574,6 @@ fi %defattr(644,root,root,755) %dir %{_libdir}/courier-authlib %attr(755,root,root) %{_libdir}/courier-authlib/libcourierauth.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libcourierauth.so.0 %files devel %defattr(644,root,root,755) @@ -625,36 +590,25 @@ fi %doc authldap.schema README.ldap %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/authlib/authldaprc %attr(755,root,root) %{_libdir}/courier-authlib/libauthldap.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthldap.so.0 -%{_libdir}/courier-authlib/libauthldap.la -%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) %{_libdir}/courier-authlib/libauthmysql.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthmysql.so.0 -%{_libdir}/courier-authlib/libauthmysql.la %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) %{_libdir}/courier-authlib/libauthpgsql.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthpgsql.so.0 -%{_libdir}/courier-authlib/libauthpgsql.la %files authpipe %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/courier-authlib/libauthpipe.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthpipe.so.0 -%{_libdir}/courier-authlib/libauthpipe.la %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 -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthsqlite.so.0 -%{_libdir}/courier-authlib/libauthsqlite.la %files authuserdb %defattr(644,root,root,755) @@ -665,9 +619,8 @@ fi %attr(755,root,root) %{_sbindir}/userdb-test-cram-md5 %attr(755,root,root) %{_sbindir}/userdbpw %attr(755,root,root) %{_libdir}/courier-authlib/libauthuserdb.so -%attr(755,root,root) %ghost %{_libdir}/courier-authlib/libauthuserdb.so.0 -%{_libdir}/courier-authlib/libauthuserdb.la %{_mandir}/man8/makeuserdb.8* +%{_mandir}/man8/pw2userdb.8* %{_mandir}/man8/userdb.8* %{_mandir}/man8/userdbpw.8*