Hello community, here is the log from the commit of package courier-authlib for openSUSE:Leap:15.2 checked in at 2020-05-29 15:15:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/courier-authlib (Old) and /work/SRC/openSUSE:Leap:15.2/.courier-authlib.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "courier-authlib" Fri May 29 15:15:55 2020 rev:14 rq:810063 version:0.69.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/courier-authlib/courier-authlib.changes 2020-01-15 14:50:55.321433683 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.courier-authlib.new.3606/courier-authlib.changes 2020-05-29 15:16:04.395056896 +0200 @@ -1,0 +2,35 @@ +Tue Mar 17 01:16:53 UTC 2020 - Max Lin <mlin@suse.com> + +- BuildRequires postgresql-server-devel on Leap >= 15.2 + +------------------------------------------------------------------- +Tue Nov 12 15:01:52 UTC 2019 - Arjen de Korte <suse+build@de-korte.org> + +- update to 0.69.1 + * authldaplib.cpp (ldapopen): Make sure that we rebind if we reconnect, + if so configured. + * authldaplib.cpp: Fix handling of LDAP configurations that use the + same LDAP attribute for two or more variables. +- update to 0.69.0 + * authdaemond.c: set FD_CLOEXEC on socket file descriptors, to avoid + leaks to child processes. + * authldaplib.cpp: improve automatic reconnection logic to the LDAP + server. + * authsaslclient.h (SASL_LIST): Reorder SASL methods, strongest + first. +- add courier-authlib.keyring for source verification +- remove obsolete SysV courier-authdaemon.init +- cleanup spec + +------------------------------------------------------------------- +Tue Jun 11 12:38:04 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +------------------------------------------------------------------- +Tue Apr 9 06:36:29 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> + +- Add the missing dependencies for Tumbleweed. + +------------------------------------------------------------------- Old: ---- courier-authdaemon.init courier-authlib-0.68.0.tar.bz2 courier-authlib-0.68.0.tar.bz2.sig New: ---- courier-authlib-0.69.1.tar.bz2 courier-authlib-0.69.1.tar.bz2.sig courier-authlib.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-authlib.spec ++++++ --- /var/tmp/diff_new_pack.MYfTA8/_old 2020-05-29 15:16:05.183059466 +0200 +++ /var/tmp/diff_new_pack.MYfTA8/_new 2020-05-29 15:16:05.187059479 +0200 @@ -1,7 +1,7 @@ # # spec file for package courier-authlib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: courier-authlib +Version: 0.69.1 +Release: 0 Summary: Courier authentication library License: SUSE-GPL-3.0-with-openssl-exception Group: Productivity/Networking/Email/Servers -Version: 0.68.0 -Release: 0 -Url: http://www.courier-mta.org/imap/ -Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-%{version}.tar.bz2.sig -Source2: courier-authdaemon-rpmlintrc -Source11: courier-authdaemon.init +URL: https://www.courier-mta.org/imap/ +Source0: https://downloads.sourceforge.net/project/courier/authlib/%{version}/%{name}-%{version}.tar.bz2 +Source1: https://downloads.sourceforge.net/project/courier/authlib/%{version}/%{name}-%{version}.tar.bz2.sig +# Keyring downloaded from https://www.courier-mta.org/KEYS.bin#/%{name}.keyring +Source2: %{name}.keyring +Source3: courier-authdaemon-rpmlintrc Source12: courier-authdaemon.service Source13: courier-authlib.tmpfile Patch0: %{name}-authdaemonrc.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: coreutils BuildRequires: courier-unicode-devel >= 2.0 BuildRequires: expect BuildRequires: gcc-c++ @@ -40,17 +39,15 @@ BuildRequires: mysql-devel BuildRequires: openldap2-devel BuildRequires: pam-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: postgresql-devel >= 9.1 +BuildRequires: pkgconfig(systemd) +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 +BuildRequires: postgresql-server-devel +%endif BuildRequires: procps BuildRequires: sqlite3-devel -Requires: expect - -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd %{?systemd_requires} -%define has_systemd 1 -%endif %description The Courier authentication library provides authentication services for @@ -127,63 +124,41 @@ %patch0 %build -export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1" +export CFLAGS="%{optflags} -DLDAP_DEPRECATED=1" %configure \ --libexecdir=%{_prefix}/lib \ --datadir=%{_datadir}/courier-imap \ --sharedstatedir=%{_sharedstatedir}/%{name} \ -%if 0%{?has_systemd} - --with-piddir=/run \ -%else - --with-piddir=/var/run \ -%endif + --with-piddir=%{_rundir} \ --disable-root-check \ --enable-unicode \ -%if 0%{?has_systemd} - --with-authdaemonvar=/run/%{name} \ -%else - --with-authdaemonvar=%{_localstatedir}/run/%{name} \ -%endif + --with-authdaemonvar=%{_rundir}/%{name} \ --host=%{_host} --build=%{_build} --target=%{_target_platform} make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +%make_install mv %{buildroot}%{_libdir}/%{name}/lib*.so* %{buildroot}%{_libdir} rm -f %{buildroot}/%{_libdir}/%{name}/*.{a,la} install -m 755 sysconftool %{buildroot}/%{_prefix}/lib/%{name} install -m 755 authmigrate %{buildroot}/%{_prefix}/lib/%{name} -%if 0%{?has_systemd} -install -D -m 0644 %{S:12} %{buildroot}/%{_unitdir}/courier-authdaemon.service +install -D -m 0644 %{SOURCE12} %{buildroot}/%{_unitdir}/courier-authdaemon.service # systemd need to create a tmp dir: /run/courier-authlib -install -D -m 0644 %{S:13} %{buildroot}/%{_prefix}/lib/tmpfiles.d/%{name}.conf +install -d -m755 %{buildroot}%{_tmpfilesdir} +install -D -m 0644 %{SOURCE13} %{buildroot}%{_tmpfilesdir}/%{name}.conf ln -fs service %{buildroot}/%{_sbindir}/rccourier-authdaemon -%else -mkdir -p %{buildroot}/%{_sysconfdir}/init.d -install -m 755 %{S:11} %{buildroot}/%{_sysconfdir}/init.d/courier-authdaemon -ln -fs ../../%{_sysconfdir}/init.d/courier-authdaemon \ - %{buildroot}%{_sbindir}/rccourier-authdaemon -%endif %pre -%if 0%{?has_systemd} %service_add_pre courier-authdaemon.service -%endif %preun %if 0%{?suse_version} %stop_on_removal courier-authdaemon %endif -%if 0%{?has_systemd} %service_del_preun courier-authdaemon.service -%endif if [ "$1" = "0" ]; then for i in socket pid pid.lock; do -%if 0%{?has_systemd} - rm -f /run/%{name}/$i -%else - rm -f %{_localstatedir}/run/%{name}/$i -%endif + rm -f %{_rundir}/%{name}/$i done fi @@ -191,58 +166,31 @@ /sbin/ldconfig %{_prefix}/lib/%{name}/authmigrate >/dev/null %{_prefix}/lib/%{name}/sysconftool %{_sysconfdir}/authlib/*.dist >/dev/null - -%if 0%{?has_systemd} %service_add_post courier-authdaemon.service -# Create our dirs immediatly, after a manual package install. -# After a reboot systemd/aaa_base will take care. -install -d /run/%{name} -%else -%if 0%{?suse_version} -%{fillup_and_insserv -f courier-authdaemon} -%endif -install -d %{_localstatedir}/run/%{name} -%endif +%tmpfiles_create %{_prefix}/lib/tmpfiles.d/%{name}.conf %postun /sbin/ldconfig -%if 0%{?has_systemd} %service_del_postun courier-authdaemon.service -%else -%if 0%{?suse_version} -%restart_on_update courier-authdaemon -%insserv_cleanup -%endif -%endif %post userdb -p /sbin/ldconfig - %postun userdb -p /sbin/ldconfig - %post ldap -p /sbin/ldconfig - %postun ldap -p /sbin/ldconfig - %post mysql -p /sbin/ldconfig - %postun mysql -p /sbin/ldconfig - %post pgsql -p /sbin/ldconfig - %postun pgsql -p /sbin/ldconfig - %post pipe -p /sbin/ldconfig - %postun pipe -p /sbin/ldconfig - %post sqlite -p /sbin/ldconfig - %postun sqlite -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc README README*html -%doc NEWS COPYING* AUTHORS ChangeLog authldap.schema +%license COPYING* +%doc NEWS AUTHORS ChangeLog authldap.schema %dir %{_sysconfdir}/authlib %config %{_sysconfdir}/authlib/* %{_sbindir}/authdaemond @@ -251,12 +199,12 @@ %{_sbindir}/authtest %{_sbindir}/courierlogger %{_sbindir}/rccourier-authdaemon -%dir /usr/lib/%{name} -/usr/lib/%{name}/authmigrate -/usr/lib/%{name}/sysconftool -/usr/lib/%{name}/authdaemond -/usr/lib/%{name}/authsystem.passwd -/usr/lib/%{name}/makedatprog +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/authmigrate +%{_prefix}/lib/%{name}/sysconftool +%{_prefix}/lib/%{name}/authdaemond +%{_prefix}/lib/%{name}/authsystem.passwd +%{_prefix}/lib/%{name}/makedatprog %{_libdir}/libauthcustom.so %{_libdir}/libauthpam.so %{_libdir}/libcourierauth.so @@ -264,14 +212,9 @@ %{_libdir}/libcourierauthsasl.so %{_libdir}/libcourierauthsaslclient.so %{_mandir}/man1/* -%if 0%{?has_systemd} %{_unitdir}/courier-authdaemon.service %{_prefix}/lib/tmpfiles.d/%{name}.conf -%ghost %dir /run/%{name} -%else -%{_sysconfdir}/init.d/courier-authdaemon -%ghost %dir %{_localstatedir}/run/%{name} -%endif +%ghost %dir %{_rundir}/%{name} %files devel %defattr(-,root,root,-) ++++++ courier-authlib-0.68.0.tar.bz2 -> courier-authlib-0.69.1.tar.bz2 ++++++ ++++ 13905 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/ChangeLog new/courier-authlib-0.69.1/ChangeLog --- old/courier-authlib-0.68.0/ChangeLog 2017-07-02 16:42:16.000000000 +0200 +++ new/courier-authlib-0.69.1/ChangeLog 2019-07-25 01:57:35.000000000 +0200 @@ -1,3 +1,42 @@ +0.69.1 + +2019-07-23 Sam Varshavchik <mrsam@courier-mta.com> + + * authldaplib.cpp (ldapopen): Make sure that we rebind if we reconnect, + if so configured. + +2018-10-18 Sam Varshavchik <mrsam@courier-mta.com> + + * authldaplib.cpp: Fix handling of LDAP configurations that use the + same LDAP attribute for two or more variables. + +0.69.0 + +2018-08-16 Sam Varshavchik <mrsam@courier-mta.com> + + * authdaemond.c: set FD_CLOEXEC on socket file descriptors, to avoid + leaks to child processes. + +2018-05-25 Sam Varshavchik <mrsam@courier-mta.com> + + * authldaplib.cpp: improve automatic reconnection logic to the LDAP + server. + +2017-11-27 Sam Varshavchik <mrsam@courier-mta.com> + + * rpm packaging fixes. + +2017-09-08 Sam Varshavchik <mrsam@courier-mta.com> + + * courier-authlib.spec.in: Fix several problems with the package + scripts. Remove 'authdaemond stop' from %preun. Add explicit + systemctl daemon-reload to %post and %postun + +2017-07-23 Sam Varshavchik <mrsam@courier-mta.com> + + * authsaslclient.h (SASL_LIST): Reorder SASL methods, strongest + first. + 0.68.0 2017-03-16 Sam Varshavchik <mrsam@courier-mta.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/Makefile.am new/courier-authlib-0.69.1/Makefile.am --- old/courier-authlib-0.68.0/Makefile.am 2017-01-28 03:57:11.000000000 +0100 +++ new/courier-authlib-0.69.1/Makefile.am 2018-07-29 05:16:40.000000000 +0200 @@ -17,8 +17,8 @@ pkglibexec_SCRIPTS=authsystem.passwd pkglib_LTLIBRARIES=libcourierauth.la \ - libcourierauthsasl.la libcourierauthsaslclient.la \ - libcourierauthcommon.la $(modules) + libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \ + $(modules) sbin_SCRIPTS=authdaemond sbin_PROGRAMS=authtest authenumerate authpasswd bin_PROGRAMS=courierauthconfig @@ -363,10 +363,11 @@ authdaemondprog_SOURCES=authdaemond.c authdaemondcpp.cpp authdaemondprog_DEPENDENCIES=libcourierauthcommon.la \ + libcourierauth.la \ libs/liblock/liblock.la $(modules) \ libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \ libs/rfc822/libencode.la libs/numlib/libnumlib.la -authdaemondprog_LDADD=$(LIBLTDL) libcourierauthcommon.la libs/liblock/liblock.la \ +authdaemondprog_LDADD=$(LIBLTDL) libcourierauthcommon.la libcourierauth.la libs/liblock/liblock.la \ libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \ libs/rfc822/libencode.la libs/numlib/libnumlib.la authdaemondprog_LDFLAGS=-export-dynamic $(modules:%=-dlopen %) @NETLIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_enumerate.3 new/courier-authlib-0.69.1/auth_enumerate.3 --- old/courier-authlib-0.68.0/auth_enumerate.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_enumerate.3 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_enumerate -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_ENUMERATE" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_ENUMERATE" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_generic.3 new/courier-authlib-0.69.1/auth_generic.3 --- old/courier-authlib-0.68.0/auth_generic.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_generic.3 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_generic -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_GENERIC" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_GENERIC" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_getoption.3 new/courier-authlib-0.69.1/auth_getoption.3 --- old/courier-authlib-0.68.0/auth_getoption.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_getoption.3 2017-09-09 02:49:26.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_getoption -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_GETOPTION" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_GETOPTION" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_getuserinfo.3 new/courier-authlib-0.69.1/auth_getuserinfo.3 --- old/courier-authlib-0.68.0/auth_getuserinfo.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_getuserinfo.3 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_getuserinfo -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_GETUSERINFO" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_GETUSERINFO" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_login.3 new/courier-authlib-0.69.1/auth_login.3 --- old/courier-authlib-0.68.0/auth_login.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_login.3 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_login -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_LOGIN" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_LOGIN" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_mkhomedir.3 new/courier-authlib-0.69.1/auth_mkhomedir.3 --- old/courier-authlib-0.68.0/auth_mkhomedir.3 2015-11-04 16:15:08.000000000 +0100 +++ new/courier-authlib-0.69.1/auth_mkhomedir.3 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2015 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_mkhomedir -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/04/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_MKHOMEDIR" "3" "11/04/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_MKHOMEDIR" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_passwd.3 new/courier-authlib-0.69.1/auth_passwd.3 --- old/courier-authlib-0.68.0/auth_passwd.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_passwd.3 2017-09-09 02:49:26.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_passwd -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_PASSWD" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_PASSWD" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/auth_sasl.3 new/courier-authlib-0.69.1/auth_sasl.3 --- old/courier-authlib-0.68.0/auth_sasl.3 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/auth_sasl.3 2017-09-09 02:49:26.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004-2008 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: auth_sasl -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTH_SASL" "3" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTH_SASL" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -136,7 +136,8 @@ is a version of \fBauth_sasl\fR that recognizes the -EXTERNALSASL +EXTERNAL +SASL method\&. It takes an extra parameter, \fIexternalauth\fR\&. This parameter should be set to indicate an login that was authenticated via some other means, such as, perhaps, an SSL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authdaemond.c new/courier-authlib-0.69.1/authdaemond.c --- old/courier-authlib-0.68.0/authdaemond.c 2017-01-28 03:57:11.000000000 +0100 +++ new/courier-authlib-0.69.1/authdaemond.c 2018-08-17 02:11:21.000000000 +0200 @@ -1,5 +1,5 @@ /* -** Copyright 2000-2016 Double Precision, Inc. See COPYING for +** Copyright 2000-2018 Double Precision, Inc. See COPYING for ** distribution information. */ @@ -56,10 +56,11 @@ strcat(skun.sun_path, ".tmp"); unlink(skun.sun_path); if (bind(fd, (const struct sockaddr *)&skun, sizeof(skun)) || - listen(fd, SOMAXCONN) || - chmod(skun.sun_path, 0777) || - rename(skun.sun_path, AUTHDAEMONSOCK) || - fcntl(fd, F_SETFL, O_NONBLOCK) < 0) + listen(fd, SOMAXCONN) || + chmod(skun.sun_path, 0777) || + rename(skun.sun_path, AUTHDAEMONSOCK) || + fcntl(fd, F_SETFD, FD_CLOEXEC) < 0 || + fcntl(fd, F_SETFL, O_NONBLOCK) < 0) { perror(AUTHDAEMONSOCK); close(fd); @@ -1024,7 +1025,8 @@ saddr_len=sizeof(saddr); if ((fd=accept(s, &saddr, &saddr_len)) < 0) continue; - if (fcntl(fd, F_SETFL, 0) < 0) + if (fcntl(fd, F_SETFL, 0) < 0 || + fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) { perror("CRIT: fcntl() failed"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authdaemonrc.in new/courier-authlib-0.69.1/authdaemonrc.in --- old/courier-authlib-0.68.0/authdaemonrc.in 2016-01-05 02:20:05.000000000 +0100 +++ new/courier-authlib-0.69.1/authdaemonrc.in 2019-07-23 14:09:31.000000000 +0200 @@ -1,4 +1,4 @@ -##VERSION: $Id: 7b218a8185f424046f3ef3322a37443983e443e3-20160104202005$ +##VERSION: $Id:$ # # Copyright 2000-2005 Double Precision, Inc. See COPYING for # distribution information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authldaplib.cpp new/courier-authlib-0.69.1/authldaplib.cpp --- old/courier-authlib-0.68.0/authldaplib.cpp 2016-04-24 21:26:50.000000000 +0200 +++ new/courier-authlib-0.69.1/authldaplib.cpp 2019-07-24 19:03:46.000000000 +0200 @@ -9,6 +9,7 @@ #include <string> #include <sstream> #include <map> +#include <set> #include <vector> #include <algorithm> #include <cctype> @@ -53,8 +54,9 @@ public: LDAP *connection; + bool bound; - ldap_connection() : connection(0) {} + ldap_connection() : connection(0), bound(false) {} ~ldap_connection() { disconnect(); } bool connected() const { return connection != 0; } @@ -81,16 +83,38 @@ bool bind(const std::string &userid, const std::string &password) { + if (do_bind(userid, password)) + { + bound=true; + return true; + } + + return false; + } + +private: + bool do_bind(const std::string &userid, + const std::string &password) + { std::vector<char> buffer(password.begin(), password.end()); struct berval cred; cred.bv_len=buffer.size(); cred.bv_val=&buffer[0]; - return ok("ldap_sasl_bind_s", - ldap_sasl_bind_s(connection, userid.c_str(), - NULL, &cred, - NULL, NULL, NULL)); + if (connect() && + ok("ldap_sasl_bind_s", + ldap_sasl_bind_s(connection, userid.c_str(), + NULL, &cred, + NULL, NULL, NULL))) + return true; + + disconnect(); + return connect() && + ok("ldap_sasl_bind_s", + ldap_sasl_bind_s(connection, userid.c_str(), + NULL, &cred, + NULL, NULL, NULL)); } }; @@ -418,6 +442,8 @@ { if (connected()) return true; + bound=false; + DPRINTF("authldaplib: connecting to %s", authldaprc.ldap_uri.c_str()); if (ldapconncheck()) @@ -501,12 +527,13 @@ static int ldapopen() { - if (main_connection.connected()) return 0; - - if (!main_connection.connect()) - return 1; + if (!main_connection.connected()) + { + if (!main_connection.connect()) + return 1; + } - if (authldaprc.initbind) + if (authldaprc.initbind && !main_connection.bound) { /* Bind to server */ if (courier_authdebug_login_level >= 2) @@ -539,7 +566,7 @@ public: - std::map<std::string, std::string *> attributes; + std::map<std::string, std::vector<std::string *> > attributes; std::string attribute(const char *name, const char *default_value, @@ -550,7 +577,7 @@ authldaprc.config(name, value, false, default_value); if (!value.empty()) - attributes[value]=&return_value; + attributes[value].push_back(&return_value); return value; } }; @@ -559,10 +586,11 @@ public: - authldaprc_attribute_vector(const std::map<std::string, std::string *> - &attributes) + authldaprc_attribute_vector(const std::map<std::string, + std::vector<std::string *> > &attributes) { - for (std::map<std::string, std::string *>::const_iterator + for (std::map<std::string, std::vector<std::string *> > + ::const_iterator p=attributes.begin(); p != attributes.end(); ++p) { push_back(p->first); @@ -581,6 +609,8 @@ authldaprc_search_attributes(const std::vector<std::string> &attributes) : copy_buffer(attributes) { + std::set<std::string> dupes; + for (std::vector<std::string>::iterator p=copy_buffer.begin(); p != copy_buffer.end(); ++p) @@ -588,6 +618,9 @@ if (p->empty()) continue; + if (dupes.find(*p) != dupes.end()) + continue; + dupes.insert(*p); p->push_back(0); all_attributes_ptr.push_back(& (*p)[0]); } @@ -618,7 +651,8 @@ { struct timeval timeout_copy=timeout; - if (!conn.ok("ldap_search_ext_s", + if (!conn.connect() || + !conn.ok("ldap_search_ext_s", ldap_search_ext_s(conn.connection, basedn.c_str(), LDAP_SCOPE_SUBTREE, @@ -630,6 +664,21 @@ 100, &ptr))) { ptr=NULL; + conn.disconnect(); + if (!conn.connect() + || !conn.ok("ldap_search_ext_s", + ldap_search_ext_s(conn.connection, + basedn.c_str(), + LDAP_SCOPE_SUBTREE, + query.c_str(), + search_attributes(), + 0, + NULL, NULL, + &timeout_copy, + 100, &ptr))) + { + ptr=NULL; + } } } @@ -778,6 +827,21 @@ return true; } + bool operator()(const std::string &attrname, + const std::vector<std::string *> &values) + { + bool found=true; + + for (std::vector<std::string *>::const_iterator + b=values.begin(); + b != values.end(); ++b) + { + found=operator()(attrname, **b); + } + + return found; + } + std::string options() { size_t i; @@ -1161,10 +1225,10 @@ authldap_get_values get_value(main_connection.connection, entry, dn.c_str()); - for (std::map<std::string, std::string *>::iterator + for (std::map<std::string, std::vector<std::string *> >::iterator p=attributes.begin(); p != attributes.end(); ++p) { - get_value(p->first, *p->second); + get_value(p->first, p->second); } au=authldaprc.uid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authlib.3.in new/courier-authlib-0.69.1/authlib.3.in --- old/courier-authlib-0.68.0/authlib.3.in 2015-11-04 16:15:08.000000000 +0100 +++ new/courier-authlib-0.69.1/authlib.3.in 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004-2015 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: authlib -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 11/04/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTHLIB" "3" "11/04/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTHLIB" "3" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authpasswd.1 new/courier-authlib-0.69.1/authpasswd.1 --- old/courier-authlib-0.68.0/authpasswd.1 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/authpasswd.1 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004-2008 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: authpasswd -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTHPASSWD" "1" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTHPASSWD" "1" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authsaslclient.h new/courier-authlib-0.69.1/authsaslclient.h --- old/courier-authlib-0.68.0/authsaslclient.h 2013-09-10 14:42:15.000000000 +0200 +++ new/courier-authlib-0.69.1/authsaslclient.h 2017-07-24 02:10:16.000000000 +0200 @@ -20,11 +20,11 @@ #define SASL_LIST \ SASL("EXTERNAL", NO_SERVER_FUNC(), authsaslclient_external) \ - SASL("PLAIN", SERVER_FUNC(authsasl_plain), authsaslclient_plain) \ - SASL("LOGIN", SERVER_FUNC(authsasl_login), authsaslclient_login) \ - SASL("CRAM-MD5", SERVER_FUNC(authsasl_cram), authsaslclient_crammd5) \ + SASL("CRAM-SHA256", SERVER_FUNC(authsasl_cram), authsaslclient_cramsha256) \ SASL("CRAM-SHA1", SERVER_FUNC(authsasl_cram), authsaslclient_cramsha1) \ - SASL("CRAM-SHA256", SERVER_FUNC(authsasl_cram), authsaslclient_cramsha256) + SASL("CRAM-MD5", SERVER_FUNC(authsasl_cram), authsaslclient_crammd5) \ + SASL("PLAIN", SERVER_FUNC(authsasl_plain), authsaslclient_plain) \ + SASL("LOGIN", SERVER_FUNC(authsasl_login), authsaslclient_login) /* A list of SASL client functions */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/authtest.1 new/courier-authlib-0.69.1/authtest.1 --- old/courier-authlib-0.68.0/authtest.1 2015-06-20 14:58:37.000000000 +0200 +++ new/courier-authlib-0.69.1/authtest.1 2017-09-09 02:49:25.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 2004 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: authtest -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "AUTHTEST" "1" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "AUTHTEST" "1" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/compile new/courier-authlib-0.69.1/compile --- old/courier-authlib-0.68.0/compile 2016-06-28 15:40:13.000000000 +0200 +++ new/courier-authlib-0.69.1/compile 2018-03-08 21:15:51.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/configure.ac new/courier-authlib-0.69.1/configure.ac --- old/courier-authlib-0.68.0/configure.ac 2017-07-02 16:41:18.000000000 +0200 +++ new/courier-authlib-0.69.1/configure.ac 2019-07-25 01:57:47.000000000 +0200 @@ -1,11 +1,11 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl -dnl Copyright 1998 - 2016 Double Precision, Inc. See COPYING for +dnl Copyright 1998 - 2019 Double Precision, Inc. See COPYING for dnl distribution information. AC_PREREQ(2.63) -AC_INIT([courier-authlib],[0.68.0],[courier-users@lists.sourceforge.net]) +AC_INIT([courier-authlib],[0.69.1],[courier-users@lists.sourceforge.net]) AC_CONFIG_SRCDIR([courierauth.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/courier-authlib.lpspec new/courier-authlib-0.69.1/courier-authlib.lpspec --- old/courier-authlib-0.68.0/courier-authlib.lpspec 2017-07-02 16:46:41.000000000 +0200 +++ new/courier-authlib-0.69.1/courier-authlib.lpspec 2019-07-25 02:02:23.000000000 +0200 @@ -3,7 +3,7 @@ # distribution information. Name: courier-authlib -Version: 0.68.0 +Version: 0.69.1 Release: 1 License: GPLv3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/courier-authlib.spec new/courier-authlib-0.69.1/courier-authlib.spec --- old/courier-authlib-0.68.0/courier-authlib.spec 2017-07-02 16:46:41.000000000 +0200 +++ new/courier-authlib-0.69.1/courier-authlib.spec 2019-07-25 02:02:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 1998 - 2010 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2017 Double Precision, Inc. See COPYING for # distribution information. # No dist tag from mock; detect mandrake, redhat, etc. the old fashioned way @@ -14,7 +14,7 @@ ################################################################################ Name: courier-authlib -Version: 0.68.0 +Version: 0.69.1 Release: 1%{?dist}%{?courier_release} Summary: Courier authentication library @@ -24,7 +24,7 @@ ################################################################################ -Source: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,6 +45,7 @@ %if 0%(rpm -q redhat-release >/dev/null 2>&1 || rpm -q fedora-release >/dev/null 2>&1 || exit 0; echo "1") BuildRequires: redhat-rpm-config +BuildRequires: /usr/bin/ps %endif %if %using_systemd @@ -283,16 +284,15 @@ /bin/systemctl stop courier-authlib.service || : fi %systemd_post courier-authlib.service +if [ $1 -eq 1 ] +then + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %else /sbin/chkconfig --del courier-authlib /sbin/chkconfig --add courier-authlib %endif %preun -if test -x %{_sbindir}/authdaemond -then - %{_sbindir}/authdaemond stop >/dev/null 2>&1 || /bin/true -fi - if test "$1" = "0" then %if %using_systemd @@ -304,6 +304,10 @@ %postun %if %using_systemd +if [ $1 -eq 0 ] +then + /bin/systemctl daemon-reload +fi %systemd_postun_with_restart courier-authlib.service %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/courier-authlib.spec.in new/courier-authlib-0.69.1/courier-authlib.spec.in --- old/courier-authlib-0.68.0/courier-authlib.spec.in 2016-04-17 05:23:25.000000000 +0200 +++ new/courier-authlib-0.69.1/courier-authlib.spec.in 2018-07-29 05:16:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 1998 - 2010 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2017 Double Precision, Inc. See COPYING for # distribution information. # No dist tag from mock; detect mandrake, redhat, etc. the old fashioned way @@ -24,7 +24,7 @@ ################################################################################ -Source: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,6 +45,7 @@ %if 0%(rpm -q redhat-release >/dev/null 2>&1 || rpm -q fedora-release >/dev/null 2>&1 || exit 0; echo "1") BuildRequires: redhat-rpm-config +BuildRequires: /usr/bin/ps %endif %if %using_systemd @@ -283,16 +284,15 @@ /bin/systemctl stop courier-authlib.service || : fi %systemd_post courier-authlib.service +if [ $1 -eq 1 ] +then + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %else /sbin/chkconfig --del courier-authlib /sbin/chkconfig --add courier-authlib %endif %preun -if test -x %{_sbindir}/authdaemond -then - %{_sbindir}/authdaemond stop >/dev/null 2>&1 || /bin/true -fi - if test "$1" = "0" then %if %using_systemd @@ -304,6 +304,10 @@ %postun %if %using_systemd +if [ $1 -eq 0 ] +then + /bin/systemctl daemon-reload +fi %systemd_postun_with_restart courier-authlib.service %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/courier_auth_config.h new/courier-authlib-0.69.1/courier_auth_config.h --- old/courier-authlib-0.68.0/courier_auth_config.h 2016-09-05 01:37:40.000000000 +0200 +++ new/courier-authlib-0.69.1/courier_auth_config.h 2018-10-18 17:48:05.000000000 +0200 @@ -204,7 +204,7 @@ /* #undef LTDL_DLOPEN_DEPLIBS */ /* Define to the system default library search path. */ -#define LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/bind99:/usr/lib64/dyninst:/usr/lib64/llvm:/usr/lib64/mysql" +#define LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64//bind9-export/:/usr/lib64/mysql:/usr/lib64/dyninst" /* The archive extension */ #define LT_LIBEXT "a" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/liblock/Makefile.am new/courier-authlib-0.69.1/libs/liblock/Makefile.am --- old/courier-authlib-0.68.0/libs/liblock/Makefile.am 2013-08-25 20:50:44.000000000 +0200 +++ new/courier-authlib-0.69.1/libs/liblock/Makefile.am 2017-07-25 01:43:36.000000000 +0200 @@ -41,5 +41,5 @@ ../docbook/sgml2html lockmail.sgml lockmail.html lockmail.1: lockmail.sgml ../docbook/sgml2man - ../docbook/sgml2man lockmail.sgml lockmail.1 + ../docbook/sgml2man lockmail.sgml lockmail.1 "--stringparam man.base.url.for.relative.links http://www.courier-mta.org/" endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/liblock/lockmail.1 new/courier-authlib-0.69.1/libs/liblock/lockmail.1 --- old/courier-authlib-0.68.0/libs/liblock/lockmail.1 2015-06-20 14:58:35.000000000 +0200 +++ new/courier-authlib-0.69.1/libs/liblock/lockmail.1 2017-09-09 02:49:16.000000000 +0200 @@ -3,13 +3,13 @@ .\"<!-- distribution information. --> .\" Title: lockmail .\" Author: Sam Varshavchik -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Courier Mail Server .\" Language: English .\" -.TH "LOCKMAIL" "1" "06/20/2015" "Courier Mail Server" "Double Precision, Inc\&." +.TH "LOCKMAIL" "1" "09/08/2017" "Courier Mail Server" "Double Precision, Inc\&." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -179,7 +179,8 @@ .PP \fBlockmail\fR terminates with the same exit status as -\fIprogram\fR\fBlockmail\fR +\fIprogram\fR +\fBlockmail\fR terminates with the EX_TEMPFAIL exit status if it was unable to obtain a lock, or if @@ -199,5 +200,5 @@ .IP " 1." 4 \fBmaildrop\fR(1) .RS 4 -\%[set $man.base.url.for.relative.links]/maildrop.html +\%http://www.courier-mta.org/maildrop.html .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/makedat/makedat.in new/courier-authlib-0.69.1/libs/makedat/makedat.in --- old/courier-authlib-0.68.0/libs/makedat/makedat.in 2017-02-08 10:00:15.000000000 +0100 +++ new/courier-authlib-0.69.1/libs/makedat/makedat.in 2018-05-23 10:00:23.000000000 +0200 @@ -111,6 +111,7 @@ foreach ( Net::CIDR::cidr2octets( Net::CIDR::range2cidr($net))) { + print ":" if $net =~ /:/; print "$_\t$line\n"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/rfc822/Makefile.am new/courier-authlib-0.69.1/libs/rfc822/Makefile.am --- old/courier-authlib-0.68.0/libs/rfc822/Makefile.am 2015-02-28 16:52:17.000000000 +0100 +++ new/courier-authlib-0.69.1/libs/rfc822/Makefile.am 2017-07-25 01:43:36.000000000 +0200 @@ -39,7 +39,7 @@ ../docbook/sgml2html rfc822.sgml rfc822.html rfc822.3: rfc822.sgml ../docbook/sgml2html - ../docbook/sgml2man rfc822.sgml rfc822.3 + ../docbook/sgml2man rfc822.sgml rfc822.3 "--stringparam man.base.url.for.relative.links http://www.courier-mta.org/" endif check-am: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/rfc822/configure.ac new/courier-authlib-0.69.1/libs/rfc822/configure.ac --- old/courier-authlib-0.68.0/libs/rfc822/configure.ac 2014-02-16 10:00:07.000000000 +0100 +++ new/courier-authlib-0.69.1/libs/rfc822/configure.ac 2017-10-04 01:27:12.000000000 +0200 @@ -64,23 +64,13 @@ AC_TRY_COMPILE([ #include <time.h> ],[ -int main() -{ time_t t=altzone; - - return (0); -} ], librfc822_cv_SYS_TIMEZONE=altzone, AC_TRY_COMPILE([ #include <time.h> ],[ -int main() -{ int n=daylight; - - return (0); -} ], librfc822_cv_SYS_TIMEZONE=daylight, AC_TRY_COMPILE([ @@ -88,12 +78,7 @@ extern struct tm dummy; ],[ -int main() -{ long n=dummy.tm_gmtoff; - - return (0); -} ] ,librfc822_cv_SYS_TIMEZONE=tm_gmtoff, librfc822_cv_SYS_TIMEZONE=unknown ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/libs/rfc822/rfc2047u.c new/courier-authlib-0.69.1/libs/rfc822/rfc2047u.c --- old/courier-authlib-0.68.0/libs/rfc822/rfc2047u.c 2015-02-28 16:52:17.000000000 +0100 +++ new/courier-authlib-0.69.1/libs/rfc822/rfc2047u.c 2017-09-20 10:00:18.000000000 +0200 @@ -131,7 +131,7 @@ if (chset == NULL) { - s.chset="iso-8859-1"; + s.chset="utf-8"; } else { @@ -991,7 +991,7 @@ } if (i) - (*callback)("iso-8859-1", "", text, i, ptr); + (*callback)("utf-8", "", text, i, ptr); text += i; @@ -1006,7 +1006,7 @@ if (rc == 0) { - (*callback)("iso-8859-1", "", text, 2, ptr); + (*callback)("utf-8", "", text, 2, ptr); text += 2; continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/missing new/courier-authlib-0.69.1/missing --- old/courier-authlib-0.68.0/missing 2016-06-28 15:40:13.000000000 +0200 +++ new/courier-authlib-0.69.1/missing 2018-03-08 21:15:51.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/userdb/makeuserdb.8.in new/courier-authlib-0.69.1/userdb/makeuserdb.8.in --- old/courier-authlib-0.68.0/userdb/makeuserdb.8.in 2015-06-20 14:58:34.000000000 +0200 +++ new/courier-authlib-0.69.1/userdb/makeuserdb.8.in 2017-09-09 02:49:07.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 1998 - 2007 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: makeuserdb -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "MAKEUSERDB" "8" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "MAKEUSERDB" "8" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/userdb/userdb.8.in new/courier-authlib-0.69.1/userdb/userdb.8.in --- old/courier-authlib-0.68.0/userdb/userdb.8.in 2015-06-20 14:58:34.000000000 +0200 +++ new/courier-authlib-0.69.1/userdb/userdb.8.in 2017-09-09 02:49:07.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 1998 - 2007 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: userdb -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "USERDB" "8" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "USERDB" "8" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/userdb/userdbpw.8.in new/courier-authlib-0.69.1/userdb/userdbpw.8.in --- old/courier-authlib-0.68.0/userdb/userdbpw.8.in 2015-06-20 14:58:34.000000000 +0200 +++ new/courier-authlib-0.69.1/userdb/userdbpw.8.in 2017-09-09 02:49:07.000000000 +0200 @@ -2,14 +2,14 @@ .\" <!-- Copyright 1998 - 2007 Double Precision, Inc. See COPYING for --> .\" <!-- distribution information. --> .\" Title: userdbpw -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 06/20/2015 +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 09/08/2017 .\" Manual: Double Precision, Inc. .\" Source: Double Precision, Inc. .\" Language: English .\" -.TH "USERDBPW" "8" "06/20/2015" "Double Precision, Inc." "Double Precision, Inc." +.TH "USERDBPW" "8" "09/08/2017" "Double Precision, Inc." "Double Precision, Inc." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-authlib-0.68.0/userdb/userdbpw.c new/courier-authlib-0.69.1/userdb/userdbpw.c --- old/courier-authlib-0.68.0/userdb/userdbpw.c 2016-09-05 01:37:21.000000000 +0200 +++ new/courier-authlib-0.69.1/userdb/userdbpw.c 2018-07-29 05:16:40.000000000 +0200 @@ -105,7 +105,9 @@ int md5=0; char buf[BUFSIZ]; char salt[9]; +#if HAVE_BCRYPT char *cryptsalt; +#endif #if HAVE_HMAC struct hmac_hashinfo *hmac=0; #endif