Request 3076 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 3076 (accepted)

Initial checkin

Created by mollekopf almost 2 years ago
In state accepted
Open review for kolab-developers

Submit package home:mollekopf...lab:Winterfell / aspell-en to package Kolab:16:Testing / aspell-en

aspell-en.spec Added

@@ -0,0 +1,208 @@
+%define lang en
+%define langrelease 0
+%define aspellversion 6
+Summary: English dictionaries for Aspell
+Name: aspell-%{lang}
+Epoch: 50
+Version: 2020.12.07
+Release: 6%{?dist}
+License: MIT and BSD
+URL: http://aspell.net/
+Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}.tar.bz2
+Buildrequires: aspell >= 12:0.60
+BuildRequires: make
+Requires: aspell >= 12:0.60
+Obsoletes: aspell-en-gb <= 0.33.7.1
+Obsoletes: aspell-en-ca <= 0.33.7.1
+Supplements: (aspell and langpacks-en)
+Supplements: (aspell and langpacks-en_GB)
+
+%define debug_package %{nil}
+
+%description
+Provides the word list/dictionaries for the following: English, Canadian
+English, British English
+
+%prep
+%setup -q -n aspell%{aspellversion}-%{lang}-%{version}-%{langrelease}
+
+%build
+./configure
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%files
+%doc Copyright
+%{_libdir}/aspell-0.60/*
+
+%changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 50:2020.12.07-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 50:2020.12.07-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 50:2020.12.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Feb  3 2021 Peter Oliver <rpm@mavit.org.uk> - 50:2020.12.07-3
+- Recommend the installation of these dictionaries when both aspell and an English langpack are installed.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 50:2020.12.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec 11 2020 Nikola Forró <nforro@redhat.com> - 50:2020.12.07-1
+- Update to version 2020.12.07
+  resolves #1905302
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 50:2019.10.06-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 50:2019.10.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Oct 08 2019 Nikola Forró <nforro@redhat.com> - 50:2019.10.06-1
+- Update to version 2019.10.06
+  resolves #1758940
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 50:2018.04.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 50:2018.04.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 50:2018.04.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Apr 17 2018 Nikola Forró <nforro@redhat.com> - 50:2018.04.16-1
+- Update to version 2018.04.16
+  resolves #1568393
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 50:2017.08.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Aug 29 2017 Nikola Forró <nforro@redhat.com> - 50:2017.08.24-1
+- Update to version 2017.08.24
+  resolves #1485079
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 50:2015.04.24-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 50:2015.04.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 50:2015.04.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 50:2015.04.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Nov 24 2015 Nikola Forró <nforro@redhat.com> - 50:2015.04.24-1
+- Update to version 2015.04.24
+  resolves #1284167
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 17 2011 Ivana Hutarova Varekova <varekova@redhat.com> 50:7.1-1
+- update to aspell6-en-7.1
+
+* Mon Jan  3 2011 Ivana Hutarova Varekova <varekova@redhat.com> 50:7.0-1
+- update to aspell6-en-7.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:6.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 50:6.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 50:6.0-9
+- Autorebuild for GCC 4.3
+
+* Thu Aug 30 2007 Ivana Varekova <varekova@redhat.com> - 50:6.0-8
+- fix #62225 - add practice to gb world lists
+
+* Fri Mar 30 2007 Ivana Varekova <varekova@redhat.com> - 50:6.0-7
+- add version to obstolete flag
+
+* Thu Mar 29 2007 Ivana Varekova <varekova@redhat.com> - 50:6.0-5
+- add documentation
+- change license tag
+
+* Thu Mar 29 2007 Ivana Varekova <varekova@redhat.com> - 50:6.0-4
+- update default buildroot
+
+* Thu Mar 29 2007 Ivana Varekova <varekova@redhat.com> - 50:6.0-3
+- update to aspell6
+- use configure script to create Makefile
+- some minor spec changes
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 50:6.0-2.1
+- rebuild
+
+* Fri Mar  3 2006 Ivana Varekova <varekova@redhat.com> - 50:6.0-2
+- removed "offencive" (#154352), add "practice" (#62225)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 50:6.0-1.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 50:6.0-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Mon Jul 18 2005 Ivana Varekova <varekova@redhat.com> 50:6.0-1
+- update to aspell5-en-6.0
+- build with aspell-0.60.3
+
+* Mon Apr 11 2005 Ivana Varekova <varekova@redhat.com> 50:0.51-12
+- rebuilt
+
+* Wed Sep 29 2004 Adrian Havill <havill@redhat.com> 50:0.51-11
+- remove debuginfo
+
+* Thu Aug 26 2004 Adrian Havill <havill@redhat.com> 50:0.51-10
+- obsolete -en-gb and -en-ca for upgrades
+
+* Wed Aug 11 2004 Adrian Havill <havill@redhat.com> 50:0.51-9
+- sync epoch with other aspell dicts, upgrade to 0.51-1
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Jun 23 2003 Adrian Havill <havill@redhat.com> 0.51-6
+- data files are not arch independent
+
+* Fri Jun 20 2003 Adrian Havill <havill@redhat.com> 0.51-5
+- first build for new aspell (0.50)

aspell6-en-2020.12.07-0.tar.bz2 Added

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:b...olab:Winterfell / chwala to package Kolab:16:Testing / chwala

chwala.spec Changed

Build Results
RPM Lint

Refresh

Submit package home:mollekop...ab:Winterfell / cyrus-imapd to package Kolab:16:Testing / cyrus-imapd

cyrus-imapd.spec Changed

@@ -1,873 +1,2194 @@
-%if 0%{?opensuse_bs} && 0%{?suse_version} < 1
-#!BuildIgnore:  systemd
-%endif
-
-%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
-%global with_systemd 0
-%else
-%global with_systemd 1
-%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
-%endif
-
-%global ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
+%global testdata_commit ca669d4b76c71cbeb4fa840e263e2c031e19ea88
+%global testdata_short %(echo %{testdata_commit} | cut -c -8)
 
-%global uid 76
-%global gid 76
+# Cassandane was split into separate CI test, run '--with cassandane' to enable it.
+%bcond_with cassandane
 
-%global _cyrususer cyrus
-%global _cyrusgroup mail
-%global _cyrexecdir %{_exec_prefix}/lib/%{name}
-
-%global tag_version 2.5.17
-%global revision    34
-%global git_hash    3e2a85d6e
-
-##
-## Options
-##
-
-%global with_bdb        0
-%global with_mysql      0
-%global with_pgsql      0
-
-%global with_dav        0
-%global with_tcpwrap    0
-%global with_zlib       0
-
-Name:               cyrus-imapd
-Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version:            %{tag_version}.%{revision}
-Release:            1%{?dist}
-License:            BSD
-Group:              System Environment/Daemons
-URL:                http://www.cyrusimap.org
-
-Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{tag_version}-%{revision}-%{git_hash}.tar.gz
-Source1:            cyrus-imapd.imap-2.3.x-conf
-Source2:            cyrus-imapd.cvt_cyrusdb_all
-Source3:            cyrus-imapd.magic
-
-# Distribution specific sources
-Source11:           cyrus-imapd.logrotate
-Source12:           cyrus-imapd.pam-config
-Source13:           cyrus-imapd.cron-daily
-
-# SysVinit
-Source21:           cyrus-imapd.init
-Source22:           cyrus-imapd.sysconfig
-
-# Systemd support
-Source31:           cyrus-imapd.service
-Source32:           cyr_systemd_helper
-
-##
-## Patches
-##
-
-BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-##
-## Build Requirements
-##
-BuildRequires:      autoconf
-BuildRequires:      automake
-BuildRequires:      bison
-BuildRequires:      cyrus-sasl-devel
-%if 0%{?suse_version}
-BuildRequires:      cunit-devel
-BuildRequires:      cyrus-sasl-digestmd5
-%else
-BuildRequires:      CUnit-devel
-BuildRequires:      cyrus-sasl-md5
-%endif
-BuildRequires:      cyrus-sasl-plain
+Name: cyrus-imapd
+Version: 3.6.0
+Release: 1%{?dist}
+
+%define ssl_pem_file_prefix /etc/pki/%name/%name
+
+# UID/GID 76 have long been reserved for Cyrus
+%define uid 76
+%define gid 76
+
+%define cyrususer cyrus
+%define cyrusgroup mail
+%define cyrexecdir %_libexecdir/%name
+
+%global __provides_exclude ^perl\$AnnotateInlinedCIDs\$$
+
+Summary: A high-performance email, contacts and calendar server
+License: BSD
+URL: http://www.cyrusimap.org/
+
+Source0: cyrus-imapd-%version-rc1.tar.gz
+
+
+# Adapt a timeout to handle our slower builders
+Patch0: patch-cyrus-testsuite-timeout
+
+# Fedora-specific patch for the default configuration file
+Patch1: patch-cyrus-default-configs
+
+# We rename quota to cyr_quota to avoid a conflict with /usr/bin/quota; one
+# place in the source must be patched to match.
+Patch2: patch-cyrus-rename-quota
+
+# Workaround for some compiled Perl modules not being linked against
+# libpcreposix, which causes them to fail to load.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1668723
+# https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909
+Patch3: patch-cyrus-perl-linking
+
+# https://github.com/cyrusimap/cyrus-imapd/pull/3892
+Patch4: patch-cyrus-squatter-assert-crash
+
+Patch5: 0001-Fixed-CALDAV-PUT-requests-while-proxying.patch
+Patch6: 0002-Openssl-3.0-fixes.patch
+Patch7: 0003-Configurable-default-addressbook-display-name.patch
+Patch8: 0004-Autocreate-on-PROPFIND.patch
+
+Source10: cyrus-imapd.logrotate
+Source11: cyrus-imapd.pam-config
+Source12: cyrus-imapd.sysconfig
+Source13: cyrus-imapd.magic
+# XXX A systemd timer would probably be better
+Source14: cyrus-imapd.cron-daily
+Source15: README.rpm
+Source16: cyrus-imapd.service
+Source17: cyrus-imapd-init.service
+Source18: cyrus-imapd.tmpfiles.conf
+
+# Source files for running the Cassandane test suite at build time.
+Source80: https://github.com/brong/Net-CalDAVTalk/archive/%{testdata_commit}/cassandane-testdata-%{testdata_short}.tar.gz
+
+# A template config file for cassandane; we will substitute in varions values.
+Source81: cassandane.ini
+
+# These are source files and not patches because you can't use autosetup to
+# apply patches to secondary unpacked source files.
+
+# Prevent cassandane from trying to syslog things
+Source91: patch-cassandane-no-syslog
+
+# Tell the annotator script to run as the current user/group
+# Upstream ticket https://github.com/cyrusimap/cyrus-imapd/issues/1995
+Source92: patch-cassandane-fix-annotator
+
+# TODO libexec/cyrus-imapd path element got into upstream:
+# https://github.com/cyrusimap/cyrus-imapd/commit/9233f70bf7a2872ab0b456ea294ce36e0e01e182
+# try to get fixed the below upstream to work on Fedora:
+# https://github.com/cyrusimap/cyrus-imapd/commit/f10eee167313418d84e63d215310477d4fe68e94
+Source93: patch-cassandane-xapian-delve-path
+
+
+BuildRequires: autoconf automake bison flex gcc gcc-c++ git glibc-langpack-en
+BuildRequires: groff libtool make pkgconfig rsync systemd transfig
+
+BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Pod::Html)
+
+
+%if 0%{?fedora} && 0%{?fedora}  >= 0
+BuildRequires: clamav-devel shapelib-devel
+%endif
+BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel
+BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel
+BuildRequires: libnghttp2-devel libxml2-devel mariadb-connector-c-devel net-snmp-devel
+BuildRequires: openldap-devel openssl-devel pcre-devel libpq-devel
+BuildRequires: sqlite-devel xapian-core-devel
+
+# Miscellaneous modules needed for 'make check' to function:
+BuildRequires: cyrus-sasl-plain cyrus-sasl-md5
+
+%if %{with cassandane}
+# Additional packages required for cassandane to function
+BuildRequires: imaptest net-tools words
+BuildRequires: perl-interpreter
+BuildRequires: perl(AnyEvent) perl(AnyEvent::Handle) perl(AnyEvent::Socket)
+BuildRequires: perl(AnyEvent::Util) perl(attributes) perl(base)
+BuildRequires: perl(BSD::Resource) perl(bytes) perl(Carp) perl(charnames)
+BuildRequires: perl(Clone) perl(Config) perl(Config::IniFiles) perl(constant)
+BuildRequires: perl(Cwd) perl(Data::Dumper) perl(DateTime)
+BuildRequires: perl(DateTime::Format::ISO8601) perl(Digest::MD5) perl(Encode)
+BuildRequires: perl(Errno) perl(experimental) perl(Exporter)
+BuildRequires: perl(File::Basename) perl(File::chdir) perl(File::Find)
+BuildRequires: perl(File::Path) perl(File::Slurp) perl(File::stat)
+BuildRequires: perl(File::Temp) perl(Getopt::Long) perl(HTTP::Tiny)
+BuildRequires: perl(IO::File) perl(IO::Handle) perl(IO::Scalar)
+BuildRequires: perl(IO::Socket::INET) perl(IO::Socket::INET6)
+BuildRequires: perl(IO::Socket::UNIX) perl(JSON) perl(JSON::XS) perl(lib)
+BuildRequires: perl(Mail::IMAPTalk) perl(Mail::JMAPTalk) >= 0.11
+BuildRequires: perl(Math::Int64) perl(MIME::Base64)
+BuildRequires: perl(Net::CalDAVTalk) >= 0.12 perl(Net::CardDAVTalk) >= 0.05
+BuildRequires: perl(Net::CardDAVTalk::VCard) perl(Net::DAVTalk)
+BuildRequires: perl(Net::POP3) perl(Net::Server::PreForkSimple)
+BuildRequires: perl(News::NNTPClient) perl(overload)
+BuildRequires: perl(POSIX) perl(Scalar::Util) perl(Storable) perl(strict)
+BuildRequires: perl(String::CRC32) perl(Sys::Hostname) perl(Sys::Syslog)
+BuildRequires: perl(Test::Unit::Exception) perl(Test::Unit::Listener)
+BuildRequires: perl(Test::Unit::Result) perl(Test::Unit::Runner)
+BuildRequires: perl(Test::Unit::TestCase) perl(Test::Unit::TestRunner)
+BuildRequires: perl(Time::HiRes) perl(URI) perl(URI::Escape) perl(User::pwent)
+BuildRequires: perl(utf8) perl(vars) perl(warnings) perl(XML::DOM)
+BuildRequires: perl(XML::Generator) perl(XML::Spice)
+BuildRequires: clamav-data perl(Unix::Syslog)
+BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant)
+BuildRequires: perl(Net::LDAP::Server)
+BuildRequires: perl(Module::Load::Conditional)
 
-%if 0%{?with_bdb}
-%if 0%{?suse_version}
-BuildRequires:      db-devel
-%else
-%if 0%{?fedora} > 15 || 0%{?rhel} > 6
-BuildRequires:      libdb-devel
-%else
-BuildRequires:      db4-devel
-%endif
-%endif
+# These were only for JMAP-Tester
+# perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa)
 %endif
 
-BuildRequires:      flex
-#BuildRequires:      gcc-c++
-BuildRequires:      gcc
-
-%if 0%{?suse_version} >= 1310
-BuildRequires:      groff-full
-%else
-BuildRequires:      groff
-%endif
-
-%if 0%{?suse_version}
-BuildRequires:      libjansson4-devel
-%else
-BuildRequires:      jansson-devel
-%endif
-BuildRequires:      krb5-devel
+Requires(pre): shadow-utils
+%{?systemd_requires}
 
-%if 0%{?with_dav}
-BuildRequires:      libical-devel
-%endif
+Requires: %name-utils = %version-%release
+Requires: file sscg
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-BuildRequires:      libtool
-BuildRequires:      libuuid-devel
+%{?perl_default_filter}
 
-%if 0%{?with_mysql}
-BuildRequires:      mysql-devel
-%endif
+%description
+The Cyrus IMAP (Internet Message Access Protocol) server provides access to
+personal mail, system-wide bulletin boards, news-feeds, calendar and contacts
+through the IMAP, JMAP, NNTP, CalDAV and CardDAV protocols. The Cyrus IMAP
+server is a scalable enterprise groupware system designed for use from small to
+large enterprise environments using technologies based on well-established Open
+Standards.
+
+A full Cyrus IMAP implementation allows a seamless mail and bulletin board
+environment to be set up across one or more nodes. It differs from other IMAP
+server implementations in that it is run on sealed nodes, where users are not
+normally permitted to log in. The mailbox database is stored in parts of the
+filesystem that are private to the Cyrus IMAP system. All user access to mail
+is through software using the IMAP, IMAPS, JMAP, POP3, POP3S, KPOP, CalDAV
+and/or CardDAV protocols.
+
+The private mailbox database design gives the Cyrus IMAP server large
+advantages in efficiency, scalability, and administratability. Multiple
+concurrent read/write connections to the same mailbox are permitted. The server
+supports access control lists on mailboxes and storage quotas on mailbox
+hierarchies.
 
-%if 0%{?suse_version}
-BuildRequires:      openldap2-devel
-%else
-BuildRequires:      openldap-devel
-%endif
 
-BuildRequires:      openssl-devel
-BuildRequires:      perl(ExtUtils::MakeMaker)
+%package devel
+Summary: Cyrus IMAP server development files
+Requires: %name%{?_isa} = %version-%release
+Requires: pkgconfig
 
-%if 0%{?suse_version}
-BuildRequires:      perl
-%else
-BuildRequires:      perl-devel
-%endif
+%description devel
+The %name-devel package contains header files and libraries
+necessary for developing applications which use the imclient library.
 
-BuildRequires:      pkgconfig
 
-%if 0%{?with_pgsql}
-BuildRequires:      postgresql-devel
-%endif
+%package doc-extra
+Summary: Extra documentation for the Cyrus IMAP server
+BuildArch: noarch
 
-%if 0%{?with_dav}
-BuildRequires:      sqlite-devel
-%endif
+%description doc-extra
+This package contains the HTML documentation for the Cyrus IMAP server, as well
+as some legacy and internal documentation not useful for normal operation of
+the server.
 
-%if 0%{?with_systemd}
-%if 0%{?suse_version}
-BuildRequires:      systemd
-%endif
-%endif
 
-%if 0%{?with_tcpwrap}
-%if 0%{?suse_version}
-BuildRequires:      tcpd-devel
-%else
-BuildRequires:      tcp_wrappers
-%endif
-%endif
+%package libs
+Summary: Runtime libraries for cyrus-imapd
 
-BuildRequires:      transfig
-%if 0
-# Disable the xapian-core requirement
-BuildRequires:      xapian-core-devel
-%endif
+%description libs
+The cyrus-imapd-libs package contains libraries shared by the Cyrus IMAP server
+and the its utilities.
 
-%if 0%{?suse_version}
-PreReq:             /usr/sbin/groupadd
-PreReq:             /usr/sbin/useradd
-%endif
 
-%if 0%{?suse_version}
-Requires:           db-utils
-%else
-Requires:           db4-utils
-%endif
+%package utils
+Summary: Cyrus IMAP server administration utilities
+Requires: cyrus-imapd = %{version}-%{release}
 
-Requires:           file
-Requires:           perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+%description utils
+The cyrus-imapd-utils package contains administrative tools for the
+Cyrus IMAP server. It can be installed on systems other than the
+one running the server.
 
-Requires(post):     coreutils
-Requires(post):     e2fsprogs
-Requires(post):     findutils
-Requires(post):     grep
-Requires(post):     make
-Requires(post):     openssl
-Requires(post):     perl
-Requires(preun):    coreutils
-
-%if 0%{?with_systemd}
-%if 0%{?suse_version}
-PreReq:             %fillup_prereq
-%{?systemd_requires}
-%else
-%if 0%{?opensuse_bs} == 0
-Requires(post):     systemd-units
-Requires(preun):    systemd-units, coreutils
-Requires(postun):   systemd-units
-%endif
-%endif
-%else
-%if 0%{?suse_version}
-PreReq:             %fillup_prereq
-PreReq:             %insserv_prereq
-%else
-Requires(preun):    chkconfig
-Requires(preun):    initscripts
-Requires(post):     chkconfig
-Requires(post):     initscripts
-Requires(postun):   initscripts
-%endif
-%endif
 
-Obsoletes:          %{name}-perl < %{version}-%{release}
-Provides:           %{name}-perl = %{version}-%{release}
-Obsoletes:          %{name}-utils < %{version}-%{release}
-Provides:           %{name}-utils = %{version}-%{release}
+%package virusscan
+Summary: Cyrus virus scanning utility
 
-%description
-The %{name} package contains the core of the Cyrus IMAP server.
-It is a scaleable enterprise mail system designed for use from
-small to large enterprise environments using standards-based
-internet mail technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin
-board environment to be set up across multiple servers. It differs from
-other IMAP server implementations in that it is run on "sealed"
-servers, where users are not normally permitted to log in and have no
-system account on the server. The mailbox database is stored in parts
-of the filesystem that are private to the Cyrus IMAP server. All user
-access to mail is through software using the IMAP, POP3 or KPOP
-protocols. It also includes support for virtual domains, NNTP,
-mailbox annotations, and much more. The private mailbox database design
-gives the server large advantages in efficiency, scalability and
-administratability. Multiple concurrent read/write connections to the
-same mailbox are permitted. The server supports access control lists on
-mailboxes and storage quotas on mailbox hierarchies.
-
-The Cyrus IMAP server supports the IMAP4rev1 protocol described
-in RFC 3501. IMAP4rev1 has been approved as a proposed standard.
-It supports any authentication mechanism available from the SASL
-library, imaps/pop3s/nntps (IMAP/POP3/NNTP encrypted using SSL and
-TLSv1) can be used for security. The server supports single instance
-store where possible when an email message is addressed to multiple
-recipients, SIEVE provides server side email filtering.
+%description virusscan
+The cyrus-imapd-virusscan package contains the cyr_virusscan utility.  It
+exists in a separate package so that users who do not wish to install all of
+the clamav suite don't have to.
 
-%package devel
-Group: Development/Libraries
-Summary: Cyrus IMAP server development files
+Install this package if you wish to use the internal cyrus virus scanning
+utility.
 
-%description devel
-The %{name}-devel package contains header files and libraries
-necessary for developing applications which use the imclient library.
 
-%prep
-%setup -q -n %{name}-%{tag_version}-%{revision}-%{git_hash}
+%package -n perl-Cyrus
+Summary: Perl libraries for interfacing with Cyrus IMAPd
 
-%if 0%{?with_bdb} < 1
-sed -i -e 's/,berkeley//g' cunit/aaa-db.testc
-sed -r -i -e 's/"berkeley(|-a-z-+)", //g' lib/imapoptions
-%endif
+%description -n perl-Cyrus
+This package contains Perl libraries used to interface with Cyrus IMAPd.
 
-# only to update config.* files
-autoreconf -vi || (libtoolize --force && autoreconf -vi)
 
-# Modify docs master --> cyrus-master
-%{__perl} -pi -e "s@master$8$@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions
-%{__sed} -i -e 's|$^-$master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \
-        man/master.8 doc/man.html
-
-%if 0%{?with_dav}
-# Modify docs httpd --> cyrus-httpd
-%{__perl} -pi -e "s@httpd$8$@cyrus-httpd(8)@" man/*5 man/*8 lib/imapoptions
-%{__sed} -i -e 's|$^-$httpd|\1cyrus-httpd|g;s|^httpd|cyrus-httpd|g;s|Httpd|Cyrus-httpd|g;s|HTTPD|CYRUS-HTTPD|g' \
-        man/httpd.8 doc/man.html
-%endif
+%prep
+%autosetup -p1
+echo %version > VERSION
 
-# Modify path in perl scripts
-find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@"
+# Install the Fedora-specific documentation file
+install -m 644 %SOURCE15 doc/
 
-# modify lmtp socket path in .conf files
-%{__perl} -pi -e "s@/var/imap/@%{_var}/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
+%if %{with cassandane}
+pushd cassandane
+mkdir work
+tar xf %SOURCE80
+
+patch -p1 < %SOURCE91
+patch -p1 < %SOURCE92
+patch -p1 < %SOURCE93
+
+cp %SOURCE81 cassandane.ini
+# RF rpm-buildroot-usage
+sed -i \
+    -e "s!CASSDIR!$(pwd)!" \
+    -e "s!BUILDROOT!%buildroot!" \
+    cassandane.ini
+
+popd
+%endif
+
+# The pm files have shebang lines for some reason
+sed -i -e '1{/usr.bin.perl/d}' perl/annotator/{Message,Daemon}.pm
+
+# This one uses env
+sed -i -e '1i#!/usr/bin/perl' -e '1d' tools/rehash
+
+# These files have a bizarre perl-in-shell shebang setup.  The exec perl bit
+# sometimes comes after a long comment block.  All use magic to turn on -w.
+# Some of these aren't installed, but we might as well fix them all just in
+# case.
+sed -i \
+    -e '1i#!/usr/bin/perl -w' \
+    -e '/^#!\/usr\/bin\/perl/d' \
+    -e '/^exec perl/d' \
+    -e '/^#!perl -w/d' \
+    -e '/^#!perl/d' \
+    -e '/^#!\/bin\/sh/d' \
+    -e '/^#! \/bin\/sh/d' \
+    perl/sieve/scripts/installsieve.pl \
+    perl/sieve/scripts/sieveshell.pl perl/imap/cyradm.sh tools/config2header \
+    tools/masssievec tools/config2rst tools/mknewsgroups tools/config2sample \
+    tools/mkimap tools/translatesieve
+# UPDATE: as of 3.4.2 most of the above files got the shabang fixed. Leaving
+#         the fixed files and this memo here temporarily:
+# cyrus-imapd-*/nmp/snmpgen - no longer exists
+# cyrus-imapd-*/perl/sieve/scripts/installsieve.pl - still contains shabang
+# cyrus-imapd-*/perl/sieve/scripts/sieveshell.pl - fixed
+# cyrus-imapd-*/perl/imap/cyradm.sh - still contains shabang
+# cyrus-imapd-*/tools/config2header - fixed
+# cyrus-imapd-*/tools/masssievec - fixed
+# cyrus-imapd-*/tools/config2rst - fixed
+# cyrus-imapd-*/tools/mknewsgroups - fixed
+# cyrus-imapd-*/tools/config2sample - fixed
+# cyrus-imapd-*/tools/mkimap - fixed
+# cyrus-imapd-*/tools/translatesieve - still contains shabang
 
-# enable idled in .conf files to prevent error messages
-%{__perl} -pi -e "s/#  idled/  idled/" master/conf/*.conf
 
 %build
-CPPFLAGS="%{?optflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV"; export CPPFLAGS
-CFLAGS="%{?optflags} -fPIC"; export CFLAGS
-CXXFLAGS="%{?optflags} -fPIC"; export CXXFLAGS
-CCDLFLAGS="-rdynamic"; export CCDLFLAGS
-%ifnarch ppc ppc64
-LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
-%endif
-
-%{configure} \
-    --enable-event-notification \
-    --enable-gssapi \
+# This is the test suite, which doesn't build much but does verify its dependencies.
+# If this is done after the configure call, the one thing it does build fails
+# because the configure macro puts some hardening flags into the environment.
+%if %{with cassandane}
+pushd cassandane
+export NOCYRUS=1
+make
+popd
+%endif
+
+# Notes about configure options:
+# --enable-objectstore
+#   It's experimental, and it doesn't appear that either openio or caringo are
+#   in Fedora.
+# --with-cyrus-prefix and --with-service-path went away; use --with-libexecdir=
+# instead.
+
+# Needed because of Patch4.
+autoreconf -vi
+
+%configure \
+    --disable-silent-rules \
+    \
+    --libexecdir=%cyrexecdir \
+    --with-clamav \
+    --with-extraident="%release Fedora" \
+    --with-krbimpl=mit \
+    --with-ldap=/usr \
+    --with-libwrap=no \
+    --with-mysql \
+    --with-pgsql \
+    --with-perl=%__perl \
+    --with-snmp \
+    --with-syslogfacility=MAIL \
+    \
+    --enable-autocreate \
+    --enable-backup \
+    --enable-calalarmd \
+    --enable-http \
     --enable-idled \
     --enable-murder \
-    --enable-netscapehack \
     --enable-nntp \
     --enable-replication \
     --enable-unit-tests \
-%if 0
     --enable-xapian \
-%endif
-%if 0%{?with_bdb}
-%if 0%{?fedora} >= 20 || 0%{?rhel} || 0%{?suse_version}
-    --with-bdb-incdir=%{_includedir}/db4 \
-%else
-    --with-bdb-incdir=%{_includedir}/libdb4 \
-%endif
-%else
-    --without-bdb \
-%endif
-    --with-cyrus-prefix=%{_cyrexecdir} \
-    --with-extraident="Kolab-%{version}-%{release}" \
-    --without-clamav \
-%if 0%{?with_tcpwrap} < 1
-    --without-wrap \
-%endif
-%if 0%{?with_zlib} < 1
-    --without-zlib \
-%endif
-%if 0%{?with_dav}
-    --with-http \
-%endif
-    --with-krbimpl=mit \
-    --with-ldap=/usr \
-%if 0%{?with_mysql}
-    --with-mysql=%{_prefix} \
-    --with-mysql-incdir=%{_includedir}/mysql/ \
-    --with-mysql-libdir=%{_libdir}/mysql/ \
-%endif
-    --with-perl=%{__perl} \
-%if 0%{?with_pgsql}
-    --with-pgsql=%{_includedir} \
-%endif
-    --with-service-path=%{_cyrexecdir} \
-    --with-syslogfacility=MAIL
+#
 
-%{__make} %{?_smp_mflags}
+# Try to get rid of RPATH....
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# The configure script will set up the Perl makefiles, but not in the way
+# Fedora needs them.  So regenerate them manually.
+for i in perl/annotator perl/imap perl/sieve/managesieve; do
+    pushd $i
+    rm -f Makefile
+    perl Makefile.PL INSTALLDIRS=vendor # NO_PERLOCAL=1 NO_PACKLIST=1
+    popd
+done
 
-%install
-%{__rm} -rf %{buildroot}
+%make_build
 
-# Fix permissions on perl programs
-find . -type f -name "*.pl" -exec %{__chmod} 755 {} \;
+# This isn't built by default, but this package has always installed it.
+make notifyd/notifytest
 
-# Do what the regular make install does
-%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor
 
-# Install tools
-for tool in tools/* ; do
-  test -f ${tool} && %{__install} -m 755 ${tool} %{buildroot}%{_cyrexecdir}/
-done
-rm -rf %{buildroot}%{_cyrexecdir}/htmlstrip.c
-rm -rf %{buildroot}%{_cyrexecdir}/config2rst
-rm -rf %{buildroot}%{_cyrexecdir}/perl2rst
+%install
+make install DESTDIR=%buildroot
 
 # Create directories
-%{__install} -d \
-  %{buildroot}%{_sysconfdir}/{logrotate.d,pam.d,cron.daily} \
-  %{buildroot}%{_libdir}/sasl \
-  %{buildroot}%{_var}/spool/imap \
-  %{buildroot}%{_var}/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
-  %{buildroot}%{_var}/lib/imap/ptclient \
-  %{buildroot}%{_sysconfdir}/pki/%{name} \
-  doc/contrib
-
-# Install additional files
-%{__install} -p -m 644 master/conf/prefork.conf %{buildroot}%{_sysconfdir}/cyrus.conf
-%{__install} -p -m 644 %{SOURCE1}    %{buildroot}%{_sysconfdir}/imapd.conf
-%{__install} -p -m 755 %{SOURCE2}   %{buildroot}%{_cyrexecdir}/cvt_cyrusdb_all
-%{__install} -p -m 644 %{SOURCE3}   %{buildroot}%{_var}/lib/imap/rpm/magic
-%{__install} -p -m 644 %{SOURCE11}    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/pop
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/imap
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/sieve
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/nntp
-%{__install} -p -m 644 %{SOURCE12}    %{buildroot}%{_sysconfdir}/pam.d/csync
-%{__install} -p -m 755 %{SOURCE13}   %{buildroot}%{_sysconfdir}/cron.daily/%{name}
-%if 0%{?suse_version}
-%{__install} -d %{buildroot}%{_localstatedir}/adm/fillup-templates/
-%{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
-%else
-%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/
-%{__install} -p -m 644 %{SOURCE22}   %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%endif
+install -d \
+    %buildroot/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig,cron.daily} \
+    %buildroot/%_libdir/sasl \
+    %buildroot/var/spool/imap \
+    %buildroot/var/lib/imap/{user,quota,proc,log,msg,socket,db,sieve,sync,md5,rpm,backup,meta} \
+    %buildroot/var/lib/imap/ptclient \
+    %buildroot/%_datadir/%name/rpm \
+    %buildroot/%cyrexecdir \
+    %buildroot/etc/pki/%name
+
+install -d -m 0750 \
+    %buildroot/run/cyrus \
+    %buildroot/run/cyrus/socket
+
+install -d -m 0700 \
+    %buildroot/run/cyrus/db \
+    %buildroot/run/cyrus/lock \
+    %buildroot/run/cyrus/proc
+
+# Some tools which aren't installed by the makefile which we have always installed
+install -m 755 notifyd/notifytest  %buildroot%_bindir/
+install -m 755 perl/imap/cyradm    %buildroot%_bindir/
+for i in arbitronsort.pl masssievec mkimap mknewsgroups rehash translatesieve; do
+    install -m 755 tools/$i %buildroot/%cyrexecdir/
+done
 
-%if 0%{?with_systemd}
-%{__install} -p -D -m 644 %{SOURCE31}   %{buildroot}%{_unitdir}/cyrus-imapd.service
-%{__install} -p -D -m 755 %{SOURCE32}   %{buildroot}%{_cyrexecdir}/cyr_systemd_helper
-%else
-%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d
-%{__install} -p -m 755 %{SOURCE21}   %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
-%endif
+install -p -m 644 %SOURCE10 %buildroot/etc/logrotate.d/%name
+
+# PAM configuration files.
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/csync
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/http
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/imap
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/lmtp
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/mupdate
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/nntp
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/pop
+install -p -m 644 %SOURCE11 %buildroot/etc/pam.d/sieve
+
+install -p -m 644 %SOURCE12 %buildroot/etc/sysconfig/%name
+install -p -m 644 %SOURCE13 %buildroot/%_datadir/%name/rpm/magic
+install -p -m 755 %SOURCE14 %buildroot/etc/cron.daily/%name
+install -p -m 644 doc/examples/cyrus_conf/prefork.conf %buildroot/etc/cyrus.conf
+install -p -m 644 doc/examples/imapd_conf/normal.conf %buildroot/etc/imapd.conf
+install -p -D -m 644 %SOURCE16 %buildroot/%_unitdir/cyrus-imapd.service
+install -p -D -m 644 %SOURCE17 %buildroot/%_unitdir/cyrus-imapd-init.service
+install -p -D -m 644 %SOURCE18 %buildroot/%_tmpfilesdir/cyrus-imapd.conf
 
 # Cleanup of doc dir
-find doc perl -name CVS -type d | xargs -r %{__rm} -rf
-find doc perl -name .cvsignore -type f | xargs -r %{__rm} -f
-%{__rm} -f doc/Makefile.dist*
-%{__rm} -f doc/text/htmlstrip.c
-%{__rm} -f doc/text/Makefile
-%{__rm} -rf doc/man
+find doc perl -name CVS -type d -prune -exec rm -rf {} \;
+find doc perl -name .cvsignore -type f -exec rm -f {} \;
+rm -f doc/Makefile.dist*
+rm -f doc/text/htmlstrip.c
+rm -f doc/text/Makefile
+rm -rf doc/man
 
 # fix permissions on perl .so files
-find %{buildroot}%{perl_vendorarch} -type f -name "*.so" -exec %{__chmod} 755 {} \;
-
-# fix conflicts with uw-imap
-mv %{buildroot}%{_mandir}/man8/imapd.8 %{buildroot}%{_mandir}/man8/imapd.8cyrus
-mv %{buildroot}%{_mandir}/man8/pop3d.8 %{buildroot}%{_mandir}/man8/pop3d.8cyrus
-
-# Install templates
-%{__install} -m 755 -d doc/conf
-%{__install} -m 644 master/conf/*.conf doc/conf/
+find %buildroot/%_libdir/perl5/ -type f -name "*.so" -exec chmod 755 {} \;
 
 # Generate db config file
-( grep '^{' lib/imapoptions | grep _db | grep -v _db_path | cut -d'"' -f 2,4 | \
+# XXX Is this still necessary?
+( grep '^{' lib/imapoptions | grep _db | cut -d'"' -f 2,4 | \
   sed -e 's/^ *//' -e 's/-nosync//' -e 's/ *$//' -e 's/"/=/'
-  echo sieve_version=2.2.3 ) | sort > %{buildroot}%{_var}/lib/imap/rpm/db.cfg
+  echo sieve_version=2.2.3 ) | sort > %buildroot/%_datadir/%name/rpm/db.cfg
 
-# create the ghost pem file
-touch %{buildroot}%{ssl_pem_file}
+# Cyrus has various files with extremely conflicting names.  Some of these are
+# not unexpected ("imapd" itself) but some like "httpd" are rather surprising.
 
-# Rename 'master' binary and manpage to avoid clash with postfix
-%{__mv} -f %{buildroot}%{_cyrexecdir}/master        %{buildroot}%{_cyrexecdir}/cyrus-master
-%{__mv} -f %{buildroot}%{_mandir}/man8/master.8     %{buildroot}%{_mandir}/man8/cyrus-master.8
-
-# Rename 'httpd' binary and manpage to avoid clash with apache httpd
-%if 0%{?with_dav}
-%{__mv} -f %{buildroot}%{_cyrexecdir}/httpd         %{buildroot}%{_cyrexecdir}/cyrus-httpd
-%{__mv} -f %{buildroot}%{_mandir}/man8/httpd.8      %{buildroot}%{_mandir}/man8/cyrus-httpd.8
-%endif
+# Where there are only conflicting manpages, they have been moved to a "8cyrus"
+# section.  If the binary was renamed, then the manpages are renamed to match
+# but a internal replacement has not been done.  This may lead to more
+# confusion but involves modifying fewer upstream files.
 
+# Actual binary conflicts
 # Rename 'fetchnews' binary and manpage to avoid clash with leafnode
-%{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews     %{buildroot}%{_cyrexecdir}/cyrfetchnews
-%{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8  %{buildroot}%{_mandir}/man8/cyrfetchnews.8
-%{__perl} -pi -e 's|fetchnews|cyrfetchnews|g;s|Fetchnews|Cyrfetchnews|g;s/FETCHNEWS/CYRFETCHNEWS/g' \
-        %{buildroot}%{_mandir}/man8/cyrfetchnews.8
+mv %buildroot/%_sbindir/fetchnews %buildroot/%_sbindir/cyr_fetchnews
+mv %buildroot/%_mandir/man8/fetchnews.8 %buildroot/%_mandir/man8/cyr_fetchnews.8
+
+# Fix conflict with dump
+mv %buildroot/%_sbindir/restore %buildroot/%_sbindir/cyr_restore
+mv %buildroot/%_mandir/man8/restore.8 %buildroot/%_mandir/man8/cyr_restore.8
+
+# Fix conceptual conflict with quota
+mv %buildroot/%_sbindir/quota %buildroot/%_sbindir/cyr_quota
+mv %buildroot/%_mandir/man8/quota.8 %buildroot/%_mandir/man8/cyr_quota.8
+
+# fix conflicts with uw-imap
+mv %buildroot/%_mandir/man8/imapd.8 %buildroot/%_mandir/man8/imapd.8cyrus
+mv %buildroot/%_mandir/man8/pop3d.8 %buildroot/%_mandir/man8/pop3d.8cyrus
+
+# Rename 'master' manpage
+mv %buildroot/%_mandir/man8/master.8 %buildroot/%_mandir/man8/master.8cyrus
+
+# Rename 'httpd' manpage to avoid clash with Apache
+mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/httpd.8cyrus
 
-# compress manpages
- -x /usr/lib/rpm/brp-compress  && /usr/lib/rpm/brp-compress
+# Old cyrus packages used to keep the deliver executable in
+# /usr/lib/cyrus-imapd, and MTA configurations might rely on this.
+# Remove this hack in the F30 timeframe.
+# RF hardcoded-library-path in %%buildroot/usr/lib/cyrus-imapd
+mkdir %buildroot/usr/lib/cyrus-imapd
+pushd %buildroot/usr/lib/cyrus-imapd
+ln -s ../../sbin/deliver
+popd
 
-# remove executable bit from docs
+#remove executable bit from docs and Perl modules
 for ddir in doc perl/imap/examples
 do
-  find $ddir -type f -exec %{__chmod} -x {} \;
+  find $ddir -type f -exec chmod -x {} \;
 done
 
+# Remove pointless libtool archives
+rm %buildroot/%_libdir/*.la
+
 # Remove installed but not packaged files
-%{__rm} -f %{buildroot}%{_cyrexecdir}/not-mkdep
-%{__rm} -f %{buildroot}%{_cyrexecdir}/config2header*
-%{__rm} -f %{buildroot}%{_cyrexecdir}/config2man
-%{__rm} -f %{buildroot}%{_cyrexecdir}/pop3proxyd
-find %{buildroot} -type f -name "perllocal.pod" -exec %{__rm} -vf {} \;
-find %{buildroot} -type f -name ".packlist" -exec %{__rm} -vf {} \;
-find %{buildroot} -type f -name ".gitignore" -exec %{__rm} -vf {} \;
-%{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
-find %{buildroot}%{perl_vendorarch} -type f -name "*.bs" -exec %{__rm} -vf {} \;
+rm %buildroot/%cyrexecdir/pop3proxyd
+find %buildroot -name "perllocal.pod" -exec rm {} \;
+find %buildroot -name ".packlist" -exec rm {} \;
 
-%check
-make check || :
+# And this one gets installed with executable permission
+chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm
 
-%clean
-%{__rm} -rf %{buildroot}
 
-%pre
-if  $1 == 1 ; then
-    # Create 'cyrus' user on target host
-    /usr/sbin/groupadd -g %{gid} -r saslauth 2> /dev/null || :
-    /usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_var}/lib/imap -g %{_cyrusgroup} \
-        -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
-fi
+%check
+export LD_LIBRARY_PATH=%buildroot/%_libdir
+export CYRUS_USER=$USER
 
-%post
-%if 0%{?suse_version}
-/sbin/ldconfig
+# TODO: The mime_boundary_extended cunit test fails due to LTO on ppc64le, skip it for now:
+%ifnarch ppc64le
+make %{?_smp_mflags} check || exit 1
 %endif
 
-CHATTRSYNC=0
-
-%if 0%{?suse_version}
-%if 0%{?with_systemd}
-    %fillup_only %{name}
-%else
-    %fillup_and_insserv %{name}
+%ifarch %{ix86} armv7hl
+exit 0
 %endif
-if  ! -e "%{_sysconfdir}/pam.d/runuser" ; then
-    ln -s %{_sysconfdir}/pam.d/su %{_sysconfdir}/pam.d/runuser
-fi
-if  ! -e "%{_sysconfdir}/pam.d/runuser-l" ; then
-    ln -s %{_sysconfdir}/pam.d/su-l %{_sysconfdir}/pam.d/runuser-l
-fi
+
+%if %{without cassandane}
+exit 0
 %endif
 
-if  -f "%{_sysconfdir}/sysconfig/cyrus-imapd" ; then
-    source %{_sysconfdir}/sysconfig/cyrus-imapd
-fi
-
-if  $CHATTRSYNC -eq 1 ; then
-    # Force synchronous updates of files in the following directories
-    chattr -R +S \
-        $(grep ^configdirectory: /etc/imapd.conf | cut -d':' -f2) \
-        $(grep ^partition- /etc/imapd.conf | cut -d':' -f2) \
-        $(grep ^metapartition- /etc/imapd.conf | cut -d':' -f2) 2>/dev/null ||:
-fi
-
-# Create SSL certificates
-exec > /dev/null 2> /dev/null
-
-if  ! -z "%{ssl_pem_file}" -a -z "$(cat %{ssl_pem_file})" ; then
-    %{__rm} -f "%{ssl_pem_file}" || :
-fi
-
-if  ! -f %{ssl_pem_file} -a -d "%{_sysconfdir}/pki/tls/certs" ; then
-    pushd %{_sysconfdir}/pki/tls/certs
-    umask 077
-    %{__cat} << EOF | make %{name}.pem
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-localhost.localdomain
-root@localhost.localdomain
-EOF
-
-    %{__chown} root.%{_cyrusgroup} %{name}.pem
-    %{__chmod} 640 %{name}.pem
-    mv %{name}.pem %{ssl_pem_file}
-    popd
-fi
+# Run the Cassandane test suite.  This will exhaustively test the various
+# server components, but running it in a mock chroot is rather an exercise.
+pushd cassandane
 
-# These commands may fail in a docker container, which may not
-# have a /usr/bin/systemctl with a 'preset' command
-%if 0%{?with_systemd}
-%if 0%{?suse_version}
-    %service_add_post cyrus-imapd.service || :
-%else
-    %systemd_post cyrus-imapd.service || :
-%endif
-%else
-    /sbin/chkconfig --add %{name}
+mkdir -p imaptest/src
+ln -s /usr/bin/imaptest imaptest/src
+ln -s /usr/share/imaptest/tests imaptest/src
+
+# Construct the set of excluded tests to pass to Cassandane
+# ---------------------------------------------------------
+exclude=()
+tests=(
+    # This exclusion list was verified on 2021-08-11.
+
+    # This tests coredumping and won't work on a machine where systemd
+    # intercepts coredumps, which includes our builders.
+    Cassandane::Test::Core
+
+    # Can't currently be run at build time because of compiled-in paths.  See
+    # https://github.com/cyrusimap/cyrus-imapd/issues/2386
+    Admin.imap_admins
+
+    Rename.intermediate_cleanup
+
+    # TODO check this one
+    Cyrus::List.no_tombstones
+    # TODO run tests outside the build process:
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1887674
+    # The below tests try to search in syslog file which we don't allow due to mock,
+    # happenes for:
+    # $ grep -R "assert.*@lines" cyrus-imapd-*/cassandane/
+    Reconstruct.reconstruct_snoozed
+    SearchSquat.simple
+    SearchSquat.skip_unmodified
+)
+for i in ${tests@}; do exclude+=("!$i"); done
+
+
+%ifarch s390x
+# This one test fails occasionally on s390x because the hosts are just too slow
+# to complete it.D  It's testing something valid (that the fork rate limiting
+# settings work properly) but s390x can't fork quickly enough to exceeed the
+# limits it's testing.
+exclude+=("!Master.maxforkrate")
 %endif
 
+# Add -vvv for too much output
+./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude@} 2>&1
+
+
+%pre
+# Create 'cyrus' user on target host
+getent group saslauth >/dev/null || /usr/sbin/groupadd -g %gid -r saslauth
+getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /var/lib/imap -g %cyrusgroup \
+  -G saslauth -s /sbin/nologin -u %uid -r %cyrususer
+
+%post
+%systemd_post cyrus-imapd.service
+
 %preun
-%if 0%{?with_systemd}
-%if 0%{?suse_version}
-    %service_del_preun cyrus-imapd.service
-%else
-    %systemd_preun cyrus-imapd.service >/dev/null 2>&1 || :
-%endif
-%else
-    if  $1 = 0 ; then
-        /sbin/service %{name} stop >/dev/null 2>&1 || :
-        /sbin/chkconfig --del %{name}
-    fi
-%endif
+%systemd_preun cyrus-imapd.service
 
 %postun
-%if 0%{?suse_version}
-/sbin/ldconfig
-%endif
+%systemd_postun_with_restart cyrus-imapd.service
 
-%if 0%{?with_systemd}
-%if 0%{?suse_version}
-    %service_del_postun cyrus-imapd.service
-%else
-    %systemd_postun_with_restart cyrus-imapd.service
-%endif
-%else
-    if  $1 != 0 ; then
-        /sbin/service %{name} condrestart >/dev/null 2>&1 || :
-    fi
-%endif
 
 %files
-%defattr(-,root,root,-)
-%doc COPYING README
-%doc doc/*
-%config(noreplace) %{_sysconfdir}/cyrus.conf
-%config(noreplace) %{_sysconfdir}/imapd.conf
-%if 0%{?with_systemd}
-%{_unitdir}/cyrus-imapd.service
-%{_cyrexecdir}/cyr_systemd_helper
-%else
-%{_sysconfdir}/rc.d/init.d/%{name}
-%endif
-%dir %{_sysconfdir}/pki
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%if 0%{?suse_version}
-%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
-%else
-%attr(0640,root,%{_cyrusgroup}) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%endif
-%config(noreplace) %{_sysconfdir}/pam.d/pop
-%config(noreplace) %{_sysconfdir}/pam.d/imap
-%config(noreplace) %{_sysconfdir}/pam.d/sieve
-%config(noreplace) %{_sysconfdir}/pam.d/lmtp
-%config(noreplace) %{_sysconfdir}/pam.d/mupdate
-%config(noreplace) %{_sysconfdir}/pam.d/csync
-%config(noreplace) %{_sysconfdir}/pam.d/nntp
-%attr(0755,root,root) %{_bindir}/cyradm
-%{_bindir}/imtest
-%{_bindir}/installsieve
-%{_bindir}/lmtptest
-%{_bindir}/mupdatetest
-%{_bindir}/nntptest
-%{_bindir}/pop3test
-%{_bindir}/sieveshell
-%{_bindir}/sivtest
-%{_bindir}/smtptest
-%{_bindir}/synctest
-%{_sysconfdir}/cron.daily/%{name}
-%dir %{_cyrexecdir}
-%{_cyrexecdir}/arbitron
-%{_cyrexecdir}/arbitronsort.pl
-%{_cyrexecdir}/chk_cyrus
-%{_cyrexecdir}/compile_st.pl
-%{_cyrexecdir}/convert-sieve.pl
-%{_cyrexecdir}/cyr_deny
-%{_cyrexecdir}/cyr_df
-%{_cyrexecdir}/cyr_info
-#%%{_cyrexecdir}/ctl_conversationsdb
-%{_cyrexecdir}/ctl_cyrusdb
-%{_cyrexecdir}/ctl_deliver
-%{_cyrexecdir}/ctl_mboxlist
-%{_cyrexecdir}/cvt_cyrusdb
-%{_cyrexecdir}/cyr_buildinfo
-%{_cyrexecdir}/cyr_dbtool
-%{_cyrexecdir}/cyr_expire
-%{_cyrexecdir}/cyr_sequence
-%{_cyrexecdir}/cyr_synclog
-%{_cyrexecdir}/cyr_userseen
-%{_cyrexecdir}/cyrdump
-%if 0%{?with_dav}
-%{_cyrexecdir}/cyrus-httpd
-%endif
-%{_cyrexecdir}/cyrus-master
-%{_cyrexecdir}/deliver
-%{_cyrexecdir}/dohash
-%{_cyrexecdir}/fixsearchpath.pl
-%{_cyrexecdir}/fud
-%exclude %{_cyrexecdir}/git-version.sh
-#%%{_cyrexecdir}/hammer_cyrusdb
-%{_cyrexecdir}/imapd
-%{_cyrexecdir}/ipurge
-%exclude %{_cyrexecdir}/jenkins-build.sh
-%{_cyrexecdir}/lmtpd
-%{_cyrexecdir}/lmtpproxyd
-%{_cyrexecdir}/masssievec
-%{_cyrexecdir}/mbexamine
-%{_cyrexecdir}/mbpath
-%{_cyrexecdir}/mbtool
-#%%{_cyrexecdir}/message_test
-%{_cyrexecdir}/migrate-metadata
-%{_cyrexecdir}/mkimap
-%{_cyrexecdir}/mknewsgroups
-%{_cyrexecdir}/notifyd
-%{_cyrexecdir}/pop3d
-%{_cyrexecdir}/quota
-%{_cyrexecdir}/reconstruct
-%{_cyrexecdir}/rehash
-#%%{_cyrexecdir}/search_test
-%{_cyrexecdir}/sievec
-%{_cyrexecdir}/sieved
-%{_cyrexecdir}/smmapd
-#%%{_cyrexecdir}/squat_dump
-%{_cyrexecdir}/squatter
-%{_cyrexecdir}/timsieved
-%{_cyrexecdir}/tls_prune
-%{_cyrexecdir}/translatesieve
-%{_cyrexecdir}/undohash
-%{_cyrexecdir}/unexpunge
-%{_cyrexecdir}/upgradesieve
-%{_cyrexecdir}/cvt_cyrusdb_all
-%{_cyrexecdir}/idled
-%{_cyrexecdir}/mupdate
-%{_cyrexecdir}/mupdate-loadgen.pl
-%{_cyrexecdir}/proxyd
-%{_cyrexecdir}/sync_client
-%{_cyrexecdir}/sync_reset
-%{_cyrexecdir}/sync_server
-%{_cyrexecdir}/cyrfetchnews
-%{_cyrexecdir}/nntpd
-%{_cyrexecdir}/ptdump
-%{_cyrexecdir}/ptexpire
-%{_cyrexecdir}/ptloader
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/backup
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/db
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/log
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/meta
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/md5
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/msg
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/proc
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/ptclient
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/quota
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/rpm
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sieve
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %{_var}/lib/imap/socket
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/sync
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/lib/imap/user
-%attr(0750,%{_cyrususer},%{_cyrusgroup}) %dir %{_var}/spool/imap
-%{_libdir}/*.so.*
-%{_var}/lib/imap/rpm/*
+%doc README.md doc/README.* doc/examples doc/text
+
+%_sbindir/*
+%_datadir/cyrus-imapd
+%_mandir/man5/*
+%_mandir/man8/*
+%exclude %_sbindir/cyr_virusscan
+%exclude %_mandir/man8/cyr_virusscan.8*
+
+# For the legacy symlink to the deliver binary
+# RF hardcoded-library-path in /usr/lib/cyrus-imapd
+/usr/lib/cyrus-imapd/
+
+
+%dir /etc/pki/cyrus-imapd
+%attr(0644,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix-ca.pem
+%attr(0644,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix.pem
+%attr(0640,root,%cyrusgroup) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %ssl_pem_file_prefix-key.pem
+
+%config(noreplace) /etc/cyrus.conf
+%config(noreplace) /etc/imapd.conf
+%config(noreplace) /etc/logrotate.d/cyrus-imapd
+%config(noreplace) /etc/sysconfig/cyrus-imapd
+%config(noreplace) /etc/pam.d/*
+
+/etc/cron.daily/cyrus-imapd
+%_unitdir/cyrus-imapd.service
+%_unitdir/cyrus-imapd-init.service
+%_tmpfilesdir/cyrus-imapd.conf
+
+%dir %cyrexecdir/
+%cyrexecdir/a-uw-z*
+
+# This creates some directories which in the default configuration cyrus will
+# never use because they are placed under /run instead.  However, old
+# configurations or setup advice from the 'net might reference them, and so
+# it's simpler to just leave them in the package.
+%attr(0750,%cyrususer,%cyrusgroup) %dir /var/lib/imap/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/backup/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/db/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/log/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/meta/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/md5/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/msg/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/proc/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/ptclient/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/quota/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/rpm/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/sieve/
+%attr(0750,%cyrususer,%cyrusgroup) /var/lib/imap/socket
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/sync/
+%attr(0700,%cyrususer,%cyrusgroup) /var/lib/imap/user/
+%attr(0700,%cyrususer,%cyrusgroup) /var/spool/imap/
+
+# The new locations
+%attr(0750,%cyrususer,%cyrusgroup) %dir /run/cyrus/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/db/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/lock/
+%attr(0700,%cyrususer,%cyrusgroup) /run/cyrus/proc/
+%attr(0750,%cyrususer,%cyrusgroup) /run/cyrus/socket/
+
+
+%files devel
+%_includedir/cyrus/
+%_libdir/libcyrus*.so
+%_libdir/pkgconfig/*.pc
+%_mandir/man3/imclient.3*
+
+
+%files doc-extra
+%doc doc/html doc/internal doc/legacy
+
+
+%files libs
+%license COPYING
+%_libdir/libcyrus*.so.*
+
+
+%files utils
+%{_bindir}/*
+%_mandir/man1/*
+
+
+%files virusscan
+%_sbindir/cyr_virusscan
+%_mandir/man8/cyr_virusscan.8*
+
+
+%files -n perl-Cyrus
+%license COPYING
 %doc perl/imap/README
 %doc perl/imap/Changes
 %doc perl/imap/examples
-%dir %{perl_vendorarch}/Cyrus
-%dir %{perl_vendorarch}/Cyrus/IMAP
-%{perl_vendorarch}/Cyrus/IMAP/Admin.pm
-%{perl_vendorarch}/Cyrus/IMAP/Shell.pm
-%{perl_vendorarch}/Cyrus/IMAP/IMSP.pm
-%{perl_vendorarch}/Cyrus/IMAP.pm
-%dir %{perl_vendorarch}/Cyrus/SIEVE
-%{perl_vendorarch}/Cyrus/SIEVE/managesieve.pm
-%dir %{perl_vendorlib}/Cyrus/
-%dir %{perl_vendorlib}/Cyrus/Annotator
-%{perl_vendorlib}/Cyrus/Annotator/Daemon.pm
-%{perl_vendorlib}/Cyrus/Annotator/Message.pm
-%dir %{perl_vendorarch}/auto
-%dir %{perl_vendorarch}/auto/Cyrus
-%dir %{perl_vendorarch}/auto/Cyrus/IMAP
-%{perl_vendorarch}/auto/Cyrus/IMAP/IMAP.so
-%dir %{perl_vendorarch}/auto/Cyrus/SIEVE
-%dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
-%{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%dir %{_sysconfdir}/pki/%{name}
-%attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
+%perl_vendorarch/auto/Cyrus
+%perl_vendorarch/Cyrus
+%perl_vendorlib/Cyrus
+%_mandir/man3/*.3pm*
 
-%files devel
-%defattr(0644,root,root,0755)
-%{_includedir}/cyrus
-%{_libdir}/pkgconfig/*cyrus*.pc
-%{_libdir}/*.so
-%{_libdir}/*.la
 
 %changelog
-* Wed Jul 28 2021 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.17.34-1
-- Check in 34 revisions ahead of upstream 2.5.17 release
+* Wed Nov 23 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 3.6.0-1
+- New upstream release with some patches
 
-* Wed Jan 29 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.15.28-1
-- Fix MessageExpunge event notification when executed from system
+* Fri Sep 09 2022 Martin Osvald <mosvald@redhat.com> - 3.4.4-3
+- Require mariadb-connector-c-devel instead of mariadb-devel (rhbz#2116360)
+- Drop tzdist module. Clients must use OS provided timezone info
+- Drop cyrus-timezones and use system-wide tzdata (rhbz#2116362)
 
-* Tue Oct 29 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.40-1
-- Include the user or group ID in failed login attempts
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 3.4.4-2
+- Rebuilt for ICU 71.1
 
-* Wed Oct 23 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.36-1
-- Rebase on to upstream -2.5 series
-- Fix ptloader group membership (Bifrost T250286)
+* Thu Jul 21 2022 Martin Osvald <mosvald@redhat.com> - 3.4.4-1
+- New version 3.4.4
+- Fix FTBFS caused by missing pcre-devel in BuildRequires (#2109395)
 
-* Mon Aug 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.30-1
-- Rebase on to upstream 2.5.13
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Tue Mar 12 2019 Timotheus Pokorra <tp@tbits.net> - 2.5.12.25-2
-- Backport patch from upstream for canonification for multiple domains
+* Thu Jun 09 2022 Martin Osvald <mosvald@redhat.com> - 3.4.3-1
+- New version 3.4.3
 
-* Wed Jan  2 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.25-1
-- Rebase on to upstream 2.5.12
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 3.2.6-10
+- Perl 5.36 rebuild
 
-* Tue Oct 17 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.11-4
-- Fix potentially non-readable, non-writeable /dev/null
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Dec 13 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.10-55-gb6dbffa
-- Fix proxying extended list usage to backends with answers.
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3.2.6-8
+- Rebuilt with OpenSSL 3.0.0
 
-* Mon Nov 14 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.10-49-g2e214b4
-- Decode the subject line before re-encoding it in automated responses.
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Sat Nov  5 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.10-43-g1148d47
-- Preserve the folder uniqueid on rename.
-- Transfer a folder between backends preserving the mailboxes.db uniqueid.
-- Allow replicated backends to transfer mailboxes between pairs.
-- Preserve the original partition as the target partition if not the default
-  partition, when replicating or transferring a mailbox.
+* Fri Jun 11 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.6-6
+- Disable tests on 32bit arches. Started to fail with perl rebase
 
-* Fri Sep 30 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.9.31-1
-- Check in 31 revisions ahead of upstream 2.5.9 release
+* Sun May 23 2021 Jitka Plesnikova <jplesnik@redhat.com> - 3.2.6-5
+- Perl 5.34 rebuild
 
-* Thu Sep 22 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.9.27-1
-- Check in 27 revisions ahead of upstream 2.5.9 release
+* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 3.2.6-4
+- Rebuild for ICU 69
 
-* Mon Aug 01 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.9.11-1
-- Check in 11 revisions ahead of upstream 2.5.9 release
+* Mon May 10 2021 Jeff Law <jlaw@tachyum.com> - 3.2.6-3
+- Re-enable LTO
 
-* Thu Jul  7 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.8.22-1
-- Check in 22 revisions ahead of upstream 2.5.8 release
+* Mon Mar 22 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.6-2
+- Require online target to prevent binding to down devices
 
-* Thu Jun 02 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.8.12-1
-- Check in 12 revisions ahead of upstream 2.5.8 release
+* Thu Mar 11 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.6-1
+- New version v3.2.6
 
-* Mon May 09 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.7.26-1
-- Check in 26 revisions ahead of upstream 2.5.7 release
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.4-8
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
 
-* Fri Apr 29 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.7.25-1
-- Check in 25 revisions ahead of upstream 2.5.7 release
+* Wed Feb 17 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-7
+- Require shapelib on Fedoras only
 
-* Mon Mar 21 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.7.10-1
-- Check in 10 revisions ahead of upstream 2.5.7 release
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.2.4-6
+- rebuild for libpq ABI fix rhbz#1908268
 
-* Thu Mar 10 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.7.8-1
-- Check in 8 revisions ahead of upstream 2.5.7 release
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Wed Dec 16 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.7-1
-- Upstream release 2.5.7
+* Tue Jan 12 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
+- Drop clamav BR for eln
 
-* Fri Sep 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.6.7-1
-- Check in 7 revisions ahead of upstream 2.5.6 release
+* Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3
+- Add ExecReload to service file (#1907223)
 
-* Sun Sep 20 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.6.3-1
-- New upstream release 2.5.6, plus 3 additional revisions
+* Thu Sep  3 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.3-1
+- New version v3.2.3
 
-* Fri Aug 14 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.5.5-1
-- New upstream release 2.5.5, plus 5 additional revisions
+* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 3.0.13-13
+- Rebuilt for new net-snmp release
 
-* Wed May 13 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.2.3-1
-- Check in 2 revisions ahead of new upstream release 2.5.2
+* Mon Aug 10 2020 Jeff Law <law@redhat.com> - 3.0.13-12
+- Disable LTO on s390x for now
 
-* Tue May 12 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.2.1-1
-- Check in 1 revision ahead of new upstream release 2.5.2
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.13-11
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Apr 28 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.1-19.1
-- Check in 19 revisions ahead of new upstream release 2.5.1
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.13-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon Apr 27 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.1-5.1
-- Check in 5 revisions ahead of new upstream release 2.5.1
+* Mon Jul 13 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-9
+- Fix FTBFS caused by weak certificates (#1852137)
 
-* Sat Apr 11 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.0-65.1
-- Check in 65 revisions ahead of new upstream release 2.5.0
+* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.13-8
+- Perl 5.32 rebuild
 
-* Fri Mar 20 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.0-45.1
-- Check in 45 revisions ahead of new upstream release 2.5.0
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 3.0.13-7
+- Rebuild for ICU 67
 
-* Tue Mar 10 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.0-30.1
-- Check in 30 revisions ahead of new upstream release 2.5.0
+* Wed May  6 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-6
+- Add missed dependencies (#1819685)
 
-* Fri Feb 13 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-12.git
-- New snapshot
+* Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-5
+- Specify version of cyrus-imapd for utils to avoid the need to test interoperability
 
-* Tue Dec  9 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-11.git
-- Fix Murder topologies not handling null ACLs at all
+* Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-4
+- Fix pem files permission
 
-* Thu Sep 25 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-10.git
-- Fix event notifications
+* Wed Apr 01 2020 Petr Pisar <ppisar@redhat.com> - 3.0.13-3
+- Specify all Perl dependencies of Cassandane
 
-* Fri Aug 29 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-9.git
-- Snapshot of (b2ef80be)
-- Merge enhanced Sieve Date and Index extension
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Mon Mar  3 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5-8.git
-- Fix shared folder deleted namespace prefix
+* Mon Dec 16 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.13-1
+- Update to 3.0.13, fixing CVE-2019-19783.
 
-* Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.17-2
-- Refresh patch for normalization of the UID - actually enable disabling it
+* Fri Nov 22 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.12-1
+- Update to 3.0.12, fixing CVE-2019-18928.
+
+* Tue Jul 30 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.11-1
+- Update to 3.0.11.
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.10-2
+- Perl 5.30 rebuild
+
+* Tue May 28 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.10-1
+- Update to 3.0.10.
+- Drop upstreamed patch.
+
+* Thu May 16 2019 Pavel Zhukov <pzhukov@redhat.com> - 3.0.9-2
+- Run sscg as mail group for proper certs permissions
+
+* Thu Mar 14 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.9-1
+- Update to 3.0.9.
+
+* Mon Feb 11 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-10
+- Add pam configuration file for httpd auth.  Thanks to Jeroen van Meeuwen.
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-8
+- Update Perl linkage patch.
+
+* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 3.0.8-7
+- Rebuild for ICU 63
+
+* Wed Jan 23 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-6
+- Re-enable --as-needed, now that PCRE has been patched.
+- Add workaround for improper linking of some Perl modules.
+
+* Tue Jan 15 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-5
+- Disable passing --as-needed to to the linker.  This breaks cyrus horribly.
+- Re-enable Cassandane run.
+
+* Tue Jan 15 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-4
+- Allow building against ClamAV 0.101.
+- Add build dependency on glibc-langpack-en to slience some Perl complaints.
+
+* Thu Dec 13 2018 Pavel Zhukov <pzhukov@redhat.com> - 3.0.8-3
+- Temporary disable cassandane in master branch
+
+* Sun Oct 28 2018 Nils Philippsen <nils@tiptoe.de> - 3.0.8-2
+- remove jmap from list of httpmodules
+
+* Sat Aug 11 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-1
+- Update to 3.0.8.
+- Drop upstreamed patch.
+
+* Tue Jul 24 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-9
+- Rebuild for unannounced net-snmp soname bump.
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 3.0.7-7
+- Rebuild for ICU 62
+
+* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.7-6
+- Perl 5.28 rebuild
+
+* Wed Jun 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-5
+- Split out cyr_virusscan into a -virusscan subpackage.
+- Split libraries into a -libs subpackage.
+- Fix rpath issues in libraries.
+- Split Perl module into a separate perl-Cyrus package.
+- Move utilities in /usr/sbin from -utils package to main package.  This
+  matches the way we packaged the 2.4 versions.
+- Fix some odd Perl shebangs and an erroneous provided symbol.
+- Moved deliver symlink to the main package as well.
+- Drop cvt_cyrusdb_all and libdb-utils requirement.  Cyrus 3 does not use
+  BerkeleyDB at all.
+
+* Thu Jun 07 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-4
+- Update Cassandane checkout.  Drop upstreamed patch.
+- Patch code for RECONSTRUCT implementation to use the renamed cyr_quota.
+- Re-exclude maxforkrate test on s390x.
+
+* Wed May 30 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-3
+- Remove ldconfig scriptlets.
+- Remove F26-specific test exclusions.
+- Update Cassandane checkout.
+- Add extra Cassandane patch from https://github.com/cyrusimap/cassandane/pull/57
+- Revalidate the excluded test list.
+
+* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-2
+- Really enable mysql and clamav support.
+
+* Fri May 18 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.7-1
+- Update to 3.0.7.
+- Update Cassandane checkout.
+- Update excluded Cassandane test list.
+
+* Tue May 01 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.6-1
+- Update to 3.0.6.
+- Remove upstreamed patches and renumber the rest.
+- Disable one new failing test:
+  https://github.com/cyrusimap/cyrus-imapd/issues/2332
+
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 3.0.5-15
+- Rebuild for ICU 61.1
+
+* Tue Apr 17 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-14
+- Update Cassandane again, fixing a broken test.
+
+* Fri Apr 13 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-13
+- Update Cassandane, fixing a few tests and a class of weird random build
+  failures.
+
+* Fri Apr 06 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-12
+- Update list of excluded tests.
+- Update Cassandane snapshot; use new base_port config setting.  No need to
+  patch that in now.
+- Add four new expected-to-fail tests from new Cassandane snapshot.
+- Add patch to collect extra Cassandane logging in case we hit some of those
+  sporadic failures again.
+
+* Tue Apr 03 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-11
+- Re-enable imaptest on >= F29.
+- F29's imaptest fixes several bugs, allowing all tests to be run there.
+- Relocate cassandane base port to hopefully work better in koji.
+
+* Mon Apr 02 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-10
+- Update cassandane checkout to fix a test that was broken by DST.
+- Add patch to fix sieve scripts for usernames containing a dot.
+- Disable imaptest in cassandane until
+  https://bugzilla.redhat.com/show_bug.cgi?id=1562970 is fixed.
+- Re-enable tests on s390; it seems to be better now.
+
+* Thu Mar 15 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-9
+- Re-enable clamav on ppc64.
+
+* Thu Mar 01 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-8
+- Bump client_timeout value in test suite.
+
+* Thu Mar 01 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-7
+- Add patch to fix imtest (rhbz#1543481).
+- Fix vzic makefile to use proper cflags (rhbz#1550543).
+
+* Mon Feb 26 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-6
+- Update cassandane checkout.
+- Add two new build dependencies.
+- Remove all JMAP-related tests from the exclusion lists, since cassandane no
+  longer runs any JMAP tests on cyrus 3.0.
+- Collapse unused test skip lists.
+- Add ten additional skipped tests, after consultation with upstream.
+
+* Mon Feb 26 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-5
+- Add patch to fix segfaults in squatter.
+- Exclude one test on all releases instead of just F28+.
+- Remove --cleanup from cassandane invocation.
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 09 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-3
+- Re-enable clamav and mariadb support as those are now built with openssl 1.1.
+- But no clamav on ppc64 because of
+  https://bugzilla.redhat.com/show_bug.cgi?id=1534071
+
+* Thu Jan 04 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-2
+- Reorganize some test exclusions so things build on all releases.
+
+* Thu Jan 04 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-1
+- Update to 3.0.5.
+- Add one new failing test.
+- Remove one now-passing test on rawhide.
+
+* Mon Dec 18 2017 Pavel Zhukov <pzhukov@redhat.com> - 3.0.4-6
+- Rebuild with new net-snmp
+
+* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 3.0.4-5
+- Rebuild for ICU 60.1
+
+* Wed Nov 29 2017 Pavel Zhukov <pzhukov@redhat.com> - 3.0.4-4
+- Do not require tcp_wrappers (#1518759)
+
+* Tue Nov 14 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.4-3
+- Rebuild for new libical.
+- Add patch to fix compilation error with new libical.
+- Disable two tests which fail due to the new libical.
+
+* Tue Oct 24 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.4-2
+- Fix typo in default config;
+  https://bugzilla.redhat.com/show_bug.cgi?id=1506000
+
+* Tue Sep 05 2017 Pavel Zhukov <landgraf@fedoraproject.org> - 3.0.4-1
+- Update to 3.0.4
+- Patched cassandane for new behaviour. It should be updated idealy.
+- Disable ImapTest.urlauth2 test; it seems to fail randomly regardless of
+  architecture.
+
+* Fri Aug 11 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.3-1
+- Update to 3.0.3, which contains an important security fix.  The fix is not
+  embargoed but no CVE has been assigned yet.
+- Drop patches merged upstream.
+- An update of imaptest has resulted in three additional cassandane failures,
+  reported upstream as https://github.com/cyrusimap/cyrus-imapd/issues/2087.
+  In order to get the security fix out without delay, those three tests have been
+  disabled.
+
+* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.0.2-9
+- Rebuilt after RPM update (№ 3)
+
+* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.0.2-8
+- Rebuilt for RPM soname bump
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jun 30 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-5
+- Add two patches from upstream which fix JMAPCalendars issues on 32-bit and
+  big-endian architectures.
+- Clean up test invocation and exclusion list.  More tests pass now.
+
+* Wed Jun 28 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-4
+- Explicitly set specialusealways: 1 in the default config.
+
+* Tue Jun 27 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-3
+- Patch the provided imapd.conf and cyrus.conf to more closely match previous
+  Fedora defaults and directories included in this package and to enable
+  features which are supported by the Fedora build.
+- Add tmpfiles.d configuration file for directories in /run.
+
+* Tue Jun 27 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-2
+- Exclude one more test from 32-bit arches.  Looks like this failure crept in
+  with the Cassandane update.
+
+* Thu Jun 22 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.2-1
+- Update to 3.0.2.
+- New Cassandane snapshot, with more tests (all of which are passing).
+
+* Tue Jun 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-7
+- Add old /usr/lib/cyrus-imapd directory to the utils package and add a symlink
+  there to the deliver binary.  This should help a bit with migrations.
+- Add upstream patch to fix reconstruct failures on 32-bit architectures.
+  Re-enable those five Cassandane tests.
+
+* Thu Jun 15 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-6
+- Rename two commands: quota -> cyr_quota, restore -> cyr_restore.
+- Fix Cassandane to handle those renames.
+- Fix location of cyr_fetchnews.
+- Fix Perl 5.26-related module linking issue which caused a test failure.
+  Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1461669
+
+* Tue Jun 06 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-5
+- Use proper path to ctl_mboxlist in cron file.
+- Add patch to increase individual test timeout.  Sometimes armv7hl can't
+  complete a single test in 20 seconds.
+- Disable the Metronome tests; upstream says that they just won't reliably on
+  shared hardware.
+- Don't bother running Cassandane on s390x for now.  The machines are simply
+  too slow.
+
+* Tue Jun 06 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.1-4
+- Perl 5.26 rebuild
+
+* Fri Jun 02 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-3
+- Remove clamav from build requirements.
+- Add --cleanup to Cassandane call to hopefully reduce build disk usage.
+- Disable maxforkrate test on s390x; our builders are too slow to run it.
+
+* Fri Jun 02 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-2
+- Add patch to fix up some endianness issues.
+- Enable both test suites on all architectures.
+- Add arch-specific excludes for a few Cassandane tests.
+
+* Thu Apr 20 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-1
+- Initial attempt at importing 3.0.  Many new dependencies.
+- Use a stock sample imapd.conf file instead of a Fedora-provided one.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 09 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-2
+- Rename httpd manpage to "cyrhttpd" to avoid conflict with the httpd package.
+
+* Wed Nov 23 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.5.10-1
+- Initial update to the 2.5 series.
+- Significant spec cleanups.
+- Add sscg dep and follow
+  https://fedoraproject.org/wiki/Packaging:Initial_Service_Setup for initial
+  cert generation.
+- Change default conf to use the system crypto policy.
+
+* Tue May 17 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.18-3
+- Perl 5.24 rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Oct 01 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.18-1
+- Update to 2.4.18, rhbz#1267871 and rhbz#1267878
+- Backport ff4e6c71d932b3e6bbfa67d76f095e27ff21bad0 to fix issues from
+  http://seclists.org/oss-sec/2015/q3/651
+
+* Wed Sep 09 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.17-14
+- Use %%license tag
+- Have -devel require the base package
+- Minor cleanups
+
+* Sat Aug 08 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.4.17-13
+- Remove invalid Patch0: URL.
+- Use HTTP for upstream source.
+- pod2html was split out of the main perl package, breaking cyrus.
+  Add a build dep for it.
+
+* Wed Jul 29 2015 Kevin Fenzi <kevin@scrye.com> 2.4.17-12
+- Rebuild for new librpm
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.17-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Jun 05 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.17-10
+- Perl 5.22 rebuild
+
+* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.17-9
+- Perl 5.20 rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.17-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.17-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.17-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 2.4.17-5
+- Perl 5.18 rebuild
+
+* Fri Jul 12 2013 Michal Hlavinka <mhlavink@redhat.com> - 2.4.17-4
+- spec clean up
+
+* Thu Apr 18 2013 Michal Hlavinka <mhlavink@redhat.com> - 2.4.17-3
+- make sure binaries are hardened
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Sat Dec  1 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.17-1
-- New upstream version
+- New upstream version, fixes upstream bugs:
+- reconstruct doesn't retain internaldate correctly (#3733)
+- Race condition in maibox rename (#3696)
+- DBERROR db4: Transaction not specified for a transactional database (#3715)
+- performance degradation on huge indexes in 2.4 branch (#3717)
+- typo fix in imapd.conf man page (#3729)
+- quota does not find all quotaroots if quotalegacy, fulldirhash and prefix are used and virtdomains is off (#3735)
+- Mail delivered during XFER was lost (#3737)
+- replication does not work on RENAME (#3742)
+- Failed asserting during APPEND (#3754)
+
+* Fri Nov 30 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.4.16-5
+- do not use strict aliasing
+
+* Tue Aug 21 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.4.16-4
+- use new systemd rpm macros (#850079)
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jun 11 2012 Petr Pisar <ppisar@redhat.com> - 2.4.16-2
+- Perl 5.16 rebuild
+
+* Thu Apr 19 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.16-1
+- New upstream release
+
+* Wed Apr 18 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.15-1
+- New upstream release
+
+* Wed Apr 11 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.4.14-2
+- rebuilt because of new libdb
+
+* Wed Mar 14 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.4.14-1
+- updated to 2.4.14
+
+* Tue Feb 07 2012 Michal Hlavinka <mhlavink@redhat.com> - 2.4.13-3
+- use PraveTmp in systemd unit file
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Jan 02 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.13-1
+- New upstream release
+
+* Wed Dec 07 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-5
+- do not use digest-md5 as part of default auth mechanisms,
+  it does not coop with pam
+
+* Tue Nov 22 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-4
+- reduce noisy logging, add option to turn on LOG_DEBUG syslog
+  messages again (thanks Philip Prindeville) (#754940)
+
+* Mon Oct 24 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-3
+- add login and digest-md5 as part of default auth mechanisms (#748278)
+
+* Tue Oct 11 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-2
+- do not hide errors if cyrus user can't be added
+
+* Wed Oct 05 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.12-1
+- cyrus-imapd updated to 2.4.12
+- fixes incomplete authentication checks in nntpd (Secunia SA46093)
+
+* Fri Sep  9 2011 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.11-1
+- update to 2.4.11
+- Fix CVE-2011-3208 (#734926, #736838)
+
+* Tue Aug 16 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.10-4
+- rebuild with db5
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2.4.10-3
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 2.4.10-2
+- Perl mass rebuild
+
+* Wed Jul  6 2011 Jeroen van Meeuwen <kanarip@kanarip.com> - 2.4.10-1
+- New upstream release
+
+* Wed Jun 22 2011 Iain Arnell <iarnell@gmail.com> 2.4.8-5
+- Patch to work with Perl 5.14
+
+* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.4.8-4
+- Perl mass rebuild
+
+* Fri Jun 10 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2.4.8-3
+- Perl 5.14 mass rebuild
+
+* Mon May 09 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.8-2
+- fixed: systemd commands in %%post (thanks Bill Nottingham)
+
+* Thu Apr 14 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.8-1
+- cyrus-imapd updated to 2.4.8
+- fixed: cannot set unlimited quota through proxy
+- fixed: reconstruct tries to set timestamps again and again
+- fixed: response for LIST "" user is wrong
+- fixed: THREAD command doesn't support quoted charset
+- fixed crashes in mupdatetest and cyr_expire when using -x
+
+* Mon Apr 04 2011 Michal Hlaivnka <mhlavink@redhat.com> - 2.4.7-2
+- now using systemd
+
+* Thu Mar 31 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.7-1
+- updated to 2.4.7
+
+* Fri Feb 11 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.4.6-1
+- updated to 2.4.6
+- "autocreate" and "autosieve" features were removed
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.16-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 21 2011 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-7
+- don't force sync io for all filesystems
+
+* Fri Jul 09 2010 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-6
+- follow licensing guideline update
+- devel sub-package has to have virtual static provides (#609604)
+
+* Mon Jun 07 2010 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-5
+- spec cleanup
+- simplified packaging (merge -perl in -utils)
+- remove obsoleted and/or unmaintained additional sources/patches
+- remove long time not used files from the cvs/srpm
+- update additional sources/patches from their upstream
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 2.3.16-4
+- Mass rebuild with perl-5.12.0
+
+* Tue Apr 20 2010 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-3
+- add support for QoS marked traffic (#576652)
+
+* Thu Jan 14 2010 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-2
+- ignore user_denny.db if missing (#553011)
+- fix location of certificates in default imapd.conf
+
+* Tue Dec 22 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-1
+- updated to 2.3.16
+
+* Fri Dec 04 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-10
+- fix shell for daily cron job (#544182)
+
+* Fri Dec 04 2009 Stepan Kasal <skasal@redhat.com> - 2.3.15-9
+- rebuild against perl 5.10.1
+
+* Thu Nov 26 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-8
+- spec cleanup
+
+* Tue Nov 24 2009 Michal Hlavinka <mhlaivnk@redhat.com> - 2.3.15-7
+- rebuild with new db4 (#540093)
+- spec cleanup
+
+* Fri Nov 06 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-6
+- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)
+
+* Thu Nov 05 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-5
+- do not fill logs with mail (de)compression messages (#528093)
+
+* Thu Oct 29 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-4
+- spec cleanup
+
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-3
+- fix cyrus user shell for db import (#528126)
+
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-2
+- make init script LSB-compliant (#523227)
+
+* Fri Sep 18 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-1
+- fix buffer overflow in cyrus sieve (CVE-2009-3235)
+
+* Wed Sep 16 2009 Tomas Mraz <tmraz@redhat.com> - 2.3.14-6
+- use password-auth common PAM configuration instead of system-auth
+
+* Mon Sep 07 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.14-5
+- fix buffer overflow in cyrus sieve (#521010)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.3.14-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 25 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.14-2
+- rebuild because of changed dependencies
+
+* Thu Apr 02 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.14-1
+- updated to 2.3.14
+
+* Wed Apr 01 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.3.13-5
+- fix unowned directory (#483336).
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Feb 02 2009 Michal Hlavinka <mhlavink@rehdat.com> - 2.3.13-3
+- fix directory ownership
+
+* Wed Jan 21 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.13-2
+- fix: #480138 - assertion failed: libcyr_cfg.c: cyrus_optionsopt.opt == opt
+
+* Tue Jan 13 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.13-1
+- updated to 2.3.13
+
+* Fri Sep 26 2008 Dan Horák <danatdanny.cz - 2.3.12p2-3
+- better fix for linking with recent db4.x
+
+* Fri Sep 12 2008 Dan Horák <danatdanny.cz - 2.3.12p2-2
+- fix linking with db4.7 (Resolves: #461875)
+- patch cleanup
+
+* Mon Sep  1 2008 Dan Horák <danatdanny.cz - 2.3.12p2-1
+- update to new upstream version 2.3.12p2
+- update patches
+
+* Mon Sep  1 2008 Dan Horák <danatdanny.cz - 2.3.11-3
+- refresh patches
+
+* Sat May 31 2008 Dan Horák <danatdanny.cz - 2.3.11-2
+- call automake to update config.* files and be buildable again on rawhide
+
+* Tue Mar 25 2008 Tomas Janousek <tjanouse@redhat.com> - 2.3.11-1
+- update to latest upstream
+- (temporarily) dropped the rmquota+deletemailbox patch (doesn't apply)
+
+* Wed Mar 19 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.3.9-12
+- cyrus-imapd conflicts with uw-imap (#222506)
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.3.9-11
+- add Requires for versioned perl (libperl.so)
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.3.9-10
+- Autorebuild for GCC 4.3
+
+* Fri Feb 08 2008 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-9
+- don't run cronjob if cyrus-imapd has never been started (#418191)
+
+* Tue Dec 04 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-8
+- move certificate creation from -utils postinst to main package
+- rebuild with newer openssl and openldap
+
+* Sun Sep 23 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-7
+- updated the getgrouplist patch
+- fixed a few undeclared functions (and int to pointer conversions)
+
+* Wed Aug 22 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-6
+- update to latest upstream
+- updated all patches from uoa and reenabled rmquota+deletemailbox
+
+* Thu Aug 16 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-5.rc2
+- update to latest upstream beta
+
+* Tue Aug 14 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.9-4.rc1
+- update to latest upstream beta
+- temporarily dropped the rmquota+deletemailbox patch (doesn't apply)
+- fixed to compile with newer glibc
+- added the getgrouplist patch from RHEL-4, dropped groupcache patch
+- dropped the allow_auth_plain patch
+- buildrequire perl-devel
+
+* Mon Jul 23 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-3.2
+- removed the lm_sensors-devel dependency, since it's properly required in
+  net-snmp-devel
+- #248984 - cyrus-imapd.logrotate updated for rsyslog
+
+* Mon Apr 23 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-3.1
+- the -devel subpackage no longer requires the main one
+
+* Wed Apr 11 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-3
+- updated the no-bare-nl patch (#235569), thanks to Matthias Hensler
+
+* Wed Apr 04 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-2
+- fixed mboxlist backup rotation (#197054)
+
+* Mon Mar 12 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-1
+- update to latest upstream
+
+* Wed Jan 24 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-8
+- compile with kerberos support
+
+* Wed Jan 24 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-7
+- fixed Makefile typo (caused multiarch conflict)
+
+* Mon Jan 08 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.7-6
+- #218046: applied patches to compile with db4-4.5
+
+* Tue Dec  5 2006 John Dennis <jdennis@redhat.com> - 2.3.7-5
+- Resolves: bug# 218046: Cyrus-imapd in rawhide needs to be rebuilt
+  against new snmp package
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 2.3.7-4
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Mon Sep 18 2006 John Dennis <jdennis@redhat.com> - 2.3.7-3
+- bump rev for rebuild
+
+* Fri Aug 04 2006 Petr Rockai <prockai@redhat.com> - 2.3.7-2
+- only buildrequire lm_sensors on i386 and x86_64, since it is not
+  available elsewhere
+
+* Sun Jul 23 2006 Petr Rockai <prockai@redhat.com> - 2.3.7-1
+- update to latest upstream version, fixes a fair amount of issues
+- forward-port the autocreate and rmquota patches (used latest
+  upstream patches, those are for 2.3.3)
+
+* Tue Jul 18 2006 Petr Rockai <prockai@redhat.com> - 2.3.1-3
+- install perl modules into vendor_perl instead of site_perl
+- change mode of perl .so files to 755 instead of 555
+- update pam configuration to use include directive instead
+  of deprecated pam_stack
+- change prereq on cyrus-imapd-utils to requires
+
+* Tue Jul 11 2006 Petr Rockai <prockai@redhat.com> - 2.3.1-2.99.test1
+- address bunch of rpmlint errors and warnings
+- rename perl-Cyrus to cyrus-imapd-perl to be consistent with rest
+  of package (the cyrus modules are not part of cpan)
+- added provides on cyrus-nntp and cyrus-murder (the functionality
+  is part of main package now)
+- removed generation of README.buildoptions
+- the two above made it possible to get rid of most build-time parameter
+  guessing from environment
+- get rid of internal autoconf (iew)
+- don't strip binaries, renders -debuginfo useless...
+- remove prereq's in favour of newly added requires(...)
+
+* Tue Feb 28 2006 John Dennis <jdennis@redhat.com> - 2.3.1-2
+- bring up to Simon Matter's 2.3.1-2 release
+- fix bug #173319, require cyrus-sasl-lib instead of cyrus-sasl
+- fix bug #176470, hardcoded disttag
+- add backend_sigsegv patch
+- add replication_policycheck patch
+
+* Mon Jan 23 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-1
+- update to official autocreate and autosievefolder patches
+
+* Thu Jan 19 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.18
+- update rpm_set_permissions script
+- add snmp support as build time option, disabled by default
+  because it doesn't build on older distributions
+
+* Wed Jan 18 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.15
+- add make_md5 patch
+
+* Mon Jan 16 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.13
+- add autosievefolder patch
+- add rmquota+deletemailbox patch
+- change default path for make_md5, add md5 directory
+
+* Fri Jan 13 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.10
+- spec file cleanup
+- add more cvt_cyrusdb_all fixes
+- fix pre/post scripts
+- fix requirements
+- add patch to set Invoca RPM config defaults
+- add sync directory used for replication
+- add autocreate patch
+
+* Thu Jan 12 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.8
+- update cvt_cyrusdb_all script
+- build db.cfg on the fly
+
+* Thu Jan 05 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.5
+- create ptclient directory if ldap enabled
+
+* Wed Jan 04 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.4
+- build without ldap support if openldap is linked against SASLv1
+
+* Tue Jan 03 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.3
+- fix ldap support
+
+* Mon Jan 02 2006 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.2
+- add openldap-devel to buildprereq, build with ldap support
+
+* Wed Dec 21 2005 Simon Matter <simon.matter@invoca.ch> 2.3.1-0.1
+- update to 2.3.1, officially called BETA-quality release
+
+* Fri Dec 16 2005 Simon Matter <simon.matter@invoca.ch> 2.3.0-0.4
+- add skiplist.py to contrib/
+- port authid_normalize patch
+
+* Thu Dec 15 2005 Simon Matter <simon.matter@invoca.ch> 2.3.0-0.3
+- reintroduce subpackage utils, fix requirements
+- move some utils to %%{_bindir}/
+
+* Wed Dec 14 2005 Simon Matter <simon.matter@invoca.ch> 2.3.0-0.2
+- integrate subpackages murder, nntp, replication, utils
+
+* Tue Dec 13 2005 Simon Matter <simon.matter@invoca.ch> 2.3.0-0.1
+- update to 2.3.0, officially called BETA-quality release
+- add replication subpackage
+
+* Fri Dec 09 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-15.1
+- add missing automake to buildprereq
+- change package description
+
+* Tue Dec 06 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-15
+- update cvt_cyrusdb_all script
+- update autocreate patches
+
+* Mon Dec 05 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-14
+- update cvt_cyrusdb_all script
+
+* Mon Nov 14 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-13
+- add 64bit quota support backported from 2.3
+
+* Fri Nov 11 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-12
+- add quickstart/stop option to init script to bypass db import/export
+- add authid_normalize patch
+- add allow_auth_plain_proxying patch
+- update gcc4 patch
+- remove useless fdatasync patch
+- add private autoconf used for build, remove autoconf dependency
+- generate correct docs including man pages
+- remove unneeded files from doc directory
+
+* Fri Nov 04 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-11
+- add mupdate thread-safe patch
+
+* Mon Oct 24 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-9.4
+- add spool patch, which is already fixed in CVS
+
+* Tue Aug 30 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-9.2
+- pull in CPPFLAGS and LDFLAGS from openssl's pkg-config data, if it exists
+
+* Wed Aug 24 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-9.1
+- add timsieved_reset_sasl_conn patch
+
+* Mon Aug 22 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-9
+- cosmetic changes in pre and post scripts
+
+* Fri Aug 19 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-8
+- add more pki dir fixes for inplace upgrades
+
+* Thu Aug 18 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-7
+- include requirement for Berkeley DB utils
+
+* Thu Aug 18 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-6
+- fix recovery problems with db4, which do not exist with db3
+- fix logic for handling ssl certs
+- remove initlog from init script
+
+* Wed Aug 17 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-5
+- add notifytest to the distribution
+- add functionality to convert all berkeley databases to skiplist
+  on shutdown and convert them back as needed on startup. This should
+  solve the upgrade problems with Berkeley databases.
+
+* Tue Aug 16 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-4.14
+- add gcc4 patch
+- determine and handle pki directory for openssl correctly
+- add skiplist recovery docs
+- add notify_sms patch
+
+* Mon Jul 18 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-4.10
+- update cvt_cyrusdb_all script
+- update autocreate patches
+
+* Fri Jul 15 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-4.9
+- add patch to remove ACLs with invalid identifier
+- update cvt_cyrusdb_all script
+
+* Sat Jun 18 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-4.1
+- update munge8bit patch
+
+* Wed Jun 08 2005 Simon Matter <simon.matter@invoca.ch> 2.2.12-4
+- updated seenstate patch
+
+* Thu Jun 02 2005 Simon Matter <simon.matter@invoca.ch>
+- removed nolinkimapspool patch, added singleinstancestore patch instead
+
+* Thu Jun 02 2005 Simon Matter <simon.matter@invoca.ch>
+- added nolinkimapspool patch
+- fix debug_package macro, it was still being expanded,
+  comments don't hide macro expansion
+- change license field to BSD, its not exact BSD, but BSD is the closest
+
+* Fri Apr 22 2005 John Dennis <jdennis@redhat.com> - 2.2.12-6.fc4
+- the openssl package moved all its certs, CA, Makefile, etc. to /etc/pki
+  now we are consistent with the openssl directory changes.
+
+* Thu Apr 21 2005 John Dennis <jdennis@redhat.com> - 2.2.12-5.fc4
+- we finally have a common directory, /etc/pki for certs, so create
+  /etc/pki/cyrus-imapd and put the ssl pem file there. The /etc/cyrus-imapd
+  location will not be used, this change supercedes that.
+
+* Mon Apr 18 2005 John Dennis <jdennis@redhat.com> - 2.2.12-4.fc4
+- fix bug #141479, move ssl pem file from /usr/share/ssl/certs to /etc/cyrus-imapd/cyrus-imapd.pem
+- change license field to BSD, its not exact BSD, but BSD is the closest.
+
+* Fri Apr 15 2005 John Dennis <jdennis@redhat.com> - 2.2.12-3.fc4
+- fix release field to be single digit
+
+* Fri Apr 15 2005 John Dennis <jdennis@redhat.com> - 2.2.12-1.2.fc4
+- fix debug_package macro, it was still being expanded,
+  comments don't hide macro expansion
+- fix changelog chronological order
+- fix bug 118832, cyrus-imapd is modifying /etc/services
+
+* Mon Apr  4 2005 John Dennis <jdennis@redhat.com> - 2.2.12-1.1.fc4
+- bring up to 2.2.12, includes security fix for CAN-2005-0546
+
+* Mon Mar 07 2005 Simon Matter <simon.matter@invoca.ch>
+- updated rmquota+deletemailbox patches
+
+* Fri Mar  4 2005 John Dennis <jdennis@redhat.com> - 2.2.10-11.4.fc4
+- fix gcc4 build problems
+
+* Thu Mar  3 2005 John Dennis <jdennis@redhat.com> 2.2.10-11.3.fc4
+- bump rev for build
+
+* Mon Feb 14 2005 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.12
+- updated autocreate and autosievefolder patches
+
+* Fri Feb 11 2005 John Dennis <jdennis@redhat.com> - 2.2.10-11.2.fc4
+- make _contribdir identical to Simon's,
+  I had been getting burned by rpm's bizarre handling of macros in comments
+
+* Thu Feb 10 2005 John Dennis <jdennis@redhat.com> - 2.2.10-11.1.fc4
+- bring up to date with Simon Matter's 2.2.10-11 rpm
+
+* Sat Feb 05 2005 Simon Matter <simon.matter@invoca.ch>
+- updated autosievefolder patch
+
+* Tue Feb 01 2005 Simon Matter <simon.matter@invoca.ch>
+- remove special ownership and permissions from deliver
+- enable deliver-wrapper per default
+- enable OutlookExpress seenstate patch per default
+
+* Wed Jan 19 2005 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate patch
+
+* Fri Jan 14 2005 Simon Matter <simon.matter@invoca.ch>
+- spec file cleanup
+
+* Tue Jan 11 2005 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate patch
+
+* Fri Jan 07 2005 Simon Matter <simon.matter@invoca.ch>
+- moved contrib dir into doc, made scripts not executable
+
+* Thu Jan 06 2005 Simon Matter <simon.matter@invoca.ch>
+- added more fixes to the autocreate patch
+- don't use %%_libdir for %%_cyrexecdir, it's a mess on x86_64
+- don't use %%_libdir for symlinks
+- remove %%_libdir pachtes
+- change pam configs to work on x86_64
+- changed default build option for IDLED to on
+- changed rpm_set_permissions to honor partitions in /etc/imapd.conf
+
+* Tue Jan 04 2005 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate patch
+
+* Mon Dec 20 2004 Simon Matter <simon.matter@invoca.ch>
+- remove idled docs when disabled, fixes RedHat's bug #142345
+
+* Fri Dec 17 2004 Simon Matter <simon.matter@invoca.ch>
+- removed allnumeric patch, not needed anymore
+- made groupcache a compile time option
+- rename nntp's pam service, fixes RedHat's bug #142672
+
+* Thu Dec 16 2004 Simon Matter <simon.matter@invoca.ch>
+- updated groupcache patch
+- updated cvt_cyrusdb_all to use runuser instead of su if available
+- added upd_groupcache tool
+
+* Wed Dec 15 2004 Simon Matter <simon.matter@invoca.ch>
+- added groupfile patch to help those using nss_ldap
+
+* Thu Dec 02 2004 Simon Matter <simon.matter@invoca.ch>
+- modified config directives and removed verify options
+
+* Thu Dec  2 2004 John Dennis <jdennis@redhat.com> 2.2.10-3.devel
+- fix bug #141673, dup of bug #141470
+  Also make cyrus.conf noreplace in addition to imapd.conf
+  Remove the verify overrides on the noreplace config files,
+  we do want config file changes visible when verifying
+
+* Wed Dec  1 2004 John Dennis <jdennis@redhat.com> 2.2.10-2.devel
+- fix bug #141470, make imapd.conf a noreplace config file
+
+* Wed Dec  1 2004 John Dennis <jdennis@redhat.com> 2.2.10-1.devel
+- update to Simon Matter's 2.2.10 RPM,
+  fixes bug #139382,
+  security advisories: CAN-2004-1011 CAN-2004-1012 CAN-2004-1013 CAN-2004-1015
+
+* Wed Nov 24 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.10
+
+* Tue Nov 23 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.9
+
+* Fri Nov 19 2004 Simon Matter <simon.matter@invoca.ch>
+- changed scripts to use runuser instead of su if available
+
+* Thu Nov 18 2004 Simon Matter <simon.matter@invoca.ch>
+- changed requirement for file >= 3.35-1 from BuildPrereq to
+  Requires, fixes RedHat's bug #124991
+- added acceptinvalidfrom patch to fix RedHat's bug #137705
+
+* Mon Oct 4 2004 Dan Walsh <dwalsh@redhat.com> 2.2.6-2.FC3.6
+- Change cyrus init scripts and cron job to use runuser instead of su
+
+* Fri Aug  6 2004 John Dennis <jdennis@redhat.com> 2.2.6-2.FC3.5
+- remove obsoletes tag, fixes bugs #127448, #129274
+
+* Wed Aug  4 2004 John Dennis <jdennis@redhat.com>
+- replace commas in release field with dots, bump build number
+
+* Tue Aug 03 2004 Simon Matter <simon.matter@invoca.ch>
+- fixed symlinks for x86_64, now uses the _libdir macro
+  reported by John Dennis, fixes RedHat's bug #128964
+- removed obsoletes tag, fixes RedHat's bugs #127448, #129274
+
+* Mon Aug  2 2004 John Dennis <jdennis@redhat.com> 2.2.6-2,FC3,3
+- fix bug #128964, lib symlinks wrong on x86_64
+
+* Thu Jul 29 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.8
+
+* Thu Jul 29 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate and autosieve patches
+- made authorization a compile time option
+- added sieve-bc_eval patch
+
+* Tue Jul 27 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.7
+- modified autocreate patch or 2.2.7
+- removed snmpargs patch which was needed for RedHat 6.2
+
+* Tue Jul 13 2004 Simon Matter <simon.matter@invoca.ch>
+- added mboxlist / mboxname patches from CVS
+
+* Tue Jul 06 2004 Simon Matter <simon.matter@invoca.ch>
+- updated rmquota+deletemailbox patch
+
+* Sat Jul  3 2004 John Dennis <jdennis@redhat.com> - 2.2.6-2,FC3,1
+- bring up to date with Simon Matter's latest upstream rpm 2.2.6-2
+- comment out illegal tags Packager, Vendor, Distribution
+  build for FC3
+
+* Wed Jun 30 2004 Simon Matter <simon.matter@invoca.ch>
+- added quota patches from CVS
+
+* Fri Jun 25 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate patch
+
+* Fri Jun 18 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.6
+
+* Fri Jun 11 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate and autosieve patches
+
+* Tue Jun 01 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate, autosieve and rmquota patches
+- fixed rmquota patch to build on gcc v3.3.x
+- added lmtp_sieve patch
+
+* Sat May 29 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.5
+
+* Fri May 28 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.5 pre-release
+
+* Mon May 24 2004 Simon Matter <simon.matter@invoca.ch>
+- added hash patch to fix a sig11 problem
+- added noncritical typo patch
+
+* Fri May 21 2004 Simon Matter <simon.matter@invoca.ch>
+- include OutlookExpress seenstate patch
+- fixed allnumeric patch
+
+* Thu May 20 2004 Simon Matter <simon.matter@invoca.ch>
+- don't enable cyrus-imapd per default
+- rename fetchnews to cyrfetchnews to avoid namespace conflicts with leafnode
+- replace fetchnews with cyrfetchnews in man pages
+- replace master with cyrus-master in man pages
+
+* Tue May 18 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.4
+
+* Fri Apr 30 2004 Simon Matter <simon.matter@invoca.ch>
+- Don't provides: imap
+
+* Wed Mar 17 2004 Simon Matter <simon.matter@invoca.ch>
+- fix init script
+
+* Thu Mar 04 2004 Simon Matter <simon.matter@invoca.ch>
+- strip binaries
+
+* Tue Mar 02 2004 Simon Matter <simon.matter@invoca.ch>
+- add more SELinux fixes
+
+* Wed Feb 25 2004 Simon Matter <simon.matter@invoca.ch>
+- add makedepend to path, thank you Andreas Piesk for reporting it
+
+* Mon Feb 23 2004 Dan Walsh <dwalsh@redhat.com>
+- change su within init script to get input from /dev/null
+  this prevents hang when running in SELinux
+- don't use -fpie as default, it breaks different distributions
+
+* Thu Feb 19 2004 Simon Matter <simon.matter@invoca.ch>
+- merged in most changes from Karsten Hopp's RedHat package
+- fixed permissions of files in contrib, thank you
+  Edward Rudd for reporting it.
+- modified snmp patch to make it build on RedHat 6.2 again
+
+* Tue Feb 03 2004 Karsten Hopp <karsten@redhat.de>
+- switch to Simon Matter's cyrus-imapd package, which has
+  some major improvements over the old Red Hat package.
+  - configdirectory moved from /var/imap to /var/lib/imap
+  - sasl_pwcheck_method changed to saslauthd
+- needed to delete package/vendor tags for buildsystem.
+- added USEPIE variable for linking with -fpie flag
+- removed rpath from linker arguments
+- removed email header from README.HOWTO-recover-mailboxes
+- added lib64 patch
+- use CFLAGS from specfile in imtest subdir
+- disable -pie on ppc for now
+
+* Tue Feb 03 2004 Simon Matter <simon.matter@invoca.ch>
+- added tls_ca_file: to imapd.conf
+- updated autocreate patch which fixes a small sig11 problem
+
+* Thu Jan 29 2004 Simon Matter <simon.matter@invoca.ch>
+- convert sieve scripts to UTF-8 only if sievec failed before
+- add note to the readme about limiting loggin on busy servers
+- added build time option to chose the syslog facility
+
+* Wed Jan 28 2004 Simon Matter <simon.matter@invoca.ch>
+- sieve scripts are now converted to UTF-8 with cvt_cyrusdb_all
+
+* Tue Jan 27 2004 Simon Matter <simon.matter@invoca.ch>
+- fixed problems with masssievec
+- lots of small fixes in the init scripts
+
+* Fri Jan 23 2004 Simon Matter <simon.matter@invoca.ch>
+- updated auto db converting functionality
+- added auto masssievec functionality
+
+* Thu Jan 22 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate/autosievefolder patches
+
+* Fri Jan 16 2004 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.3
+
+* Wed Jan 14 2004 Simon Matter <simon.matter@invoca.ch>
+- number of mailbox list dumps can now be configured
+
+* Fri Jan 02 2004 Simon Matter <simon.matter@invoca.ch>
+- updated autosievefolder patch
+
+* Thu Dec 18 2003 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate/autosievefolder/rmquota patches
+
+* Tue Oct 28 2003 Simon Matter <simon.matter@invoca.ch>
+- updated to 2.2.2-BETA
+
+* Tue Aug 05 2003 Simon Matter <simon.matter@invoca.ch>
+- add sendmail m4 macro, some people were looking for it
+- just one source for pam default configuration (they were all the same)
+- added /etc/pam.d/lmtp
+- added build support for RedHat Beta severn
+
+* Wed Jul 30 2003 Simon Matter <simon.matter@invoca.ch>
+- updated autocreate patch to 0.8.1
+- removed creation of spool/config dirs, not needed anymore
+- added cyrus_sharedbackup to contrib
+
+* Fri Jul 18 2003 Simon Matter <simon.matter@invoca.ch>
+- modified for 2.2.1-BETA
+
+* Wed Jul 09 2003 Simon Matter <simon.matter@invoca.ch>
+- modified rpm_set_permissions script
+
+* Mon Jul 07 2003 Simon Matter <simon.matter@invoca.ch>
+- changed permissions on config and spool dirs
+- modified init script
+
+* Thu Jul 03 2003 Simon Matter <simon.matter@invoca.ch>
+- upgraded to 2.1.14
+- removed now obsolete forcedowncase patch
+- use --with-extraident to add extra version information
+- updated munge8bit patch
+
+* Wed Jun 04 2003 Simon Matter <simon.matter@invoca.ch>
+- added RedHat 2.1ES support to the perlhack detection
+
+* Tue May 20 2003 Simon Matter <simon.matter@invoca.ch>
+- upgraded autocreate patch
+
+* Fri May 09 2003 Simon Matter <simon.matter@invoca.ch>
+- upgraded autocreate patch
+- modified init script
+
+* Mon May 05 2003 Simon Matter <simon.matter@invoca.ch>
+- upgraded to 2.1.13
+- replaced commands with macros, cleaned up spec file
+
+* Fri May 02 2003 Simon Matter <simon.matter@invoca.ch>
+- added murder subpackage
+- changed exec path to /usr/lib/cyrus-imapd
+
+* Thu May 01 2003 Simon Matter <simon.matter@invoca.ch>
+- included modified munge8bit patch again
+
+* Tue Apr 29 2003 Simon Matter <simon.matter@invoca.ch>
+- added new 8bit header patch
+- upgraded IPv6 patch
+- upgraded autocreate patch to 0.7
+
+* Mon Apr 28 2003 Simon Matter <simon.matter@invoca.ch>
+- added new autocreate patch
+
+* Mon Mar 31 2003 H-E Sandstrom <hes@mailcore.net>
+- added munge8bit patch
+
+* Mon Mar 24 2003 Simon Matter <simon.matter@invoca.ch>
+- added createonpost fix patch
+
+* Thu Mar 20 2003 Simon Matter <simon.matter@invoca.ch>
+- added functionality to patch the IPv6 patch on the fly if
+  autoconf > 2.13, we can now use newer autoconf again.
+
+* Tue Mar 18 2003 Paul Bender <pbender@qualcomm.com>
+- fixed spec file so that autoconf 2.13 will always be used,
+  since the IPv6 patch requires autoconf <= 2.13
+
+* Fri Mar 14 2003 Simon Matter <simon.matter@invoca.ch>
+- fixed problems with new file package
+
+* Thu Mar 13 2003 Simon Matter <simon.matter@invoca.ch>
+- added kerberos include for RedHat Beta phoebe 2
+- added Henrique's forcedowncase patch
+
+* Mon Mar 03 2003 Simon Matter <simon.matter@invoca.ch>
+- corrected imapd.conf
+
+* Sat Mar 01 2003 Simon Matter <simon.matter@invoca.ch>
+- added note about lmtp socket in sendmail
+- added flock patches
+
+* Fri Feb 07 2003 Simon Matter <simon.matter@invoca.ch>
+- added build time option for fulldirhash
+
+* Wed Feb 05 2003 Simon Matter <simon.matter@invoca.ch>
+- added IPV6 patch to source rpm
+- fixed build on RedHat 6.2
+
+* Tue Feb 04 2003 Simon Matter <simon.matter@invoca.ch>
+- update to 2.1.12
+- added logrotate entry for /var/log/auth.log
+- modified init script to use builtin daemon mode
+
+* Fri Jan 10 2003 Simon Matter <simon.matter@invoca.ch>
+- small change in mboxlist backup script
+
+* Fri Jan 10 2003 Simon Matter <simon.matter@invoca.ch>
+- fixed a cosmetic bug in cvt_cyrusdb_all
+- added cron.daily job to backup mailboxes.db
+
+* Mon Jan 06 2003 Simon Matter <simon.matter@invoca.ch>
+- add more entries to /etc/services
+
+* Wed Jan 01 2003 Simon Matter <simon.matter@invoca.ch>
+- include snmpargs patch for build on RedHat 6.2
+- added build support for RedHat 6.2
+
+* Mon Dec 30 2002 Simon Matter <simon.matter@invoca.ch>
+- removed autoconf hack, not needed anymore
+- enabled build on RedHat Beta Phoebe
+- added services entry for lmtp
+- cleanup spec file
+
+* Thu Dec 26 2002 Simon Matter <simon.matter@invoca.ch>
+- removed BuildPrereq for e2fsprogs-devel
+
+* Thu Dec 12 2002 Simon Matter <simon.matter@invoca.ch>
+- modified RedHat release detection
+- added BuildPrereq for file
+
+* Thu Dec 05 2002 Simon Matter <simon.matter@invoca.ch>
+- upgraded to cyrus-imapd 2.1.11
+- upgrade IPV6 patch to 20021205
+
+* Thu Nov 28 2002 Simon Matter <simon.matter@invoca.ch>
+- Fixed some default attributes
+
+* Thu Nov 28 2002 Troels Arvin <troels@arvin.dk>
+- Explicitly changed files-section to
+   - use defattr for simple (root-owned 0644) files
+   - explictly set root as user/group owner where
+     the user/group ownership was previously indicated
+     as "-"; this allows building valid packages without
+     having to being root when building
+
+* Mon Nov 25 2002 Simon Matter <simon.matter@invoca.ch>
+- changed default build option for IDLED to off
+- included some useful info in README.*
+
+* Thu Nov 21 2002 Simon Matter <simon.matter@invoca.ch>
+- added build time option for IDLED, thank you Roland Pope
+
+* Tue Nov 19 2002 Simon Matter <simon.matter@invoca.ch>
+- fixed spec to really use fdatasync patch
+- added createonpost patch
+
+* Thu Nov 14 2002 Simon Matter <simon.matter@invoca.ch>
+- upgraded to cyrus-imapd 2.1.10
+- build without IPv6 support by default
+
+* Tue Nov 12 2002 Simon Matter <simon.matter@invoca.ch>
+- fixed db detection in .spec
+
+* Mon Oct 21 2002 Simon Matter <simon.matter@invoca.ch>
+- updated cvt_cyrusdb_all script
+
+* Fri Oct 18 2002 Simon Matter <simon.matter@invoca.ch>
+- added fdatasync patch
+
+* Thu Oct 03 2002 Simon Matter <simon.matter@invoca.ch>
+- add RPM version 4.1 compatibility, which means remove installed
+  but not packaged files
+
+* Wed Sep 18 2002 Simon Matter <simix@datacomm.ch>
+- added auto db converting functionality
+- changed default for MBOXLIST_DB and SEEN_DB to skiplist
+
+* Mon Sep 16 2002 Simon Matter <simix@datacomm.ch>
+- remove creation of cyrus user at build time
+- added scripts from ftp://kalamazoolinux.org/pub/projects/awilliam/cyrus/
+
+* Mon Sep 02 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.9
+
+* Fri Aug 30 2002 Simon Matter <simix@datacomm.ch>
+- included extra ident string
+
+* Thu Aug 29 2002 Simon Matter <simix@datacomm.ch>
+- modified path in deliver-wrapper, thank you Richard L. Phipps
+- added RedHat 2.1AS support to the perlhack detection
+- added build time option to force syncronous updates on ext3
+
+* Wed Aug 28 2002 Simon Matter <simix@datacomm.ch>
+- added updated IPv6 patch from Hajimu UMEMOTO
+
+* Wed Aug 28 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.8
+
+* Thu Aug 22 2002 Simon Matter <simix@datacomm.ch>
+- included IPv6 patch from Hajimu UMEMOTO
+
+* Wed Aug 21 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.7 because of wrong version info
+
+* Wed Aug 21 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.6
+
+* Mon Aug 19 2002 Simon Matter <simix@datacomm.ch>
+- change db version detection, thank you Chris for reporting
+
+* Tue Aug 13 2002 Simon Matter <simix@datacomm.ch>
+- fixed autoconf detection
+
+* Mon Aug 12 2002 Simon Matter <simix@datacomm.ch>
+- included support for different autoconf versions
+- modified the perl build and install process
+- made some .spec changes to build on RedHat 7.x and limbo
+
+* Fri Aug 09 2002 Simon Matter <simix@datacomm.ch>
+- included sieve matching patch
+
+* Thu Jun 27 2002 Simon Matter <simix@datacomm.ch>
+- fixed %%post script where %%F was expanded to file.file
+
+* Wed Jun 26 2002 Simon Matter <simix@datacomm.ch>
+- fixed missing man page
+
+* Tue Jun 25 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.5
+
+* Mon Jun 24 2002 Simon Matter <simix@datacomm.ch>
+- added compile time parameters to configure the package based on
+  the idea from Luca Olivetti <luca@olivetti.cjb.net>
+- make deliver-wrapper a compile time option
+
+* Fri May 03 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.4
+
+* Mon Apr 22 2002 Simon Matter <simix@datacomm.ch>
+- small initscript fix
+
+* Fri Mar 08 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.3
+- removed some stuff that was cleaned up in the sources
+- added compile time options for db backends
+
+* Wed Mar 06 2002 Simon Matter <simix@datacomm.ch>
+- removed requires perl-File-Temp for utils package, it's in the RedHat
+  perl RPM now
+
+* Fri Feb 22 2002 Simon Matter <simix@datacomm.ch>
+- removed deliverdb/db
+
+* Wed Feb 20 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.2
+
+* Mon Feb 11 2002 Simon Matter <simix@datacomm.ch>
+- changed sasl_mech_list: PLAIN in /etc/imapd.conf
+- added sieve to /etc/pam.d
+
+* Fri Feb 08 2002 Simon Matter <simix@datacomm.ch>
+- added requires perl-File-Temp for utils package
+
+* Wed Feb 06 2002 Simon Matter <simix@datacomm.ch>
+- added some %%dir flags
+- removed /usr/lib/sasl/Cyrus.conf
+- added conf templates
+- build time option for usage of saslauth group
+
+* Tue Feb 05 2002 Simon Matter <simix@datacomm.ch>
+- upgraded to cyrus-imapd 2.1.1
+- dependency of cyrus-sasl >= 2.1.0-1
+
+* Sun Feb 03 2002 Simon Matter <simix@datacomm.ch>
+- saslauth group is only deleted on uninstall if there is no other
+  member in this group
+
+* Sat Feb 02 2002 Simon Matter <simix@datacomm.ch>
+- changed start/stop level in init file
+
+* Tue Jan 29 2002 Simon Matter <simix@datacomm.ch>
+- dependency of cyrus-sasl >= 1.5.24-22
+- dotstuffing patch for sendmail calls made by sieve for outgoing
+  mails
+- patch for ability to force ipurge to traverse personal folders
+
+* Mon Jan 28 2002 Simon Matter <simix@datacomm.ch>
+- minor spec file changes
+
+* Sat Jan 19 2002 Simon Matter <simix@datacomm.ch>
+- changed default auth to pam
+- remove several %%dir from %%files sections
+- change from /usr/lib/cyrus -> /usr/libexec/cyrus
+- rename source files to something like cyrus...
+- added rehash tool
+- changed to hashed spool
+
+* Fri Jan 18 2002 Simon Matter <simix@datacomm.ch>
+- fixed init script
+- fixed %%post section in spec
 
-* Wed Nov 21 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.15-2
-- Ship fix for APPEND BINARY GUID (#3754)
+* Thu Jan 17 2002 Simon Matter <simix@datacomm.ch>
+- ready for first build
 
+* Wed Jan 09 2002 Simon Matter <simix@datacomm.ch>
+- initial package, with help from other packages out there

0001-Fixed-CALDAV-PUT-requests-while-proxying.patch Added

0002-Openssl-3.0-fixes.patch Added

@@ -0,0 +1,175 @@
+From 5e22772d2c1972e6e97ee2486951d3048f36a360 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Fri, 14 Oct 2022 17:00:07 +0200
+Subject: PATCH 2/4 Openssl 3.0 fixes
+
+---
+ imap/tls.c      | 31 +++++++++++++++++++------------
+ imtest/imtest.c | 12 +++++++-----
+ 2 files changed, 26 insertions(+), 17 deletions(-)
+
+diff --git a/imap/tls.c b/imap/tls.c
+index a4b04dfb1..6a028b890 100644
+--- a/imap/tls.c
++++ b/imap/tls.c
+@@ -149,7 +149,7 @@ static int tls_serverengine = 0; /* server engine initialized? */
+ static int tls_clientengine = 0; /* client engine initialized? */
+ static int do_dump = 0;         /* actively dumping protocol? */
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+ static DH *dh_params = NULL;
+ #endif
+ 
+@@ -240,7 +240,7 @@ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+ }
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+ /* Logic copied from OpenSSL apps/s_server.c: give the TLS context
+  * DH params to work with DHE-* cipher suites. Hardcoded fallback
+  * in case no DH params in server_key or server_cert.
+@@ -739,7 +739,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     const char   *client_ca_file;
+     const char   *server_ca_file;
+     const char   *server_cert_file;
+-    const char   *server_dhparam_file;
+     const char   *server_key_file;
+     const char   *crl_file_path;
+     enum enum_value tls_client_certs;
+@@ -883,7 +882,6 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+ 
+     server_ca_file = config_getstring(IMAPOPT_TLS_SERVER_CA_FILE);
+     server_cert_file = config_getstring(IMAPOPT_TLS_SERVER_CERT);
+-    server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
+     server_key_file = config_getstring(IMAPOPT_TLS_SERVER_KEY);
+ 
+     if (config_debug) {
+@@ -949,8 +947,11 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
+ #endif
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
++    SSL_CTX_set_dh_auto(s_ctx, 1);
++#elif (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
+     /* Load DH params for DHE-* key exchanges */
++    const char *server_dhparam_file = config_getstring(IMAPOPT_TLS_SERVER_DHPARAM);
+     dh_params = load_dh_param(server_dhparam_file, server_key_file, server_cert_file);
+     SSL_CTX_set_tmp_dh(s_ctx, dh_params);
+ #endif
+@@ -959,12 +960,16 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+     const char *ec = config_getstring(IMAPOPT_TLS_ECCURVE);
+     int openssl_nid = OBJ_sn2nid(ec);
+     if (openssl_nid != 0) {
++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
++        SSL_CTX_set1_curves(s_ctx, &openssl_nid, 1);
++#else
+         EC_KEY *ecdh;
+         ecdh = EC_KEY_new_by_curve_name(openssl_nid);
+         if (ecdh != NULL) {
+             SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
+             EC_KEY_free(ecdh);
+         }
++#endif
+     }
+ #endif
+ 
+@@ -1086,20 +1091,22 @@ EXPORTED int     tls_init_serverengine(const char *ident,
+ 
+ /* taken from OpenSSL apps/s_cb.c */
+ 
+-static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
+-                        long argl __attribute__((unused)), long ret)
++static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
++                        size_t len __attribute__((unused)), int argi,
++                        long argl __attribute__((unused)), int ret,
++                        size_t *processed __attribute__((unused)))
+ {
+     if (!do_dump)
+         return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))",
++        printf("read from %08lX %08lX (%d bytes => %d (0x%X))",
+                (unsigned long)bio, (unsigned long)argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+         return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))",
++        printf("write to %08lX %08lX (%d bytes => %d (0x%X))",
+                (unsigned long) bio, (unsigned long)argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+@@ -1171,7 +1178,7 @@ EXPORTED int tls_start_servertls(int readfd, int writefd, int timeout,
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (var_imapd_tls_loglevel >= 3)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4*/
+     if (var_imapd_tls_loglevel >= 3)
+@@ -1402,7 +1409,7 @@ EXPORTED int tls_shutdown_serverengine(void)
+             sess_dbopen = 0;
+         }
+ 
+-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && (OPENSSL_VERSION_NUMBER < 0x30000000L)
+         if (dh_params) DH_free(dh_params);
+ #endif
+     }
+@@ -1659,7 +1666,7 @@ HIDDEN int tls_start_clienttls(int readfd, int writefd,
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (var_proxy_tls_loglevel >= 3)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4*/
+     if (var_proxy_tls_loglevel >= 3)
+diff --git a/imtest/imtest.c b/imtest/imtest.c
+index 128fb5a5e..57eafe5c1 100644
+--- a/imtest/imtest.c
++++ b/imtest/imtest.c
+@@ -630,20 +630,22 @@ static int tls_dump(const char *s, int len)
+ 
+ /* taken from OpenSSL apps/s_cb.c */
+ 
+-static long bio_dump_cb(BIO * bio, int cmd, const char *argp, int argi,
+-                        long argl __attribute__((unused)), long ret)
++static long bio_dump_cb(BIO * bio, int cmd, const char *argp,
++                        size_t len __attribute__((unused)), int argi,
++                        long argl __attribute__((unused)), int ret,
++                        size_t *processed __attribute__((unused)))
+ {
+     if (!do_dump)
+         return (ret);
+ 
+     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
+-        printf("read from %08lX %08lX (%d bytes => %ld (0x%lX))\n",
++        printf("read from %08lX %08lX (%d bytes => %d (0x%X))\n",
+                (unsigned long) bio, (unsigned long) argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+         return (ret);
+     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
+-        printf("write to %08lX %08lX (%d bytes => %ld (0x%lX))\n",
++        printf("write to %08lX %08lX (%d bytes => %d (0x%X))\n",
+                (unsigned long) bio, (unsigned long) argp,
+                argi, ret, ret);
+         tls_dump(argp, (int) ret);
+@@ -686,7 +688,7 @@ static int tls_start_clienttls(unsigned *layer, char **authid)
+      * created for us, so we can use it for debugging purposes.
+      */
+     if (verbose==1)
+-        BIO_set_callback(SSL_get_rbio(tls_conn), bio_dump_cb);
++        BIO_set_callback_ex(SSL_get_rbio(tls_conn), bio_dump_cb);
+ 
+     /* Dump the negotiation for loglevels 3 and 4 */
+     if (verbose==1)
+-- 
+2.37.3
+

0003-Configurable-default-addressbook-display-name.patch Added

@@ -0,0 +1,41 @@
+From 9481178e24b09637ac8df3ceb3db462a9dfabdf5 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Fri, 21 Oct 2022 12:15:20 +0200
+Subject: PATCH 3/4 Configurable default addressbook display name
+
+---
+ imap/http_carddav.c | 3 ++-
+ lib/imapoptions     | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/imap/http_carddav.c b/imap/http_carddav.c
+index ce2aa2370..a1fdf3718 100644
+--- a/imap/http_carddav.c
++++ b/imap/http_carddav.c
+@@ -502,7 +502,8 @@ EXPORTED int carddav_create_defaultaddressbook(const char *userid) {
+     r = mboxlist_lookup(mbname_intname(mbname), NULL, NULL);
+     if (r == IMAP_MAILBOX_NONEXISTENT) {
+         r = _create_mailbox(userid, mbname_intname(mbname),
+-                            MBTYPE_ADDRESSBOOK, "personal",
++                            MBTYPE_ADDRESSBOOK,
++                            config_getstring(IMAPOPT_ADDRESSBOOK_DEFAULT_DISPLAYNAME),
+                             &namespacelock);
+     }
+ 
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 3d43d1c36..c15163265 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -113,6 +113,9 @@ are listed with ``<none>''.
+    hierarchy will be at the toplevel of the shared namespace.  A
+    user's personal addressbook hierarchy will be a child of their Inbox. */
+ 
++{ "addressbook_default_displayname", "personal", STRING, "3.4.5" }
++/* The displayname to be used when creating a user's 'Default' addressbook. */
++
+ { "admins", "", STRING, "2.3.17" }
+ /* The list of userids with administrative rights.  Separate each userid
+    with a space.  Sites using Kerberos authentication may use
+-- 
+2.37.3
+

0004-Autocreate-on-PROPFIND.patch Added

@@ -0,0 +1,70 @@
+From 26d7c35f3c674901c0691ea2ab388cbc818d9e9b Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Mon, 24 Oct 2022 21:37:34 +0200
+Subject: PATCH 4/4 Autocreate on PROPFIND
+
+If we don't have existing calendar folders then dav_parse_req_target
+fails, because it looks for the base calendar via mupdate.
+The new codepath simply attempts to lookup the inbox instead and then
+proxies the request to that backend, triggering the autocreate.
+This requires that the inbox has been created before though.
+---
+ imap/http_dav.c | 35 ++++++++++++++++++++++++++++++++++-
+ 1 file changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/imap/http_dav.c b/imap/http_dav.c
+index bd73964f2..285d4b939 100644
+--- a/imap/http_dav.c
++++ b/imap/http_dav.c
+@@ -509,6 +509,28 @@ static unsigned long principal_allow_cb(struct request_target_t *tgt)
+     return tgt->namespace->allow;
+ }
+ 
++static struct backend *proxy_findinboxserver(const char *userid)
++{
++    mbentry_t *mbentry = NULL;
++    struct backend *s = NULL;
++
++    char *inbox = mboxname_user_mbox(userid, NULL);
++    int r = mboxlist_lookup(inbox, &mbentry, NULL);
++    free(inbox);
++
++    if (r) return NULL;
++
++    if (mbentry->mbtype & MBTYPE_REMOTE) {
++        s = proxy_findserver(mbentry->server, &http_protocol,
++                             httpd_userid, &backend_cached,
++                             NULL, NULL, httpd_in);
++    }
++
++    mboxlist_entry_free(&mbentry);
++
++    return s;
++}
++
+ 
+ /* Parse request-target path in DAV principals namespace */
+ static int principal_parse_path(const char *path, struct request_target_t *tgt,
+@@ -6121,7 +6143,18 @@ EXPORTED int meth_propfind(struct transaction_t *txn, void *params)
+     /* Parse the path */
+     if (fparams->parse_path) {
+         r = dav_parse_req_target(txn, fparams);
+-        if (r) return r;
++        if (r) {
++
++            struct backend *be;
++            be = proxy_findinboxserver(txn->req_tgt.userid);
++            if (!be) {
++                syslog(LOG_ERR, "Could not find a backend");
++                return HTTP_UNAVAILABLE;
++            }
++            return http_pipe_req_resp(be, txn);
++
++            return r;
++        }
+     }
+ 
+     /* Make sure method is allowed */
+-- 
+2.37.3
+

README.rpm Added

@@ -0,0 +1,34 @@
+---------------
+Cyrus IMAPd RPM
+---------------
+
+This is a _very_ 'quick and dirty' install howto.
+
+The following steps should lead you to a running Cyrus IMAP server:
+
+1)  Install on a distribution which is supported by this RPM. Don't install
+    on a dirty system, where you have previously installed from source.
+2)  Don't install if you have a previous Cyrus IMAPd installation <=2.1.x on
+    your box. Upgrading any Invoca rpm based installation should be fine.
+3)  Make sure you understand that this RPM installs in FHS compliant
+    directories, like /var/lib/imap and /var/spool/imap
+4)  Make sure cyrus-sasl is installed.
+5)  Make sure saslauthd is running. If not, edit /etc/sysconfig/saslauthd as
+    needed and do 'chkconfig saslauthd on ; service saslauthd start'
+6)  Install the cyrus-imapd RPMs.
+7)  If it's your first install of Cyrus IMAPd, then set a password for the
+    cyrus user in whatever database you are using to authenticate. When
+    using a local account, this should be 'passwd cyrus'.
+8)  Make sure your MTA delivers to Cyrus IMAPd, I recommend LMTP for this.
+9)  Start Cyrus IMAPd with 'service cyrus-imapd start'
+10) Run cyradm and create a user. Usually it's something like this:
+    'cyradm --user=cyrus --auth=login localhost'
+11) If you're using sendmail, be aware that cyrusv2.m4 included in standard
+    sendmail distribution uses socket /var/imap/socket/lmtp while this rpm
+    uses /var/lib/imap/socket/lmtp.
+12) Check your syslog configuration. This RPM uses the mail facility to log
+    messages. On busy sites you may want to limit the mail facility to the
+    info priority with something like 'mail.info    /var/log/maillog' in
+    /etc/syslog.conf.
+
+Enjoy!

cassandane-testdata-ca669d4b.tar.gz Added

cassandane.ini Added

@@ -0,0 +1,56 @@
+# A basic cassandane.ini file for running cassandane as part of the Fedora
+# package build process.
+
+# The idea here is to run tests on the just-compiled version of cyrus-imapd.
+# However, many of the build locations are just random temporary directories, and
+# so this requires some finesse.
+
+cassandane
+rootdir = CASSDIR/work
+pwcheck = alwaystrue # This is enabled in Fedora builds
+cleanup = no
+maxworkers = 1
+base_port = 19100
+
+#valgrind
+#enabled = no
+
+# The installed copy
+cyrus default
+prefix = /usr
+destdir = BUILDROOT
+quota = cyr_quota
+
+# Replication testing disabled
+# cyrus replica
+# cyrus murder
+
+# Don't enable any of the gdb options but leave them here in case someone ever
+# needs to do so
+#gdb
+# imapd = yes
+# sync_server = yes
+# lntpd = yes
+# timsieved = yes
+# backupd = yes
+
+config
+altnamespace = no
+unixhierarchysep = no
+client_timeout = 60
+
+#caldavtalk
+#basedir = CASSDIR/cassandane/testdata
+
+imaptest
+# Cassandane wants this to not be installed.  Don't know why.  To use it we
+# have to make a directory and link things into it.
+basedir = imaptest
+
+# jmaptester
+# basedir = JMAP-Tester
+# The JMAP modules end up needing JSON-Typist (which I could bundle) and CryptX (which is a bit too much to bundle)
+
+# caldavtester
+# XXX Would need to include the source in the cyrus package just as cassandane is, and get it built before running tests
+# basedir = ...

cyr_systemd_helper Deleted

@@ -1,106 +0,0 @@
-#!/bin/sh
-# get_config config default
-# extracts config option from config file
-
-if  ! -c /dev/null ; then
-    exit 1
-fi
-
-if  ! -r /dev/null -o ! -w /dev/null ; then
-    exit 1
-fi
-
-if  "$(stat -c %a /dev/null)" != "666" ; then
-    chmod 666 /dev/null
-fi
-
-if  -f /etc/sysconfig/cyrus-imapd ; then
-    . /etc/sysconfig/cyrus-imapd
-elif  -f /etc/default/cyrus-imapd ; then
-    . /etc/default/cyrus-imapd
-fi
-
-if  ! -z "${QUICK}" ; then
-    if  ${QUICK} -ne 0 ; then
-        exit 0
-    fi
-fi
-
-get_config() {
-    if conf=$(grep "^$1" /etc/imapd.conf); then
-        echo $conf | cut -d: -f2
-    else
-        echo $2
-    fi
-}
-
-CONFIGDIRECTORY=$(get_config configdirectory /var/lib/imap)
-if  ! -d ${CONFIGDIRECTORY} ; then
-    mkdir -p ${CONFIGDIRECTORY}
-    chmod 700 ${CONFIGDIRECTORY}
-    chown cyrus:mail ${CONFIGDIRECTORY}
-fi
-
-RETVAL=0
-
-# Sometimes, there is no path
-runuser=$(which runuser 2>/dev/null)
-
-if  -z "${runuser}" ; then
-    runuser=/usr/sbin/runuser
-fi
-
-reload() {
-    if  ! -f /var/run/cyrus-master.pid ; then
-        exit 255
-    fi
-
-    if  -z "$(pidof cyrus-master)" ; then
-        exit 1
-    fi
-
-    if  "$(cat /var/run/cyrus-master.pid)" != "$(pidof cyrus-master)" ; then
-        exit 1
-    fi
-
-    kill -HUP $(cat /var/run/cyrus-master.pid)
-}
-
-start() {
-    cd $CONFIGDIRECTORY
-    $runuser - cyrus -s /bin/bash -c '/usr/lib/cyrus-imapd/mkimap' >/dev/null 2>&1 < /dev/null
-
-    mkdir -p ${CONFIGDIRECTORY}/rpm
-    chown cyrus:mail ${CONFIGDIRECTORY}/rpm
-
-    $runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all import > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
-    RETVAL=$?
-}
-
-stop() {
-    cd $CONFIGDIRECTORY
-    mkdir -p ${CONFIGDIRECTORY}/rpm
-    chown cyrus:mail ${CONFIGDIRECTORY}/rpm
-
-    $runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
-    RETVAL=$?
-}
-
-case "$1" in
-    reload)
-            reload
-        ;;
-
-    start)
-            start
-        ;;
-
-    stop)
-            stop
-        ;;
-
-    *)
-        ;;
-esac
-
-exit $RETVAL

cyrus-imapd-2.5.17-34-3e2a85d6e.tar.gz Deleted

cyrus-imapd-3.6.0-rc1.tar.gz Added

cyrus-imapd-init.service Added

cyrus-imapd.cron-daily Changed

cyrus-imapd.cvt_cyrusdb_all Deleted

@@ -1,268 +0,0 @@
-#!/bin/bash
-# Simplified version of Simon Matter's cvt_cyrusdb_all.
-
-function usage() {
-    echo "Usage: $0 -C <altconfig> --verbose --devel <export|import>"
-    exit 1
-}
-
-if  ! -c /dev/null ; then
-    exit 1
-fi
-
-if  ! -r /dev/null -o ! -w /dev/null ; then
-    exit 1
-fi
-
-if  "$(stat -c %a /dev/null)" != "666" ; then
-    chmod 666 /dev/null
-fi
-
-if  -f /etc/sysconfig/cyrus-imapd ; then
-    . /etc/sysconfig/cyrus-imapd
-elif  -f /etc/default/cyrus-imapd ; then
-    . /etc/default/cyrus-imapd
-fi
-
-if  ! -z "${QUICK}" ; then
-    if  ${QUICK} -ne 0 ; then
-        exit 0
-    fi
-fi
-
-# Ensure this script is run as the cyrus user.
-if  -x "$(which runuser 2>/dev/null)" ; then
-    SWITCHUSER=runuser
-else
-    SWITCHUSER=su
-fi
-
-#if  ! $(whoami) = "cyrus" ; then
-#    exec $SWITCHUSER -s /bin/bash - cyrus -c "cd \$HOME < /dev/null ; INSTANCE=$0 $*"
-#    exit 0
-#fi
-
-alt_config="/etc/imapd.conf"
-devel_mode=0
-verbose_mode=0
-mode=""
-
-while  $# -gt 0 ; do
-    case $1 in
-        -C)
-            alt_config=$2
-            shift; shift
-        ;;
-
-        --devel)
-            devel_mode=1
-            shift
-        ;;
-
-        --verbose)
-            verbose_mode=1
-            shift
-        ;;
-
-        export|import)
-            mode=$1
-            shift
-        ;;
-
-        *)
-            usage
-        ;;
-
-    esac
-done
-
-if  -z "${mode}" ; then
-    usage
-fi
-
-if  ${devel_mode} -eq 1 ; then
-    verbose_mode=1
-fi
-
-declare -a dbs
-declare -a db_paths
-
-dbs${#dbs@}="annotation_db";    db_paths${#db_paths@}="annotations.db"
-dbs${#dbs@}="duplicate_db";     db_paths${#db_paths@}="deliver.db"
-# dbs${#dbs@}="mboxkey_db";       db_paths${#db_paths@}=""
-dbs${#dbs@}="mboxlist_db";      db_paths${#db_paths@}="mailboxes.db"
-dbs${#dbs@}="ptscache_db";      db_paths${#db_paths@}="ptclient/ptscache.db"
-dbs${#dbs@}="quota_db";         db_paths${#db_paths@}="quotas.db"
-# dbs${#dbs@}="seenstate_db";     db_paths${#db_paths@}=""
-dbs${#dbs@}="statuscache_db";   db_paths${#db_paths@}="statuscache.db"
-# dbs${#dbs@}="subscription_db";  db_paths${#db_paths@}=""
-dbs${#dbs@}="tls_sessions_db";  db_paths${#db_paths@}="tls_sessions.db"
-dbs${#dbs@}="userdeny_db";      db_paths${#db_paths@}="user_deny.db"
-
-# /usr/lib/cyrus-imapd/cyr_dbtool /var/lib/imap/annotations.db skiplist consistent; echo $?
-# Yes, consistent
-# 0
-
-cvt_cyrusdb="/usr/lib/cyrus-imapd/cvt_cyrusdb"
-cyr_dbtool="/usr/lib/cyrus-imapd/cyr_dbtool"
-cyr_info="/usr/lib/cyrus-imapd/cyr_info"
-
-system_magic=$(file --version 2>&1 | awk '/magic file/ {print $4}')
-
-if  ${devel_mode} -gt 0 ; then
-    if  -f "$(pwd)/imap/cvt_cyrusdb" ; then
-        cvt_cyrusdb="$(pwd)/imap/cvt_cyrusdb"
-    fi
-
-    if  -f "$(pwd)/imap/.libs/cyr_dbtool" ; then
-        cyr_dbtool="$(pwd)/imap/cyr_dbtool"
-    fi
-
-    if  -f "$(pwd)/imap/.libs/cyr_info" ; then
-        cyr_info="$(pwd)/imap/cyr_info"
-    fi
-fi
-
-function check_consistency() {
-    db_path=$1
-    db_tech=$2
-
-    if  ! -f "${db_path}" ; then
-        return 1
-    fi
-
-    retval=$(${cyr_dbtool} -C ${alt_config} ${db_path} ${db_tech} consistent >/dev/null 2>&1; echo $?)
-
-    return ${retval}
-}
-
-function convert_database() {
-    retval=$(${cvt_cyrusdb} -C ${alt_config} "$1" "$2" "$3" "$4" >/dev/null 2>&1; echo $?)
-    chown cyrus:mail "$3"
-}
-
-function expand_db_path() {
-    if  "${1:0:1}" != "/" ; then
-        config_directory=$(get_config "configdirectory")
-        value="${config_directory}/${1}"
-    fi
-
-    echo "${value}"
-}
-
-function get_config() {
-    echo $(${cyr_info} -C ${alt_config} conf | grep -E "^$1:\s+" | sed -r -e 's/a-z0-9_-+\:\s*(.*)/\1/g')
-}
-
-function get_config_default() {
-    echo $(${cyr_info} -C ${alt_config} conf-default | grep -E "^$1:\s+" | sed -r -e 's/a-z0-9_-+\:\s*(.*)/\1/g')
-}
-
-function get_current() {
-    default_path="$2"
-    value=$(${cyr_info} -C ${alt_config} conf-all | grep -E "^$1_path:\s+" | sed -r -e 's/a-z0-9_-+\:\s*(.*)/\1/g')
-
-    if  -z "${value}" ; then
-        if  ! -z "${default_path}" ; then
-            value=$(expand_db_path "${default_path}")
-        fi
-    fi
-
-    if  -z "${value}" ; then
-        return 1
-    fi
-
-    if  ! -f "${value}" ; then
-        return 1
-    fi
-
-    current=$(file -b -m /var/lib/imap/rpm/magic:${system_magic} "${value}")
-
-    if echo "${current}" | grep -qi skiplist > /dev/null 2>&1; then
-        current="skiplist"
-    elif echo "${current}" | grep -qi twoskip > /dev/null 2>&1; then
-        current="twoskip"
-    elif echo "${current}" | grep -qi text > /dev/null 2>&1; then
-        current="flat"
-    else
-        current="berkeley"
-    fi
-
-    echo "${current}"
-}
-
-config_directory=$(get_config "configdirectory")
-
-if  ${devel_mode} -eq 1 ; then
-    echo "Using configuration directory: '${config_directory}'"
-fi
-
-x=0
-while  ${x} -lt ${#dbs@} ; do
-    config=$(get_config "${dbs${x}}")
-    default=$(get_config_default "${dbs${x}}")
-    current=$(get_current "${dbs${x}}" "${db_paths${x}}")
-
-    if  ${verbose_mode} -eq 1 ; then
-        echo -n "${dbs${x}}: "
-    fi
-
-    if  $? -ne 0 ; then
-        if  ${verbose_mode} -eq 1 ; then
-            echo "SKIPPED"
-        fi
-        let x++
-        continue
-    fi
-
-    # If configuration doesn't hold anything, we have defaults
-    if  -z "${config}" ; then
-        config="${default}"
-    fi
-
-    if  "${config}" == "${default}" -a "${config}" == "${current}" ; then
-        if  ${verbose_mode} -eq 1 ; then
-            echo "SKIPPED (unchanged)"
-        fi
-        let x++
-        continue
-    fi
-
-    db_path=$(expand_db_path "${db_paths${x}}")
-
-    if  ! -f "${db_path}" ; then
-        if  ${verbose_mode} -eq 1 ; then
-            echo "SKIPPED (No such file or directory '${db_path}')"
-        fi
-        let x++
-        continue
-    fi
-
-    if  "${current}" != "${default}" ; then
-        if  ${devel_mode} -eq 1 ; then
-            echo -n "to default(1), "
-        fi
-        convert_database "${db_path}" "${current}" "${db_path}.${default}" "${default}"
-    fi
-
-    if  "${current}" != "${config}" ; then
-        mv "${db_path}" "${db_path}.${current}"
-        if  "${current}" != "${default}" ; then
-            if  ${devel_mode} -eq 1 ; then
-                echo -n "to default(2), "
-            fi
-            convert_database "${db_path}.${current}" "${current}" "${db_path}.${default}" "${default}"
-        fi
-
-        if  ${devel_mode} -eq 1 ; then
-            echo -n "to config(1), "
-        fi
-        convert_database "${db_path}.${current}" "${current}" "${db_path}" "${config}"
-    fi
-
-    if  ${verbose_mode} -eq 1 ; then
-        echo "OK"
-    fi
-
-    let x++
-done

cyrus-imapd.dsc Deleted

@@ -1,47 +0,0 @@
-Format: 1.0
-Source: cyrus-imapd
-Binary: cyrus-imapd
-Architecture: any
-Version: 2.5.17.34-0~kolab1
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Homepage: http://www.cyrusimap.org/
-Standards-Version: 3.9.1
-Vcs-Browser: http://git.kolabsys.com/apt/cyrus-imapd/
-Vcs-Git: git://git.kolabsys.com/git/apt/cyrus-imapd
-Build-Depends:
-    autoconf,
-    automake,
-    autotools-dev,
-    bison,
-    comerr-dev,
-    debhelper (>= 5),
-    flex,
-    ghostscript | gs-gpl,
-    groff,
-    heimdal-dev,
-    libdb5.1-dev | libdb-dev,
-    libjansson-dev,
-    libkvm-dev kfreebsd-amd64,
-    libkvm-dev kfreebsd-i391,
-    libldap2-dev,
-    libpam0g-dev,
-    libpcre3-dev,
-    libsasl2-dev (>= 2.1.9),
-    libsnmp-dev | libsnmp9-dev,
-    libssl-dev,
-    libtool,
-    libwrap0-dev,
-    libzephyr-dev,
-    lsb-base,
-    perl,
-    pkg-config,
-    po-debconf,
-    tcl-dev | tcl8.3-dev,
-    transfig,
-    xutils-dev | xutils
-Package-List:
- cyrus-imapd deb mail extra
-Files:
- 00000000000000000000000000000000 0 cyrus-imapd-2.5.17-34-3e2a85d6e.tar.gz
- 00000000000000000000000000000000 0 debian.tar.gz

cyrus-imapd.imap-2.3.x-conf Deleted

cyrus-imapd.init Deleted

@@ -1,160 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 65 35
-# description: The Cyrus IMAPD master serves as a master process for the Cyrus \
-#              IMAP and POP servers.
-# config: /etc/cyrus.conf
-# config: /etc/imapd.conf
-# pidfile: /var/run/cyrus-master.pid
-
-# author:	Simon Matter, Invoca Systems <simon.matter@invoca.ch>
-# version:	2005111100
-# changed:	add quickstart/stop option to init script to bypass db import/export
-
-. /etc/init.d/functions
-
-config=/etc/imapd.conf
-config2=/etc/cyrus.conf
-exec=/usr/lib/cyrus-imapd/cyrus-master
-lockfile=/var/lock/subsys/cyrus-imapd
-pidfile=/var/run/cyrus-master.pid
-prog="cyrus-imapd"
-
-QUICK=0
-
-if  -f /etc/sysconfig/$prog ; then
-    . /etc/sysconfig/$prog
-fi
-
-# check if the config files are present
-configok=true
- -f $config -a $config2  || configok=false
- 
-# get_config config default
-# extracts config option from config file
-get_config() {
-  if conf=$(grep "^$1" /etc/imapd.conf); then
-    echo $conf | cut -d: -f2
-  else
-    echo $2
-  fi
-}
-
-# where to find files and directories
-CONFIGDIRECTORY=$(get_config configdirectory /var/lib/imap)
-CYRUSMASTER=/usr/lib/cyrus-imapd/cyrus-master
-CYRUS_PROC_NAME=$(basename $CYRUSMASTER)
-ALWAYS_CONVERT=1
-
-RETVAL=0
-RETVAL2=1
-
-start() {
-   $UID -eq 0  || exit 4
-   -x $exec  || exit 5
-  $configok || exit 6
-  if  $(/sbin/pidof -s $CYRUSMASTER) ; then
-    echo -n $"$prog already running."
-    true
-    echo
-  else
-    if  $QUICK -eq 0 ; then
-      echo -n $"Importing $prog databases: "
-      cd $CONFIGDIRECTORY
-      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all import > ${CONFIGDIRECTORY}/rpm/db_import.log 2>&1" < /dev/null
-      RETVAL=$?
-      if  $RETVAL -eq 0 ; then
-        success $"$prog importing databases"
-      else
-        failure $"$prog error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import.log"
-      fi
-      echo
-    fi
-    if  $RETVAL -eq 0 ; then
-      echo -n $"Starting $prog: "
-      daemon $CYRUSMASTER -d $CYRUSOPTIONS
-      RETVAL2=$?
-      echo
-    fi
-  fi
-   $RETVAL -eq 0 -a $RETVAL2 -eq 0  && touch $lockfile
-  return $RETVAL
-}
-
-stop() {
-   $UID -eq 0  || exit 4
-   -x $exec  || exit 5
-
-  echo -n $"Shutting down $prog: "
-  killproc $CYRUSMASTER
-  RETVAL=$?
-  if  $QUICK -eq 0 ; then
-    if  ! $(/sbin/pidof -s $CYRUSMASTER) ; then
-      echo
-      echo -n $"Exporting $prog databases: "
-      cd $CONFIGDIRECTORY
-      runuser - cyrus -s /bin/sh -c "umask 166 ; /usr/lib/cyrus-imapd/cvt_cyrusdb_all export > ${CONFIGDIRECTORY}/rpm/db_export.log 2>&1" < /dev/null
-      RETVAL2=$?
-      if  $RETVAL2 -eq 0 ; then
-        success $"$prog exporting databases"
-      else
-        failure $"$prog error exporting databases, check ${CONFIGDIRECTORY}/rpm/db_export.log"
-      fi
-    fi
-  fi
-  echo
-   $RETVAL -eq 0 -a $RETVAL2 -eq 0  && rm -f $lockfile
-  return $RETVAL
-}
-
-restart() {
-  stop
-  start
-}
-
-reload() {
-  echo -n $"Reloading cyrus.conf file: "
-  killproc $CYRUSMASTER -HUP
-  RETVAL=$?
-  echo
-  return $RETVAL
-}
- 
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  force-reload|restart)
-    restart
-    ;;
-  reload)
-    reload
-    ;;
-  condrestart|try-restart)
-    if  -f $lockfile ; then
-        stop
-        start
-    fi
-    ;;
-  status)
-    status -p $pidfile $prog 
-    RETVAL=$?
-    ;;
-  quickstart)
-    QUICK=1
-    start
-    ;;
-  quickstop)
-    QUICK=1
-    stop
-    ;;
-  *)
-    echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status|quickstart|quickstop}"
-    RETVAL=2
-     "$1" = "usage"  && RETVAL=0
-esac
-
-exit $RETVAL

cyrus-imapd.magic Changed

cyrus-imapd.pam-config Changed

cyrus-imapd.service Changed

cyrus-imapd.sysconfig Changed

cyrus-imapd.tmpfiles.conf Added

debian.changelog Deleted

@@ -1,543 +0,0 @@
-cyrus-imapd (2.5.17.34-0~kolab1) unstable; urgency=low
-
-  * Check in 34 revisions ahead of the upsteam 2.5.17 release
-
- -- Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>  Wed, 28 Jul 2021 11:30:13 +0100
-
-cyrus-imapd (2.5.15.28-0~kolab1) unstable; urgency=low
-
-  * Ensure MessageExpunge notifications include a user parameter even if it is (none)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 30 Jan 2020 11:30:13 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab4) unstable; urgency=low
-
-  * added patch: 0003-Canonification-for-multiple-domains.patch
-  * added cyrus-(admin,clients,murder,nntpd,pop3d,replication) to Provides
-    Control field to match vanilla cyrus-imapd packages
-
- -- Daniel Hoffend <dh@dotlan.net>  Sun, 24 Nov 2019 01:44:00 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab3) unstable; urgency=low
-
-  * Include the user or group ID in failed authentication attempts
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 29 Oct 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.13.36-0~kolab2) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.13
-  * Fix ptloader group membership (Bifrost T250286)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 23 Oct 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.13.30-0~kolab2) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.13
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 19 Aug 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.12.25-0~kolab1) unstable; urgency=low
-
-  * Rebase on to upstream 2.5.12
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  2 Jan 2019 11:30:13 +0100
-
-cyrus-imapd (2.5.11.41-0~kolab2) unstable; urgency=low
-
-  * Fix potential non-writeable /dev/null and consequences
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 17 Oct 2017 11:30:13 +0100
-
-cyrus-imapd (2.5.11.41-0~kolab1) unstable; urgency=low
-
-  * Fix syntax of badlogin messages
-  * Fix erroneous IOERRER messages for proc_foreach
-  * Fix segfault in XFER
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 11 Jul 2017 11:30:13 +0100
-
-cyrus-imapd (2.5.11.29-0~kolab1) unstable; urgency=low
-
-  * Check in upstream version 2.5.11
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat,  1 Jul 2017 11:30:13 +0100
-
-cyrus-imapd (2.5.10.55-0~kolab1) unstable; urgency=low
-
-  * Fix proxying extended list usage.
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 13 Dec 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.10.49-0~kolab1) unstable; urgency=low
-
-  * Decode subject line before re-encoding it in automatic responses.
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 14 Nov 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.10.43-0~kolab1) unstable; urgency=low
-
-  * Preserve the folder uniqueid on rename.
-  * Transfer a folder between backends preserving the mailboxes.db uniqueid.
-  * Allow replicated backends to transfer mailboxes between pairs.
-  * Preserve the original partition as the target partition if not the default
-    partition, when replicating or transferring a mailbox.
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 05 Nov 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.9-0~kolab31.1) unstable; urgency=low
-
-  * Check in a snapshot version 31 revisions ahead of the upstream 2.5.9 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 30 Sep 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.9-0~kolab27.1) unstable; urgency=low
-
-  * Check in a snapshot version 27 revisions ahead of the upstream 2.5.9 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 22 Sep 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.9-0~kolab11.1) unstable; urgency=low
-
-  * Check in a snapshot version 11 revisions ahead of the upstream 2.5.9 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  2 Jun 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.8-0~kolab22.1) unstable; urgency=low
-
-  * Check in a snapshot version 22 revisions ahead of the upstream 2.5.8 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  7 Jul 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.8-0~kolab12.1) unstable; urgency=low
-
-  * Check in a snapshot version 12 revisions ahead of the upstream 2.5.8 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  2 Jun 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab26.1) unstable; urgency=low
-
-  * Check in a snapshot version 26 revisions ahead of the upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon,  9 May 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab25.1) unstable; urgency=low
-
-  * Check in a snapshot version 25 revisions ahead of the upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 29 Apr 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab23.1) unstable; urgency=low
-
-  * Check in a snapshot version 23 revisions ahead of the upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 12 Apr 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab10.1) unstable; urgency=low
-
-  * Check in a snapshot version 10 revisions ahead of the upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 21 Mar 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab8.1) unstable; urgency=low
-
-  * Check in a snapshot version 8 revisions ahead of the upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 10 Mar 2016 11:30:13 +0100
-
-cyrus-imapd (2.5.7-0~kolab1) unstable; urgency=low
-
-  * New upstream 2.5.7 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 16 Dec 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.6-0~kolab7.1) unstable; urgency=low
-
-  * Check in a snapshot version 7 revisions ahead of the new upstream 2.5.6 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 25 Sep 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.6-0~kolab3.1) unstable; urgency=low
-
-  * Check in a snapshot version 3 revisions ahead of the new upstream 2.5.6 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 20 Sep 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.5-0~kolab5.2) unstable; urgency=low
-
-  * Fixed building and packing of cyrus perl modules
-
- -- Daniel Hoffend <dh@dotlan.net>  Mon, 14 Sep 2015 22:03:00 +0200
-
-cyrus-imapd (2.5.5-0~kolab5.1) unstable; urgency=low
-
-  * Check in a snapshot version 5 revisions ahead of the new upstream 2.5.5 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 13 May 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.2-0~kolab3.1) unstable; urgency=low
-
-  * Check in a snapshot version 3 revisions ahead of the new upstream 2.5.2 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 13 May 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.2-0~kolab1.1) unstable; urgency=low
-
-  * Check in a snapshot version 1 revision ahead of the new upstream 2.5.2 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 12 May 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.1-0~kolab19.1) unstable; urgency=low
-
-  * Check in a snapshot version 19 revisions ahead of the new upstream 2.5.1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 28 Apr 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.1-0~kolab5.1) unstable; urgency=low
-
-  * Check in a snapshot version 5 revisions ahead of the new upstream 2.5.1 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 27 Apr 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.0-0~kolab91.1) unstable; urgency=low
-
-  * Check in a snapshot version 91 revisions ahead of the new upstream 2.5.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 19 Apr 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.0-0~kolab58.1) unstable; urgency=low
-
-  * Check in a snapshot version 58 revisions ahead of the new upstream 2.5.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 11 Apr 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.0-0~kolab45.1) unstable; urgency=low
-
-  * Check in a snapshot version 45 revisions ahead of the new upstream 2.5.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 25 Mar 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.0-0~kolab34.1) unstable; urgency=low
-
-  * Check in a snapshot version 34 revisions ahead of the new upstream 2.5.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 20 Mar 2015 11:30:13 +0100
-
-cyrus-imapd (2.5.0-0~kolab30.1) unstable; urgency=low
-
-  * Check in a snapshot version 30 revisions ahead of the new upstream 2.5.0 release
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 10 Mar 2015 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2015021301-0~kolab1) unstable; urgency=low
-
-  * New snapshot at e9158f39130b553a4f62b891f61193cf1b199fc3
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 13 Feb 2015 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014120901-0~kolab1) unstable; urgency=low
-
-  * New snapshot at f01310091cbf58958412deda9c61ecfd7c82a19b
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  9 Dec 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014120401-0~kolab1) unstable; urgency=low
-
-  * New snapshot at 7f5b99bab9641d89735a882761e4d19eca3a4068
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  4 Dec 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014112701-0~kolab1) unstable; urgency=low
-
-  * New snapshot at 3123ee091529130cd7045a0ba4f9296be77cb5ac
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 27 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014112301-0~kolab1) unstable; urgency=low
-
-  * New snapshot at 631aa71cf5fe691563ae1d7e740a5cc76d0bf75f
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 23 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014112201-0~kolab1) unstable; urgency=low
-
-  * New snapshot at 790df515eedd8be0050b14bfb7ab471c6ab9c6d3
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 22 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014111801-0~kolab1) unstable; urgency=low
-
-  * New snapshot at e1f53f2dda607c19c7f6b2293aba65e4d2c9c47f
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 18 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014111701-0~kolab1) unstable; urgency=low
-
-  * New snapshot at b20b142c6ce0ee58e4e47da84a2ce099310b2dcb
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 17 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014111201-0~kolab2) unstable; urgency=low
-
-  * Set the default database format to skiplist
-  * New snapshot at 7361099c548f11f5dff5d65591ba39f150e46938
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 12 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014111201-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    58e1f4b277591e448f726bdafe6f2e250c9ea5f4
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 11 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014110501-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    2941de1350adf7f0d99443ace884f40c754df193
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Nov 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014103002-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    8f15dcd0c71aff01f6d30e91944e9efcb5915b87
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 30 Oct 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014101701-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    9704e5d41981a18f46a63af78cf02c63fe3824a6
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 17 Oct 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014100701-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    d8beae4e3a9490b0435caee22ddae313b8f4b17b
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  7 Oct 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014100301-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    44e8e7f7d0e19cc6005441709fc7c02e7032d6b3
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  3 Oct 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014092501-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    1907cfc24b5b3bee0e4f81f87ba5ab3be3a8a418
-  * Fix event notifications
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 25 Sep 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014082901-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    b2ef80bee2102d0eadf280c6c23b5759920d1752
-  * Merge enhanced Sieve Date and Index extension
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 29 Aug 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014081301-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot from git.cyrusimap.org
-    3d45146a7befa1951d46a4db381fb10be40e53ee
-  * Correct the default location of sockets (https://issues.kolab.org/show_bug.cgi?id=3468)
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 21 Aug 2014 11:30:13 +0100
-
-cyrus-imapd (2.5~dev2014011701-0~kolab1) unstable; urgency=low
-
-  * Ship a GIT development snapshot
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 17 Jan 2014 11:30:13 +0100
-
-cyrus-imapd (2.4.17-8) unstable; urgency=low
-
-  * Add /var/lib/imap/ptclient directory
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 10 Feb 2013 11:30:13 +0100
-
-cyrus-imapd (2.4.17-7) unstable; urgency=low
-
-  * Start cyrus-imapd service in postinst
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 23 Nov 2013 11:30:13 +0100
-
-cyrus-imapd (2.4.17-6) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Supply 3.1 version of /etc/imapd.annotations.conf
-  * When stat-overriding directories, really they should exist as well
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 15 Nov 2013 11:30:13 +0100
-
-cyrus-imapd (2.4.17-4) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Refresh patch to normalize the uid so that it actually takes the configuration option in to account
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 12 Mar 2013 11:30:13 +0100
-
-cyrus-imapd (2.4.17-3) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Escape a failing db_get cyrus-imapd/removespools and do not remove files that do not exist
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 19 Dec 2012 15:07:03 +0100
-
-cyrus-imapd (2.4.17-2) unstable; urgency=low
-
-  * Set socket permission to 751 on /var/lib/imap/socket
-
- -- Paul Klos <kolab@klos2day.nl>  Mon, 10 Dec 2012 23:58:52 +0100
-
-cyrus-imapd (2.4.17-1) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Add ptloader ldap_user_attribute patch
-  * New upstream version 2.4.17
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 10 Dec 2012 18:25:36 +0100
-
-cyrus-imapd (2.4.19-15) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Fix newbie mistake on double redirection
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 13 Nov 2012 11:14:32 -0500
-
-cyrus-imapd (2.4.19-14) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Include all files that are installed to /usr/bin/ and /usr/sbin/
-  * Add more Conflicts/Replaces/Obsoletes headers in debian/control
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 07 Nov 2012 08:34:21 -0500
-
-cyrus-imapd (2.4.19-13) unstable; urgency=low
-
-   Franz Skale 
-  * Fix typo in openssl parameter -des (was -ides)
-
-   Jeroen van Meeuwen 
-
- -- Franz Skale <i.bin@dah.am>  Mon, 05 Nov 2012 05:46:11 -0500
-
-cyrus-imapd (2.4.19-12) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Don't forget to add the cyrus user to ssl-cert (which has access to /etc/ssl/private/)
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 03 Nov 2012 12:21:50 -0400
-
-cyrus-imapd (2.4.19-11) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Eliminate faulty fix_directories and verify_15_upgrade functions.
-  * Correct the use of ${NAME} (use ${PROG})
-  * Daemonize the daemon
-  * Use `pidof ${DAEMON}` rather than the unconfigurable static path
-  * Set correct certificate file path
-  * Generate certificate if it doesn't already exist
-  * Incorporate #1157 and #1158 fixes
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 03 Nov 2012 12:00:53 -0400
-
-cyrus-imapd (2.4.19-10) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Still rename Cyrus' master blob to cyrus-master (#1158, c#4)
-  * Update changelog
-  * Update invokation of invoke-rc.d to match the cyrus-imapd service name
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 30 Oct 2012 17:11:32 -0400
-
-cyrus-imapd (2.4.19-9) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Add --with-ldap and --with-auth (#1158)
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 30 Oct 2012 08:19:42 -0400
-
-cyrus-imapd (2.4.19-8) unstable; urgency=low
-
-  * Correct Default-Start (all runlevels need to be listed explicitely)
-  * Correct git-buildpackage settings for wheezy/kolab-3.0
-  * Correct libdb4.7-dev build dependency -> libdb5.1
-  * Add db51 compatibility patch
-  * comerr development packaged changed, and not in a fun way
-  * Add perl5.14 patch
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen>  Tue, 11 Sep 2012 22:34:23 +0200
-
-cyrus-imapd (2.4.19-3) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Correct reference to /etc/default/kolab-cyrus -> /etc/default/cyrus-
-    imapd
-  * Correct the use of $PROG over $SERVICE
-  * Correct references to kolab-cyrus-common -> cyrus-imapd
-  * Update translations and translation master file to no longer refer
-    to kolab-cyrus-common
-  * kolab-cyrus-imapd -> cyrus-imapd
-  * Source no longer contains CVS directory
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen <vanmeeuwen@auto.kolabsys.com>  Thu, 10 May 2012 14:09:58 +0200
-
-cyrus-imapd (2.4.19-2) unstable; urgency=low
-
-   Jeroen van Meeuwen (Kolab Systems) 
-  * Add usr/sbin/cyrus-makedirs to the list of installed files
-  * Update gbp.conf
-
-   Jeroen van Meeuwen 
-
- -- Jeroen van Meeuwen <vanmeeuwen@auto.kolabsys.com>  Thu, 10 May 2012 13:57:04 +0200
-
-cyrus-imapd (2.4.19-1) unstable; urgency=low
-
-  * New upstream version
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  9 May 2012 00:21:24 +0000
-
-cyrus-imapd (2.4.3-1) unstable; urgency=low
-
-  * Update to new upstream version
-  * Rename binary package
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 10 Nov 2010 13:46:33 +0000
-
-cyrus-imapd (2.4.2-1) unstable; urgency=low
-
-  * Update Debian packaging metadata
-  * New upstream version
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Oct 2010 20:26:24 +0200
-

debian.control Deleted

@@ -1,120 +0,0 @@
-Source: cyrus-imapd
-Section: mail
-Priority: extra
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Uploaders: Paul Klos <kolab@klos2day.nl>
-Standards-Version: 3.9.1
-Build-Depends:
-    autoconf,
-    automake,
-    autotools-dev,
-    bison,
-    comerr-dev,
-    debhelper (>= 5),
-    flex,
-    ghostscript | gs-gpl,
-    groff,
-    heimdal-dev,
-    libdb5.1-dev | libdb-dev,
-    libkvm-dev kfreebsd-amd64,
-    libkvm-dev kfreebsd-i386,
-    libjansson-dev,
-    libldap2-dev,
-    libpam0g-dev,
-    libpcre3-dev,
-    libsasl2-dev (>= 2.1.9),
-    libsnmp-dev | libsnmp9-dev,
-    libssl-dev,
-    libtool,
-    libwrap0-dev,
-    libzephyr-dev,
-    lsb-base,
-    perl,
-    pkg-config,
-    po-debconf,
-    tcl-dev | tcl8.3-dev,
-    transfig,
-    xutils-dev | xutils,
-    zlib1g-dev
-Vcs-Browser: http://git.kolabsys.com/apt/cyrus-imapd/
-Vcs-Git: git://git.kolabsys.com/git/apt/cyrus-imapd
-Homepage: http://www.cyrusimap.org/
-
-Package: cyrus-imapd
-Architecture: any
-Section: mail
-Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
-Suggests: sasl2-bin, apt-listchanges (>= 2.35)
-Conflicts: imap-server,
-	pop3-server,
-	suidmanager (<< 0.50),
-	cyrus-common,
-	cyrus21-common,
-	cyrus22-common,
-	cyrus-common-2.2,
-	cyrus23-common,
-	cyrus-common-2.3,
-	cyrus24-common,
-	cyrus-common-2.4,
-	cyrus-admin,
-	cyrus-clients,
-	cyrus-common,
-	cyrus-murder,
-	cyrus-nntpd,
-	cyrus-pop3d,
-	cyrus-replication
-Replaces: cyrus22-common,
-	cyrus22-imapd,
-	cyrus-common-2.2,
-	cyrus-imapd-2.2,
-	cyrus23-common,
-	cyrus23-imapd,
-	cyrus-common-2.3,
-	cyrus-imapd-2.3,
-	cyrus24-common,
-	cyrus24-imapd,
-	cyrus-common-2.4,
-	cyrus-imapd-2.4,
-	cyrus-admin,
-	cyrus-clients,
-	cyrus-common,
-	cyrus-murder,
-	cyrus-nntpd,
-	cyrus-pop3d,
-	cyrus-replication
-Provides: imap-server,
-	pop3-server,
-	cyrus22-common,
-	cyrus-common-2.2,
-	cyrus-imapd-2.2,
-	cyrus23-common,
-	cyrus-common-2.3,
-	cyrus-imapd-2.3,
-	cyrus24-common,
-	cyrus-common-2.4,
-	cyrus-imapd-2.4,
-	cyrus-admin,
-	cyrus-clients,
-	cyrus-common,
-	cyrus-murder,
-	cyrus-nntpd,
-	cyrus-pop3d,
-	cyrus-replication
-Description: Cyrus IMAP Server
- Cyrus is an IMAP server designed to handle massive quantities of mail,
- with a number of features not found in other IMAP implementations,
- including support for:
-  - running the daemon without root privileges;
-  - POP3 in addition to plain IMAP;
-  - POP/IMAP-before-SMTP using DRAC;
-  - secure IMAP using SSL;
-  - server-side filtering with Sieve;
-  - mail users without login accounts;
-  - simple mail quotas;
-  - virtual domains;
-  - IPv6.
- .
- Cyrus doesn't support reading from and storing mail in the
- standard mail spool. It stores mail in a separate directory in its
- own MH-like format.
-

debian.rules Deleted

@@ -1,320 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for CMU Cyrus IMAP version 2.2
-# GNU copyright 1997 by Joey Hess.
-# Copyright (c) 2001 by Henrique de Moraes Holschuh
-# Published under the GNU GPL license
-# Based on previous work by Michael-John Turner <mj@debian.org>,
-#			    David Parker <david@neongoat.com>
-#
-
-# DebHelper control
-export DH_ALWAYS_EXCLUDE=CVS
-
-# This is the debhelper compatibility version to use.
-export DH_VERBOSE=1
-export DH_COMPAT=9
-
-export MAINPKG=cyrus-imapd
-export TMPPKG := $(CURDIR)/debian/tmp
-export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
-
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# Extra version information to add to Cyrus IMAPd ID
-DEBVERSION:=$(shell LCALL=C dpkg-parsechangelog | sed -ne 's/^Version: $.*-$/\1/p')
-EXTRA_IDENT:="Debian-$(DEBVERSION)"
-
-# DB engine version
-DBENGINE=BerkeleyDB4.7
-
-DEBUGFLAGS=-g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	DEBUGFLAGS += -O0
-else
-	DEBUGFLAGS += -O2
-endif
-
-# TODO: Support parallel builds (make -j x)
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-CONFFLAGS =
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
-  CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-# Other oddities
-ifneq (,$(findstring strict,$(DEB_BUILD_OPTIONS)))
-	CONFFLAGS += --enable-warnings-are-errors
-endif
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-build: build-arch build-indep
-
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	aclocal -I cmulocal
-	libtoolize --install
-	autoheader
-	automake --add-missing || autoreconf -v && automake --add-missing
-	autoreconf -v
-
-	#
-	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
-	# DBENGINE AT THE TOP OF THIS MAKEFILE!
-	PERL_MM_OPT="INSTALLDIRS=vendor" ./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
-		--enable-event-notification \
-		--enable-idled \
-		--enable-gssapi --with-gss_impl=heimdal \
-		--enable-listext \
-		--enable-murder \
-		--enable-nntp \
-		--enable-replication \
-		--enable-xapian \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--libexecdir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--includedir=/usr/include \
-		--datadir=/usr/share/cyrus \
-		--sysconfdir=/etc \
-		--sharedstatedir=/usr/share/cyrus \
-		--localstatedir=/var/lib/imap \
-		--mandir=/usr/share/man \
-		--with-auth=pts \
-		--with-com_err="" \
-		--with-cyrus-prefix=/usr/lib/cyrus-imapd \
-		--with-cyrus-group=mail \
-		--with-cyrus-user=cyrus \
-		--with-extraident=$(EXTRA_IDENT) \
-		--with-ldap=/usr \
-		--with-lock=fcntl \
-		--with-perl=/usr/bin/perl \
-		--with-openssl=/usr \
-		--with-sasl=/usr \
-		--without-clamav \
-		--without-wrap \
-		--without-zlib \
-		--with-pidfile=/var/run/cyrus-master.pid \
-		--with-service-path=/usr/lib/cyrus-imapd \
-		--with-syslogfacility=MAIL \
-		--with-ucdsnmp=/usr
-	if grep -q "WARNING: Disabling GSSAPI" config.log ; then \
-		echo "ERROR: GSSAPI not found by configure" >&2 ;\
-		exit 1 ;\
-	fi
-	echo 'To build this package, configure was called as follows:' \
-		> debian/README.configure-options
-	grep with\ options config.status \
-	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
-		>> debian/README.configure-options
-	touch configure-stamp
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	dh_testdir
-	#
-	$(MAKE)
-	# store database configuration for possible automatic
-	# upgrading later
-	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
-	grep _db lib/imapoptions \
-	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \
-	| sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
-	| awk '{printf("%s %s\n",toupper($$1),$$2);}' \
-	>>debian/cyrus-db-types.txt
-	mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
-	&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
-	&& rm debian/cyrus-db-types.txt.old
-	#
-	# store some useful state about the current package
-	echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
-	if grep -q -s -n -E '^:space:*#define:space:+USE_DIR_FULL:space:+1' config.h ; then \
-		echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\
-	else \
-		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
-	fi
-	touch build-arch-stamp
-
-# We aren't actually able to build arch-indep independently from
-# arch-dep, so we guarantee that the arch build has been done first
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp build-arch-stamp
-	dh_testdir
-	cd doc && \
-		pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 && \
-		fig2dev -L png murder.fig murder.png && \
-		rm -f groff-html-*.png pod2htm*
-	cd doc && \
-		mkdir -p man && \
-		for man in ../man/*.1-9 ../debian/*.1-9; do \
-			echo "Generating html manpage for $$man..."; \
-			groff -man -Thtml $$man > man/`basename $$man`.html; \
-		done
-	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
-	rm -f pod2htm*
-	touch build-indep-stamp
-
-install-arch: build-arch-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -a
-	$(MAKE) install DESTDIR=$(TMPPKG)
-	mv $(TMPPKG)/usr/lib/cyrus-imapd/master $(TMPPKG)/usr/lib/cyrus-imapd/cyrus-master
-
-	# Default configuration
-	mkdir -p $(TMPPKG)/etc
-	install -p -m 644 debian/imapd.conf $(TMPPKG)/etc
-	install -p -m 644 debian/cyrus-imapd-2.4.x-imapd.annotations.conf \
-		$(TMPPKG)/etc/imapd.annotations.conf
-	install -m 644 master/conf/prefork.conf   $(TMPPKG)/etc/cyrus.conf
-
-	# Correct paths used in cyrus.conf (https://issues.kolab.org/show_bug.cgi?id=3468)
-	sed -i -e 's/\/var\/imap\//\/var\/lib\/imap\//g' $(TMPPKG)/etc/cyrus.conf
-
-	# Avoid namespace turf wars
-	mv $(TMPPKG)/usr/share/man/man8/master.8 $(TMPPKG)/usr/share/man/man8/cyrus-master.8
-	mv $(TMPPKG)/usr/share/man/man8/deliver.8 $(TMPPKG)/usr/share/man/man8/cyr_deliver.8
-	install -p -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
-
-	# And add our own manpages
-	mkdir -p $(TMPPKG)/usr/share/man/man8
-	install -p -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
-	install -p -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
-
-	# SNMP files
-	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
-	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
-
-	# Install cyradm icons
-	mkdir -p $(TMPPKG)/usr/share/icons/mini
-	install -p -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
-	install -p -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
-
-	# Install debian-provided scripts
-	mkdir -p $(TMPPKG)/usr/sbin
-	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
-
-	# and logcheck files
-	mkdir -p \
-		$(TMPPKG)/etc/logcheck/ignore.d.server/ \
-		$(TMPPKG)/etc/logcheck/violations.ignore.d/
-	install -p -m 644 debian/logcheck.ignore \
-		$(TMPPKG)/etc/logcheck/ignore.d.server/logcheck-cyrus
-	install -p -m 644 debian/logcheck.violations.ignore \
-		$(TMPPKG)/etc/logcheck/violations.ignore.d/logcheck-cyrus
-
-	# Install the stuff needed for upgrades
-	mkdir $(TMPPKG)/usr/lib/cyrus-imapd/upgrade
-	for i in convert-sieve.pl dohash rehash undohash translatesieve \
-		upgradesieve masssievec; do \
-		install -p -m 755 tools/$$i $(TMPPKG)/usr/lib/cyrus-imapd/upgrade ;\
-	done
-	# And other upgrade helpers
-	install -p -m 644 debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt \
-		   $(TMPPKG)/usr/lib/cyrus-imapd/
-	# And other misc useful tools
-	install -p -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
-	# Lintian overrides
-	cd debian ; \
-	for i in *.lintian ; do \
-		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
-		install -p -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
-	done
-	# the old debian package format doesn't support file modes
-	# maybe switch to quilt soon(tm)
-	chmod 755 debian/cyrus-imapd.install
-	dh_install -a --sourcedir=$(TMPPKG)
-	touch install-arch-stamp
-
-# We aren't actually able to install arch-indep independently from
-# arch-dep, so we guarantee that the arch build has been done first
-install-indep: build-indep-stamp install-arch
-	dh_testdir
-	dh_testroot
-	#dh_clean -k
-	dh_installdirs -i
-	#
-	# Massage the documentation into place
-#	#mkdir -p $(DOCDIR)
-	#find doc/text -name 'Ra-z*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
-	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
-	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
-	#
-	# Install the html docs and examples
-#	mkdir -p $(DOCDIR)/html
-#	install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
-#	cp -a doc/man $(DOCDIR)/html
-#	cp -a debian/examples $(DOCDIR)
-#	install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
-	#
-	# Install contrib/ files
-#	mkdir -p $(DOCDIR)/contrib
-#	xargs < debian/cyrus-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
-	#
-	dh_install -i --sourcedir=$(TMPPKG)
-
-binary-indep: install-indep
-	dh_testdir -i
-	dh_testroot -i
-#	dh_installdebconf -i
-	dh_installdocs -p cyrus-imapd
-	dh_installexamples -p cyrus-imapd
-	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installcron -i
-	dh_installman -i
-	dh_installchangelogs -p cyrus-imapd doc/changes.html
-	#dh_installchangelogs -p cyrus-doc-2.2
-	dh_strip -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_makeshlibs -i
-	dh_installdeb -i
-	dh_perl -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdebconf -a
-	dh_installdocs -p $(MAINPKG)
-	dh_installexamples -p $(MAINPKG)
-	dh_installmenu -a
-#	dh_installlogrotate -a
-#	dh_installpam -a
-#	dh_installmime -a
-	dh_installinit -p $(MAINPKG) --noscripts --name=cyrus-imapd
-	dh_installcron -a --name=cyrus-imapd
-	dh_installman -a
-#	dh_installinfo -a
-	dh_installchangelogs -p $(MAINPKG) doc/changes.html perl/imap/Changes
-	dh_fixperms -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary install-arch install-indep

debian.series Deleted

debian.tar.gz Deleted

gating.yaml Added

patch-cassandane-fix-annotator Added

patch-cassandane-no-syslog Added

@@ -0,0 +1,41 @@
+diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+index fb36b8f..78e7100 100644
+--- a/Cassandane/Instance.pm
++++ b/Cassandane/Instance.pm
+@@ -2146,12 +2146,8 @@ sub setup_syslog_replacement
+ {
+     my ($self) = @_;
+ 
+-    if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
+-        xlog "utils/syslog.so not found (do you need to run 'make'?)";
+-        xlog "tests will not examine syslog output";
+-        $self->{have_syslog_replacement} = 0;
+-        return;
+-    }
++    $self->{have_syslog_replacement} = 0;
++    return;
+ 
+     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
+     $self->{have_syslog_replacement} = 1;
+diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
+index 7c17f0c..9eb07ad 100644
+--- a/Cassandane/Util/Log.pm
++++ b/Cassandane/Util/Log.pm
+@@ -51,9 +51,6 @@ our @EXPORT = qw(
+ 
+ my $verbose = 0;
+ 
+-openlog('cassandane', '', LOG_LOCAL6)
+-    or die "Cannot openlog";
+-
+ sub xlog
+ {
+     my $id;
+@@ -74,7 +71,6 @@ sub xlog
+     $msg .= "($id) " if $id;
+     $msg .= join(' ', @_);
+     print STDERR "$msg\n";
+-    syslog(LOG_ERR, "$msg");
+ }
+ 
+ sub set_verbose

patch-cassandane-xapian-delve-path Added

patch-cyrus-default-configs Added

@@ -0,0 +1,105 @@
+diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
+index 95b54e9..3935b77 100644
+--- a/doc/examples/imapd_conf/normal.conf
++++ b/doc/examples/imapd_conf/normal.conf
+@@ -10,7 +10,7 @@ admins: cyrus
+ ###################################################################
+ 
+ # Configuration directory
+-configdirectory: /var/lib/cyrus
++configdirectory: /var/lib/imap
+ 
+ # Directories for proc and lock files
+ proc_path: /run/cyrus/proc
+@@ -19,18 +19,18 @@ mboxname_lockpath: /run/cyrus/lock
+ # Locations for DB files
+ # The following DB are recreated upon initialization, so should live in
+ # ephemeral storage for best performance.
+-duplicate_db_path: /run/cyrus/deliver.db
+-ptscache_db_path:  /run/cyrus/ptscache.db
+-statuscache_db_path: /run/cyrus/statuscache.db
+-tls_sessions_db_path: /run/cyrus/tls_sessions.db
++duplicate_db_path: /run/cyrus/db/deliver.db
++ptscache_db_path:  /run/cyrus/db/ptscache.db
++statuscache_db_path: /run/cyrus/db/statuscache.db
++tls_sessions_db_path: /run/cyrus/db/tls_sessions.db
+ 
+ # Which partition to use for default mailboxes
+ defaultpartition: default
+-partition-default: /var/spool/cyrus/mail
++partition-default: /var/spool/imap
+ 
+ # If sieveusehomedir is false (the default), this directory is searched
+ # for Sieve scripts.
+-sievedir: /var/spool/sieve
++sievedir: /var/lib/imap/sieve
+ 
+ ###################################################################
+ ## Important: KEEP THESE IN SYNC WITH cyrus.conf
+@@ -51,19 +51,16 @@ syslog_prefix: cyrus
+ # Space-separated list of HTTP modules that will be enabled in
+ # httpd(8).  This option has no effect on modules that are disabled at
+ # compile time due to missing dependencies (e.g. libical).
+-#
+-# Allowed values: caldav, carddav, domainkey, ischedule, rss
+-httpmodules: caldav carddav
++# Fedora default: enable all modules besides admin and tzdist
++httpmodules: caldav carddav domainkey freebusy ischedule rss webdav
+ 
+ # If enabled, the partitions will also be hashed, in addition to the
+ # hashing done on configuration directories. This is recommended if one
+ # partition has a very bushy mailbox tree.
+ hashimapspool: true
+ 
+-# Enable virtual domains
+-# and set default domain to localhost
+-virtdomains: yes
+-defaultdomain: localhost
++# Disable virtual domains by default
++virtdomains: off
+ 
+ ###################################################################
+ ## User experience settings
+@@ -72,6 +69,14 @@ defaultdomain: localhost
+ # Minimum time between POP mail fetches in minutes
+ popminpoll: 1
+ 
++# Conversation support is required for jmap
++conversations: 1
++conversations_db: twoskip
++
++# This will default to on in 3.1, and improves compatibility with some Apple
++# devices.  Upstream https://github.com/cyrusimap/cyrus-imapd/issues/1556
++specialusealways: 1
++
+ ###################################################################
+ ## User Authentication settings
+ ###################################################################
+@@ -99,6 +104,12 @@ sasl_auto_transition: no
+ ## SSL/TLS Options
+ ###################################################################
+ 
++# These three files will automatically be generated by the systemd unit when
++# the service starts for the first time.
++tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
++tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd-key.pem
++tls_client_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
++
+ # File containing the global certificate used for ALL services (imap,
+ # pop3, lmtp, sieve)
+ #tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 186fe66..ab97848 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
++++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,8 +19,8 @@ SERVICES {
+ #  nntps         cmd="nntpd -s" listen="nntps" prefork=1
+ 
+   # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
+-#  http          cmd="httpd" listen="http" prefork=3
+-#  https         cmd="httpd -s" listen="https" prefork=1
++  http          cmd="httpd" listen="http" prefork=3
++  https         cmd="httpd -s" listen="https" prefork=1
+ 
+   # at least one LMTP is required for delivery
+ #  lmtp          cmd="lmtpd" listen="lmtp" prefork=0

patch-cyrus-perl-linking Added

@@ -0,0 +1,26 @@
+diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in
+index 7180b98..d589ebe 100644
+--- a/perl/sieve/managesieve/Makefile.PL.in
++++ b/perl/sieve/managesieve/Makefile.PL.in
+@@ -69,7 +69,7 @@ WriteMakefile(
+     'ABSTRACT'  => 'Cyrus Sieve management interface',
+     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+     'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@",
++    'LIBS'	=> "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ -lpcreposix",
+     'CCFLAGS'	=> '@GCOV_CFLAGS@',
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
+diff --git a/perl/imap/Makefile.PL.in b/perl/imap/Makefile.PL.in
+index 71416cc..f76cda6 100644
+--- a/perl/imap/Makefile.PL.in
++++ b/perl/imap/Makefile.PL.in
+@@ -91,7 +91,7 @@ WriteMakefile(
+     'LD'       => $Config{ld} . ' @GCOV_LDFLAGS@',
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=>  "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@",
++    'LIBS'	=>  "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@ -lpcreposix",
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING'
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ @GCOV_CFLAGS@ -I@top_srcdir@/perl/imap",
+     'EXE_FILES' => cyradm,

patch-cyrus-rename-quota Added

patch-cyrus-squatter-assert-crash Added

patch-cyrus-testsuite-timeout Added

Build Results
RPM Lint

Refresh

Submit package home:mollekopf...ab:Winterfell / cyrus-sasl to package Kolab:16:Testing / cyrus-sasl

cyrus-sasl.spec Added

@@ -0,0 +1,393 @@
+%global username    saslauth
+
+%global _plugindir2 %{_libdir}/sasl2
+%global bootstrap_cyrus_sasl 0
+%global gdbm_db_file /etc/sasl2/sasldb2
+
+Summary: The Cyrus SASL library
+Name: cyrus-sasl
+Version: 2.1.28
+Release: %autorelease
+License: BSD with advertising
+URL: https://www.cyrusimap.org/sasl/
+
+# Source0 originally comes from https://www.cyrusimap.org/releases/;
+# make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and builds a
+# new tarball.
+Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
+Source3: saslauth.sysusers
+Source5: saslauthd.service
+Source7: sasl-mechlist.c
+Source9: saslauthd.sysconfig
+Source10: make-no-dlcompatorsrp-tarball.sh
+# From upstream git, required for reconfigure after applying patches to configure.ac
+# https://raw.githubusercontent.com/cyrusimap/cyrus-sasl/master/autogen.sh
+Source11: autogen.sh
+
+
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Patch11: cyrus-sasl-2.1.25-no_rpath.patch
+Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
+Patch23: cyrus-sasl-2.1.23-man.patch
+Patch24: cyrus-sasl-2.1.21-sizes.patch
+# The 64 bit *INT8 type is not used anywhere and other types match
+Patch49: cyrus-sasl-2.1.26-md5global.patch
+
+Patch101: cyrus-sasl-2.1.27-Add-basic-test-infrastructure.patch
+Patch102: cyrus-sasl-2.1.27-Add-Channel-Binding-support-for-GSSAPI-GSS-SPNEGO.patch
+#https://github.com/simo5/cyrus-sasl/commit/ebd2387f06c84c7f9aac3167ec041bb01e5c6e48
+Patch106: cyrus-sasl-2.1.27-nostrncpy.patch
+# Upstream PR: https://github.com/cyrusimap/cyrus-sasl/pull/635
+Patch107: cyrus-sasl-2.1.27-more-tests.patch
+Patch108: cyrus-sasl-2.1.27-Add-support-for-setting-max-ssf-0-to-GSS-SPNEGO.patch
+#Migration tool should be removed from Fedora 36
+Patch109: cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch
+Patch500: cyrus-sasl-2.1.27-coverity.patch
+Patch501: cyrus-sasl-2.1.27-cumulative-digestmd5.patch
+Patch502: cyrus-sasl-2.1.27-cumulative-ossl3.patch
+
+
+BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
+BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
+BuildRequires: mariadb-connector-c-devel, libpq-devel, zlib-devel
+%if ! %{bootstrap_cyrus_sasl}
+BuildRequires: openldap-devel
+%endif
+#build reqs for migration from BerkeleyDB
+#should be removed from RHEL10
+BuildRequires: libdb-devel-static
+#build reqs for make check
+BuildRequires: python3 nss_wrapper socket_wrapper krb5-server
+BuildRequires: make
+Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd
+Requires(postun): /usr/sbin/userdel /usr/sbin/groupdel
+Requires: /sbin/nologin
+Provides: user(%username)
+Provides: group(%username)
+
+
+%description
+The %{name} package contains the Cyrus implementation of SASL.
+SASL is the Simple Authentication and Security Layer, a method for
+adding authentication support to connection-based protocols.
+
+%package lib
+Summary: Shared libraries needed by applications which use Cyrus SASL
+
+%description lib
+The %{name}-lib package contains shared libraries which are needed by
+applications which use the Cyrus SASL library.
+
+%package devel
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+Summary: Files needed for developing applications with Cyrus SASL
+
+%description devel
+The %{name}-devel package contains files needed for developing and
+compiling applications which use the Cyrus SASL library.
+
+%package gssapi
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: GSSAPI authentication support for Cyrus SASL
+
+%description gssapi
+The %{name}-gssapi package contains the Cyrus SASL plugins which
+support GSSAPI authentication. GSSAPI is commonly used for Kerberos
+authentication.
+
+%package plain
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: PLAIN and LOGIN authentication support for Cyrus SASL
+
+%description plain
+The %{name}-plain package contains the Cyrus SASL plugins which support
+PLAIN and LOGIN authentication schemes.
+
+%package md5
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: CRAM-MD5 and DIGEST-MD5 authentication support for Cyrus SASL
+
+%description md5
+The %{name}-md5 package contains the Cyrus SASL plugins which support
+CRAM-MD5 and DIGEST-MD5 authentication schemes.
+
+%package ntlm
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: NTLM authentication support for Cyrus SASL
+
+%description ntlm
+The %{name}-ntlm package contains the Cyrus SASL plugin which supports
+the NTLM authentication scheme.
+
+# This would more appropriately be named cyrus-sasl-auxprop-sql.
+%package sql
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: SQL auxprop support for Cyrus SASL
+
+%description sql
+The %{name}-sql package contains the Cyrus SASL plugin which supports
+using a RDBMS for storing shared secrets.
+
+%if ! %{bootstrap_cyrus_sasl}
+# This was *almost* named cyrus-sasl-auxprop-ldapdb, but that's a lot of typing.
+%package ldap
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: LDAP auxprop support for Cyrus SASL
+
+%description ldap
+The %{name}-ldap package contains the Cyrus SASL plugin which supports using
+a directory server, accessed using LDAP, for storing shared secrets.
+%endif
+
+%package scram
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: SCRAM auxprop support for Cyrus SASL
+
+%description scram
+The %{name}-scram package contains the Cyrus SASL plugin which supports
+the SCRAM authentication scheme.
+
+%package gs2
+Requires: %{name}-lib%{?_isa} = %{version}-%{release}
+Summary: GS2 support for Cyrus SASL
+
+%description gs2
+The %{name}-gs2 package contains the Cyrus SASL plugin which supports
+the GS2 authentication scheme.
+
+###
+
+
+%prep
+%setup -q -n cyrus-sasl-%{version}
+%patch11 -p1 -b .no_rpath
+%patch15 -p1 -b .path
+%patch23 -p1 -b .man
+%patch24 -p1 -b .sizes
+%patch49 -p1 -b .md5global.h
+%patch101 -p1 -b .tests
+%patch102 -p1 -b .gssapi_cbs
+%patch106 -p1 -b .nostrncpy
+%patch107 -p1 -b .moretests
+%patch108 -p1 -b .maxssf0
+%patch109 -p1 -b .frombdb
+%patch500 -p1 -b .coverity
+%patch501 -p1 -b .digestmd5
+%patch502 -p1 -b .ossl3
+
+%build
+# reconfigure
+cp %{SOURCE11} ./
+rm configure aclocal.m4 config/ltmain.sh Makefile.in
+export NOCONFIGURE=yes
+sh autogen.sh
+
+# Find Kerberos.
+krb5_prefix=`krb5-config --prefix`
+if test x$krb5_prefix = x%{_prefix} ; then
+        krb5_prefix=
+else
+        CPPFLAGS="-I${krb5_prefix}/include $CPPFLAGS"; export CPPFLAGS
+        LDFLAGS="-L${krb5_prefix}/%{_lib} $LDFLAGS"; export LDFLAGS
+fi
+
+# Find OpenSSL.
+LIBS="-lcrypt"; export LIBS
+if pkg-config openssl ; then
+        CPPFLAGS="`pkg-config --cflags-only-I openssl` $CPPFLAGS"; export CPPFLAGS
+        LDFLAGS="`pkg-config --libs-only-L openssl` $LDFLAGS"; export LDFLAGS
+fi
+
+# Find the MySQL libraries used needed by the SQL auxprop plugin.
+INC_DIR="`mysql_config --include`"
+if test x"$INC_DIR" != "x-I%{_includedir}"; then
+        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
+fi
+LIB_DIR="`mysql_config --libs | sed -e 's,-^L^ *,,g' -e 's,^ *,,' -e 's, *$,,' -e 's,  *, ,g'`"
+if test x"$LIB_DIR" != "x-L%{_libdir}"; then
+        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
+fi
+
+# Find the PostgreSQL libraries used needed by the SQL auxprop plugin.
+INC_DIR="-I`pg_config --includedir`"
+if test x"$INC_DIR" != "x-I%{_includedir}"; then
+        CPPFLAGS="$INC_DIR $CPPFLAGS"; export CPPFLAGS
+fi
+LIB_DIR="-L`pg_config --libdir`"
+if test x"$LIB_DIR" != "x-L%{_libdir}"; then
+        LDFLAGS="$LIB_DIR $LDFLAGS"; export LDFLAGS
+fi
+
+CFLAGS="$RPM_OPT_FLAGS $CFLAGS $CPPFLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"; export CFLAGS
+
+echo "$CFLAGS"
+echo "$CPPFLAGS"
+echo "$LDFLAGS"
+
+%configure \
+        --enable-shared --disable-static \
+        --disable-java \
+        --with-plugindir=%{_plugindir2} \
+        --with-configdir=%{_plugindir2}:%{_sysconfdir}/sasl2 \
+        --disable-krb4 \
+        --enable-gssapi${krb5_prefix:+=${krb5_prefix}} \
+        --with-gss_impl=mit \
+        --with-rc4 \
+        --with-dblib=gdbm \
+        --with-dbpath=%{gdbm_db_file} \
+        --with-saslauthd=/run/saslauthd --without-pwcheck \
+%if ! %{bootstrap_cyrus_sasl}
+        --with-ldap \
+%endif
+        --with-devrandom=/dev/urandom \
+        --enable-anon \
+        --enable-cram \
+        --enable-digest \
+        --enable-ntlm \
+        --enable-plain \
+        --enable-login \
+        --enable-alwaystrue \
+        --enable-httpform \
+        --disable-otp \
+%if ! %{bootstrap_cyrus_sasl}
+        --enable-ldapdb \
+%endif
+        --enable-sql --with-mysql=yes --with-pgsql=yes \
+        --without-sqlite \
+        --enable-auth-sasldb \
+        "$@"
+make sasldir=%{_plugindir2}
+make -C saslauthd testsaslauthd
+make -C sample
+
+# Build a small program to list the available mechanisms, because I need it.
+pushd lib
+../libtool --mode=link %{__cc} -o sasl2-shared-mechlist -I../include $CFLAGS %{SOURCE7} $LDFLAGS ./libsasl2.la
+
+
+%install
+test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2}
+make install DESTDIR=$RPM_BUILD_ROOT sasldir=%{_plugindir2} -C plugins
+
+install -m755 -d $RPM_BUILD_ROOT%{_bindir}
+./libtool --mode=install \
+install -m755 sample/client $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-client
+./libtool --mode=install \
+install -m755 sample/server $RPM_BUILD_ROOT%{_bindir}/sasl2-sample-server
+#Migration tool should be removed from RHEL10
+mv $RPM_BUILD_ROOT%{_sbindir}/cyrusbdb2current $RPM_BUILD_ROOT%{_bindir}/cyrusbdb2current
+./libtool --mode=install \
+install -m755 saslauthd/testsaslauthd $RPM_BUILD_ROOT%{_sbindir}/testsaslauthd
+
+# Install the saslauthd mdoc page in the expected location.  Sure, it's not
+# really a man page, but groff seems to be able to cope with it.
+install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man8/
+install -m644 -p saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
+install -m644 -p saslauthd/testsaslauthd.8 $RPM_BUILD_ROOT%{_mandir}/man8/testsaslauthd.8
+
+# Install the systemd unit file for saslauthd and the config file.
+install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} $RPM_BUILD_ROOT/etc/sysconfig
+install -m644 -p %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/saslauthd.service
+install -m644 -p %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
+
+# Install the config dirs if they're not already there.
+install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
+install -m755 -d $RPM_BUILD_ROOT/%{_plugindir2}
+
+# Provide an easy way to query the list of available mechanisms.
+./libtool --mode=install \
+install -m755 lib/sasl2-shared-mechlist $RPM_BUILD_ROOT/%{_sbindir}/
+
+# Sysusers file
+install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/cyrus-sasl.conf
+
+# Remove unpackaged files from the buildroot.
+rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/libotp.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_mandir}/cat8/saslauthd.8
+
+%check
+make check %{?_smp_mflags}
+
+%pre
+%sysusers_create_compat %{SOURCE3}
+
+%post
+%systemd_post saslauthd.service
+
+%preun
+%systemd_preun saslauthd.service
+
+%postun
+%systemd_postun_with_restart saslauthd.service
+
+%ldconfig_scriptlets lib
+
+%files
+%doc saslauthd/LDAP_SASLAUTHD
+%{_mandir}/man8/*
+%{_sbindir}/pluginviewer
+%{_sbindir}/saslauthd
+%{_sbindir}/testsaslauthd
+%config(noreplace) /etc/sysconfig/saslauthd
+%{_unitdir}/saslauthd.service
+%ghost /run/saslauthd
+%{_sysusersdir}/cyrus-sasl.conf
+
+%files lib
+%license COPYING
+%doc AUTHORS doc/html/*.html
+%{_libdir}/libsasl*.so.*
+%dir %{_sysconfdir}/sasl2
+%dir %{_plugindir2}/
+%{_plugindir2}/*anonymous*.so*
+%{_plugindir2}/*sasldb*.so*
+%{_sbindir}/saslpasswd2
+%{_sbindir}/sasldblistusers2
+%{_bindir}/cyrusbdb2current
+
+%files plain
+%{_plugindir2}/*plain*.so*
+%{_plugindir2}/*login*.so*
+
+%if ! %{bootstrap_cyrus_sasl}
+%files ldap
+%{_plugindir2}/*ldapdb*.so*
+%endif
+
+%files md5
+%{_plugindir2}/*crammd5*.so*
+%{_plugindir2}/*digestmd5*.so*
+
+%files ntlm
+%{_plugindir2}/*ntlm*.so*
+
+%files sql
+%{_plugindir2}/*sql*.so*
+
+%files gssapi
+%{_plugindir2}/*gssapi*.so*
+
+%files scram
+%{_plugindir2}/libscram.so*
+
+%files gs2
+%{_plugindir2}/libgs2.so*
+
+%files devel
+%{_bindir}/sasl2-sample-client
+%{_bindir}/sasl2-sample-server
+%{_includedir}/*
+%{_libdir}/libsasl*.*so
+%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*
+%{_sbindir}/sasl2-shared-mechlist
+
+%changelog
+%autochangelog

0001-CVE-2022-24407-Escape-password-for-SQL-insert-update.patch Added

@@ -0,0 +1,82 @@
+From 37f2e0f0658d78a1496dc277f402f8b577ce6aae Mon Sep 17 00:00:00 2001
+From: Klaus Espenlaub <klaus@espenlaub.com>
+Date: Tue, 8 Feb 2022 20:34:40 +0000
+Subject: PATCH CVE-2022-24407 Escape password for SQL insert/update
+ commands.
+
+Signed-off-by: Klaus Espenlaub <klaus@espenlaub.com>
+---
+ plugins/sql.c | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/sql.c b/plugins/sql.c
+index 31b54a78..6ac81c2f 100644
+--- a/plugins/sql.c
++++ b/plugins/sql.c
+@@ -1151,6 +1151,7 @@ static int sql_auxprop_store(void *glob_context,
+     char *statement = NULL;
+     char *escap_userid = NULL;
+     char *escap_realm = NULL;
++    char *escap_passwd = NULL;
+     const char *cmd;
+     
+     sql_settings_t *settings;
+@@ -1222,6 +1223,11 @@ static int sql_auxprop_store(void *glob_context,
+ 			    "Unable to begin transaction\n");
+     }
+     for (cur = to_store; ret == SASL_OK && cur->name; cur++) {
++	/* Free the buffer, current content is from previous loop. */
++	if (escap_passwd) {
++	    sparams->utils->free(escap_passwd);
++	    escap_passwd = NULL;
++	}
+ 
+ 	if (cur->name0 == '*') {
+ 	    continue;
+@@ -1243,19 +1249,32 @@ static int sql_auxprop_store(void *glob_context,
+ 	}
+ 	sparams->utils->free(statement);
+ 
++	if (cur->values0) {
++	    escap_passwd = (char *)sparams->utils->malloc(strlen(cur->values0)*2+1);
++	    if (!escap_passwd) {
++		ret = SASL_NOMEM;
++		break;
++	    }
++	    settings->sql_engine->sql_escape_str(escap_passwd, cur->values0);
++	}
++
+ 	/* create a statement that we will use */
+ 	statement = sql_create_statement(cmd, cur->name, escap_userid,
+ 					 escap_realm,
+-					 cur->values && cur->values0 ?
+-					 cur->values0 : SQL_NULL_VALUE,
++					 escap_passwd ?
++					 escap_passwd : SQL_NULL_VALUE,
+ 					 sparams->utils);
++	if (!statement) {
++	    ret = SASL_NOMEM;
++	    break;
++	}
+ 	
+ 	{
+ 	    char *log_statement =
+ 		sql_create_statement(cmd, cur->name,
+ 				     escap_userid,
+ 				     escap_realm,
+-				     cur->values && cur->values0 ?
++				     escap_passwd ?
+ 				     "<omitted>" : SQL_NULL_VALUE,
+ 				     sparams->utils);
+ 	    sparams->utils->log(sparams->utils->conn, SASL_LOG_DEBUG,
+@@ -1288,6 +1307,7 @@ static int sql_auxprop_store(void *glob_context,
+   done:
+     if (escap_userid) sparams->utils->free(escap_userid);
+     if (escap_realm) sparams->utils->free(escap_realm);
++    if (escap_passwd) sparams->utils->free(escap_passwd);
+     if (conn) settings->sql_engine->sql_close(conn);
+     if (userid) sparams->utils->free(userid);
+     if (realm) sparams->utils->free(realm);
+-- 
+2.25.1
+

cyrus-sasl-2.1.20-saslauthd.conf-path.patch Added

@@ -0,0 +1,26 @@
+diff -up cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc
+--- cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc.path	2015-10-15 15:44:43.000000000 +0200
++++ cyrus-sasl-2.1.27/saslauthd/saslauthd.mdoc	2015-11-20 15:05:30.421377527 +0100
+@@ -221,7 +221,7 @@ instead.
+ .Em (All platforms that support OpenLDAP 2.0 or higher)
+ .Pp
+ Authenticate against an ldap server.  The ldap configuration parameters are
+-read from /usr/local/etc/saslauthd.conf.  The location of this file can be
++read from /etc/saslauthd.conf.  The location of this file can be
+ changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
+ distribution for the list of available parameters.
+ .It Li sia
+@@ -251,10 +251,10 @@ these ticket files can cause serious per
+ servers. (Kerberos
+ was never intended to be used in this manner, anyway.)
+ .Sh FILES
+-.Bl -tag -width "/var/run/saslauthd/mux"
+-.It Pa /var/run/saslauthd/mux
++.Bl -tag -width "/run/saslauthd/mux"
++.It Pa /run/saslauthd/mux
+ The default communications socket.
+-.It Pa /usr/local/etc/saslauthd.conf
++.It Pa /etc/saslauthd.conf
+ The default configuration file for ldap support.
+ .El
+ .Sh SEE ALSO

cyrus-sasl-2.1.21-sizes.patch Added

@@ -0,0 +1,119 @@
+diff -up cyrus-sasl-2.1.27/configure.ac.sizes cyrus-sasl-2.1.27/configure.ac
+--- cyrus-sasl-2.1.27/configure.ac.sizes	2015-11-18 09:46:24.000000000 +0100
++++ cyrus-sasl-2.1.27/configure.ac	2015-11-20 15:11:20.474588247 +0100
+@@ -1312,6 +1312,10 @@ AC_HEADER_STDC
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
++AC_CHECK_TYPES(long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t,,,
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif)
+ 
+ IPv6_CHECK_SS_FAMILY()
+ IPv6_CHECK_SA_LEN()
+diff -up cyrus-sasl-2.1.27/include/makemd5.c.sizes cyrus-sasl-2.1.27/include/makemd5.c
+--- cyrus-sasl-2.1.27/include/makemd5.c.sizes	2015-10-15 15:44:43.000000000 +0200
++++ cyrus-sasl-2.1.27/include/makemd5.c	2015-11-20 15:11:20.477588240 +0100
+@@ -82,12 +82,19 @@
+  */
+ 
+ 
++#ifdef HAVE_CONFIG_H
++#include "../config.h"
++#endif
+ 
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+ 
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
+ 
+ static void
+ my_strupr(char *s)
+@@ -122,6 +129,18 @@ my_strupr(char *s)
+ static void
+ try_signed(FILE *f, int len)
+ {
++#ifdef HAVE_INT8_T
++    BITSIZE(int8_t);
++#endif
++#ifdef HAVE_INT16_T
++    BITSIZE(int16_t);
++#endif
++#ifdef HAVE_INT32_T
++    BITSIZE(int32_t);
++#endif
++#ifdef HAVE_INT64_T
++    BITSIZE(int64_t);
++#endif
+     BITSIZE(signed char);
+     BITSIZE(short);
+     BITSIZE(int);
+@@ -135,6 +154,18 @@ try_signed(FILE *f, int len)
+ static void
+ try_unsigned(FILE *f, int len)
+ {
++#ifdef HAVE_UINT8_T
++    BITSIZE(uint8_t);
++#endif
++#ifdef HAVE_UINT16_T
++    BITSIZE(uint16_t);
++#endif
++#ifdef HAVE_UINT32_T
++    BITSIZE(uint32_t);
++#endif
++#ifdef HAVE_UINT64_T
++    BITSIZE(uint64_t);
++#endif
+     BITSIZE(unsigned char);
+     BITSIZE(unsigned short);
+     BITSIZE(unsigned int);
+@@ -165,6 +196,11 @@ static int print_pre(FILE *f)
+ 	  "/* POINTER defines a generic pointer type */\n"
+ 	  "typedef unsigned char *POINTER;\n"
+ 	  "\n"
++#ifdef HAVE_INTTYPES_H
++	  "/* We try to define integer types for our use */\n"
++	  "#include <inttypes.h>\n"
++	  "\n"
++#endif
+ 	  );
+   return 1;
+ }
+@@ -212,31 +248,15 @@ int main(int argc, char **argv)
+ 
+   print_pre(f);
+ 
+-#ifndef HAVE_INT8_T
+     try_signed (f, 8);
+-#endif /* HAVE_INT8_T */
+-#ifndef HAVE_INT16_T
+     try_signed (f, 16);
+-#endif /* HAVE_INT16_T */
+-#ifndef HAVE_INT32_T
+     try_signed (f, 32);
+-#endif /* HAVE_INT32_T */
+-#ifndef HAVE_INT64_T
+     try_signed (f, 64);
+-#endif /* HAVE_INT64_T */
+ 
+-#ifndef HAVE_U_INT8_T
+     try_unsigned (f, 8);
+-#endif /* HAVE_INT8_T */
+-#ifndef HAVE_U_INT16_T
+     try_unsigned (f, 16);
+-#endif /* HAVE_U_INT16_T */
+-#ifndef HAVE_U_INT32_T
+     try_unsigned (f, 32);
+-#endif /* HAVE_U_INT32_T */
+-#ifndef HAVE_U_INT64_T
+     try_unsigned (f, 64);
+-#endif /* HAVE_U_INT64_T */
+ 
+     print_post(f);
+

cyrus-sasl-2.1.23-db5.patch Added

cyrus-sasl-2.1.23-man.patch Added

cyrus-sasl-2.1.23-race.patch Added

cyrus-sasl-2.1.23-rimap2.patch Added

@@ -0,0 +1,70 @@
+diff -up cyrus-sasl-2.1.23/saslauthd/auth_rimap.c.rimap2 cyrus-sasl-2.1.23/saslauthd/auth_rimap.c
+--- cyrus-sasl-2.1.23/saslauthd/auth_rimap.c.rimap2	2011-06-01 05:54:13.339252378 +0200
++++ cyrus-sasl-2.1.23/saslauthd/auth_rimap.c	2011-06-01 05:54:39.626252337 +0200
+@@ -1,3 +1,4 @@
++
+ /* MODULE: auth_rimap */
+ 
+ /* COPYRIGHT
+@@ -368,6 +369,30 @@ auth_rimap (
+     alarm(NETWORK_IO_TIMEOUT);
+     rc = read(s, rbuf, sizeof(rbuf));
+     alarm(0);
++    if ( rc>0 ) {
++        /* check if there is more to read */
++        fd_set         perm;
++        int            fds, ret;
++        struct timeval timeout;
++
++        FD_ZERO(&perm);
++        FD_SET(s, &perm);
++        fds = s +1;
++
++        timeout.tv_sec  = 1;
++        timeout.tv_usec = 0;
++        while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
++           if ( FD_ISSET(s, &perm) ) {
++              ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
++              if ( ret<0 ) {
++                 rc = ret;
++                 break;
++              } else {
++                 rc += ret;
++              }
++           }
++        }
++    }
+     if (rc == -1) {
+ 	syslog(LOG_WARNING, "auth_rimap: read (banner): %m");
+ 	(void) close(s);
+@@ -457,6 +482,30 @@ auth_rimap (
+     alarm(NETWORK_IO_TIMEOUT);
+     rc = read(s, rbuf, sizeof(rbuf));
+     alarm(0);
++    if ( rc>0 ) {
++        /* check if there is more to read */
++        fd_set         perm;
++        int            fds, ret;
++        struct timeval timeout;
++
++        FD_ZERO(&perm);
++        FD_SET(s, &perm);
++        fds = s +1;
++
++        timeout.tv_sec  = 1;
++        timeout.tv_usec = 0;
++        while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
++           if ( FD_ISSET(s, &perm) ) {
++              ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
++              if ( ret<0 ) {
++                 rc = ret;
++                 break;
++              } else {
++                 rc += ret;
++              }
++           }
++        }
++    }
+     (void) close(s);			/* we're done with the remote */
+     if (rc == -1) {
+ 	syslog(LOG_WARNING, "auth_rimap: read (response): %m");

cyrus-sasl-2.1.25-no_rpath.patch Added

cyrus-sasl-2.1.26-md5global.patch Added

cyrus-sasl-2.1.27-Add-Channel-Binding-support-for-GSSAPI-GSS-SPNEGO.patch Added

@@ -0,0 +1,475 @@
+Backport of commit ids (minor inline mods to make them apply):
+975edbb69070eba6b035f08776de771a129cfb57
+ea8eb892e44129ac3890298da91c868d5592ed20
+
+From 975edbb69070eba6b035f08776de771a129cfb57 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Fri, 20 Mar 2020 14:51:04 -0400
+Subject: PATCH Add Channel Binding support for GSSAPI/GSS-SPNEGO
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ plugins/gssapi.c     | 30 +++++++++++---
+ tests/runtests.py    | 93 ++++++++++++++++++++++++++++++++++++++++----
+ tests/t_common.c     | 14 +++++++
+ tests/t_common.h     |  2 +
+ tests/t_gssapi_cli.c | 21 +++++++++-
+ tests/t_gssapi_srv.c | 21 +++++++++-
+ 6 files changed, 164 insertions(+), 17 deletions(-)
+
+diff --git a/plugins/gssapi.c b/plugins/gssapi.c
+index ff663da7..5d900c5e 100644
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -830,7 +830,9 @@ gssapi_server_mech_authneg(context_t *text,
+     gss_buffer_desc name_without_realm;
+     gss_name_t client_name_MN = NULL, without = NULL;
+     gss_OID mech_type;
+-	
++    gss_channel_bindings_t bindings = GSS_C_NO_CHANNEL_BINDINGS;
++    struct gss_channel_bindings_struct cb = {0};
++
+     input_token = &real_input_token;
+     output_token = &real_output_token;
+     output_token->value = NULL; output_token->length = 0;
+@@ -902,6 +904,12 @@ gssapi_server_mech_authneg(context_t *text,
+ 	real_input_token.length = clientinlen;
+     }
+ 
++    if (params->cbinding != NULL) {
++        cb.application_data.length = params->cbinding->len;
++        cb.application_data.value = params->cbinding->data;
++        bindings = &cb;
++    }
++
+ 
+     GSS_LOCK_MUTEX_CTX(params->utils, text);
+     maj_stat =
+@@ -909,7 +917,7 @@ gssapi_server_mech_authneg(context_t *text,
+ 			       &(text->gss_ctx),
+ 			       server_creds,
+ 			       input_token,
+-			       GSS_C_NO_CHANNEL_BINDINGS,
++			       bindings,
+ 			       &text->client_name,
+ 			       &mech_type,
+ 			       output_token,
+@@ -1505,7 +1513,8 @@ static sasl_server_plug_t gssapi_server_plugins =
+ 	| SASL_SEC_PASS_CREDENTIALS,
+ 	SASL_FEAT_WANT_CLIENT_FIRST
+ 	| SASL_FEAT_ALLOWS_PROXY
+-	| SASL_FEAT_DONTUSE_USERPASSWD,	/* features */
++	| SASL_FEAT_DONTUSE_USERPASSWD
++	| SASL_FEAT_CHANNEL_BINDING,	/* features */
+ 	NULL,				/* glob_context */
+ 	&gssapi_server_mech_new,	/* mech_new */
+ 	&gssapi_server_mech_step,	/* mech_step */
+@@ -1529,6 +1538,7 @@ static sasl_server_plug_t gssapi_server_plugins =
+ 	SASL_FEAT_WANT_CLIENT_FIRST
+ 	| SASL_FEAT_ALLOWS_PROXY
+ 	| SASL_FEAT_DONTUSE_USERPASSWD
++	| SASL_FEAT_CHANNEL_BINDING
+ 	| SASL_FEAT_SUPPORTS_HTTP,	/* features */
+ 	&gss_spnego_oid,		/* glob_context */
+ 	&gssapi_server_mech_new,	/* mech_new */
+@@ -1662,6 +1672,8 @@ static int gssapi_client_mech_step(void *conn_context,
+     input_token->value = NULL; 
+     input_token->length = 0;
+     gss_cred_id_t client_creds = (gss_cred_id_t)params->gss_creds;
++    gss_channel_bindings_t bindings = GSS_C_NO_CHANNEL_BINDINGS;
++    struct gss_channel_bindings_struct cb = {0};
+ 
+     if (clientout)
+         *clientout = NULL;
+@@ -1777,6 +1789,12 @@ static int gssapi_client_mech_step(void *conn_context,
+ 	    req_flags = req_flags |  GSS_C_DELEG_FLAG;
+ 	}
+ 
++        if (params->cbinding != NULL) {
++            cb.application_data.length = params->cbinding->len;
++            cb.application_data.value = params->cbinding->data;
++            bindings = &cb;
++        }
++
+ 	GSS_LOCK_MUTEX_CTX(params->utils, text);
+ 	maj_stat = gss_init_sec_context(&min_stat,
+ 					client_creds, /* GSS_C_NO_CREDENTIAL */
+@@ -1785,7 +1803,7 @@ static int gssapi_client_mech_step(void *conn_context,
+ 					text->mech_type,
+ 					req_flags,
+ 					0,
+-					GSS_C_NO_CHANNEL_BINDINGS,
++					bindings,
+ 					input_token,
+ 					NULL,
+ 					output_token,
+@@ -2190,7 +2208,8 @@ static sasl_client_plug_t gssapi_client_plugins =
+ 	| SASL_SEC_PASS_CREDENTIALS,    /* security_flags */
+ 	SASL_FEAT_NEEDSERVERFQDN
+ 	| SASL_FEAT_WANT_CLIENT_FIRST
+-	| SASL_FEAT_ALLOWS_PROXY,	/* features */
++	| SASL_FEAT_ALLOWS_PROXY
++	| SASL_FEAT_CHANNEL_BINDING,	/* features */
+ 	gssapi_required_prompts,	/* required_prompts */
+ 	GSS_C_NO_OID,			/* glob_context */
+ 	&gssapi_client_mech_new,	/* mech_new */
+@@ -2213,6 +2232,7 @@ static sasl_client_plug_t gssapi_client_plugins =
+ 	SASL_FEAT_NEEDSERVERFQDN
+ 	| SASL_FEAT_WANT_CLIENT_FIRST
+ 	| SASL_FEAT_ALLOWS_PROXY
++	| SASL_FEAT_CHANNEL_BINDING
+ 	| SASL_FEAT_SUPPORTS_HTTP,	/* features */
+ 	gssapi_required_prompts,	/* required_prompts */
+ 	&gss_spnego_oid,		/* glob_context */
+diff --git a/tests/runtests.py b/tests/runtests.py
+index f645adf4..fc9cf244 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -1,6 +1,7 @@
+ #!/usr/bin/python3
+ 
+ import argparse
++import base64
+ import os
+ import shutil
+ import signal
+@@ -126,14 +127,7 @@ def setup_kdc(testdir, env):
+ 
+     return kdc, env
+ 
+-
+-def gssapi_tests(testdir):
+-    """ SASL/GSSAPI Tests """
+-    env = setup_socket_wrappers(testdir)
+-    kdc, kenv = setup_kdc(testdir, env)
+-    #print("KDC: {}, ENV: {}".format(kdc, kenv))
+-    kenv'KRB5_TRACE' = os.path.join(testdir, 'trace.log')
+-
++def gssapi_basic_test(kenv):
+     try:
+         srv = subprocess.Popen("../tests/t_gssapi_srv",
+                                stdout=subprocess.PIPE,
+@@ -155,11 +149,94 @@ def gssapi_tests(testdir):
+                 srv.returncode, srv.stderr.read().decode('utf-8')))
+     except Exception as e:
+         print("FAIL: {}".format(e))
++        return
++
++    print("PASS: CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++
++def gssapi_channel_binding_test(kenv):
++    try:
++        bindings = base64.b64encode("MATCHING CBS".encode('utf-8'))
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-c", bindings,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-c", bindings,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli.stderr.read().decode('utf-8'),
++                srv.returncode, srv.stderr.read().decode('utf-8')))
++    except Exception as e:
++        print("FAIL: {}".format(e))
++        return
+ 
+     print("PASS: CLI({}) SRV({})".format(
+         cli.stdout.read().decode('utf-8').strip(),
+         srv.stdout.read().decode('utf-8').strip()))
+ 
++def gssapi_channel_binding_mismatch_test(kenv):
++    result = "FAIL"
++    try:
++        bindings = base64.b64encode("SRV CBS".encode('utf-8'))
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-c", bindings,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        bindings = base64.b64encode("CLI CBS".encode('utf-8'))
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-c", bindings,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            cli_err = cli.stderr.read().decode('utf-8').strip()
++            srv_err = srv.stderr.read().decode('utf-8').strip()
++            if "authentication failure" in srv_err:
++                result = "PASS"
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli_err, srv.returncode, srv_err))
++    except Exception as e:
++        print("{}: {}".format(result, e))
++        return
++
++    print("FAIL: This test should fail CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++
++def gssapi_tests(testdir):
++    """ SASL/GSSAPI Tests """
++    env = setup_socket_wrappers(testdir)
++    kdc, kenv = setup_kdc(testdir, env)
++    #print("KDC: {}, ENV: {}".format(kdc, kenv))
++    kenv'KRB5_TRACE' = os.path.join(testdir, 'trace.log')
++
++    print('GSSAPI BASIC:')
++    print('    ', end='')
++    gssapi_basic_test(kenv)
++
++    print('GSSAPI CHANNEL BINDING:')
++    print('    ', end='')
++    gssapi_channel_binding_test(kenv)
++
++    print('GSSAPI CHANNEL BINDING MISMTACH:')
++    print('    ', end='')
++    gssapi_channel_binding_mismatch_test(kenv)
++
+     os.killpg(kdc.pid, signal.SIGTERM)
+ 
+ 
+diff --git a/tests/t_common.c b/tests/t_common.c
+index 7168b2f1..87875b48 100644
+--- a/tests/t_common.c
++++ b/tests/t_common.c
+@@ -65,4 +65,18 @@ int getpath(void *context __attribute__((unused)), const char **path)
+     return SASL_OK;
+ }
+ 
++void parse_cb(sasl_channel_binding_t *cb, char *buf, unsigned max, char *in)
++{
++    unsigned len;
++    int r;
+ 
++    r = sasl_decode64(in, strlen(in), buf, max, &len);
++    if (r != SASL_OK) {
++        saslerr(r, "failed to parse channel bindings");
++        exit(-1);
++    }
++    cb->name = "TEST BINDINGS";
++    cb->critical = 0;
++    cb->data = (unsigned char *)buf;
++    cb->len = len;
++}
+diff --git a/tests/t_common.h b/tests/t_common.h
+index 4ee1976c..0d08d8ba 100644
+--- a/tests/t_common.h
++++ b/tests/t_common.h
+@@ -7,9 +7,11 @@
+ #include <sys/socket.h>
+ 
+ #include <sasl.h>
++#include <saslutil.h>
+ 
+ void s_error(const char *hdr, ssize_t ret, ssize_t len, int err);
+ void send_string(int sd, const char *s, unsigned int l);
+ void recv_string(int sd, char *buf, unsigned int *buflen);
+ void saslerr(int why, const char *what);
+ int getpath(void *context __attribute__((unused)), const char **path);
++void parse_cb(sasl_channel_binding_t *cb, char *buf, unsigned max, char *in);
+diff --git a/tests/t_gssapi_cli.c b/tests/t_gssapi_cli.c
+index c833c055..6b5664eb 100644
+--- a/tests/t_gssapi_cli.c
++++ b/tests/t_gssapi_cli.c
+@@ -13,6 +13,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <saslplug.h>
++#include <saslutil.h>
+ 
+ static int setup_socket(void)
+ {
+@@ -32,7 +33,7 @@ static int setup_socket(void)
+     return sock;
+ }
+ 
+-int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
++int main(int argc, char *argv)
+ {
+     sasl_callback_t callbacks2 = {};
+     char buf8192;
+@@ -40,8 +41,20 @@ int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
+     sasl_conn_t *conn;
+     const char *data;
+     unsigned int len;
++    sasl_channel_binding_t cb = {0};
++    char cb_buf256;
+     int sd;
+-    int r;
++    int c, r;
++
++    while ((c = getopt(argc, argv, "c:")) != EOF) {
++        switch (c) {
++        case 'c':
++            parse_cb(&cb, cb_buf, 256, optarg);
++            break;
++        default:
++            break;
++        }
++    }
+ 
+     /* initialize the sasl library */
+     callbacks0.id = SASL_CB_GETPATH;
+@@ -60,6 +73,10 @@ int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
+         exit(-1);
+     }
+ 
++    if (cb.name) {
++        sasl_setprop(conn, SASL_CHANNEL_BINDING, &cb);
++    }
++
+     r = sasl_client_start(conn, "GSSAPI", NULL, &data, &len, &chosenmech);
+     if (r != SASL_OK && r != SASL_CONTINUE) {
+ 	saslerr(r, "starting SASL negotiation");
+diff --git a/tests/t_gssapi_srv.c b/tests/t_gssapi_srv.c
+index 29f538dd..3a8a5d44 100644
+--- a/tests/t_gssapi_srv.c
++++ b/tests/t_gssapi_srv.c
+@@ -44,15 +44,28 @@ static int setup_socket(void)
+     return sd;
+ }
+ 
+-int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
++int main(int argc, char *argv)
+ {
+     sasl_callback_t callbacks2 = {};
+     char buf8192;
+     sasl_conn_t *conn;
+     const char *data;
+     unsigned int len;
++    sasl_channel_binding_t cb = {0};
++    unsigned char cb_buf256;
+     int sd;
+-    int r;
++    int c, r;
++
++    while ((c = getopt(argc, argv, "c:")) != EOF) {
++        switch (c) {
++        case 'c':
++            parse_cb(&cb, cb_buf, 256, optarg);
++            break;
++        default:
++            break;
++        }
++    }
++
+ 
+     /* initialize the sasl library */
+     callbacks0.id = SASL_CB_GETPATH;
+@@ -72,6 +85,10 @@ int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
+         exit(-1);
+     }
+ 
++    if (cb.name) {
++        sasl_setprop(conn, SASL_CHANNEL_BINDING, &cb);
++    }
++
+     sd = setup_socket();
+ 
+     len = 8192;
+
+From ea8eb892e44129ac3890298da91c868d5592ed20 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Fri, 20 Mar 2020 14:52:15 -0400
+Subject: PATCH Fixup minor issues in previous PR.
+
+Remove spurious debugging code, this was left in by mistake.
+Add C notices, this was omitted by mistake.
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ tests/t_common.c     | 10 ++--------
+ tests/t_common.h     |  3 ++-
+ tests/t_gssapi_cli.c |  3 ++-
+ tests/t_gssapi_srv.c |  3 ++-
+ 4 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/tests/t_common.c b/tests/t_common.c
+index 87875b48..478e6a1f 100644
+--- a/tests/t_common.c
++++ b/tests/t_common.c
+@@ -1,4 +1,5 @@
+-/* TBD, add (C) */
++/* Copyright (C) Simo Sorce <simo@redhat.com>
++ * See COPYING file for License */
+ 
+ #include <t_common.h>
+ 
+@@ -13,9 +14,6 @@ void send_string(int sd, const char *s, unsigned int l)
+ {
+     ssize_t ret;
+ 
+-fprintf(stderr, "s:%u ", l);
+-fflush(stderr);
+-
+     ret = send(sd, &l, sizeof(l), 0);
+     if (ret != sizeof(l)) s_error("send size", ret, sizeof(l), errno);
+ 
+@@ -34,8 +32,6 @@ void recv_string(int sd, char *buf, unsigned int *buflen)
+     if (ret != sizeof(l)) s_error("recv size", ret, sizeof(l), errno);
+ 
+     if (l == 0) {
+-fprintf(stderr, "r:0 ");
+-fflush(stderr);
+         *buflen = 0;
+         return;
+     }
+@@ -45,8 +41,6 @@ fflush(stderr);
+     ret = recv(sd, buf, l, 0);
+     if (ret != l) s_error("recv data", ret, l, errno);
+ 
+-fprintf(stderr, "r:%ld ", ret);
+-fflush(stderr);
+     *buflen = ret;
+ }
+ 
+diff --git a/tests/t_common.h b/tests/t_common.h
+index 0d08d8ba..a10def17 100644
+--- a/tests/t_common.h
++++ b/tests/t_common.h
+@@ -1,4 +1,5 @@
+-/* TBD, add (C) */
++/* Copyright (C) Simo Sorce <simo@redhat.com>
++ * See COPYING file for License */
+ 
+ #include "config.h"
+ 
+diff --git a/tests/t_gssapi_cli.c b/tests/t_gssapi_cli.c
+index 6b5664eb..a44a3f58 100644
+--- a/tests/t_gssapi_cli.c
++++ b/tests/t_gssapi_cli.c
+@@ -1,4 +1,5 @@
+-/* TBD, add (C) */
++/* Copyright (C) Simo Sorce <simo@redhat.com>
++ * See COPYING file for License */
+ 
+ #include "t_common.h"
+ 
+diff --git a/tests/t_gssapi_srv.c b/tests/t_gssapi_srv.c
+index 3a8a5d44..ef1217f6 100644
+--- a/tests/t_gssapi_srv.c
++++ b/tests/t_gssapi_srv.c
+@@ -1,4 +1,5 @@
+-/* TBD, add (C) */
++/* Copyright (C) Simo Sorce <simo@redhat.com>
++ * See COPYING file for License */
+ 
+ #include "t_common.h"
+ 
+

cyrus-sasl-2.1.27-Add-basic-test-infrastructure.patch Added

@@ -0,0 +1,642 @@
+Backport of 18ff41d5d18f61c2ded7235dad1d9618aa84784b with minor inline mods to
+make it apply.
+
+From 18ff41d5d18f61c2ded7235dad1d9618aa84784b Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Sat, 14 Mar 2020 10:50:19 -0400
+Subject: PATCH Add basic test infrastructure
+
+First test is for SASL/GSSAPI
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+
+:x
+---
+ Makefile.am          |   2 +-
+ configure.ac         |   3 +-
+ tests/Makefile.am    |  79 +++++++++++++++++++
+ tests/runtests.py    | 179 +++++++++++++++++++++++++++++++++++++++++++
+ tests/t_common.c     |  68 ++++++++++++++++
+ tests/t_common.h     |  15 ++++
+ tests/t_gssapi_cli.c |  95 +++++++++++++++++++++++
+ tests/t_gssapi_srv.c | 111 +++++++++++++++++++++++++++
+ 10 files changed, 559 insertions(+), 4 deletions(-)
+ create mode 100644 tests/Makefile.am
+ create mode 100755 tests/runtests.py
+ create mode 100644 tests/t_common.c
+ create mode 100644 tests/t_common.h
+ create mode 100644 tests/t_gssapi_cli.c
+ create mode 100644 tests/t_gssapi_srv.c
+
+diff --git a/Makefile.am b/Makefile.am
+index f7d3b22e..102e2a3e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -65,7 +65,7 @@ else
+ INSTALLOSX = 
+ endif
+ 
+-SUBDIRS=include sasldb common lib plugins utils $(PWC) $(SAM) $(SAD)
++SUBDIRS=include sasldb common lib plugins utils $(PWC) $(SAM) $(SAD) tests
+ EXTRA_DIST=config doc docsrc win32 mac dlcompat-20010505 NTMakefile \
+     INSTALL.TXT libsasl2.pc.in
+ 
+diff --git a/configure.ac b/configure.ac
+index 3610671b..dd7908a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1516,8 +1516,9 @@ plugins/Makefile
+ lib/Makefile
+ utils/Makefile
+ sample/Makefile
+-pwcheck/Makefile)
++pwcheck/Makefile
++tests/Makefile)
+ AC_OUTPUT
+ 
+ AC_MSG_NOTICE(
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+new file mode 100644
+index 00000000..1edf010a
+--- /dev/null
++++ b/tests/Makefile.am
+@@ -0,0 +1,79 @@
++# Makefile.am -- automake input for cyrus-sasl tests
++# Simo Sorce
++#
++################################################################
++# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++#
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in
++#    the documentation and/or other materials provided with the
++#    distribution.
++#
++# 3. The name "Carnegie Mellon University" must not be used to
++#    endorse or promote products derived from this software without
++#    prior written permission. For permission or any other legal
++#    details, please contact
++#      Office of Technology Transfer
++#      Carnegie Mellon University
++#      5000 Forbes Avenue
++#      Pittsburgh, PA  15213-3890
++#      (412) 268-4387, fax: (412) 268-7395
++#      tech-transfer@andrew.cmu.edu
++#
++# 4. Redistributions of any form whatsoever must retain the following
++#    acknowledgment:
++#    "This product includes software developed by Computing Services
++#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
++#
++# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
++# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
++# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++#
++################################################################
++
++AM_CPPFLAGS=-I$(top_srcdir)/include -DPLUGINDIR='"${top_srcdir}/plugins/.libs"'
++
++COMMON_LDADD = ../lib/libsasl2.la $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET)
++
++t_gssapi_cli_SOURCES = \
++	t_common.c \
++	t_gssapi_cli.c
++
++t_gssapi_cli_LDADD = $(COMMON_LDADD)
++
++t_gssapi_srv_SOURCES = \
++	t_common.c \
++	t_gssapi_srv.c
++
++t_gssapi_srv_LDADD = $(COMMON_LDADD)
++
++check_PROGRAMS = \
++	t_gssapi_cli \
++	t_gssapi_srv \
++	$(NULL)
++
++noinst_PROGRAMS = $(check_PROGRAMS)
++
++EXTRA_DIST = \
++	runtests.py \
++	$(NULL)
++
++all: $(check_PROGRAMS)
++
++check:
++if MACOSX
++# skip Mac OSX for now
++else
++	$(srcdir)/runtests.py $(CHECKARGS)
++endif
+diff --git a/tests/runtests.py b/tests/runtests.py
+new file mode 100755
+index 00000000..f645adf4
+--- /dev/null
++++ b/tests/runtests.py
+@@ -0,0 +1,179 @@
++#!/usr/bin/python3
++
++import argparse
++import os
++import shutil
++import signal
++import subprocess
++import time
++from string import Template
++
++
++def setup_socket_wrappers(testdir):
++    """ Try to set up socket wrappers """
++    wrapdir = os.path.join(testdir, 'w')
++    os.makedirs(wrapdir)
++
++    wrappers = subprocess.Popen('pkg-config', '--exists', 'socket_wrapper')
++    wrappers.wait()
++    if wrappers.returncode != 0:
++        raise Exception('Socket Wrappers not available')
++
++    wrappers = subprocess.Popen('pkg-config', '--exists', 'nss_wrapper')
++    wrappers.wait()
++    if wrappers.returncode != 0:
++        raise Exception('NSS Wrappers not available')
++
++    hosts = os.path.join(wrapdir, 'hosts')
++    with open(hosts, 'w+') as conffile:
++        conffile.write('127.0.0.9 host.realm.test')
++
++    return {'LD_PRELOAD': 'libsocket_wrapper.so libnss_wrapper.so',
++            'SOCKET_WRAPPER_DIR': wrapdir,
++            'SOCKET_WRAPPER_DEFAULT_IFACE': '9',
++            'NSS_WRAPPER_HOSTNAME': 'host.realm.test',
++            'NSS_WRAPPER_HOSTS': hosts}
++
++
++KERBEROS_CONF = '''
++libdefaults
++  default_realm = REALM.TEST
++  dns_lookup_realm = false
++  dns_lookup_kdc = false
++  rdns = false
++  ticket_lifetime = 24h
++  forwardable = yes
++  default_ccache_name = FILE://${TESTDIR}/ccache
++  udp_preference_limit = 1
++
++domain_realm
++  .realm.test = REALM.TEST
++  realm.test = REALM.TEST
++
++realms
++ REALM.TEST = {
++  kdc = 127.0.0.9
++  admin_server = 127.0.0.9
++  acl_file = ${TESTDIR}/kadm.acl
++  dict_file = /usr/share/dict/words
++  admin_keytab = ${TESTDIR}/kadm.keytab
++  database_name = ${TESTDIR}/kdc.db
++  key_stash_file = ${TESTDIR}/kdc.stash
++ }
++
++kdcdefaults
++ kdc_ports = 88
++ kdc_tcp_ports = 88
++
++logging
++  kdc = FILE:${TESTDIR}/kdc.log
++  admin_server = FILE:${TESTDIR}/kadm.log
++  default = FILE:${TESTDIR}/krb5.log
++'''
++
++
++def setup_kdc(testdir, env):
++    """ Setup KDC and start process """
++    krbconf = os.path.join(testdir, 'krb.conf')
++    env'KRB5_CONFIG' = krbconf
++
++    kenv = {'KRB5_KDC_PROFILE': krbconf,
++            'PATH': '/sbin:/bin:/usr/sbin:/usr/bin'}
++    kenv.update(env)
++
++    # KDC/KRB5 CONFIG
++    templ = Template(KERBEROS_CONF)
++    text = templ.substitute({'TESTDIR': testdir})
++    with open(krbconf, 'w+') as conffile:
++        conffile.write(text)
++
++    testlog = os.path.join(testdir, 'kdc.log')
++    log = open(testlog, 'a')
++
++    subprocess.check_call(
++        "kdb5_util", "create",
++        "-r", "REALM.TEST", "-s", "-P", "password"
++        , stdout=log, stderr=log, env=kenv, timeout=5)
++
++    kdc = subprocess.Popen('krb5kdc', '-n', env=kenv, preexec_fn=os.setsid)
++    time.sleep(5)
++
++    # Add a user and genrate a keytab
++    keytab = os.path.join(testdir, "user.keytab")
++    subprocess.check_call(
++        "kadmin.local", "-q",
++        "addprinc -randkey user"
++        , stdout=log, stderr=log, env=kenv, timeout=5)
++
++    subprocess.check_call(
++        "kadmin.local", "-q",
++        "ktadd -k {} user".format(keytab)
++        , stdout=log, stderr=log, env=kenv, timeout=5)
++    env'KRB5_CLIENT_KTNAME' = keytab
++
++    # Add a service and genrate a keytab
++    keytab = os.path.join(testdir, "test.keytab")
++    subprocess.check_call(
++        "kadmin.local", "-q",
++        "addprinc -randkey test/host.realm.test"
++        , stdout=log, stderr=log, env=kenv, timeout=5)
++
++    subprocess.check_call(
++        "kadmin.local", "-q",
++        "ktadd -k {} test/host.realm.test".format(keytab)
++        , stdout=log, stderr=log, env=kenv, timeout=5)
++    env'KRB5_KTNAME' = keytab
++
++    return kdc, env
++
++
++def gssapi_tests(testdir):
++    """ SASL/GSSAPI Tests """
++    env = setup_socket_wrappers(testdir)
++    kdc, kenv = setup_kdc(testdir, env)
++    #print("KDC: {}, ENV: {}".format(kdc, kenv))
++    kenv'KRB5_TRACE' = os.path.join(testdir, 'trace.log')
++
++    try:
++        srv = subprocess.Popen("../tests/t_gssapi_srv",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        cli = subprocess.Popen("../tests/t_gssapi_cli",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli.stderr.read().decode('utf-8'),
++                srv.returncode, srv.stderr.read().decode('utf-8')))
++    except Exception as e:
++        print("FAIL: {}".format(e))
++
++    print("PASS: CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++
++    os.killpg(kdc.pid, signal.SIGTERM)
++
++
++if __name__ == "__main__":
++
++    P = argparse.ArgumentParser(description='Cyrus SASL Tests')
++    P.add_argument('--testdir', default=os.path.join(os.getcwd(), '.tests'),
++                   help="Directory for running tests")
++    A = vars(P.parse_args())
++
++    T = A'testdir'
++
++    if os.path.exists(T):
++        shutil.rmtree(T)
++    os.makedirs(T)
++
++    gssapi_tests(T)
+diff --git a/tests/t_common.c b/tests/t_common.c
+new file mode 100644
+index 00000000..7168b2f1
+--- /dev/null
++++ b/tests/t_common.c
+@@ -0,0 +1,68 @@
++/* TBD, add (C) */
++
++#include <t_common.h>
++
++void s_error(const char *hdr, ssize_t ret, ssize_t len, int err)
++{
++    fprintf(stderr, "%s l:%ld/%ld %d %s",
++            hdr, ret, len, err, strerror(err));
++    exit(-1);
++}
++
++void send_string(int sd, const char *s, unsigned int l)
++{
++    ssize_t ret;
++
++fprintf(stderr, "s:%u ", l);
++fflush(stderr);
++
++    ret = send(sd, &l, sizeof(l), 0);
++    if (ret != sizeof(l)) s_error("send size", ret, sizeof(l), errno);
++
++    if (l == 0) return;
++
++    ret = send(sd, s, l, 0);
++    if (ret != l) s_error("send data", ret, l, errno);
++}
++
++void recv_string(int sd, char *buf, unsigned int *buflen)
++{
++    unsigned int l;
++    ssize_t ret;
++
++    ret = recv(sd, &l, sizeof(l), MSG_WAITALL);
++    if (ret != sizeof(l)) s_error("recv size", ret, sizeof(l), errno);
++
++    if (l == 0) {
++fprintf(stderr, "r:0 ");
++fflush(stderr);
++        *buflen = 0;
++        return;
++    }
++
++    if (*buflen < l) s_error("recv len", l, *buflen, E2BIG);
++
++    ret = recv(sd, buf, l, 0);
++    if (ret != l) s_error("recv data", ret, l, errno);
++
++fprintf(stderr, "r:%ld ", ret);
++fflush(stderr);
++    *buflen = ret;
++}
++
++void saslerr(int why, const char *what)
++{
++    fprintf(stderr, "%s: %s", what, sasl_errstring(why, NULL, NULL));
++}
++
++int getpath(void *context __attribute__((unused)), const char **path)
++{
++    if (! path) {
++        return SASL_BADPARAM;
++    }
++
++    *path = PLUGINDIR;
++    return SASL_OK;
++}
++
++
+diff --git a/tests/t_common.h b/tests/t_common.h
+new file mode 100644
+index 00000000..4ee1976c
+--- /dev/null
++++ b/tests/t_common.h
+@@ -0,0 +1,15 @@
++/* TBD, add (C) */
++
++#include "config.h"
++
++#include <errno.h>
++#include <stdio.h>
++#include <sys/socket.h>
++
++#include <sasl.h>
++
++void s_error(const char *hdr, ssize_t ret, ssize_t len, int err);
++void send_string(int sd, const char *s, unsigned int l);
++void recv_string(int sd, char *buf, unsigned int *buflen);
++void saslerr(int why, const char *what);
++int getpath(void *context __attribute__((unused)), const char **path);
+diff --git a/tests/t_gssapi_cli.c b/tests/t_gssapi_cli.c
+new file mode 100644
+index 00000000..c833c055
+--- /dev/null
++++ b/tests/t_gssapi_cli.c
+@@ -0,0 +1,95 @@
++/* TBD, add (C) */
++
++#include "t_common.h"
++
++#include <stdlib.h>
++#include <stdarg.h>
++#include <ctype.h>
++#include <string.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <arpa/inet.h>
++#include <saslplug.h>
++
++static int setup_socket(void)
++{
++    struct sockaddr_in addr;
++    int sock, ret;
++
++    sock = socket(AF_INET, SOCK_STREAM, 0);
++    if (sock < 0) s_error("socket", 0, 0, errno);
++
++    addr.sin_family = AF_INET;
++    addr.sin_addr.s_addr = inet_addr("127.0.0.9");
++    addr.sin_port = htons(9000);
++
++    ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr));
++    if (ret != 0) s_error("connect", 0, 0, errno);
++
++    return sock;
++}
++
++int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
++{
++    sasl_callback_t callbacks2 = {};
++    char buf8192;
++    const char *chosenmech;
++    sasl_conn_t *conn;
++    const char *data;
++    unsigned int len;
++    int sd;
++    int r;
++
++    /* initialize the sasl library */
++    callbacks0.id = SASL_CB_GETPATH;
++    callbacks0.proc = (sasl_callback_ft)&getpath;
++    callbacks0.context = NULL;
++    callbacks1.id = SASL_CB_LIST_END;
++    callbacks1.proc = NULL;
++    callbacks1.context = NULL;
++
++    r = sasl_client_init(callbacks);
++    if (r != SASL_OK) exit(-1);
++
++    r = sasl_client_new("test", "host.realm.test", NULL, NULL, NULL, 0, &conn);
++    if (r != SASL_OK) {
++        saslerr(r, "allocating connection state");
++        exit(-1);
++    }
++
++    r = sasl_client_start(conn, "GSSAPI", NULL, &data, &len, &chosenmech);
++    if (r != SASL_OK && r != SASL_CONTINUE) {
++	saslerr(r, "starting SASL negotiation");
++	printf("\n%s\n", sasl_errdetail(conn));
++	exit(-1);
++    }
++
++    sd = setup_socket();
++
++    while (r == SASL_CONTINUE) {
++        send_string(sd, data, len);
++        len = 8192;
++        recv_string(sd, buf, &len);
++
++	r = sasl_client_step(conn, buf, len, NULL, &data, &len);
++	if (r != SASL_OK && r != SASL_CONTINUE) {
++	    saslerr(r, "performing SASL negotiation");
++	    printf("\n%s\n", sasl_errdetail(conn));
++	    exit(-1);
++        }
++    }
++
++    if (r != SASL_OK) exit(-1);
++
++    if (len > 0) {
++        send_string(sd, data, len);
++    }
++
++    fprintf(stdout, "DONE\n");
++    fflush(stdout);
++    return 0;
++}
++
+diff --git a/tests/t_gssapi_srv.c b/tests/t_gssapi_srv.c
+new file mode 100644
+index 00000000..29f538dd
+--- /dev/null
++++ b/tests/t_gssapi_srv.c
+@@ -0,0 +1,111 @@
++/* TBD, add (C) */
++
++#include "t_common.h"
++
++#include <stdlib.h>
++#include <stdarg.h>
++#include <ctype.h>
++#include <string.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <arpa/inet.h>
++#include <saslplug.h>
++
++static int setup_socket(void)
++{
++    struct sockaddr_in addr;
++    int sock, ret, sd;
++
++    sock = socket(AF_INET, SOCK_STREAM, 0);
++    if (sock < 0) s_error("socket", 0, 0, errno);
++
++    addr.sin_family = AF_INET;
++    addr.sin_addr.s_addr = inet_addr("127.0.0.9");
++    addr.sin_port = htons(9000);
++
++    ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
++    if (ret != 0) s_error("bind", 0, 0, errno);
++
++    ret = listen(sock, 1);
++    if (ret != 0) s_error("listen", 0, 0, errno);
++
++    /* signal we are ready */
++    fprintf(stdout, "READY\n");
++    fflush(stdout);
++
++    /* block until the client connects */
++    sd = accept(sock, NULL, NULL);
++    if (sd < 0) s_error("accept", 0, 0, errno);
++
++    close(sock);
++    return sd;
++}
++
++int main(int argc __attribute__((unused)), char *argv __attribute__((unused)))
++{
++    sasl_callback_t callbacks2 = {};
++    char buf8192;
++    sasl_conn_t *conn;
++    const char *data;
++    unsigned int len;
++    int sd;
++    int r;
++
++    /* initialize the sasl library */
++    callbacks0.id = SASL_CB_GETPATH;
++    callbacks0.proc = (sasl_callback_ft)&getpath;
++    callbacks0.context = NULL;
++    callbacks1.id = SASL_CB_LIST_END;
++    callbacks1.proc = NULL;
++    callbacks1.context = NULL;
++
++    r = sasl_server_init(callbacks, "t_gssapi_srv");
++    if (r != SASL_OK) exit(-1);
++
++    r = sasl_server_new("test", "host.realm.test", NULL, NULL, NULL,
++                        callbacks, 0, &conn);
++    if (r != SASL_OK) {
++        saslerr(r, "allocating connection state");
++        exit(-1);
++    }
++
++    sd = setup_socket();
++
++    len = 8192;
++    recv_string(sd, buf, &len);
++
++    r = sasl_server_start(conn, "GSSAPI", buf, len, &data, &len);
++    if (r != SASL_OK && r != SASL_CONTINUE) {
++	saslerr(r, "starting SASL negotiation");
++	printf("\n%s\n", sasl_errdetail(conn));
++	exit(-1);
++    }
++
++    while (r == SASL_CONTINUE) {
++        send_string(sd, data, len);
++        len = 8192;
++        recv_string(sd, buf, &len);
++
++	r = sasl_server_step(conn, buf, len, &data, &len);
++	if (r != SASL_OK && r != SASL_CONTINUE) {
++	    saslerr(r, "performing SASL negotiation");
++	    printf("\n%s\n", sasl_errdetail(conn));
++	    exit(-1);
++	}
++
++    }
++
++    if (r != SASL_OK) exit(-1);
++
++    if (len > 0) {
++        send_string(sd, data, len);
++    }
++
++    fprintf(stdout, "DONE\n");
++    fflush(stdout);
++    return 0;
++}
++
+

cyrus-sasl-2.1.27-Add-support-for-setting-max-ssf-0-to-GSS-SPNEGO.patch Added

@@ -0,0 +1,95 @@
+Backport of part of Upstream PR#603 minimal part needed for interop
+
+From 0e722dd3266d5ebd0f889462cc23856fde3d21ed Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Thu, 19 Sep 2019 15:58:04 -0400
+Subject: PATCH Add support for setting max ssf 0 to GSS-SPNEGO
+
+This is needed to interop with Windows within a TLS channel.
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ m4/sasl2.m4      | 13 +++++++++++++
+ plugins/gssapi.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 57 insertions(+), 1 deletion(-)
+
+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
+index 17f5d081..60306943 100644
+--- a/m4/sasl2.m4
++++ b/m4/sasl2.m4
+@@ -287,6 +287,19 @@ if test "$gssapi" != no; then
+   AC_CHECK_FUNCS(gss_oid_equal)
+   LIBS="$cmu_save_LIBS"
+ 
++  cmu_save_LIBS="$LIBS"
++  LIBS="$LIBS $GSSAPIBASE_LIBS"
++  if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
++    AC_CHECK_DECL(GSS_KRB5_CRED_NO_CI_FLAGS_X,
++                  AC_DEFINE(HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X,1,
++                             Define if your GSSAPI implementation supports GSS_KRB5_CRED_NO_CI_FLAGS_X),,
++                  
++                    AC_INCLUDES_DEFAULT
++                    #include <gssapi/gssapi_krb5.h>
++                    )
++  fi
++  LIBS="$cmu_save_LIBS"
++
+   cmu_save_LIBS="$LIBS"
+   LIBS="$LIBS $GSSAPIBASE_LIBS"
+   AC_CHECK_FUNCS(gss_get_name_attribute)
+diff --git a/plugins/gssapi.c b/plugins/gssapi.c
+index 46de7d48..cca6cc0a 100644
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -2123,7 +2123,50 @@ static int gssapi_client_mech_step(void *conn_context,
+ 		/* We want to try for privacy */
+ 		req_flags |= GSS_C_CONF_FLAG;
+ 	    }
+-	}
++#ifdef HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X
++        /* The krb5 mechanism automatically adds INTEG and CONF flags even when
++         * not specified, this has the effect of rendering explicit requests
++         * of no confidentiality and integrity via setting maxssf 0 moot.
++         * However to interoperate with Windows machines it needs to be
++         * possible to unset these flags as Windows machines refuse to allow
++         * two layers (say TLS and GSSAPI) to both provide these services.
++         * So if we do not suppress these flags a SASL/GSS-SPNEGO negotiation
++         * over, say, LDAPS will fail against Windows Servers */
++	} else if (params->props.max_ssf == 0) {
++            gss_buffer_desc empty_buffer = GSS_C_EMPTY_BUFFER;
++            if (client_creds == GSS_C_NO_CREDENTIAL) {
++                gss_OID_set_desc mechs = { 0 };
++                gss_OID_set desired_mechs = GSS_C_NO_OID_SET;
++                if (text->mech_type != GSS_C_NO_OID) {
++                    mechs.count = 1;
++                    mechs.elements = text->mech_type;
++                    desired_mechs = &mechs;
++                }
++
++                maj_stat = gss_acquire_cred(&min_stat, GSS_C_NO_NAME,
++                                            GSS_C_INDEFINITE, desired_mechs,
++                                            GSS_C_INITIATE,
++                                            &text->client_creds, NULL, NULL);
++                if (GSS_ERROR(maj_stat)) {
++                    sasl_gss_seterror(text->utils, maj_stat, min_stat);
++                    sasl_gss_free_context_contents(text);
++                    return SASL_FAIL;
++                }
++                client_creds = text->client_creds;
++            }
++
++            maj_stat = gss_set_cred_option(&min_stat, &client_creds,
++                                           (gss_OID)GSS_KRB5_CRED_NO_CI_FLAGS_X,
++                                            &empty_buffer);
++            if (GSS_ERROR(maj_stat)) {
++                sasl_gss_seterror(text->utils, maj_stat, min_stat);
++                sasl_gss_free_context_contents(text);
++                return SASL_FAIL;
++            }
++#endif
++        }
++
++
+
+	if (params->props.security_flags & SASL_SEC_PASS_CREDENTIALS) {
+	    req_flags = req_flags |  GSS_C_DELEG_FLAG;

cyrus-sasl-2.1.27-Migration-from-BerkeleyDB.patch Added

@@ -0,0 +1,566 @@
+diff -up cyrus-sasl-2.1.27/configure.ac.frombdb cyrus-sasl-2.1.27/configure.ac
+--- cyrus-sasl-2.1.27/configure.ac.frombdb	2021-04-28 15:36:37.313675329 +0200
++++ cyrus-sasl-2.1.27/configure.ac	2021-04-28 15:36:37.320675385 +0200
+@@ -1091,6 +1091,9 @@ AC_SUBST(SASL_STATIC_SRCS)
+ AC_SUBST(SASL_STATIC_OBJS)
+ AC_SUBST(SASL_STATIC_LIBS)
+ 
++CYRUS_BERKELEY_DB_STATIC_LIB()
++AC_SUBST(BDB_STATIC_LIBADD)
++
+ AC_ARG_WITH(plugindir,   --with-plugindir=DIR    set the directory where plugins will
+                           be found LIBDIR/sasl2 ,
+   plugindir=$withval,
+diff -up cyrus-sasl-2.1.27/m4/berkdb.m4.frombdb cyrus-sasl-2.1.27/m4/berkdb.m4
+--- cyrus-sasl-2.1.27/m4/berkdb.m4.frombdb	2016-01-29 18:35:35.000000000 +0100
++++ cyrus-sasl-2.1.27/m4/berkdb.m4	2021-05-04 15:58:12.266748283 +0200
+@@ -286,3 +286,10 @@ AC_DEFUN(CYRUS_BERKELEY_DB_CHK,
+ 
+ 	CPPFLAGS=$cmu_save_CPPFLAGS
+ )
++
++AC_DEFUN(CYRUS_BERKELEY_DB_STATIC_LIB,
++
++BDB_STATIC_LIBADD="/dev/null -lpthread"
++AC_CHECK_FILE(/usr/lib64/libdb-5.3.a,BDB_STATIC_LIBADD="/usr/lib64/libdb-5.3.a -lpthread ",)
++AC_CHECK_FILE(/usr/lib/libdb-5.3.a,BDB_STATIC_LIBADD="/usr/lib/libdb-5.3.a -lpthread",)
++)
+diff -up cyrus-sasl-2.1.27/m4/sasldb.m4.frombdb cyrus-sasl-2.1.27/m4/sasldb.m4
+--- cyrus-sasl-2.1.27/m4/sasldb.m4.frombdb	2017-07-13 20:45:19.000000000 +0200
++++ cyrus-sasl-2.1.27/m4/sasldb.m4	2021-05-04 15:51:20.827090074 +0200
+@@ -111,7 +111,7 @@ AC_MSG_RESULT($dblib)
+ SASL_DB_BACKEND="db_${dblib}.lo"
+ SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
+ SASL_DB_BACKEND_STATIC_SRCS="\$(top_srcdir)/sasldb/db_${dblib}.c \$(top_srcdir)/sasldb/allockey.c"
+-SASL_DB_UTILS="saslpasswd2\$(EXEEXT) sasldblistusers2\$(EXEEXT)"
++SASL_DB_UTILS="cyrusbdb2current\$(EXEEXT) saslpasswd2\$(EXEEXT) sasldblistusers2\$(EXEEXT)"
+ SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
+ 
+ case "$dblib" in
+diff -up cyrus-sasl-2.1.27/sasldb/db_gdbm.c.frombdb cyrus-sasl-2.1.27/sasldb/db_gdbm.c
+--- cyrus-sasl-2.1.27/sasldb/db_gdbm.c.frombdb	2017-07-13 14:34:03.000000000 +0200
++++ cyrus-sasl-2.1.27/sasldb/db_gdbm.c	2021-06-04 13:04:24.098206887 +0200
+@@ -67,6 +67,7 @@ int _sasldb_getdata(const sasl_utils_t *
+   void *cntxt;
+   sasl_getopt_t *getopt;
+   const char *path = SASL_DB_PATH;
++  int fetch_errno = 0;
+ 
+   if (!utils) return SASL_BADPARAM;
+   if (!authid || !propName || !realm || !out || !max_out) {
+@@ -99,6 +100,9 @@ int _sasldb_getdata(const sasl_utils_t *
+   }
+   db = gdbm_open((char *)path, 0, GDBM_READER, S_IRUSR | S_IWUSR, NULL);
+   if (! db) {
++      utils->log(conn, SASL_LOG_ERR,
++		 "SASL error opening password file. "
++		 "Have you performed the migration from db2 using cyrusbdb2current?\n");
+       utils->seterror(cntxt, 0, "Could not open %s: gdbm_errno=%d",
+ 		      path, gdbm_errno);
+       result = SASL_FAIL;
+@@ -107,7 +111,7 @@ int _sasldb_getdata(const sasl_utils_t *
+   gkey.dptr = key;
+   gkey.dsize = key_len;
+   gvalue = gdbm_fetch(db, gkey);
+-  int fetch_errno = gdbm_errno;
++  fetch_errno = gdbm_errno;
+ 
+   gdbm_close(db);
+   if (! gvalue.dptr) {
+@@ -186,7 +191,8 @@ int _sasldb_putdata(const sasl_utils_t *
+   if (! db) {
+       utils->log(conn, SASL_LOG_ERR,
+ 		 "SASL error opening password file. "
+-		 "Do you have write permissions?\n");
++		 "Do you have write permissions?\n"
++		 "Have you performed the migration from db2 using cyrusbdb2current?\n");
+       utils->seterror(conn, 0, "Could not open %s for write: gdbm_errno=%d",
+                      path, gdbm_errno);
+       result = SASL_FAIL;
+@@ -298,6 +302,9 @@ sasldb_handle _sasldb_getkeyhandle(const
+     db = gdbm_open((char *)path, 0, GDBM_READER, S_IRUSR | S_IWUSR, NULL);
+ 
+     if(!db) {
++        utils->log(conn, SASL_LOG_ERR,
++		 "SASL error opening password file. "
++		 "Have you performed the migration from db2 using cyrusbdb2current?\n");
+         utils->seterror(conn, 0, "Could not open %s: gdbm_errno=%d",
+ 			 path, gdbm_errno);
+ 	return NULL;
+diff -up cyrus-sasl-2.1.27/utils/cyrusbdb2current.8.frombdb cyrus-sasl-2.1.27/utils/cyrusbdb2current.8
+--- cyrus-sasl-2.1.27/utils/cyrusbdb2current.8.frombdb	2021-04-28 15:36:37.321675394 +0200
++++ cyrus-sasl-2.1.27/utils/cyrusbdb2current.8	2021-04-28 15:36:37.321675394 +0200
+@@ -0,0 +1,159 @@
++.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
++.\"
++.\" Standard preamble:
++.\" ========================================================================
++.de Sp \" Vertical space (when we can't use .PP)
++.if t .sp .5v
++.if n .sp
++..
++.de Vb \" Begin verbatim text
++.ft CW
++.nf
++.ne \\$1
++..
++.de Ve \" End verbatim text
++.ft R
++.fi
++..
++.\" Set up some character translations and predefined strings.  \*(-- will
++.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
++.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
++.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
++.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
++.\" nothing in troff, for use with C<>.
++.tr \(*W-
++.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
++.ie n \{\
++.    ds -- \(*W-
++.    ds PI pi
++.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
++.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
++.    ds L" ""
++.    ds R" ""
++.    ds C` ""
++.    ds C' ""
++'br\}
++.el\{\
++.    ds -- \|\(em\|
++.    ds PI \(*p
++.    ds L" ``
++.    ds R" ''
++.    ds C`
++.    ds C'
++'br\}
++.\"
++.\" Escape single quotes in literal strings from groff's Unicode transform.
++.ie \n(.g .ds Aq \(aq
++.el       .ds Aq '
++.\"
++.\" If the F register is >0, we'll generate index entries on stderr for
++.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
++.\" entries marked with X<> in POD.  Of course, you'll have to process the
++.\" output yourself in some meaningful fashion.
++.\"
++.\" Avoid warning from groff about undefined register 'F'.
++.de IX
++..
++.nr rF 0
++.if \n(.g .if rF .nr rF 1
++.if (\n(rF:(\n(.g==0)) \{\
++.    if \nF \{\
++.        de IX
++.        tm Index:\\$1\t\\n%\t"\\$2"
++..
++.        if !\nF==2 \{\
++.            nr % 0
++.            nr F 2
++.        \}
++.    \}
++.\}
++.rr rF
++.\"
++.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
++.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
++.    \" fudge factors for nroff and troff
++.if n \{\
++.    ds #H 0
++.    ds #V .8m
++.    ds #F .3m
++.    ds # \f1
++.    ds # \fP
++.\}
++.if t \{\
++.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
++.    ds #V .6m
++.    ds #F 0
++.    ds # \&
++.    ds # \&
++.\}
++.    \" simple accents for nroff and troff
++.if n \{\
++.    ds ' \&
++.    ds ` \&
++.    ds ^ \&
++.    ds , \&
++.    ds ~ ~
++.    ds /
++.\}
++.if t \{\
++.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
++.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
++.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
++.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
++.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
++.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
++.\}
++.    \" troff and (daisy-wheel) nroff accents
++.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
++.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
++.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#\z\(de\v'.3n'\h'|\\n:u'\*(#
++.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
++.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
++.ds th \*(#\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#
++.ds Th \*(#\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#
++.ds ae a\h'-(\w'a'u*4/10)'e
++.ds Ae A\h'-(\w'A'u*4/10)'E
++.    \" corrections for vroff
++.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
++.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
++.    \" for low resolution devices (crt and lpr)
++.if \n(.H>23 .if \n(.V>19 \
++\{\
++.    ds : e
++.    ds 8 ss
++.    ds o a
++.    ds d- d\h'-1'\(ga
++.    ds D- D\h'-1'\(hy
++.    ds th \o'bp'
++.    ds Th \o'LP'
++.    ds ae ae
++.    ds Ae AE
++.\}
++.rm # # #H #V #F C
++.\" ========================================================================
++.\"
++.IX Title "CYRUSBDB2CURRENT 1"
++.TH CYRUSBDB2CURRENT 1 "2021-04-28" "perl v5.30.3" "User Contributed Perl Documentation"
++.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
++.\" way too many mistakes in technical documents.
++.if n .ad l
++.nh
++.SH "NAME"
++cyrusbdb2current \- command\-line utility converting the SASLDB database from
++BerkeleyDB to the database format currently used bys sasldb.
++.SH "SYNOPSIS"
++.IX Header "SYNOPSIS"
++cyrusbdb2current <sasldb_old_path> <sasldb_new_path>
++.SH "DESCRIPTION"
++.IX Header "DESCRIPTION"
++\&\fBcyrusbdb2current\fR converts the current sasldb database from BerkeleyDB format to the
++currently used database format. It is \fB\s-1STRONGLY RECOMMENDED\s0\fR to make a backup
++of the current database before the conversion.
++.PP
++We expect that the old path is \fB/etc/sasldb2\fR and the new one is
++\&\fB/etc/sasl2/sasldb2\fR
++.SH "SEE ALSO"
++.IX Header "SEE ALSO"
++\&\fBsaslpasswd2\fR\|(8)
++.PP
++rfc4422 \- Simple Authentication and Security Layer (\s-1SASL\s0)
+diff -up cyrus-sasl-2.1.27/utils/cyrusbdb2current.c.frombdb cyrus-sasl-2.1.27/utils/cyrusbdb2current.c
+--- cyrus-sasl-2.1.27/utils/cyrusbdb2current.c.frombdb	2021-04-28 15:36:37.321675394 +0200
++++ cyrus-sasl-2.1.27/utils/cyrusbdb2current.c	2021-04-28 15:36:37.321675394 +0200
+@@ -0,0 +1,282 @@
++#include <config.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++#include <sasl.h>
++#include <saslplug.h>
++#include "../sasldb/sasldb.h"
++
++/* Cheating to make the utils work out right */
++extern const sasl_utils_t *sasl_global_utils;
++sasl_conn_t *globalconn;
++
++typedef void *listcb_t(const char *, const char *, const char *,
++		       const char *, unsigned);
++
++void listusers_cb(const char *authid, const char *realm,
++		  const char *propName, const char *secret,
++		  unsigned seclen)
++{
++    if (!authid || !propName || !realm) {
++	fprintf(stderr,"userlist callback has bad param");
++	return;
++    }
++
++    /* the entries that just say the mechanism exists */
++    if (strlen(authid)==0) return;
++
++    printf("Converting: %s@%s (%s)...",authid,realm,propName);
++
++    _sasldb_putdata(sasl_global_utils, globalconn,
++		    authid, realm, propName,
++		    secret, seclen);
++
++    printf("ok\n");
++}
++
++/*
++ * List all users in database
++ */
++
++#include <db.h>
++
++#define DB_VERSION_FULL ((DB_VERSION_MAJOR << 24) | (DB_VERSION_MINOR << 16) | DB_VERSION_PATCH)
++/*
++ * Open the database
++ *
++ */
++static int berkeleydb_open(const char *path,DB **mbdb)
++{
++    int ret;
++
++#if DB_VERSION_FULL < 0x03000000
++    ret = db_open(path, DB_HASH, DB_CREATE, 0664, NULL, NULL, mbdb);
++#else /* DB_VERSION_FULL < 0x03000000 */
++    ret = db_create(mbdb, NULL, 0);
++    if (ret == 0 && *mbdb != NULL)
++    {
++#if DB_VERSION_FULL >= 0x04010000
++	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
++#else
++	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
++#endif
++	if (ret != 0)
++	{
++	    (void) (*mbdb)->close(*mbdb, 0);
++	    *mbdb = NULL;
++	}
++    }
++#endif /* DB_VERSION_FULL < 0x03000000 */
++
++    if (ret != 0) {
++	fprintf(stderr,"Error opening password file %s\n", path);
++	return SASL_FAIL;
++    }
++
++    return SASL_OK;
++}
++
++/*
++ * Close the database
++ *
++ */
++
++static void berkeleydb_close(DB *mbdb)
++{
++    int ret;
++    
++    ret = mbdb->close(mbdb, 0);
++    if (ret!=0) {
++	fprintf(stderr,"error closing sasldb: %s",
++		db_strerror(ret));
++    }
++}
++
++int listusers(const char *path, listcb_t *cb)
++{
++    int result;
++    DB *mbdb = NULL;
++    DBC *cursor;
++    DBT key, data;
++
++    /* open the db */
++    result=berkeleydb_open(path, &mbdb);
++    if (result!=SASL_OK) goto cleanup;
++
++    /* make cursor */
++#if DB_VERSION_FULL < 0x03060000
++    result = mbdb->cursor(mbdb, NULL,&cursor); 
++#else
++    result = mbdb->cursor(mbdb, NULL,&cursor, 0); 
++#endif /* DB_VERSION_FULL < 0x03060000 */
++
++    if (result!=0) {
++	fprintf(stderr,"Making cursor failure: %s\n",db_strerror(result));
++      result = SASL_FAIL;
++      goto cleanup;
++    }
++
++    memset(&key,0, sizeof(key));
++    memset(&data,0,sizeof(data));
++
++    /* loop thru */
++    result = cursor->c_get(cursor, &key, &data,
++			   DB_FIRST);
++
++    while (result != DB_NOTFOUND)
++    {
++	char *authid;
++	char *realm;
++	char *tmp;
++	unsigned int len;
++	char prop1024;
++	int numnulls = 0;
++	unsigned int lup;
++
++	/* make sure there are exactly 2 null's */
++	for (lup=0;lup<key.size;lup++)
++	    if (((char *)key.data)lup=='\0')
++		numnulls++;
++
++	if (numnulls != 2) {
++	    fprintf(stderr,"warning: probable database corruption\n");
++	    result = cursor->c_get(cursor, &key, &data, DB_NEXT);
++	    continue;
++	}
++
++	authid = key.data;
++	realm  = authid + strlen(authid)+1;
++	tmp    = realm + strlen(realm)+1;
++	len = key.size - (tmp - authid);
++
++	/* make sure we have enough space of prop */
++	if (len >=sizeof(prop)) {
++	    fprintf(stderr,"warning: absurdly long prop name\n");
++	    result = cursor->c_get(cursor, &key, &data, DB_NEXT);
++	    continue;
++	}
++
++	memcpy(prop, tmp, key.size - (tmp - ((char *)key.data)));
++	propkey.size - (tmp - ((char *)key.data)) = '\0';
++
++	if (*authid) {
++	    /* don't check return values */
++	    cb(authid,realm,prop,data.data,data.size);
++	}
++
++	result = cursor->c_get(cursor, &key, &data, DB_NEXT);
++    }
++
++    if (result != DB_NOTFOUND) {
++	fprintf(stderr,"failure: %s\n",db_strerror(result));
++	result = SASL_FAIL;
++	goto cleanup;
++    }
++
++    result = cursor->c_close(cursor);
++    if (result != 0) {
++        result = SASL_FAIL;
++        goto cleanup;
++    }
++
++    result = SASL_OK;
++
++ cleanup:
++
++    if (mbdb != NULL) berkeleydb_close(mbdb);
++    return result;
++}
++
++
++char *db = NULL, *db_new=NULL;
++
++int good_getopt(void *context __attribute__((unused)), 
++		const char *plugin_name __attribute__((unused)), 
++		const char *option,
++		const char **result,
++		unsigned *len)
++{
++    if (db_new && !strcmp(option, "sasldb_path")) {
++	*result = db_new;
++	if (len)
++	    *len = strlen(db_new);
++	return SASL_OK;
++    }
++
++    return SASL_FAIL;
++}
++
++static struct sasl_callback goodsasl_cb = {
++    { SASL_CB_GETOPT, (int (*)(void))&good_getopt, NULL },
++    { SASL_CB_LIST_END, NULL, NULL }
++};
++
++int main(int argc, char **argv)
++{
++    int result;
++    FILE *f;
++
++    if (argc != 3) {
++	fprintf(stderr, "Usage: cyrusbdb2current old_sasldb new_sasldb\n");
++	fprintf(stderr, "old_sasldb is presumably /etc/sasldb2\n");
++       	fprintf(stderr, "new_sasldb is presumably /etc/sasl2/sasldb2\n");
++	return 1;
++    }
++
++    db = argv1;
++    db_new = argv2;
++
++    if (strcmp(db, db_new) == 0) {
++	fprintf(stderr, "Old and new files should be different\n");
++	return 1;
++    }
++
++
++    f = fopen(db_new, "rb");
++    if (f != NULL) {
++	fprintf(stderr, "The specified target file %s already exists\n", db_new);
++	fclose(f);
++	return 1;
++    }
++
++    result = sasl_server_init(goodsasl_cb, "dbconverter");
++    if (result != SASL_OK) {
++	fprintf(stderr, "couldn't init saslv2\n");
++	return 1;
++    }
++
++    result = sasl_server_new("sasldb",
++			     "localhost",
++			     NULL,
++			     NULL,
++			     NULL,
++			     NULL,
++			     0,
++			     &globalconn);
++    if (result != SASL_OK) {
++	fprintf(stderr, "couldn't create globalconn\n");
++	return 1;
++    }
++
++    if(_sasl_check_db(sasl_global_utils,globalconn) != SASL_OK) {
++	fprintf(stderr, "target DB %s is not OK\n", db_new);
++	return 1;
++    }
++
++    printf("\nThis program will take the sasldb file specified on the\n"
++           "command line and convert it to a new sasldb specified\n"
++           "on the command line. It is STRONGLY RECOMMENDED that you\n"
++           "backup sasldb before allowing this program to run\n\n"
++	   "We are going to convert %s and our output will be in %s\n\n"
++           "Press return to continue\n", db, db_new);
++
++    getchar();
++
++    listusers(db, (listcb_t *) &listusers_cb);
++
++    sasl_dispose(&globalconn);
++    sasl_done();
++
++    exit(0);
++}
+diff -up cyrus-sasl-2.1.27/utils/Makefile.am.frombdb cyrus-sasl-2.1.27/utils/Makefile.am
+--- cyrus-sasl-2.1.27/utils/Makefile.am.frombdb	2018-10-05 16:40:16.000000000 +0200
++++ cyrus-sasl-2.1.27/utils/Makefile.am	2021-04-28 15:36:37.321675394 +0200
+@@ -46,14 +46,14 @@ all_sasl_libs = ../lib/libsasl2.la $(SAS
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ 
+ sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
+-EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer
++EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer cyrusbdb2current
+ 
+ noinst_PROGRAMS = dbconverter-2
+ 
+ if NO_SASL_DB_MANS
+ man_MANS = 
+ else
+-man_MANS = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8
++man_MANS = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 cyrusbdb2current.8
+ endif
+ 
+ saslpasswd2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
+@@ -63,6 +63,7 @@ sasldblistusers2_SOURCES = sasldblistuse
+ dbconverter_2_LDADD = ../sasldb/libsasldb.la $(all_sasl_libs)
+ pluginviewer_LDADD = $(all_sasl_libs)
+ pluginviewer_SOURCES = pluginviewer.c
++cyrusbdb2current_LDADD = ../sasldb/libsasldb.la @BDB_STATIC_LIBADD@ $(all_sasl_libs)
+ 
+ testsuite_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@
+

cyrus-sasl-2.1.27-coverity.patch Added

@@ -0,0 +1,56 @@
+diff -up cyrus-sasl-2.1.27/include/makemd5.c.coverity cyrus-sasl-2.1.27/include/makemd5.c
+--- cyrus-sasl-2.1.27/include/makemd5.c.coverity	2021-04-12 15:10:25.421431535 +0200
++++ cyrus-sasl-2.1.27/include/makemd5.c	2021-04-12 15:56:46.752827737 +0200
+@@ -107,7 +107,6 @@ my_strupr(char *s)
+     }	
+ }
+ 
+-
+ #define BITSIZE(TYPE)						\
+ {								\
+     int b = 0; TYPE x = 1, zero = 0; char *pre = "U";		\
+@@ -129,6 +128,8 @@ my_strupr(char *s)
+ static void
+ try_signed(FILE *f, int len)
+ {
++/* Local macros for not-installed program. No coverity/compiler issues! */
++#pragma GCC diagnostic ignored "-Wformat-overflow"
+ #ifdef HAVE_INT8_T
+     BITSIZE(int8_t);
+ #endif
+@@ -149,6 +150,7 @@ try_signed(FILE *f, int len)
+     BITSIZE(long long);
+ #endif
+     fprintf(f, "/* There is no %d bit type */\n", len);
++#pragma GCC pop
+ }
+ 
+ static void
+diff -up cyrus-sasl-2.1.27/saslauthd/lak.c.coverity cyrus-sasl-2.1.27/saslauthd/lak.c
+--- cyrus-sasl-2.1.27/saslauthd/lak.c.coverity	2018-11-08 18:29:57.000000000 +0100
++++ cyrus-sasl-2.1.27/saslauthd/lak.c	2021-04-12 15:10:25.433431630 +0200
+@@ -337,9 +337,9 @@ static int lak_config_read(
+          EMPTY(conf->group_search_base) )
+         strlcpy(conf->group_search_base, conf->search_base, LAK_DN_LEN);
+         
+-	fclose(infile);
++    fclose(infile);
+ 
+-	return LAK_OK;
++    return LAK_OK;
+ }
+ 
+ static int lak_config_int(
+diff -up cyrus-sasl-2.1.27/saslauthd/saslauthd-main.c.coverity cyrus-sasl-2.1.27/saslauthd/saslauthd-main.c
+--- cyrus-sasl-2.1.27/saslauthd/saslauthd-main.c.coverity	2018-01-19 15:13:40.000000000 +0100
++++ cyrus-sasl-2.1.27/saslauthd/saslauthd-main.c	2021-04-12 15:10:25.433431630 +0200
+@@ -833,7 +833,8 @@ void detach_tty() {
+     }
+     
+     logger(L_INFO, L_FUNC, "master pid is: %lu", (unsigned long)master_pid);
+-    
++    /* null_fd expected to be more than 2, so it is closed after dups, no leaks occur */
++    /* coverityleaked_handle : FALSE*/
+     return;
+ }
+

cyrus-sasl-2.1.27-cumulative-digestmd5.patch Added

@@ -0,0 +1,554 @@
+diff -uPr cyrus-sasl-2.1.27/plugins/digestmd5.c cyrus-sasl-2.1.27.digestmd5/plugins/digestmd5.c
+--- cyrus-sasl-2.1.27/plugins/digestmd5.c	2021-09-30 17:13:06.573093526 -0400
++++ cyrus-sasl-2.1.27.digestmd5/plugins/digestmd5.c	2021-09-30 17:26:31.818378442 -0400
+@@ -80,6 +80,12 @@
+ # endif
+ #endif /* WITH_DES */
+ 
++/* legacy provider with openssl 3.0 */
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++#  include <openssl/provider.h>
++#  include <openssl/crypto.h>
++#endif
++
+ #ifdef WIN32
+ # include <winsock2.h>
+ #else /* Unix */
+@@ -170,6 +176,12 @@
+ 
+ typedef struct cipher_context cipher_context_t;
+ 
++typedef struct crypto_context {
++    void *libctx;
++    cipher_context_t *enc_ctx;
++    cipher_context_t *dec_ctx;
++} crypto_context_t;
++
+ /* cached auth info used for fast reauth */
+ typedef struct reauth_entry {
+     char *authid;
+@@ -254,12 +266,12 @@
+     decode_context_t decode_context;
+ 
+     /* if privacy mode is used use these functions for encode and decode */
++    char *cipher_name;
+     cipher_function_t *cipher_enc;
+     cipher_function_t *cipher_dec;
+     cipher_init_t *cipher_init;
+     cipher_free_t *cipher_free;
+-    struct cipher_context *cipher_enc_context;
+-    struct cipher_context *cipher_dec_context;
++    crypto_context_t crypto;
+ } context_t;
+ 
+ struct digest_cipher {
+@@ -888,7 +900,7 @@
+ 		    char *output,
+ 		    unsigned *outputlen)
+ {
+-    des_context_t *c = (des_context_t *) text->cipher_dec_context;
++    des_context_t *c = (des_context_t *) text->crypto.dec_ctx;
+     int padding, p;
+     
+     des_ede2_cbc_encrypt((void *) input,
+@@ -925,7 +937,7 @@
+ 		    char *output,
+ 		    unsigned *outputlen)
+ {
+-    des_context_t *c = (des_context_t *) text->cipher_enc_context;
++    des_context_t *c = (des_context_t *) text->crypto.enc_ctx;
+     int len;
+     int paddinglen;
+     
+@@ -973,7 +985,7 @@
+ 	return SASL_FAIL;
+     memcpy(c->ivec, ((char *) enckey) + 8, 8);
+ 
+-    text->cipher_enc_context = (cipher_context_t *) c;
++    text->crypto.enc_ctx = (cipher_context_t *) c;
+ 
+     /* setup dec context */
+     c++;
+@@ -987,7 +999,7 @@
+     
+     memcpy(c->ivec, ((char *) deckey) + 8, 8);
+ 
+-    text->cipher_dec_context = (cipher_context_t *) c;
++    text->crypto.dec_ctx = (cipher_context_t *) c;
+     
+     return SASL_OK;
+ }
+@@ -1006,7 +1018,7 @@
+ 		   char *output,
+ 		   unsigned *outputlen)
+ {
+-    des_context_t *c = (des_context_t *) text->cipher_dec_context;
++    des_context_t *c = (des_context_t *) text->crypto.dec_ctx;
+     int p, padding = 0;
+     
+     des_cbc_encrypt((void *) input,
+@@ -1046,7 +1058,7 @@
+ 		   char *output,
+ 		   unsigned *outputlen)
+ {
+-    des_context_t *c = (des_context_t *) text->cipher_enc_context;
++    des_context_t *c = (des_context_t *) text->crypto.enc_ctx;
+     int len;
+     int paddinglen;
+   
+@@ -1093,7 +1105,7 @@
+ 
+     memcpy(c->ivec, ((char *) enckey) + 8, 8);
+     
+-    text->cipher_enc_context = (cipher_context_t *) c;
++    text->crypto.enc_ctx = (cipher_context_t *) c;
+ 
+     /* setup dec context */
+     c++;
+@@ -1102,60 +1114,143 @@
+ 
+     memcpy(c->ivec, ((char *) deckey) + 8, 8);
+     
+-    text->cipher_dec_context = (cipher_context_t *) c;
++    text->crypto.dec_ctx = (cipher_context_t *) c;
+ 
+     return SASL_OK;
+ }
+ 
+ static void free_des(context_t *text)
+ {
+-    /* free des contextss. only cipher_enc_context needs to be free'd,
+-       since cipher_dec_context was allocated at the same time. */
+-    if (text->cipher_enc_context) text->utils->free(text->cipher_enc_context);
++    /* free des contextss. only enc_ctx needs to be free'd,
++       since dec_cxt was allocated at the same time. */
++    if (text->crypto.enc_ctx) {
++        text->utils->free(text->crypto.enc_ctx);
++    }
+ }
+ 
+ #endif /* WITH_DES */
+ 
+ #ifdef WITH_RC4
+-#ifdef HAVE_OPENSSL
+ #include <openssl/evp.h>
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++typedef struct ossl3_library_context {
++    OSSL_LIB_CTX *libctx;
++    OSSL_PROVIDER *legacy_provider;
++    OSSL_PROVIDER *default_provider;
++} ossl3_context_t;
++
++static int init_ossl3_ctx(context_t *text)
++{
++    ossl3_context_t *ctx = text->utils->malloc(sizeof(ossl3_context_t));
++    if (!ctx) return SASL_NOMEM;
++
++    ctx->libctx = OSSL_LIB_CTX_new();
++    if (!ctx->libctx) {
++        text->utils->free(ctx);
++        return SASL_FAIL;
++    }
++
++    /* Load both legacy and default provider as both may be needed */
++    /* if they fail keep going and an error will be raised when we try to
++     * fetch the cipher later */
++    ctx->legacy_provider = OSSL_PROVIDER_load(ctx->libctx, "legacy");
++    ctx->default_provider = OSSL_PROVIDER_load(ctx->libctx, "default");
++    text->crypto.libctx = (void *)ctx;
++
++    return SASL_OK;
++}
++
++static void free_ossl3_ctx(context_t *text)
++{
++    ossl3_context_t *ctx;
++
++    if (!text->crypto.libctx) return;
++
++    ctx = (ossl3_context_t *)text->crypto.libctx;
++
++    if (ctx->legacy_provider) OSSL_PROVIDER_unload(ctx->legacy_provider);
++    if (ctx->default_provider) OSSL_PROVIDER_unload(ctx->default_provider);
++    if (ctx->libctx) OSSL_LIB_CTX_free(ctx->libctx);
++
++    text->utils->free(ctx);
++    text->crypto.libctx = NULL;
++}
++#endif
++
+ static void free_rc4(context_t *text)
+ {
+-    if (text->cipher_enc_context) {
+-        EVP_CIPHER_CTX_free((EVP_CIPHER_CTX *)text->cipher_enc_context);
+-        text->cipher_enc_context = NULL;
+-    }
+-    if (text->cipher_dec_context) {
+-        EVP_CIPHER_CTX_free((EVP_CIPHER_CTX *)text->cipher_dec_context);
+-        text->cipher_dec_context = NULL;
++    if (text->crypto.enc_ctx) {
++        EVP_CIPHER_CTX_free((EVP_CIPHER_CTX *)text->crypto.enc_ctx);
++        text->crypto.enc_ctx = NULL;
++    }
++    if (text->crypto.dec_ctx) {
++        EVP_CIPHER_CTX_free((EVP_CIPHER_CTX *)text->crypto.dec_ctx);
++        text->crypto.dec_ctx = NULL;
+     }
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++    free_ossl3_ctx(text);
++#endif
+ }
+ 
+ static int init_rc4(context_t *text,
+ 		    unsigned char enckey16,
+ 		    unsigned char deckey16)
+ {
+     EVP_CIPHER_CTX *ctx;
+     int rc;
+ 
+-    ctx = EVP_CIPHER_CTX_new();
+-    if (ctx == NULL) return SASL_NOMEM;
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++    EVP_CIPHER *cipher;
++    ossl3_context_t *ossl3_ctx;
+ 
+-    rc = EVP_EncryptInit_ex(ctx, EVP_rc4(), NULL, enckey, NULL);
+-    if (rc != 1) return SASL_FAIL;
++    rc = init_ossl3_ctx(text);
++    if (rc != SASL_OK) return rc;
++
++    ossl3_ctx = (ossl3_context_t *)text->crypto.libctx;
++    cipher = EVP_CIPHER_fetch(ossl3_ctx->libctx, "RC4", "");
++#else
++    const EVP_CIPHER *cipher;
++    cipher = EVP_rc4();
++#endif
+ 
+-    text->cipher_enc_context = (void *)ctx;
+ 
+     ctx = EVP_CIPHER_CTX_new();
+-    if (ctx == NULL) return SASL_NOMEM;
++    if (ctx == NULL) {
++        rc = SASL_NOMEM;
++        goto done;
++    }
+ 
+-    rc = EVP_DecryptInit_ex(ctx, EVP_rc4(), NULL, deckey, NULL);
+-    if (rc != 1) return SASL_FAIL;
++    rc = EVP_EncryptInit_ex(ctx, cipher, NULL, enckey, NULL);
++    if (rc != 1) {
++        rc = SASL_FAIL;
++        goto done;
++    }
++    text->crypto.enc_ctx = (void *)ctx;
+ 
+-    text->cipher_dec_context = (void *)ctx;
++    ctx = EVP_CIPHER_CTX_new();
++    if (ctx == NULL) {
++        rc = SASL_NOMEM;
++        goto done;
++    }
+ 
+-    return SASL_OK;
++    rc = EVP_DecryptInit_ex(ctx, cipher, NULL, deckey, NULL);
++    if (rc != 1) {
++        rc = SASL_FAIL;
++        goto done;
++    }
++    text->crypto.dec_ctx = (void *)ctx;
++
++    rc = SASL_OK;
++
++done:
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++    EVP_CIPHER_free(cipher);
++#endif
++    if (rc != SASL_OK) {
++        free_rc4(text);
++    }
++    return rc;
+ }
+ 
+ static int dec_rc4(context_t *text,
+@@ -1169,14 +1260,14 @@
+     int rc;
+ 
+     /* decrypt the text part & HMAC */
+-    rc = EVP_DecryptUpdate((EVP_CIPHER_CTX *)text->cipher_dec_context,
++    rc = EVP_DecryptUpdate((EVP_CIPHER_CTX *)text->crypto.dec_ctx,
+                            (unsigned char *)output, &len,
+                            (const unsigned char *)input, inputlen);
+     if (rc != 1) return SASL_FAIL;
+ 
+     *outputlen = len;
+ 
+-    rc = EVP_DecryptFinal_ex((EVP_CIPHER_CTX *)text->cipher_dec_context,
++    rc = EVP_DecryptFinal_ex((EVP_CIPHER_CTX *)text->crypto.dec_ctx,
+                              (unsigned char *)output + len, &len);
+     if (rc != 1) return SASL_FAIL;
+ 
+@@ -1198,7 +1289,7 @@
+     int len;
+     int rc;
+     /* encrypt the text part */
+-    rc = EVP_EncryptUpdate((EVP_CIPHER_CTX *)text->cipher_enc_context,
++    rc = EVP_EncryptUpdate((EVP_CIPHER_CTX *)text->crypto.enc_ctx,
+                            (unsigned char *)output, &len,
+                            (const unsigned char *)input, inputlen);
+     if (rc != 1) return SASL_FAIL;
+@@ -1206,14 +1297,14 @@
+     *outputlen = len;
+ 
+     /* encrypt the `MAC part */
+-    rc = EVP_EncryptUpdate((EVP_CIPHER_CTX *)text->cipher_enc_context,
++    rc = EVP_EncryptUpdate((EVP_CIPHER_CTX *)text->crypto.enc_ctx,
+                            (unsigned char *)output + *outputlen, &len,
+                            digest, 10);
+     if (rc != 1) return SASL_FAIL;
+ 
+     *outputlen += len;
+ 
+-    rc = EVP_EncryptFinal_ex((EVP_CIPHER_CTX *)text->cipher_enc_context,
++    rc = EVP_EncryptFinal_ex((EVP_CIPHER_CTX *)text->crypto.enc_ctx,
+                              (unsigned char *)output + *outputlen, &len);
+     if (rc != 1) return SASL_FAIL;
+ 
+@@ -1221,194 +1312,11 @@
+ 
+     return SASL_OK;
+ }
+-#else
+-/* quick generic implementation of RC4 */
+-struct rc4_context_s {
+-    unsigned char sbox256;
+-    int i, j;
+-};
+-
+-typedef struct rc4_context_s rc4_context_t;
+-
+-static void rc4_init(rc4_context_t *text,
+-		     const unsigned char *key,
+-		     unsigned keylen)
+-{
+-    int i, j;
+-    
+-    /* fill in linearly s0=0 s1=1... */
+-    for (i=0;i<256;i++)
+-	text->sboxi=i;
+-    
+-    j=0;
+-    for (i = 0; i < 256; i++) {
+-	unsigned char tmp;
+-	/* j = (j + Si + Ki) mod 256 */
+-	j = (j + text->sboxi + keyi % keylen) % 256;
+-	
+-	/* swap Si and Sj */
+-	tmp = text->sboxi;
+-	text->sboxi = text->sboxj;
+-	text->sboxj = tmp;
+-    }
+-    
+-    /* counters initialized to 0 */
+-    text->i = 0;
+-    text->j = 0;
+-}
+-
+-static void rc4_encrypt(rc4_context_t *text,
+-			const char *input,
+-			char *output,
+-			unsigned len)
+-{
+-    int tmp;
+-    int i = text->i;
+-    int j = text->j;
+-    int t;
+-    int K;
+-    const char *input_end = input + len;
+-    
+-    while (input < input_end) {
+-	i = (i + 1) % 256;
+-	
+-	j = (j + text->sboxi) % 256;
+-	
+-	/* swap Si and Sj */
+-	tmp = text->sboxi;
+-	text->sboxi = text->sboxj;
+-	text->sboxj = tmp;
+-	
+-	t = (text->sboxi + text->sboxj) % 256;
+-	
+-	K = text->sboxt;
+-	
+-	/* byte K is Xor'ed with plaintext */
+-	*output++ = *input++ ^ K;
+-    }
+-    
+-    text->i = i;
+-    text->j = j;
+-}
+-
+-static void rc4_decrypt(rc4_context_t *text,
+-			const char *input,
+-			char *output,
+-			unsigned len)
+-{
+-    int tmp;
+-    int i = text->i;
+-    int j = text->j;
+-    int t;
+-    int K;
+-    const char *input_end = input + len;
+-    
+-    while (input < input_end) {
+-	i = (i + 1) % 256;
+-	
+-	j = (j + text->sboxi) % 256;
+-	
+-	/* swap Si and Sj */
+-	tmp = text->sboxi;
+-	text->sboxi = text->sboxj;
+-	text->sboxj = tmp;
+-	
+-	t = (text->sboxi + text->sboxj) % 256;
+-	
+-	K = text->sboxt;
+-	
+-	/* byte K is Xor'ed with plaintext */
+-	*output++ = *input++ ^ K;
+-    }
+-    
+-    text->i = i;
+-    text->j = j;
+-}
+-
+-static void free_rc4(context_t *text)
+-{
+-    /* free rc4 context structures */
+-
+-    if (text->cipher_enc_context) {
+-        text->utils->free(text->cipher_enc_context);
+-        text->cipher_enc_context = NULL;
+-    }
+-    if (text->cipher_dec_context) {
+-        text->utils->free(text->cipher_dec_context);
+-        text->cipher_dec_context = NULL;
+-    }
+-}
+-
+-static int init_rc4(context_t *text, 
+-		    unsigned char enckey16,
+-		    unsigned char deckey16)
+-{
+-    /* allocate rc4 context structures */
+-    text->cipher_enc_context=
+-	(cipher_context_t *) text->utils->malloc(sizeof(rc4_context_t));
+-    if (text->cipher_enc_context == NULL) return SASL_NOMEM;
+-    
+-    text->cipher_dec_context=
+-	(cipher_context_t *) text->utils->malloc(sizeof(rc4_context_t));
+-    if (text->cipher_dec_context == NULL) return SASL_NOMEM;
+-    
+-    /* initialize them */
+-    rc4_init((rc4_context_t *) text->cipher_enc_context,
+-             (const unsigned char *) enckey, 16);
+-    rc4_init((rc4_context_t *) text->cipher_dec_context,
+-             (const unsigned char *) deckey, 16);
+-    
+-    return SASL_OK;
+-}
+-
+-static int dec_rc4(context_t *text,
+-		   const char *input,
+-		   unsigned inputlen,
+-		   unsigned char digest16 __attribute__((unused)),
+-		   char *output,
+-		   unsigned *outputlen)
+-{
+-    /* decrypt the text part & HMAC */
+-    rc4_decrypt((rc4_context_t *) text->cipher_dec_context, 
+-                input, output, inputlen);
+-
+-    /* no padding so we just subtract the HMAC to get the text length */
+-    *outputlen = inputlen - 10;
+-    
+-    return SASL_OK;
+-}
+-
+-static int enc_rc4(context_t *text,
+-		   const char *input,
+-		   unsigned inputlen,
+-		   unsigned char digest16,
+-		   char *output,
+-		   unsigned *outputlen)
+-{
+-    /* pad is zero */
+-    *outputlen = inputlen+10;
+-    
+-    /* encrypt the text part */
+-    rc4_encrypt((rc4_context_t *) text->cipher_enc_context,
+-                input,
+-                output,
+-                inputlen);
+-    
+-    /* encrypt the HMAC part */
+-    rc4_encrypt((rc4_context_t *) text->cipher_enc_context, 
+-                (const char *) digest, 
+-		(output)+inputlen, 10);
+-    
+-    return SASL_OK;
+-}
+-#endif /* HAVE_OPENSSL */
+ #endif /* WITH_RC4 */
+ 
+ struct digest_cipher available_ciphers =
+ {
+ #ifdef WITH_RC4
+-    { "rc4-40", 40, 5, 0x01, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 },
+-    { "rc4-56", 56, 7, 0x02, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 },
+     { "rc4", 128, 16, 0x04, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 },
+ #endif
+ #ifdef WITH_DES
+@@ -2815,6 +2729,7 @@
+ 	}
+ 	
+ 	if (cptr->name) {
++	    text->cipher_name = cptr->name;
+ 	    text->cipher_enc = cptr->cipher_enc;
+ 	    text->cipher_dec = cptr->cipher_dec;
+ 	    text->cipher_init = cptr->cipher_init;
+@@ -2958,7 +2873,10 @@
+ 	if (text->cipher_init) {
+ 	    if (text->cipher_init(text, enckey, deckey) != SASL_OK) {
+ 		sparams->utils->seterror(sparams->utils->conn, 0,
+-					 "couldn't init cipher");
++					 "couldn't init cipher '%s'",
++                                         text->cipher_name);
++                result = SASL_FAIL;
++                goto FreeAllMem;
+ 	    }
+ 	}
+     }
+@@ -3509,6 +3427,7 @@
+ 	oparams->mech_ssf = ctext->cipher->ssf;
+ 
+ 	nbits = ctext->cipher->n;
++	text->cipher_name = ctext->cipher->name;
+ 	text->cipher_enc = ctext->cipher->cipher_enc;
+ 	text->cipher_dec = ctext->cipher->cipher_dec;
+ 	text->cipher_free = ctext->cipher->cipher_free;
+@@ -3733,7 +3652,13 @@
+ 	
+ 	/* initialize cipher if need be */
+ 	if (text->cipher_init) {
+-	    text->cipher_init(text, enckey, deckey);
++	    if (text->cipher_init(text, enckey, deckey) != SASL_OK) {
++	        params->utils->seterror(params->utils->conn, 0,
++		         "internal error: failed to init cipher '%s'",
++                         text->cipher_name);
++                result = SASL_FAIL;
++                goto FreeAllocatedMem;
++            }
+ 	}
+     }
+

cyrus-sasl-2.1.27-cumulative-ossl3.patch Added

@@ -0,0 +1,109 @@
+diff -uPr cyrus-sasl-2.1.27/configure.ac cyrus-sasl-2.1.27.ossl3/configure.ac
+--- cyrus-sasl-2.1.27/configure.ac	2021-10-06 11:29:53.274375206 -0400
++++ cyrus-sasl-2.1.27.ossl3/configure.ac	2021-10-06 11:31:19.966726775 -0400
+@@ -1115,7 +1115,11 @@
+ 	with_rc4=yes)
+ 
+ if test "$with_rc4" != no; then
+-    AC_DEFINE(WITH_RC4,,Use RC4)
++    if test "$with_openssl" = no; then
++        AC_WARN(OpenSSL not found -- RC4 will be disabled)
++    else
++        AC_DEFINE(WITH_RC4,,Use RC4)
++    fi
+ fi
+ 
+ building_for_macosx=no
+diff -uPr cyrus-sasl-2.1.27/plugins/scram.c cyrus-sasl-2.1.27.ossl3/plugins/scram.c
+--- cyrus-sasl-2.1.27/plugins/scram.c	2018-11-08 12:29:57.000000000 -0500
++++ cyrus-sasl-2.1.27.ossl3/plugins/scram.c	2021-10-06 11:31:04.407484201 -0400
+@@ -65,7 +65,9 @@
+ 
+ #include <openssl/sha.h>
+ #include <openssl/evp.h>
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ #include <openssl/hmac.h>
++#endif
+ 
+ /*****************************  Common Section  *****************************/
+ 
+@@ -291,6 +293,32 @@
+ }
+ #endif
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++
++/* Decalre as void given functions never use the result */
++void *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
++                     const unsigned char *data, size_t data_len,
++                     unsigned char *md, unsigned int *md_len)
++{
++    const char *digest;
++    size_t digest_size;
++    size_t out_len;
++    void *ret = NULL;
++
++    digest = EVP_MD_get0_name(evp_md);
++    if (digest == NULL) {
++        return NULL;
++    }
++    digest_size = EVP_MD_size(evp_md);
++
++    ret = EVP_Q_mac(NULL, "hmac", NULL, digest, NULL, key, key_len,
++                    data, data_len, md, digest_size, &out_len);
++    if (ret != NULL) {
++        *md_len = (unsigned int)out_len;
++    }
++    return ret;
++}
++#endif
+ 
+ /* The result variable need to point to a buffer big enough for the SHA-* hash */
+ static void
+diff -uPr cyrus-sasl-2.1.27/saslauthd/lak.c cyrus-sasl-2.1.27.ossl3/saslauthd/lak.c
+--- cyrus-sasl-2.1.27/saslauthd/lak.c	2022-01-09 11:30:50.000000000 -0400
++++ cyrus-sasl-2.1.27.ossl3/saslauthd/lak.c	2022-01-09 11:30:50.000000001 -0400
+@@ -1806,18 +1806,36 @@
+ 		return rc;
+ 	}
+ 
+-	EVP_DigestInit(mdctx, md);
+-	EVP_DigestUpdate(mdctx, passwd, strlen(passwd));
++	rc = EVP_DigestInit(mdctx, md);
++	if (rc != 1) {
++		rc = LAK_FAIL;
++		goto done;
++	}
++	rc = EVP_DigestUpdate(mdctx, passwd, strlen(passwd));
++	if (rc != 1) {
++		rc = LAK_FAIL;
++		goto done;
++	}
+ 	if (hrock->salted) {
+-		EVP_DigestUpdate(mdctx, &credEVP_MD_size(md),
+-				 clen - EVP_MD_size(md));
++		rc = EVP_DigestUpdate(mdctx, &credEVP_MD_size(md),
++				      clen - EVP_MD_size(md));
++		if (rc != 1) {
++		    rc = LAK_FAIL;
++		    goto done;
++		}
++	}
++	rc = EVP_DigestFinal(mdctx, digest, NULL);
++	if (rc != 1) {
++		rc = LAK_FAIL;
++		goto done;
+ 	}
+-	EVP_DigestFinal(mdctx, digest, NULL);
+-	EVP_MD_CTX_free(mdctx);
+ 
+ 	rc = memcmp((char *)cred, (char *)digest, EVP_MD_size(md));
++	rc = rc ? LAK_INVALID_PASSWORD : LAK_OK;
++done:
++	EVP_MD_CTX_free(mdctx);
+ 	free(cred);
+-	return rc ? LAK_INVALID_PASSWORD : LAK_OK;
++	return rc;
+ }
+ 
+ #endif /* HAVE_OPENSSL */

cyrus-sasl-2.1.27-more-tests.patch Added

@@ -0,0 +1,761 @@
+From 10ac4d4822023b24734acde3c07186937ad52813 Mon Sep 17 00:00:00 2001
+From: Dmitry Belyavskiy <beldmit@gmail.com>
+Date: Wed, 6 Jan 2021 12:38:46 +0100
+Subject: PATCH Some basic PLAIN auth tests
+
+Signed-off-by: Dmitry Belyavskiy <beldmit@gmail.com>
+---
+ tests/runtests.py    | 91 +++++++++++++++++++++++++++++++++++++++++
+ tests/t_gssapi_cli.c | 97 +++++++++++++++++++++++++++++++++++++++-----
+ tests/t_gssapi_srv.c | 78 +++++++++++++++++++++++++++--------
+ 3 files changed, 239 insertions(+), 27 deletions(-)
+
+diff --git a/tests/runtests.py b/tests/runtests.py
+index fc9cf244..513ed3ff 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -239,6 +239,96 @@ def gssapi_tests(testdir):
+ 
+     os.killpg(kdc.pid, signal.SIGTERM)
+ 
++def setup_plain(testdir):
++    """ Create sasldb file """
++    sasldbfile = os.path.join(testdir, 'testsasldb.db')
++
++    sasldbenv = {'SASL_PATH': os.path.join(testdir, '../../plugins/.libs'),
++                 'LD_LIBRARY_PATH' : os.path.join(testdir, '../../lib/.libs')}
++
++    passwdprog = os.path.join(testdir, '../../utils/saslpasswd2')
++
++    echo = subprocess.Popen(('echo', '1234567'), stdout=subprocess.PIPE)
++    subprocess.check_call(
++        passwdprog, "-f", sasldbfile, "-c", "test",
++        "-u", "host.realm.test", "-p"
++        , stdin=echo.stdout, env=sasldbenv, timeout=5)
++
++    return (sasldbfile, sasldbenv)
++
++def plain_test(sasldbfile, sasldbenv):
++    try:
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-P", sasldbfile,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=sasldbenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-P", "1234567",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=sasldbenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli.stderr.read().decode('utf-8'),
++                srv.returncode, srv.stderr.read().decode('utf-8')))
++    except Exception as e:
++        print("FAIL: {}".format(e))
++        return
++
++    print("PASS: PLAIN CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++    return
++
++def plain_mismatch_test(sasldbfile, sasldbenv):
++    result = "FAIL"
++    try:
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-P", sasldbfile,
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=sasldbenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        bindings = base64.b64encode("CLI CBS".encode('utf-8'))
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-P", "12345678",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=sasldbenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            cli_err = cli.stderr.read().decode('utf-8').strip()
++            srv_err = srv.stderr.read().decode('utf-8').strip()
++            if "authentication failure" in srv_err:
++                result = "PASS"
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli_err, srv.returncode, srv_err))
++    except Exception as e:
++        print("{}: {}".format(result, e))
++        return
++
++    print("FAIL: This test should fail CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++    return
++
++def plain_tests(testdir):
++    sasldbfile, sasldbenv = setup_plain(testdir)
++    #print("DB file: {}, ENV: {}".format(sasldbfile, sasldbenv))
++    print('SASLDB PLAIN:')
++    print('    ', end='')
++    plain_test(sasldbfile, sasldbenv)
++
++    print('SASLDB PLAIN PASSWORD MISMATCH:')
++    print('    ', end='')
++    plain_mismatch_test(sasldbfile, sasldbenv)
+ 
+ if __name__ == "__main__":
+ 
+@@ -254,3 +344,4 @@ def gssapi_tests(testdir):
+     os.makedirs(T)
+ 
+     gssapi_tests(T)
++    plain_tests(T)
+diff --git a/tests/t_gssapi_cli.c b/tests/t_gssapi_cli.c
+index a44a3f58..20d22070 100644
+--- a/tests/t_gssapi_cli.c
++++ b/tests/t_gssapi_cli.c
+@@ -16,6 +16,8 @@
+ #include <saslplug.h>
+ #include <saslutil.h>
+ 
++const char *testpass = NULL;
++
+ static int setup_socket(void)
+ {
+     struct sockaddr_in addr;
+@@ -34,9 +36,60 @@ static int setup_socket(void)
+     return sock;
+ }
+ 
++static int get_user(void *context __attribute__((unused)),
++                  int id,
++                  const char **result,
++                  unsigned *len)
++{
++    const char *testuser = "test@host.realm.test";
++
++    if (! result)
++        return SASL_BADPARAM;
++
++    switch (id) {
++    case SASL_CB_USER:
++    case SASL_CB_AUTHNAME:
++        *result = testuser;
++        break;
++    default:
++        return SASL_BADPARAM;
++    }
++
++    if (len) *len = strlen(*result);
++
++    return SASL_OK;
++}
++
++static int get_pass(sasl_conn_t *conn __attribute__((unused)),
++          void *context __attribute__((unused)),
++          int id,
++          sasl_secret_t **psecret)
++{
++    size_t len;
++    static sasl_secret_t *x;
++
++    /* paranoia check */
++    if (! conn || ! psecret || id != SASL_CB_PASS)
++        return SASL_BADPARAM;
++
++    len = strlen(testpass);
++
++    x = (sasl_secret_t *) realloc(x, sizeof(sasl_secret_t) + len);
++
++    if (!x) {
++        return SASL_NOMEM;
++    }
++
++    x->len = len;
++    strcpy((char *)x->data, testpass);
++
++    *psecret = x;
++    return SASL_OK;
++}
++
+ int main(int argc, char *argv)
+ {
+-    sasl_callback_t callbacks2 = {};
++    sasl_callback_t callbacks4 = {};
+     char buf8192;
+     const char *chosenmech;
+     sasl_conn_t *conn;
+@@ -46,12 +99,18 @@ int main(int argc, char *argv)
+     char cb_buf256;
+     int sd;
+     int c, r;
++    const char *sasl_mech = "GSSAPI";
++    int plain = 0;
+ 
+-    while ((c = getopt(argc, argv, "c:")) != EOF) {
++    while ((c = getopt(argc, argv, "c:P:")) != EOF) {
+         switch (c) {
+         case 'c':
+             parse_cb(&cb, cb_buf, 256, optarg);
+             break;
++        case 'P':
++            plain = 1;
++            testpass = optarg;
++            break;
+         default:
+             break;
+         }
+@@ -64,6 +123,22 @@ int main(int argc, char *argv)
+     callbacks1.id = SASL_CB_LIST_END;
+     callbacks1.proc = NULL;
+     callbacks1.context = NULL;
++    callbacks2.id = SASL_CB_LIST_END;
++    callbacks2.proc = NULL;
++    callbacks2.context = NULL;
++    callbacks3.id = SASL_CB_LIST_END;
++    callbacks3.proc = NULL;
++    callbacks3.context = NULL;
++
++    if (plain) {
++        sasl_mech = "PLAIN";
++
++        callbacks1.id = SASL_CB_AUTHNAME;
++        callbacks1.proc = (sasl_callback_ft)&get_user;
++
++        callbacks2.id = SASL_CB_PASS;
++        callbacks2.proc = (sasl_callback_ft)&get_pass;
++    }
+ 
+     r = sasl_client_init(callbacks);
+     if (r != SASL_OK) exit(-1);
+@@ -78,11 +153,11 @@ int main(int argc, char *argv)
+         sasl_setprop(conn, SASL_CHANNEL_BINDING, &cb);
+     }
+ 
+-    r = sasl_client_start(conn, "GSSAPI", NULL, &data, &len, &chosenmech);
++    r = sasl_client_start(conn, sasl_mech, NULL, &data, &len, &chosenmech);
+     if (r != SASL_OK && r != SASL_CONTINUE) {
+-	saslerr(r, "starting SASL negotiation");
+-	printf("\n%s\n", sasl_errdetail(conn));
+-	exit(-1);
++        saslerr(r, "starting SASL negotiation");
++        printf("\n%s\n", sasl_errdetail(conn));
++        exit(-1);
+     }
+ 
+     sd = setup_socket();
+@@ -92,11 +167,11 @@ int main(int argc, char *argv)
+         len = 8192;
+         recv_string(sd, buf, &len);
+ 
+-	r = sasl_client_step(conn, buf, len, NULL, &data, &len);
+-	if (r != SASL_OK && r != SASL_CONTINUE) {
+-	    saslerr(r, "performing SASL negotiation");
+-	    printf("\n%s\n", sasl_errdetail(conn));
+-	    exit(-1);
++        r = sasl_client_step(conn, buf, len, NULL, &data, &len);
++        if (r != SASL_OK && r != SASL_CONTINUE) {
++            saslerr(r, "performing SASL negotiation");
++            printf("\n%s\n", sasl_errdetail(conn));
++            exit(-1);
+         }
+     }
+ 
+diff --git a/tests/t_gssapi_srv.c b/tests/t_gssapi_srv.c
+index ef1217f6..430cad65 100644
+--- a/tests/t_gssapi_srv.c
++++ b/tests/t_gssapi_srv.c
+@@ -1,4 +1,5 @@
+-/* Copyright (C) Simo Sorce <simo@redhat.com>
++/* Copyright (C) Simo Sorce <simo@redhat.com>,
++ * Dmitry Belyavskiy <dbelyavs@redhat.com>
+  * See COPYING file for License */
+ 
+ #include "t_common.h"
+@@ -15,6 +16,10 @@
+ #include <arpa/inet.h>
+ #include <saslplug.h>
+ 
++const char *sasldb_path = NULL,
++      *auxprop_plugin = "sasldb",
++      *pwcheck_method = "auxprop-hashed";
++
+ static int setup_socket(void)
+ {
+     struct sockaddr_in addr;
+@@ -45,9 +50,38 @@ static int setup_socket(void)
+     return sd;
+ }
+ 
++static int test_getopt(void *context __attribute__((unused)),
++                const char *plugin_name __attribute__((unused)),
++                const char *option,
++                const char **result,
++                unsigned *len)
++{
++    if (sasldb_path && !strcmp(option, "sasldb_path")) {
++        *result = sasldb_path;
++        if (len)
++            *len = (unsigned) strlen(sasldb_path);
++        return SASL_OK;
++    }
++
++    if (sasldb_path && !strcmp(option, "auxprop_plugin")) {
++        *result = auxprop_plugin;
++        if (len)
++            *len = (unsigned) strlen(auxprop_plugin);
++        return SASL_OK;
++    }
++
++    if (sasldb_path && !strcmp(option, "pwcheck_method")) {
++        *result = pwcheck_method;
++        if (len)
++            *len = (unsigned) strlen(pwcheck_method);
++        return SASL_OK;
++    }
++    return SASL_FAIL;
++}
++
+ int main(int argc, char *argv)
+ {
+-    sasl_callback_t callbacks2 = {};
++    sasl_callback_t callbacks3 = {};
+     char buf8192;
+     sasl_conn_t *conn;
+     const char *data;
+@@ -56,25 +90,33 @@ int main(int argc, char *argv)
+     unsigned char cb_buf256;
+     int sd;
+     int c, r;
++    const char *sasl_mech = "GSSAPI";
++    int plain = 0;
+ 
+-    while ((c = getopt(argc, argv, "c:")) != EOF) {
++    while ((c = getopt(argc, argv, "c:P:")) != EOF) {
+         switch (c) {
+         case 'c':
+             parse_cb(&cb, cb_buf, 256, optarg);
+             break;
++        case 'P':
++            plain = 1;
++            sasldb_path = optarg;
++            break;
+         default:
+             break;
+         }
+     }
+ 
+-
+     /* initialize the sasl library */
+     callbacks0.id = SASL_CB_GETPATH;
+     callbacks0.proc = (sasl_callback_ft)&getpath;
+     callbacks0.context = NULL;
+-    callbacks1.id = SASL_CB_LIST_END;
+-    callbacks1.proc = NULL;
++    callbacks1.id = SASL_CB_GETOPT;
++    callbacks1.proc = (sasl_callback_ft)&test_getopt;
+     callbacks1.context = NULL;
++    callbacks2.id = SASL_CB_LIST_END;
++    callbacks2.proc = NULL;
++    callbacks2.context = NULL;
+ 
+     r = sasl_server_init(callbacks, "t_gssapi_srv");
+     if (r != SASL_OK) exit(-1);
+@@ -90,16 +132,20 @@ int main(int argc, char *argv)
+         sasl_setprop(conn, SASL_CHANNEL_BINDING, &cb);
+     }
+ 
++    if (plain) {
++        sasl_mech = "PLAIN";
++    }
++
+     sd = setup_socket();
+ 
+     len = 8192;
+     recv_string(sd, buf, &len);
+ 
+-    r = sasl_server_start(conn, "GSSAPI", buf, len, &data, &len);
++    r = sasl_server_start(conn, sasl_mech, buf, len, &data, &len);
+     if (r != SASL_OK && r != SASL_CONTINUE) {
+-	saslerr(r, "starting SASL negotiation");
+-	printf("\n%s\n", sasl_errdetail(conn));
+-	exit(-1);
++        saslerr(r, "starting SASL negotiation");
++        printf("\n%s\n", sasl_errdetail(conn));
++        exit(-1);
+     }
+ 
+     while (r == SASL_CONTINUE) {
+@@ -107,12 +153,12 @@ int main(int argc, char *argv)
+         len = 8192;
+         recv_string(sd, buf, &len);
+ 
+-	r = sasl_server_step(conn, buf, len, &data, &len);
+-	if (r != SASL_OK && r != SASL_CONTINUE) {
+-	    saslerr(r, "performing SASL negotiation");
+-	    printf("\n%s\n", sasl_errdetail(conn));
+-	    exit(-1);
+-	}
++        r = sasl_server_step(conn, buf, len, &data, &len);
++        if (r != SASL_OK && r != SASL_CONTINUE) {
++            saslerr(r, "performing SASL negotiation");
++            printf("\n%s\n", sasl_errdetail(conn));
++            exit(-1);
++        }
+ 
+     }
+ 
+From d95b0afef1289194148090874799428e9e4f4cff Mon Sep 17 00:00:00 2001
+From: Simo Sorce <idra@samba.org>
+Date: Wed, 15 Apr 2020 11:57:17 -0400
+Subject: PATCH Test GSS-SPNEGO as well
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ tests/runtests.py    | 91 ++++++++++++++++++++++++++++++++++++++++----
+ tests/t_common.c     | 13 ++++---
+ tests/t_common.h     |  3 +-
+ tests/t_gssapi_cli.c | 22 ++++++++++-
+ tests/t_gssapi_srv.c | 25 ++++++++++--
+ 5 files changed, 134 insertions(+), 20 deletions(-)
+
+diff --git a/tests/runtests.py b/tests/runtests.py
+index 513ed3ff..7be60745 100755
+--- a/tests/runtests.py
++++ b/tests/runtests.py
+@@ -6,6 +6,7 @@
+ import shutil
+ import signal
+ import subprocess
++import sys
+ import time
+ from string import Template
+ 
+@@ -149,11 +150,12 @@ def gssapi_basic_test(kenv):
+                 srv.returncode, srv.stderr.read().decode('utf-8')))
+     except Exception as e:
+         print("FAIL: {}".format(e))
+-        return
++        return 1
+ 
+     print("PASS: CLI({}) SRV({})".format(
+         cli.stdout.read().decode('utf-8').strip(),
+         srv.stdout.read().decode('utf-8').strip()))
++    return 0
+ 
+ def gssapi_channel_binding_test(kenv):
+     try:
+@@ -178,11 +180,12 @@ def gssapi_channel_binding_test(kenv):
+                 srv.returncode, srv.stderr.read().decode('utf-8')))
+     except Exception as e:
+         print("FAIL: {}".format(e))
+-        return
++        return 1
+ 
+     print("PASS: CLI({}) SRV({})".format(
+         cli.stdout.read().decode('utf-8').strip(),
+         srv.stdout.read().decode('utf-8').strip()))
++    return 0
+ 
+ def gssapi_channel_binding_mismatch_test(kenv):
+     result = "FAIL"
+@@ -212,11 +215,70 @@ def gssapi_channel_binding_mismatch_test(kenv):
+                 cli.returncode, cli_err, srv.returncode, srv_err))
+     except Exception as e:
+         print("{}: {}".format(result, e))
+-        return
++        return 0
+ 
+     print("FAIL: This test should fail CLI({}) SRV({})".format(
+         cli.stdout.read().decode('utf-8').strip(),
+         srv.stdout.read().decode('utf-8').strip()))
++    return 1
++
++def gss_spnego_basic_test(kenv):
++    try:
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-N",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-N",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli.stderr.read().decode('utf-8'),
++                srv.returncode, srv.stderr.read().decode('utf-8')))
++    except Exception as e:
++        print("FAIL: {}".format(e))
++        return 1
++
++    print("PASS: CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++    return 0
++
++def gss_spnego_zeromaxssf_test(kenv):
++    try:
++        srv = subprocess.Popen("../tests/t_gssapi_srv", "-N", "-z",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        srv.stdout.readline() # Wait for srv to say it is ready
++        cli = subprocess.Popen("../tests/t_gssapi_cli", "-N", "-z",
++                               stdout=subprocess.PIPE,
++                               stderr=subprocess.PIPE, env=kenv)
++        try:
++            cli.wait(timeout=5)
++            srv.wait(timeout=5)
++        except Exception as e:
++            print("Failed on {}".format(e));
++            cli.kill()
++            srv.kill()
++        if cli.returncode != 0 or srv.returncode != 0:
++            raise Exception("CLI ({}): {} --> SRV ({}): {}".format(
++                cli.returncode, cli.stderr.read().decode('utf-8'),
++                srv.returncode, srv.stderr.read().decode('utf-8')))
++    except Exception as e:
++        print("FAIL: {}".format(e))
++        return 1
++
++    print("PASS: CLI({}) SRV({})".format(
++        cli.stdout.read().decode('utf-8').strip(),
++        srv.stdout.read().decode('utf-8').strip()))
++    return 0
+ 
+ def gssapi_tests(testdir):
+     """ SASL/GSSAPI Tests """
+@@ -225,19 +287,30 @@ def gssapi_tests(testdir):
+     #print("KDC: {}, ENV: {}".format(kdc, kenv))
+     kenv'KRB5_TRACE' = os.path.join(testdir, 'trace.log')
+ 
++    err = 0
++
+     print('GSSAPI BASIC:')
+     print('    ', end='')
+-    gssapi_basic_test(kenv)
++    err += gssapi_basic_test(kenv)
+ 
+     print('GSSAPI CHANNEL BINDING:')
+     print('    ', end='')
+-    gssapi_channel_binding_test(kenv)
++    err += gssapi_channel_binding_test(kenv)
+ 
+     print('GSSAPI CHANNEL BINDING MISMTACH:')
+     print('    ', end='')
+-    gssapi_channel_binding_mismatch_test(kenv)
++    err += gssapi_channel_binding_mismatch_test(kenv)
++
++    print('GSS-SPNEGO BASIC:')
++    print('    ', end='')
++    err += gss_spnego_basic_test(kenv)
++
++    print('GSS-SPNEGO 0 MAXSSF:')
++    print('    ', end='')
++    err += gss_spnego_zeromaxssf_test(kenv)
+ 
+     os.killpg(kdc.pid, signal.SIGTERM)
++    return err
+ 
+ def setup_plain(testdir):
+     """ Create sasldb file """
+@@ -343,5 +416,9 @@ def plain_tests(testdir):
+         shutil.rmtree(T)
+     os.makedirs(T)
+ 
+-    gssapi_tests(T)
+     plain_tests(T)
++
++    err = gssapi_tests(T)
++    if err != 0:
++        print('{} test(s) FAILED'.format(err))
++        sys.exit(-1)
+diff --git a/tests/t_common.c b/tests/t_common.c
+index 478e6a1f..f56098ef 100644
+--- a/tests/t_common.c
++++ b/tests/t_common.c
+@@ -23,20 +23,21 @@ void send_string(int sd, const char *s, unsigned int l)
+     if (ret != l) s_error("send data", ret, l, errno);
+ }
+ 
+-void recv_string(int sd, char *buf, unsigned int *buflen)
++void recv_string(int sd, char *buf, unsigned int *buflen, bool allow_eof)
+ {
++    unsigned int bufsize = *buflen;
+     unsigned int l;
+     ssize_t ret;
+ 
++    *buflen = 0;
++
+     ret = recv(sd, &l, sizeof(l), MSG_WAITALL);
++    if (allow_eof && ret == 0) return;
+     if (ret != sizeof(l)) s_error("recv size", ret, sizeof(l), errno);
+ 
+-    if (l == 0) {
+-        *buflen = 0;
+-        return;
+-    }
++    if (l == 0) return;
+ 
+-    if (*buflen < l) s_error("recv len", l, *buflen, E2BIG);
++    if (bufsize < l) s_error("recv len", l, bufsize, E2BIG);
+ 
+     ret = recv(sd, buf, l, 0);
+     if (ret != l) s_error("recv data", ret, l, errno);
+diff --git a/tests/t_common.h b/tests/t_common.h
+index a10def17..be24a53d 100644
+--- a/tests/t_common.h
++++ b/tests/t_common.h
+@@ -4,6 +4,7 @@
+ #include "config.h"
+ 
+ #include <errno.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/socket.h>
+ 
+@@ -12,7 +13,7 @@
+ 
+ void s_error(const char *hdr, ssize_t ret, ssize_t len, int err);
+ void send_string(int sd, const char *s, unsigned int l);
+-void recv_string(int sd, char *buf, unsigned int *buflen);
++void recv_string(int sd, char *buf, unsigned int *buflen, bool allow_eof);
+ void saslerr(int why, const char *what);
+ int getpath(void *context __attribute__((unused)), const char **path);
+ void parse_cb(sasl_channel_binding_t *cb, char *buf, unsigned max, char *in);
+diff --git a/tests/t_gssapi_cli.c b/tests/t_gssapi_cli.c
+index 20d22070..b1dd6ce0 100644
+--- a/tests/t_gssapi_cli.c
++++ b/tests/t_gssapi_cli.c
+@@ -101,8 +101,10 @@ int main(int argc, char *argv)
+     int c, r;
+     const char *sasl_mech = "GSSAPI";
+     int plain = 0;
++    bool spnego = false;
++    bool zeromaxssf = false;
+ 
+-    while ((c = getopt(argc, argv, "c:P:")) != EOF) {
++    while ((c = getopt(argc, argv, "c:P:zN")) != EOF) {
+         switch (c) {
+         case 'c':
+             parse_cb(&cb, cb_buf, 256, optarg);
+@@ -111,6 +113,12 @@ int main(int argc, char *argv)
+             plain = 1;
+             testpass = optarg;
+             break;
++        case 'z':
++            zeromaxssf = true;
++            break;
++        case 'N':
++            spnego = true;
++            break;
+         default:
+             break;
+         }
+@@ -153,6 +161,16 @@ int main(int argc, char *argv)
+         sasl_setprop(conn, SASL_CHANNEL_BINDING, &cb);
+     }
+ 
++    if (spnego) {
++        sasl_mech = "GSS-SPNEGO";
++    }
++
++    if (zeromaxssf) {
++        /* set all security properties to 0 including maxssf */
++        sasl_security_properties_t secprops = { 0 };
++        sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
++    }
++
+     r = sasl_client_start(conn, sasl_mech, NULL, &data, &len, &chosenmech);
+     if (r != SASL_OK && r != SASL_CONTINUE) {
+         saslerr(r, "starting SASL negotiation");
+@@ -165,7 +183,7 @@ int main(int argc, char *argv)
+     while (r == SASL_CONTINUE) {
+         send_string(sd, data, len);
+         len = 8192;
+-        recv_string(sd, buf, &len);
++        recv_string(sd, buf, &len, false);
+ 
+         r = sasl_client_step(conn, buf, len, NULL, &data, &len);
+         if (r != SASL_OK && r != SASL_CONTINUE) {
+diff --git a/tests/t_gssapi_srv.c b/tests/t_gssapi_srv.c
+index 430cad65..0adbd12f 100644
+--- a/tests/t_gssapi_srv.c
++++ b/tests/t_gssapi_srv.c
+@@ -92,8 +92,10 @@ int main(int argc, char *argv)
+     int c, r;
+     const char *sasl_mech = "GSSAPI";
+     int plain = 0;
++    bool spnego = false;
++    bool zeromaxssf = false;
+ 
+-    while ((c = getopt(argc, argv, "c:P:")) != EOF) {
++    while ((c = getopt(argc, argv, "c:P:zN")) != EOF) {
+         switch (c) {
+         case 'c':
+             parse_cb(&cb, cb_buf, 256, optarg);
+@@ -102,6 +104,12 @@ int main(int argc, char *argv)
+             plain = 1;
+             sasldb_path = optarg;
+             break;
++        case 'z':
++            zeromaxssf = true;
++            break;
++        case 'N':
++            spnego = true;
++            break;
+         default:
+             break;
+         }
+@@ -136,10 +144,20 @@ int main(int argc, char *argv)
+         sasl_mech = "PLAIN";
+     }
+ 
++    if (spnego) {
++        sasl_mech = "GSS-SPNEGO";
++    }
++
++    if (zeromaxssf) {
++        /* set all security properties to 0 including maxssf */
++        sasl_security_properties_t secprops = { 0 };
++        sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
++    }
++
+     sd = setup_socket();
+ 
+     len = 8192;
+-    recv_string(sd, buf, &len);
++    recv_string(sd, buf, &len, false);
+ 
+     r = sasl_server_start(conn, sasl_mech, buf, len, &data, &len);
+     if (r != SASL_OK && r != SASL_CONTINUE) {
+@@ -151,7 +169,7 @@ int main(int argc, char *argv)
+     while (r == SASL_CONTINUE) {
+         send_string(sd, data, len);
+         len = 8192;
+-        recv_string(sd, buf, &len);
++        recv_string(sd, buf, &len, true);
+ 
+         r = sasl_server_step(conn, buf, len, &data, &len);
+         if (r != SASL_OK && r != SASL_CONTINUE) {
+@@ -159,7 +177,6 @@ int main(int argc, char *argv)
+             printf("\n%s\n", sasl_errdetail(conn));
+             exit(-1);
+         }
+-
+     }
+ 
+     if (r != SASL_OK) exit(-1);
+

cyrus-sasl-2.1.27-nostrncpy.patch Added

@@ -0,0 +1,51 @@
+diff --git a/plugins/gssapi.c b/plugins/gssapi.c
+index 5d900c5e..4688bb9a 100644
+--- a/plugins/gssapi.c
++++ b/plugins/gssapi.c
+@@ -1567,7 +1567,6 @@ int gssapiv2_server_plug_init(
+ {
+ #ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
+     const char *keytab = NULL;
+-    char keytab_path1024;
+     unsigned int rl;
+ #endif
+     
+@@ -1589,15 +1588,7 @@ int gssapiv2_server_plug_init(
+ 	    return SASL_FAIL;
+ 	}
+ 	
+-	if(strlen(keytab) > 1024) {
+-	    utils->log(NULL, SASL_LOG_ERR,
+-		       "path to keytab is > 1024 characters");
+-	    return SASL_BUFOVER;
+-	}
+-	
+-	strncpy(keytab_path, keytab, 1024);
+-	
+-	gsskrb5_register_acceptor_identity(keytab_path);
++	gsskrb5_register_acceptor_identity(keytab);
+     }
+ #endif
+     
+diff --git a/plugins/ntlm.c b/plugins/ntlm.c
+index aeb3ac34..8a7d9065 100644
+--- a/plugins/ntlm.c
++++ b/plugins/ntlm.c
+@@ -375,10 +375,15 @@ static unsigned char *P16_lm(unsigned char *P16, sasl_secret_t *passwd,
+ 			     unsigned *buflen __attribute__((unused)),
+ 			     int *result)
+ {
+-    char P1414;
++    char P1414 = { 0 };
++    int Plen;
+     unsigned char S8 = { 0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 };
+ 
+-    strncpy(P14, (const char *) passwd->data, sizeof(P14));
++    Plen = sizeof(P14);
++    if (passwd->len < Plen) {
++        Plen = passwd->len;
++    }
++    memcpy(P14, (const char *) passwd->data, Plen);
+     ucase(P14, sizeof(P14));
+ 
+     E(P16, (unsigned char *) P14, sizeof(P14), S8, sizeof(S8));

autogen.sh Added

changelog Added

@@ -0,0 +1,790 @@
+* Tue Oct 12 2021 Simo Sorce <simo@redhat.com> - 2.1.27-16
+- Fix rpath patch
+- Resolves: rhbz#2012172
+
+* Wed Oct  6 2021 Simo Sorce <simo@redhat.com> - 2.1.27-15
+- More openssl 3 compatibility and digestmd5 updates.
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.1.27-14
+- Rebuilt with OpenSSL 3.0.0
+
+* Tue Aug 10 2021 Dmitry Belyavskiy <dbelyavs@redhat.com> - 2.1.27-13
+- Preserve GDBM error to correctly deal with GDBM sasldb
+- Related: rhbz#1952926
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 03 2021 Dmitry Belyavskiy <dbelyavs@redhat.com> - 2.1.27-11
+- Fix some coverity issues
+- Set default sasldb database to GDBM instead of BerkeleyDB
+- Add the migration tool from BerkeleyDB
+- Add some PLAIN auth tests
+
+* Tue Apr 06 2021 Simo Sorce <simo@redhat.com> - 2.1.27-10
+- Fix issues with autoconf 2.70+
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.1.27-9
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 2.1.27-8
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu May  7 2020 Simo Sorce <simo@redhat.com> - 2.1.27-5
+- Backport GSSAPI Channel Bindings support
+- Add support for setting maxssf=0 in GSS-SPNEGO
+- Reduce excessive GSSAPI plugin logging
+
+* Thu Mar 19 2020 Simo Sorce - 2.1.27-4
+- Fix CVE 2019 19906
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 13 2019 Simo Sorce - 2.1.27-1
+- Update to final 2.1.27 sources
+- Also add patch to use OpenSSL RC4, currently proposed as PR 559
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-0.6rc7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 2.1.27-0.5rc7
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Sun Oct 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2.1.27-0.4rc7
+- Clean up remanents of sys-v, spec cleanups
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.27-0.3rc7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu May 17 2018 Jakub Jelen <jjelen@redhat.com> - 2.1.27-0.2rc7
+- Avoid multilib conflicts between devel subpackages (#1577675)
+
+* Mon Mar 05 2018 Jakub Jelen <jjelen@redhat.com> - 2.1.27-0.1rc7
+- New upstream (pre-)release
+- Import LDFLAGS from redhat-rpm-config (#1548437)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.26-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2.1.26-36
+- Rebuilt for switch to libxcrypt
+
+* Mon Oct 23 2017 Jakub Jelen <jjelen@redhat.com> - 2.1.26-35
+- Use mariadb-connector-c-devel instead of mysql-devel (#1493620)
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.26-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.26-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Apr 19 2017 Jakub Jelen <jjelen@redhat.com> - 2.1.26-32
+- Add missing patch for separate mutexes per connection in GSSAPI
+
+* Tue Apr 18 2017 Jakub Jelen <jjelen@redhat.com> - 2.1.26-31
+- Allow cyrus sasl to get the ssf from gssapi
+
+* Wed Apr 12 2017 Petr Šabata <contyk@redhat.com> - 2.1.26-30
+- Removing the obsolete scriptlet /sbin/service dependency
+
+* Tue Mar 07 2017 Jakub Jelen <jjelen@redhat.com> - 2.1.26-29
+- Fix GSS SPNEGO support (#1421663)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.26-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov 07 2016 Jakub Jelen <jjelen@redhat.com> - 2.1.26-27
+- Add support for OpenSSL 1.1.0
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.26-26.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jul 16 2015 Jakub Jelen <jjelen@redhat.com> 2.1.26-25.2
+- Revert tmpfiles.d and use new systemd feature RuntimeDirectory
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.26-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri May 29 2015 Jakub Jelen <jjelen@redhat.com> 2.1.26-23
+- Add ability to handle logging in gssapi plugin (#1187097)
+
+* Mon Mar 16 2015 Jakub Jelen <jjelen@redhat.com> 2.1.26-22
+- Rever "Do not leak memory in plugin_common.c ..." due the breakage of svn (#1202364)
+
+* Thu Mar 12 2015 Jakub Jelen <jjelen@redhat.com> 2.1.26-21
+- Add and Document ability to run saslauthd as non-root user, fix tpmfiles ownership (#1189203)
+- Do not leak memory in sample server (#852755)
+- Do not leak memory in plugin_common.c for password callback (#1191183)
+- Cleanup spec file: tmpfiles.d macros and tab/space
+
+* Wed Feb 04 2015 Petr Lautrbach <plautrba@redhat.com> 2.1.26-20
+- Change the ownership of /run/saslauth to saslauth:saslauth (#1189203)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.26-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 2.1.26-18
+- fix license handling
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.26-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Jan 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.1.26-16
+- Don't order service after syslog.target.
+
+* Fri Nov 15 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-15
+- Treat SCRAM-SHA-1/DIGEST-MD5 as more secure than PLAIN (#970718)
+- improve configuration error message
+
+* Fri Nov 01 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-14
+- revert upstream commit 080e51c7fa0421eb2f0210d34cf0ac48a228b1e9 (#984079)
+
+* Tue Oct 15 2013 Karsten Hopp <karsten@redhat.com> 2.1.26-13
+- add ppc64p7 subarch support in config.sub (Fedora only)
+
+* Mon Sep 09 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-12
+- build with RPM_OPT_FLAGS <ville.skytta@iki.fi> (#1005535)
+
+* Tue Sep 03 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-11
+- fix hardening for /usr/sbin/saslauthd
+- add testsaslauthd.8 man page to the package
+- use static md5global.h file
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.26-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jun 24 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-9
+- detect gsskrb5_register_acceptor_identity macro <nalin@redhat.com> (#976538)
+
+* Tue Jun 04 2013 Karsten Hopp <karsten@redhat.com> 2.1.26-8
+- disable incorrect check for MkLinux to allow building with shared libraries on PPC
+
+* Tue May 21 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-7
+- fix the spec file in order to build the cyrus-sasl-sql plugin
+  with support for PostgreSQL and MySQL
+
+* Thu Feb 21 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-6
+- don't include system sasl2 library needed for rebuilds after rebase
+
+* Mon Feb 11 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-5
+- enable full relro and PIE compiler flags for saslauthd
+
+* Fri Feb 01 2013 Petr Lautrbach <plautrba@redhat.com> 2.1.26-4
+- fix library symlinks
+
+* Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> 2.1.26-3
+- actually apply size_t patch (#906519)
+
+* Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> 2.1.26-2
+- sasl.h: +#include<sys/types.h> for missing size_t type (#906519)
+- tighten subpkg deps via %%?_isa
+
+* Thu Dec 20 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.26-1
+- update to 2.1.26
+- fix segfaults in sasl_gss_encode (#886140)
+
+* Mon Dec 10 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.25-2
+- always use the current external Berkeley DB when linking
+
+* Fri Dec 07 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.25-1
+- update to 2.1.25
+- add cyrus-sasl-scram and cyrus-sasl-gs2 packages
+
+* Fri Sep 14 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.23-36
+- replace scriptlets with systemd macros (#856666)
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.23-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 17 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.23-34
+- move /etc/tmpfiles.d/saslauthd.conf to /usr/lib/tmpfiles.d/saslauthd.conf (#840193)
+
+* Wed Jun 20 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.23-33
+- properly deal with crypt() returning NULL (#816250)
+- use fixed gid 76 for saslauth
+
+* Mon Apr 16 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-32
+- re-enable libdb support and utilities
+
+* Wed Apr 04 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-31
+- temporarily disable libdb support to resolve cyrus-sasl
+  chicken and egg build problem against libdb
+
+* Tue Apr 03 2012 Jindrich Novy <jnovy@redhat.com> 2.1.23-30
+- rebuild against new libdb
+
+* Wed Feb 08 2012 Petr Lautrbach <plautrba@redhat.com> 2.1.23-29
+- Change saslauth user homedir to /run/saslauthd (#752889)
+- Change all /var/run/ to /run/
+- DAEMONOPTS are not supported any more in systemd units
+
+* Mon Jan 09 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.1.23-28
+- Ship with sasl_pwcheck_method: alwaystrue
+
+* Mon Dec 12 2011 Petr Lautrbach <plautrba@redhat.com> 2.1.23-27
+- remove support for logging of the remote host via PAM (#759334)
+- fix systemd files (#750436)
+
+* Wed Aug 10 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-26
+- Add partial relro support for libraries
+
+* Mon Jul 25 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-25
+- Add support for berkeley db 5
+
+* Wed Jun 29 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-23
+- Migrate the package to full native systemd unit files, according to the Fedora
+  packaging guidelines.
+
+* Wed Jun  1 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-22
+- repair rimap support (more packets in response)
+
+* Wed May 25 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-21
+- repair ntlm support
+
+* Mon May 23 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-20
+- add logging of the remote host via PAM
+
+* Thu Apr 28 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-19
+- temporarilly revert systemd units
+
+* Tue Apr 26 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-18
+- update scriptlets
+
+* Fri Apr 22 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-17
+- Add systemd units
+
+* Wed Mar 23 2011 Tomas Mraz <tmraz@redhat.com> - 2.1.23-16
+- Rebuilt with new mysqlclient
+
+* Fri Feb 25 2011 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-15
+- set correct license tag
+- add ghost to /var/run/saslauthd
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.23-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Apr  9 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-13
+- Add /etc/tmpfiles.d element (#662734)
+
+* Fri Apr  9 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-12
+- Update init script to impeach pid file
+
+* Thu Mar 11 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-11
+- Update pre post preun and postun scripts (#572399)
+
+* Wed Mar 10 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-10
+- Rewrite spec file, make corect CFLAGS, CPPFLAGS and LDFLAGS
+
+* Mon Feb 22 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-9
+- solve race condition (#566875)
+
+* Wed Feb 17 2010 Stepan Kasal <skasal@redhat.com> - 2.1.23-8
+- improve m4 quoting to fix saslauthd/configure (#566088)
+- call autotools in build, not in prep
+
+* Fri Feb  5 2010 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-7
+- Add man page to testtcpauthd (#526189)
+
+* Fri Oct 16 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-6
+- Create the saslauth user according to fedora packaging guide
+
+* Thu Sep 24 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-5
+- Repair initscript to make condrestart working properly (#522103)
+
+* Wed Sep 23 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-3
+- Add possibility to run the saslauth without root privilegies (#185614)
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.23-2
+- rebuilt with new openssl
+
+* Fri Aug  7 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.23-1
+- update to 2.1.23
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.22-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 11 2009 Jan F. Chadima <jchadima@redhat.com> - 2.1.22-24
+- repair sasl_encode64 nul termination (#487251)
+
+* Thu Apr 16 2009 Robert Scheck <robert@fedoraproject.org> - 2.1.22-23
+- Don't build the krb4 plugin as krb5 1.7 will drop it (#225974 #c6)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.22-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb  6 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.22-21
+- fix build with gcc-4.4
+
+* Fri Jan 23 2009 Tomas Mraz <tmraz@redhat.com> - 2.1.22-20
+- set LDAP_OPT_TIMEOUT (#326452)
+- provide LSB compatible init script (#246900)
+
+* Fri Sep 26 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-19
+- always use the current external db4 when linking,
+  thanks to Dan Horak for the original patch (#464098)
+
+* Wed Sep 10 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-18
+- fix most critical build warnings (#433583)
+- use external db4
+
+* Fri Aug 29 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-17
+- always link against the internal db4 (#459163)
+- rediff patches for no fuzz
+
+* Wed Jul  9 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-16
+- update internal db4 (#449737)
+
+* Tue Jul  1 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-15
+- drop reload from initscript help (#448154)
+- fix hang in rimap auth method (#438533)
+- build the krb4 plugin (#154675)
+
+* Fri May 23 2008 Dennis Gilmore <dennis@ausil.us> - 2.1.22-14
+- make it so that bootstrap actually works
+
+* Thu May 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.1.22-13.1
+- minor release bump for sparc rebuild
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.1.22-13
+- Autorebuild for GCC 4.3
+
+* Thu Feb 14 2008 Steve Conklin <sconklin@redhat.com> - 2.1.22-12
+- rebuild for gcc4.3
+
+* Fri Jan 25 2008 Steve Conklin <sconklin@redhat.com> - 2.1.22-11
+- Cleanup after merge review bz #225673
+- no longer mark /etc/rc.d/init.d/saslauthd as config file
+- removed -x permissions on include files
+- added devel package dependency on cyrus-sasl
+- removed some remaining .la files that were being delivered
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.1.22-10
+ - Rebuild for deps
+
+* Wed Nov  7 2007 Steve Conklin <sconklin@redhat.com> - 2.1.22-9
+- Fixed a typo in the spec file
+
+* Wed Nov  7 2007 Steve Conklin <sconklin@redhat.com> - 2.1.22-8
+- Removed srp plugin source and added dist to NVR
+
+* Tue Sep 18 2007 Steve Conklin <sconklin@redhat.com> 2.1.22-7
+- use db4 version 4.6.19 bz#249737
+
+* Mon Feb 26 2007 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-6
+- install config files and init scripts using -p
+- pull in patch to build with current automake (#229010, Jacek Konieczny
+  and Robert Scheck)
+- remove prereq on ldconfig, RPM should pick it up based on the -libs
+  scriptlets
+- pull in patch to correctly detect gsskrb5_register_acceptor_identity
+  (#200892, Mirko Streckenbach)
+- move sasldb auxprop modules into the -lib subpackage, so that we'll pick
+  it up for multilib systems
+
+* Thu Feb 22 2007 Nalin Dahyabhai <nalin@redhat.com>
+- pull CVS fix for not tripping over extra commas in digest-md5
+  challenges (#229640)
+
+* Fri Feb 16 2007 Nalin Dahyabhai <nalin@redhat.com>
+- remove static build, which is no longer a useful option because not all of
+  our dependencies are available as static libraries
+- drop patches which were needed to keep static builds going
+- drop gssapi-generic patch due to lack of interest
+- update the bundled copy of db to 4.5.20 (#229012)
+- drop dbconverter-2, as we haven't bundled v1 libraries since FC4
+
+* Tue Dec  5 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-5
+- rebuild
+- add 'authentication' or 'auxprop' to summaries for plugin packages to
+  better indicate what the plugin provides
+- switch from automake 1.9 to automake 1.7
+
+* Fri Sep 29 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-4
+- rebuild without 'dlcompat' bits (#206119)
+
+* Mon Jul 17 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-3
+- rebuild
+
+* Tue Jun 20 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-2
+- fix a typo in sasl_client_start(3) (#196066)
+
+* Mon May 22 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.22-1
+- update to 2.1.22, adding pluginviewer to %%{_sbindir}
+
+* Tue May 16 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-12
+- add conditionalized build dependency on openldap-devel (#191855)
+- patch md5global.h to be the same on all architectures
+
+* Thu Apr 27 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-11
+- add unapplied patch which makes the DIGEST-MD5 plugin omit the realm
+  argument when the environment has $CYRUS_SASL_DIGEST_MD5_OMIT_REALM set to a
+  non-zero value, for testing purposes
+- add missing buildrequires on zlib-devel (#190113)
+
+* Mon Feb 20 2006 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-10
+- add missing buildrequires on gdbm-devel (Karsten Hopp)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.1.21-9.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.1.21-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Dec 19 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-9
+- use --as-needed to avoid linking dbconverter-2 with SQL libraries, which
+  it doesn't use because it manipulates files directly (#173321)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Mon Nov 14 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-8
+- rebuild with new OpenLDAP, overriding the version checks to assume that
+  2.3.11 is acceptable
+- remove a lingering patch for 1.x which we no longer use
+
+* Sat Nov 12 2005 Tom Lane <tgl@redhat.com> 2.1.21-7
+- Rebuild due to mysql update.
+
+* Tue Nov  8 2005 Tomas Mraz <tmraz@redhat.com> 2.1.21-6
+- rebuilt with new openssl
+
+* Fri Sep  9 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-5
+- add missing buildrequires: on groff (#163032)
+
+* Thu Sep  1 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-4
+- move the ldapdb auxprop support into a subpackage (#167300)
+  (note: the ldap password check support in saslauthd doesn't use auxprop)
+
+* Tue Aug 30 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-3
+- correct a use of uninitialized memory in the bundled libdb (Arjan van de Ven)
+
+* Mon Aug 29 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-2
+- move the ANONYMOUS mech plugin to the -lib subpackage so that multilib
+  systems can use it without installing the main package
+- build the static libraries without sql auxprop support
+
+* Mon Aug 29 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-1
+- update to 2.1.21
+- turn off compilation of libsasl v1 (finally)
+- explicitly disable sqlite to avoid the build warning
+- change the default mechanism which is set for saslauthd from "shadow" to
+  "pam" (#159194)
+- split the shared library up from saslauthd so that multilib systems don't
+  have to pull in every dependency of saslauthd for the compat arch (#166749)
+
+* Wed Apr 13 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-5
+- rebuild with new deps
+
+* Tue Mar  1 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-4
+- rebuild with new deps
+
+* Thu Nov 11 2004 Jeff Johnson <jbj@jbj.org> 2.1.20-3
+- rebuild against db-4.3.21.
+
+* Thu Nov 11 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-2
+- build with mysql-devel instead of mysqlclient10
+
+* Mon Nov  1 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-1
+- build with mysqlclient10 instead of mysql-devel
+
+* Wed Oct 27 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.20-0
+- update to 2.1.20, including the fix for CAN-2004-0884
+
+* Tue Oct  5 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-3
+- use notting's fix for incorrect patch for CAN-2004-0884 for 1.5.28
+
+* Tue Oct  5 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-2
+- don't trust the environment in setuid/setgid contexts (CAN-2004-0884, #134660)
+
+* Thu Aug 19 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-1
+- rebuild (the 2.1.19 changelog for fixing a buffer overflow referred to a CVS
+  revision between 2.1.18 and 2.1.19)
+
+* Mon Jul 19 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.19-0
+- update to 2.1.19, maybe for update
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Jun  7 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.18-4
+- enable sql auxprop support in a subpackage
+- include LDAP_SASLAUTHD documentation file (#124830)
+
+* Fri Jun  4 2004 Nalin Dahyabhai <nalin@redhat.com>
+- turn on ntlm in a subpackage
+
+* Thu May 13 2004 Thomas Woerner <twoerner@redhat.com> 2.1.18-3
+- removed rpath
+
+* Tue Mar 16 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.18-2
+- turn on building of libsasl v1 again
+
+* Fri Mar 12 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.18-1
+- update to 2.1.18
+- saslauthd's ldap code is no longer marked experimental, so we build it
+
+* Mon Mar  8 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-4
+- rebuild
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb  3 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-2
+- include default /etc/sysconfig/saslauthd configuration file for the init
+  script (#114868)
+
+* Thu Jan 29 2004 Nalin Dahyabhai <nalin@redhat.com>
+- drop saslauthd_version patch for libsasl2
+
+* Thu Jan 29 2004 Nalin Dahyabhai <nalin@redhat.com>
+- add a saslauthd_version option to libsasl's saslauthd client and teach it to
+  do the right thing
+- enable the saslauthd client code in libsasl version 1 (it's still going away!)
+- add saslauthd1-checkpass/saslauthd2-checkpass for testing the above change
+
+* Wed Jan  7 2004 Nalin Dahyabhai <nalin@redhat.com> 2.1.17-1
+- forcibly disable otp and sql plugins at compile-time
+
+* Fri Dec 19 2003 Nalin Dahyabhai <nalin@redhat.com>
+- update to 2.1.17, forcing the gssapi plugin to be shared now, as before
+- use a bundled libdb (#112215)
+- build static-with-all-plugins and normal-shared libsasl versions
+- add sasl2-{shared,static}-mechlist for very basic sanity checking
+- make inclusion of sasl1 stuffs conditional, because it's so going away
+
+* Sat Dec 13 2003 Jeff Johnson <jbj@jbj.org> 2.1.15-7
+- rebuild against db-4.2.52.
+
+* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-6
+- use /dev/urandom instead of /dev/random for SASL2 (docs indicate that this is
+  safe if you aren't using OTP or SRP, and we build neither); SASL1 appears to
+  use it to seed the libc RNG only (#103378)
+
+* Mon Oct 20 2003 Nalin Dahyabhai <nalin@redhat.com>
+- obey RPM_OPT_FLAGS again when krb5_prefix != %%{_prefix}
+
+* Fri Oct 17 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-5
+- install saslauthd's mdoc page instead of the pre-formatted man page, which
+  would get formatted again
+
+* Thu Sep 25 2003 Jeff Johnson <jbj@jbj.org> 2.1.15-5
+- rebuild against db-4.2.42.
+
+* Mon Sep 15 2003 Nalin Dahyabhai <nalin@redhat.com>
+- include testsaslauthd
+- note in the README that the saslauthd protocol is different for v1 and v2,
+  so v1's clients can't talk to the v2 server
+
+* Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-4
+- rebuild
+
+* Thu Aug 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-3
+- add logic to build with gssapi libs in either /usr or /usr/kerberos
+
+* Mon Jul 21 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-2
+- rebuild
+
+* Tue Jul 15 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.15-1
+- update to 2.1.15
+
+* Mon Jul 14 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.14-1
+- update to 2.1.14
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri May  9 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-3
+- change -m argument to saslauthd to be a directory instead of a path
+
+* Thu May  8 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-2
+- link libsasl2 with -lpthread to ensure that the sasldb plug-in can always
+  be loaded
+
+* Tue Apr 29 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.13-1
+- update to 2.1.13
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-3
+- rebuild
+
+* Thu Dec 12 2002 Nalin Dahyabhai <nalin@redhat.com>
+- consider either des_cbc_encrypt or DES_cbc_encrypt to be sufficient when
+  searching for a DES implementation in libcrypto
+- pull in CPPFLAGS and LDFLAGS from openssl's pkg-config data, if it exists
+
+* Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-2
+- rebuild
+
+* Mon Dec  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.10-1
+- update to 2.1.10, fixing buffer overflows in libsasl2 noted by Timo Sirainen
+
+* Tue Nov 12 2002 Tim Powers <timp@redhat.com> 2.1.7-5
+- remove files from $RPM_BUILD_ROOT that we don't intend to include
+
+* Wed Oct  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-4
+- update to SASLv1 to final 1.5.28
+
+* Fri Sep 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-3
+- rebuild, overriding sasldir when running make so that on multilib systems
+  applications will be able to load modules for the right arch
+
+* Mon Sep  2 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-2
+- include dbconverter-2 (#68741)
+
+* Fri Aug  9 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.7-1
+- update to 2.1.7, fixing a race condition in digest-md5
+
+* Wed Jul 17 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.6-1
+- update to 2.1.6 and 1.5.28
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu Jun 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.5-1
+- update to 2.1.5
+
+* Mon Jun 10 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.4-1
+- update to 2.1.4
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 16 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.2-1
+- modify to build with db 4.x
+
+* Thu Apr 18 2002 Nalin Dahyabhai <nalin@redhat.com>
+- update cyrus-sasl 2 to 2.1.2
+- change buildreq to db3-devel
+
+* Tue Feb 12 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.1-3
+- suppress output to stdout/stderr in %%postun
+
+* Sun Feb 10 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.1-2
+- configure sasldb2 to use berkeley DB instead of gdbm
+
+* Wed Feb  6 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.1-1
+- update to 2.1.1
+
+* Thu Jan 31 2002 Nalin Dahyabhai <nalin@redhat.com> 2.1.0-1
+- marge 1.5.24 back in, making a note that it should be removed at some
+  point in the future
+
+* Wed Jan 30 2002 Nalin Dahyabhai <nalin@redhat.com>
+- update to 2.1.0, which is designed to be installed in parallel with cyrus sasl
+  1.x, so fork the package and rename it to cyrus-sasl2
+- add the sasldb auxprop plugin to the main package
+- add disabled-by-default saslauthd init script
+- move the .la files for plugins into their respective packages -- they're
+  needed by the library
+
+* Wed Jan 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-24
+- free ride through the build system
+
+* Fri Nov  2 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-23
+- patch to fix possible syslog format-string vulnerability 
+
+* Mon Oct 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-22
+- add pam-devel as a buildprereq
+
+* Wed Aug 29 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-21
+- include sample programs in the -devel subpackage, prefixing their names
+  with "sasl-" to reduce future potential naming conflicts
+
+* Tue Aug 14 2001 Nalin Dahyabhai <nalin@redhat.com> 1.5.24-20
+- build without -ggdb
+
+* Fri Aug  3 2001 Nalin Dahyabhai <nalin@redhat.com>
+- add gdbm-devel as a build dependency (#44990)
+- split off CRAM-MD5 and DIGEST-MD5 into a subpackage of their own (#43079,
+  and dialogs with David L. Parsley)
+
+* Fri Apr 27 2001 Nalin Dahyabhai <nalin@redhat.com>
+- split out the PLAIN and LOGIN mechanisms into their own package (this allows
+  an administrator to disable them by simply removing the package)
+
+* Fri Jan 19 2001 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment
+
+* Wed Dec  6 2000 Nalin Dahyabhai <nalin@redhat.com>
+- fix gssapi-over-tls
+
+* Fri Oct 27 2000 Nalin Dahyabhai <nalin@redhat.com>
+- enable static libraries, but always build with -fPIC
+
+* Wed Oct 25 2000 Nalin Dahyabhai <nalin@redhat.com>
+- make sure the version of 1.5.24 in the package matches the masters (#18968)
+
+* Mon Oct  9 2000 Nalin Dahyabhai <nalin@redhat.com>
+- re-add the libsasl.so symlink to the -devel package (oops)
+
+* Fri Oct  6 2000 Nalin Dahyabhai <nalin@redhat.com>
+- move .so files for modules to their respective packages -- they're not -devel
+  links meant for use by ld anyway
+
+* Thu Oct  5 2000 Nalin Dahyabhai <nalin@redhat.com>
+- split off -devel subpackage
+- add a -gssapi subpackage for the gssapi plugins
+
+* Wed Aug 16 2000 Nalin Dahyabhai <nalin@redhat.com>
+- fix the summary text
+
+* Sun Aug 13 2000 Nalin Dahyabhai <nalin@redhat.com>
+- re-enable arcfour and CRAM
+
+* Fri Aug  4 2000 Nalin Dahyabhai <nalin@redhat.com>
+- force use of gdbm for database files to avoid DB migration weirdness
+- enable login mechanism
+- disable gssapi until it can coexist peacefully with non-gssapi setups
+- actually do a make in the build section (#15410)
+
+* Fri Jul 21 2000 Nalin Dahyabhai <nalin@redhat.com>
+- update to 1.5.24
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Tue Jun 27 2000 Nalin Dahyabhai <nalin@redhat.com>
+- rebuild in new environment (release 3)
+
+* Mon Jun 19 2000 Nalin Dahyabhai <nalin@redhat.com>
+- don't muck with syslogd in post
+- remove patch for db-3.0 wackiness, no longer needed
+
+* Thu Jun  8 2000 Nalin Dahyabhai <nalin@redhat.com>
+- FHS cleanup
+- don't strip anything by default
+
+* Fri Feb 11 2000 Tim Powers <timp@redhat.com>
+- fixed man pages not being gzipped
+
+* Tue Nov 16 1999 Tim Powers <timp@redhat.com>
+- incorporated changes from Mads Kiilerich
+- release number is 1, not mk1
+
+* Wed Nov 10 1999 Mads Kiilerich <mads@kiilerich.com>
+- updated to sasl 1.5.11
+- configure --disable-krb4 --without-rc4 --disable-cram 
+  because of missing libraries and pine having cram as default...
+- handle changing libsasl.so versions
+
+* Mon Aug 30 1999 Tim Powers <timp@redhat.com>
+- changed group
+
+* Fri Aug 13 1999 Tim Powers <timp@redhat.com>
+- first build for Powertools

cyrus-sasl-2.1.28-nodlcompatorsrp.tar.gz Added

make-no-dlcompatorsrp-tarball.sh Added

@@ -0,0 +1,41 @@
+#!/bin/bash -e
+#
+#  See https://github.com/cyrusimap/cyrus-sasl/releases for unmodified sources.
+#
+
+tmppath=`mktemp -d ${TMPDIR:-/tmp}/make-no-dlcompat-tarball-XXXXXX`
+if test -z "$tmppath" ; then
+	echo Error creating temporary directory.
+	exit 1
+fi
+trap "rm -fr $tmppath" EXIT
+
+initialdir=`pwd`
+
+for tarball in ${initialdir}/cyrus-sasl-*.tar.{gz,bz2} ; do
+	if ! test -s "$tarball" ; then
+		continue
+	fi
+	rm -fr $tmppath/*
+	pushd $tmppath > /dev/null
+	case "$tarball" in
+	*nodlcompat*)
+		: Do nothing.
+		;;
+	*.gz)
+		gzip  -dc "$tarball" | tar xf -
+		rm -fr cyrus-sasl-*/dlcompat*
+		rm -fr cyrus-sasl-*/plugins/srp*
+		tar cf - * | gzip  -9c > \
+		$initialdir/`basename $tarball .tar.gz`-nodlcompatorsrp.tar.gz
+		;;
+	*.bz2)
+		bzip2 -dc "$tarball" | tar xf -
+		rm -fr cyrus-sasl-*/dlcompat*
+		rm -fr cyrus-sasl-*/plugins/srp*
+		tar cf - * | bzip2 -9c > \
+		$initialdir/`basename $tarball .tar.bz2`-nodlcompatorsrp.tar.bz2
+		;;
+	esac
+	popd > /dev/null
+done

sasl-mechlist.c Added

@@ -0,0 +1,99 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "sasl.h"
+
+static int
+my_getopt(void *context, const char *plugin_name,
+	  const char *option, const char **result, unsigned *len)
+{
+	if (result) {
+		*result = NULL;
+#if 0
+		fprintf(stderr, "Getopt plugin=%s%s%s/option=%s%s%s -> ",
+			plugin_name ? "\"" : "",
+			plugin_name ? plugin_name : "(null)",
+			plugin_name ? "\"" : "",
+			option ? "\"" : "",
+			option ? option : "(null)",
+			option ? "\"" : "");
+		fprintf(stderr, "'%s'.\n", *result ? *result : "");
+#endif
+	}
+	if (len) {
+		*len = 0;
+	}
+	return 0;
+}
+
+int
+main(int argc, char **argv)
+{
+	int ret, i;
+	const char *mechs, **globals;
+	sasl_callback_t callbacks = {
+		{SASL_CB_GETOPT, my_getopt, NULL},
+		{SASL_CB_LIST_END},
+	};
+	sasl_conn_t *connection;
+	char hostname512;
+
+	if ((argc > 1) && (argv10 == '-')) {
+		fprintf(stderr, "Usage: %s appname hostname \n", argv0);
+		return 0;
+	}
+
+	ret = sasl_server_init(callbacks, argc > 1 ? argv1 : "sasl-mechlist");
+	if (ret != SASL_OK) {
+		fprintf(stderr, "Error in sasl_server_init(): %s\n",
+			sasl_errstring(ret, NULL, NULL));
+	}
+
+	connection = NULL;
+	strcpy(hostname, "localhost");
+	gethostname(hostname, sizeof(hostname));
+	ret = sasl_server_new(argc > 2 ? argv2 : "host",
+			      hostname,
+			      NULL,
+			      NULL,
+			      NULL,
+			      callbacks,
+			      0,
+			      &connection);
+	if (ret != SASL_OK) {
+		fprintf(stderr, "Error in sasl_server_new(): %s\n",
+			sasl_errstring(ret, NULL, NULL));
+	}
+
+	ret = sasl_listmech(connection,
+			    getenv("USER") ? getenv("USER") : "root",
+			    "Available mechanisms: ",
+			    ",",
+			    "\n",
+			    &mechs,
+			    NULL,
+			    NULL);
+	if (ret != SASL_OK) {
+		fprintf(stderr, "Error in sasl_listmechs(): %s\n",
+			sasl_errstring(ret, NULL, NULL));
+	} else {
+		fprintf(stdout, "%s", mechs);
+	}
+
+	globals = sasl_global_listmech();
+	for (i = 0; (globals != NULL) && (globalsi != NULL); i++) {
+		if (i == 0) {
+			fprintf(stdout, "Library supports: ");
+		}
+		fprintf(stdout, "%s", globalsi);
+		if (globalsi + 1 != NULL) {
+			fprintf(stdout, ",");
+		} else {
+			fprintf(stdout, "\n");
+		}
+	}
+
+	return 0;
+}

saslauth.sysusers Added

saslauthd.service Added

saslauthd.sysconfig Added

Build Results
RPM Lint

Refresh

Submit package home:molle...interfell / guam-selfcontained to package Kolab:16:Testing / guam

guam.spec Changed

@@ -14,11 +14,13 @@
 %endif
 
 %{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
+%{!?_erldir: %global _erldir /usr/lib64/erlang/}
+%{!?_erllibdir: %global _erllibdir /usr/lib64/erlang/lib}
 
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
 Name:               guam
-Version:            0.9.11
+Version:            0.9.12
 Release:            1%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
@@ -29,26 +31,18 @@
 Source0:            guam-%{version}.tar.gz
 Source100:          plesk.sys.config
 
-Patch9991:          nodeps.patch
-
 BuildRequires:      erlang >= 17.4
 BuildRequires:      erlang-asn1
 BuildRequires:      erlang-common_test
 BuildRequires:      erlang-compiler
 BuildRequires:      erlang-crypto
 BuildRequires:      erlang-debugger
-BuildRequires:      erlang-eimap >= 0.4.0
 BuildRequires:      erlang-erts
 BuildRequires:      erlang-et
-BuildRequires:      erlang-goldrush >= 0.1.8
 BuildRequires:      erlang-kernel
-BuildRequires:      erlang-lager >= 3.1.0
-BuildRequires:      erlang-lager_syslog >= 2.0.3
 BuildRequires:      erlang-mnesia
 BuildRequires:      erlang-observer
 BuildRequires:      erlang-public_key
-BuildRequires:      erlang-rebar3 >= 3.3.2
-BuildRequires:      erlang-rpm-macros
 BuildRequires:      erlang-runtime_tools
 BuildRequires:      erlang-sasl
 BuildRequires:      erlang-snmp
@@ -56,17 +50,11 @@
 BuildRequires:      erlang-ssl
 BuildRequires:      erlang-stdlib
 BuildRequires:      erlang-syntax_tools
-BuildRequires:      erlang-syslog >= 1.0.3
 BuildRequires:      erlang-tools
 BuildRequires:      erlang-wx
 BuildRequires:      erlang-xmerl
 
-Requires:           %lock_version erlang
-Requires:           %lock_version erlang-eimap
-Requires:           %lock_version erlang-goldrush
-Requires:           %lock_version erlang-lager
-Requires:           %lock_version erlang-lager_syslog
-
+Requires:           erlang
 Requires:           which
 
 %if 0%{?with_systemd}
@@ -95,17 +83,23 @@
 %prep
 %setup -q
 
-%patch9991 -p1
-
 %build
 
 DEBUG=1
 export DEBUG
 
+# Only available since hex v0.9.0
 HEX_OFFLINE=true
 export HEX_OFFLINE
 
-rebar3 release \
+REBAR_CACHE_DIR=cache/rebar3/
+export REBAR_CACHE_DIR
+
+# Rebuild all beam files (The otp version from the tarball may not match)
+rm -rf _build
+./rebar3 compile
+
+./rebar3 release \
     --dev-mode false \
     --relname %{name} \
     --relvsn %{version} \
@@ -119,7 +113,7 @@
     %{buildroot}%{_sysconfdir}/%{name}/ \
     %{buildroot}%{_sbindir} \
     %{buildroot}%{_erldir}/bin/ \
-    %{buildroot}%{_erllibdir}/%{realname}-%{version}/ \
+    %{buildroot}%{_erllibdir}/ \
 %if 0%{?with_systemd}
     %{buildroot}%{_unitdir}/ \
 %else
@@ -146,10 +140,19 @@
 ln -s ../lib/%{realname}-%{version}/bin/%{binname} %{realname}
 popd
 
-cp -a _build/default/rel/%{name}/bin %{buildroot}%{_erllibdir}/%{realname}-%{version}/
-cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
-cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+mkdir -p %{buildroot}%{_erllibdir}/%{realname}-%{version}/bin/
+cp -av _build/default/rel/%{name}/bin/* %{buildroot}%{_erllibdir}/%{realname}-%{version}/bin/
 
+# Remove the sources
+find _build/default/rel/%{name}/lib/ -type d -name "src" -exec rm -Rf {} +
+
+# Copy over all lib dirs
+cp -av _build/default/rel/%{name}/lib/* %{buildroot}%{_erllibdir}/
+
+# Copy over the release directory as well
+cp -av _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+
+# More configuration
 %if 0%{?plesk}
 install -m 644 -p %{SOURCE100} %{buildroot}%{_sysconfdir}/guam/sys.config
 %endif
@@ -171,8 +174,18 @@
 EOF
 
 %check
-# Hopeless on -0.9
-rebar3 eunit -v || :
+
+DEBUG=1
+export DEBUG
+
+HEX_OFFLINE=true
+export HEX_OFFLINE
+
+REBAR_CACHE_DIR=cache/rebar3/
+export REBAR_CACHE_DIR
+
+./rebar3 eunit -v
+./rebar3 ct -v
 
 %postun
 %if 0%{?with_systemd}
@@ -214,7 +227,7 @@
 %config(noreplace) %{_sysconfdir}/%{name}/vm.args
 %attr(0750,root,root) %{_sbindir}/%{name}
 %{_libdir}/erlang/bin/%{realname}
-%{_libdir}/erlang/lib/%{realname}-%{version}
+%{_libdir}/erlang/lib/
 %attr(0640,root,root) %{_var}/log/%{name}/
 
 %if 0%{?with_systemd}
@@ -224,6 +237,9 @@
 %endif
 
 %changelog
+* Tue Apr 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.9.12-1
+- Release of version 0.9.12
+
 * Mon Jun 07 2021 Christian Mollekopf <mollekopf@kolabsys.com> - 0.9.11-1
 - Release of version 0.9.11

nodeps.patch Deleted

README.md Added

buildtarball.sh Added

debian.changelog Changed

debian.control Changed

@@ -5,37 +5,17 @@
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 10) | dh-systemd (>= 1.5),
 	erlang (>= 17.4),
-	erlang-eimap (>= 0.3.0),
-	erlang-goldrush (>= 0.2.0),
-	erlang-lager,
-	erlang-lager-syslog,
-	psa | bash,
-	erlang-rebar3 (>= 3.3.2)
+	psa | bash
 Homepage: https://kolab.org/about/guam
 
 Package: guam
 Architecture: any
 Section: mail
-Depends: ${misc:Depends}, ${dist:GuamDepends}
+Depends: erlang-base | erlang-base-hipe,
+    erlang-asn1,
+    erlang-inets,
+    erlang-public-key
+Conflicts: erlang-goldrush, erlang-eimap, erlang-lager, erlang-syslog
 Description: Smart Reverse IMAP Proxy
  Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at
  the perimeter of your IMAP environment.
-
-Package: guam-libs
-Architecture: any
-Section: mail
-Depends: ${misc:Depends}, ${dist:GuamLibDepends}
-Conflicts: guam-bundled-libs
-Description: Dependency meta-package for Guam
- This package pulls in all the library dependencies required to run Guam.
- Debian backports users who have a backported Erlang version may need to install
- guam-bundled-libs instead.
-
-Package: guam-bundled-libs
-Architecture: any
-Section: mail
-Depends: ${misc:Depends}, ${dist:GuamBundleDepends}
-Conflicts: guam-libs
-Description: Bundled runtime environment for Guam
- This is a support package for Debian backports users who have a backported
- Erlang version. All others should preferably use guam-libs.

debian.rules Changed

@@ -3,73 +3,49 @@
 include /usr/share/dpkg/pkg-info.mk
 
 DESTDIR   = $(CURDIR)/debian/guam
-LIBDIR    = $(CURDIR)/debian/guam-libs
-BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs
-
-# The versions of all dependencies are hardcoded by relx (which honestly sucks).
-# The following magic tries to ensure that the Debian package's dependencies are
-# pinned to the versions present on the build machine.
-# Usually, we pull in the package "guam-libs", which declares all the regular
-# dependencies and creates an appropriate "lib" symlink.
-# However, if the dependencies cannot be satisfied on the end user's machine -
-# for instance because a  different Erlang version was installed from backports
-# - we make the package manager pull in an extra package "guam-bundled-libs"
-# that contains all the dependencies in the exact versions expected by relx.
-#
-# For maintainers, the bottom line is this: please revision-bump this package
-# every time one of its dependencies gets version-bumped.
-currver = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/+-.*$$//')
-nextver = $(shell echo $(call currver,$(1)) | perl -pe 's/((\d+\.)*)(\d+)$$/$$1.($$3+1)/e')
-pinvermin = $(1) (>= $(call currver,$(1)))
-pinvermax = $(1) (<< $(call nextver,$(1)))
-pinver    = $(call pinvermin,$(1)), $(call pinvermax,$(1))
-pinvererlmin = $(1) (>= $(call currver,erlang))
-pinvererlmax = $(1) (<< $(call nextver,erlang))
-
-# We ship these packages ourselves, so they don't need bundling
-KOLAB_PROVIDED_DEPS := $(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog)
-EIMAP_DIR        := eimap-$(call currver,erlang-eimap)
-LAGER_SYSLOG_DIR := lager_syslog-$(call currver,erlang-lager-syslog)
-
-SUBSTVARS += -Vdist:GuamDepends="guam-libs (= $(DEB_VERSION)) | guam-bundled-libs (= $(DEB_VERSION))"
-SUBSTVARS += -Vdist:GuamLibDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe), $(KOLAB_PROVIDED_DEPS), $(call pinver,erlang-asn1), $(call pinver,erlang-goldrush), $(call pinver,erlang-inets), $(call pinver,erlang-lager), $(call pinver,erlang-public-key)"
-SUBSTVARS += -Vdist:GuamBundleDepends="$(KOLAB_PROVIDED_DEPS)"
 
 %:
 	dh $@ --with=systemd
 
 override_dh_auto_build:
-	sed -i -e 's/include_erts,\s*false/include_erts, true/' rebar.config
 	export DEBUG=1
-	export HEX_OFFLINE=1
+	export HEX_OFFLINE=true
+	export REBAR_CACHE_DIR="cache/rebar3/"
+
+	# Rebuild all beam files (The otp version from the tarball may not match)
+	rm -rf _build
+	./rebar3 compile
+
 	./rebar3 release \
 		--dev-mode false \
 		--relname guam \
 		--relvsn $(DEB_VERSION_UPSTREAM) \
 		--verbose
 
-
 override_dh_auto_clean:
-	./rebar3 clean || :
+    # do nothing, rebar3 clean would clear the artifacts that we need above
+    #./rebar3 clean || :
 
 override_dh_auto_test:
+	export DEBUG=1
+	export HEX_OFFLINE=true
+	export REBAR_CACHE_DIR="cache/rebar3/"
 	./rebar3 eunit -v || :
+	./rebar3 ct -v || :
 
 override_dh_auto_install:
-	mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \
-		$(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log/ \
+	mkdir -p $(DESTDIR)/usr/sbin \
+		$(DESTDIR)/etc/guam \
+		$(DESTDIR)/lib/systemd/system \
+		$(DESTDIR)/var/log/ \
 		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ \
-		$(DESTDIR)/usr/lib/erlang/bin $(DESTDIR)/var/log/guam
+		$(DESTDIR)/usr/lib/erlang/bin \
+		$(DESTDIR)/var/log/guam
 	chmod o= $(DESTDIR)/var/log/guam
 
+	# Service scripts
 	install -p -m 644 contrib/guam.service \
-	        $(DESTDIR)/lib/systemd/system/guam.service
-
-	cp -a _build/default/rel/guam/bin \
-		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-
-	cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \
-		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+			$(DESTDIR)/lib/systemd/system/guam.service
 
 	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
 	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/vm.args
@@ -77,6 +53,7 @@
 	cp -a _build/default/rel/guam/releases \
 		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
 
+	# Configuration
 	if  -f "/etc/plesk-release" ; then \
 		cp ../SOURCES/plesk.sys.config \
 			$(DESTDIR)/etc/guam/sys.config ; \
@@ -99,30 +76,25 @@
 
 	ln -s ../../../../../var/log/guam $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log
 
+	cp -a _build/default/rel/guam/bin \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
+	# Remove the sources
+	find _build/default/rel/guam/lib/ -type d -name "src" -exec rm -Rf {} +
+
+	# Copy over all lib dirs
+	cp -av _build/default/rel/guam/lib $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
+
+	# Copy over the release directory as well
+	cp -av _build/default/rel/guam/releases/ $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
 	echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam
 	echo 'exec /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam $$*' \
-	     >> $(DESTDIR)/usr/sbin/guam
+		 >> $(DESTDIR)/usr/sbin/guam
 	chmod +x $(DESTDIR)/usr/sbin/guam
 
 	ln -s ../lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam \
 		$(DESTDIR)/usr/lib/erlang/bin/kolab_guam
 
-	# Symlink for system-installed libraries
-	mkdir -p $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	ln -s ../../lib $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
-
-	# Bundled runtime system and libraries
-	mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	cp -a _build/default/rel/guam/erts-* \
-		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	cp -a _build/default/rel/guam/lib \
-		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	for dir in $(EIMAP_DIR) $(LAGER_SYSLOG_DIR); do \
-		rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-		ln -s ../../$$dir $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-	done
-
 override_dh_gencontrol:
-	dh_gencontrol -- $(SUBSTVARS)
+	dh_gencontrol

debian.series Changed

guam-0.9.11.tar.gz -> guam-0.9.12.tar.gz Changed

guam.dsc Changed

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:b...Kolab:Winterfell / kolab to package Kolab:16:Testing / kolab

kolab.spec Changed

Build Results
RPM Lint

Refresh

Submit package home:molleko...:Winterfell / kolab-autoconf to package Kolab:16:Testing / kolab-autoconf

kolab-autoconf.spec Changed

kolab-autoconf-1.3.4.tar.gz/composer.json Deleted

kolab-autoconf-1.3.4.tar.gz/lib/Autodiscover.php Changed

kolab-autoconf-1.3.4.tar.gz/public_html/index.php Changed

Build Results
RPM Lint

Refresh

Submit package home:molleko...:Winterfell / kolab-freebusy to package Kolab:16:Testing / kolab-freebusy

kolab-freebusy.spec Changed

@@ -35,9 +35,7 @@
 
 BuildArch:      noarch
 
-%if 0%{?rhel} < 8 || 0%{?fedora}
 BuildRequires:  composer
-%endif
 %if 0%{?fedora}
 # fix issue:
 # have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
@@ -45,12 +43,11 @@
 BuildRequires:  php-justinrainbow-json-schema4
 %endif
 
-%if 0%{?rhel} < 8 || 0%{?fedora}
 BuildRequires:  php-Monolog
 BuildRequires:  php-sabre-dav >= 2.1.3
-%endif
 BuildRequires:  roundcubemail(core)
-BuildRequires:  roundcubemail-plugins-kolab
+BuildRequires:  roundcubemail-plugin-libcalendaring
+BuildRequires:  roundcubemail-plugin-libkolab
 
 %if 0%{?suse_version}
 Requires:       http_daemon
@@ -60,16 +57,17 @@
 Requires:       php-common >= 5.3
 %endif
 
-Requires:       kolab-utils
 Requires:       logrotate
-%if 0%{?rhel} < 8 || 0%{?fedora}
+%if 0%{?plesk}
+%else
 Requires:       php-ldap
-Requires:       php-Monolog
 Requires:       php-kolab-net-ldap3
-Requires:       php-sabre-dav >= 2.1.3
 %endif
+Requires:       php-Monolog
+Requires:       php-sabre-dav >= 2.1.3
 Requires:       roundcubemail(core)
-Requires:       roundcubemail-plugins-kolab
+BuildRequires:  roundcubemail-plugin-libcalendaring
+BuildRequires:  roundcubemail-plugin-libkolab
 
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
@@ -84,7 +82,6 @@
 %setup -q
 
 %build
-%if 0%{?rhel} < 8 || 0%{?fedora}
 rm -rf composer.json
 mv composer.json-dist composer.json
 mkdir -p $HOME/.composer/
@@ -94,7 +91,6 @@
 export USE_ZEND_ALLOC=0
 %endif
 composer -vvv dumpautoload --optimize
-%endif
 
 %install
 mkdir -p \
@@ -122,9 +118,7 @@
 popd
 
 cp -a public_html %{buildroot}/%{_datadir}/%{name}/public_html
-%if 0%{?rhel} < 8
 cp -a vendor %{buildroot}/%{_datadir}/%{name}/vendor
-%endif
 
 cp -a config/config.ini.sample %{buildroot}/%{_sysconfdir}/%{name}/config.ini

debian.control Changed

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:...lab:Winterfell / libkolab to package Kolab:16:Testing / libkolab

libkolab.spec Changed

@@ -200,6 +200,26 @@
 
 %description -n plesk-php74-kolab
 libkolab bindings for Plesk's PHP 7.4
+
+%package -n plesk-php80-kolab
+Summary:        libkolab bindings for Plesk's PHP 8.0
+Group:          System Environment/Libraries
+Provides:       php-bindings(libkolab) = %{version}-%{release}
+Requires:       libkolab%{?_isa} = %{version}
+Requires:       plesk-php80
+
+%description -n plesk-php80-kolab
+libkolab bindings for Plesk's PHP 8.0
+
+%package -n plesk-php81-kolab
+Summary:        libkolab bindings for Plesk's PHP 8.1
+Group:          System Environment/Libraries
+Provides:       php-bindings(libkolab) = %{version}-%{release}
+Requires:       libkolab%{?_isa} = %{version}
+Requires:       plesk-php81
+
+%description -n plesk-php81-kolab
+libkolab bindings for Plesk's PHP 8.1
 %endif
 
 %package -n python-kolab
@@ -254,6 +274,12 @@
 
 cp -a libkolab-%{version} libkolab-%{version}-7.4
 sed -i "s/-php/-php7/g" libkolab-%{version}-7.4/cmake/modules/SWIGUtils.cmake
+
+cp -a libkolab-%{version} libkolab-%{version}-8.0
+sed -i "s/-php/-php7/g" libkolab-%{version}-8.0/cmake/modules/SWIGUtils.cmake
+
+cp -a libkolab-%{version} libkolab-%{version}-8.1
+sed -i "s/-php/-php7/g" libkolab-%{version}-8.1/cmake/modules/SWIGUtils.cmake
 %endif
 
 %if 0%{?with_php7}
@@ -263,7 +289,7 @@
 %endif
 
 %if 0%{?with_python}
-cp -a libkolab-%{version} libkolab-%{version}-python
+cp -a libkolab-%{version} libkolab-%{version}-python2
 %endif
 
 %if 0%{?with_python3}
@@ -313,7 +339,7 @@
 popd
 
 %if 0%{with_python}
-    pushd %{name}-%{version}-python
+    pushd %{name}-%{version}-python2
     rm -rf build
     mkdir -p build
     pushd build
@@ -365,9 +391,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     rm -rf build
@@ -422,9 +448,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     pushd build
@@ -456,7 +482,7 @@
 %endif
 
 %if 0%{?with_python}
-pushd %{name}-%{version}-python
+pushd %{name}-%{version}-python2
 pushd build
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 popd
@@ -561,6 +587,20 @@
 /opt/plesk/php/7.4/share/php/*.php
 /opt/plesk/php/7.4/etc/php.d/*.ini
 /opt/plesk/php/7.4/etc/php-fpm.d/*.ini
+
+%files -n plesk-php80-kolab
+%defattr(-,root,root,-)
+/opt/plesk/php/8.0/lib64/php/modules/*.so
+/opt/plesk/php/8.0/share/php/*.php
+/opt/plesk/php/8.0/etc/php.d/*.ini
+/opt/plesk/php/8.0/etc/php-fpm.d/*.ini
+
+%files -n plesk-php81-kolab
+%defattr(-,root,root,-)
+/opt/plesk/php/8.1/lib64/php/modules/*.so
+/opt/plesk/php/8.1/share/php/*.php
+/opt/plesk/php/8.1/etc/php.d/*.ini
+/opt/plesk/php/8.1/etc/php-fpm.d/*.ini
 %endif
 
 %if 0%{?with_python} > 0

Build Results
RPM Lint

Refresh

Submit package home:mollekop...ab:Winterfell / libkolabxml to package Kolab:16:Testing / libkolabxml

libkolabxml.spec Changed

@@ -4,6 +4,9 @@
 #!BuildIgnore:	httpd
 %endif
 
+# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
+%define __cmake_in_source_build 1
+
 %{?!mono_arches: %global mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64}
 
 %ifarch %{mono_arches}
@@ -338,6 +341,27 @@
 
 %description -n plesk-php74-kolabformat
 libkolabxml bindings for Plesk's PHP 7.4
+
+%package -n plesk-php80-kolabformat
+Summary:        libkolabxml bindings for Plesk's PHP 8.0
+Group:          System Environment/Libraries
+Provides:       php-bindings(libkolabxml) = %{version}-%{release}
+Requires:       libkolabxml%{?_isa} = %{version}
+Requires:       plesk-php80
+
+%description -n plesk-php80-kolabformat
+libkolabxml bindings for Plesk's PHP 8.0
+
+%package -n plesk-php81-kolabformat
+Summary:        libkolabxml bindings for Plesk's PHP 8.1
+Group:          System Environment/Libraries
+Provides:       php-bindings(libkolabxml) = %{version}-%{release}
+Requires:       libkolabxml%{?_isa} = %{version}
+Requires:       plesk-php81
+
+%description -n plesk-php81-kolabformat
+libkolabxml bindings for Plesk's PHP 8.1
+
 %endif # if 0%{?plesk}
 
 %if 0%{?with_python} > 0
@@ -404,6 +428,12 @@
 
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.4
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.4/src/php/CMakeLists.txt
+
+cp -a libkolabxml-%{version} libkolabxml-%{version}-8.0
+sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
+
+cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
+sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
 %endif
 
 %if 0%{?with_php7}
@@ -434,6 +464,8 @@
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.3/.
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-8.0/.
+cp %{name}-%{version}/tztable.h %{name}-%{version}-8.1/.
 %endif
 %if 0%{?with_python3} > 0
 cp %{name}-%{version}/tztable.h %{name}-%{version}-python3/.
@@ -464,8 +496,6 @@
 %endif
     -DBUILD_SHARED_LIBS:BOOL=ON \
 %else # if 0${?suse_version}
-# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
-%define __cmake_in_source_build 1
 %cmake \
 %endif
     -DBoost_NO_BOOST_CMAKE=TRUE \
@@ -524,9 +554,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     rm -rf build
@@ -582,9 +612,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}
     pushd build
@@ -633,9 +663,9 @@
 
 %if 0%{?plesk}
 %if 0%{?rhel} < 8 || 0%{?fedora}
-for version in 5.6 7.0 7.1 7.2 7.3 7.4; do
+for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
 %else
-for version in 7.1 7.2 7.3 7.4; do
+for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
 %endif
     pushd %{name}-%{version}-${version}/build/
     export LD_LIBRARY_PATH=$( pwd )/src/
@@ -732,6 +762,20 @@
 /opt/plesk/php/7.4/etc/php.d/kolabformat.ini
 /opt/plesk/php/7.4/etc/php-fpm.d/kolabformat.ini
 
+%files -n plesk-php80-kolabformat
+%defattr(-,root,root,-)
+/opt/plesk/php/8.0/lib64/php/modules/kolabformat.so
+/opt/plesk/php/8.0/share/php/kolabformat.php
+/opt/plesk/php/8.0/etc/php.d/kolabformat.ini
+/opt/plesk/php/8.0/etc/php-fpm.d/kolabformat.ini
+
+%files -n plesk-php81-kolabformat
+%defattr(-,root,root,-)
+/opt/plesk/php/8.1/lib64/php/modules/kolabformat.so
+/opt/plesk/php/8.1/share/php/kolabformat.php
+/opt/plesk/php/8.1/etc/php.d/kolabformat.ini
+/opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini
+
 %endif # if 0%{?plesk}
 
 %endif # if 0%{?with_php}

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:br...:Kolab:Winterfell / php to package Kolab:16:Testing / php

php.spec Added

@@ -0,0 +1,3550 @@
+# Fedora spec file for php
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
+# API/ABI check
+%global apiver      20210902
+%global zendver     20210902
+%global pdover      20170320
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
+# Adds -z now to the linker flags
+%global _hardened_build 1
+
+# version used for php embedded library soname
+%global embed_version 8.1
+
+%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
+
+# Regression tests take a long time, you can skip 'em with this
+#global runselftest 0
+%{!?runselftest: %global runselftest 1}
+
+# Use the arch-specific mysql_config binary to avoid mismatch with the
+# arch detection heuristic used by bindir/mysql_config.
+%global mysql_config %{_libdir}/mysql/mysql_config
+
+# needed at srpm build time, when httpd-devel not yet installed
+%{!?_httpd_mmn:        %{expand: %%global _httpd_mmn        %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
+
+%if 0%{?fedora}
+# Enabled by default on Fedora
+%bcond_without   zts
+%ifarch s390x
+# https://bugzilla.redhat.com/show_bug.cgi?id=1969393
+# firebird have ExcludeArch: s390x
+%bcond_with      firebird
+%else
+%bcond_without   firebird
+%endif
+%bcond_without   freetds
+%bcond_without   sodium
+%bcond_without   pspell
+%bcond_without   tidy
+%bcond_without   db4
+%bcond_without   qdbm
+%else
+# Disabled by default on RHEL
+%bcond_with      zts
+%bcond_with      firebird
+%bcond_with      freetds
+%bcond_with      sodium
+%bcond_with      pspell
+%bcond_with      tidy
+%bcond_with      db4
+%bcond_with      qdbm
+%endif
+%bcond_with      modphp
+%bcond_with      imap
+%bcond_without   lmdb
+
+%global upver        8.1.9
+#global rcver        RC1
+
+Summary: PHP scripting language for creating dynamic web sites
+Name: php
+Version: %{upver}%{?rcver:~%{rcver}}
+Release: 1%{?dist}
+# All files licensed under PHP version 3.01, except
+# Zend is licensed under Zend
+# TSRM is licensed under BSD
+# main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
+# ext/date/lib is MIT
+# Zend/zend_sort is NCSA
+# Zend/asm is Boost
+License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and Boost
+URL: http://www.php.net/
+
+Source0: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
+Source1: php.conf
+Source2: php.ini
+Source3: macros.php
+Source4: php-fpm.conf
+Source5: php-fpm-www.conf
+Source6: php-fpm.service
+Source7: php-fpm.logrotate
+Source9: php.modconf
+Source12: php-fpm.wants
+Source13: nginx-fpm.conf
+Source14: nginx-php.conf
+# See https://secure.php.net/gpg-keys.php
+Source20: https://www.php.net/distributions/php-keyring.gpg
+Source21: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz.asc
+# Configuration files for some extensions
+Source50: 10-opcache.ini
+Source51: opcache-default.blacklist
+Source53: 20-ffi.ini
+
+# Build fixes
+Patch1: php-7.4.0-httpd.patch
+Patch5: php-7.2.0-includedir.patch
+Patch6: php-8.0.0-embed.patch
+Patch8: php-8.1.0-libdb.patch
+
+# Functional changes
+# Use system nikic/php-parser
+Patch41: php-8.1.0-parser.patch
+# use system tzdata
+Patch42: php-8.1.0-systzdata-v22.patch
+# See http://bugs.php.net/53436
+Patch43: php-7.4.0-phpize.patch
+# Use -lldap_r for OpenLDAP
+Patch45: php-7.4.0-ldap_r.patch
+# drop "Configure command" from phpinfo output
+# and only use gcc (instead of full version)
+Patch47: php-8.1.0-phpinfo.patch
+
+# Upstream fixes (100+)
+
+# Security fixes (200+)
+
+# Fixes for tests (300+)
+# Factory is droped from system tzdata
+Patch300: php-7.4.0-datetests.patch
+
+
+BuildRequires: gnupg2
+BuildRequires: bzip2-devel
+BuildRequires: pkgconfig(libcurl)  >= 7.29.0
+BuildRequires: httpd-devel >= 2.0.46-1
+BuildRequires: pam-devel
+# to ensure we are using httpd with filesystem feature (see #1081453)
+BuildRequires: httpd-filesystem
+# to ensure we are using nginx with filesystem feature (see #1142298)
+BuildRequires: nginx-filesystem
+BuildRequires: libstdc++-devel
+# no pkgconfig to avoid compat-openssl10
+BuildRequires: openssl-devel >= 1.0.2
+BuildRequires: pkgconfig(sqlite3) >= 3.7.4
+BuildRequires: pkgconfig(zlib) >= 1.2.0.4
+BuildRequires: smtpdaemon
+BuildRequires: pkgconfig(libedit)
+BuildRequires: pkgconfig(libpcre2-8) >= 10.30
+BuildRequires: pkgconfig(libxcrypt)
+BuildRequires: bzip2
+BuildRequires: perl-interpreter
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libtool
+BuildRequires: libtool-ltdl-devel
+BuildRequires: systemtap-sdt-devel
+# used for tests
+BuildRequires: %{_bindir}/ps
+BuildRequires: tzdata
+
+%if %{with zts}
+Provides: php-zts = %{version}-%{release}
+Provides: php-zts%{?_isa} = %{version}-%{release}
+%endif
+
+%if %{with modphp}
+Requires: httpd-mmn = %{_httpd_mmn}
+Provides: mod_php                = %{version}-%{release}
+# To ensure correct /var/lib/php/session ownership:
+Requires(pre): httpd-filesystem
+# php engine for Apache httpd webserver
+Provides: php(httpd)
+# mod_php is deprecated, no package should requires php or mod_php
+# all packages must requires used SAPI (cli, fpm, embded..)
+# and used extrensions (mysqli, mbstring, xmlwriter...)
+Provides: deprecated()
+%else
+# preserve old behavior
+Recommends: httpd
+%endif
+Requires: php-common%{?_isa}     = %{version}-%{release}
+# For backwards-compatibility, pull the "php" command
+Recommends: php-cli%{?_isa}      = %{version}-%{release}
+# httpd have threaded MPM by default
+Recommends: php-fpm%{?_isa}      = %{version}-%{release}
+# as "php" is now mostly a meta-package, commonly used extensions
+# reduce diff with "dnf module install php"
+Recommends: php-mbstring%{?_isa} = %{version}-%{release}
+Recommends: php-opcache%{?_isa}  = %{version}-%{release}
+Recommends: php-pdo%{?_isa}      = %{version}-%{release}
+%if %{with sodium}
+Recommends: php-sodium%{?_isa}   = %{version}-%{release}
+%endif
+Recommends: php-xml%{?_isa}      = %{version}-%{release}
+
+
+%description
+PHP is an HTML-embedded scripting language. PHP attempts to make it
+easy for developers to write dynamically generated web pages. PHP also
+offers built-in database integration for several commercial and
+non-commercial database management systems, so writing a
+database-enabled webpage with PHP is fairly simple. The most common
+use of PHP coding is probably as a replacement for CGI scripts.
+%if %{with modphp}
+The php package contains the module (often referred to as mod_php)
+which adds support for the PHP language to Apache HTTP Server when
+running in prefork mode. This module is deprecated.
+%endif
+
+%package cli
+Summary: Command-line interface for PHP
+# sapi/cli/ps_title.c is PostgreSQL
+License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and PostgreSQL
+Requires: php-common%{?_isa} = %{version}-%{release}
+Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release}
+Provides: php-pcntl, php-pcntl%{?_isa}
+Provides: php-readline, php-readline%{?_isa}
+
+%description cli
+The php-cli package contains the command-line interface
+executing PHP scripts, /usr/bin/php, and the CGI interface.
+
+
+%package dbg
+Summary: The interactive PHP debugger
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description dbg
+The php-dbg package contains the interactive PHP debugger.
+
+
+%package fpm
+Summary: PHP FastCGI Process Manager
+BuildRequires: libacl-devel
+BuildRequires: pkgconfig(libsystemd) >= 209
+Requires: php-common%{?_isa} = %{version}-%{release}
+%{?systemd_requires}
+# To ensure correct /var/lib/php/session ownership:
+Requires(pre): httpd-filesystem
+# For php.conf in /etc/httpd/conf.d
+# and version 2.4.10 for proxy support in SetHandler
+Requires: httpd-filesystem >= 2.4.10
+# php engine for Apache httpd webserver
+Provides: php(httpd)
+# for /etc/nginx ownership
+Requires: nginx-filesystem
+
+%description fpm
+PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
+implementation with some additional features useful for sites of
+any size, especially busier sites.
+
+%package common
+Summary: Common files for PHP
+# All files licensed under PHP version 3.01, except
+# fileinfo is licensed under PHP version 3.0
+# regex, libmagic are licensed under BSD
+License: PHP and BSD
+# ABI/API check - Arch specific
+Provides: php(api) = %{apiver}-%{__isa_bits}
+Provides: php(zend-abi) = %{zendver}-%{__isa_bits}
+Provides: php(language) = %{version}, php(language)%{?_isa} = %{version}
+# Provides for all builtin/shared modules:
+Provides: php-bz2, php-bz2%{?_isa}
+Provides: php-calendar, php-calendar%{?_isa}
+Provides: php-core = %{version}, php-core%{?_isa} = %{version}
+Provides: php-ctype, php-ctype%{?_isa}
+Provides: php-curl, php-curl%{?_isa}
+Provides: php-date, php-date%{?_isa}
+Provides: bundled(timelib)
+Provides: php-exif, php-exif%{?_isa}
+Provides: php-fileinfo, php-fileinfo%{?_isa}
+Provides: bundled(libmagic) = 5.29
+Provides: php-filter, php-filter%{?_isa}
+Provides: php-ftp, php-ftp%{?_isa}
+Provides: php-gettext, php-gettext%{?_isa}
+Provides: php-hash, php-hash%{?_isa}
+Provides: php-mhash = %{version}, php-mhash%{?_isa} = %{version}
+Provides: php-iconv, php-iconv%{?_isa}
+Obsoletes: php-json < 8
+Provides: php-json = %{version}, php-json%{?_isa} = %{version}
+Provides: php-libxml, php-libxml%{?_isa}
+Provides: php-openssl, php-openssl%{?_isa}
+Provides: php-phar, php-phar%{?_isa}
+Provides: php-pcre, php-pcre%{?_isa}
+Provides: php-reflection, php-reflection%{?_isa}
+Provides: php-session, php-session%{?_isa}
+Provides: php-sockets, php-sockets%{?_isa}
+Provides: php-spl, php-spl%{?_isa}
+Provides: php-standard = %{version}, php-standard%{?_isa} = %{version}
+Provides: php-tokenizer, php-tokenizer%{?_isa}
+Provides: php-zlib, php-zlib%{?_isa}
+
+%description common
+The php-common package contains files used by both the php
+package and the php-cli package.
+
+%package devel
+Summary: Files needed for building PHP extensions
+Requires: php-cli%{?_isa} = %{version}-%{release}
+# always needed to build extension
+Requires: autoconf
+Requires: automake
+Requires: make
+Requires: gcc
+Requires: gcc-c++
+Requires: libtool
+# see "php-config --libs"
+Requires: krb5-devel%{?_isa}
+Requires: libxml2-devel%{?_isa}
+Requires: openssl-devel%{?_isa} >= 1.0.2
+Requires: pcre2-devel%{?_isa}
+Requires: zlib-devel%{?_isa}
+%if %{with zts}
+Provides: php-zts-devel = %{version}-%{release}
+Provides: php-zts-devel%{?_isa} = %{version}-%{release}
+%endif
+Recommends: php-nikic-php-parser4 >= 4.13.0
+
+
+%description devel
+The php-devel package contains the files needed for building PHP
+extensions. If you need to compile your own PHP extensions, you will
+need to install this package.
+
+%package opcache
+Summary:   The Zend OPcache
+License:   PHP
+Requires:  php-common%{?_isa} = %{version}-%{release}
+Provides:  php-pecl-zendopcache = %{version}
+Provides:  php-pecl-zendopcache%{?_isa} = %{version}
+Provides:  php-pecl(opcache) = %{version}
+Provides:  php-pecl(opcache)%{?_isa} = %{version}
+
+%description opcache
+The Zend OPcache provides faster PHP execution through opcode caching and
+optimization. It improves PHP performance by storing precompiled script
+bytecode in the shared memory. This eliminates the stages of reading code from
+the disk and compiling it on future access. In addition, it applies a few
+bytecode optimization patterns that make code execution faster.
+
+%if %{with imap}
+%package imap
+Summary: A module for PHP applications that use IMAP
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(krb5)
+BuildRequires: pkgconfig(krb5-gssapi)
+BuildRequires: openssl-devel >= 1.0.2
+BuildRequires: libc-client-devel
+
+%description imap
+The php-imap module will add IMAP (Internet Message Access Protocol)
+support to PHP. IMAP is a protocol for retrieving and uploading e-mail
+messages on mail servers. PHP is an HTML-embedded scripting language.
+%endif
+
+%package ldap
+Summary: A module for PHP applications that use LDAP
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(libsasl2)
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel >= 1.0.2
+
+%description ldap
+The php-ldap adds Lightweight Directory Access Protocol (LDAP)
+support to PHP. LDAP is a set of protocols for accessing directory
+services over the Internet. PHP is an HTML-embedded scripting
+language.
+
+%package pdo
+Summary: A database access abstraction module for PHP applications
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+# ABI/API check - Arch specific
+Provides: php-pdo-abi  = %{pdover}-%{__isa_bits}
+Provides: php(pdo-abi) = %{pdover}-%{__isa_bits}
+Provides: php-sqlite3, php-sqlite3%{?_isa}
+Provides: php-pdo_sqlite, php-pdo_sqlite%{?_isa}
+
+%description pdo
+The php-pdo package contains a dynamic shared object that will add
+a database access abstraction layer to PHP.  This module provides
+a common interface for accessing MySQL, PostgreSQL or other
+databases.
+
+%package mysqlnd
+Summary: A module for PHP applications that use MySQL databases
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-pdo%{?_isa} = %{version}-%{release}
+Provides: php_database
+Provides: php-mysqli = %{version}-%{release}
+Provides: php-mysqli%{?_isa} = %{version}-%{release}
+Provides: php-pdo_mysql, php-pdo_mysql%{?_isa}
+
+%description mysqlnd
+The php-mysqlnd package contains a dynamic shared object that will add
+MySQL database support to PHP. MySQL is an object-relational database
+management system. PHP is an HTML-embeddable scripting language. If
+you need MySQL support for PHP applications, you will need to install
+this package and the php package.
+
+This package use the MySQL Native Driver
+
+%package pgsql
+Summary: A PostgreSQL database module for PHP
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-pdo%{?_isa} = %{version}-%{release}
+Provides: php_database
+Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa}
+BuildRequires: krb5-devel
+BuildRequires: openssl-devel >= 1.0.2
+BuildRequires: libpq-devel
+
+%description pgsql
+The php-pgsql package add PostgreSQL database support to PHP.
+PostgreSQL is an object-relational database management
+system that supports almost all SQL constructs. PHP is an
+HTML-embedded scripting language. If you need back-end support for
+PostgreSQL, you should install this package in addition to the main
+php package.
+
+%package process
+Summary: Modules for PHP script using system process interfaces
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+Provides: php-posix, php-posix%{?_isa}
+Provides: php-shmop, php-shmop%{?_isa}
+Provides: php-sysvsem, php-sysvsem%{?_isa}
+Provides: php-sysvshm, php-sysvshm%{?_isa}
+Provides: php-sysvmsg, php-sysvmsg%{?_isa}
+
+%description process
+The php-process package contains dynamic shared objects which add
+support to PHP using system interfaces for inter-process
+communication.
+
+%package odbc
+Summary: A module for PHP applications that use ODBC databases
+# All files licensed under PHP version 3.01, except
+# pdo_odbc is licensed under PHP version 3.0
+License: PHP
+Requires: php-pdo%{?_isa} = %{version}-%{release}
+Provides: php_database
+Provides: php-pdo_odbc, php-pdo_odbc%{?_isa}
+BuildRequires: unixODBC-devel
+
+%description odbc
+The php-odbc package contains a dynamic shared object that will add
+database support through ODBC to PHP. ODBC is an open specification
+which provides a consistent API for developers to use for accessing
+data sources (which are often, but not always, databases). PHP is an
+HTML-embeddable scripting language. If you need ODBC support for PHP
+applications, you will need to install this package and the php
+package.
+
+%package soap
+Summary: A module for PHP applications that use the SOAP protocol
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(libxml-2.0)
+
+%description soap
+The php-soap package contains a dynamic shared object that will add
+support to PHP for using the SOAP web services protocol.
+
+%if %{with firebird}
+%package pdo-firebird
+Summary: PDO driver for Interbase/Firebird databases
+# All files licensed under PHP version 3.01
+License: PHP
+# for fb_config command
+BuildRequires:  firebird-devel
+Requires: php-pdo%{?_isa} = %{version}-%{release}
+Provides: php_database
+Provides: php-pdo_firebird, php-pdo_firebird%{?_isa}
+
+%description pdo-firebird
+The php-pdo-firebird package contains the PDO driver for
+Interbase/Firebird databases.
+%endif
+
+%package snmp
+Summary: A module for PHP applications that query SNMP-managed devices
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}, net-snmp
+BuildRequires: net-snmp-devel
+
+%description snmp
+The php-snmp package contains a dynamic shared object that will add
+support for querying SNMP devices to PHP.  PHP is an HTML-embeddable
+scripting language. If you need SNMP support for PHP applications, you
+will need to install this package and the php package.
+
+%package xml
+Summary: A module for PHP applications which use XML
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+Provides: php-dom, php-dom%{?_isa}
+Provides: php-domxml, php-domxml%{?_isa}
+Provides: php-simplexml, php-simplexml%{?_isa}
+Provides: php-xmlreader, php-xmlreader%{?_isa}
+Provides: php-xmlwriter, php-xmlwriter%{?_isa}
+Provides: php-xsl, php-xsl%{?_isa}
+BuildRequires: pkgconfig(libxslt)  >= 1.1
+BuildRequires: pkgconfig(libexslt)
+BuildRequires: pkgconfig(libxml-2.0)  >= 2.7.6
+
+%description xml
+The php-xml package contains dynamic shared objects which add support
+to PHP for manipulating XML documents using the DOM tree,
+and performing XSL transformations on XML documents.
+
+%package mbstring
+Summary: A module for PHP applications which need multi-byte string handling
+# All files licensed under PHP version 3.01, except
+# libmbfl is licensed under LGPLv2
+# ucgendat is licensed under OpenLDAP
+License: PHP and LGPLv2 and OpenLDAP
+BuildRequires: pkgconfig(oniguruma) >= 6.8
+Provides: bundled(libmbfl) = 1.3.2
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description mbstring
+The php-mbstring package contains a dynamic shared object that will add
+support for multi-byte string handling to PHP.
+
+%package gd
+Summary: A module for PHP applications for using the gd graphics library
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(gdlib) >= 2.1.1
+
+%description gd
+The php-gd package contains a dynamic shared object that will add
+support for using the gd graphics library to PHP.
+
+%package bcmath
+Summary: A module for PHP applications for using the bcmath library
+# All files licensed under PHP version 3.01, except
+# libbcmath is licensed under LGPLv2+
+License: PHP and LGPLv2+
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description bcmath
+The php-bcmath package contains a dynamic shared object that will add
+support for using the bcmath library to PHP.
+
+%package gmp
+Summary: A module for PHP applications for using the GNU MP library
+# All files licensed under PHP version 3.01
+License: PHP
+BuildRequires: gmp-devel
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description gmp
+These functions allow you to work with arbitrary-length integers
+using the GNU MP library.
+
+%package dba
+Summary: A database abstraction layer module for PHP applications
+# All files licensed under PHP version 3.01
+License: PHP
+%if %{with db4}
+BuildRequires: libdb-devel
+%endif
+BuildRequires: tokyocabinet-devel
+%if %{with lmdb}
+BuildRequires: lmdb-devel
+%endif
+%if %{with qdbm}
+BuildRequires: qdbm-devel
+%endif
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description dba
+The php-dba package contains a dynamic shared object that will add
+support for using the DBA database abstraction layer to PHP.
+
+%if %{with tidy}
+%package tidy
+Summary: Standard PHP module provides tidy library support
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: libtidy-devel
+
+%description tidy
+The php-tidy package contains a dynamic shared object that will add
+support for using the tidy library to PHP.
+%endif
+
+%if %{with freetds}
+%package pdo-dblib
+Summary: PDO driver for Microsoft SQL Server and Sybase databases
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-pdo%{?_isa} = %{version}-%{release}
+BuildRequires: freetds-devel
+Provides: php-pdo_dblib, php-pdo_dblib%{?_isa}
+
+%description pdo-dblib
+The php-pdo-dblib package contains a dynamic shared object
+that implements the PHP Data Objects (PDO) interface to enable access from
+PHP to Microsoft SQL Server and Sybase databases through the FreeTDS library.
+%endif
+
+%package embedded
+Summary: PHP library for embedding in applications
+Requires: php-common%{?_isa} = %{version}-%{release}
+# doing a real -devel package for just the .so symlink is a bit overkill
+Provides: php-embedded-devel = %{version}-%{release}
+Provides: php-embedded-devel%{?_isa} = %{version}-%{release}
+
+%description embedded
+The php-embedded package contains a library which can be embedded
+into applications to provide PHP scripting language support.
+
+%if %{with pspell}
+%package pspell
+Summary: A module for PHP applications for using pspell interfaces
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: aspell-devel >= 0.50.0
+
+%description pspell
+The php-pspell package contains a dynamic shared object that will add
+support for using the pspell library to PHP.
+%endif
+
+%package intl
+Summary: Internationalization extension for PHP applications
+# All files licensed under PHP version 3.01
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(icu-i18n) >= 50.1
+BuildRequires: pkgconfig(icu-io)   >= 50.1
+BuildRequires: pkgconfig(icu-uc)   >= 50.1
+
+%description intl
+The php-intl package contains a dynamic shared object that will add
+support for using the ICU library to PHP.
+
+%package enchant
+Summary: Enchant spelling extension for PHP applications
+# All files licensed under PHP version 3.0
+License: PHP
+Requires: php-common%{?_isa} = %{version}-%{release}
+BuildRequires: pkgconfig(enchant-2)
+
+%description enchant
+The php-enchant package contains a dynamic shared object that will add
+support for using the enchant library to PHP.
+
+%if %{with sodium}
+%package sodium
+Summary: Wrapper for the Sodium cryptographic library
+# All files licensed under PHP version 3.0.1
+License: PHP
+BuildRequires:  pkgconfig(libsodium) >= 1.0.9
+
+Requires: php-common%{?_isa} = %{version}-%{release}
+Obsoletes: php-pecl-libsodium2 < 3
+Provides:  php-pecl(libsodium)         = %{version}
+Provides:  php-pecl(libsodium)%{?_isa} = %{version}
+
+%description sodium
+The php-sodium package provides a simple,
+low-level PHP extension for the libsodium cryptographic library.
+%endif
+
+
+%package ffi
+Summary: Foreign Function Interface
+# All files licensed under PHP version 3.0.1
+License: PHP
+Group: System Environment/Libraries
+BuildRequires:  pkgconfig(libffi)
+Requires: php-common%{?_isa} = %{version}-%{release}
+
+%description ffi
+FFI is one of the features that made Python and LuaJIT very useful for fast
+prototyping. It allows calling C functions and using C data types from pure
+scripting language and therefore develop “system code” more productively.
+
+For PHP, FFI opens a way to write PHP extensions and bindings to C libraries
+in pure PHP.
+
+
+%prep
+%{?gpgverify:%{gpgverify} --keyring='%{SOURCE20}' --signature='%{SOURCE21}' --data='%{SOURCE0}'}
+
+%setup -q -n php-%{upver}%{?rcver}
+
+%patch1 -p1 -b .mpmcheck
+%patch5 -p1 -b .includedir
+%patch6 -p1 -b .embed
+%patch8 -p1 -b .libdb
+
+%patch41 -p1 -b .syslib
+%patch42 -p1 -b .systzdata
+%patch43 -p1 -b .headers
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%patch45 -p1 -b .ldap_r
+%endif
+%patch47 -p1 -b .phpinfo
+
+# upstream patches
+
+# security patches
+
+# Fixes for tests
+%patch300 -p1 -b .datetests
+
+
+# Prevent %%doc confusion over LICENSE files
+cp Zend/LICENSE ZEND_LICENSE
+cp TSRM/LICENSE TSRM_LICENSE
+cp Zend/asm/LICENSE BOOST_LICENSE
+cp sapi/fpm/LICENSE fpm_LICENSE
+cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE
+cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE
+cp ext/bcmath/libbcmath/LICENSE libbcmath_LICENSE
+cp ext/date/lib/LICENSE.rst timelib_LICENSE
+
+# Multiple builds for multiple SAPIs
+mkdir build-cgi build-embedded \
+%if %{with modphp}
+    build-apache \
+%endif
+%if %{with zts}
+    build-zts build-ztscli \
+%endif
+    build-fpm
+
+# ----- Manage known as failed test -------
+# affected by systzdata patch
+rm ext/date/tests/timezone_location_get.phpt
+rm ext/date/tests/timezone_version_get.phpt
+rm ext/date/tests/timezone_version_get_basic1.phpt
+# fails sometime
+rm ext/sockets/tests/mcast_ipv?_recv.phpt
+# cause stack exhausion
+rm Zend/tests/bug54268.phpt
+rm Zend/tests/bug68412.phpt
+# tar issue
+rm ext/zlib/tests/004-mb.phpt
+
+# Safety check for API version change.
+pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
+if test "x${pver}" != "x%{upver}%{?rcver}"; then
+   : Error: Upstream PHP version is now ${pver}, expecting %{upver}%{?rcver}.
+   : Update the version/rcver macros and rebuild.
+   exit 1
+fi
+
+vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
+if test "x${vapi}" != "x%{apiver}"; then
+   : Error: Upstream API version is now ${vapi}, expecting %{apiver}.
+   : Update the apiver macro and rebuild.
+   exit 1
+fi
+
+vzend=`sed -n '/#define ZEND_MODULE_API_NO/{s/^^0-9*//;p;}' Zend/zend_modules.h`
+if test "x${vzend}" != "x%{zendver}"; then
+   : Error: Upstream Zend ABI version is now ${vzend}, expecting %{zendver}.
+   : Update the zendver macro and rebuild.
+   exit 1
+fi
+
+# Safety check for PDO ABI version change
+vpdo=`sed -n '/#define PDO_DRIVER_API/{s/.* 	//;p}' ext/pdo/php_pdo_driver.h`
+if test "x${vpdo}" != "x%{pdover}"; then
+   : Error: Upstream PDO ABI version is now ${vpdo}, expecting %{pdover}.
+   : Update the pdover macro and rebuild.
+   exit 1
+fi
+
+# https://bugs.php.net/63362 - Not needed but installed headers.
+# Drop some Windows specific headers to avoid installation,
+# before build to ensure they are really not needed.
+rm -f TSRM/tsrm_win32.h \
+      TSRM/tsrm_config.w32.h \
+      Zend/zend_config.w32.h \
+      ext/mysqlnd/config-win.h \
+      ext/standard/winver.h \
+      main/win32_internal_function_disabled.h \
+      main/win95nt.h
+
+# Fix some bogus permissions
+find . -name \*.ch -exec chmod 644 {} \;
+chmod 644 README.*
+
+# Some extensions have their own configuration file
+cp %{SOURCE50} %{SOURCE51} %{SOURCE53} .
+
+
+%build
+# This package fails to build with LTO due to undefined symbols.  LTO
+# was disabled in OpenSuSE as well, but with no real explanation why
+# beyond the undefined symbols.  It really shold be investigated further.
+# Disable LTO
+%define _lto_cflags %{nil}
+
+# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
+export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+export PHP_UNAME=$(uname)
+export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//')
+%if 0%{?vendor:1}
+export PHP_BUILD_PROVIDER="%{vendor}"
+%endif
+export PHP_BUILD_COMPILER="$(gcc --version | head -n1)"
+export PHP_BUILD_ARCH="%{_arch}"
+
+# Force use of system libtool:
+libtoolize --force --copy
+cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4
+
+# Regenerate configure scripts (patches change config.m4's)
+touch configure.ac
+./buildconf --force
+
+CFLAGS=$(echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign | sed 's/-mstackrealign//')
+export CFLAGS
+
+# Install extension modules in %%{_libdir}/php/modules.
+EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
+
+# Set PEAR_INSTALLDIR to ensure that the hard-coded include_path
+# includes the PEAR directory even though pear is packaged
+# separately.
+PEAR_INSTALLDIR=%{_datadir}/pear; export PEAR_INSTALLDIR
+
+# Shell function to configure and build a PHP tree.
+build() {
+# Old/recent bison version seems to produce a broken parser;
+# upstream uses GNU Bison 2.3. Workaround:
+mkdir Zend && cp ../Zend/zend_{language,ini}_{parser,scanner}.ch Zend
+
+# Always static:
+# date, ereg, filter, libxml, reflection, spl: not supported
+# hash: for PHAR_SIG_SHA256 and PHAR_SIG_SHA512
+# session: dep on hash, used by soap
+# pcre: used by filter, zip
+# pcntl, readline: only used by CLI sapi
+# openssl: for PHAR_SIG_OPENSSL
+# zlib: used by image
+
+ln -sf ../configure
+%configure \
+    --enable-rtld-now \
+    --cache-file=../config.cache \
+    --with-libdir=%{_lib} \
+    --with-config-file-path=%{_sysconfdir} \
+    --with-config-file-scan-dir=%{_sysconfdir}/php.d \
+    --disable-debug \
+    --with-pic \
+    --disable-rpath \
+    --without-pear \
+    --with-exec-dir=%{_bindir} \
+    --without-gdbm \
+    --with-openssl \
+    --with-system-ciphers \
+    --with-external-pcre \
+    --with-external-libcrypt \
+%ifarch s390 s390x sparc64 sparcv9 riscv64
+    --without-pcre-jit \
+%endif
+    --with-zlib \
+    --with-layout=GNU \
+    --with-kerberos \
+    --with-libxml \
+    --with-system-tzdata \
+    --with-mhash \
+    --without-password-argon2 \
+    --enable-dtrace \
+    $*
+if test $? != 0; then
+  tail -500 config.log
+  : configure failed
+  exit 1
+fi
+
+%make_build
+}
+
+# Build /usr/bin/php-cgi with the CGI SAPI, and most shared extensions
+pushd build-cgi
+
+build --libdir=%{_libdir}/php \
+      --enable-pcntl \
+      --enable-opcache \
+      --enable-phpdbg \
+%if %{with imap}
+      --with-imap=shared --with-imap-ssl \
+%endif
+      --enable-mbstring=shared \
+      --enable-mbregex \
+      --enable-gd=shared \
+      --with-external-gd \
+      --with-gmp=shared \
+      --enable-calendar=shared \
+      --enable-bcmath=shared \
+      --with-bz2=shared \
+      --enable-ctype=shared \
+      --enable-dba=shared \
+%if %{with db4}
+                          --with-db4=%{_prefix} \
+%endif
+                          --with-tcadb=%{_prefix} \
+%if %{with lmdb}
+                          --with-lmdb=%{_prefix} \
+%endif
+%if %{with qdbm}
+                          --with-qdbm=%{_prefix} \
+%endif
+      --enable-exif=shared \
+      --enable-ftp=shared \
+      --with-gettext=shared \
+      --with-iconv=shared \
+      --enable-sockets=shared \
+      --enable-tokenizer=shared \
+      --with-ldap=shared --with-ldap-sasl \
+      --enable-mysqlnd=shared \
+      --with-mysqli=shared,mysqlnd \
+      --with-mysql-sock=%{mysql_sock} \
+%if %{with firebird}
+      --with-pdo-firebird=shared \
+%endif
+      --enable-dom=shared \
+      --with-pgsql=shared \
+      --enable-simplexml=shared \
+      --enable-xml=shared \
+      --with-snmp=shared,%{_prefix} \
+      --enable-soap=shared \
+      --with-xsl=shared,%{_prefix} \
+      --enable-xmlreader=shared --enable-xmlwriter=shared \
+      --with-curl=shared \
+      --enable-pdo=shared \
+      --with-pdo-odbc=shared,unixODBC,%{_prefix} \
+      --with-pdo-mysql=shared,mysqlnd \
+      --with-pdo-pgsql=shared,%{_prefix} \
+      --with-pdo-sqlite=shared \
+%if %{with freetds}
+      --with-pdo-dblib=shared,%{_prefix} \
+%endif
+      --with-sqlite3=shared \
+      --without-readline \
+      --with-libedit \
+%if %{with pspell}
+      --with-pspell=shared \
+%endif
+      --enable-phar=shared \
+%if %{with tidy}
+      --with-tidy=shared,%{_prefix} \
+%endif
+      --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
+      --enable-shmop=shared \
+      --enable-posix=shared \
+      --with-unixODBC=shared,%{_prefix} \
+      --enable-fileinfo=shared \
+      --with-ffi=shared \
+%if %{with sodium}
+      --with-sodium=shared \
+%else
+      --without-sodium \
+%endif
+      --enable-intl=shared \
+      --with-enchant=shared
+popd
+
+without_shared="--without-gd \
+      --disable-dom --disable-dba --without-unixODBC \
+      --disable-opcache \
+      --disable-phpdbg \
+      --without-ffi \
+      --disable-xmlreader --disable-xmlwriter \
+      --without-sodium \
+      --without-sqlite3 --disable-phar --disable-fileinfo \
+      --without-pspell \
+      --without-curl --disable-posix --disable-xml \
+      --disable-simplexml --disable-exif --without-gettext \
+      --without-iconv --disable-ftp --without-bz2 --disable-ctype \
+      --disable-shmop --disable-sockets --disable-tokenizer \
+      --disable-sysvmsg --disable-sysvshm --disable-sysvsem"
+
+%if %{with modphp}
+# Build Apache module, and the CLI SAPI, /usr/bin/php
+pushd build-apache
+build --with-apxs2=%{_httpd_apxs} \
+      --libdir=%{_libdir}/php \
+      --without-mysqli \
+      --disable-pdo \
+      ${without_shared}
+popd
+%endif
+
+# Build php-fpm
+pushd build-fpm
+build --enable-fpm \
+      --with-fpm-acl \
+      --with-fpm-systemd \
+      --libdir=%{_libdir}/php \
+      --without-mysqli \
+      --disable-pdo \
+      ${without_shared}
+popd
+
+# Build for inclusion as embedded script language into applications,
+# /usr/lib64/libphp7.so
+pushd build-embedded
+build --enable-embed \
+      --without-mysqli --disable-pdo \
+      ${without_shared}
+popd
+
+%if %{with zts}
+# Build a special thread-safe (mainly for modules)
+pushd build-ztscli
+
+EXTENSION_DIR=%{_libdir}/php-zts/modules
+build --includedir=%{_includedir}/php-zts \
+      --libdir=%{_libdir}/php-zts \
+      --enable-zts \
+      --program-prefix=zts- \
+      --disable-cgi \
+      --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
+      --enable-pcntl \
+      --enable-opcache \
+%if %{with imap}
+      --with-imap=shared --with-imap-ssl \
+%endif
+      --enable-mbstring=shared \
+      --enable-mbregex \
+      --enable-gd=shared \
+      --with-external-gd \
+      --with-gmp=shared \
+      --enable-calendar=shared \
+      --enable-bcmath=shared \
+      --with-bz2=shared \
+      --enable-ctype=shared \
+      --enable-dba=shared \
+%if %{with db4}
+                          --with-db4=%{_prefix} \
+%endif
+                          --with-tcadb=%{_prefix} \
+%if %{with lmdb}
+                          --with-lmdb=%{_prefix} \
+%endif
+%if %{with qdbm}
+                          --with-qdbm=%{_prefix} \
+%endif
+      --with-gettext=shared \
+      --with-iconv=shared \
+      --enable-sockets=shared \
+      --enable-tokenizer=shared \
+      --enable-exif=shared \
+      --enable-ftp=shared \
+      --with-ldap=shared --with-ldap-sasl \
+      --enable-mysqlnd=shared \
+      --with-mysqli=shared,mysqlnd \
+      --with-mysql-sock=%{mysql_sock} \
+      --enable-mysqlnd-threading \
+%if %{with firebird}
+      --with-pdo-firebird=shared \
+%endif
+      --enable-dom=shared \
+      --with-pgsql=shared \
+      --enable-simplexml=shared \
+      --enable-xml=shared \
+      --with-snmp=shared,%{_prefix} \
+      --enable-soap=shared \
+      --with-xsl=shared,%{_prefix} \
+      --enable-xmlreader=shared --enable-xmlwriter=shared \
+      --with-curl=shared \
+      --enable-pdo=shared \
+      --with-pdo-odbc=shared,unixODBC,%{_prefix} \
+      --with-pdo-mysql=shared,mysqlnd \
+      --with-pdo-pgsql=shared,%{_prefix} \
+      --with-pdo-sqlite=shared \
+%if %{with freetds}
+      --with-pdo-dblib=shared,%{_prefix} \
+%endif
+      --with-sqlite3=shared \
+      --without-readline \
+      --with-libedit \
+%if %{with pspell}
+      --with-pspell=shared \
+%endif
+      --enable-phar=shared \
+%if %{with tidy}
+      --with-tidy=shared,%{_prefix} \
+%endif
+      --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \
+      --enable-shmop=shared \
+      --enable-posix=shared \
+      --with-unixODBC=shared,%{_prefix} \
+      --enable-fileinfo=shared \
+      --with-ffi=shared \
+%if %{with sodium}
+      --with-sodium=shared \
+%else
+      --without-sodium \
+%endif
+      --enable-intl=shared \
+      --with-enchant=shared
+popd
+
+### NOTE!!! EXTENSION_DIR was changed for the -zts build, so it must remain
+### the last SAPI to be built.
+%endif
+
+
+%check
+: Ensure proper NTS/ZTS build
+$RPM_BUILD_ROOT%{_bindir}/php     -n -v | grep NTS
+%if %{with zts}
+$RPM_BUILD_ROOT%{_bindir}/zts-php -n -v | grep ZTS
+%endif
+
+%if %runselftest
+cd build-fpm
+
+# Run tests, using the CLI SAPI
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+export SKIP_ONLINE_TESTS=1
+export SKIP_IO_CAPTURE_TESTS=1
+unset TZ LANG LC_ALL
+if ! make test TESTS=-j4; then
+  set +x
+  for f in $(find .. -name \*.diff -type f -print); do
+    if ! grep -q XFAIL "${f/.diff/.phpt}"
+    then
+      echo "TEST FAILURE: $f --"
+      cat "$f"
+      echo -e "\n-- $f result ends."
+    fi
+  done
+  set -x
+  #exit 1
+fi
+unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
+%endif
+
+%install
+%if %{with zts}
+# Install the extensions for the ZTS version
+make -C build-ztscli install \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+
+# Install the version for embedded script language in applications + php_embed.h
+make -C build-embedded install-sapi install-headers \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# Install the php-fpm binary
+make -C build-fpm install-fpm \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# Install everything from the CGI SAPI build
+make -C build-cgi install \
+     INSTALL_ROOT=$RPM_BUILD_ROOT
+
+# Use php-config from embed SAPI to reduce used libs
+install -m 755 build-embedded/scripts/php-config $RPM_BUILD_ROOT%{_bindir}/php-config
+
+# Install the default configuration file
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+
+# For third-party packaging:
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/php/preload
+
+%if %{with modphp}
+# install the DSO
+install -m 755 -d $RPM_BUILD_ROOT%{_httpd_moddir}
+install -m 755 build-apache/libs/libphp.so $RPM_BUILD_ROOT%{_httpd_moddir}
+%endif
+
+# Apache config fragment
+# Dual config file with httpd >= 2.4 (fedora >= 18)
+%if %{with modphp}
+install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_modconfdir}/20-php.conf
+%endif
+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf
+
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
+%if %{with zts}
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d
+%endif
+install -m 755 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php
+install -m 755 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/peclxml
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/session
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/wsdlcache
+install -m 700 -d $RPM_BUILD_ROOT%{_sharedstatedir}/php/opcache
+
+install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/pecl
+install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/tests/pecl
+
+# PHP-FPM stuff
+# Log
+install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/php-fpm
+install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm
+# Config
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf
+mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default .
+mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default .
+# install systemd unit files and scripts for handling server startup
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d
+install -Dm 644 %{SOURCE6}  $RPM_BUILD_ROOT%{_unitdir}/php-fpm.service
+install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/php-fpm.conf
+install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/php-fpm.conf
+# LogRotate
+install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/php-fpm
+# Nginx configuration
+install -D -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/php-fpm.conf
+install -D -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/default.d/php.conf
+
+TESTCMD="$RPM_BUILD_ROOT%{_bindir}/php --no-php-ini"
+# Ensure all provided extensions are really there
+for mod in core date filter hash libxml openssl pcntl pcre readline reflection session spl standard zlib
+do
+     $TESTCMD --modules | grep -qi $mod
+done
+
+TESTCMD="$TESTCMD --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/php/modules"
+
+# Generate files lists and stub .ini files for each subpackage
+for mod in pgsql odbc ldap snmp \
+%if %{with imap}
+    imap \
+%endif
+    mysqlnd mysqli \
+    mbstring gd dom xsl soap bcmath dba \
+    simplexml bz2 calendar ctype exif ftp gettext gmp iconv \
+    sockets tokenizer opcache \
+    sqlite3 \
+    enchant phar fileinfo intl \
+    ffi \
+%if %{with tidy}
+    tidy \
+%endif
+%if %{with pspell}
+    pspell \
+%endif
+    curl \
+%if %{with sodium}
+    sodium \
+%endif
+    posix shmop sysvshm sysvsem sysvmsg xml \
+    pdo pdo_mysql pdo pdo_pgsql pdo_odbc pdo_sqlite \
+%if %{with firebird}
+    pdo_firebird \
+%endif
+%if %{with freetds}
+    pdo_dblib \
+%endif
+    xmlreader xmlwriter
+do
+    case $mod in
+      opcache)
+        # Zend extensions
+        TESTCMD="$TESTCMD --define zend_extension=$mod"
+        ini=10-${mod}.ini;;
+      pdo_*|mysqli|xmlreader)
+        # Extensions with dependencies on 20-*
+        TESTCMD="$TESTCMD --define extension=$mod"
+        ini=30-${mod}.ini;;
+      *)
+        # Extensions with no dependency
+        TESTCMD="$TESTCMD --define extension=$mod"
+        ini=20-${mod}.ini;;
+    esac
+
+    $TESTCMD --modules | grep -qi $mod
+
+    # some extensions have their own config file
+    if  -f ${ini} ; then
+      cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini}
+%if %{with zts}
+      cp -p ${ini} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini}
+%endif
+    else
+      cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${ini} <<EOF
+; Enable ${mod} extension module
+extension=${mod}
+EOF
+%if %{with zts}
+      cat > $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/${ini} <<EOF
+; Enable ${mod} extension module
+extension=${mod}
+EOF
+%endif
+    fi
+    cat > files.${mod} <<EOF
+%{_libdir}/php/modules/${mod}.so
+%config(noreplace) %{_sysconfdir}/php.d/${ini}
+%if %{with zts}
+%{_libdir}/php-zts/modules/${mod}.so
+%config(noreplace) %{_sysconfdir}/php-zts.d/${ini}
+%endif
+EOF
+done
+
+# The dom, xsl and xml* modules are all packaged in php-xml
+cat files.dom files.xsl files.xml{reader,writer} \
+    files.simplexml >> files.xml
+
+# mysqlnd
+cat files.mysqli \
+    files.pdo_mysql \
+    >> files.mysqlnd
+
+# Split out the PDO modules
+cat files.pdo_pgsql >> files.pgsql
+cat files.pdo_odbc >> files.odbc
+
+# sysv* and posix in packaged in php-process
+cat files.shmop files.sysv* files.posix > files.process
+
+# Package sqlite3 and pdo_sqlite with pdo; isolating the sqlite dependency
+# isn't useful at this time since rpm itself requires sqlite.
+cat files.pdo_sqlite >> files.pdo
+cat files.sqlite3 >> files.pdo
+
+# Package curl, phar and fileinfo in -common.
+cat files.curl files.phar files.fileinfo \
+    files.exif files.gettext files.iconv files.calendar \
+    files.ftp files.bz2 files.ctype files.sockets \
+    files.tokenizer > files.common
+
+# The default Zend OPcache blacklist file
+install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/opcache-default.blacklist
+%if %{with zts}
+install -m 644 %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/opcache-default.blacklist
+sed -e '/blacklist_filename/s/php.d/php-zts.d/' \
+    -i $RPM_BUILD_ROOT%{_sysconfdir}/php-zts.d/10-opcache.ini
+%endif
+
+# Install the macros file:
+sed -e "s/@PHP_APIVER@/%{apiver}-%{__isa_bits}/" \
+    -e "s/@PHP_ZENDVER@/%{zendver}-%{__isa_bits}/" \
+    -e "s/@PHP_PDOVER@/%{pdover}-%{__isa_bits}/" \
+    -e "s/@PHP_VERSION@/%{upver}/" \
+%if ! %{with zts}
+    -e "/zts/d" \
+%endif
+    < %{SOURCE3} > macros.php
+install -m 644 -D macros.php \
+           $RPM_BUILD_ROOT%{_rpmmacrodir}/macros.php
+
+# Remove unpackaged files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
+       $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \
+       $RPM_BUILD_ROOT%{_bindir}/{phptar} \
+       $RPM_BUILD_ROOT%{_datadir}/pear \
+       $RPM_BUILD_ROOT%{_bindir}/zts-phar* \
+       $RPM_BUILD_ROOT%{_mandir}/man1/zts-phar* \
+       $RPM_BUILD_ROOT%{_libdir}/libphp.a \
+       $RPM_BUILD_ROOT%{_libdir}/libphp.la
+
+# Remove irrelevant docs
+rm -f README.{Zeus,QNX,CVS-RULES}
+
+
+%post fpm
+%systemd_post php-fpm.service
+
+%preun fpm
+%systemd_preun php-fpm.service
+
+# Raised by new pool installation or new extension installation
+%transfiletriggerin fpm -- %{_sysconfdir}/php-fpm.d %{_sysconfdir}/php.d
+systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
+
+
+%files
+%if %{with modphp}
+%{_httpd_moddir}/libphp.so
+%config(noreplace) %{_httpd_modconfdir}/20-php.conf
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/session
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
+%config(noreplace) %{_httpd_confdir}/php.conf
+%endif
+
+%files common -f files.common
+%doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
+%license LICENSE TSRM_LICENSE ZEND_LICENSE BOOST_LICENSE
+%license libmagic_LICENSE
+%license timelib_LICENSE
+%doc php.ini-*
+%config(noreplace) %{_sysconfdir}/php.ini
+%dir %{_sysconfdir}/php.d
+%dir %{_libdir}/php
+%dir %{_libdir}/php/modules
+%if %{with zts}
+%dir %{_sysconfdir}/php-zts.d
+%dir %{_libdir}/php-zts
+%dir %{_libdir}/php-zts/modules
+%endif
+%dir %{_sharedstatedir}/php
+%dir %{_sharedstatedir}/php/peclxml
+%dir %{_datadir}/php
+%dir %{_docdir}/pecl
+%dir %{_datadir}/tests
+%dir %{_datadir}/tests/pecl
+
+%files cli
+%{_bindir}/php
+%if %{with zts}
+%{_bindir}/zts-php
+%{_mandir}/man1/zts-php.1*
+%endif
+%{_bindir}/php-cgi
+%{_bindir}/phar.phar
+%{_bindir}/phar
+# provides phpize here (not in -devel) for pecl command
+%{_bindir}/phpize
+%{_mandir}/man1/php.1*
+%{_mandir}/man1/php-cgi.1*
+%{_mandir}/man1/phar.1*
+%{_mandir}/man1/phar.phar.1*
+%{_mandir}/man1/phpize.1*
+
+%files dbg
+%doc sapi/phpdbg/CREDITS
+%{_bindir}/phpdbg
+%{_mandir}/man1/phpdbg.1*
+%if %{with zts}
+%{_bindir}/zts-phpdbg
+%{_mandir}/man1/zts-phpdbg.1*
+%endif
+
+%files fpm
+%doc php-fpm.conf.default www.conf.default
+%license fpm_LICENSE
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/session
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache
+%attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache
+%config(noreplace) %{_httpd_confdir}/php.conf
+%config(noreplace) %{_sysconfdir}/php-fpm.conf
+%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
+%config(noreplace) %{_sysconfdir}/nginx/conf.d/php-fpm.conf
+%config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf
+%{_unitdir}/php-fpm.service
+%{_unitdir}/httpd.service.d/php-fpm.conf
+%{_unitdir}/nginx.service.d/php-fpm.conf
+%{_sbindir}/php-fpm
+%dir %{_sysconfdir}/systemd/system/php-fpm.service.d
+%dir %{_sysconfdir}/php-fpm.d
+# log owned by apache for log
+%attr(770,apache,root) %dir %{_localstatedir}/log/php-fpm
+%dir %ghost /run/php-fpm
+%{_mandir}/man8/php-fpm.8*
+%dir %{_datadir}/fpm
+%{_datadir}/fpm/status.html
+
+%files devel
+%{_bindir}/php-config
+%{_includedir}/php
+%{_libdir}/php/build
+%if %{with zts}
+%{_bindir}/zts-php-config
+%{_bindir}/zts-phpize
+%{_includedir}/php-zts
+%{_libdir}/php-zts/build
+%{_mandir}/man1/zts-php-config.1*
+%{_mandir}/man1/zts-phpize.1*
+%endif
+%{_mandir}/man1/php-config.1*
+%{_rpmmacrodir}/macros.php
+
+%files embedded
+%{_libdir}/libphp.so
+%{_libdir}/libphp-%{embed_version}.so
+
+%files pgsql -f files.pgsql
+%files odbc -f files.odbc
+%if %{with imap}
+%files imap -f files.imap
+%endif
+%files ldap -f files.ldap
+%files snmp -f files.snmp
+%files xml -f files.xml
+%files mbstring -f files.mbstring
+%license libmbfl_LICENSE
+%files gd -f files.gd
+%files soap -f files.soap
+%files bcmath -f files.bcmath
+%license libbcmath_LICENSE
+%files gmp -f files.gmp
+%files dba -f files.dba
+%files pdo -f files.pdo
+%if %{with tidy}
+%files tidy -f files.tidy
+%endif
+%if %{with freetds}
+%files pdo-dblib -f files.pdo_dblib
+%endif
+%if %{with pspell}
+%files pspell -f files.pspell
+%endif
+%files intl -f files.intl
+%files process -f files.process
+%if %{with firebird}
+%files pdo-firebird -f files.pdo_firebird
+%endif
+%files enchant -f files.enchant
+%files mysqlnd -f files.mysqlnd
+%files opcache -f files.opcache
+%config(noreplace) %{_sysconfdir}/php.d/opcache-default.blacklist
+%if %{with zts}
+%config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist
+%endif
+%if %{with sodium}
+%files sodium -f files.sodium
+%endif
+%files ffi -f files.ffi
+%dir %{_datadir}/php/preload
+
+
+%changelog
+* Tue Aug  2 2022 Remi Collet <remi@remirepo.net> - 8.1.9-1
+- Update to 8.1.9 - http://www.php.net/releases/8_1_9.php
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 8.1.9~RC1-3
+- Rebuilt for ICU 71.1
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.9~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 8.1.9~RC1-1
+- update to 8.1.9RC1
+
+* Wed Jul  6 2022 Remi Collet <remi@remirepo.net> - 8.1.8-1
+- Update to 8.1.8 - http://www.php.net/releases/8_1_8.php
+
+* Tue Jun 21 2022 Remi Collet <remi@remirepo.net> - 8.1.8~RC1-1
+- update to 8.1.8RC1
+
+* Wed Jun  8 2022 Remi Collet <remi@remirepo.net> - 8.1.7-1
+- Update to 8.1.7 - http://www.php.net/releases/8_1_7.php
+- add upstream patch to initialize pcre before mbstring
+
+* Wed May 25 2022 Remi Collet <remi@remirepo.net> - 8.1.7~RC1-1
+- update to 8.1.7RC1
+
+* Wed May 11 2022 Remi Collet <remi@remirepo.net> - 8.1.6-1
+- Update to 8.1.6 - http://www.php.net/releases/8_1_6.php
+
+* Wed Apr 27 2022 Remi Collet <remi@remirepo.net> - 8.1.6~RC1-1
+- update to 8.1.6RC1
+
+* Wed Apr 13 2022 Remi Collet <remi@remirepo.net> - 8.1.5-1
+- Update to 8.1.5 - http://www.php.net/releases/8_1_5.php
+
+* Mon Apr  4 2022 Remi Collet <remi@remirepo.net> - 8.1.5~RC1-1
+- update to 8.1.5RC1
+
+* Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 8.1.4-1
+- Update to 8.1.4 - http://www.php.net/releases/8_1_4.php
+
+* Thu Mar  3 2022 Remi Collet <remi@remirepo.net> - 8.1.4~RC1-1
+- update to 8.1.4RC1
+
+* Wed Feb 23 2022 Remi Collet <remi@remirepo.net> - 8.1.3-2
+- retrieve tzdata version #2056611
+
+* Wed Feb 16 2022 Remi Collet <remi@remirepo.net> - 8.1.3-1
+- Update to 8.1.3 - http://www.php.net/releases/8_1_3.php
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 19 2022 Remi Collet <remi@remirepo.net> - 8.1.2-1
+- Update to 8.1.2 - http://www.php.net/releases/8_1_2.php
+
+* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 8.1.2~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
+
+* Wed Jan  5 2022 Remi Collet <remi@remirepo.net> - 8.1.2~RC1-1
+- update to 8.1.2RC1
+
+* Wed Dec 15 2021 Remi Collet <remi@remirepo.net> - 8.1.1-1
+- Update to 8.1.1 - http://www.php.net/releases/8_1_1.php
+
+* Thu Dec  2 2021 Remi Collet <remi@remirepo.net> - 8.1.1~RC1-1
+- update to 8.1.1RC1
+
+* Wed Nov 24 2021 Remi Collet <remi@remirepo.net> - 8.1.0-1
+- update to 8.1.0 GA
+
+* Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 8.1.0~RC6-1
+- update to 8.1.0RC6
+
+* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.1.0~RC5-1
+- update to 8.1.0RC5 - https://fedoraproject.org/wiki/Changes/php81
+- bump API version
+
+* Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 8.0.12-2
+- dba: enable qdbm backend
+
+* Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 8.0.12-1
+- Update to 8.0.12 - http://www.php.net/releases/8_0_12.php
+
+* Mon Oct 18 2021 Remi Collet <remi@remirepo.net> - 8.0.12~RC1-2
+- build using system libxcrypt
+
+* Wed Oct  6 2021 Remi Collet <remi@remirepo.net> - 8.0.12~RC1-1
+- update to 8.0.12RC1
+
+* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 8.0.11-1
+- Update to 8.0.11 - http://www.php.net/releases/8_0_11.php
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 8.0.11~RC1-4
+- Rebuilt with OpenSSL 3.0.0
+
+* Mon Sep 13 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-3
+- more changes for OpenSSL 3 from PHP 8.1
+
+* Fri Sep 10 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-2
+- backport changes for OpenSSL 3 from PHP 8.1
+
+* Tue Sep  7 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-1
+- update to 8.0.11RC1
+
+* Thu Aug 26 2021 Remi Collet <remi@remirepo.net> - 8.0.10-1
+- Update to 8.0.10 - http://www.php.net/releases/8_0_10.php
+
+* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 8.0.10~RC1-3
+- phar: switch to sha256 signature by default, backported from 8.1
+- phar: implement openssl_256 and openssl_512 for signatures, backported from 8.1
+
+* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 8.0.10~RC1-2
+- snmp: add sha256 / sha512 security protocol, backported from 8.1
+
+* Tue Aug 10 2021 Remi Collet <remi@remirepo.net> - 8.0.10~RC1-1
+- update to 8.0.10RC1
+- adapt systzdata patch for timelib 2020.03 (v20)
+
+* Tue Aug  3 2021 Remi Collet <remi@remirepo.net> - 8.0.9-2
+- add upstream patch for https://bugs.php.net/81325 segfault in simplexml
+
+* Thu Jul 29 2021 Remi Collet <remi@remirepo.net> - 8.0.9-1
+- Update to 8.0.9 - http://www.php.net/releases/8_0_9.php
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.9~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 8.0.9~RC1-1
+- update to 8.0.9RC1
+
+* Tue Jun 29 2021 Remi Collet <remi@remirepo.net> - 8.0.8-1
+- Update to 8.0.8 - http://www.php.net/releases/8_0_8.php
+
+* Tue Jun 15 2021 Remi Collet <remi@remirepo.net> - 8.0.8~RC1-1
+- update to 8.0.8RC1
+
+* Wed Jun  2 2021 Remi Collet <remi@remirepo.net> - 8.0.7-1
+- Update to 8.0.7 - http://www.php.net/releases/8_0_7.php
+
+* Thu May 27 2021 Remi Collet <remi@remirepo.net> - 8.0.7~RC1-2
+- fix snmp extension for net-snmp without DES
+
+* Thu May 20 2021 Remi Collet <remi@remirepo.net> - 8.0.7~RC1-1
+- update to 8.0.7RC1
+
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 8.0.6-4
+- Rebuild for ICU 69
+
+* Sat May  8 2021 Remi Collet <remi@remirepo.net> - 8.0.6-3
+- get rid of inet_addr and gethostbyaddr calls
+
+* Thu May  6 2021 Remi Collet <remi@remirepo.net> - 8.0.6-2
+- get rid of inet_ntoa and inet_aton calls
+
+* Wed May  5 2021 Remi Collet <remi@remirepo.net> - 8.0.6-1
+- Update to 8.0.6 - http://www.php.net/releases/8_0_6.php
+
+* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 8.0.5-1
+- Update to 8.0.5 - http://www.php.net/releases/8_0_5.php
+
+* Tue Apr 13 2021 Remi Collet <remi@remirepo.net> - 8.0.5~RC1-1
+- update to 8.0.5RC1
+
+* Fri Mar 19 2021 Remi Collet <remi@remirepo.net> - 8.0.4~RC1-2
+- make libdb usage conditional
+  default: on for Fedora, off for RHEL
+
+* Tue Mar 16 2021 Remi Collet <remi@remirepo.net> - 8.0.4~RC1-1
+- update to 8.0.4RC1
+
+* Mon Mar 15 2021 Remi Collet <remi@remirepo.net> - 8.0.3-2
+- clean conditions
+
+* Thu Mar  4 2021 Remi Collet <remi@remirepo.net> - 8.0.3-1
+- Update to 8.0.3 - http://www.php.net/releases/8_0_3.php
+- see https://fedoraproject.org/wiki/Changes/php80
+- drop xmlrpc extension
+- drop json subpackage, extension always there
+- enchant: use libenchant-2 instead of libenchant
+
+* Tue Mar  2 2021 Remi Collet <remi@remirepo.net> - 7.4.16-1
+- Update to 7.4.16 - http://www.php.net/releases/7_4_16.php
+
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 7.4.15-3
+- drop php-imap, fix #1929640
+
+* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 7.4.15-2
+- rebuild for libpq ABI fix rhbz#1908268
+
+* Tue Feb  2 2021 Remi Collet <remi@remirepo.net> - 7.4.15-1
+- Update to 7.4.15 - http://www.php.net/releases/7_4_15.php
+- add upstream patch for https://bugs.php.net/80682
+  fix opcache doesn't honour pcre.jit option
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.15~RC2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Remi Collet <remi@remirepo.net> - 7.4.15~RC2-1
+- update to 7.4.15RC2
+
+* Tue Jan  5 2021 Remi Collet <remi@remirepo.net> - 7.4.14-1
+- Update to 7.4.14 - http://www.php.net/releases/7_4_14.php
+
+* Wed Dec 16 2020 Remi Collet <remi@remirepo.net> - 7.4.14~RC1-1
+- update to 7.4.14RC1
+
+* Tue Dec  1 2020 Remi Collet <remi@remirepo.net> - 7.4.13-2
+- explicitly requires make
+  https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
+
+* Tue Nov 24 2020 Remi Collet <remi@remirepo.net> - 7.4.13-1
+- Update to 7.4.13 - http://www.php.net/releases/7_4_13.php
+
+* Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 7.4.13~RC1-1
+- update to 7.4.13RC1
+
+* Tue Oct 27 2020 Remi Collet <remi@remirepo.net> - 7.4.12-1
+- Update to 7.4.12 - http://www.php.net/releases/7_4_12.php
+
+* Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 7.4.12~RC1-1
+- update to 7.4.12RC1
+
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.4.11-1
+- Update to 7.4.11 - http://www.php.net/releases/7_4_11.php
+
+* Tue Sep 15 2020 Remi Collet <remi@remirepo.net> - 7.4.11~RC1-1
+- update to 7.4.11RC1
+
+* Thu Sep 03 2020 Josef Řídký <jridky@redhat.com> - 7.4.10-2
+- Rebuilt for new net-snmp release
+
+* Tue Sep  1 2020 Remi Collet <remi@remirepo.net> - 7.4.10-1
+- Update to 7.4.10 - http://www.php.net/releases/7_4_10.php
+
+* Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 7.4.10~RC1-2
+- Rebuilt for new net-snmp release
+
+* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 7.4.10~RC1-1
+- update to 7.4.10RC1
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 7.4.9-1
+- Update to 7.4.9 - http://www.php.net/releases/7_4_9.php
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.9~RC1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Remi Collet <remi@remirepo.net> - 7.4.9~RC1-1
+- update to 7.4.9RC1
+
+* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 7.4.8-3
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Thu Jul  9 2020 Remi Collet <remi@remirepo.net> - 7.4.8-2
+- Update to 7.4.8 - http://www.php.net/releases/7_4_8.php
+  rebuild from new sources
+
+* Tue Jul  7 2020 Remi Collet <remi@remirepo.net> - 7.4.8-1
+- Update to 7.4.8 - http://www.php.net/releases/7_4_8.php
+
+* Mon Jul  6 2020 Remi Collet <remi@remirepo.net> - 7.4.8~RC1-3
+- display build system and provider in phpinfo (from 8.0)
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 7.4.8~RC1-2
+- Disable LTO
+
+* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 7.4.8~RC1-1
+- update to 7.4.8RC1
+- drop patch to fix PHP_UNAME
+
+* Tue Jun 16 2020 Remi Collet <remi@remirepo.net> - 7.4.7-2
+- disable build of mod_php
+  https://fedoraproject.org/wiki/Changes/drop_mod_php
+
+* Tue Jun  9 2020 Remi Collet <remi@remirepo.net> - 7.4.7-1
+- Update to 7.4.7 - http://www.php.net/releases/7_4_7.php
+
+* Mon Jun  8 2020 Remi Collet <remi@remirepo.net> - 7.4.7~RC1-4
+- rewrite conditional using bcond_with and bcond_without
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 7.4.7~RC1-1
+- update to 7.4.7RC1
+
+* Wed May 20 2020 Remi Collet <remi@remirepo.net> - 7.4.6-3
+- use php-config from embed SAPI to reduce used libs
+
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 7.4.6-2
+- Rebuild for ICU 67
+
+* Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.4.6-1
+- Update to 7.4.6 - http://www.php.net/releases/7_4_6.php
+
+* Wed Apr 29 2020 Remi Collet <remi@remirepo.net> - 7.4.6~RC1-1
+- update to 7.4.6RC1
+
+* Tue Apr 21 2020 Remi Collet <remi@fedoraproject.org> - 7.4.5-2
+- make mod_php optional (enabled by default for now)
+- drop mod_php ZTS build
+- run FPM tests
+
+* Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 7.4.5-1
+- Update to 7.4.5 - http://www.php.net/releases/7_4_5.php
+
+* Tue Mar 31 2020 Remi Collet <remi@remirepo.net> - 7.4.5~RC1-1
+- update to 7.4.5RC1
+
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 7.4.4-1
+- Update to 7.4.4 - http://www.php.net/releases/7_4_4.php
+
+* Tue Mar  3 2020 Remi Collet <remi@remirepo.net> - 7.4.4~RC1-1
+- update to 7.4.4RC1
+
+* Tue Feb 18 2020 Remi Collet <remi@remirepo.net> - 7.4.3-1
+- Update to 7.4.3 - http://www.php.net/releases/7_4_3.php
+
+* Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 7.4.3~RC1-1
+- update to 7.4.3RC1
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 21 2020 Remi Collet <remi@remirepo.net> - 7.4.2-1
+- Update to 7.4.2 - http://www.php.net/releases/7_4_2.php
+
+* Tue Jan  7 2020 Remi Collet <remi@remirepo.net> - 7.4.2~RC1-1
+- update to 7.4.2RC1
+
+* Wed Dec 18 2019 Remi Collet <remi@remirepo.net> - 7.4.1-1
+- Update to 7.4.1 - http://www.php.net/releases/7_4_1.php
+
+* Wed Dec 11 2019 Remi Collet <remi@remirepo.net> - 7.4.1~RC1-1
+- update to 7.4.1RC1
+
+* Wed Nov 27 2019 Remi Collet <remi@remirepo.net> - 7.4.0-1
+- update to 7.4.0 GA
+
+* Mon Nov 11 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC6-1
+- update to 7.4.0RC6
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 7.4.0~RC5-2
+- Rebuild for ICU 65
+
+* Tue Oct 29 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC5-1
+- update to 7.4.0RC5
+- set opcache.enable_cli in provided default configuration
+- add /usr/share/php/preload as default ffi.preload configuration
+
+* Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-1
+- update to 7.4.0RC4
+
+* Mon Oct  7 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-2
+- ensure all shared extensions can be loaded
+- add patch from https://github.com/php/php-src/pull/4794
+  to ensure opcache is always linked with librt
+
+* Tue Oct  1 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-1
+- update to 7.4.0RC3
+- bump API version to 20190902
+- drop wddx, recode and interbase extensions
+- add ffi extension
+- drop dependency on libargon2, use libsodium implementation
+- run test suite using 4 concurrent workers
+- cleanup unused conditional
+- add upstream patch to fix aarch64 build
+
+* Tue Sep 24 2019 Remi Collet <remi@remirepo.net> - 7.3.10-1
+- Update to 7.3.10 - http://www.php.net/releases/7_3_10.php
+
+* Wed Sep 11 2019 Remi Collet <remi@remirepo.net> - 7.3.10~RC1-2
+- update to 7.3.10RC1 (new tag)
+
+* Tue Sep 10 2019 Remi Collet <remi@remirepo.net> - 7.3.10~RC1-1
+- update to 7.3.10RC1
+
+* Wed Aug 28 2019 Remi Collet <remi@remirepo.net> - 7.3.9-1
+- Update to 7.3.9 - http://www.php.net/releases/7_3_9.php
+- add tarball signature check
+
+* Tue Aug 20 2019 Petr Pisar <ppisar@redhat.com> - 7.3.9~RC1-2
+- Rebuild against recode-3.7.2 (bug #1379055)
+
+* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 7.3.9~RC1-1
+- update to 7.3.9RC1
+
+* Tue Jul 30 2019 Remi Collet <remi@remirepo.net> - 7.3.8-1
+- Update to 7.3.8 - http://www.php.net/releases/7_3_8.php
+
+* Tue Jul 16 2019 Remi Collet <remi@remirepo.net> - 7.3.8~RC1-1
+- update to 7.3.8RC1
+- add upstream patch for #78297
+- main package now recommends commonly used extensions
+  (json, mbstring, opcache, pdo, xml)
+
+* Wed Jul  3 2019 Remi Collet <remi@remirepo.net> - 7.3.7-2
+- Update to 7.3.7 - http://www.php.net/releases/7_3_7.php
+- disable opcache.huge_code_pages in default configuration
+
+* Thu Jun 20 2019 Remi Collet <remi@remirepo.net> - 7.3.7~RC3-1
+- update to 7.3.7RC3
+
+* Tue Jun 18 2019 Remi Collet <remi@remirepo.net> - 7.3.7~RC2-1
+- update to 7.3.7RC2
+
+* Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 7.3.7~RC1-1
+- update to 7.3.7RC1
+
+* Tue May 28 2019 Remi Collet <remi@remirepo.net> - 7.3.6-1
+- Update to 7.3.6 - http://www.php.net/releases/7_3_6.php
+
+* Wed May 15 2019 Remi Collet <remi@remirepo.net> - 7.3.6~RC1-2
+- update to 7.3.6RC1 (new tag)
+
+* Tue May 14 2019 Remi Collet <remi@remirepo.net> - 7.3.6~RC1-1
+- update to 7.3.6RC1
+
+* Wed May  1 2019 Remi Collet <remi@remirepo.net> - 7.3.5-1
+- Update to 7.3.5 - http://www.php.net/releases/7_3_5.php
+
+* Tue Apr 16 2019 Remi Collet <remi@remirepo.net> - 7.3.5~RC1-1
+- update to 7.3.5RC1
+
+* Tue Apr  2 2019 Remi Collet <remi@remirepo.net> - 7.3.4-1
+- Update to 7.3.4 - http://www.php.net/releases/7_3_4.php
+
+* Thu Mar 21 2019 Remi Collet <remi@remirepo.net> - 7.3.4~RC1-3
+- update to 7.3.4RC1 new tag
+- add upstream patches for failed tests
+- add build dependency on ps command
+
+* Wed Mar 20 2019 Remi Collet <remi@remirepo.net> - 7.3.4~RC1-2
+- revert upstream change for extension test suite
+
+* Tue Mar 19 2019 Remi Collet <remi@remirepo.net> - 7.3.4~RC1-1
+- update to 7.3.4RC1
+
+* Mon Mar 18 2019 Remi Collet <remi@fedoraproject.org> - 7.3.3-2
+- rebuild for libargon2 new soname
+
+* Wed Mar  6 2019 Remi Collet <remi@remirepo.net> - 7.3.3-1
+- Update to 7.3.3 - http://www.php.net/releases/7_3_3.php
+- add upstream patch for OpenSSL 1.1.1b
+
+* Tue Feb 19 2019 Remi Collet <remi@remirepo.net> - 7.3.3~RC1-1
+- update to 7.3.3RC1
+- adapt systzdata patch (v18)
+
+* Wed Feb  6 2019 Remi Collet <remi@remirepo.net> - 7.3.2-1
+- Update to 7.3.2 - http://www.php.net/releases/7_3_2.php
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.2~RC1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 7.3.2~RC1-2
+- Rebuild for ICU 63
+
+* Tue Jan 22 2019 Remi Collet <remi@remirepo.net> - 7.3.2~RC1-1
+- update to 7.3.2RC1
+- update system tzdata patch for timelib 2018.01
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 7.3.1-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Tue Jan  8 2019 Remi Collet <remi@remirepo.net> - 7.3.1-1
+- Update to 7.3.1 - http://www.php.net/releases/7_3_1.php
+
+* Tue Dec 18 2018 Remi Collet <remi@remirepo.net> - 7.3.1-0.1.RC1
+- update to 7.3.1RC1
+
+* Tue Dec  4 2018 Remi Collet <remi@remirepo.net> - 7.3.0-1
+- update to 7.3.0 GA
+- update FPM configuration from upstream
+
+* Tue Nov 20 2018 Remi Collet <remi@remirepo.net> - 7.3.0~0.3.RC5
+- update to 7.3.0RC6
+
+* Tue Nov  6 2018 Remi Collet <remi@remirepo.net> - 7.3.0~0.2.RC5
+- update to 7.3.0RC5
+
+* Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 7.3.0-0.1.RC4
+- rebuild
+
+* Tue Oct 23 2018 Remi Collet <remi@remirepo.net> - 7.3.0~rc4-1
+- update to 7.3.0RC4
+
+* Tue Oct  9 2018 Remi Collet <remi@remirepo.net> - 7.3.0~rc3-1
+- update to 7.3.0RC3
+
+* Thu Oct  4 2018 Remi Collet <remi@remirepo.net> - 7.3.0~rc2-1
+- update to 7.3.0RC2
+- bump API numbers
+- switch from libpcre to libpcre2
+- temporarily disable pcre jit on s390x see https://bugzilla.redhat.com/1636032
+
+* Wed Sep 26 2018 Remi Collet <remi@remirepo.net> - 7.2.11~RC1-1
+- update to 7.2.11RC1
+
+* Tue Sep 11 2018 Remi Collet <remi@remirepo.net> - 7.2.10-1
+- Update to 7.2.10 - http://www.php.net/releases/7_2_10.php
+
+* Tue Aug 28 2018 Remi Collet <remi@remirepo.net> - 7.2.10~RC1-1
+- update to 7.2.10RC1
+
+* Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 7.2.9-1
+- Update to 7.2.9 - http://www.php.net/releases/7_2_9.php
+
+* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 7.2.8-2
+- Rebuild for new net-snmp
+
+* Tue Jul 17 2018 Remi Collet <remi@remirepo.net> - 7.2.8-1
+- Update to 7.2.8 - http://www.php.net/releases/7_2_8.php
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.8~RC1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 7.2.8~RC1-3
+- Rebuild for ICU 62
+
+* Tue Jul  3 2018 Remi Collet <remi@remirepo.net> - 7.2.8~RC1-2
+- FPM: add getallheaders, backported from 7.3
+
+* Tue Jul  3 2018 Remi Collet <remi@remirepo.net> - 7.2.8~RC1-1
+- update to 7.2.8RC1
+
+* Wed Jun 20 2018 Remi Collet <remi@remirepo.net> - 7.2.7-1
+- Update to 7.2.7 - http://www.php.net/releases/7_2_7.php
+- drop -mstackrealign option, workaround to #1593144
+
+* Wed Jun  6 2018 Remi Collet <remi@remirepo.net> - 7.2.7~RC1-1
+- update to 7.2.7RC1
+
+* Wed May 23 2018 Remi Collet <remi@remirepo.net> - 7.2.6-1
+- Update to 7.2.6 - http://www.php.net/releases/7_2_6.php
+
+* Sun May 13 2018 Remi Collet <remi@remirepo.net> - 7.2.6~RC1-1
+- update to 7.2.6RC1
+
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 7.2.5-2
+- Rebuild for ICU 61.1
+
+* Tue Apr 24 2018 Remi Collet <remi@remirepo.net> - 7.2.5-1
+- Update to 7.2.5 - http://www.php.net/releases/7_2_5.php
+
+* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 7.2.5~RC1-1
+- update to 7.2.5RC1
+
+* Tue Apr  3 2018 Remi Collet <remi@remirepo.net> - 7.2.4-2
+- add upstream patch for oniguruma 6.8.1, FTBFS #1562583
+
+* Sun Apr 01 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 7.2.4-2
+- Rebuild against oniguruma 6.8.1
+
+* Tue Mar 27 2018 Remi Collet <remi@remirepo.net> - 7.2.4-1
+- Update to 7.2.4 - http://www.php.net/releases/7_2_4.php
+- FPM: update default pool configuration for process.dumpable
+
+* Wed Mar 21 2018 Remi Collet <remi@remirepo.net> - 7.2.4~RC1-3
+- use systemd RuntimeDirectory instead of /etc/tmpfiles.d
+
+* Thu Mar 15 2018 Remi Collet <remi@remirepo.net> - 7.2.4~RC1-2
+- add file trigger to restart the php-fpm service
+  when new pool or new extension installed #1556762
+
+* Tue Mar 13 2018 Remi Collet <remi@remirepo.net> - 7.2.4~RC1-1
+- update to 7.2.4RC1
+
+* Wed Feb 28 2018 Remi Collet <remi@remirepo.net> - 7.2.3-1
+- Update to 7.2.3 - http://www.php.net/releases/7_2_3.php
+- FPM: revert pid file removal
+
+* Wed Feb 21 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-4
+- disable ZTS on RHEL
+
+* Fri Feb 16 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-3
+- disable pspell extension on RHEL
+- improve devel dependencies
+
+* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-2
+- rebuild for new tag and drop patch merged upstream
+- drop ldconfig scriptlets
+
+* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-1
+- update to 7.2.3RC1
+- adapt systzdata, fixheader and ldap_r patches
+- apply upstream patch for date ext
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 30 2018 Remi Collet <remi@remirepo.net> - 7.2.2-1
+- Update to 7.2.2 - http://www.php.net/releases/7_2_2.php
+
+* Mon Jan 29 2018 Remi Collet <rcollet@redhat.com> - 7.2.2~RC1-3
+- disable interbase, imap, pdo_dblib and sodium on rhel
+
+* Thu Jan 25 2018 Remi Collet <remi@remirepo.net> - 7.2.2~RC1-3
+- undefine _strict_symbol_defs_build
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 7.2.2~RC1-2
+- Rebuilt for switch to libxcrypt
+
+* Tue Jan 16 2018 Remi Collet <remi@remirepo.net> - 7.2.2~RC1-1
+- update to 7.2.2RC1
+- define SOURCE_DATE_EPOCH for reproducible build
+
+* Wed Jan  3 2018 Remi Collet <remi@remirepo.net> - 7.2.1-1
+- Update to 7.2.1 - http://www.php.net/releases/7_2_1.php
+
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 7.2.1~RC1-1
+- update to 7.2.1RC1
+
+* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 7.2.0-3
+- Rebuild for ICU 60.1
+
+* Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-2
+- refresh patch for https://bugs.php.net/75514
+
+* Tue Nov 28 2017 Remi Collet <remi@remirepo.net> - 7.2.0-1
+- update to 7.2.0 GA
+- add upstream patch for https://bugs.php.net/75514
+
+* Tue Nov  7 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0~RC6-1
+- Update to 7.2.0RC6
+
+* Wed Oct 25 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0~RC5-1
+- Update to 7.2.0RC5
+- make php-fpm a weak dependency
+
+* Wed Oct 18 2017 Remi Collet <remi@remirepo.net> - 7.2.0~RC4-2
+- enable argon2 password hash
+
+* Tue Oct 10 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0~RC4-1
+- Update to 7.2.0RC4
+
+* Fri Sep 29 2017 Remi Collet <remi@fedoraproject.org> - 7.2.0~RC3-1
+- Update to 7.2.0RC3
+- drop mcrypt extension
+- add sodium extension
+- use system oniguruma
+- drop .so suffix from ini files
+- refresh configuration files from upstream
+
+* Wed Sep 27 2017 Remi Collet <remi@fedoraproject.org> - 7.1.10-1
+- Update to 7.1.10 - http://www.php.net/releases/7_1_10.php
+
+* Mon Sep 25 2017 Remi Collet <remi@fedoraproject.org> - 7.1.10~RC1-2
+- php now requires php-fpm and start it with httpd / nginx
+
+* Wed Sep 13 2017 Remi Collet <remi@fedoraproject.org> - 7.1.10~RC1-1
+- Update to 7.1.10RC1
+
+* Wed Sep  6 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9-2
+- Automatically load OpenSSL configuration file, from PHP 7.2
+
+* Wed Aug 30 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9-1
+- Update to 7.1.9 - http://www.php.net/releases/7_1_9.php
+
+* Wed Aug 16 2017 Remi Collet <remi@fedoraproject.org> - 7.1.9~RC1-1
+- Update to 7.1.9RC1
+- php-fpm: drop unneeded "pid" from default configuration
+
+* Wed Aug  2 2017 Remi Collet <remi@fedoraproject.org> - 7.1.8-1
+- Update to 7.1.8 - http://www.php.net/releases/7_1_8.php
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.8~RC1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Remi Collet <remi@fedoraproject.org> - 7.1.8~RC1-1
+- Update to 7.1.8RC1
+
+* Tue Jul 18 2017 Remi Collet <remi@fedoraproject.org> - 7.1.7-2
+- disable httpd MPM check
+
+* Thu Jul  6 2017 Remi Collet <remi@fedoraproject.org> - 7.1.7-1
+- Update to 7.1.7 - http://www.php.net/releases/7_1_7.php
+
+* Wed Jun 21 2017 Remi Collet <remi@fedoraproject.org> - 7.1.7~RC1-1
+- Update to 7.1.7RC1
+
+* Wed Jun  7 2017 Remi Collet <remi@fedoraproject.org> - 7.1.6-1
+- Update to 7.1.6 - http://www.php.net/releases/7_1_6.php
+- add upstream security patches for oniguruma
+
+* Wed May 24 2017 Remi Collet <remi@fedoraproject.org> - 7.1.6~RC1-1
+- Update to 7.1.6RC1
+
+* Tue May  9 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-1
+- Update to 7.1.5 - http://www.php.net/releases/7_1_5.php
+
+* Sat May  6 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-0.3.RC1
+- enable PHP execution of .phar files, see #1117140
+
+* Thu Apr 27 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-0.2.RC1
+- new sources from new tag
+
+* Tue Apr 25 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-0.1.RC1
+- Update to 7.1.5RC1
+
+* Tue Apr 11 2017 Remi Collet <remi@fedoraproject.org> - 7.1.4-1
+- Update to 7.1.4 - http://www.php.net/releases/7_1_4.php
+
+* Wed Mar 29 2017 Remi Collet <remi@fedoraproject.org> - 7.1.4-0.1.RC1
+- Update to 7.1.4RC1
+
+* Wed Mar 22 2017 Remi Collet <remi@fedoraproject.org> - 7.1.3-3
+- timelib is MIT license
+
+* Wed Mar 15 2017 Remi Collet <remi@fedoraproject.org> - 7.1.3-2
+- remove %%attr, see #1432372
+
+* Wed Mar 15 2017 Remi Collet <remi@fedoraproject.org> - 7.1.3-1
+- Update to 7.1.3 - http://www.php.net/releases/7_1_3.php
+
+* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> 7.1.3-0.1.RC1
+- Update to 7.1.3RC1
+
+* Wed Feb 15 2017 Remi Collet <remi@fedoraproject.org> - 7.1.2-1
+- Update to 7.1.2 - http://www.php.net/releases/7_1_2.php
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.2-0.2.RC1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb  2 2017 Remi Collet <remi@fedoraproject.org> - 7.1.2-0.2.RC1
+- Update to 7.1.2RC1 (new sources)
+
+* Wed Feb  1 2017 Remi Collet <remi@fedoraproject.org> 7.1.2-0.1.RC1
+- Update to 7.1.2RC1
+
+* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-1
+- Update to 7.1.1 - http://www.php.net/releases/7_1_1.php
+
+* Fri Jan  6 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-0.1.RC1
+- Update to 7.1.1RC1
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-1
+- Update to 7.1.0 - http://www.php.net/releases/7_1_0.php
+
+* Fri Nov 25 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-0.3.RC6
+- disable pcre.jit everywhere as it raise AVC #1398474
+- sync provided configuration with upstream production defaults
+
+* Mon Nov 14 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-0.2.RC6
+- re-enable interbase sub package
+  see http://bugzilla.redhat.com/1394750 sub package inconsistency
+- add patch to fix firebird include path (using fb_config)
+
+* Mon Nov 14 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-0.1.RC6
+- Update to 7.1.0RC6
+- update tzdata patch to v14, improve check for valid tz file
+- disable interbase sub package (interbase and pdo_firebird)
+
+* Tue Oct 11 2016 Remi Collet <remi@fedoraproject.org> 7.1.0-0.1.RC3
+- Update to 7.1.0RC3
+
+* Wed Sep 28 2016 Remi Collet <remi@fedoraproject.org> 7.0.12-0.1.RC1
+- Update to 7.0.12RC1
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> 7.0.11-1
+- Update to 7.0.11 - http://www.php.net/releases/7_0_11.php
+
+* Fri Sep  2 2016 Remi Collet <remi@fedoraproject.org> 7.0.11-0.1.RC1
+- Update to 7.0.11RC1
+
+* Thu Sep  1 2016 Remi Collet <remi@fedoraproject.org> 7.0.10-1
+- Update to 7.0.10 - http://www.php.net/releases/7_0_10.php
+
+* Wed Aug  3 2016 Remi Collet <remi@fedoraproject.org> 7.0.10-0.1.RC1
+- Update to 7.0.10RC1
+
+* Wed Jul 20 2016 Remi Collet <remi@fedoraproject.org> 7.0.9-1
+- Update to 7.0.9 - http://www.php.net/releases/7_0_9.php
+- wddx: add upstream patch for https://bugs.php.net/72564
+
+* Wed Jul  6 2016 Remi Collet <remi@fedoraproject.org> 7.0.9-0.1.RC1
+- Update to 7.0.9RC1
+
+* Thu Jun 30 2016 Remi Collet <remi@fedoraproject.org> 7.0.8-2
+- own tests/doc directories for pecl packages #1351345
+
+* Wed Jun 22 2016 Remi Collet <remi@fedoraproject.org> 7.0.8-1
+- Update to 7.0.8 - http://www.php.net/releases/7_0_8.php
+- https://fedoraproject.org/wiki/Changes/php70
+- drop ereg, mysql, mssql extensions
+- add json extension
+
+* Wed Jun 22 2016 Remi Collet <remi@fedoraproject.org> 5.6.23-1
+- Update to 5.6.23 - http://www.php.net/releases/5_6_23.php
+
+* Thu Jun  9 2016 Remi Collet <remi@fedoraproject.org> 5.6.23-0.1.RC1
+- update to 5.6.23RC1
+
+* Fri May 27 2016 Remi Collet <remi@fedoraproject.org> 5.6.22-2
+- drop unneeded option --with-vpx-dir, fix FTBFS, thanks Koschei
+
+* Thu May 26 2016 Remi Collet <remi@fedoraproject.org> 5.6.22-1
+- Update to 5.6.22 - http://www.php.net/releases/5_6_22.php
+
+* Thu May 12 2016 Remi Collet <remi@fedoraproject.org> 5.6.22-0.1.RC1
+- update to 5.6.22RC1
+
+* Thu Apr 28 2016 Remi Collet <remi@fedoraproject.org> 5.6.21-1
+- Update to 5.6.21
+  http://www.php.net/releases/5_6_21.php
+
+* Mon Apr 18 2016 Remi Collet <remi@fedoraproject.org> 5.6.21-0.2.RC1
+- rebuild for ICU 57.1
+
+* Mon Apr 18 2016 Remi Collet <remi@fedoraproject.org> 5.6.21-0.1.RC1
+- update to 5.6.21RC1
+
+* Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 5.6.20-1.1
+- rebuild for ICU 57.1
+
+* Thu Mar 31 2016 Remi Collet <remi@fedoraproject.org> 5.6.20-1
+- Update to 5.6.20
+  http://www.php.net/releases/5_6_20.php
+
+* Thu Mar 17 2016 Remi Collet <remi@fedoraproject.org> 5.6.20-0.1.RC1
+- update to 5.6.20RC1
+
+* Thu Mar  3 2016 Remi Collet <remi@fedoraproject.org> 5.6.19-1
+- Update to 5.6.19
+  http://www.php.net/releases/5_6_19.php
+
+* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> 5.6.19-0.1.RC1
+- update to 5.6.19RC1
+
+* Tue Feb  9 2016 Remi Collet <remi@fedoraproject.org> 5.6.18-2
+- define %%pecl_xmldir and own it (/var/lib/php/peclxml)
+
+* Wed Feb  3 2016 Remi Collet <remi@fedoraproject.org> 5.6.18-1
+- Update to 5.6.18
+  http://www.php.net/releases/5_6_18.php
+
+* Thu Jan 21 2016 Remi Collet <remi@fedoraproject.org> 5.6.18-0.1.RC1
+- update to 5.6.18RC1
+
+* Thu Jan  7 2016 Remi Collet <remi@fedoraproject.org> 5.6.17-1
+- Update to 5.6.17
+  http://www.php.net/releases/5_6_17.php
+
+* Thu Dec 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.1.RC1
+- update to 5.6.17RC1
+
+* Tue Dec  1 2015 Tom Callaway <spot@fedoraproject.org> 5.6.16-2
+- rebuild for libvpx 1.5.0
+
+* Thu Nov 26 2015 Remi Collet <remi@fedoraproject.org> 5.6.16-1
+- Update to 5.6.16
+  http://www.php.net/releases/5_6_16.php
+
+* Wed Nov 18 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.16-0.2.RC2
+- rebuild (tidy)
+
+* Thu Nov 12 2015 Remi Collet <remi@fedoraproject.org> 5.6.16-0.1.RC1
+- update to 5.6.16RC1
+
+* Thu Oct 29 2015 Remi Collet <remi@fedoraproject.org> 5.6.15-1
+- Update to 5.6.15
+  http://www.php.net/releases/5_6_15.php
+- php-config: reports all built sapis
+
+* Thu Oct 15 2015 Remi Collet <remi@fedoraproject.org> 5.6.15-0.1.RC1
+- update to 5.6.15RC1
+
+* Wed Sep 30 2015 Remi Collet <remi@fedoraproject.org> 5.6.14-1
+- Update to 5.6.14
+  http://www.php.net/releases/5_6_14.php
+- php-fpm: enable http authorization headers
+
+* Thu Sep 17 2015 Remi Collet <remi@fedoraproject.org> 5.6.14-0.1.RC1
+- update to 5.6.14RC1
+
+* Thu Sep  3 2015 Remi Collet <remi@fedoraproject.org> 5.6.13-1
+- Update to 5.6.13
+  http://www.php.net/releases/5_6_13.php
+
+* Thu Aug  6 2015 Remi Collet <remi@fedoraproject.org> 5.6.12-1
+- Update to 5.6.12
+  http://www.php.net/releases/5_6_12.php
+
+* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> 5.6.12-0.1.RC1
+- update to 5.6.12RC1
+
+* Fri Jul 17 2015 Remi Collet <remi@fedoraproject.org> 5.6.11-2
+- fix typo in php.conf #1244104
+
+* Sun Jul 12 2015 Remi Collet <remi@fedoraproject.org> 5.6.11-1
+- Update to 5.6.11
+  http://www.php.net/releases/5_6_11.php
+
+* Thu Jun 25 2015 Remi Collet <remi@fedoraproject.org> 5.6.11-0.1.RC1
+- update to 5.6.11RC1
+- the phar link is now correctly created
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.10-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Jun 11 2015 Remi Collet <remi@fedoraproject.org> 5.6.10-1
+- Update to 5.6.10
+  http://www.php.net/releases/5_6_10.php
+- add explicit spec license (implicit by FPCA)
+
+* Thu May 28 2015 Remi Collet <remi@fedoraproject.org> 5.6.10-0.1.RC1
+- update to 5.6.10RC1
+- opcache is now 7.0.6-dev
+
+* Fri May 15 2015 Remi Collet <remi@fedoraproject.org> 5.6.9-1
+- Update to 5.6.9
+  http://www.php.net/releases/5_6_9.php
+
+* Thu Apr 30 2015 Remi Collet <remi@fedoraproject.org> 5.6.9-0.1.RC1
+- update to 5.6.9RC1
+- adapt systzdata patch for upstream changes for new zic
+
+* Thu Apr 16 2015 Remi Collet <remi@fedoraproject.org> 5.6.8-1
+- Update to 5.6.8
+  http://www.php.net/releases/5_6_8.php
+
+* Fri Apr 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.8-0.3.RC1
+- add upstream patch to drop SSLv3 tests
+
+* Mon Apr  6 2015 Tom Callaway <spot@fedoraproject.org> - 5.6.8-0.2.RC1
+- rebuild for libvpx 1.4.0
+
+* Wed Apr  1 2015 Remi Collet <remi@fedoraproject.org> 5.6.8-0.1.RC1
+- update to 5.6.8RC1
+
+* Fri Mar 20 2015 Remi Collet <remi@fedoraproject.org> 5.6.7-2
+- Update to 5.6.7
+  http://www.php.net/releases/5_6_7.php
+
+* Sun Mar  8 2015 Remi Collet <remi@fedoraproject.org> 5.6.7-1
+- update to 5.6.7RC1
+
+* Thu Feb 19 2015 Remi Collet <remi@fedoraproject.org> 5.6.6-1
+- Update to 5.6.6
+  http://www.php.net/releases/5_6_6.php
+
+* Thu Feb  5 2015 Remi Collet <rcollet@redhat.com> 5.6.6-0.1.RC1
+- php 5.6.6RC1 for Koschei
+
+* Mon Jan 26 2015 David Tardon <dtardon@redhat.com> - 5.6.5-2
+- rebuild for ICU 54.1
+
+* Thu Jan 22 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-1
+- Update to 5.6.5
+  http://www.php.net/releases/5_6_5.php
+- drop deprecated php-fpm EnvironmentFile
+
+* Fri Jan  9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
+- update to 5.6.5RC1
+- FPM: enable ACL support for Unix Domain Socket
+- FPM: switch default configuration to use UDS
+
+* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> 5.6.4-2
+- Update to 5.6.4 (real)
+  http://www.php.net/releases/5_6_4.php
+- php-xmlrpc requires php-xml
+
+* Wed Dec 10 2014 Remi Collet <remi@fedoraproject.org> 5.6.4-1
+- Update to 5.6.4
+  http://www.php.net/releases/5_6_4.php
+
+* Fri Nov 28 2014 Remi Collet <rcollet@redhat.com> 5.6.4-0.1.RC1
+- php 5.6.4RC1
+
+* Mon Nov 17 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-4
+- FPM: add upstream patch for https://bugs.php.net/68428
+  listen.allowed_clients is IPv4 only
+
+* Mon Nov 17 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-3
+- sync php-fpm configuration with upstream
+- refresh upstream patch for 68421
+
+* Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-2
+- FPM: add upstream patch for https://bugs.php.net/68421
+  access.format=R doesn't log ipv6 address
+- FPM: add upstream patch for https://bugs.php.net/68420
+  listen=9000 listens to ipv6 localhost instead of all addresses
+- FPM: add upstream patch for https://bugs.php.net/68423
+  will no longer load all pools
+
+* Thu Nov 13 2014 Remi Collet <remi@fedoraproject.org> 5.6.3-1
+- Update to PHP 5.6.3
+  http://php.net/releases/5_6_3.php
+
+* Fri Oct 31 2014 Remi Collet <rcollet@redhat.com> 5.6.3-0.2.RC1
+- php 5.6.3RC1 (refreshed, phpdbg changes reverted)
+- new version of systzdata patch, fix case sensitivity
+- ignore Factory in date tests
+
+* Wed Oct 29 2014 Remi Collet <rcollet@redhat.com> 5.6.3-0.1.RC1
+- php 5.6.3RC1
+- disable opcache.fast_shutdown in default config
+- enable phpdbg_webhelper new extension (in php-dbg)
+
+* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> 5.6.1-1
+- Update to PHP 5.6.2
+  http://php.net/releases/5_6_2.php
+
+* Fri Oct  3 2014 Remi Collet <remi@fedoraproject.org> 5.6.1-1
+- Update to PHP 5.6.1
+  http://php.net/releases/5_6_1.php
+- use default system cipher list by Fedora policy
+  http://fedoraproject.org/wiki/Changes/CryptoPolicy
+
+* Wed Sep 24 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.2.RC1
+- provides nginx configuration (see #1142298)
+
+* Sat Sep 13 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0.1.RC1
+- php 5.6.1RC1
+
+* Thu Aug 28 2014 Remi Collet <remi@fedoraproject.org> 5.6.0-1
+- PHP 5.6.0 is GA
+  http://php.net/releases/5_6_0.php
+- fix ZTS man pages, upstream patch for 67878
+- provides php(httpd)
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.0-0.7.RC4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Aug 14 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.6.RC4
+- php 5.6.0RC4
+
+* Thu Jul 31 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.5.RC3
+- fpm requires httpd >= 2.4.10 for proxy support in SetHandler
+
+* Thu Jul 31 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.4.RC3
+- php 5.6.0RC3
+- cleanup with_libmysql
+- fix licenses handling
+- fix zts-php-config --php-binary output #1124605
+- provide php.conf with php-fpm, allow apache + fpm
+  to work with default configuration, without mod_php
+
+* Mon Jul  7 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.3.RC2
+- php 5.6.0RC2
+
+* Mon Jun 23 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.2.RC1
+- fix phpdbg with libedit https://bugs.php.net/67499
+- add workaround for unserialize/mock issue from 5.4/5.5
+
+* Thu Jun 19 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.1.RC1
+- php 5.6.0RC1
+  https://fedoraproject.org/wiki/Changes/Php56
+- add php-dbg subpackage
+- update php.ini and opcache.ini from upstream production template
+- move zts-php to php-cli
+
+* Thu Jun  5 2014 Remi Collet <rcollet@redhat.com> 5.5.13-3
+- fix regression introduce in fix for #67118
+
+* Tue Jun  3 2014 Remi Collet <remi@fedoraproject.org> 5.5.13-2
+- fileinfo: fix insufficient boundary check
+- workaround regression introduce in fix for 67072 in
+  serialize/unzerialize functions
+
+* Fri May 30 2014 Remi Collet <rcollet@redhat.com> 5.5.13-1
+- Update to 5.5.13
+  http://www.php.net/releases/5_5_13.php
+- sync php.ini with upstream php.ini-production
+
+* Sat May  3 2014 Remi Collet <rcollet@redhat.com> 5.5.12-1
+- Update to 5.5.12
+  http://www.php.net/releases/5_5_12.php
+- php-fpm: change default unix socket permission CVE-2014-0185
+
+* Wed Apr 23 2014 Remi Collet <rcollet@redhat.com> 5.5.11-2
+- add numerical prefix to extension configuration files
+- prevent .user.ini files from being viewed by Web clients
+- load php directives only when mod_php is active
+
+* Thu Apr  3 2014 Remi Collet <rcollet@redhat.com> 5.5.11-1
+- Update to 5.5.11
+  http://www.php.net/ChangeLog-5.php#5.5.11
+
+* Thu Mar  6 2014 Remi Collet <rcollet@redhat.com> 5.5.10-1
+- Update to 5.5.10
+  http://www.php.net/ChangeLog-5.php#5.5.10
+- php-fpm should own /var/lib/php/session and wsdlcache
+- fix pcre test results with libpcre < 8.34
+
+* Tue Feb 18 2014 Remi Collet <rcollet@redhat.com> 5.5.9-2
+- upstream patch for https://bugs.php.net/66731
+
+* Thu Feb 13 2014 Remi Collet <remi@fedoraproject.org> 5.5.9-1.1
+- rebuild
+
+* Tue Feb 11 2014 Remi Collet <remi@fedoraproject.org> 5.5.9-1
+- Update to 5.5.9
+  http://www.php.net/ChangeLog-5.php#5.5.9
+- Install macros to /usr/lib/rpm/macros.d
+
+* Thu Jan 23 2014 Joe Orton <jorton@redhat.com> - 5.5.8-2
+- fix _httpd_mmn expansion in absence of httpd-devel
+
+* Wed Jan  8 2014 Remi Collet <rcollet@redhat.com> 5.5.8-1
+- update to 5.5.8
+- drop conflicts with other opcode caches as both can
+  be used only for user data cache
+
+* Wed Dec 11 2013 Remi Collet <rcollet@redhat.com> 5.5.7-1
+- update to 5.5.7, fix for CVE-2013-6420
+- fix zend_register_functions breaks reflection, php bug 66218
+- fix Heap buffer over-read in DateInterval, php bug 66060
+- fix fix overflow handling bug in non-x86
+
+* Wed Nov 13 2013 Remi Collet <remi@fedoraproject.org> 5.5.6-1
+- update to 5.5.6
+
+* Thu Oct 17 2013 Remi Collet <rcollet@redhat.com> - 5.5.5-1
+- update to 5.5.5
+- sync php.ini with upstream
+
+* Thu Sep 19 2013 Remi Collet <rcollet@redhat.com> - 5.5.4-1
+- update to 5.5.4
+- improve security, use specific soap.wsdl_cache_dir
+  use /var/lib/php/wsdlcache for mod_php and php-fpm
+- sync short_tag comments in php.ini with upstream
+
+* Wed Aug 21 2013 Remi Collet <rcollet@redhat.com> - 5.5.3-1
+- update to 5.5.3
+- fix typo and add missing entries in php.ini
+- drop zip extension
+
+* Mon Aug 19 2013 Remi Collet <rcollet@redhat.com> - 5.5.2-1
+- update to 5.5.2, fixes for CVE-2011-4718 + CVE-2013-4248
+
+* Thu Aug 08 2013 Remi Collet <rcollet@redhat.com> - 5.5.1-3
+- improve system libzip patch
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jul 22 2013 Remi Collet <rcollet@redhat.com> - 5.5.1-1
+- update to 5.5.1
+- add Provides: php(pdo-abi), for consistency with php(api)
+  and php(zend-abi)
+- improved description for mod_php
+- fix opcache ZTS configuration (blacklists in /etc/php-zts.d)
+- add missing man pages (phar, php-cgi)
+
+* Fri Jul 12 2013 Remi Collet <rcollet@redhat.com> - 5.5.0-2
+- add security fix for CVE-2013-4113
+- add missing ASL 1.0 license
+- 32k stack size seems ok for tests on both 32/64bits build
+
+* Thu Jun 20 2013 Remi Collet <rcollet@redhat.com> 5.5.0-1
+- update to 5.5.0 final
+
+* Fri Jun 14 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.11.RC3
+- also drop JSON from sources
+- clean conditional for JSON (as removed from the sources)
+- clean conditional for FPM (always build)
+
+* Thu Jun 13 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.10.RC3
+- drop JSON extension
+
+* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.9.RC3
+- build with system GD >= 2.1.0
+
+* Thu Jun  6 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.8.RC3
+- update to 5.5.0RC3
+
+* Thu May 23 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.7.RC2
+- update to 5.5.0RC2
+- add missing options in php-fpm.conf
+- run php-fpm in systemd notify mode
+- /etc/syconfig/php-fpm is deprecated (still used)
+- add /systemd/system/php-fpm.service.d
+
+* Wed May  8 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.6.RC1
+- update to 5.5.0RC1
+- remove reference to apache in some sub-packages description
+- add option to disable json extension
+- drop most (very old) "Obsoletes", add version to others
+
+* Thu Apr 25 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.5.beta4
+- update to 5.5.0beta4
+- zend_extension doesn't requires full path
+- refresh patch for system libzip
+- drop opcache patch merged upstream
+- add BuildRequires libvpx-devel for WebP support in php-gd
+- php-fpm own /usr/share/fpm
+
+* Thu Apr 11 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.4.beta3
+- update to 5.5.0beta3
+- allow wildcard in opcache.blacklist_filename and provide
+  default /etc/php.d/opcache-default.blacklist
+- clean spec, use only spaces (no tab)
+
+* Thu Apr  4 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.3.beta2
+- clean old deprecated options
+
+* Thu Mar 28 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.2.beta2
+- update to 5.5.0beta2
+- Zend Optimizer+ renamed to Zend OPcache
+- sync provided configuration with upstream
+
+* Fri Mar 22 2013 Remi Collet <rcollet@redhat.com> 5.5.0-0.1.beta1
+- update to 5.5.0beta1
+  http://fedoraproject.org/wiki/Features/Php55
+- new Zend OPcache extension in php-opccache new sub-package
+- don't display XFAIL tests in report
+- use xz compressed tarball
+- build simplexml and xml extensions shared (moved in php-xml)
+- build bz2, calendar, ctype, exif, ftp, gettext, iconv
+  sockets and tokenizer extensions shared (in php-common)
+- build gmp extension shared (in php-gmp new sub-package)
+- build shmop extension shared (moved in php-process)
+- drop some old compatibility provides (php-api, php-zend-abi, php-pecl-*)
+
+* Thu Mar 14 2013 Remi Collet <rcollet@redhat.com> 5.4.13-1
+- update to 5.4.13
+- security fix for CVE-2013-1643
+- Hardened build (links with -z now option)
+
+* Mon Mar 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> -  5.4.13-0.2.RC1
+- Remove %%config from %%{_sysconfdir}/rpm/macros.*
+  (https://fedorahosted.org/fpc/ticket/259).
+
+* Thu Feb 28 2013 Remi Collet <rcollet@redhat.com> 5.4.13-0.1.RC1
+- update to 5.4.13RC1
+- drop patches merged upstream
+
+* Sat Feb 23 2013 Karsten Hopp <karsten@redhat.com> 5.4.12-4
+- add support for ppc64p7 arch (Power7 optimized)
+
+* Thu Feb 21 2013 Remi Collet <rcollet@redhat.com> 5.4.12-3
+- make ZTS build optional (still enabled)
+
+* Wed Feb 20 2013 Remi Collet <rcollet@redhat.com> 5.4.12-2
+- make php-mysql package optional and disabled
+
+* Wed Feb 20 2013 Remi Collet <remi@fedoraproject.org> 5.4.12-1
+- update to 5.4.12
+- security fix for CVE-2013-1635
+- drop gdbm because of license incompatibility
+
+* Wed Feb 13 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.6.RC2
+- enable tokyocabinet and gdbm dba handlers
+
+* Wed Feb 13 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.5.RC2
+- update to 5.4.12RC2
+
+* Mon Feb 11 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.4.RC1
+- upstream patch (5.4.13) to fix dval to lval conversion
+  https://bugs.php.net/64142
+
+* Mon Feb  4 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.3.RC1
+- upstream patch (5.4.13) for 2 failed tests
+
+* Fri Feb  1 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.2.RC1
+- fix buit-in web server on ppc64 (fdset usage)
+  https://bugs.php.net/64128
+
+* Thu Jan 31 2013 Remi Collet <rcollet@redhat.com> 5.4.12-0.1.RC1
+- update to 5.4.12RC1
+
+* Mon Jan 28 2013 Remi Collet <rcollet@redhat.com> 5.4.11-3
+- rebuild for new libicu
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 5.4.11-2
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Wed Jan 16 2013 Remi Collet <rcollet@redhat.com> 5.4.11-1
+- update to 5.4.11
+
+* Thu Jan 10 2013 Remi Collet <rcollet@redhat.com> 5.4.11-0.2.RC1
+- fix php.conf to allow MultiViews managed by php scripts
+
+* Thu Jan 10 2013 Remi Collet <rcollet@redhat.com> 5.4.11-0.1.RC1
+- update to 5.4.11RC1
+
+* Wed Dec 19 2012 Remi Collet <rcollet@redhat.com> 5.4.10-1
+- update to 5.4.10
+- remove patches merged upstream
+
+* Tue Dec 11 2012 Remi Collet <rcollet@redhat.com> 5.4.9-3
+- drop "Configure Command" from phpinfo output
+
+* Tue Dec 11 2012 Joe Orton <jorton@redhat.com> - 5.4.9-2
+- prevent php_config.h changes across (otherwise identical) rebuilds
+
+* Thu Nov 22 2012 Remi Collet <rcollet@redhat.com> 5.4.9-1
+- update to 5.4.9
+
+* Thu Nov 15 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.5.RC1
+- switch back to upstream generated scanner/parser
+
+* Thu Nov 15 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.4.RC1
+- use _httpd_contentdir macro and fix php.gif path
+
+* Wed Nov 14 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.3.RC1
+- improve system libzip patch to use pkg-config
+
+* Wed Nov 14 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.2.RC1
+- use _httpd_moddir macro
+
+* Wed Nov 14 2012 Remi Collet <rcollet@redhat.com> 5.4.9-0.1.RC1
+- update to 5.4.9RC1
+- improves php.conf (use FilesMatch + SetHandler)
+- improves filter (httpd module)
+- apply ldap_r patch on fedora >= 18 only
+
+* Fri Nov  9 2012 Remi Collet <rcollet@redhat.com> 5.4.8-6
+- clarify Licenses
+- missing provides xmlreader and xmlwriter
+- modernize spec
+- change php embedded library soname version to 5.4
+
+* Tue Nov  6 2012 Remi Collet <rcollet@redhat.com> 5.4.8-5
+- fix _httpd_mmn macro definition
+
+* Mon Nov  5 2012 Remi Collet <rcollet@redhat.com> 5.4.8-4
+- fix mysql_sock macro definition
+
+* Thu Oct 25 2012 Remi Collet <rcollet@redhat.com> 5.4.8-3
+- fix installed headers
+
+* Tue Oct 23 2012 Joe Orton <jorton@redhat.com> - 5.4.8-2
+- use libldap_r for ldap extension
+
+* Thu Oct 18 2012 Remi Collet <remi@fedoraproject.org> 5.4.8-1
+- update to 5.4.8
+- define both session.save_handler and session.save_path
+- fix possible segfault in libxml (#828526)
+- php-fpm: create apache user if needed
+- use SKIP_ONLINE_TEST during make test
+- php-devel requires pcre-devel and php-cli (instead of php)
+
+* Fri Oct  5 2012 Remi Collet <remi@fedoraproject.org> 5.4.7-11
+- provides php-phar
+- update systzdata patch to v10, timezone are case insensitive
+
+* Mon Oct  1 2012 Remi Collet <remi@fedoraproject.org> 5.4.7-10
+- fix typo in systemd macro
+
+* Mon Oct  1 2012 Remi Collet <remi@fedoraproject.org> 5.4.7-9
+- php-fpm: enable PrivateTmp
+- php-fpm: new systemd macros (#850268)
+- php-fpm: add upstream patch for startup issue (#846858)
+
+* Fri Sep 28 2012 Remi Collet <rcollet@redhat.com> 5.4.7-8
+- systemd integration, https://bugs.php.net/63085
+- no odbc call during timeout, https://bugs.php.net/63171
+- check sqlite3_column_table_name, https://bugs.php.net/63149
+
+* Mon Sep 24 2012 Remi Collet <rcollet@redhat.com> 5.4.7-7
+- most failed tests explained (i386, x86_64)
+
+* Wed Sep 19 2012 Remi Collet <rcollet@redhat.com> 5.4.7-6
+- fix for http://bugs.php.net/63126 (#783967)
+
+* Wed Sep 19 2012 Remi Collet <rcollet@redhat.com> 5.4.7-5
+- patch to ensure we use latest libdb (not libdb4)
+
+* Wed Sep 19 2012 Remi Collet <rcollet@redhat.com> 5.4.7-4
+- really fix rhel tests (use libzip and libdb)
+
+* Tue Sep 18 2012 Remi Collet <rcollet@redhat.com> 5.4.7-3
+- fix test to enable zip extension on RHEL-7
+
+* Mon Sep 17 2012 Remi Collet <remi@fedoraproject.org> 5.4.7-2
+- remove session.save_path from php.ini
+  move it to apache and php-fpm configuration files
+
+* Fri Sep 14 2012 Remi Collet <remi@fedoraproject.org> 5.4.7-1
+- update to 5.4.7
+  http://www.php.net/releases/5_4_7.php
+- php-fpm: don't daemonize
+
+* Mon Aug 20 2012 Remi Collet <remi@fedoraproject.org> 5.4.6-2
+- enable php-fpm on secondary arch (#849490)
+
+* Fri Aug 17 2012 Remi Collet <remi@fedoraproject.org> 5.4.6-1
+- update to 5.4.6
+- update to v9 of systzdata patch
+- backport fix for new libxml
+
+* Fri Jul 20 2012 Remi Collet <remi@fedoraproject.org> 5.4.5-1
+- update to 5.4.5
+
+* Mon Jul 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-4
+- also provide php(language)%%{_isa}
+- define %%{php_version}
+
+* Mon Jul 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-3
+- drop BR for libevent (#835671)
+- provide php(language) to allow version check
+
+* Thu Jun 21 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-2
+- add missing provides (core, ereg, filter, standard)
+
+* Thu Jun 14 2012 Remi Collet <remi@fedoraproject.org> 5.4.4-1
+- update to 5.4.4 (CVE-2012-2143, CVE-2012-2386)
+- use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d
+- use /run/php-fpm instead of /var/run/php-fpm
+
+* Wed May 09 2012 Remi Collet <remi@fedoraproject.org> 5.4.3-1
+- update to 5.4.3 (CVE-2012-2311, CVE-2012-2329)
+
+* Thu May 03 2012 Remi Collet <remi@fedoraproject.org> 5.4.2-1
+- update to 5.4.2 (CVE-2012-1823)
+
+* Fri Apr 27 2012 Remi Collet <remi@fedoraproject.org> 5.4.1-1
+- update to 5.4.1
+
+* Wed Apr 25 2012 Joe Orton <jorton@redhat.com> - 5.4.0-6
+- rebuild for new icu
+- switch (conditionally) to libdb-devel
+
+* Sat Mar 31 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-5
+- fix Loadmodule with MPM event (use ZTS if not MPM worker)
+- split conf.d/php.conf + conf.modules.d/10-php.conf with httpd 2.4
+
+* Thu Mar 29 2012 Joe Orton <jorton@redhat.com> - 5.4.0-4
+- rebuild for missing automatic provides (#807889)
+
+* Mon Mar 26 2012 Joe Orton <jorton@redhat.com> - 5.4.0-3
+- really use _httpd_mmn
+
+* Mon Mar 26 2012 Joe Orton <jorton@redhat.com> - 5.4.0-2
+- rebuild against httpd 2.4
+- use _httpd_mmn, _httpd_apxs macros
+
+* Fri Mar 02 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-1
+- update to PHP 5.4.0 finale
+
+* Sat Feb 18 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-0.4.RC8
+- update to PHP 5.4.0RC8
+
+* Sat Feb 04 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-0.3.RC7
+- update to PHP 5.4.0RC7
+- provides env file for php-fpm (#784770)
+- add patch to use system libzip (thanks to spot)
+- don't provide INSTALL file
+
+* Wed Jan 25 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-0.2.RC6
+- all binaries in /usr/bin with zts prefix
+
+* Wed Jan 18 2012 Remi Collet <remi@fedoraproject.org> 5.4.0-0.1.RC6
+- update to PHP 5.4.0RC6
+  https://fedoraproject.org/wiki/Features/Php54
+
+* Sun Jan 08 2012 Remi Collet <remi@fedoraproject.org> 5.3.8-4.4
+- fix systemd unit
+
+* Mon Dec 12 2011 Remi Collet <remi@fedoraproject.org> 5.3.8-4.3
+- switch to systemd
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 5.3.8-4.2
+- Rebuild for new libpng
+
+* Wed Oct 26 2011 Marcela Mašláňová <mmaslano@redhat.com> - 5.3.8-3.2
+- rebuild with new gmp without compat lib
+
+* Wed Oct 12 2011 Peter Schiffer <pschiffe@redhat.com> - 5.3.8-3.1
+- rebuild with new gmp
+
+* Wed Sep 28 2011 Remi Collet <remi@fedoraproject.org> 5.3.8-3
+- revert is_a() to php <= 5.3.6 behavior (from upstream)
+  with new option (allow_string) for new behavior
+
+* Tue Sep 13 2011 Remi Collet <remi@fedoraproject.org> 5.3.8-2
+- add mysqlnd sub-package
+- drop patch4, use --libdir to use /usr/lib*/php/build
+- add patch to redirect mysql.sock (in mysqlnd)
+
+* Tue Aug 23 2011 Remi Collet <remi@fedoraproject.org> 5.3.8-1
+- update to 5.3.8
+  http://www.php.net/ChangeLog-5.php#5.3.8
+
+* Thu Aug 18 2011 Remi Collet <remi@fedoraproject.org> 5.3.7-1
+- update to 5.3.7
+  http://www.php.net/ChangeLog-5.php#5.3.7
+- merge php-zts into php (#698084)
+
+* Tue Jul 12 2011 Joe Orton <jorton@redhat.com> - 5.3.6-4
+- rebuild for net-snmp SONAME bump
+
+* Mon Apr  4 2011 Remi Collet <Fedora@famillecollet.com> 5.3.6-3
+- enable mhash extension (emulated by hash extension)
+
+* Wed Mar 23 2011 Remi Collet <Fedora@famillecollet.com> 5.3.6-2
+- rebuild for new MySQL client library
+
+* Thu Mar 17 2011 Remi Collet <Fedora@famillecollet.com> 5.3.6-1
+- update to 5.3.6
+  http://www.php.net/ChangeLog-5.php#5.3.6
+- fix php-pdo arch specific requires
+
+* Tue Mar 15 2011 Joe Orton <jorton@redhat.com> - 5.3.5-6
+- disable zip extension per "No Bundled Libraries" policy (#551513)
+
+* Mon Mar 07 2011 Caolán McNamara <caolanm@redhat.com> 5.3.5-5
+- rebuild for icu 4.6
+
+* Mon Feb 28 2011 Remi Collet <Fedora@famillecollet.com> 5.3.5-4
+- fix systemd-units requires
+
+* Thu Feb 24 2011 Remi Collet <Fedora@famillecollet.com> 5.3.5-3
+- add tmpfiles.d configuration for php-fpm
+- add Arch specific requires/provides
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 07 2011 Remi Collet <Fedora@famillecollet.com> 5.3.5-1
+- update to 5.3.5
+  http://www.php.net/ChangeLog-5.php#5.3.5
+- clean duplicate configure options
+
+* Tue Dec 28 2010 Remi Collet <rpms@famillecollet.com> 5.3.4-2
+- rebuild against MySQL 5.5.8
+- remove all RPM_SOURCE_DIR
+
+* Sun Dec 12 2010 Remi Collet <rpms@famillecollet.com> 5.3.4-1.1
+- security patch from upstream for #660517
+
+* Sat Dec 11 2010 Remi Collet <Fedora@famillecollet.com> 5.3.4-1
+- update to 5.3.4
+  http://www.php.net/ChangeLog-5.php#5.3.4
+- move phpize to php-cli (see #657812)
+
+* Wed Dec  1 2010 Remi Collet <Fedora@famillecollet.com> 5.3.3-5
+- ghost /var/run/php-fpm (see #656660)
+- add filter_setup to not provides extensions as .so
+
+* Mon Nov  1 2010 Joe Orton <jorton@redhat.com> - 5.3.3-4
+- use mysql_config in libdir directly to avoid biarch build failures
+
+* Fri Oct 29 2010 Joe Orton <jorton@redhat.com> - 5.3.3-3
+- rebuild for new net-snmp
+
+* Sun Oct 10 2010 Remi Collet <Fedora@famillecollet.com> 5.3.3-2
+- add php-fpm sub-package
+
+* Thu Jul 22 2010 Remi Collet <Fedora@famillecollet.com> 5.3.3-1
+- PHP 5.3.3 released
+
+* Fri Apr 30 2010 Remi Collet <Fedora@famillecollet.com> 5.3.2-3
+- garbage collector upstream  patches (#580236)
+
+* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> 5.3.2-2
+- rebuild for icu 4.4
+
+* Sat Mar 06 2010 Remi Collet <Fedora@famillecollet.com> 5.3.2-1
+- PHP 5.3.2 Released!
+- remove mime_magic option (now provided by fileinfo, by emu)
+- add patch for http://bugs.php.net/50578
+- remove patch for libedit (upstream)
+- add runselftest option to allow build without test suite
+
+* Fri Nov 27 2009 Joe Orton <jorton@redhat.com> - 5.3.1-3
+- update to v7 of systzdata patch
+
+* Wed Nov 25 2009 Joe Orton <jorton@redhat.com> - 5.3.1-2
+- fix build with autoconf 2.6x
+
+* Fri Nov 20 2009 Remi Collet <Fedora@famillecollet.com> 5.3.1-1
+- update to 5.3.1
+- remove openssl patch (merged upstream)
+- add provides for php-pecl-json
+- add prod/devel php.ini in doc
+
+* Tue Nov 17 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 5.3.0-7
+- use libedit instead of readline to resolve licensing issues
+
+* Tue Aug 25 2009 Tomas Mraz <tmraz@redhat.com> - 5.3.0-6
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Joe Orton <jorton@redhat.com> 5.3.0-4
+- rediff systzdata patch
+
+* Thu Jul 16 2009 Joe Orton <jorton@redhat.com> 5.3.0-3
+- update to v6 of systzdata patch; various fixes
+
+* Tue Jul 14 2009 Joe Orton <jorton@redhat.com> 5.3.0-2
+- update to v5 of systzdata patch; parses zone.tab and extracts
+  timezone->{country-code,long/lat,comment} mapping table
+
+* Sun Jul 12 2009 Remi Collet <Fedora@famillecollet.com> 5.3.0-1
+- update to 5.3.0
+- remove ncurses, dbase, mhash extensions
+- add enchant, sqlite3, intl, phar, fileinfo extensions
+- raise sqlite version to 3.6.0 (for sqlite3, build with --enable-load-extension)
+- sync with upstream "production" php.ini
+
+* Sun Jun 21 2009 Remi Collet <Fedora@famillecollet.com> 5.2.10-1
+- update to 5.2.10
+- add interbase sub-package
+
+* Sat Feb 28 2009 Remi Collet <Fedora@FamilleCollet.com> - 5.2.9-1
+- update to 5.2.9
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.8-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb  5 2009 Joe Orton <jorton@redhat.com> 5.2.8-9
+- add recode support, -recode subpackage (#106755)
+- add -zts subpackage with ZTS-enabled build of httpd SAPI
+- adjust php.conf to use -zts SAPI build for worker MPM
+
+* Wed Feb  4 2009 Joe Orton <jorton@redhat.com> 5.2.8-8
+- fix patch fuzz, renumber patches
+
+* Wed Feb  4 2009 Joe Orton <jorton@redhat.com> 5.2.8-7
+- drop obsolete configure args
+- drop -odbc patch (#483690)
+
+* Mon Jan 26 2009 Joe Orton <jorton@redhat.com> 5.2.8-5
+- split out sysvshm, sysvsem, sysvmsg, posix into php-process
+
+* Sun Jan 25 2009 Joe Orton <jorton@redhat.com> 5.2.8-4
+- move wddx to php-xml, build curl shared in -common
+- remove BR for expat-devel, bogus configure option
+
+* Fri Jan 23 2009 Joe Orton <jorton@redhat.com> 5.2.8-3
+- rebuild for new MySQL
+
+* Sat Dec 13 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.8-2
+- libtool 2 workaround for phpize (#476004)
+- add missing php_embed.h (#457777)
+
+* Tue Dec 09 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.8-1
+- update to 5.2.8
+
+* Sat Dec 06 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.7-1.1
+- libtool 2 workaround
+
+* Fri Dec 05 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.7-1
+- update to 5.2.7
+- enable pdo_dblib driver in php-mssql
+
+* Mon Nov 24 2008 Joe Orton <jorton@redhat.com> 5.2.6-7
+- tweak Summary, thanks to Richard Hughes
+
+* Tue Nov  4 2008 Joe Orton <jorton@redhat.com> 5.2.6-6
+- move gd_README to php-gd
+- update to r4 of systzdata patch; introduces a default timezone
+  name of "System/Localtime", which uses /etc/localtime (#469532)
+
+* Sat Sep 13 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.6-5
+- enable XPM support in php-gd
+- Fix BR for php-gd
+
+* Sun Jul 20 2008 Remi Collet <Fedora@FamilleCollet.com> 5.2.6-4
+- enable T1lib support in php-gd
+
+* Mon Jul 14 2008 Joe Orton <jorton@redhat.com> 5.2.6-3
+- update to 5.2.6
+- sync default php.ini with upstream
+- drop extension_dir from default php.ini, rely on hard-coded
+  default, to make php-common multilib-safe (#455091)
+- update to r3 of systzdata patch
+
+* Thu Apr 24 2008 Joe Orton <jorton@redhat.com> 5.2.5-7
+- split pspell extension out into php-spell (#443857)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.2.5-6
+- Autorebuild for GCC 4.3
+
+* Fri Jan 11 2008 Joe Orton <jorton@redhat.com> 5.2.5-5
+- ext/date: use system timezone database
+
+* Fri Dec 28 2007 Joe Orton <jorton@redhat.com> 5.2.5-4
+- rebuild for libc-client bump
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 5.2.5-3
+- Rebuild for openssl bump
+
+* Wed Dec  5 2007 Joe Orton <jorton@redhat.com> 5.2.5-2
+- update to 5.2.5
+
+* Mon Oct 15 2007 Joe Orton <jorton@redhat.com> 5.2.4-3
+- correct pcre BR version (#333021)
+- restore metaphone fix (#205714)
+- add READMEs to php-cli
+
+* Sun Sep 16 2007 Joe Orton <jorton@redhat.com> 5.2.4-2
+- update to 5.2.4
+
+* Sun Sep  2 2007 Joe Orton <jorton@redhat.com> 5.2.3-9
+- rebuild for fixed APR
+
+* Tue Aug 28 2007 Joe Orton <jorton@redhat.com> 5.2.3-8
+- add ldconfig post/postun for -embedded (Hans de Goede)
+
+* Fri Aug 10 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 5.2.3-7
+- add php-embedded sub-package
+
+* Fri Aug 10 2007 Joe Orton <jorton@redhat.com> 5.2.3-6
+- fix build with new glibc
+- fix License
+
+* Mon Jul 16 2007 Joe Orton <jorton@redhat.com> 5.2.3-5
+- define php_extdir in macros.php
+
+* Mon Jul  2 2007 Joe Orton <jorton@redhat.com> 5.2.3-4
+- obsolete php-dbase
+
+* Tue Jun 19 2007 Joe Orton <jorton@redhat.com> 5.2.3-3
+- add mcrypt, mhash, tidy, mssql subpackages (Dmitry Butskoy)
+- enable dbase extension and package in -common
+
+* Fri Jun  8 2007 Joe Orton <jorton@redhat.com> 5.2.3-2
+- update to 5.2.3 (thanks to Jeff Sheltren)
+
+* Wed May  9 2007 Joe Orton <jorton@redhat.com> 5.2.2-4
+- fix php-pdo *_arg_force_ref global symbol abuse (#216125)
+
+* Tue May  8 2007 Joe Orton <jorton@redhat.com> 5.2.2-3
+- rebuild against uw-imap-devel
+
+* Fri May  4 2007 Joe Orton <jorton@redhat.com> 5.2.2-2
+- update to 5.2.2
+- synch changes from upstream recommended php.ini
+
+* Thu Mar 29 2007 Joe Orton <jorton@redhat.com> 5.2.1-5
+- enable SASL support in LDAP extension (#205772)
+
+* Wed Mar 21 2007 Joe Orton <jorton@redhat.com> 5.2.1-4
+- drop mime_magic extension (deprecated by php-pecl-Fileinfo)
+
+* Mon Feb 19 2007 Joe Orton <jorton@redhat.com> 5.2.1-3
+- fix regression in str_{i,}replace (from upstream)
+
+* Thu Feb 15 2007 Joe Orton <jorton@redhat.com> 5.2.1-2
+- update to 5.2.1
+- add Requires(pre) for httpd
+- trim %%changelog to versions >= 5.0.0
+
+* Thu Feb  8 2007 Joe Orton <jorton@redhat.com> 5.2.0-10
+- bump default memory_limit to 32M (#220821)
+- mark config files noreplace again (#174251)
+- drop trailing dots from Summary fields
+- use standard BuildRoot
+- drop libtool15 patch (#226294)
+
+* Tue Jan 30 2007 Joe Orton <jorton@redhat.com> 5.2.0-9
+- add php(api), php(zend-abi) provides (#221302)
+- package /usr/share/php and append to default include_path (#225434)
+
+* Tue Dec  5 2006 Joe Orton <jorton@redhat.com> 5.2.0-8
+- fix filter.h installation path
+- fix php-zend-abi version (Remi Collet, #212804)
+
+* Tue Nov 28 2006 Joe Orton <jorton@redhat.com> 5.2.0-7
+- rebuild again
+
+* Tue Nov 28 2006 Joe Orton <jorton@redhat.com> 5.2.0-6
+- rebuild for net-snmp soname bump
+
+* Mon Nov 27 2006 Joe Orton <jorton@redhat.com> 5.2.0-5
+- build json and zip shared, in -common (Remi Collet, #215966)
+- obsolete php-json and php-pecl-zip
+- build readline extension into /usr/bin/php* (#210585)
+- change module subpackages to require php-common not php (#177821)
+
+* Wed Nov 15 2006 Joe Orton <jorton@redhat.com> 5.2.0-4
+- provide php-zend-abi (#212804)
+- add /etc/rpm/macros.php exporting interface versions
+- synch with upstream recommended php.ini
+
+* Wed Nov 15 2006 Joe Orton <jorton@redhat.com> 5.2.0-3
+- update to 5.2.0 (#213837)
+- php-xml provides php-domxml (#215656)
+- fix php-pdo-abi provide (#214281)
+
+* Tue Oct 31 2006 Joseph Orton <jorton@redhat.com> 5.1.6-4
+- rebuild for curl soname bump
+- add build fix for curl 7.16 API
+
+* Wed Oct  4 2006 Joe Orton <jorton@redhat.com> 5.1.6-3
+- from upstream: add safety checks against integer overflow in _ecalloc
+
+* Tue Aug 29 2006 Joe Orton <jorton@redhat.com> 5.1.6-2
+- update to 5.1.6 (security fixes)
+- bump default memory_limit to 16M (#196802)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.1.4-8.1
+- rebuild
+
+* Fri Jun  9 2006 Joe Orton <jorton@redhat.com> 5.1.4-8
+- Provide php-posix (#194583)
+- only provide php-pcntl from -cli subpackage
+- add missing defattr's (thanks to Matthias Saou)
+
+* Fri Jun  9 2006 Joe Orton <jorton@redhat.com> 5.1.4-7
+- move Obsoletes for php-openssl to -common (#194501)
+- Provide: php-cgi from -cli subpackage
+
+* Fri Jun  2 2006 Joe Orton <jorton@redhat.com> 5.1.4-6
+- split out php-cli, php-common subpackages (#177821)
+- add php-pdo-abi version export (#193202)
+
+* Wed May 24 2006 Radek Vokal <rvokal@redhat.com> 5.1.4-5.1
+- rebuilt for new libnetsnmp
+
+* Thu May 18 2006 Joe Orton <jorton@redhat.com> 5.1.4-5
+- provide mod_php (#187891)
+- provide php-cli (#192196)
+- use correct LDAP fix (#181518)
+- define _GNU_SOURCE in php_config.h and leave it defined
+- drop (circular) dependency on php-pear
+
+* Mon May  8 2006 Joe Orton <jorton@redhat.com> 5.1.4-3
+- update to 5.1.4
+
+* Wed May  3 2006 Joe Orton <jorton@redhat.com> 5.1.3-3
+- update to 5.1.3
+
+* Tue Feb 28 2006 Joe Orton <jorton@redhat.com> 5.1.2-5
+- provide php-api (#183227)
+- add provides for all builtin modules (Tim Jackson, #173804)
+- own %%{_libdir}/php/pear for PEAR packages (per #176733)
+- add obsoletes to allow upgrade from FE4 PDO packages (#181863)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.1.2-4.3
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 5.1.2-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 31 2006 Joe Orton <jorton@redhat.com> 5.1.2-4
+- rebuild for new libc-client soname
+
+* Mon Jan 16 2006 Joe Orton <jorton@redhat.com> 5.1.2-3
+- only build xmlreader and xmlwriter shared (#177810)
+
+* Fri Jan 13 2006 Joe Orton <jorton@redhat.com> 5.1.2-2
+- update to 5.1.2
+
+* Thu Jan  5 2006 Joe Orton <jorton@redhat.com> 5.1.1-8
+- rebuild again
+
+* Mon Jan  2 2006 Joe Orton <jorton@redhat.com> 5.1.1-7
+- rebuild for new net-snmp
+
+* Mon Dec 12 2005 Joe Orton <jorton@redhat.com> 5.1.1-6
+- enable short_open_tag in default php.ini again (#175381)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Thu Dec  8 2005 Joe Orton <jorton@redhat.com> 5.1.1-5
+- require net-snmp for php-snmp (#174800)
+
+* Sun Dec  4 2005 Joe Orton <jorton@redhat.com> 5.1.1-4
+- add /usr/share/pear back to hard-coded include_path (#174885)
+
+* Fri Dec  2 2005 Joe Orton <jorton@redhat.com> 5.1.1-3
+- rebuild for httpd 2.2
+
+* Mon Nov 28 2005 Joe Orton <jorton@redhat.com> 5.1.1-2
+- update to 5.1.1
+- remove pear subpackage
+- enable pdo extensions (php-pdo subpackage)
+- remove non-standard conditional module builds
+- enable xmlreader extension
+
+* Thu Nov 10 2005 Tomas Mraz <tmraz@redhat.com> 5.0.5-6
+- rebuilt against new openssl
+
+* Mon Nov  7 2005 Joe Orton <jorton@redhat.com> 5.0.5-5
+- pear: update to XML_RPC 1.4.4, XML_Parser 1.2.7, Mail 1.1.9 (#172528)
+
+* Tue Nov  1 2005 Joe Orton <jorton@redhat.com> 5.0.5-4
+- rebuild for new libnetsnmp
+
+* Wed Sep 14 2005 Joe Orton <jorton@redhat.com> 5.0.5-3
+- update to 5.0.5
+- add fix for upstream #34435
+- devel: require autoconf, automake (#159283)
+- pear: update to HTTP-1.3.6, Mail-1.1.8, Net_SMTP-1.2.7, XML_RPC-1.4.1
+- fix imagettftext et al (upstream, #161001)
+
+* Thu Jun 16 2005 Joe Orton <jorton@redhat.com> 5.0.4-11
+- ldap: restore ldap_start_tls() function
+
+* Fri May  6 2005 Joe Orton <jorton@redhat.com> 5.0.4-10
+- disable RPATHs in shared extensions (#156974)
+
+* Tue May  3 2005 Joe Orton <jorton@redhat.com> 5.0.4-9
+- build simplexml_import_dom even with shared dom (#156434)
+- prevent truncation of copied files to ~2Mb (#155916)
+- install /usr/bin/php from CLI build alongside CGI
+- enable sysvmsg extension (#142988)
+
+* Mon Apr 25 2005 Joe Orton <jorton@redhat.com> 5.0.4-8
+- prevent build of builtin dba as well as shared extension
+
+* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-7
+- split out dba and bcmath extensions into subpackages
+- BuildRequire gcc-c++ to avoid AC_PROG_CXX{,CPP} failure (#155221)
+- pear: update to DB-1.7.6
+- enable FastCGI support in /usr/bin/php-cgi (#149596)
+
+* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-6
+- build /usr/bin/php with the CLI SAPI, and add /usr/bin/php-cgi,
+  built with the CGI SAPI (thanks to Edward Rudd, #137704)
+- add php(1) man page for CLI
+- fix more test cases to use -n when invoking php
+
+* Wed Apr 13 2005 Joe Orton <jorton@redhat.com> 5.0.4-5
+- rebuild for new libpq soname
+
+* Tue Apr 12 2005 Joe Orton <jorton@redhat.com> 5.0.4-4
+- bundle from PEAR: HTTP, Mail, XML_Parser, Net_Socket, Net_SMTP
+- snmp: disable MSHUTDOWN function to prevent error_log noise (#153988)
+- mysqli: add fix for crash on x86_64 (Georg Richter, upstream #32282)
+
+* Mon Apr 11 2005 Joe Orton <jorton@redhat.com> 5.0.4-3
+- build shared objects as PIC (#154195)
+
+* Mon Apr  4 2005 Joe Orton <jorton@redhat.com> 5.0.4-2
+- fix PEAR installation and bundle PEAR DB-1.7.5 package
+
+* Fri Apr  1 2005 Joe Orton <jorton@redhat.com> 5.0.4-1
+- update to 5.0.4 (#153068)
+- add .phps AddType to php.conf (#152973)
+- better gcc4 fix for libxmlrpc
+
+* Wed Mar 30 2005 Joe Orton <jorton@redhat.com> 5.0.3-5
+- BuildRequire mysql-devel >= 4.1
+- don't mark php.ini as noreplace to make upgrades work (#152171)
+- fix subpackage descriptions (#152628)
+- fix memset(,,0) in Zend (thanks to Dave Jones)
+- fix various compiler warnings in Zend
+
+* Thu Mar 24 2005 Joe Orton <jorton@redhat.com> 5.0.3-4
+- package mysqli extension in php-mysql
+- really enable pcntl (#142903)
+- don't build with --enable-safe-mode (#148969)
+- use "Instant Client" libraries for oci8 module (Kai Bolay, #149873)
+
+* Fri Feb 18 2005 Joe Orton <jorton@redhat.com> 5.0.3-3
+- fix build with GCC 4
+
+* Wed Feb  9 2005 Joe Orton <jorton@redhat.com> 5.0.3-2
+- install the ext/gd headers (#145891)
+- enable pcntl extension in /usr/bin/php (#142903)
+- add libmbfl array arithmetic fix (dcb314@hotmail.com, #143795)
+- add BuildRequire for recent pcre-devel (#147448)
+
+* Wed Jan 12 2005 Joe Orton <jorton@redhat.com> 5.0.3-1
+- update to 5.0.3 (thanks to Robert Scheck et al, #143101)
+- enable xsl extension (#142174)
+- package both the xsl and dom extensions in php-xml
+- enable soap extension, shared (php-soap package) (#142901)
+- add patches from upstream 5.0 branch:
+ * Zend_strtod.c compile fixes
+ * correct php_sprintf return value usage
+
+* Mon Nov 22 2004 Joe Orton <jorton@redhat.com> 5.0.2-8
+- update for db4-4.3 (Robert Scheck, #140167)
+- build against mysql-devel
+- run tests in %%check
+
+* Wed Nov 10 2004 Joe Orton <jorton@redhat.com> 5.0.2-7
+- truncate changelog at 4.3.1-1
+- merge from 4.3.x package:
+ - enable mime_magic extension and Require: file (#130276)
+
+* Mon Nov  8 2004 Joe Orton <jorton@redhat.com> 5.0.2-6
+- fix dom/sqlite enable/without confusion
+
+* Mon Nov  8 2004 Joe Orton <jorton@redhat.com> 5.0.2-5
+- fix phpize installation for lib64 platforms
+- add fix for segfault in variable parsing introduced in 5.0.2
+
+* Mon Nov  8 2004 Joe Orton <jorton@redhat.com> 5.0.2-4
+- update to 5.0.2 (#127980)
+- build against mysqlclient10-devel
+- use new RTLD_DEEPBIND to load extension modules
+- drop explicit requirement for elfutils-devel
+- use AddHandler in default conf.d/php.conf (#135664)
+- "fix" round() fudging for recent gcc on x86
+- disable sqlite pending audit of warnings and subpackage split
+
+* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-4
+- don't build dom extension into 2.0 SAPI
+
+* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-3
+- ExclusiveArch: x86 ppc x86_64 for the moment
+
+* Fri Sep 17 2004 Joe Orton <jorton@redhat.com> 5.0.1-2
+- fix default extension_dir and conf.d/php.conf
+
+* Thu Sep  9 2004 Joe Orton <jorton@redhat.com> 5.0.1-1
+- update to 5.0.1
+- only build shared modules once
+- put dom extension in php-dom subpackage again
+- move extension modules into %%{_libdir}/php/modules
+- don't use --with-regex=system, it's ignored for the apache* SAPIs
+
+* Wed Aug 11 2004 Tom Callaway <tcallawa@redhat.com>
+- Merge in some spec file changes from Jeff Stern (jastern@uci.edu)
+
+* Mon Aug 09 2004 Tom Callaway <tcallawa@redhat.com>
+- bump to 5.0.0
+- add patch to prevent clobbering struct re_registers from regex.h
+- remove domxml references, replaced with dom now built-in
+- fix php.ini to refer to php5 not php4

php-7.2.0-includedir.patch Added

php-7.4.0-datetests.patch Added

@@ -0,0 +1,98 @@
+diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt
+--- ./ext/date/tests/bug33414-2.phpt.datetests	2020-04-09 14:06:11.000000000 +0200
++++ ./ext/date/tests/bug33414-2.phpt	2020-04-09 14:40:00.809433489 +0200
+@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid
+ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
+ print "wanted=Friday            00:00:00\n\n";
+ ?>
+---EXPECT--
++--EXPECTF--
+ TZ=Pacific/Rarotonga - wrong day.
+-tStamp=Thursday 1970-01-01 17:17:17 -1030 0
+-result=Tuesday 1970-01-06 00:00:00 -1030 0
++tStamp=Thursday 1970-01-01 17:17:17 %s
++result=Tuesday 1970-01-06 00:00:00 %s
+ wanted=Tuesday            00:00:00
+ 
+ TZ=Atlantic/South_Georgia - wrong day.
+@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1
+ wanted=Monday            00:00:00
+ 
+ TZ=Pacific/Enderbury - wrong day, off by 2 days.
+-tStamp=Thursday 1970-01-01 17:17:17 -12 0
+-result=Monday 1970-01-05 00:00:00 -12 0
++tStamp=Thursday 1970-01-01 17:17:17 %s
++result=Monday 1970-01-05 00:00:00 %s
+ wanted=Monday            00:00:00
+ 
+ TZ=Pacific/Kiritimati - wrong day, off by 2 days.
+-tStamp=Thursday 1970-01-01 17:17:17 -1040 0
+-result=Monday 1970-01-05 00:00:00 -1040 0
++tStamp=Thursday 1970-01-01 17:17:17 %s
++result=Monday 1970-01-05 00:00:00 %s
+ wanted=Monday            00:00:00
+ 
+ TZ=America/Managua - wrong day.
+@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1
+ wanted=Tuesday            00:00:00
+ 
+ TZ=Pacific/Pitcairn - wrong day.
+-tStamp=Thursday 1970-01-01 17:17:17 -0830 0
+-result=Wednesday 1970-01-07 00:00:00 -0830 0
++tStamp=Thursday 1970-01-01 17:17:17 %s
++result=Wednesday 1970-01-07 00:00:00 %s
+ wanted=Wednesday            00:00:00
+ 
+ TZ=Pacific/Fakaofo - wrong day.
+-tStamp=Thursday 1970-01-01 17:17:17 -11 0
+-result=Saturday 1970-01-03 00:00:00 -11 0
++tStamp=Thursday 1970-01-01 17:17:17 %s
++result=Saturday 1970-01-03 00:00:00 %s
+ wanted=Saturday            00:00:00
+ 
+ TZ=Pacific/Johnston - wrong day.
+diff -up ./ext/date/tests/bug66985.phpt.datetests ./ext/date/tests/bug66985.phpt
+--- ./ext/date/tests/bug66985.phpt.datetests	2020-04-09 14:06:11.000000000 +0200
++++ ./ext/date/tests/bug66985.phpt	2020-04-09 14:40:37.099288185 +0200
+@@ -3,7 +3,7 @@ Bug #66985 (Some timezones are no longer
+ --FILE--
+ <?php
+ $zones = array(
+-    "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "Factory", "GB-Eire",
++    "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "GB-Eire",
+     "GMT0", "Greenwich", "Hongkong", "Iceland", "Iran", "Israel", "Jamaica",
+     "Japan", "Kwajalein", "Libya", "MST7MDT", "Navajo", "NZ-CHAT", "Poland",
+     "Portugal", "PST8PDT", "Singapore", "Turkey", "Universal", "W-SU",
+@@ -45,11 +45,6 @@ DateTimeZone Object
+ )
+ DateTimeZone Object
+ (
+-    timezone_type => 3
+-    timezone => Factory
+-)
+-DateTimeZone Object
+-(
+     timezone_type => 3
+     timezone => GB-Eire
+ )
+diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt
+--- ./ext/date/tests/strtotime3-64bit.phpt.datetests	2020-04-09 14:06:11.000000000 +0200
++++ ./ext/date/tests/strtotime3-64bit.phpt	2020-04-09 14:40:00.809433489 +0200
+@@ -44,7 +44,7 @@ foreach ($strs as $str) {
+ }
+ 
+ ?>
+---EXPECT--
++--EXPECTF--
+ bool(false)
+ bool(false)
+ string(31) "Thu, 15 Jun 2006 00:00:00 +0100"
+@@ -53,7 +53,7 @@ bool(false)
+ string(31) "Fri, 16 Jun 2006 23:49:12 +0100"
+ bool(false)
+ string(31) "Fri, 16 Jun 2006 02:22:00 +0100"
+-string(31) "Sun, 16 Jun 0222 02:22:00 -0036"
++string(31) "Sun, 16 Jun 0222 02:22:00 %s"
+ string(31) "Fri, 16 Jun 2006 02:22:33 +0100"
+ bool(false)
+ string(31) "Tue, 02 Mar 2004 00:00:00 +0000"

php-7.4.0-httpd.patch Added

php-7.4.0-ldap_r.patch Added

@@ -0,0 +1,19 @@
+
+Use -lldap_r by default.
+
+diff -up php-7.4.0RC2/ext/ldap/config.m4.ldap_r php-7.4.0RC2/ext/ldap/config.m4
+--- php-7.4.0RC2/ext/ldap/config.m4.ldap_r	2019-09-17 10:21:24.769200812 +0200
++++ php-7.4.0RC2/ext/ldap/config.m4	2019-09-17 10:21:30.658181771 +0200
+@@ -68,7 +68,11 @@ if test "$PHP_LDAP" != "no"; then
+   dnl -pc removal is a hack for clang
+   MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
+ 
+-  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
++  if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
++    PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++    PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
++
++  elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
+     PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+

php-7.4.0-phpize.patch Added

php-8.0.0-embed.patch Added

@@ -0,0 +1,25 @@
+diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4
+--- ./sapi/embed/config.m4.embed	2020-07-07 13:51:05.879764972 +0200
++++ ./sapi/embed/config.m4	2020-07-07 13:52:50.128412148 +0200
+@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then
+     yes|shared)
+       LIBPHP_CFLAGS="-shared"
+       PHP_EMBED_TYPE=shared
+-      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
++      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)"
++      INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)"
+       ;;
+     static)
+       LIBPHP_CFLAGS="-static"
+diff -up ./scripts/php-config.in.embed ./scripts/php-config.in
+--- ./scripts/php-config.in.embed	2020-07-07 12:54:42.000000000 +0200
++++ ./scripts/php-config.in	2020-07-07 13:51:05.880764968 +0200
+@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@"
+ php_cli_binary=NONE
+ php_cgi_binary=NONE
+ configure_options="@CONFIGURE_OPTIONS@"
+-php_sapis="@PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@"
+ ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
+ ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@"
+

php-8.1.0-libdb.patch Added

@@ -0,0 +1,92 @@
+diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4
+--- ./ext/dba/config.m4.libdb	2020-04-09 14:06:11.000000000 +0200
++++ ./ext/dba/config.m4	2020-04-09 14:35:08.208605065 +0200
+@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then
+   dbdp4="/usr/local/BerkeleyDB.4."
+   dbdp5="/usr/local/BerkeleyDB.5."
+   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
+-    if test -f "$i/db5/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/db5/db.h
+-      break
+-    elif test -f "$i/db4/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/db4/db.h
+-      break
+-    elif test -f "$i/include/db5.3/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db5.3/db.h
+-      break
+-    elif test -f "$i/include/db5.1/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db5.1/db.h
+-      break
+-    elif test -f "$i/include/db5.0/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db5.0/db.h
+-      break
+-    elif test -f "$i/include/db4.8/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.8/db.h
+-      break
+-    elif test -f "$i/include/db4.7/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.7/db.h
+-      break
+-    elif test -f "$i/include/db4.6/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.6/db.h
+-      break
+-    elif test -f "$i/include/db4.5/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.5/db.h
+-      break
+-    elif test -f "$i/include/db4/db.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4/db.h
+-      break
+-    elif test -f "$i/include/db/db4.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db/db4.h
+-      break
+-    elif test -f "$i/include/db4.h"; then
+-      THIS_PREFIX=$i
+-      THIS_INCLUDE=$i/include/db4.h
+-      break
+-    elif test -f "$i/include/db.h"; then
++    if test -f "$i/include/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db.h
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, (void)db_create((DB**)0, (DB_ENV*)0, 0))
++  PHP_DBA_DB_CHECK(4, db, (void)db_create((DB**)0, (DB_ENV*)0, 0))
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 
+diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c
+--- ./ext/dba/dba.c.libdb	2020-04-09 14:06:11.000000000 +0200
++++ ./ext/dba/dba.c	2020-04-09 14:36:30.593275190 +0200
+@@ -50,6 +50,10 @@
+ #include "php_lmdb.h"
+ #include "dba_arginfo.h"
+ 
++#ifdef DB4_INCLUDE_FILE
++#include DB4_INCLUDE_FILE
++#endif
++
+ PHP_MINIT_FUNCTION(dba);
+ PHP_MSHUTDOWN_FUNCTION(dba);
+ PHP_MINFO_FUNCTION(dba);
+@@ -452,6 +456,10 @@ PHP_MINFO_FUNCTION(dba)
+ 
+ 	php_info_print_table_start();
+ 	php_info_print_table_row(2, "DBA support", "enabled");
++#ifdef DB_VERSION_STRING
++ 	php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
++ 	php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
++#endif
+ 	if (handlers.s) {
+ 		smart_str_0(&handlers);
+ 		php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s));

php-8.1.0-parser.patch Added

php-8.1.0-phpinfo.patch Added

@@ -0,0 +1,44 @@
+
+Drop "Configure Command" from phpinfo as it doesn't
+provide any useful information.
+The available extensions are not related to this command.
+
+Replace full GCC name by gcc in php -v output
+
+
+diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
+--- ./ext/standard/info.c.phpinfo	2020-07-21 10:49:31.000000000 +0200
++++ ./ext/standard/info.c	2020-07-21 11:41:56.295633523 +0200
+@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int
+ #ifdef PHP_BUILD_ARCH
+ 		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
+ #endif
+-#ifdef CONFIGURE_COMMAND
+-		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
+-#endif
+ 
+ 		if (sapi_module.pretty_name) {
+ 			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
+diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
+--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2020-07-21 10:49:31.000000000 +0200
++++ ./ext/standard/tests/general_functions/phpinfo.phpt	2020-07-21 11:41:56.296633522 +0200
+@@ -17,7 +17,6 @@ PHP Version => %s
+ 
+ System => %s
+ Build Date => %s%a
+-Configure Command => %s
+ Server API => Command Line Interface
+ Virtual Directory Support => %s
+ Configuration File (php.ini) Path => %s
+diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
+--- ./sapi/cli/php_cli.c.phpinfo	2020-07-21 11:43:38.812475300 +0200
++++ ./sapi/cli/php_cli.c	2020-07-21 11:43:45.783464540 +0200
+@@ -645,7 +645,7 @@ static int do_cli(int argc, char **argv)
+ 					"NTS"
+ #endif
+ #ifdef PHP_BUILD_COMPILER
+-					" " PHP_BUILD_COMPILER
++					" gcc"
+ #endif
+ #ifdef PHP_BUILD_ARCH
+ 					" " PHP_BUILD_ARCH

php-8.1.0-systzdata-v22.patch Added

@@ -0,0 +1,720 @@
+# License: MIT
+# http://opensource.org/licenses/MIT
+
+Add support for use of the system timezone database, rather
+than embedding a copy.  Discussed upstream but was not desired.
+
+History:
+r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
+r21: adapt for timelib 2021.03 (in 8.1.0)
+r20: adapt for timelib 2020.03 (in 8.0.10RC1)
+r19: adapt for timelib 2020.02 (in 8.0.0beta2)
+r18: adapt for autotool change in 7.3.3RC1
+r17: adapt for timelib 2018.01 (in 7.3.2RC1)
+r16: adapt for timelib 2017.06 (in 7.2.3RC1)
+r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
+r14: improve check for valid tz file
+r13: adapt for upstream changes to use PHP allocator
+r12: adapt for upstream changes for new zic
+r11: use canonical names to avoid more case sensitivity issues
+     round lat/long from zone.tab towards zero per builtin db
+r10: make timezone case insensitive
+r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
+r8: fix compile error without --with-system-tzdata configured
+r7: improve check for valid timezone id to exclude directories
+r6: fix fd leak in r5, fix country code/BC flag use in
+    timezone_identifiers_list() using system db,
+    fix use of PECL timezonedb to override system db,
+r5: reverts addition of "System/Localtime" fake tzname.
+    updated for 5.3.0, parses zone.tab to pick up mapping between
+    timezone name, country code and long/lat coords
+r4: added "System/Localtime" tzname which uses /etc/localtime
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+
+diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
+index 18b8106bd2..3d1f63c758 100644
+--- a/ext/date/config0.m4
++++ b/ext/date/config0.m4
+@@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS(strtoll atoll)
+ 
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++  --with-system-tzdata=DIR      to specify use of system timezone data,
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++   AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, Define if system timezone data is used)
++
++   if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++      AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++                         Define for location of system timezone data)
++   fi
++fi
++
+ PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
+                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
+diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
+index e41315efdb..4b6547c0a3 100644
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
+@@ -26,9 +26,22 @@
+ #include "timelib.h"
+ #include "timelib_private.h"
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++
++#else
+ #define TIMELIB_SUPPORTS_V2DATA
+ #define TIMELIB_SUPPORT_SLIM_FILE
+ #include "timezonedb.h"
++#endif
++
++#include <ctype.h>
+ 
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -95,6 +108,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+ {
+ 	uint32_t version;
+ 
++	if (memcmp(*tzf, "TZif", 4) == 0) {
++		*tzf += 20;
++		return 0;
++	}
++
+ 	/* read ID */
+ 	version = (*tzf)3 - '0';
+ 	*tzf += 4;
+@@ -577,7 +595,467 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+ 	}
+ }
+ 
+-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++/* System timezone database pointer. */
++static const timelib_tzdb *timezonedb_system;
++
++/* Hash table entry for the cache of the zone.tab mapping table. */
++struct location_info {
++        char code2;
++        double latitude, longitude;
++        char name64;
++        char *comment;
++        struct location_info *next;
++};
++
++/* Cache of zone.tab. */
++static struct location_info **system_location_table;
++
++/* Size of the zone.tab hash table; a random-ish prime big enough to
++ * prevent too many collisions. */
++#define LOCINFO_HASH_SIZE (1021)
++
++/* Compute a case insensitive hash of str */
++static uint32_t tz_hash(const char *str)
++{
++    const unsigned char *p = (const unsigned char *)str;
++    uint32_t hash = 5381;
++    int c;
++
++    while ((c = tolower(*p++)) != '\0') {
++        hash = (hash << 5) ^ hash ^ c;
++    }
++
++    return hash % LOCINFO_HASH_SIZE;
++}
++
++/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
++ * parsed string on success, or NULL on parse error.  On success,
++ * writes the parsed number to *result. */
++static char *parse_iso6709(char *p, double *result)
++{
++    double v, sign;
++    char *pend;
++    size_t len;
++
++    if (*p == '+')
++        sign = 1.0;
++    else if (*p == '-')
++        sign = -1.0;
++    else
++        return NULL;
++
++    p++;
++    for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
++        ;;
++
++    /* Annoying encoding used by zone.tab has no decimal point, so use
++     * the length to determine the format:
++     * 
++     * 4 = DDMM
++     * 5 = DDDMM
++     * 6 = DDMMSS
++     * 7 = DDDMMSS
++     */
++    len = pend - p;
++    if (len < 4 || len > 7) {
++        return NULL;
++    }
++
++    /* p => DDD */
++    v = (p0 - '0') * 10.0 + (p1 - '0');
++    p += 2;
++    if (len == 5 || len == 7)
++        v = v * 10.0 + (*p++ - '0');
++    /* p => MMSS */
++    v += (10.0 * (p0 - '0')
++          + p1 - '0') / 60.0;
++    p += 2;
++    /* p => SS */
++    if (len > 5) {
++        v += (10.0 * (p0 - '0')
++              + p1 - '0') / 3600.0;
++        p += 2;
++    }
++
++    /* Round to five decimal place, not because it's a good idea,
++     * but, because the builtin data uses rounded data, so, match
++     * that. */
++    *result = trunc(v * sign * 100000.0) / 100000.0;
++
++    return p;
++}
++
++/* This function parses the zone.tab file to build up the mapping of
++ * timezone to country code and geographic location, and returns a
++ * hash table.  The hash table is indexed by the function:
++ *
++ *   tz_hash(timezone-name)
++ */
++static struct location_info **create_location_table(void)
++{
++    struct location_info **li, *i;
++    char zone_tabPATH_MAX;
++    char line512;
++    FILE *fp;
++
++    strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
++
++    fp = fopen(zone_tab, "r");
++    if (!fp) {
++        return NULL;
++    }
++
++    li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
++
++    while (fgets(line, sizeof line, fp)) {
++        char *p = line, *code, *name, *comment;
++        uint32_t hash;
++        double latitude, longitude;
++
++        while (isspace(*p))
++            p++;
++
++        if (*p == '#' || *p == '\0' || *p == '\n')
++            continue;
++        
++        if (!isalpha(p0) || !isalpha(p1) || p2 != '\t')
++            continue;
++        
++        /* code => AA */
++        code = p;
++        p2 = 0;
++        p += 3;
++
++        /* coords => +-DDDMMSS+-DDDMMSS */
++        p = parse_iso6709(p, &latitude);
++        if (!p) {
++            continue;
++        }
++        p = parse_iso6709(p, &longitude);
++        if (!p) {
++            continue;
++        }
++
++        if (!p || *p != '\t') {
++            continue;
++        }
++
++        /* name = string */
++        name = ++p;
++        while (*p != '\t' && *p && *p != '\n')
++            p++;
++
++        *p++ = '\0';
++
++        /* comment = string */
++        comment = p;
++        while (*p != '\t' && *p && *p != '\n')
++            p++;
++
++        if (*p == '\n' || *p == '\t')
++            *p = '\0';
++        
++        hash = tz_hash(name);
++        i = malloc(sizeof *i);
++        memcpy(i->code, code, 2);
++        strncpy(i->name, name, sizeof i->name);
++        i->comment = strdup(comment);
++        i->longitude = longitude;
++        i->latitude = latitude;
++        i->next = lihash;
++        lihash = i;
++        /* printf("%s %u, %f, %f\n", name, hash, latitude, longitude); */
++    }
++
++    fclose(fp);
++
++    return li;
++}
++
++/* Return location info from hash table, using given timezone name.
++ * Returns NULL if the name could not be found. */
++const struct location_info *find_zone_info(struct location_info **li, 
++                                           const char *name)
++{
++    uint32_t hash = tz_hash(name);
++    const struct location_info *l;
++
++    if (!li) {
++        return NULL;
++    }
++
++    for (l = lihash; l; l = l->next) {
++        if (timelib_strcasecmp(l->name, name) == 0)
++            return l;
++    }
++
++    return NULL;
++}    
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++	return strcmp(ent->d_name, ".") != 0
++		&& strcmp(ent->d_name, "..") != 0
++		&& strcmp(ent->d_name, "posix") != 0
++		&& strcmp(ent->d_name, "posixrules") != 0
++		&& strcmp(ent->d_name, "right") != 0
++		&& strstr(ent->d_name, ".list") == NULL
++		&& strstr(ent->d_name, ".tab") == NULL;
++}
++
++static int sysdbcmp(const void *first, const void *second)
++{
++        const timelib_tzdb_index_entry *alpha = first, *beta = second;
++
++        return timelib_strcasecmp(alpha->id, beta->id);
++}
++
++/* Retrieve tzdata version. */
++static void retrieve_zone_version(timelib_tzdb *db)
++{
++    static char buf30;
++    char pathPATH_MAX;
++    FILE *fp;
++
++    strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path));
++
++    fp = fopen(path, "r");
++    if (fp) {
++		if (fgets(buf, sizeof(buf), fp)) {
++			if (!memcmp(buf, "# version ", 10) &&
++				isdigit(buf10) &&
++				isdigit(buf11) &&
++				isdigit(buf12) &&
++				isdigit(buf13) &&
++				islower(buf14)) {
++				if (buf14 >= 't') {        /* 2022t = 2022.20 */
++					buf17 = 0;
++					buf16 = buf14 - 't' + '0';
++					buf15 = '2';
++				} else if (buf14 >= 'j') { /* 2022j = 2022.10 */
++					buf17 = 0;
++					buf16 = buf14 - 'j' + '0';
++					buf15 = '1';
++				} else {                     /* 2022a = 2022.1  */
++					buf16 = 0;
++					buf15 = buf14 - 'a' + '1';
++				}
++				buf14 = '.';
++				db->version = buf+10;
++			}
++		}
++		fclose(fp);
++    }
++}
++
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++	size_t dirstack_size,  dirstack_top;
++	size_t index_size, index_next;
++	timelib_tzdb_index_entry *db_index;
++	char **dirstack;
++
++	/* LIFO stack to hold directory entries to scan; each slot is a
++	 * directory name relative to the zoneinfo prefix. */
++	dirstack_size = 32;
++	dirstack = malloc(dirstack_size * sizeof *dirstack);
++	dirstack_top = 1;
++	dirstack0 = strdup("");
++	
++	/* Index array. */
++	index_size = 64;
++	db_index = malloc(index_size * sizeof *db_index);
++	index_next = 0;
++
++	do {
++		struct dirent **ents;
++		char namePATH_MAX, *top;
++		int count;
++
++		/* Pop the top stack entry, and iterate through its contents. */
++		top = dirstack--dirstack_top;
++		snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++		count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++		while (count > 0) {
++			struct stat st;
++			const char *leaf = entscount - 1->d_name;
++
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++				 top, leaf);
++			
++			if (strlen(name) && stat(name, &st) == 0) {
++				/* Name, relative to the zoneinfo prefix. */
++				const char *root = top;
++
++				if (root0 == '/') root++;
++
++				snprintf(name, sizeof name, "%s%s%s", root, 
++					 *root ? "/": "", leaf);
++
++				if (S_ISDIR(st.st_mode)) {
++					if (dirstack_top == dirstack_size) {
++						dirstack_size *= 2;
++						dirstack = realloc(dirstack, 
++								   dirstack_size * sizeof *dirstack);
++					}
++					dirstackdirstack_top++ = strdup(name);
++				}
++				else {
++					if (index_next == index_size) {
++						index_size *= 2;
++						db_index = realloc(db_index,
++								   index_size * sizeof *db_index);
++					}
++
++					db_indexindex_next++.id = strdup(name);
++				}
++			}
++
++			free(ents--count);
++		}
++		
++		if (count != -1) free(ents);
++		free(top);
++	} while (dirstack_top);
++
++        qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
++
++	db->index = db_index;
++	db->index_size = index_next;
++
++	free(dirstack);
++}
++
++#define FAKE_HEADER "1234\0??\1??"
++#define FAKE_UTC_POS (7 - 4)
++
++/* Create a fake data segment for database 'sysdb'. */
++static void fake_data_segment(timelib_tzdb *sysdb,
++                              struct location_info **info)
++{
++        size_t n;
++        char *data, *p;
++        
++        data = malloc(3 * sysdb->index_size + 7);
++
++        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
++
++        for (n = 0; n < sysdb->index_size; n++) {
++                const struct location_info *li;
++                timelib_tzdb_index_entry *ent;
++
++                ent = (timelib_tzdb_index_entry *)&sysdb->indexn;
++
++                /* Lookup the timezone name in the hash table. */
++                if (strcmp(ent->id, "UTC") == 0) {
++                        ent->pos = FAKE_UTC_POS;
++                        continue;
++                }
++
++                li = find_zone_info(info, ent->id);
++                if (li) {
++                        /* If found, append the BC byte and the
++                         * country code; set the position for this
++                         * section of timezone data.  */
++                        ent->pos = (p - data) - 4;
++                        *p++ = '\1';
++                        *p++ = li->code0;
++                        *p++ = li->code1;
++                }
++                else {
++                        /* If not found, the timezone data can
++                         * point at the header. */
++                        ent->pos = 0;
++                }
++        }
++        
++        sysdb->data = (unsigned char *)data;
++}
++
++/* Returns true if the passed-in stat structure describes a
++ * probably-valid timezone file. */
++static int is_valid_tzfile(const struct stat *st, int fd)
++{
++	if (fd) {
++		char buf20;
++		if (read(fd, buf, 20)!=20) {
++			return 0;
++		}
++		lseek(fd, SEEK_SET, 0);
++		if (memcmp(buf, "TZif", 4)) {
++			return 0;
++		}
++	}
++	return S_ISREG(st->st_mode) && st->st_size > 20;
++}
++
++/* To allow timezone names to be used case-insensitively, find the
++ * canonical name for this timezone, if possible. */
++static const char *canonical_tzname(const char *timezone)
++{
++    if (timezonedb_system) {
++        timelib_tzdb_index_entry *ent, lookup;
++
++        lookup.id = (char *)timezone;
++
++        ent = bsearch(&lookup, timezonedb_system->index,
++                      timezonedb_system->index_size, sizeof lookup,
++                      sysdbcmp);
++        if (ent) {
++            return ent->id;
++        }
++    }
++
++    return timezone;
++}
++
++/* Return the mmap()ed tzfile if found, else NULL.  On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++	char fnamePATH_MAX;
++	struct stat st;
++	char *p;
++	int fd;
++	
++	if (timezone0 == '\0' || strstr(timezone, "..") != NULL) {
++		return NULL;
++	}
++
++	snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
++
++	fd = open(fname, O_RDONLY);
++	if (fd == -1) {
++		return NULL;
++	} else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
++		close(fd);
++		return NULL;
++	}
++
++	*length = st.st_size;
++	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++	close(fd);
++	
++	return p != MAP_FAILED ? p : NULL;
++}
++
++#endif
++
++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	int left = 0, right = tzdb->index_size - 1;
+ 
+@@ -603,9 +1081,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+ 	return 0;
+ }
+ 
++static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
++			       char **map, size_t *maplen,
++			       const timelib_tzdb *tzdb)
++{
++#ifdef HAVE_SYSTEM_TZDATA
++	if (tzdb == timezonedb_system) {
++		char *orig;
++
++		orig = map_tzfile(timezone, maplen);
++		if (orig == NULL) {
++			return 0;
++		}
++
++		(*tzf) = (unsigned char *)orig;
++		*map = orig;
++        return 1;
++	}
++	else
++#endif
++	{
++		return inmem_seek_to_tz_position(tzf, timezone, tzdb);
++	}
++}
++
+ const timelib_tzdb *timelib_builtin_db(void)
+ {
++#ifdef HAVE_SYSTEM_TZDATA
++	if (timezonedb_system == NULL) {
++		timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++		tmp->version = "0.system";
++		tmp->data = NULL;
++		create_zone_index(tmp);
++		retrieve_zone_version(tmp);
++		system_location_table = create_location_table();
++		fake_data_segment(tmp, system_location_table);
++		timezonedb_system = tmp;
++	}
++
++	return timezonedb_system;
++#else
+ 	return &timezonedb_builtin;
++#endif
+ }
+ 
+ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
+@@ -617,7 +1135,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+ int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
+ {
+ 	const unsigned char *tzf;
+-	return (seek_to_tz_position(&tzf, timezone, tzdb));
++
++#ifdef HAVE_SYSTEM_TZDATA
++	if (tzdb == timezonedb_system) {
++		char fnamePATH_MAX;
++		struct stat st;
++
++		if (timezone0 == '\0' || strstr(timezone, "..") != NULL) {
++			return 0;
++		}
++
++		if (system_location_table) {
++			if (find_zone_info(system_location_table, timezone) != NULL) {
++				/* found in cache */
++				return 1;
++			}
++		}
++
++		snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
++
++		return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
++	}
++#endif
++
++	return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
+ }
+ 
+ static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -662,6 +1203,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
+ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
+ {
+ 	const unsigned char *tzf;
++	char *memmap = NULL;
++	size_t maplen;
+ 	timelib_tzinfo *tmp;
+ 	int version;
+ 	int transitions_result, types_result;
+@@ -669,7 +1212,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+ 
+ 	*error_code = TIMELIB_ERROR_NO_ERROR;
+ 
+-	if (seek_to_tz_position(&tzf, timezone, tzdb)) {
++	if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
+ 		tmp = timelib_tzinfo_ctor(timezone);
+ 
+ 		version = read_preamble(&tzf, tmp, &type);
+@@ -712,11 +1255,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
+ 			return NULL;
+ 		}
+ 
++#ifdef HAVE_SYSTEM_TZDATA
++		if (memmap) {
++			const struct location_info *li;
++
++			/* TZif-style - grok the location info from the system database,
++			 * if possible. */
++
++			if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
++				tmp->location.comments = timelib_strdup(li->comment);
++				strncpy(tmp->location.country_code, li->code, 2);
++				tmp->location.longitude = li->longitude;
++				tmp->location.latitude = li->latitude;
++				tmp->bc = 1;
++			}
++			else {
++				set_default_location_and_comments(&tzf, tmp);
++			}
++
++			/* Now done with the mmap segment - discard it. */
++			munmap(memmap, maplen);
++		} else {
++#endif
+ 		if (type == TIMELIB_TZINFO_PHP) {
+ 			read_location(&tzf, tmp);
+ 		} else {
+ 			set_default_location_and_comments(&tzf, tmp);
+ 		}
++#ifdef HAVE_SYSTEM_TZDATA
++		}
++#endif
+ 	} else {
+ 		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
+ 		tmp = NULL;
+diff --git a/ext/date/php_date.c b/ext/date/php_date.c
+index cf4a11b8a2..cd49abc78d 100644
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -457,7 +457,11 @@ PHP_MINFO_FUNCTION(date)
+ 	php_info_print_table_row(2, "date/time support", "enabled");
+ 	php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
+ 	php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
++#ifdef HAVE_SYSTEM_TZDATA
++	php_info_print_table_row(2, "Timezone Database", "system");
++#else
+ 	php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal");
++#endif
+ 	php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
+ 	php_info_print_table_end();
+

10-opcache.ini Added

@@ -0,0 +1,153 @@
+; Enable Zend OPcache extension module
+zend_extension=opcache
+
+; Determines if Zend OPCache is enabled
+opcache.enable=1
+
+; Determines if Zend OPCache is enabled for the CLI version of PHP
+opcache.enable_cli=1
+
+; The OPcache shared memory storage size.
+;opcache.memory_consumption=128
+
+; The amount of memory for interned strings in Mbytes.
+;opcache.interned_strings_buffer=8
+
+; The maximum number of keys (scripts) in the OPcache hash table.
+; Only numbers between 200 and 1000000 are allowed.
+;opcache.max_accelerated_files=10000
+
+; The maximum percentage of "wasted" memory until a restart is scheduled.
+;opcache.max_wasted_percentage=5
+
+; When this directive is enabled, the OPcache appends the current working
+; directory to the script key, thus eliminating possible collisions between
+; files with the same name (basename). Disabling the directive improves
+; performance, but may break existing applications.
+;opcache.use_cwd=1
+
+; When disabled, you must reset the OPcache manually or restart the
+; webserver for changes to the filesystem to take effect.
+;opcache.validate_timestamps=1
+
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate)
+;opcache.revalidate_freq=2
+
+; Enables or disables file search in include_path optimization
+;opcache.revalidate_path=0
+
+; If disabled, all PHPDoc comments are dropped from the code to reduce the
+; size of the optimized code.
+;opcache.save_comments=1
+
+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
+; Allow file existence override (file_exists, etc.) performance feature.
+;opcache.enable_file_override=0
+
+; A bitmask, where each bit enables or disables the appropriate OPcache
+; passes
+;opcache.optimization_level=0x7FFFBFFF
+
+; This hack should only be enabled to work around "Cannot redeclare class"
+; errors.
+;opcache.dups_fix=0
+
+; The location of the OPcache blacklist file (wildcards allowed).
+; Each OPcache blacklist file is a text file that holds the names of files
+; that should not be accelerated.
+opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
+
+; Allows exclusion of large files from being cached. By default all files
+; are cached.
+;opcache.max_file_size=0
+
+; Check the cache checksum each N requests.
+; The default value of "0" means that the checks are disabled.
+;opcache.consistency_checks=0
+
+; How long to wait (in seconds) for a scheduled restart to begin if the cache
+; is not being accessed.
+;opcache.force_restart_timeout=180
+
+; OPcache error_log file name. Empty string assumes "stderr".
+;opcache.error_log=
+
+; All OPcache errors go to the Web server log.
+; By default, only fatal errors (level 0) or errors (level 1) are logged.
+; You can also enable warnings (level 2), info messages (level 3) or
+; debug messages (level 4).
+;opcache.log_verbosity_level=1
+
+; Preferred Shared Memory back-end. Leave empty and let the system decide.
+;opcache.preferred_memory_model=
+
+; Protect the shared memory from unexpected writing during script execution.
+; Useful for internal debugging only.
+;opcache.protect_memory=0
+
+; Allows calling OPcache API functions only from PHP scripts which path is
+; started from specified string. The default "" means no restriction
+;opcache.restrict_api=
+
+; Enables and sets the second level cache directory.
+; It should improve performance when SHM memory is full, at server restart or
+; SHM reset. The default "" disables file based caching.
+; RPM note : file cache directory must be owned by process owner
+;   for mod_php, see /etc/httpd/conf.d/php.conf
+;   for php-fpm, see /etc/php-fpm.d/*conf
+;opcache.file_cache=
+
+; Enables or disables opcode caching in shared memory.
+;opcache.file_cache_only=0
+
+; Enables or disables checksum validation when script loaded from file cache.
+;opcache.file_cache_consistency_checks=1
+
+; Implies opcache.file_cache_only=1 for a certain process that failed to
+; reattach to the shared memory (for Windows only). Explicitly enabled file
+; cache is required.
+;opcache.file_cache_fallback=1
+
+; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
+; This should improve performance, but requires appropriate OS configuration.
+opcache.huge_code_pages=0
+
+; Validate cached file permissions.
+; Leads OPcache to check file readability on each access to cached file.
+; This directive should be enabled in shared hosting environment, when few
+; users (PHP-FPM pools) reuse the common OPcache shared memory.
+;opcache.validate_permission=0
+
+; Prevent name collisions in chroot'ed environment.
+; This directive prevents file name collisions in different "chroot"
+; environments. It should be enabled for sites that may serve requests in
+; different "chroot" environments.
+;opcache.validate_root=0
+
+; If specified, it produces opcode dumps for debugging different stages of
+; optimizations.
+;opcache.opt_debug_level=0
+
+; Specifies a PHP script that is going to be compiled and executed at server
+; start-up.
+; https://php.net/opcache.preload
+;opcache.preload=
+
+; Preloading code as root is not allowed for security reasons. This directive
+; facilitates to let the preloading to be run as another user.
+; https://php.net/opcache.preload_user
+;opcache.preload_user=
+
+; Prevents caching files that are less than this number of seconds old. It
+; protects from caching of incompletely updated files. In case all file updates
+; on your site are atomic, you may increase performance by setting it to "0".
+;opcache.file_update_protection=2
+
+; Absolute path used to store shared lockfiles (for *nix only).
+;opcache.lockfile_path=/tmp

20-ffi.ini Added

Makefile Added

gating.yaml Added

macros.php Added

news2markdown.php Added

@@ -0,0 +1,40 @@
+#!/usr/bin/env php
+<?php
+if ($_SERVER'argc' < 2) {
+	die("Usage {$_SERVER'argv'0} /path/to/NEWS\n");
+}
+
+$text = file_get_contents($_SERVER'argv'1);
+if (!$text) {
+	die("Can't read {$_SERVER'argv'1}\n");
+}
+$debug = (isset($_SERVER'argv'2) && $_SERVER'argv'2==-'d');
+
+$text = explode("\n", $text);
+$in=false;
+foreach ($text as $line) {
+	if (preg_match('/(^0-9+ .* 200-90-9),* PHP (.*)$/', $line, $reg)) {
+		if ($in) {
+			break;
+		}
+		printf("**PHP version %s** (%s)", $reg2, $reg1);
+		$in = true;
+		continue;
+	} else if (!$in) {
+		if ($debug) echo "+ Ignore $line\n";
+		continue;
+	}
+	$line = preg_replace('/(#0-9+)/', 'php\1', $line);
+	$line = preg_replace('/(GH-(0-9+))/', '\1(https://github.com/php/php-src/issues/\2)', $line);
+	$line = preg_replace('/(CVE-0-9+-0-9+)/', '**\1**', $line);
+	if (empty($line)) {
+		echo "\n\n";
+	} else if (substr($line, 0, 2) == '- ') {
+		echo "**" . substr($line, 2) . "**\n";
+	} else if (substr($line, 0, 4) == '  . ') {
+		echo "\n* " . substr($line, 4);
+	} else {
+		echo " ".trim($line);
+	}
+}
+

nginx-fpm.conf Added

nginx-php.conf Added

opcache-default.blacklist Added

php-8.1.9.tar.xz Added

php-8.1.9.tar.xz.asc Added

php-fpm-www.conf Added

@@ -0,0 +1,438 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+www
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or @php_fpm_prefix@) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+; RPM: apache user chosen to provide access to the same directories as httpd
+user = apache
+; RPM: Keep a group allowed to write in log dir.
+group = apache
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   'ip:6:addr:ess:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = /run/php-fpm/www.sock
+
+; Set listen(2) backlog.
+; Default Value: 511
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+;listen.owner = nobody
+;listen.group = nobody
+;listen.mode = 0660
+
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+listen.acl_users = apache,nginx
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is differrent than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 50
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 5
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 5
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 35
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following informations:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because CPU calculation is done when the request
+;                          processing has terminated;
+;   last request memory  - the max amount of memory the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;   last request memory:  0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{miliseconds}d
+;      - %{mili}d
+;      - %{microseconds}d
+;      - %{micro}d
+;  %e: an environment variable (same as $_ENV or $_SERVER)
+;      it must be associated with embraces to specify the name of the env
+;      variable. Some exemples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %p: PID of the child that serviced the request
+;  %P: PID of the parent of the child that serviced the request
+;  %q: the query string
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+slowlog = /var/log/php-fpm/www-slow.log
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;envHOSTNAME = $HOSTNAME
+;envPATH = /usr/local/bin:/usr/bin:/bin
+;envTMP = /tmp
+;envTMPDIR = /tmp
+;envTEMP = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or @prefix@)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_valuesendmail_path = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flagdisplay_errors = off
+php_admin_valueerror_log = /var/log/php-fpm/www-error.log
+php_admin_flaglog_errors = on
+;php_admin_valuememory_limit = 128M
+
+; Set the following data paths to directories owned by the FPM process user.
+;
+; Do not change the ownership of existing system directories, if the process
+; user does not have write permission, create dedicated directories for this
+; purpose.
+;
+; See warning about choosing the location of these directories on your system
+; at http://php.net/session.save-path
+php_valuesession.save_handler = files
+php_valuesession.save_path    = /var/lib/php/session
+php_valuesoap.wsdl_cache_dir  = /var/lib/php/wsdlcache
+;php_valueopcache.file_cache  = /var/lib/php/opcache

php-fpm.conf Added

@@ -0,0 +1,137 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix.
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+include=/etc/php-fpm.d/*.conf
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+global
+; Pid file
+; Default Value: none
+pid = /run/php-fpm/php-fpm.pid
+
+; Error log file
+; If it's set to "syslog", log is sent to syslogd instead of being written
+; in a local file.
+; Default Value: /var/log/php-fpm.log
+error_log = /var/log/php-fpm/error.log
+
+; syslog_facility is used to specify what type of program is logging the
+; message. This lets syslogd specify that messages from different facilities
+; will be handled differently.
+; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
+; Default Value: daemon
+;syslog.facility = daemon
+
+; syslog_ident is prepended to every message. If you have multiple FPM
+; instances running on the same server, you can change the default value
+; which must suit common needs.
+; Default Value: php-fpm
+;syslog.ident = php-fpm
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+;log_level = notice
+
+; Log limit on number of characters in the single line (log entry). If the
+; line is over the limit, it is wrapped on multiple lines. The limit is for
+; all logged characters including message prefix and suffix if present. However
+; the new line character does not count into it as it is present only when
+; logging to a file descriptor. It means the new line character is not present
+; when logging to syslog.
+; Default Value: 1024
+;log_limit = 4096
+
+; Log buffering specifies if the log line is buffered which means that the
+; line is written in a single write operation. If the value is false, then the
+; data is written directly into the file descriptor. It is an experimental
+; option that can potentionaly improve logging performance and memory usage
+; for some heavy logging scenarios. This option is ignored if logging to syslog
+; as it has to be always buffered.
+; Default value: yes
+;log_buffering = no
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; The maximum number of processes FPM will fork. This has been designed to control
+; the global number of processes when using dynamic PM within a lot of pools.
+; Use it with caution.
+; Note: A value of 0 indicates no limit
+; Default Value: 0
+;process.max = 128
+
+; Specify the nice(2) priority to apply to the master process (only if set)
+; The value can vary from -19 (highest priority) to 20 (lowest priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool process will inherit the master process priority
+;         unless specified otherwise
+; Default Value: no set
+;process.priority = -19
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+daemonize = yes
+
+; Set open file descriptor rlimit for the master process.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit for the master process.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Specify the event mechanism FPM will use. The following is available:
+; - select     (any POSIX os)
+; - poll       (any POSIX os)
+; - epoll      (linux >= 2.5.44)
+; Default Value: not set (auto detection)
+;events.mechanism = epoll
+
+; When FPM is built with systemd integration, specify the interval,
+; in seconds, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; See /etc/php-fpm.d/*.conf
+

php-fpm.logrotate Added

php-fpm.service Added

php-fpm.wants Added

php-keyring.gpg Added

@@ -0,0 +1,572 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=MP+q
+-----END PGP PUBLIC KEY BLOCK-----

php.conf Added

@@ -0,0 +1,62 @@
+#
+# The following lines prevent .user.ini files from being viewed by Web clients.
+#
+<Files ".user.ini">
+    Require all denied
+</Files>
+
+#
+# Allow php to handle Multiviews
+#
+AddType text/html .php
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+
+#
+# Redirect to local php-fpm (no mod_php in default configuration)
+#
+<IfModule !mod_php.c>
+    # Enable http authorization headers
+    SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+
+    <FilesMatch \.(php|phar)$>
+        SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
+    </FilesMatch>
+</IfModule>
+
+#
+# mod_php is deprecated as FPM is now used by default with httpd in event mode
+# mod_php is only used when explicitly enabled or httpd switch to prefork mode
+#
+# mod_php options
+#
+<IfModule  mod_php.c>
+    #
+    # Cause the PHP interpreter to handle files with a .php extension.
+    #
+    <FilesMatch \.(php|phar)$>
+        SetHandler application/x-httpd-php
+    </FilesMatch>
+
+    #
+    # Uncomment the following lines to allow PHP to pretty-print .phps
+    # files as PHP source code:
+    #
+    #<FilesMatch \.phps$>
+    #    SetHandler application/x-httpd-php-source
+    #</FilesMatch>
+
+    #
+    # Apache specific PHP configuration options
+    # those can be override in each configured vhost
+    #
+    php_value session.save_handler "files"
+    php_value session.save_path    "/var/lib/php/session"
+    php_value soap.wsdl_cache_dir  "/var/lib/php/wsdlcache"
+
+    #php_value opcache.file_cache   "/var/lib/php/opcache"
+</IfModule>

php.ini Added

@@ -0,0 +1,1667 @@
+PHP
+
+;;;;;;;;;;;;;;;;;;;
+; About php.ini   ;
+;;;;;;;;;;;;;;;;;;;
+; PHP's initialization file, generally called php.ini, is responsible for
+; configuring many of the aspects of PHP's behavior.
+
+; PHP attempts to find and load this configuration from a number of locations.
+; The following is a summary of its search order:
+; 1. SAPI module specific location.
+; 2. The PHPRC environment variable. (As of PHP 5.2.0)
+; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
+; 4. Current working directory (except CLI)
+; 5. The web server's directory (for SAPI modules), or directory of PHP
+; (otherwise in Windows)
+; 6. The directory from the --with-config-file-path compile time option, or the
+; Windows directory (usually C:\windows)
+; See the PHP docs for more specific information.
+; https://php.net/configuration.file
+
+; The syntax of the file is extremely simple.  Whitespace and lines
+; beginning with a semicolon are silently ignored (as you probably guessed).
+; Section headers (e.g. Foo) are also silently ignored, even though
+; they might mean something in the future.
+
+; Directives following the section heading PATH=/www/mysite only
+; apply to PHP files in the /www/mysite directory.  Directives
+; following the section heading HOST=www.example.com only apply to
+; PHP files served from www.example.com.  Directives set in these
+; special sections cannot be overridden by user-defined INI files or
+; at runtime. Currently, PATH= and HOST= sections only work under
+; CGI/FastCGI.
+; https://php.net/ini.sections
+
+; Directives are specified using the following syntax:
+; directive = value
+; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
+; Directives are variables used to configure PHP or PHP extensions.
+; There is no name validation.  If PHP can't find an expected
+; directive because it is not set or is mistyped, a default value will be used.
+
+; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
+; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
+; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a
+; previously set variable or directive (e.g. ${foo})
+
+; Expressions in the INI file are limited to bitwise operators and parentheses:
+; |  bitwise OR
+; ^  bitwise XOR
+; &  bitwise AND
+; ~  bitwise NOT
+; !  boolean NOT
+
+; Boolean flags can be turned on using the values 1, On, True or Yes.
+; They can be turned off using the values 0, Off, False or No.
+
+; An empty string can be denoted by simply not writing anything after the equal
+; sign, or by using the None keyword:
+
+; foo =         ; sets foo to an empty string
+; foo = None    ; sets foo to an empty string
+; foo = "None"  ; sets foo to the string 'None'
+
+; If you use constants in your value, and these constants belong to a
+; dynamically loaded extension (either a PHP extension or a Zend extension),
+; you may only use these constants *after* the line that loads the extension.
+
+;;;;;;;;;;;;;;;;;;;
+; About this file ;
+;;;;;;;;;;;;;;;;;;;
+; PHP comes packaged with two INI files. One that is recommended to be used
+; in production environments and one that is recommended to be used in
+; development environments.
+
+; php.ini-production contains settings which hold security, performance and
+; best practices at its core. But please be aware, these settings may break
+; compatibility with older or less security conscience applications. We
+; recommending using the production ini in production and testing environments.
+
+; php.ini-development is very similar to its production variant, except it is
+; much more verbose when it comes to errors. We recommend using the
+; development version only in development environments, as errors shown to
+; application users can inadvertently leak otherwise secure information.
+
+; This is the php.ini-production INI file.
+
+;;;;;;;;;;;;;;;;;;;
+; Quick Reference ;
+;;;;;;;;;;;;;;;;;;;
+
+; The following are all the settings which are different in either the production
+; or development versions of the INIs with respect to PHP's default behavior.
+; Please see the actual settings later in the document for more details as to why
+; we recommend these changes in PHP's behavior.
+
+; display_errors
+;   Default Value: On
+;   Development Value: On
+;   Production Value: Off
+
+; display_startup_errors
+;   Default Value: On
+;   Development Value: On
+;   Production Value: Off
+
+; error_reporting
+;   Default Value: E_ALL
+;   Development Value: E_ALL
+;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; log_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: On
+
+; max_input_time
+;   Default Value: -1 (Unlimited)
+;   Development Value: 60 (60 seconds)
+;   Production Value: 60 (60 seconds)
+
+; output_buffering
+;   Default Value: Off
+;   Development Value: 4096
+;   Production Value: 4096
+
+; register_argc_argv
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; request_order
+;   Default Value: None
+;   Development Value: "GP"
+;   Production Value: "GP"
+
+; session.gc_divisor
+;   Default Value: 100
+;   Development Value: 1000
+;   Production Value: 1000
+
+; session.sid_bits_per_character
+;   Default Value: 4
+;   Development Value: 5
+;   Production Value: 5
+
+; short_open_tag
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; variables_order
+;   Default Value: "EGPCS"
+;   Development Value: "GPCS"
+;   Production Value: "GPCS"
+
+; zend.exception_ignore_args
+;   Default Value: Off
+;   Development Value: Off
+;   Production Value: On
+
+; zend.exception_string_param_max_len
+;   Default Value: 15
+;   Development Value: 15
+;   Production Value: 0
+
+;;;;;;;;;;;;;;;;;;;;
+; php.ini Options  ;
+;;;;;;;;;;;;;;;;;;;;
+; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
+;user_ini.filename = ".user.ini"
+
+; To disable this feature set this option to an empty value
+;user_ini.filename =
+
+; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
+;user_ini.cache_ttl = 300
+
+;;;;;;;;;;;;;;;;;;;;
+; Language Options ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Enable the PHP scripting language engine under Apache.
+; https://php.net/engine
+engine = On
+
+; This directive determines whether or not PHP will recognize code between
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; https://php.net/short-open-tag
+short_open_tag = Off
+
+; The number of significant digits displayed in floating point numbers.
+; https://php.net/precision
+precision = 14
+
+; Output buffering is a mechanism for controlling how much output data
+; (excluding headers and cookies) PHP should keep internally before pushing that
+; data to the client. If your application's output exceeds this setting, PHP
+; will send that data in chunks of roughly the size you specify.
+; Turning on this setting and managing its maximum buffer size can yield some
+; interesting side-effects depending on your application and web server.
+; You may be able to send headers and cookies after you've already sent output
+; through print or echo. You also may see performance benefits if your server is
+; emitting less packets due to buffered output versus PHP streaming the output
+; as it gets it. On production servers, 4096 bytes is a good setting for performance
+; reasons.
+; Note: Output buffering can also be controlled via Output Buffering Control
+;   functions.
+; Possible Values:
+;   On = Enabled and buffer is unlimited. (Use with caution)
+;   Off = Disabled
+;   Integer = Enables the buffer and sets its maximum size in bytes.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; Default Value: Off
+; Development Value: 4096
+; Production Value: 4096
+; https://php.net/output-buffering
+output_buffering = 4096
+
+; You can redirect all of the output of your scripts to a function.  For
+; example, if you set output_handler to "mb_output_handler", character
+; encoding will be transparently converted to the specified encoding.
+; Setting any output handler automatically turns on output buffering.
+; Note: People who wrote portable scripts should not depend on this ini
+;   directive. Instead, explicitly set the output handler using ob_start().
+;   Using this ini directive may cause problems unless you know what script
+;   is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
+;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+; Note: output_handler must be empty if this is set 'On' !!!!
+;   Instead you must use zlib.output_handler.
+; https://php.net/output-handler
+;output_handler =
+
+; URL rewriter function rewrites URL on the fly by using
+; output buffer. You can set target tags by this configuration.
+; "form" tag is special tag. It will add hidden input tag to pass values.
+; Refer to session.trans_sid_tags for usage.
+; Default Value: "form="
+; Development Value: "form="
+; Production Value: "form="
+;url_rewriter.tags
+
+; URL rewriter will not rewrite absolute URL nor form by default. To enable
+; absolute URL rewrite, allowed hosts must be defined at RUNTIME.
+; Refer to session.trans_sid_hosts for more details.
+; Default Value: ""
+; Development Value: ""
+; Production Value: ""
+;url_rewriter.hosts
+
+; Transparent output compression using the zlib library
+; Valid values for this option are 'off', 'on', or a specific buffer size
+; to be used for compression (default is 4KB)
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+;   outputs chunks that are few hundreds bytes each as a result of
+;   compression. If you prefer a larger chunk size for better
+;   performance, enable output_buffering in addition.
+; Note: You need to use zlib.output_handler instead of the standard
+;   output_handler, or otherwise the output will be corrupted.
+; https://php.net/zlib.output-compression
+zlib.output_compression = Off
+
+; https://php.net/zlib.output-compression-level
+;zlib.output_compression_level = -1
+
+; You cannot specify additional output handlers if zlib.output_compression
+; is activated here. This setting does the same as output_handler but in
+; a different order.
+; https://php.net/zlib.output-handler
+;zlib.output_handler =
+
+; Implicit flush tells PHP to tell the output layer to flush itself
+; automatically after every output block.  This is equivalent to calling the
+; PHP function flush() after each and every call to print() or echo() and each
+; and every HTML block.  Turning this option on has serious performance
+; implications and is generally recommended for debugging purposes only.
+; https://php.net/implicit-flush
+; Note: This directive is hardcoded to On for the CLI SAPI
+implicit_flush = Off
+
+; The unserialize callback function will be called (with the undefined class'
+; name as parameter), if the unserializer finds an undefined class
+; which should be instantiated. A warning appears if the specified function is
+; not defined, or if the function doesn't include/implement the missing class.
+; So only set this entry, if you really want to implement such a
+; callback-function.
+unserialize_callback_func =
+
+; The unserialize_max_depth specifies the default depth limit for unserialized
+; structures. Setting the depth limit too high may result in stack overflows
+; during unserialization. The unserialize_max_depth ini setting can be
+; overridden by the max_depth option on individual unserialize() calls.
+; A value of 0 disables the depth limit.
+;unserialize_max_depth = 4096
+
+; When floats & doubles are serialized, store serialize_precision significant
+; digits after the floating point. The default value ensures that when floats
+; are decoded with unserialize, the data will remain the same.
+; The value is also used for json_encode when encoding double values.
+; If -1 is used, then dtoa mode 0 is used which automatically select the best
+; precision.
+serialize_precision = -1
+
+; open_basedir, if set, limits all file operations to the defined directory
+; and below.  This directive makes most sense if used in a per-directory
+; or per-virtualhost web server configuration file.
+; Note: disables the realpath cache
+; https://php.net/open-basedir
+;open_basedir =
+
+; This directive allows you to disable certain functions.
+; It receives a comma-delimited list of function names.
+; https://php.net/disable-functions
+disable_functions =
+
+; This directive allows you to disable certain classes.
+; It receives a comma-delimited list of class names.
+; https://php.net/disable-classes
+disable_classes =
+
+; Colors for Syntax Highlighting mode.  Anything that's acceptable in
+; <span style="color: ???????"> would work.
+; https://php.net/syntax-highlighting
+;highlight.string  = #DD0000
+;highlight.comment = #FF9900
+;highlight.keyword = #007700
+;highlight.default = #0000BB
+;highlight.html    = #000000
+
+; If enabled, the request will be allowed to complete even if the user aborts
+; the request. Consider enabling it if executing long requests, which may end up
+; being interrupted by the user or a browser timing out. PHP's default behavior
+; is to disable this feature.
+; https://php.net/ignore-user-abort
+;ignore_user_abort = On
+
+; Determines the size of the realpath cache to be used by PHP. This value should
+; be increased on systems where PHP opens many files to reflect the quantity of
+; the file operations performed.
+; Note: if open_basedir is set, the cache is disabled
+; https://php.net/realpath-cache-size
+;realpath_cache_size = 4096k
+
+; Duration of time, in seconds for which to cache realpath information for a given
+; file or directory. For systems with rarely changing files, consider increasing this
+; value.
+; https://php.net/realpath-cache-ttl
+;realpath_cache_ttl = 120
+
+; Enables or disables the circular reference collector.
+; https://php.net/zend.enable-gc
+zend.enable_gc = On
+
+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings.  To use this feature, mbstring extension must be enabled.
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts.  This value will be used
+; unless "declare(encoding=...)" directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+;zend.script_encoding =
+
+; Allows to include or exclude arguments from stack traces generated for exceptions.
+; In production, it is recommended to turn this setting on to prohibit the output
+; of sensitive information in stack traces
+; Default Value: Off
+; Development Value: Off
+; Production Value: On
+zend.exception_ignore_args = On
+
+; Allows setting the maximum string length in an argument of a stringified stack trace
+; to a value between 0 and 1000000.
+; This has no effect when zend.exception_ignore_args is enabled.
+; Default Value: 15
+; Development Value: 15
+; Production Value: 0
+; In production, it is recommended to set this to 0 to reduce the output
+; of sensitive information in stack traces.
+zend.exception_string_param_max_len = 0
+
+;;;;;;;;;;;;;;;;;
+; Miscellaneous ;
+;;;;;;;;;;;;;;;;;
+
+; Decides whether PHP may expose the fact that it is installed on the server
+; (e.g. by adding its signature to the Web server header).  It is no security
+; threat in any way, but it makes it possible to determine whether you use PHP
+; on your server or not.
+; https://php.net/expose-php
+expose_php = On
+
+;;;;;;;;;;;;;;;;;;;
+; Resource Limits ;
+;;;;;;;;;;;;;;;;;;;
+
+; Maximum execution time of each script, in seconds
+; https://php.net/max-execution-time
+; Note: This directive is hardcoded to 0 for the CLI SAPI
+max_execution_time = 30
+
+; Maximum amount of time each script may spend parsing request data. It's a good
+; idea to limit this time on productions servers in order to eliminate unexpectedly
+; long running scripts.
+; Note: This directive is hardcoded to -1 for the CLI SAPI
+; Default Value: -1 (Unlimited)
+; Development Value: 60 (60 seconds)
+; Production Value: 60 (60 seconds)
+; https://php.net/max-input-time
+max_input_time = 60
+
+; Maximum input variable nesting level
+; https://php.net/max-input-nesting-level
+;max_input_nesting_level = 64
+
+; How many GET/POST/COOKIE input variables may be accepted
+;max_input_vars = 1000
+
+; Maximum amount of memory a script may consume
+; https://php.net/memory-limit
+memory_limit = 128M
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Error handling and logging ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; This directive informs PHP of which errors, warnings and notices you would like
+; it to take action for. The recommended way of setting values for this
+; directive is through the use of the error level constants and bitwise
+; operators. The error level constants are below here for convenience as well as
+; some common settings and their meanings.
+; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
+; those related to E_NOTICE and E_STRICT, which together cover best practices and
+; recommended coding standards in PHP. For performance reasons, this is the
+; recommend error reporting setting. Your production server shouldn't be wasting
+; resources complaining about best practices and coding standards. That's what
+; development servers and development settings are for.
+; Note: The php.ini-development file has this setting as E_ALL. This
+; means it pretty much reports everything which is exactly what you want during
+; development and early testing.
+;
+; Error Level Constants:
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
+; E_ERROR           - fatal run-time errors
+; E_RECOVERABLE_ERROR  - almost fatal run-time errors
+; E_WARNING         - run-time warnings (non-fatal errors)
+; E_PARSE           - compile-time parse errors
+; E_NOTICE          - run-time notices (these are warnings which often result
+;                     from a bug in your code, but it's possible that it was
+;                     intentional (e.g., using an uninitialized variable and
+;                     relying on the fact it is automatically initialized to an
+;                     empty string)
+; E_STRICT          - run-time notices, enable to have PHP suggest changes
+;                     to your code which will ensure the best interoperability
+;                     and forward compatibility of your code
+; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
+; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
+;                     initial startup
+; E_COMPILE_ERROR   - fatal compile-time errors
+; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
+; E_USER_ERROR      - user-generated error message
+; E_USER_WARNING    - user-generated warning message
+; E_USER_NOTICE     - user-generated notice message
+; E_DEPRECATED      - warn about code that will not work in future versions
+;                     of PHP
+; E_USER_DEPRECATED - user-generated deprecation warnings
+;
+; Common Values:
+;   E_ALL (Show all errors, warnings and notices including coding standards.)
+;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
+;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
+;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
+; Default Value: E_ALL
+; Development Value: E_ALL
+; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; https://php.net/error-reporting
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; This directive controls whether or not and where PHP will output errors,
+; notices and warnings too. Error output is very useful during development, but
+; it could be very dangerous in production environments. Depending on the code
+; which is triggering the error, sensitive information could potentially leak
+; out of your application such as database usernames and passwords or worse.
+; For production environments, we recommend logging errors rather than
+; sending them to STDOUT.
+; Possible Values:
+;   Off = Do not display any errors
+;   stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
+;   On or stdout = Display errors to STDOUT
+; Default Value: On
+; Development Value: On
+; Production Value: Off
+; https://php.net/display-errors
+display_errors = Off
+
+; The display of errors which occur during PHP's startup sequence are handled
+; separately from display_errors. We strongly recommend you set this to 'off'
+; for production servers to avoid leaking configuration details.
+; Default Value: On
+; Development Value: On
+; Production Value: Off
+; https://php.net/display-startup-errors
+display_startup_errors = Off
+
+; Besides displaying errors, PHP can also log errors to locations such as a
+; server-specific log, STDERR, or a location specified by the error_log
+; directive found below. While errors should not be displayed on productions
+; servers they should still be monitored and logging is a great way to do that.
+; Default Value: Off
+; Development Value: On
+; Production Value: On
+; https://php.net/log-errors
+log_errors = On
+
+; Do not log repeated messages. Repeated errors must occur in same file on same
+; line unless ignore_repeated_source is set true.
+; https://php.net/ignore-repeated-errors
+ignore_repeated_errors = Off
+
+; Ignore source of message when ignoring repeated messages. When this setting
+; is On you will not log errors with repeated messages from different files or
+; source lines.
+; https://php.net/ignore-repeated-source
+ignore_repeated_source = Off
+
+; If this parameter is set to Off, then memory leaks will not be shown (on
+; stdout or in the log). This is only effective in a debug compile, and if
+; error reporting includes E_WARNING in the allowed list
+; https://php.net/report-memleaks
+report_memleaks = On
+
+; This setting is off by default.
+;report_zend_debug = 0
+
+; Turn off normal error reporting and emit XML-RPC error XML
+; https://php.net/xmlrpc-errors
+;xmlrpc_errors = 0
+
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
+; When PHP displays or logs an error, it has the capability of formatting the
+; error message as HTML for easier reading. This directive controls whether
+; the error message is formatted as HTML or not.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; https://php.net/html-errors
+;html_errors = On
+
+; If html_errors is set to On *and* docref_root is not empty, then PHP
+; produces clickable error messages that direct to a page describing the error
+; or function causing the error in detail.
+; You can download a copy of the PHP manual from https://php.net/docs
+; and change docref_root to the base URL of your local copy including the
+; leading '/'. You must also specify the file extension being used including
+; the dot. PHP's default behavior is to leave these settings empty, in which
+; case no links to documentation are generated.
+; Note: Never use this feature for production boxes.
+; https://php.net/docref-root
+; Examples
+;docref_root = "/phpmanual/"
+
+; https://php.net/docref-ext
+;docref_ext = .html
+
+; String to output before an error message. PHP's default behavior is to leave
+; this setting blank.
+; https://php.net/error-prepend-string
+; Example:
+;error_prepend_string = "<span style='color: #ff0000'>"
+
+; String to output after an error message. PHP's default behavior is to leave
+; this setting blank.
+; https://php.net/error-append-string
+; Example:
+;error_append_string = "</span>"
+
+; Log errors to specified file. PHP's default behavior is to leave this value
+; empty.
+; https://php.net/error-log
+; Example:
+;error_log = php_errors.log
+; Log errors to syslog (Event Log on Windows).
+;error_log = syslog
+
+; The syslog ident is a string which is prepended to every message logged
+; to syslog. Only used when error_log is set to syslog.
+;syslog.ident = php
+
+; The syslog facility is used to specify what type of program is logging
+; the message. Only used when error_log is set to syslog.
+;syslog.facility = user
+
+; Set this to disable filtering control characters (the default).
+; Some loggers only accept NVT-ASCII, others accept anything that's not
+; control characters. If your logger accepts everything, then no filtering
+; is needed at all.
+; Allowed values are:
+;   ascii (all printable ASCII characters and NL)
+;   no-ctrl (all characters except control characters)
+;   all (all characters)
+;   raw (like "all", but messages are not split at newlines)
+; https://php.net/syslog.filter
+;syslog.filter = ascii
+
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+;;;;;;;;;;;;;;;;;
+; Data Handling ;
+;;;;;;;;;;;;;;;;;
+
+; The separator used in PHP generated URLs to separate arguments.
+; PHP's default setting is "&".
+; https://php.net/arg-separator.output
+; Example:
+;arg_separator.output = "&amp;"
+
+; List of separator(s) used by PHP to parse input URLs into variables.
+; PHP's default setting is "&".
+; NOTE: Every character in this directive is considered as separator!
+; https://php.net/arg-separator.input
+; Example:
+;arg_separator.input = ";&"
+
+; This directive determines which super global arrays are registered when PHP
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
+; paid for the registration of these arrays and because ENV is not as commonly
+; used as the others, ENV is not recommended on productions servers. You
+; can still get access to the environment variables through getenv() should you
+; need to.
+; Default Value: "EGPCS"
+; Development Value: "GPCS"
+; Production Value: "GPCS";
+; https://php.net/variables-order
+variables_order = "GPCS"
+
+; This directive determines which super global data (G,P & C) should be
+; registered into the super global array REQUEST. If so, it also determines
+; the order in which that data is registered. The values for this directive
+; are specified in the same manner as the variables_order directive,
+; EXCEPT one. Leaving this value empty will cause PHP to use the value set
+; in the variables_order directive. It does not mean it will leave the super
+; globals array REQUEST empty.
+; Default Value: None
+; Development Value: "GP"
+; Production Value: "GP"
+; https://php.net/request-order
+request_order = "GP"
+
+; This directive determines whether PHP registers $argv & $argc each time it
+; runs. $argv contains an array of all the arguments passed to PHP when a script
+; is invoked. $argc contains an integer representing the number of arguments
+; that were passed when the script was invoked. These arrays are extremely
+; useful when running scripts from the command line. When this directive is
+; enabled, registering these variables consumes CPU cycles and memory each time
+; a script is executed. For performance reasons, this feature should be disabled
+; on production servers.
+; Note: This directive is hardcoded to On for the CLI SAPI
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; https://php.net/register-argc-argv
+register_argc_argv = Off
+
+; When enabled, the ENV, REQUEST and SERVER variables are created when they're
+; first used (Just In Time) instead of when the script starts. If these
+; variables are not used within a script, having this directive on will result
+; in a performance gain. The PHP directive register_argc_argv must be disabled
+; for this directive to have any effect.
+; https://php.net/auto-globals-jit
+auto_globals_jit = On
+
+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; https://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
+; Maximum size of POST data that PHP will accept.
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
+; https://php.net/post-max-size
+post_max_size = 8M
+
+; Automatically add files before PHP document.
+; https://php.net/auto-prepend-file
+auto_prepend_file =
+
+; Automatically add files after PHP document.
+; https://php.net/auto-append-file
+auto_append_file =
+
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
+;
+; PHP's built-in default media type is set to text/html.
+; https://php.net/default-mimetype
+default_mimetype = "text/html"
+
+; PHP's default character set is set to UTF-8.
+; https://php.net/default-charset
+default_charset = "UTF-8"
+
+; PHP internal character encoding is set to empty.
+; If empty, default_charset is used.
+; https://php.net/internal-encoding
+;internal_encoding =
+
+; PHP input character encoding is set to empty.
+; If empty, default_charset is used.
+; https://php.net/input-encoding
+;input_encoding =
+
+; PHP output character encoding is set to empty.
+; If empty, default_charset is used.
+; See also output_buffer.
+; https://php.net/output-encoding
+;output_encoding =
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; Paths and Directories ;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; UNIX: "/path1:/path2"
+;include_path = ".:/php/includes"
+;
+; Windows: "\path1;\path2"
+;include_path = ".;c:\php\includes"
+;
+; PHP's default setting for include_path is ".;/path/to/php/pear"
+; https://php.net/include-path
+
+; The root of the PHP pages, used only if nonempty.
+; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
+; if you are running php as a CGI under any web server (other than IIS)
+; see documentation for security issues.  The alternate is to use the
+; cgi.force_redirect configuration below
+; https://php.net/doc-root
+doc_root =
+
+; The directory under which PHP opens the script using /~username used only
+; if nonempty.
+; https://php.net/user-dir
+user_dir =
+
+; Directory in which the loadable extensions (modules) reside.
+; https://php.net/extension-dir
+;extension_dir = "./"
+; On windows:
+;extension_dir = "ext"
+
+; Directory where the temporary files should be placed.
+; Defaults to the system default (see sys_get_temp_dir)
+;sys_temp_dir = "/tmp"
+
+; Whether or not to enable the dl() function.  The dl() function does NOT work
+; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+; disabled on them.
+; https://php.net/enable-dl
+enable_dl = Off
+
+; cgi.force_redirect is necessary to provide security running PHP as a CGI under
+; most web servers.  Left undefined, PHP turns this on by default.  You can
+; turn it off here AT YOUR OWN RISK
+; **You CAN safely turn this off for IIS, in fact, you MUST.**
+; https://php.net/cgi.force-redirect
+;cgi.force_redirect = 1
+
+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+; every request. PHP's default behavior is to disable this feature.
+;cgi.nph = 1
+
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
+; will look for to know it is OK to continue execution.  Setting this variable MAY
+; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
+; https://php.net/cgi.redirect-status-env
+;cgi.redirect_status_env =
+
+; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
+; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
+; this to 1 will cause PHP CGI to fix its paths to conform to the spec.  A setting
+; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+; https://php.net/cgi.fix-pathinfo
+;cgi.fix_pathinfo=1
+
+; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
+; of the web tree and people will not be able to circumvent .htaccess security.
+;cgi.discard_path=1
+
+; FastCGI under IIS supports the ability to impersonate
+; security tokens of the calling client.  This allows IIS to define the
+; security context that the request runs under.  mod_fastcgi under Apache
+; does not currently support this feature (03/17/2002)
+; Set to 1 if running under IIS.  Default is zero.
+; https://php.net/fastcgi.impersonate
+;fastcgi.impersonate = 1
+
+; Disable logging through FastCGI connection. PHP's default behavior is to enable
+; this feature.
+;fastcgi.logging = 0
+
+; cgi.rfc2616_headers configuration option tells PHP what type of headers to
+; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+; is supported by Apache. When this option is set to 1, PHP will send
+; RFC2616 compliant header.
+; Default is zero.
+; https://php.net/cgi.rfc2616-headers
+;cgi.rfc2616_headers = 0
+
+; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
+; (shebang) at the top of the running script. This line might be needed if the
+; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
+; mode skips this line and ignores its content if this directive is turned on.
+; https://php.net/cgi.check-shebang-line
+;cgi.check_shebang_line=1
+
+;;;;;;;;;;;;;;;;
+; File Uploads ;
+;;;;;;;;;;;;;;;;
+
+; Whether to allow HTTP file uploads.
+; https://php.net/file-uploads
+file_uploads = On
+
+; Temporary directory for HTTP uploaded files (will use system default if not
+; specified).
+; https://php.net/upload-tmp-dir
+;upload_tmp_dir =
+
+; Maximum allowed size for uploaded files.
+; https://php.net/upload-max-filesize
+upload_max_filesize = 2M
+
+; Maximum number of files that can be uploaded via a single request
+max_file_uploads = 20
+
+;;;;;;;;;;;;;;;;;;
+; Fopen wrappers ;
+;;;;;;;;;;;;;;;;;;
+
+; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+; https://php.net/allow-url-fopen
+allow_url_fopen = On
+
+; Whether to allow include/require to open URLs (like https:// or ftp://) as files.
+; https://php.net/allow-url-include
+allow_url_include = Off
+
+; Define the anonymous ftp password (your email address). PHP's default setting
+; for this is empty.
+; https://php.net/from
+;from="john@doe.com"
+
+; Define the User-Agent string. PHP's default setting for this is empty.
+; https://php.net/user-agent
+;user_agent="PHP"
+
+; Default timeout for socket based streams (seconds)
+; https://php.net/default-socket-timeout
+default_socket_timeout = 60
+
+; If your scripts have to deal with files from Macintosh systems,
+; or you are running on a Mac and need to deal with files from
+; unix or win32 systems, setting this flag will cause PHP to
+; automatically detect the EOL character in those files so that
+; fgets() and file() will work regardless of the source of the file.
+; https://php.net/auto-detect-line-endings
+;auto_detect_line_endings = Off
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
+
+; If you wish to have an extension loaded automatically, use the following
+; syntax:
+;
+;   extension=modulename
+;
+; For example:
+;
+;   extension=mysqli
+;
+; When the extension library to load is not located in the default extension
+; directory, You may specify an absolute path to the library file:
+;
+;   extension=/path/to/extension/mysqli.so
+;
+; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
+; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
+; deprecated in a future PHP major version. So, when it is possible, please
+; move to the new ('extension=<ext>) syntax.
+
+;;;;
+; Note: packaged extension modules are now loaded via the .ini files
+; found in the directory /etc/php.d; these are loaded by default.
+;;;;
+
+;;;;;;;;;;;;;;;;;;;
+; Module Settings ;
+;;;;;;;;;;;;;;;;;;;
+
+CLI Server
+; Whether the CLI web server uses ANSI color coding in its terminal output.
+cli_server.color = On
+
+Date
+; Defines the default timezone used by the date functions
+; https://php.net/date.timezone
+;date.timezone =
+
+; https://php.net/date.default-latitude
+;date.default_latitude = 31.7667
+
+; https://php.net/date.default-longitude
+;date.default_longitude = 35.2333
+
+; https://php.net/date.sunrise-zenith
+;date.sunrise_zenith = 90.833333
+
+; https://php.net/date.sunset-zenith
+;date.sunset_zenith = 90.833333
+
+filter
+; https://php.net/filter.default
+;filter.default = unsafe_raw
+
+; https://php.net/filter.default-flags
+;filter.default_flags =
+
+iconv
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < input_encoding < iconv.input_encoding
+;iconv.input_encoding =
+
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;iconv.internal_encoding =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+;iconv.output_encoding =
+
+imap
+; rsh/ssh logins are disabled by default. Use this INI entry if you want to
+; enable them. Note that the IMAP library does not filter mailbox names before
+; passing them to rsh/ssh command, thus passing untrusted data to this function
+; with rsh/ssh enabled is insecure.
+;imap.enable_insecure_rsh=0
+
+intl
+;intl.default_locale =
+; This directive allows you to produce PHP errors when some error
+; happens within intl functions. The value is the level of the error produced.
+; Default is 0, which does not produce any errors.
+;intl.error_level = E_WARNING
+;intl.use_exceptions = 0
+
+sqlite3
+; Directory pointing to SQLite3 extensions
+; https://php.net/sqlite3.extension-dir
+;sqlite3.extension_dir =
+
+; SQLite defensive mode flag (only available from SQLite 3.26+)
+; When the defensive flag is enabled, language features that allow ordinary
+; SQL to deliberately corrupt the database file are disabled. This forbids
+; writing directly to the schema, shadow tables (eg. FTS data tables), or
+; the sqlite_dbpage virtual table.
+; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
+; (for older SQLite versions, this flag has no use)
+;sqlite3.defensive = 1
+
+Pcre
+; PCRE library backtracking limit.
+; https://php.net/pcre.backtrack-limit
+;pcre.backtrack_limit=100000
+
+; PCRE library recursion limit.
+; Please note that if you set this value to a high number you may consume all
+; the available process stack and eventually crash PHP (due to reaching the
+; stack size limit imposed by the Operating System).
+; https://php.net/pcre.recursion-limit
+;pcre.recursion_limit=100000
+
+; Enables or disables JIT compilation of patterns. This requires the PCRE
+; library to be compiled with JIT support.
+pcre.jit=0
+
+Pdo
+; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
+; https://php.net/pdo-odbc.connection-pooling
+;pdo_odbc.connection_pooling=strict
+
+Pdo_mysql
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+pdo_mysql.default_socket=
+
+Phar
+; https://php.net/phar.readonly
+;phar.readonly = On
+
+; https://php.net/phar.require-hash
+;phar.require_hash = On
+
+;phar.cache_list =
+
+mail function
+; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+; https://php.net/sendmail-path
+sendmail_path = /usr/sbin/sendmail -t -i
+
+; Force the addition of the specified parameters to be passed as extra parameters
+; to the sendmail binary. These parameters will always replace the value of
+; the 5th parameter to mail().
+;mail.force_extra_parameters =
+
+; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
+mail.add_x_header = Off
+
+; The path to a log file that will log all mail() calls. Log entries include
+; the full path of the script, line number, To address and headers.
+;mail.log =
+; Log mail to syslog (Event Log on Windows).
+;mail.log = syslog
+
+ODBC
+; https://php.net/odbc.default-db
+;odbc.default_db    =  Not yet implemented
+
+; https://php.net/odbc.default-user
+;odbc.default_user  =  Not yet implemented
+
+; https://php.net/odbc.default-pw
+;odbc.default_pw    =  Not yet implemented
+
+; Controls the ODBC cursor model.
+; Default: SQL_CURSOR_STATIC (default).
+;odbc.default_cursortype
+
+; Allow or prevent persistent links.
+; https://php.net/odbc.allow-persistent
+odbc.allow_persistent = On
+
+; Check that a connection is still valid before reuse.
+; https://php.net/odbc.check-persistent
+odbc.check_persistent = On
+
+; Maximum number of persistent links.  -1 means no limit.
+; https://php.net/odbc.max-persistent
+odbc.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+; https://php.net/odbc.max-links
+odbc.max_links = -1
+
+; Handling of LONG fields.  Returns number of bytes to variables.  0 means
+; passthru.
+; https://php.net/odbc.defaultlrl
+odbc.defaultlrl = 4096
+
+; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
+; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
+; of odbc.defaultlrl and odbc.defaultbinmode
+; https://php.net/odbc.defaultbinmode
+odbc.defaultbinmode = 1
+
+MySQLi
+
+; Maximum number of persistent links.  -1 means no limit.
+; https://php.net/mysqli.max-persistent
+mysqli.max_persistent = -1
+
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; https://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; It allows the user to specify a folder where files that can be sent via LOAD DATA
+; LOCAL can exist. It is ignored if mysqli.allow_local_infile is enabled.
+;mysqli.local_infile_directory =
+
+; Allow or prevent persistent links.
+; https://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+; Maximum number of links.  -1 means no limit.
+; https://php.net/mysqli.max-links
+mysqli.max_links = -1
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+; https://php.net/mysqli.default-port
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+; https://php.net/mysqli.default-socket
+mysqli.default_socket =
+
+; Default host for mysqli_connect() (doesn't apply in safe mode).
+; https://php.net/mysqli.default-host
+mysqli.default_host =
+
+; Default user for mysqli_connect() (doesn't apply in safe mode).
+; https://php.net/mysqli.default-user
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+; https://php.net/mysqli.default-pw
+mysqli.default_pw =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
+; If this option is enabled, closing a persistent connection will rollback
+; any pending transactions of this connection, before it is put back
+; into the persistent connection pool.
+;mysqli.rollback_on_cached_plink = Off
+
+mysqlnd
+; Enable / Disable collection of general statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+mysqlnd.collect_statistics = On
+
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+mysqlnd.collect_memory_statistics = Off
+
+; Records communication from all extensions using mysqlnd to the specified log
+; file.
+; https://php.net/mysqlnd.debug
+;mysqlnd.debug =
+
+; Defines which queries will be logged.
+;mysqlnd.log_mask = 0
+
+; Default size of the mysqlnd memory pool, which is used by result sets.
+;mysqlnd.mempool_default_size = 16000
+
+; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
+;mysqlnd.net_cmd_buffer_size = 2048
+
+; Size of a pre-allocated buffer used for reading data sent by the server in
+; bytes.
+;mysqlnd.net_read_buffer_size = 32768
+
+; Timeout for network requests in seconds.
+;mysqlnd.net_read_timeout = 31536000
+
+; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
+; key.
+;mysqlnd.sha256_server_public_key =
+
+PostgreSQL
+; Allow or prevent persistent links.
+; https://php.net/pgsql.allow-persistent
+pgsql.allow_persistent = On
+
+; Detect broken persistent links always with pg_pconnect().
+; Auto reset feature requires a little overheads.
+; https://php.net/pgsql.auto-reset-persistent
+pgsql.auto_reset_persistent = Off
+
+; Maximum number of persistent links.  -1 means no limit.
+; https://php.net/pgsql.max-persistent
+pgsql.max_persistent = -1
+
+; Maximum number of links (persistent+non persistent).  -1 means no limit.
+; https://php.net/pgsql.max-links
+pgsql.max_links = -1
+
+; Ignore PostgreSQL backends Notice message or not.
+; Notice message logging require a little overheads.
+; https://php.net/pgsql.ignore-notice
+pgsql.ignore_notice = 0
+
+; Log PostgreSQL backends Notice message or not.
+; Unless pgsql.ignore_notice=0, module cannot log notice message.
+; https://php.net/pgsql.log-notice
+pgsql.log_notice = 0
+
+bcmath
+; Number of decimal digits for all bcmath functions.
+; https://php.net/bcmath.scale
+bcmath.scale = 0
+
+browscap
+; https://php.net/browscap
+;browscap = extra/browscap.ini
+
+Session
+; Handler used to store/retrieve data.
+; https://php.net/session.save-handler
+session.save_handler = files
+
+; Argument passed to save_handler.  In the case of files, this is the path
+; where data files are stored. Note: Windows users have to change this
+; variable in order to use PHP's session functions.
+;
+; The path can be defined as:
+;
+;     session.save_path = "N;/path"
+;
+; where N is an integer.  Instead of storing all the session files in
+; /path, what this will do is use subdirectories N-levels deep, and
+; store the session data in those directories.  This is useful if
+; your OS has problems with many files in one directory, and is
+; a more efficient layout for servers that handle many sessions.
+;
+; NOTE 1: PHP will not create this directory structure automatically.
+;         You can use the script in the ext/session dir for that purpose.
+; NOTE 2: See the section on garbage collection below if you choose to
+;         use subdirectories for session storage
+;
+; The file storage module creates files using mode 600 by default.
+; You can change that by using
+;
+;     session.save_path = "N;MODE;/path"
+;
+; where MODE is the octal representation of the mode. Note that this
+; does not overwrite the process's umask.
+; https://php.net/session.save-path
+
+; RPM note : session directory must be owned by process owner
+; for mod_php, see /etc/httpd/conf.d/php.conf
+; for php-fpm, see /etc/php-fpm.d/*conf
+;session.save_path = "/tmp"
+
+; Whether to use strict session mode.
+; Strict session mode does not accept an uninitialized session ID, and
+; regenerates the session ID if the browser sends an uninitialized session ID.
+; Strict mode protects applications from session fixation via a session adoption
+; vulnerability. It is disabled by default for maximum compatibility, but
+; enabling it is encouraged.
+; https://wiki.php.net/rfc/strict_sessions
+session.use_strict_mode = 0
+
+; Whether to use cookies.
+; https://php.net/session.use-cookies
+session.use_cookies = 1
+
+; https://php.net/session.cookie-secure
+;session.cookie_secure =
+
+; This option forces PHP to fetch and use a cookie for storing and maintaining
+; the session id. We encourage this operation as it's very helpful in combating
+; session hijacking when not specifying and managing your own session id. It is
+; not the be-all and end-all of session hijacking defense, but it's a good start.
+; https://php.net/session.use-only-cookies
+session.use_only_cookies = 1
+
+; Name of the session (used as cookie name).
+; https://php.net/session.name
+session.name = PHPSESSID
+
+; Initialize session on request startup.
+; https://php.net/session.auto-start
+session.auto_start = 0
+
+; Lifetime in seconds of cookie or, if 0, until browser is restarted.
+; https://php.net/session.cookie-lifetime
+session.cookie_lifetime = 0
+
+; The path for which the cookie is valid.
+; https://php.net/session.cookie-path
+session.cookie_path = /
+
+; The domain for which the cookie is valid.
+; https://php.net/session.cookie-domain
+session.cookie_domain =
+
+; Whether or not to add the httpOnly flag to the cookie, which makes it
+; inaccessible to browser scripting languages such as JavaScript.
+; https://php.net/session.cookie-httponly
+session.cookie_httponly =
+
+; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
+; Current valid values are "Strict", "Lax" or "None". When using "None",
+; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
+; https://tools.ietf.org/html/draft-west-first-party-cookies-07
+session.cookie_samesite =
+
+; Handler used to serialize data. php is the standard serializer of PHP.
+; https://php.net/session.serialize-handler
+session.serialize_handler = php
+
+; Defines the probability that the 'garbage collection' process is started on every
+; session initialization. The probability is calculated by using gc_probability/gc_divisor,
+; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; https://php.net/session.gc-probability
+session.gc_probability = 1
+
+; Defines the probability that the 'garbage collection' process is started on every
+; session initialization. The probability is calculated by using gc_probability/gc_divisor,
+; e.g. 1/100 means there is a 1% chance that the GC process starts on each request.
+; For high volume production servers, using a value of 1000 is a more efficient approach.
+; Default Value: 100
+; Development Value: 1000
+; Production Value: 1000
+; https://php.net/session.gc-divisor
+session.gc_divisor = 1000
+
+; After this number of seconds, stored data will be seen as 'garbage' and
+; cleaned up by the garbage collection process.
+; https://php.net/session.gc-maxlifetime
+session.gc_maxlifetime = 1440
+
+; NOTE: If you are using the subdirectory option for storing session files
+;       (see session.save_path above), then garbage collection does *not*
+;       happen automatically.  You will need to do your own garbage
+;       collection through a shell script, cron entry, or some other method.
+;       For example, the following script is the equivalent of setting
+;       session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+;          find /path/to/sessions -cmin +24 -type f | xargs rm
+
+; Check HTTP Referer to invalidate externally stored URLs containing ids.
+; HTTP_REFERER has to contain this substring for the session to be
+; considered as valid.
+; https://php.net/session.referer-check
+session.referer_check =
+
+; Set to {nocache,private,public,} to determine HTTP caching aspects
+; or leave this empty to avoid sending anti-caching headers.
+; https://php.net/session.cache-limiter
+session.cache_limiter = nocache
+
+; Document expires after n minutes.
+; https://php.net/session.cache-expire
+session.cache_expire = 180
+
+; trans sid support is disabled by default.
+; Use of trans sid may risk your users' security.
+; Use this option with caution.
+; - User may send URL contains active session ID
+;   to other person via. email/irc/etc.
+; - URL that contains active session ID may be stored
+;   in publicly accessible computer.
+; - User may access your site with the same session ID
+;   always using URL stored in browser's history or bookmarks.
+; https://php.net/session.use-trans-sid
+session.use_trans_sid = 0
+
+; Set session ID character length. This value could be between 22 to 256.
+; Shorter length than default is supported only for compatibility reason.
+; Users should use 32 or more chars.
+; https://php.net/session.sid-length
+; Default Value: 32
+; Development Value: 26
+; Production Value: 26
+session.sid_length = 26
+
+; The URL rewriter will look for URLs in a defined set of HTML tags.
+; <form> is special; if you include them here, the rewriter will
+; add a hidden <input> field with the info which is otherwise appended
+; to URLs. <form> tag's action attribute URL will not be modified
+; unless it is specified.
+; Note that all valid entries require a "=", even if no value follows.
+; Default Value: "a=href,area=href,frame=src,form="
+; Development Value: "a=href,area=href,frame=src,form="
+; Production Value: "a=href,area=href,frame=src,form="
+; https://php.net/url-rewriter.tags
+session.trans_sid_tags = "a=href,area=href,frame=src,form="
+
+; URL rewriter does not rewrite absolute URLs by default.
+; To enable rewrites for absolute paths, target hosts must be specified
+; at RUNTIME. i.e. use ini_set()
+; <form> tags is special. PHP will check action attribute's URL regardless
+; of session.trans_sid_tags setting.
+; If no host is defined, HTTP_HOST will be used for allowed host.
+; Example value: php.net,www.php.net,wiki.php.net
+; Use "," for multiple hosts. No spaces are allowed.
+; Default Value: ""
+; Development Value: ""
+; Production Value: ""
+;session.trans_sid_hosts=""
+
+; Define how many bits are stored in each character when converting
+; the binary hash data to something readable.
+; Possible values:
+;   4  (4 bits: 0-9, a-f)
+;   5  (5 bits: 0-9, a-v)
+;   6  (6 bits: 0-9, a-z, A-Z, "-", ",")
+; Default Value: 4
+; Development Value: 5
+; Production Value: 5
+; https://php.net/session.hash-bits-per-character
+session.sid_bits_per_character = 5
+
+; Enable upload progress tracking in $_SESSION
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; https://php.net/session.upload-progress.enabled
+;session.upload_progress.enabled = On
+
+; Cleanup the progress information as soon as all POST data has been read
+; (i.e. upload completed).
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; https://php.net/session.upload-progress.cleanup
+;session.upload_progress.cleanup = On
+
+; A prefix used for the upload progress key in $_SESSION
+; Default Value: "upload_progress_"
+; Development Value: "upload_progress_"
+; Production Value: "upload_progress_"
+; https://php.net/session.upload-progress.prefix
+;session.upload_progress.prefix = "upload_progress_"
+
+; The index name (concatenated with the prefix) in $_SESSION
+; containing the upload progress information
+; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; https://php.net/session.upload-progress.name
+;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
+
+; How frequently the upload progress should be updated.
+; Given either in percentages (per-file), or in bytes
+; Default Value: "1%"
+; Development Value: "1%"
+; Production Value: "1%"
+; https://php.net/session.upload-progress.freq
+;session.upload_progress.freq =  "1%"
+
+; The minimum delay between updates, in seconds
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; https://php.net/session.upload-progress.min-freq
+;session.upload_progress.min_freq = "1"
+
+; Only write session data when session data is changed. Enabled by default.
+; https://php.net/session.lazy-write
+;session.lazy_write = On
+
+Assertion
+; Switch whether to compile assertions at all (to have no overhead at run-time)
+; -1: Do not compile at all
+;  0: Jump over assertion at run-time
+;  1: Execute assertions
+; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
+; Default Value: 1
+; Development Value: 1
+; Production Value: -1
+; https://php.net/zend.assertions
+zend.assertions = -1
+
+; Assert(expr); active by default.
+; https://php.net/assert.active
+;assert.active = On
+
+; Throw an AssertionError on failed assertions
+; https://php.net/assert.exception
+;assert.exception = On
+
+; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
+; https://php.net/assert.warning
+;assert.warning = On
+
+; Don't bail out by default.
+; https://php.net/assert.bail
+;assert.bail = Off
+
+; User-function to be called if an assertion fails.
+; https://php.net/assert.callback
+;assert.callback = 0
+
+mbstring
+; language for internal character representation.
+; This affects mb_send_mail() and mbstring.detect_order.
+; https://php.net/mbstring.language
+;mbstring.language = Japanese
+
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; internal/script encoding.
+; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;mbstring.internal_encoding =
+
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; http input encoding.
+; mbstring.encoding_translation = On is needed to use this setting.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < input_encoding < mbstring.http_input
+; https://php.net/mbstring.http-input
+;mbstring.http_input =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; http output encoding.
+; mb_output_handler must be registered as output buffer to function.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+; https://php.net/mbstring.http-output
+;mbstring.http_output =
+
+; enable automatic encoding translation according to
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
+;       portable libs/applications.
+; https://php.net/mbstring.encoding-translation
+;mbstring.encoding_translation = Off
+
+; automatic encoding detection order.
+; "auto" detect order is changed according to mbstring.language
+; https://php.net/mbstring.detect-order
+;mbstring.detect_order = auto
+
+; substitute_character used when character cannot be converted
+; one from another
+; https://php.net/mbstring.substitute-character
+;mbstring.substitute_character = none
+
+; Enable strict encoding detection.
+;mbstring.strict_detection = Off
+
+; This directive specifies the regex pattern of content types for which mb_output_handler()
+; is activated.
+; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml)
+;mbstring.http_output_conv_mimetypes=
+
+; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
+; to the pcre.recursion_limit for PCRE.
+;mbstring.regex_stack_limit=100000
+
+; This directive specifies maximum retry count for mbstring regular expressions. It is similar
+; to the pcre.backtrack_limit for PCRE.
+;mbstring.regex_retry_limit=1000000
+
+gd
+; Tell the jpeg decode to ignore warnings and try to create
+; a gd image. The warning will then be displayed as notices
+; disabled by default
+; https://php.net/gd.jpeg-ignore-warning
+;gd.jpeg_ignore_warning = 1
+
+exif
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; With mbstring support this will automatically be converted into the encoding
+; given by corresponding encode setting. When empty mbstring.internal_encoding
+; is used. For the decode settings you can distinguish between motorola and
+; intel byte order. A decode setting cannot be empty.
+; https://php.net/exif.encode-unicode
+;exif.encode_unicode = ISO-8859-15
+
+; https://php.net/exif.decode-unicode-motorola
+;exif.decode_unicode_motorola = UCS-2BE
+
+; https://php.net/exif.decode-unicode-intel
+;exif.decode_unicode_intel    = UCS-2LE
+
+; https://php.net/exif.encode-jis
+;exif.encode_jis =
+
+; https://php.net/exif.decode-jis-motorola
+;exif.decode_jis_motorola = JIS
+
+; https://php.net/exif.decode-jis-intel
+;exif.decode_jis_intel    = JIS
+
+Tidy
+; The path to a default tidy configuration file to use when using tidy
+; https://php.net/tidy.default-config
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+; https://php.net/tidy.clean-output
+tidy.clean_output = Off
+
+soap
+; Enables or disables WSDL caching feature.
+; https://php.net/soap.wsdl-cache-enabled
+soap.wsdl_cache_enabled=1
+
+; Sets the directory name where SOAP extension will put cache files.
+; https://php.net/soap.wsdl-cache-dir
+
+; RPM note : cache directory must be owned by process owner
+; for mod_php, see /etc/httpd/conf.d/php.conf
+; for php-fpm, see /etc/php-fpm.d/*conf
+soap.wsdl_cache_dir="/tmp"
+
+; (time to live) Sets the number of second while cached file will be used
+; instead of original one.
+; https://php.net/soap.wsdl-cache-ttl
+soap.wsdl_cache_ttl=86400
+
+; Sets the size of the cache limit. (Max. number of WSDL files to cache)
+soap.wsdl_cache_limit = 5
+
+sysvshm
+; A default size of the shared memory segment
+;sysvshm.init_mem = 10000
+
+ldap
+; Sets the maximum number of open links or -1 for unlimited.
+ldap.max_links = -1
+
+dba
+;dba.default_handler=
+
+opcache
+; see /etc/php.d/10-opcache.ini
+
+curl
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
+openssl
+; The location of a Certificate Authority (CA) file on the local filesystem
+; to use when verifying the identity of SSL/TLS peers. Most users should
+; not specify a value for this directive as PHP will attempt to use the
+; OS-managed cert stores in its absence. If specified, this value may still
+; be overridden on a per-stream basis via the "cafile" SSL stream context
+; option.
+;openssl.cafile=
+
+; If openssl.cafile is not specified or if the CA file is not found, the
+; directory pointed to by openssl.capath is searched for a suitable
+; certificate. This value must be a correctly hashed certificate directory.
+; Most users should not specify a value for this directive as PHP will
+; attempt to use the OS-managed cert stores in its absence. If specified,
+; this value may still be overridden on a per-stream basis via the "capath"
+; SSL stream context option.
+;openssl.capath=
+
+ffi
+; see /etc/php.d/20-ffi.ini

php.modconf Added

Build Results
RPM Lint

Refresh

Submit package home:mollekopf...ab:Winterfell / php-PsrLog to package Kolab:16:Testing / php-PsrLog

php-PsrLog.spec Added

@@ -0,0 +1,195 @@
+#
+# Fedora spec file for php-PsrLog
+#
+# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve the changelog entries
+#
+
+%global github_owner     php-fig
+%global github_name      log
+%global github_version   1.1.4
+%global github_commit    d49695b909c3b7628b6289db5479a1c204601f11
+
+%global composer_vendor  psr
+%global composer_project log
+
+%{!?phpdir:  %global phpdir  %{_datadir}/php}
+
+Name:      php-PsrLog
+Version:   %{github_version}
+Release:   2%{?dist}
+Summary:   Common interface for logging libraries
+
+License:   MIT
+URL:       https://www.php-fig.org/psr/psr-3/
+Source0:   https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+
+BuildArch: noarch
+# For tests
+BuildRequires:  php-cli
+# Autoloader
+BuildRequires:  php-composer(fedora/autoloader)
+
+Requires:  php(language) >= 5.3.0
+# phpcompatinfo requires (computed from version 1.1.0)
+Requires:  php-date
+Requires:  php-pcre
+Requires:  php-spl
+# Autoloader
+Requires:  php-composer(fedora/autoloader)
+
+# php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT}
+Provides:  php-%{composer_vendor}-%{composer_project}           = %{version}-%{release}
+# Composer
+Provides:  php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+
+
+%description
+This package holds all interfaces/classes/traits related to PSR-3 1.
+
+Note that this is not a logger of its own. It is merely an interface that
+describes a logger. See the specification for more details.
+
+1 https://www.php-fig.org/psr/psr-3/
+
+
+%prep
+%setup -qn %{github_name}-%{github_commit}
+
+: Create autoloader
+cat <<'AUTOLOAD' | tee Psr/Log/autoload.php
+<?php
+/**
+ * Autoloader for %{name} and its' dependencies
+ * (created by %{name}-%{version}-%{release}).
+ *
+ * @return \Symfony\Component\ClassLoader\ClassLoader
+ */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Psr\\Log\\', __DIR__);
+AUTOLOAD
+
+
+%build
+# Empty build section, nothing to build
+
+
+%install
+mkdir -p %{buildroot}%{_datadir}/php
+cp -rp Psr %{buildroot}%{_datadir}/php/
+
+
+%check
+: Check if our autoloader works
+php -r '
+require "%{buildroot}%{_datadir}/php/Psr/Log/autoload.php";
+$a = new Psr\Log\NullLogger();
+echo "Ok\n";
+exit(0);
+'
+
+
+%files
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.md
+%doc composer.json
+%dir %{_datadir}/php/Psr
+     %{_datadir}/php/Psr/Log
+
+
+%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May  3 2021 Remi Collet <remi@remirepo.net> - 1.1.4-1
+- update to 1.1.4
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Mar 24 2020 Remi Collet <remi@remirepo.net> - 1.1.3-1
+- update to 1.1.3
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov  4 2019 Remi Collet <remi@remirepo.net> - 1.1.2-1
+- update to 1.1.2
+
+* Fri Oct 25 2019 Remi Collet <remi@remirepo.net> - 1.1.1-1
+- update to 1.1.1
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 1.1.0-1
+- update to 1.1.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-2
+- update to 1.0.2
+- switch from symfony/class-loader to fedora/autoloader
+- add minimal %%check for autoloader
+
+* Sun Sep 25 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.1-1
+- Updated to 1.0.1 (RHBZ #1377513)
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jan 20 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-9
+- Added php-{COMPOSER_VENDOR}-{COMPOSER_PROJECT} ("php-psr-log") virtual provide
+- %%license usage
+
+* Mon Nov 16 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-8
+- Added autoloader
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Jun 07 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-6
+- Replaced single-use %%composer_vendor and %%composer_project
+
+* Fri Jun 06 2014 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-5
+- Updated URL
+- Requires php-common => php(language)
+- Added php-composer(%%{composer_vendor}/%%{composer_project}) virtual provide
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Jan 22 2013 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.0.0-2
+- Updated URL
+- Added php-date require
+
+* Thu Jan 10 2013 Shawn Iwinski <shawn.iwiinski@gmail.com> - 1.0.0-1
+- Initial package

composer.json Added

php-PsrLog-1.1.4-d49695b909c3b7628b6289db5479a1c204601f11.tar.gz Added

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:...olab:Winterfell / phpunit to package Kolab:16:Testing / phpunit

phpunit.spec Added

@@ -0,0 +1,1083 @@
+# remirepo/fedora spec file for php-phpunit-PHPUnit
+#
+# Copyright (c) 2010-2021 Remi Collet
+# Copyright (c) 2006-2009 Christopher Stone
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please, preserve the changelog entries
+#
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
+%global gh_commit    b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c
+#global gh_date      20150927
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     sebastianbergmann
+%global gh_project   phpunit
+%global php_home     %{_datadir}/php
+%global pear_name    PHPUnit
+%global pear_channel pear.phpunit.de
+%global major        5.7
+%global minor        27
+
+Name:           php-phpunit-PHPUnit
+Version:        %{major}.%{minor}
+Release:        13%{?dist}
+Summary:        The PHP Unit Testing framework version 5
+
+License:        BSD
+URL:            https://github.com/%{gh_owner}/%{gh_project}
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+
+# Autoload template, from version 3.7
+Source2:        %{gh_project}-5.4.0-Autoload.php.in
+
+# Fix command for autoload
+Patch0:         %{gh_project}-rpm.patch
+# Minimal fix for PHP 8
+Patch1:         %{gh_project}-php8.patch
+
+BuildArch:      noarch
+BuildRequires:  php(language) >= 5.6
+BuildRequires:  %{_bindir}/phpab
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 1.4     with php-composer(phpunit/php-file-iterator) <  2)
+BuildRequires:  (php-composer(phpunit/php-text-template) >= 1.2     with php-composer(phpunit/php-text-template) <  2)
+BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 4.0.4   with php-composer(phpunit/php-code-coverage) <  5)
+BuildRequires:  (php-composer(phpunit/php-timer) >= 1.0.6           with php-composer(phpunit/php-timer) <  2)
+BuildRequires:  (php-composer(phpunit/phpunit-mock-objects) >= 3.2  with php-composer(phpunit/phpunit-mock-objects) <  4)
+BuildRequires:  (php-composer(phpspec/prophecy) >= 1.6.2            with php-composer(phpspec/prophecy) <  2)
+BuildRequires:  (php-composer(sebastian/comparator) >= 1.2.4        with php-composer(sebastian/comparator) <  2)
+BuildRequires:  (php-composer(sebastian/diff) >= 1.4.3              with php-composer(sebastian/diff) <  2)
+BuildRequires:  (php-composer(sebastian/environment) >= 1.3.4       with php-composer(sebastian/environment) <  3)
+BuildRequires:  (php-composer(sebastian/exporter) >= 2.0            with php-composer(sebastian/exporter) <  3)
+BuildRequires:  (php-composer(sebastian/global-state) >= 1.1        with php-composer(sebastian/global-state) <  2)
+BuildRequires:  (php-composer(sebastian/object-enumerator) >= 2.0   with php-composer(sebastian/object-enumerator) <  3)
+BuildRequires:  (php-composer(sebastian/resource-operations) >= 1.0 with php-composer(sebastian/resource-operations) <  2)
+BuildRequires:  (php-composer(sebastian/version) >= 2.0.1           with php-composer(sebastian/version) <  3)
+BuildRequires:  (php-composer(myclabs/deep-copy) >= 1.3             with php-composer(myclabs/deep-copy) <  2)
+BuildRequires:  (php-composer(phpunit/php-invoker) >= 1.1           with php-composer(phpunit/php-invoker) <  2)
+BuildRequires:  (php-composer(doctrine/instantiator) >= 1.0.4       with php-composer(doctrine/instantiator) <  2)
+BuildRequires:  (php-composer(sebastian/recursion-context) >= 2.0   with php-composer(sebastian/recursion-context) <  3)
+# remirepo:20
+%else
+BuildRequires:  php-phpunit-File-Iterator         >= 1.4
+BuildRequires:  php-phpunit-Text-Template         >= 1.2
+BuildRequires:  php-phpunit-PHP-CodeCoverage      >= 4.0.4
+BuildRequires:  php-phpunit-PHP-Timer             >= 1.0.6
+BuildRequires:  php-phpunit-PHPUnit-MockObject    >= 3.2
+BuildRequires:  php-phpspec-prophecy              >= 1.6.2
+BuildRequires:  php-phpunit-comparator            >= 1.2.4
+BuildRequires:  php-phpunit-diff                  >= 1.4.3
+BuildRequires:  php-phpunit-environment           >= 1.3.4
+BuildRequires:  php-phpunit-exporter
+BuildRequires:  php-sebastian-global-state        >= 1.1
+BuildRequires:  php-sebastian-object-enumerator
+BuildRequires:  php-sebastian-resource-operations
+BuildRequires:  php-phpunit-Version               >= 2.0.1
+BuildRequires:  php-myclabs-deep-copy             >= 1.3
+BuildRequires:  php-phpunit-PHP-Invoker           >= 1.1
+BuildRequires:  php-doctrine-instantiator         >= 1.0.4
+BuildRequires:  php-sebastian-recursion-context
+%endif
+BuildRequires:  php-symfony4-yaml
+# Autoloader
+BuildRequires:  php-composer(fedora/autoloader)
+
+# From composer.json, "require": {
+#        "php": "^5.6 || ^7.0",
+#        "phpunit/php-file-iterator": "~1.4",
+#        "phpunit/php-text-template": "~1.2",
+#        "phpunit/php-code-coverage": "^4.0.4",
+#        "phpunit/php-timer": "^1.0.6",
+#        "phpunit/phpunit-mock-objects": "^3.2",
+#        "phpspec/prophecy": "^1.6.2",
+#        "symfony/yaml": "~2.1|~3.0|~4.0",
+#        "sebastian/comparator": "^1.2.4",
+#        "sebastian/diff": "^1.4.3",
+#        "sebastian/environment": "^1.3.4 || ^2.0",
+#        "sebastian/exporter": "~2.0",
+#        "sebastian/global-state": "^1.1",
+#        "sebastian/object-enumerator": "~2.0",
+#        "sebastian/resource-operations": "~1.0",
+#        "sebastian/version": "^1.0.6|^2.0.1",
+#        "myclabs/deep-copy": "~1.3",
+#        "ext-dom": "*",
+#        "ext-json": "*",
+#        "ext-mbstring": "*",
+#        "ext-xml": "*",
+#        "ext-libxml": "*"
+Requires:       php(language) >= 5.6
+Requires:       php-cli
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:       (php-composer(phpunit/php-file-iterator) >= 1.4     with php-composer(phpunit/php-file-iterator) <  2)
+Requires:       (php-composer(phpunit/php-text-template) >= 1.2     with php-composer(phpunit/php-text-template) <  2)
+Requires:       (php-composer(phpunit/php-code-coverage) >= 4.0.4   with php-composer(phpunit/php-code-coverage) <  5)
+Requires:       (php-composer(phpunit/php-timer) >= 1.0.6           with php-composer(phpunit/php-timer) <  2)
+Requires:       (php-composer(phpunit/phpunit-mock-objects) >= 3.2  with php-composer(phpunit/phpunit-mock-objects) <  4)
+Requires:       (php-composer(phpspec/prophecy) >= 1.6.2            with php-composer(phpspec/prophecy) <  2)
+Requires:       (php-composer(sebastian/comparator) >= 1.2.4        with php-composer(sebastian/comparator) <  2)
+Requires:       (php-composer(sebastian/diff) >= 1.4.3              with php-composer(sebastian/diff) <  2)
+Requires:       (php-composer(sebastian/environment) >= 1.3.4       with php-composer(sebastian/environment) <  3)
+Requires:       (php-composer(sebastian/exporter) >= 2.0            with php-composer(sebastian/exporter) <  3)
+Requires:       (php-composer(sebastian/global-state) >= 1.1        with php-composer(sebastian/global-state) <  2)
+Requires:       (php-composer(sebastian/object-enumerator) >= 2.0   with php-composer(sebastian/object-enumerator) <  3)
+Requires:       (php-composer(sebastian/resource-operations) >= 1.0 with php-composer(sebastian/resource-operations) <  2)
+Requires:       (php-composer(sebastian/version) >= 2.0.1           with php-composer(sebastian/version) <  3)
+Requires:       (php-composer(myclabs/deep-copy) >= 1.3             with php-composer(myclabs/deep-copy) <  2)
+# Supported versions
+Recommends:      phpunit8
+Recommends:      phpunit9
+# remirepo:17
+%else
+Requires:       php-phpunit-File-Iterator         >= 1.4
+Requires:       php-phpunit-Text-Template         >= 1.2
+Requires:       php-phpunit-PHP-CodeCoverage      >= 4.0.4
+Requires:       php-phpunit-PHP-Timer             >= 1.0.6
+Requires:       php-phpunit-PHPUnit-MockObject    >= 3.2
+Requires:       php-phpspec-prophecy              >= 1.6.2
+Requires:       php-phpunit-comparator            >= 1.2.4
+Requires:       php-phpunit-diff                  >= 1.4.3
+Requires:       php-phpunit-environment           >= 1.3.4
+Requires:       php-phpunit-exporter
+Requires:       php-sebastian-global-state        >= 1.1
+Requires:       php-sebastian-object-enumerator
+Requires:       php-sebastian-resource-operations
+Requires:       php-phpunit-Version               >= 2.0.1
+Requires:       php-myclabs-deep-copy             >= 1.3
+%endif
+Requires:       php-symfony4-yaml
+Requires:       php-dom
+Requires:       php-json
+Requires:       php-mbstring
+Requires:       php-xml
+Requires:       php-libxml
+# From composer.json, "suggest": {
+#        "phpunit/php-invoker": "~1.1",
+#        "ext-xdebug": "*"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:       (php-composer(phpunit/php-invoker) >= 1.1           with php-composer(phpunit/php-invoker) <  2)
+# For our autoload patch
+Requires:       (php-composer(doctrine/instantiator) >= 1.0.4       with php-composer(doctrine/instantiator) <  2)
+Requires:       (php-composer(sebastian/recursion-context) >= 2.0   with php-composer(sebastian/recursion-context) <  3)
+# remirepo:5
+%else
+Requires:       php-phpunit-PHP-Invoker           >= 1.1
+Requires:       php-doctrine-instantiator         >= 1.0.4
+Requires:       php-sebastian-recursion-context
+%endif
+Requires:       php-composer(fedora/autoloader)
+# From phpcompatinfo report for version 5.6.0
+Requires:       php-reflection
+Requires:       php-openssl
+Requires:       php-pcntl
+Requires:       php-pcre
+Requires:       php-phar
+Requires:       php-spl
+
+
+Provides:       php-composer(phpunit/phpunit) = %{version}
+# For compatibility with PEAR mode
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
+# Package have been rename
+Obsoletes:      php-pear-PHPUnit < 4
+Provides:       php-pear-PHPUnit = %{version}-%{release}
+# Project
+Provides:       phpunit = %{version}-%{release}
+
+
+%description
+PHPUnit is a family of PEAR packages that supports the development of
+object-oriented PHP applications using the concepts and methods of Agile
+Software Development, Extreme Programming, Test-Driven Development and
+Design-by-Contract Development by providing an elegant and robust framework
+for the creation, execution and analysis of Unit Tests.
+
+This package provides the version 5 of PHPUnit,
+available using the phpunit command.
+
+This version have reached its end of life in Feb 2018,
+so consider using a supported version,
+see https://phpunit.de/supported-versions.html
+
+Documentation: https://phpunit.readthedocs.io/
+
+
+%prep
+%setup -q -n %{gh_project}-%{gh_commit}
+
+%patch0 -p1 -b .rpm
+# Restore PSR-0 tree
+mv src PHPUnit
+%patch1 -p1 -b .php8
+
+find . $ -name \*.rpm -o -name \*.php8 $ -delete -print
+
+
+
+%build
+%{_bindir}/phpab \
+  --output   PHPUnit/Autoload.php \
+  --template %{SOURCE2} \
+  PHPUnit
+
+%{_bindir}/phpab \
+  --output   tests/autoload.php \
+  --exclude  '*/BankAccountTest2.php' \
+  --exclude  '*/Regression/Trac/783/OneTest.php' \
+  tests
+
+
+%install
+mkdir -p       %{buildroot}%{php_home}
+cp -pr PHPUnit %{buildroot}%{php_home}/PHPUnit
+
+install -D -p -m 755 phpunit %{buildroot}%{_bindir}/phpunit
+
+
+%check
+OPT="--testsuite=small --no-coverage"
+
+ret=0
+for cmd in php php73 php74 php80; do
+   if which $cmd; then
+      $cmd ./phpunit $OPT --verbose
+   fi
+done
+exit $ret
+
+
+%post
+if  -x %{_bindir}/pear ; then
+   %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
+      %{pear_channel}/%{pear_name} >/dev/null || :
+fi
+
+
+%files
+%doc README.md composer.json ChangeLog-%{major}.md
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+
+%{_bindir}/phpunit
+%{php_home}/PHPUnit
+
+
+%changelog
+* Thu Mar 25 2021 Remi Collet <remi@remirepo.net> - 5.7.27-13
+- switch to Symfony 4
+
+* Thu Mar 25 2021 Remi Collet <remi@remirepo.net> - 5.7.27-12
+- recommend using a supported version
+
+* Fri Mar 19 2021 Remi Collet <remi@remirepo.net> - 5.7.27-11
+- add minimal fix for PHP 8
+
+* Mon Mar 18 2019 Remi Collet <remi@remirepo.net> - 5.7.27-6
+- improve package description
+
+* Tue Dec  4 2018 Remi Collet <remi@remirepo.net> - 5.7.27-4
+- cleanup for EL-8
+
+* Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 5.7.27-3
+- fix autoloader, restrict symfony to Yaml component
+
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 5.7.27-2
+- use package names on EL and Fedora < 27
+
+* Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 5.7.27-1
+- Update to 5.7.27
+- raise dependency on sebastian/version 2.0.1
+- undefine __brp_mangle_shebangs
+- use range dependencies on F27+
+
+* Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 5.7.26-1
+- Update to 5.7.26
+
+* Wed Nov 15 2017 Remi Collet <remi@remirepo.net> - 5.7.25-1
+- Update to 5.7.25
+
+* Sun Oct 15 2017 Remi Collet <remi@remirepo.net> - 5.7.23-1
+- Update to 5.7.23
+
+* Sun Sep 24 2017 Remi Collet <remi@remirepo.net> - 5.7.22-1
+- Update to 5.7.22
+
+* Sat Jun 24 2017 Remi Collet <remi@remirepo.net> - 5.7.21-1
+- Update to 5.7.21
+
+* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 5.7.20-1
+- Update to 5.7.20 (no change)
+- raise dependency on sebastian/diff 1.4.3
+
+* Mon Apr  3 2017 Remi Collet <remi@remirepo.net> - 5.7.19-1
+- Update to 5.7.19
+
+* Mon Mar 20 2017 Remi Collet <remi@remirepo.net> - 5.7.17-1
+- Update to 5.7.17
+
+* Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 5.7.16-1
+- Update to 5.7.16
+
+* Sat Mar  4 2017 Remi Collet <remi@remirepo.net> - 5.7.15-2
+- fix dependency on sebastian/recursion-context
+
+* Thu Mar  2 2017 Remi Collet <remi@remirepo.net> - 5.7.15-1
+- Update to 5.7.15
+
+* Sun Feb 19 2017 Remi Collet <remi@fedoraproject.org> - 5.7.14-1
+- update to 5.7.14
+
+* Fri Feb 10 2017 Remi Collet <remi@fedoraproject.org> - 5.7.13-1
+- update to 5.7.13
+
+* Wed Feb  8 2017 Remi Collet <remi@fedoraproject.org> - 5.7.12-1
+- update to 5.7.12
+
+* Tue Feb  7 2017 Remi Collet <remi@fedoraproject.org> - 5.7.11-2
+- add max version for some build dependencies
+- only allow Symfony 2
+- handle redirect to composer installed PHPUnit v6
+
+* Sun Feb  5 2017 Remi Collet <remi@fedoraproject.org> - 5.7.11-1
+- update to 5.7.11
+- raise dependency on sebastian/comparator 1.2.4
+- raise dependency on sebastian/global-state 1.1
+
+* Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 5.7.9-1
+- update to 5.7.9
+
+* Fri Jan 27 2017 Remi Collet <remi@fedoraproject.org> - 5.7.8-2
+- add upstream patch
+
+* Thu Jan 26 2017 Remi Collet <remi@fedoraproject.org> - 5.7.8-1
+- update to 5.7.8
+- temporary ignore testNoTestCases
+
+* Thu Jan 26 2017 Remi Collet <remi@fedoraproject.org> - 5.7.7-1
+- update to 5.7.7
+
+* Mon Jan 23 2017 Remi Collet <remi@fedoraproject.org> - 5.7.6-1
+- update to 5.7.6
+
+* Thu Dec 29 2016 Remi Collet <remi@fedoraproject.org> - 5.7.5-1
+- update to 5.7.5
+
+* Wed Dec 14 2016 Remi Collet <remi@fedoraproject.org> - 5.7.4-1
+- update to 5.7.4
+
+* Fri Dec  9 2016 Remi Collet <remi@fedoraproject.org> - 5.7.3-1
+- update to 5.7.3
+- raise dependency on phpspec/prophecy 1.6.2
+
+* Sun Dec  4 2016 Remi Collet <remi@fedoraproject.org> - 5.7.2-1
+- update to 5.7.2
+
+* Fri Dec  2 2016 Remi Collet <remi@fedoraproject.org> - 5.7.1-1
+- update to 5.7.1
+
+* Fri Dec  2 2016 Remi Collet <remi@fedoraproject.org> - 5.7.0-1
+- update to 5.7.0
+
+* Mon Nov 28 2016 Remi Collet <remi@fedoraproject.org> - 5.6.7-1
+- update to 5.6.7
+
+* Tue Nov 22 2016 Remi Collet <remi@fedoraproject.org> - 5.6.5-1
+- update to 5.6.5
+- raise dependency on sebastian/comparator 1.2.2
+- raise dependency on sebastian/exporter 2.0
+- raise dependency on sebastian/object-enumerator 2.0
+
+* Mon Nov 14 2016 Remi Collet <remi@fedoraproject.org> - 5.6.3-1
+- update to 5.6.3
+
+* Mon Oct 31 2016 Remi Collet <remi@fedoraproject.org> - 5.6.2-2
+- fix autoloader (don't use symfony one for symfony components)
+
+* Tue Oct 25 2016 Remi Collet <remi@fedoraproject.org> - 5.6.2-1
+- update to 5.6.2 (no change)
+- switch to fedora/autoloader
+
+* Fri Oct  7 2016 Remi Collet <remi@fedoraproject.org> - 5.6.1-1
+- update to 5.6.1
+
+* Fri Oct  7 2016 Remi Collet <remi@fedoraproject.org> - 5.6.0-1
+- update to 5.6.0
+- drop dependency on php-tidy
+
+* Mon Oct  3 2016 Remi Collet <remi@fedoraproject.org> - 5.5.7-1
+- Update to 5.5.7 (no change)
+- sources from github
+
+* Mon Oct  3 2016 Remi Collet <remi@fedoraproject.org> - 5.5.6-1
+- Update to 5.5.6
+- sources from a git snapshot
+
+* Wed Sep 21 2016 Remi Collet <remi@fedoraproject.org> - 5.5.5-1
+- Update to 5.5.5
+
+* Wed Aug 31 2016 Remi Collet <remi@fedoraproject.org> - 5.5.4-1
+- Update to 5.5.4
+
+* Fri Aug  5 2016 Remi Collet <remi@fedoraproject.org> - 5.5.0-1
+- Update to 5.5.0
+
+* Tue Jul 26 2016 Remi Collet <remi@fedoraproject.org> - 5.4.8-1
+- Update to 5.4.8 (no change)
+- raise dependency on phpunit/php-code-coverage >= 4.0.1
+
+* Thu Jul 21 2016 Remi Collet <remi@fedoraproject.org> - 5.4.7-1
+- Update to 5.4.7
+
+* Thu Jun 16 2016 Remi Collet <remi@fedoraproject.org> - 5.4.6-1
+- Update to 5.4.6 (no change)
+
+* Wed Jun 15 2016 Remi Collet <remi@fedoraproject.org> - 5.4.5-1
+- Update to 5.4.5
+
+* Thu Jun  9 2016 Remi Collet <remi@fedoraproject.org> - 5.4.4-1
+- Update to 5.4.4
+
+* Fri Jun  3 2016 Remi Collet <remi@fedoraproject.org> - 5.4.2-1
+- Update to 5.4.2
+
+* Fri Jun  3 2016 Remi Collet <remi@fedoraproject.org> - 5.4.0-1
+- Update to 5.4.0
+- raise dependency on phpunit/php-code-coverage >= 4.0
+- raise dependency on phpunit/phpunit-mock-objects >= 3.2
+
+* Wed May 11 2016 Remi Collet <remi@fedoraproject.org> - 5.3.4-1
+- Update to 5.3.4
+
+* Wed Apr 13 2016 Remi Collet <remi@fedoraproject.org> - 5.3.2-1
+- Update to 5.3.2
+
+* Thu Apr  7 2016 Remi Collet <remi@fedoraproject.org> - 5.3.1-1
+- Update to 5.3.1
+
+* Fri Apr  1 2016 Remi Collet <remi@fedoraproject.org> - 5.3.0-1
+- Update to 5.3.0
+- add dependency on sebastian/object-enumerator
+- raise dependency on phpunit/phpunit-mock-objects >= 3.1
+
+* Tue Mar 15 2016 Remi Collet <remi@fedoraproject.org> - 5.2.12-1
+- Update to 5.2.12
+
+* Mon Mar 14 2016 Remi Collet <remi@fedoraproject.org> - 5.2.11-1
+- Update to 5.2.11
+
+* Thu Mar  3 2016 Remi Collet <remi@fedoraproject.org> - 5.2.10-1
+- Update to 5.2.10
+- raise dependency on phpunit/php-code-coverage >= 3.3.0
+
+* Fri Feb 19 2016 Remi Collet <remi@fedoraproject.org> - 5.2.9-1
+- Update to 5.2.9
+
+* Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> - 5.2.8-1
+- Update to 5.2.8
+- raise dependency on phpunit/php-code-coverage >= 3.2.1
+
+* Tue Feb 16 2016 Remi Collet <remi@fedoraproject.org> - 5.2.6-1
+- Update to 5.2.6
+
+* Sat Feb 13 2016 Remi Collet <remi@fedoraproject.org> - 5.2.5-1
+- Update to 5.2.5
+- raise dependency on phpunit/php-code-coverage >= 3.2
+
+* Thu Feb 11 2016 Remi Collet <remi@fedoraproject.org> - 5.2.4-1
+- Update to 5.2.4
+- lower dependency on phpunit/php-code-coverage >= 3.0
+
+* Sun Feb  7 2016 Remi Collet <remi@fedoraproject.org> - 5.2.2-1
+- Update to 5.2.2
+
+* Fri Feb  5 2016 Remi Collet <remi@fedoraproject.org> - 5.2.1-1
+- Update to 5.2.1
+
+* Fri Feb  5 2016 Remi Collet <remi@fedoraproject.org> - 5.2.0-1
+- Update to 5.2.0
+- raise dependency on phpunit/php-code-coverage >= 3.1
+
+* Tue Feb  2 2016 Remi Collet <remi@fedoraproject.org> - 5.1.7-1
+- Update to 5.1.7
+
+* Fri Jan 29 2016 Remi Collet <remi@fedoraproject.org> - 5.1.6-1
+- Update to 5.1.6
+
+* Fri Jan 29 2016 Remi Collet <remi@fedoraproject.org> - 5.1.5-1
+- Update to 5.1.5
+
+* Mon Jan 11 2016 Remi Collet <remi@fedoraproject.org> - 5.1.4-1
+- Update to 5.1.4
+
+* Thu Dec 10 2015 Remi Collet <remi@fedoraproject.org> - 5.1.3-1
+- Update to 5.1.3
+- obsolete php-phpunit-PHPUnit-Selenium
+
+* Mon Dec  7 2015 Remi Collet <remi@fedoraproject.org> - 5.1.2-1
+- Update to 5.1.2
+
+* Thu Dec  3 2015 Remi Collet <remi@fedoraproject.org> - 5.1.0-1
+- Update to 5.1.0
+
+* Mon Nov 30 2015 Remi Collet <remi@fedoraproject.org> - 5.0.10-1
+- Update to 5.0.10
+- run test suite with both PHP 5 and 7 when available
+
+* Wed Nov 11 2015 Remi Collet <remi@fedoraproject.org> - 5.0.9-1
+- Update to 5.0.9
+
+* Fri Oct 23 2015 Remi Collet <remi@fedoraproject.org> - 5.0.8-1
+- Update to 5.0.8 (no change)
+
+* Thu Oct 22 2015 Remi Collet <remi@fedoraproject.org> - 5.0.7-1
+- Update to 5.0.7
+
+* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 5.0.6-1
+- Update to 5.0.6
+
+* Mon Oct 12 2015 Remi Collet <remi@fedoraproject.org> - 5.0.5-1
+- Update to 5.0.5
+
+* Wed Oct  7 2015 Remi Collet <remi@fedoraproject.org> - 5.0.4-1
+- Update to 5.0.4
+
+* Fri Oct  2 2015 Remi Collet <remi@fedoraproject.org> - 5.0.3-1
+- Update to 5.0.3 (no change)
+
+* Fri Oct  2 2015 Remi Collet <remi@fedoraproject.org> - 5.0.2-1
+- Update to 5.0.2
+
+* Tue Sep 29 2015 Remi Collet <remi@fedoraproject.org> - 5.0.0-0.1.20150927gite3b3f36
+- update to 5.0.0-dev
+- raise dependency on PHP >= 5.6
+- raise dependency on phpunit/php-code-coverage ~3.0
+- raise dependency on phpunit/phpunit-mock-objects ~3.0
+- add dependency on sebastian/resource-operations ~1.0
+- add dependency on myclabs/deep-copy ~1.3
+
+* Sun Sep 27 2015 Remi Collet <remi@fedoraproject.org> - 4.8.9-2
+- add --atleast-version command option, backported from 5.0
+
+* Mon Sep 21 2015 Remi Collet <remi@fedoraproject.org> - 4.8.9-1
+- Update to 4.8.9
+
+* Sun Sep 20 2015 Remi Collet <remi@fedoraproject.org> - 4.8.8-1
+- Update to 4.8.8
+
+* Mon Sep 14 2015 Remi Collet <remi@fedoraproject.org> - 4.8.7-1
+- Update to 4.8.7 (no change)
+
+* Tue Aug 25 2015 Remi Collet <remi@fedoraproject.org> - 4.8.6-1
+- Update to 4.8.6
+
+* Fri Aug 21 2015 Remi Collet <remi@fedoraproject.org> - 4.8.5-1
+- Update to 4.8.5 (no change)
+
+* Sat Aug 15 2015 Remi Collet <remi@fedoraproject.org> - 4.8.4-1
+- Update to 4.8.4
+
+* Mon Aug 10 2015 Remi Collet <remi@fedoraproject.org> - 4.8.3-1
+- Update to 4.8.3
+
+* Fri Aug  7 2015 Remi Collet <remi@fedoraproject.org> - 4.8.2-1
+- Update to 4.8.2
+
+* Fri Aug  7 2015 Remi Collet <remi@fedoraproject.org> - 4.8.1-1
+- Update to 4.8.1 (no change)
+
+* Fri Aug  7 2015 Remi Collet <remi@fedoraproject.org> - 4.8.0-1
+- Update to 4.8.0
+- raise dependency on sebastian/environment 1.3
+- rely on include_path for all dependencies
+- add Changelog in documentation
+
+* Mon Jul 13 2015 Remi Collet <remi@fedoraproject.org> - 4.7.7-1
+- Update to 4.7.7 (no change)
+
+* Tue Jun 30 2015 Remi Collet <remi@fedoraproject.org> - 4.7.6-1
+- Update to 4.7.6
+
+* Tue Jun 30 2015 Remi Collet <remi@fedoraproject.org> - 4.7.5-2
+- use $fedoraClassLoader autoloader
+
+* Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 4.7.5-1
+- Update to 4.7.5
+
+* Thu Jun 18 2015 Remi Collet <remi@fedoraproject.org> - 4.7.4-1
+- Update to 4.7.4
+- raise dependency on phpunit/php-timer >= 1.0.6
+
+* Thu Jun 11 2015 Remi Collet <remi@fedoraproject.org> - 4.7.3-1
+- Update to 4.7.3
+
+* Sun Jun  7 2015 Remi Collet <remi@fedoraproject.org> - 4.7.2-1
+- Update to 4.7.2
+
+* Fri Jun  5 2015 Remi Collet <remi@fedoraproject.org> - 4.7.1-1
+- Update to 4.7.1
+- raise dependency on phpunit/php-code-coverage ~2.1
+- improve autoloader
+
+* Wed Jun  3 2015 Remi Collet <remi@fedoraproject.org> - 4.6.10-1
+- Update to 4.6.10
+
+* Fri May 29 2015 Remi Collet <remi@fedoraproject.org> - 4.6.9-1
+- Update to 4.6.9
+
+* Thu May 28 2015 Remi Collet <remi@fedoraproject.org> - 4.6.8-1
+- Update to 4.6.8 (no change)
+
+* Tue May 26 2015 Remi Collet <remi@fedoraproject.org> - 4.6.7-3
+- ensure compatibility with SCL
+
+* Tue May 26 2015 Remi Collet <remi@fedoraproject.org> - 4.6.7-2
+- detect and redirect to composer installed version #1157910
+
+* Mon May 25 2015 Remi Collet <remi@fedoraproject.org> - 4.6.7-1
+- Update to 4.6.7 (no change)
+
+* Thu Apr 30 2015 Remi Collet <remi@fedoraproject.org> - 4.6.6-1
+- Update to 4.6.6
+
+* Wed Apr 29 2015 Remi Collet <remi@fedoraproject.org> - 4.6.5-1
+- Update to 4.6.5
+
+* Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 4.6.4-2
+- keep upstream shebang with /usr/bin/env (for SCL)
+
+* Mon Apr 13 2015 Remi Collet <remi@fedoraproject.org> - 4.6.4-1
+- Update to 4.6.4
+
+* Tue Apr  7 2015 Remi Collet <remi@fedoraproject.org> - 4.6.2-1
+- Update to 4.6.2
+
+* Fri Apr  3 2015 Remi Collet <remi@fedoraproject.org> - 4.6.1-1
+- Update to 4.6.1
+
+* Fri Apr  3 2015 Remi Collet <remi@fedoraproject.org> - 4.6.0-1
+- Update to 4.6.0
+- raise dependencies on file-iterator 1.4 and diff 1.2
+
+* Sun Mar 29 2015 Remi Collet <remi@fedoraproject.org> - 4.5.1-1
+- Update to 4.5.1
+
+* Fri Feb 13 2015 Remi Collet <remi@fedoraproject.org> - 4.5.0-1
+- Update to 4.5.0
+- add dependency on phpspec/prophecy
+- raise dependencies on sebastian/comparator >= 1.1,
+  sebastian/environment >= 1.2, sebastian/exporter >= 1.2
+  and doctrine/instantiator >= 1.0.4 (for autoloader file)
+
+* Tue Jan 27 2015 Remi Collet <remi@fedoraproject.org> - 4.4.5-1
+- Update to 4.4.5 (no change)
+
+* Tue Jan 27 2015 Remi Collet <remi@fedoraproject.org> - 4.4.4-2
+- add dependency on sebastian/recursion-context
+
+* Sun Jan 25 2015 Remi Collet <remi@fedoraproject.org> - 4.4.4-1
+- Update to 4.4.4
+
+* Sun Jan 18 2015 Remi Collet <remi@fedoraproject.org> - 4.4.2-1
+- Update to 4.4.2
+
+* Sun Dec 28 2014 Remi Collet <remi@fedoraproject.org> - 4.4.1-1
+- Update to 4.4.1
+
+* Fri Dec  5 2014 Remi Collet <remi@fedoraproject.org> - 4.4.0-1
+- Update to 4.4.0
+- add dependency on sebastian/global-state
+
+* Tue Nov 11 2014 Remi Collet <remi@fedoraproject.org> - 4.3.5-1
+- Update to 4.3.5
+- define date.timezone in phpunit command to avoid warning
+
+* Sat Oct 25 2014 Remi Collet <remi@fedoraproject.org> - 4.3.4-1
+- Update to 4.3.4
+- raise dependency on phpunit/php-file-iterator >= 1.3.2
+
+* Fri Oct 17 2014 Remi Collet <remi@fedoraproject.org> - 4.3.3-1
+- Update to 4.3.3
+
+* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 4.3.2-1
+- Update to 4.3.2
+
+* Wed Oct  8 2014 Remi Collet <remi@fedoraproject.org> - 4.3.1-2
+- new upstream patch for "no colors" patch
+- raise dependency on sebastian/environment >= 1.1
+
+* Mon Oct  6 2014 Remi Collet <remi@fedoraproject.org> - 4.3.1-1
+- Update to 4.3.1 (no change)
+
+* Mon Oct  6 2014 Remi Collet <remi@fedoraproject.org> - 4.3.0-2
+- only enable colors when output to a terminal (from 4.4)
+- open https://github.com/sebastianbergmann/phpunit/pull/1458
+
+* Fri Oct  3 2014 Remi Collet <remi@fedoraproject.org> - 4.3.0-1
+- Update to 4.3.0
+- drop dependencies on ocramius/instantiator and ocramius/lazy-map
+- add dependency on doctrine/instantiator
+- raise dependency on phpunit/phpunit-mock-objects >= 2.3
+
+* Sun Sep 14 2014 Remi Collet <remi@fedoraproject.org> - 4.2.6-1
+- Update to 4.2.6 (no change)
+
+* Sun Sep  7 2014 Remi Collet <remi@fedoraproject.org> - 4.2.5-1
+- Update to 4.2.5 (no change)
+
+* Sun Aug 31 2014 Remi Collet <remi@fedoraproject.org> - 4.2.4-1
+- Update to 4.2.4
+
+* Thu Aug 28 2014 Remi Collet <remi@fedoraproject.org> - 4.2.3-1
+- Update to 4.2.3
+
+* Mon Aug 18 2014 Remi Collet <remi@fedoraproject.org> - 4.2.2-1
+- Update to 4.2.2
+
+* Sun Aug 17 2014 Remi Collet <remi@fedoraproject.org> - 4.2.1-1
+- Update to 4.2.1
+
+* Mon Aug 11 2014 Remi Collet <remi@fedoraproject.org> - 4.2.0-1
+- Update to 4.2.0
+- raise dependency on phpunit/phpunit-mock-objects >= 2.2
+- add dependency on ocramius/instantiator, ocramius/lazy-map
+  and symfony/class-loader
+
+* Fri Jul 18 2014 Remi Collet <remi@fedoraproject.org> - 4.1.4-1
+- Update to 4.1.4
+- composer dependencies
+- add missing documentation and license
+
+* Fri Jun 13 2014 Remi Collet <remi@fedoraproject.org> - 4.1.3-1
+- Update to 4.1.3
+
+* Sat Jun  7 2014 Remi Collet <remi@fedoraproject.org> - 4.1.2-1
+- Update to 4.1.2 (no change)
+- improve test suite bootstraping
+- add composer provide
+
+* Mon May 26 2014 Remi Collet <remi@fedoraproject.org> - 4.1.1-1
+- Update to 4.1.1
+
+* Tue May  6 2014 Remi Collet <remi@fedoraproject.org> - 4.1.0-2
+- fix some autoload issues
+
+* Sat May  3 2014 Remi Collet <remi@fedoraproject.org> - 4.1.0-1
+- Update to 4.1.0
+
+* Wed Apr 30 2014 Remi Collet <remi@fedoraproject.org> - 4.0.18-2
+- cleanup pear registry
+
+* Tue Apr 29 2014 Remi Collet <remi@fedoraproject.org> - 4.0.18-1
+- update to 4.0.18
+- sources from github
+
+* Tue Apr 22 2014 Remi Collet <remi@fedoraproject.org> - 3.7.35-2
+- remove message about deprecated PEAR channel
+
+* Tue Apr 22 2014 Remi Collet <remi@fedoraproject.org> - 3.7.35-1
+- Update to 3.7.35
+
+* Sun Apr 06 2014 Remi Collet <remi@fedoraproject.org> - 3.7.34-1
+- Update to 3.7.34
+
+* Tue Feb 25 2014 Remi Collet <remi@fedoraproject.org> - 3.7.32-1
+- Update to 3.7.32 (no change)
+
+* Mon Feb 03 2014 Remi Collet <remi@fedoraproject.org> - 3.7.31-1
+- Update to 3.7.31 (no change)
+
+* Fri Jan 31 2014 Remi Collet <remi@fedoraproject.org> - 3.7.30-1
+- Update to 3.7.30
+
+* Wed Jan 15 2014 Remi Collet <remi@fedoraproject.org> - 3.7.29-1
+- Update to 3.7.29 (stable)
+
+* Thu Oct 17 2013 Remi Collet <remi@fedoraproject.org> - 3.7.28-1
+- Update to 3.7.28
+- add Spec license header
+- open https://github.com/sebastianbergmann/phpunit/issues/1029
+
+* Mon Sep 16 2013 Remi Collet <remi@fedoraproject.org> - 3.7.27-1
+- Update to 3.7.27 (no change)
+
+* Fri Sep 13 2013 Remi Collet <remi@fedoraproject.org> - 3.7.26-1
+- Update to 3.7.26 (no change)
+
+* Tue Sep 10 2013 Remi Collet <remi@fedoraproject.org> - 3.7.25-1
+- Update to 3.7.25 (no change)
+
+* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 3.7.24-1
+- Update to 3.7.24
+
+* Mon Aug 05 2013 Remi Collet <remi@fedoraproject.org> - 3.7.23-1
+- Update to 3.7.23
+- raise dependency on phpunit/PHP_Timer 1.0.4
+
+* Mon Jul 08 2013 Remi Collet <remi@fedoraproject.org> - 3.7.22-1
+- Update to 3.7.22
+
+* Fri May 24 2013 Remi Collet <remi@fedoraproject.org> - 3.7.21-1
+- Update to 3.7.21
+
+* Mon May 13 2013 Remi Collet <remi@fedoraproject.org> - 3.7.20-1
+- Update to 3.7.20
+
+* Mon Mar 25 2013 Remi Collet <remi@fedoraproject.org> - 3.7.19-1
+- Update to 3.7.19
+- requires pear.symfony.com/Yaml >= 2.0.0, <= 2.2.99
+
+* Fri Mar 08 2013 Remi Collet <remi@fedoraproject.org> - 3.7.18-1
+- Update to 3.7.18
+
+* Thu Mar 07 2013 Remi Collet <remi@fedoraproject.org> - 3.7.17-1
+- Update to 3.7.17
+
+* Wed Mar 06 2013 Remi Collet <remi@fedoraproject.org> - 3.7.16-1
+- Update to 3.7.16
+
+* Tue Mar 05 2013 Remi Collet <remi@fedoraproject.org> - 3.7.15-1
+- Update to 3.7.15
+
+* Thu Feb 14 2013 Remi Collet <remi@fedoraproject.org> - 3.7.14-1
+- Update to 3.7.14
+
+* Sun Jan 13 2013 Remi Collet <remi@fedoraproject.org> - 3.7.13-1
+- Version 3.7.13 (stable) - API 3.7.0 (stable)
+
+* Thu Jan 10 2013 Remi Collet <remi@fedoraproject.org> - 3.7.12-1
+- Version 3.7.12 (stable) - API 3.7.0 (stable)
+
+* Wed Jan  9 2013 Remi Collet <remi@fedoraproject.org> - 3.7.11-1
+- Version 3.7.11 (stable) - API 3.7.0 (stable)
+
+* Sun Dec  2 2012 Remi Collet <remi@fedoraproject.org> - 3.7.10-1
+- Version 3.7.10 (stable) - API 3.7.0 (stable)
+
+* Wed Nov 07 2012 Remi Collet <remi@fedoraproject.org> - 3.7.9-1
+- Version 3.7.9 (stable) - API 3.7.0 (stable)
+
+* Thu Oct 18 2012 Remi Collet <remi@fedoraproject.org> - 3.7.8-1
+- Version 3.7.8 (stable) - API 3.7.0 (stable)
+
+* Thu Oct 11 2012 Remi Collet <remi@fedoraproject.org> - 3.7.7-1
+- Version 3.7.7 (stable) - API 3.7.0 (stable)
+
+* Sun Oct  7 2012 Remi Collet <remi@fedoraproject.org> - 3.7.6-1
+- Version 3.7.6 (stable) - API 3.7.0 (stable)
+
+* Sat Oct  6 2012 Remi Collet <remi@fedoraproject.org> - 3.7.5-1
+- Version 3.7.5 (stable) - API 3.7.0 (stable)
+
+* Sat Oct  6 2012 Remi Collet <remi@fedoraproject.org> - 3.7.4-1
+- Version 3.7.4 (stable) - API 3.7.0 (stable)
+- add Conflicts for max version of PHP_CodeCoverage and PHPUnit_MockObject
+
+* Thu Sep 20 2012 Remi Collet <remi@fedoraproject.org> - 3.7.1-1
+- Version 3.7.1 (stable) - API 3.7.0 (stable)
+- raise dependencies: php 5.3.3, PHP_CodeCoverage 1.2.1,
+  PHP_Timer 1.0.2, Yaml 2.1.0 (instead of YAML from symfony 1)
+
+* Sat Aug 04 2012 Remi Collet <remi@fedoraproject.org> - 3.6.12-1
+- Version 3.6.12 (stable) - API 3.6.0 (stable)
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jun 07 2012 Remi Collet <remi@fedoraproject.org> - 3.6.11-1
+- Version 3.6.11 (stable) - API 3.6.0 (stable)
+
+* Fri Jan 27 2012 Remi Collet <remi@fedoraproject.org> - 3.6.10-1
+- Version 3.6.10 (stable) - API 3.6.0 (stable)
+- raise PHP_Invokers >= 1.1.0
+
+* Tue Jan 24 2012 Remi Collet <remi@fedoraproject.org> - 3.6.9-1
+- Version 3.6.9 (stable) - API 3.6.0 (stable)
+
+* Sat Jan 21 2012 Remi Collet <remi@fedoraproject.org> - 3.6.8-1
+- Version 3.6.8 (stable) - API 3.6.0 (stable)
+
+* Thu Jan 05 2012 Remi Collet <remi@fedoraproject.org> - 3.6.7-1
+- Version 3.6.7 (stable) - API 3.6.0 (stable)
+
+* Mon Jan 02 2012 Remi Collet <remi@fedoraproject.org> - 3.6.6-1
+- Version 3.6.6 (stable) - API 3.6.0 (stable)
+
+* Mon Dec 19 2011 Remi Collet <remi@fedoraproject.org> - 3.6.5-1
+- Version 3.6.5 (stable) - API 3.6.0 (stable)
+
+* Sat Nov 26 2011 Remi Collet <remi@fedoraproject.org> - 3.6.4-1
+- Version 3.6.4 (stable) - API 3.6.0 (stable)
+
+* Fri Nov 11 2011 Remi Collet <remi@fedoraproject.org> - 3.6.3-1
+- Version 3.6.3 (stable) - API 3.6.0 (stable)
+
+* Fri Nov 04 2011 Remi Collet <remi@fedoraproject.org> - 3.6.2-1
+- Version 3.6.2 (stable) - API 3.6.0 (stable)
+
+* Tue Nov 01 2011 Remi Collet <remi@fedoraproject.org> - 3.6.0-1
+- Version 3.6.0 (stable) - API 3.6.0 (stable)
+
+* Fri Aug 19 2011 Remi Collet <remi@fedoraproject.org> - 3.5.15-1
+- Version 3.5.15 (stable) - API 3.5.7 (stable)
+- raise PEAR dependency to 1.9.3
+
+* Fri Jun 10 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.14-1
+- Version 3.5.14 (stable) - API 3.5.7 (stable)
+
+* Tue May  3 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.13-2
+- rebuild for doc in /usr/share/doc/pear
+
+* Tue Mar  8 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.13-1
+- Version 3.5.13 (stable) - API 3.5.7 (stable)
+- remove PEAR hack (only needed for EPEL)
+- raise PEAR dependency to 1.9.2
+- remove duplicate dependency (YAML)
+
+* Thu Feb 24 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.12-1
+- Version 3.5.12 (stable) - API 3.5.7 (stable)
+
+* Wed Feb 16 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.11-1
+- Version 3.5.11 (stable) - API 3.5.7 (stable)
+- new dependency on php-pear(XML_RPC2)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan 20 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.10-1
+- Version 3.5.10 (stable) - API 3.5.7 (stable)
+
+* Tue Jan 18 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.9-1
+- Version 3.5.9 (stable) - API 3.5.7 (stable)
+
+* Tue Jan 11 2011 Remi Collet <Fedora@famillecollet.com> - 3.5.7-1
+- Version 3.5.7 (stable) - API 3.5.7 (stable)
+- README, CHANGELOG and LICENSE are now in the tarball
+
+* Mon Dec 20 2010 Remi Collet <Fedora@famillecollet.com> - 3.5.6-1
+- Version 3.5.6 (stable) - API 3.5.4 (stable)
+- move README.mardown to README (was Changelog, now links to doc)
+- add CHANGELOG
+- not more doc provided by upstream
+
+* Mon Nov 22 2010 Remi Collet <Fedora@famillecollet.com> - 3.5.5-1
+- Version 3.5.5 (stable) - API 3.5.4 (stable)
+
+* Wed Nov 17 2010 Remi Collet <Fedora@famillecollet.com> - 3.5.4-1
+- Version 3.5.4 (stable) - API 3.5.4 (stable)
+
+* Wed Oct 27 2010 Remi Collet <Fedora@famillecollet.com> - 3.5.3-1
+- Update to 3.5.3
+- new requires and new packages for extensions of PHPUnit
+  PHPUnit_MockObject, PHPUnit_Selenium, DbUnit
+- lower PEAR dependency to allow el6 build
+- define timezone during build
+
+* Thu Jul 22 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.15-1
+- Update to 3.4.15
+
+* Sat Jun 19 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.14-1
+- Update to 3.4.14
+
+* Sat May 22 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.13-1
+- Update to 3.4.13
+- add README.markdown (Changelog)
+
+* Wed Apr 07 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.12-1
+- Update to 3.4.12
+
+* Thu Feb 18 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.11-1.1
+- Update to 3.4.11
+
+* Wed Feb 10 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.10-1
+- Update to 3.4.10
+
+* Sun Jan 24 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.9-1
+- Update to 3.4.9
+
+* Sat Jan 16 2010 Remi Collet <Fedora@famillecollet.com> - 3.4.7-1
+- Update to 3.4.7
+- rename from php-pear-PHPUnit to php-phpunit-PHPUnit
+- update dependencies (PEAR 1.8.1, YAML, php-soap)
+
+* Sat Sep 12 2009 Christopher Stone <chris.stone@gmail.com> 3.3.17-1
+- Upstream sync
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May 02 2009 Remi Collet <Fedora@famillecollet.com> - 3.3.16-1
+- Upstream sync
+- Fix requires (remove hint) and raise PEAR version to 1.7.1
+- rename %%{pear_name}.xml to %%{name}.xml
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov  8 2008 Christopher Stone <chris.stone@gmail.com> 3.3.4-1
+- Upstream sync
+
+* Thu Oct 23 2008 Christopher Stone <chris.stone@gmail.com> 3.3.2-1
+- Upstream sync
+- Remove no longer needed Obsolete/Provides
+
+* Thu Oct 09 2008 Christopher Stone <chris.stone@gmail.com> 3.3.1-1
+- Upstream sync
+
+* Thu Oct 09 2008 Christopher Stone <chris.stone@gmail.com> 3.2.21-1
+- Upstream sync
+- Add php-xml to Requires (bz #464758)
+
+* Thu May 22 2008 Christopher Stone <chris.stone@gmail.com> 3.2.19-1
+- Upstream sync
+
+* Thu Feb 21 2008 Christopher Stone <chris.stone@gmail.com> 3.2.15-1
+- Upstream sync
+
+* Wed Feb 13 2008 Christopher Stone <chris.stone@gmail.com> 3.2.13-1
+- Upstream sync
+
+* Sun Nov 25 2007 Christopher Stone <chris.stone@gmail.com> 3.2.1-1
+- Upstream sync
+
+* Sat Sep 08 2007 Christopher Stone <chris.stone@gmail.com> 3.1.8-1
+- Upstream sync
+
+* Sun May 06 2007 Christopher Stone <chris.stone@gmail.com> 3.0.6-1
+- Upstream sync
+
+* Thu Mar 08 2007 Christopher Stone <chris.stone@gmail.com> 3.0.5-3
+- Fix testdir
+- Fix Provides version
+
+* Wed Mar 07 2007 Christopher Stone <chris.stone@gmail.com> 3.0.5-2
+- Add Obsoletes/Provides for php-pear(PHPUnit2)
+- Requires php-pear(PEAR) >= 1.5.0
+- Own %%{pear_testdir}/%%{pear_name}
+- Remove no longer needed manual channel install
+- Simplify %%doc
+- Only unregister old phpunit on upgrade
+
+* Mon Feb 26 2007 Christopher Stone <chris.stone@gmail.com> 3.0.5-1
+- Upstream sync
+
+* Wed Feb 21 2007 Christohper Stone <chris.stone@gmail.com> 3.0.4-1
+- Upstream sync
+
+* Mon Jan 29 2007 Christopher Stone <chris.stone@gmail.com> 3.0.3-1
+- Upstream sync
+
+* Sun Jan 14 2007 Christopher Stone <chris.stone@gmail.com> 3.0.2-1
+- Upstream sync
+
+* Fri Jan 05 2007 Christopher Stone <chris.stone@gmail.com> 3.0.1-1
+- Upstream sync
+
+* Wed Dec 27 2006 Christopher Stone <chris.stone@gmail.com> 3.0.0-1
+- Initial Release

phpunit-php8.patch Added

@@ -0,0 +1,68 @@
+diff -up ./PHPUnit/Framework/TestCase.php.php8 ./PHPUnit/Framework/TestCase.php
+--- ./PHPUnit/Framework/TestCase.php.php8	2021-03-19 12:29:00.122960437 +0100
++++ ./PHPUnit/Framework/TestCase.php	2021-03-19 12:29:16.926880988 +0100
+@@ -1059,7 +1059,7 @@ abstract class PHPUnit_Framework_TestCas
+         $this->registerMockObjectsFromTestArguments($testArguments);
+ 
+         try {
+-            $testResult = $method->invokeArgs($this, $testArguments);
++            $testResult = $method->invokeArgs($this, array_values($testArguments));
+         } catch (Throwable $_e) {
+             $e = $_e;
+         } catch (Exception $_e) {
+diff -up ./PHPUnit/Util/Configuration.php.php8 ./PHPUnit/Util/Configuration.php
+--- ./PHPUnit/Util/Configuration.php.php8	2018-02-01 06:50:59.000000000 +0100
++++ ./PHPUnit/Util/Configuration.php	2021-03-19 12:28:10.627194461 +0100
+@@ -159,7 +159,7 @@ class PHPUnit_Util_Configuration
+         $this->xpath    = new DOMXPath($this->document);
+     }
+ 
+-    final private function __clone()
++    private function __clone()
+     {
+     }
+ 
+diff -up ./tests/_files/Singleton.php.php8 ./tests/_files/Singleton.php
+--- ./tests/_files/Singleton.php.php8	2018-02-01 06:50:59.000000000 +0100
++++ ./tests/_files/Singleton.php	2021-03-19 12:28:10.627194461 +0100
+@@ -7,7 +7,7 @@ class Singleton
+     {
+     }
+ 
+-    final private function __clone()
++    private function __clone()
+     {
+     }
+ 
+diff -up ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php.php8 ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
+--- ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php.php8	2018-02-01 06:50:59.000000000 +0100
++++ ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php	2021-03-19 12:28:10.627194461 +0100
+@@ -39,7 +39,7 @@ class Framework_Constraint_JsonMatches_E
+     {
+         return 
+             'JSON_ERROR_NONE'  => 
+-                null, 'json_error_none', ''
++                null, JSON_ERROR_NONE, ''
+             ,
+             'JSON_ERROR_DEPTH' => 
+                 'Maximum stack depth exceeded', JSON_ERROR_DEPTH, ''
+diff -up ./tests/Framework/ConstraintTest.php.php8 ./tests/Framework/ConstraintTest.php
+--- ./tests/Framework/ConstraintTest.php.php8	2018-02-01 06:50:59.000000000 +0100
++++ ./tests/Framework/ConstraintTest.php	2021-03-19 12:28:10.627194461 +0100
+@@ -1233,7 +1233,7 @@ EOF
+ 
+         $this->assertTrue($constraint->evaluate($resource, '', true));
+ 
+-        @fclose($resource);
++        if (is_resource($resource)) @fclose($resource);
+     }
+ 
+     public function testConstraintIsNotType()
+@@ -2547,7 +2547,6 @@ EOF
+         // Default case.
+         $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
+ 
+-        $this->assertTrue($constraint->evaluate(0, '', true));
+         $this->assertTrue($constraint->evaluate(true, '', true));
+     }
+

phpunit-rpm.patch Added

@@ -0,0 +1,62 @@
+diff -up ./phpunit.rpm ./phpunit
+--- ./phpunit.rpm	2017-02-05 16:31:31.000000000 +0100
++++ ./phpunit	2017-02-07 11:56:09.174850687 +0100
+@@ -27,26 +27,27 @@ if (!ini_get('date.timezone')) {
+     ini_set('date.timezone', 'UTC');
+ }
+ 
+-foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+-    if (file_exists($file)) {
+-        define('PHPUNIT_COMPOSER_INSTALL', $file);
+-
+-        break;
+-    }
++// Ensure correct include_path for RHSCL
++$inc = get_include_path();
++$dirs = explode(':', $inc);
++if (!in_array('/usr/share/php', $dirs)) {
++    $dirs = '/usr/share/php';
++    set_include_path(implode(':', $dirs));
+ }
++unset ($inc, $dirs);
+ 
+-unset($file);
+-
+-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+-    fwrite(STDERR,
+-        'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL .
+-        '    composer install' . PHP_EOL . PHP_EOL .
+-        'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL
+-    );
+-
+-    die(1);
++// Libraries PATH
++if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
++    echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
++    define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
++} else {
++    define ('PHPUNIT_COMPOSER_INSTALL', stream_resolve_include_path('PHPUnit/Autoload.php'));
+ }
+ 
+ require PHPUNIT_COMPOSER_INSTALL;
+ 
+-PHPUnit_TextUI_Command::main();
++if (class_exists('PHPUnit_TextUI_Command')) {
++    PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
++} else {
++    PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
++}
+diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
+--- ./tests/bootstrap.php.rpm	2017-02-05 16:31:31.000000000 +0100
++++ ./tests/bootstrap.php	2017-02-07 11:49:35.123108015 +0100
+@@ -1,6 +1,9 @@
+ <?php
+ // Needed for isolated tests
+-require __DIR__ . '/../vendor/autoload.php';
++require_once __DIR__ . '/_files/CoveredFunction.php';
++require_once __DIR__ . '/../PHPUnit/Framework/Assert/Functions.php';
++require_once __DIR__ . '/../PHPUnit/Autoload.php';
++require_once __DIR__ . '/autoload.php';
+ 
+ ini_set('precision', 14);
+ ini_set('serialize_precision', 14);

php-phpunit-PHPUnit-5.7.27-b7803ae.tar.gz Added

phpunit-5.4.0-Autoload.php.in Added

@@ -0,0 +1,49 @@
+<?php
+/* Autoloader for phpunit/phpunit and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once 'Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+    array(
+        ___CLASSLIST___
+    ),
+    __DIR__
+);
+
+$sym = (getenv('RPM_SYMFONY_TREE') ?: 'Symfony4');
+/* don't use symfony autoloader which pull some unwanted stuff (polyfill) */
+$vendorDir = stream_resolve_include_path("$sym/Component/Yaml/Yaml.php");
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Yaml\\', dirname($vendorDir));
+
+/* Required */
+require_once 'File/Iterator/Autoload.php';
+require_once 'SebastianBergmann/CodeCoverage/autoload.php';
+require_once 'PHP/Timer/Autoload.php';
+require_once 'PHPUnit/Framework/MockObject/Autoload.php';
+require_once 'Text/Template/Autoload.php';
+require_once 'PHP/Invoker/Autoload.php';
+require_once 'SebastianBergmann/Diff/autoload.php';
+require_once 'SebastianBergmann/Environment/autoload.php';
+require_once 'SebastianBergmann/Exporter/autoload.php';
+require_once 'SebastianBergmann/Version/autoload.php';
+require_once 'SebastianBergmann/Comparator/autoload.php';
+require_once 'SebastianBergmann/GlobalState/autoload.php';
+require_once 'SebastianBergmann/ObjectEnumerator/autoload.php';
+require_once 'Doctrine/Instantiator/autoload.php';
+require_once 'Prophecy/autoload.php';
+require_once 'SebastianBergmann/ResourceOperations/autoload.php';
+require_once 'DeepCopy/autoload.php';
+
+/* Optional */
+foreach(
+            'PHPUnit/Extensions/Database/Autoload.php',
+            'PHPUnit/Extensions/SeleniumCommon/Autoload.php',
+            'PHPUnit/Extensions/SeleniumTestCase/Autoload.php',
+            'PHPUnit/Extensions/Story/Autoload.php'
+         as $opt) {
+    if ($fic = stream_resolve_include_path($opt)) {
+        require_once $fic;
+    }
+}

Build Results
RPM Lint

Refresh

Submit package home:mollekopf:...olab:Winterfell / pykolab to package Kolab:16:Testing / pykolab

pykolab.spec Changed

@@ -2,11 +2,19 @@
 #!BuildIgnore:  systemd
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global py2 2
+%if 0%{?rhel} >= 8
+%global use_python3 1
+%endif
+
+%if 0%{?use_python3}
+%global py2or3_suffix 3
+%global py3ornone_suffix 3
+%global __python %{__python3}
+%else
+%global py2or3_suffix 2
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %endif
 
-%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6
 %global with_systemd 1
@@ -31,6 +39,17 @@
 %global kolabr_group kolab-r
 %global kolabr_group_id 414
 
+
+%if 0%{?suse_version}
+%global pythonmysql python-mysql
+%else
+%if 0%{?use_python3}
+%global pythonmysql python3-PyMySQL
+%else
+%global pythonmysql MySQL-python
+%endif
+%endif
+
 Summary:            Kolab Groupware Solution
 Name:               pykolab
 Version:            0.8.23
@@ -55,44 +74,40 @@
 BuildRequires:      future
 %endif
 
+
 BuildRequires:      gcc
 BuildRequires:      gettext
 BuildRequires:      glib2-devel
 BuildRequires:      intltool
-
-%if 0%{?suse_version}
-BuildRequires:      python-mysql
-%else
-BuildRequires:      MySQL-python
-%endif
-
-BuildRequires:      python%{?py2}
-BuildRequires:      python%{?py2}-augeas
-BuildRequires:      python%{?py2}-gnupg
-BuildRequires:      python%{?py2}-icalendar
-BuildRequires:      python%{?py2}-kolab >= 2.0
-BuildRequires:      python%{?py2}-kolabformat
-BuildRequires:      python%{?py2}-ldap
-BuildRequires:      python%{?py2}-nose
-BuildRequires:      python%{?py2}-pep8
-BuildRequires:      python%{?py2}-pyasn1
-BuildRequires:      python%{?py2}-pyasn1-modules
+BuildRequires:      %{pythonmysql}
+BuildRequires:      python%{?py3ornone_suffix}
+BuildRequires:      python%{?py3ornone_suffix}-gnupg
+BuildRequires:      python%{?py3ornone_suffix}-icalendar
+BuildRequires:      python%{?py3ornone_suffix}-ldap
+BuildRequires:      python%{?py3ornone_suffix}-augeas
+BuildRequires:      python%{?py3ornone_suffix}-kolab >= 2.0
+BuildRequires:      python%{?py3ornone_suffix}-kolabformat
+BuildRequires:      python%{?py3ornone_suffix}-sqlalchemy
+BuildRequires:      python%{?py3ornone_suffix}-tzlocal
+BuildRequires:      python%{?py2or3_suffix}-nose
+BuildRequires:      python%{?py2or3_suffix}-pyasn1
+BuildRequires:      python%{?py2or3_suffix}-pyasn1-modules
 %if 0%{?rhel} < 8 && 0%{?fedora} < 1
 BuildRequires:      pytz
 %else
-BuildRequires:      python%{?py2}-pytz
+BuildRequires:      python%{?py2or3_suffix}-pytz
+%endif
+BuildRequires:      python%{?py2or3_suffix}-six
+%if 0%{?use_python3} < 1
+#FIXME only used for unittests
+BuildRequires:      python-twisted-core
 %endif
-BuildRequires:      python%{?py2}-sievelib
-BuildRequires:      python%{?py2}-six
-BuildRequires:      python%{?py2}-sqlalchemy
-BuildRequires:      python%{?py2}-twisted-core
-BuildRequires:      python%{?py2}-tzlocal
 
 Requires:           kolab-cli = %{version}-%{release}
-Requires:           python%{?py2}-ldap >= 2.4
-Requires:           python%{?py2}-pyasn1
-Requires:           python%{?py2}-pyasn1-modules
-Requires:           python%{?py2}-six
+Requires:           python%{?py3ornone_suffix}-ldap >= 2.4
+Requires:           python%{?py2or3_suffix}-pyasn1
+Requires:           python%{?py2or3_suffix}-pyasn1-modules
+Requires:           python%{?py2or3_suffix}-six
 Requires(pre):      /usr/sbin/useradd
 Requires(pre):      /usr/sbin/usermod
 Requires(pre):      /usr/sbin/groupadd
@@ -140,10 +155,10 @@
 Summary:            Kolab XML format wrapper for %{name}
 Group:              Applications/System
 Requires:           %{name} = %{version}-%{release}
-Requires:           python-icalendar
-Requires:           python-kolab
-Requires:           python-kolabformat >= 0.5
-Requires:           python-tzlocal
+Requires:           python{?py3ornone_suffix}-icalendar
+Requires:           python{?py3ornone_suffix}-kolab
+Requires:           python{?py3ornone_suffix}-kolabformat >= 0.5
+Requires:           python{?py3ornone_suffix}-tzlocal
 
 %description xml
 Kolab Format XML bindings wrapper for %{name}
@@ -155,9 +170,9 @@
 Summary:            Kolab CLI components
 Group:              Applications/System
 Requires:           %{name} = %{version}-%{release}
-Requires:           python-augeas
-Requires:           python-cheetah
-Requires:           python-sqlalchemy
+Requires:           python{?py3ornone_suffix}-augeas
+Requires:           python{?py3ornone_suffix}-sqlalchemy
+Requires:           python{?py2or3_suffix}-cheetah
 
 %description -n kolab-cli
 Kolab CLI utilities
@@ -171,7 +186,7 @@
 Requires:           %{name} = %{version}-%{release}
 Requires:           cyrus-sasl
 Requires:           cyrus-sasl-plain
-Requires:           python-sqlalchemy
+Requires:           python{?py3ornone_suffix}-sqlalchemy
 
 %description -n kolab-saslauthd
 Kolab SASL Authentication Daemon for multi-domain, multi-authn database deployments
@@ -198,12 +213,12 @@
 %endif
 Requires:           postfix
 Requires:           %{name} = %{version}-%{release}
-Requires:           python-sqlalchemy
-%if 0%{?suse_version}
-Requires:           python-mysql
+%if 0%{?use_python3}
+Requires:           python3-sqlalchemy
 %else
-Requires:           MySQL-python
+Requires:           python-sqlalchemy
 %endif
+Requires:           %{pythonmysql}
 
 %description -n postfix-kolab
 Kolab SMTP Access Policy for Postfix
@@ -215,15 +230,11 @@
 Summary:            Kolab Content-Filter
 Group:              Applications/System
 Requires:           %{name} = %{version}-%{release}
-Requires:           python-sqlalchemy
-%if 0%{?suse_version}
-Requires:           python-mysql
-%else
-Requires:           MySQL-python
-%endif
-Requires:           python-gnupg
-Requires:           python-icalendar >= 3.0
-Requires:           python-tzlocal
+Requires:           python{?py3ornone_suffix}-sqlalchemy
+Requires:           python{?py3ornone_suffix}-tzlocal
+Requires:           %{pythonmysql}
+Requires:           python{?py3ornone_suffix}-gnupg
+Requires:           python{?py3ornone_suffix}-icalendar >= 3.0
 Requires:           %{name}-xml = %{version}-%{release}
 
 %description -n wallace
@@ -232,8 +243,21 @@
 %prep
 %setup -q
 
+%if 0%{?use_python3}
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' kolabd.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' saslauthd.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' conf.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' setup-kolab.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' wallace.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' kolab-cli.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' bin/kolab_parse_telemetry.py
+sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' bin/kolab_smtp_access_policy.py
+%endif
+
+
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
+
 %configure
 
 %install
@@ -401,7 +425,7 @@
 fi
 
 %check
-nosetests -v tests/unit/ ||:
+nosetests -v tests/unit/ || :
 
 %clean
 rm -rf %{buildroot}
@@ -413,11 +437,16 @@
 %attr(0750,kolab-n,kolab) %dir %{_sysconfdir}/kolab
 %attr(0640,kolab-n,kolab) %config(noreplace) %{_sysconfdir}/kolab/kolab.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
+
 %dir %{python_sitelib}/pykolab/
 %exclude %{python_sitelib}/pykolab/telemetry.*
 %{python_sitelib}/pykolab/*.py
 %{python_sitelib}/pykolab/*.pyc
 %{python_sitelib}/pykolab/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/__pycache__/
+%endif
 %{python_sitelib}/pykolab/auth/
 %{python_sitelib}/pykolab/conf/
 %{python_sitelib}/pykolab/imap/
@@ -426,6 +455,9 @@
 %{python_sitelib}/pykolab/plugins/*.py
 %{python_sitelib}/pykolab/plugins/*.pyc
 %{python_sitelib}/pykolab/plugins/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/plugins/__pycache__/
+%endif
 %{python_sitelib}/pykolab/plugins/defaultfolders
 %{python_sitelib}/pykolab/plugins/dynamicquota
 %{python_sitelib}/pykolab/plugins/recipientpolicy
@@ -434,6 +466,11 @@
 %exclude %{python_sitelib}/kolab/
 %endif
 %{python_sitelib}/cyruslib.py*
+%if 0%{?use_python3}
+%pycached %{python_sitelib}/cyruslib.py
+%endif
+
+
 %attr(0775,kolab,kolab-n) %dir %{_localstatedir}/lib/kolab/
 %attr(0775,kolab,kolab-n) %dir %{_localstatedir}/log/kolab/
 
@@ -450,6 +487,9 @@
 %{python_sitelib}/pykolab/xml/*.py
 %{python_sitelib}/pykolab/xml/*.pyc
 %{python_sitelib}/pykolab/xml/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/xml/__pycache__/
+%endif
 
 %files -n kolab-cli
 %defattr(-,root,root,-)
@@ -468,14 +508,24 @@
 %{python_sitelib}/pykolab/cli/wap/*.py
 %{python_sitelib}/pykolab/cli/wap/*.pyc
 %{python_sitelib}/pykolab/cli/wap/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/cli/wap/__pycache__/
+%{python_sitelib}/pykolab/cli/__pycache__/
+%endif
 %dir %{python_sitelib}/pykolab/setup/
 %{python_sitelib}/pykolab/setup/*.py
 %{python_sitelib}/pykolab/setup/*.pyc
 %{python_sitelib}/pykolab/setup/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/setup/__pycache__/
+%endif
 %dir %{python_sitelib}/pykolab/wap_client/
 %{python_sitelib}/pykolab/wap_client/*.py
 %{python_sitelib}/pykolab/wap_client/*.pyc
 %{python_sitelib}/pykolab/wap_client/*.pyo
+%if 0%{?use_python3}
+%{python_sitelib}/pykolab/wap_client/__pycache__/
+%endif
 
 %files -n kolab-saslauthd
 %defattr(-,root,root,-)
@@ -567,6 +617,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Tue Aug  2 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.8.23-2
+- Python3 support on centos 8
+
 * Tue Feb  8 2022 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 0.8.23-1
 - Release of version 0.8.23

Build Results
RPM Lint

Refresh

Submit package home:mollek...:Winterfell / python-sievelib to package Kolab:16:Testing / python-sievelib

python-sievelib.spec Changed

@@ -1,107 +1,162 @@
-%if 0%{?fedora}
-%global with_python3 1
-%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version:3)")}
-%else
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%endif
-
-Name:           python-sievelib
-Version:        0.5.2
-Release:        2%{?dist}
-Summary:        Managesieve library in Python
-
-Group:          Development/Tools
-
-License:        BSD
-URL:            http://kolab.org/about/python-sievelib/
-Source0:        sievelib-%{version}.tar.gz
-
+%global srcname sievelib
+%global _description\
+Client-side Sieve and Managesieve library written in Python.\
+* Sieve : An Email Filtering Language (RFC 5228).\
+* ManageSieve : A Protocol for Remotely Managing Sieve Scripts (RFC 5804).
+
+Name:           python-%{srcname}
+Version:        1.2.1
+Release:        5%{?dist}
+Summary:        Client-side SIEVE library
+License:        MIT
+URL:            https://github.com/tonioo/sievelib
+Source0:        %{pypi_source}
 BuildArch:      noarch
-%if 0%{?suse_version}
-BuildRequires:  python-devel >= 2.4
-%else
-BuildRequires:  python2-devel >= 2.4
-%endif
-BuildRequires:  python-setuptools
-
-%if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-docutils
-BuildRequires:  python3-jinja2
-BuildRequires:  python3-pygments
+BuildRequires:  python3-setuptools_scm
 BuildRequires:  python3-nose
-%endif # with_python3
-
-%description
-Client-side Sieve and Managesieve library written in Python.
+BuildRequires:  python3-six
+BuildRequires:  python3-future
+BuildRequires:  python3-pip
 
-* Sieve : An Email Filtering Language
-  (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
-* ManageSieve : A Protocol for Remotely Managing Sieve Scripts
-  (`Draft <http://tools.ietf.org/html/draft-martin-managesieve-12>`_)
+%description %_description
 
-%if 0%{?with_python3}
-%package -n     python3-sievelib
-Summary:        Managesieve library in Python
-Group:          Development/Tools
+%package -n python3-%{srcname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{srcname}}
 
-%description -n python3-sievelib
+%description -n python3-%{srcname}
 Client-side Sieve and Managesieve library written in Python.
-
-* Sieve : An Email Filtering Language
-  (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
-* ManageSieve : A Protocol for Remotely Managing Sieve Scripts
-  (`Draft <http://tools.ietf.org/html/draft-martin-managesieve-12>`_)
-%endif # with_python3
+* Sieve : An Email Filtering Language (RFC 5228)
+* ManageSieve : A Protocol for Remotely Managing Sieve Scripts (RFC 5804)
 
 %prep
-%setup -q -n sievelib-%{version}
-
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
+%autosetup -n %{srcname}-%{version}
+# remove bundled egg-info
+rm -rf %{srcname}.egg-info
 
 %build
-%{__python} setup.py build
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
+%py3_build
 
 %install
-rm -rf %{buildroot}
+%py3_install
 
-# Must do the python3 install first because the scripts in /usr/bin are
-# overwritten with every setup.py install (and we want the python2 version
-# to be the default for now).
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-popd
-%endif # with_python3
+%check
+nosetests-%{python3_version}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+%files -n python3-%{srcname}
+%doc README.rst
+%license COPYING
+%{python3_sitelib}/%{srcname}
+%{python3_sitelib}/%{srcname}-%{version}-py*.egg-info
 
-%check
+%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-%files
-%doc COPYING
-%{python_sitelib}/*
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-%if 0%{?with_python3}
-%files -n python3-sievelib
-%doc COPYING
-%{python3_sitelib}/*
-%endif # with_python3
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.1-3
+- Rebuilt for Python 3.10
 
-%changelog
-* Tue Aug 26 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.2-2
-- Fix Python 3 compatibility,
-- Better verbosity in debug mode,
-- Fix mixed use of tabs and spaces for indentation
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 07 2020 Juan Orti Alcaine <jortialc@redhat.com> - 1.2.1-1
+- Version 1.2.1 (#1904992)
+
+* Tue Nov 17 2020 Juan Orti Alcaine <jortialc@redhat.com> - 1.2.0-1
+- Version 1.2.0 (#1890926)
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 16 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.1.1-11
+- Fix build with pip >= 20.1 (#1838484)
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-10
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-8
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-7
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Oct 12 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.1.1-4
+- Python2 binary package has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-2
+- Rebuilt for Python 3.7
+
+* Tue Mar 13 2018 Juan Orti Alcaine <jorti@fedoraproject.org> - 1.1.1-1
+- Version 1.1.1
+- Github's tarball doesn't build, use Pypi instead.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 21 2017 Juan Orti Alcaine <jorti@fedoraproject.org> - 1.0.0-1
+- Version 1.0.0
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Jul 01 2017 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.9.2-8
+- Python3 changes
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.9.2-6
+- Rebuild for Python 3.6
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-5
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Nov 16 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.9.2-3
+- Use python_provide macro
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Wed Oct 21 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.9.2-1
+- New version 0.9.2
+
+* Mon Jun 29 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.8-5.20150629gite34fb54
+- Add python3 subpackage
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Apr 09 2015 Juan Orti Alcaine <jorti@fedoraproject.org> - 0.8-3
+- Use license macro
+
+* Wed Dec 03 2014 Juan Orti <jorti@fedoraproject.org> - 0.8-2
+- Remove python shebang from libraries
+- Change URL to GitHub
+- Include license file
+
+* Tue Dec 02 2014 Juan Orti <jorti@fedoraproject.org> - 0.8-1
+- Spec file cleanup
 
-* Tue Aug 19 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.5.2-1
-- Initial package
+* Sat May 24 2014 Didier Fabert <didier.fabert@gmail.com> 0.0.4-1
+- Initial RPM release

debian.changelog Deleted

debian.control Deleted

@@ -1,31 +0,0 @@
-Source: sievelib
-Section: python
-Priority: optional
-Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7)
-Standards-Version: 3.9.3
-
-Package: python-sievelib
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Description: Client-side SIEVE library
- sievelib
- ========
- .
- Client-side Sieve and Managesieve library written in Python.
- .
- * Sieve : An Email Filtering Language
-   (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
- * ManageSieve : A Protocol for Remotely Managing Sieve Scripts
-   (`Draft <http://tools.ietf.org/html/draft-martin-managesieve-12>`_)
- .
- Sieve tools
- -----------
- .
- What is supported
- ^^^^^^^^^^^^^^^^^
- .
- Currently, the provided parser supports most of the functionalities
- described in the RFC. The only exception concerns section
- *2.4.2.4. Encoding Characters Using "encoded-character"* which is not
- supported.

debian.rules Deleted

debian.tar.gz Deleted

python-sievelib.dsc Deleted

sievelib-0.5.2.tar.gz/.gitignore -> sievelib-1.2.1.tar.gz/.gitignore Changed

sievelib-1.2.1.tar.gz/.travis.yml Added

sievelib-0.5.2.tar.gz/COPYING -> sievelib-1.2.1.tar.gz/COPYING Changed

@@ -1,13 +1,19 @@
-Copyright (c) 2011-2012, Antoine Nguyen <tonio@ngyn.org>
+Copyright (c) 2011-2015 Antoine Nguyen <tonio@ngyn.org>
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

sievelib-0.5.2.tar.gz/MANIFEST.in -> sievelib-1.2.1.tar.gz/MANIFEST.in Changed

sievelib-0.5.2.tar.gz/PKG-INFO -> sievelib-1.2.1.tar.gz/PKG-INFO Changed

@@ -1,20 +1,35 @@
 Metadata-Version: 1.1
 Name: sievelib
-Version: 0.5.1
+Version: 1.2.1
 Summary: Client-side SIEVE library
-Home-page: http://bitbucket.org/tonioo/sievelib
+Home-page: https://github.com/tonioo/sievelib
 Author: Antoine Nguyen
 Author-email: tonio@ngyn.org
 License: MIT
 Description: sievelib
         ========
         
+        |travis| |codecov| |latest-version|
+        
         Client-side Sieve and Managesieve library written in Python.
         
         * Sieve : An Email Filtering Language
           (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
         * ManageSieve : A Protocol for Remotely Managing Sieve Scripts
-          (`Draft <http://tools.ietf.org/html/draft-martin-managesieve-12>`_)
+          (`RFC 5804 <http://tools.ietf.org/html/rfc5804>`_)
+        
+        Installation
+        ------------
+        
+        To install ``sievelib`` from PyPI::
+        
+          pip install sievelib
+        
+        To install sievelib from git::
+        
+          git clone git@github.com:tonioo/sievelib.git
+          cd sievelib
+          python ./setup.py install
         
         Sieve tools
         -----------
@@ -29,7 +44,40 @@
         
         The following extensions are also supported:
         
+        * Copying Without Side Effects (`RFC 3894 <https://tools.ietf.org/html/rfc3894>`_)
+        * Body (`RFC 5173 <https://tools.ietf.org/html/rfc5173>`_)
         * Vacation (`RFC 5230 <http://tools.ietf.org/html/rfc5230>`_)
+        * Relational (`RFC 5231 <https://tools.ietf.org/html/rfc5231>`_)
+        * Imap4flags (`RFC 5232 <https://tools.ietf.org/html/rfc5232>`_)
+        
+        The following extensions are partially supported:
+        
+        * Date and Index (`RFC 5260 <https://tools.ietf.org/html/rfc5260>`_)
+        * Checking Mailbox Status and Accessing Mailbox Metadata (`RFC 5490 <https://tools.ietf.org/html/rfc5490>`_)
+        
+        Extending the parser
+        ^^^^^^^^^^^^^^^^^^^^
+        
+        It is possible to extend the parser by adding new supported
+        commands. For example::
+        
+          import sievelib
+        
+          class MyCommand(sievelib.commands.ActionCommand):
+              args_definition = 
+                  {"name": "testtag",
+                      "type": "tag",
+                      "write_tag": True,
+                      "values": ":testtag",
+                      "extra_arg": {"type": "number",
+                                    "required": False},
+                      "required": False},
+                  {"name": "recipients",
+                      "type": "string", "stringlist",
+                      "required": True}
+              
+        
+          sievelib.commands.add_commands(MyCommand)
         
         Basic usage
         ^^^^^^^^^^^
@@ -63,7 +111,8 @@
         Some high-level classes are provided with the ``factory`` module, they
         make the generation of Sieve rules easier::
         
-          >>> from sievelib.factory import FilterSet
+          >>> from sievelib.factory import FiltersSet
+          >>> fs = FiltersSet("test")
           >>> fs.addfilter("rule1",
           ...              ("Sender", ":is", "toto@toto.com"),,
           ...              ("fileinto", "Toto"),)
@@ -76,7 +125,7 @@
           }
           >>> 
         
-        Additionnal documentation is available with source code.
+        Additional documentation is available within source code.
         
         ManageSieve tools
         -----------------
@@ -109,7 +158,14 @@
           True
           >>>
         
-        Additionnal documentation is available with source code.
+        Additional documentation is available with source code.
+        
+        .. |latest-version| image:: https://badge.fury.io/py/sievelib.svg
+           :target: https://badge.fury.io/py/sievelib
+        .. |travis| image:: https://travis-ci.org/tonioo/sievelib.png?branch=master
+           :target: https://travis-ci.org/tonioo/sievelib
+        .. |codecov| image:: http://codecov.io/github/tonioo/sievelib/coverage.svg?branch=master
+           :target: http://codecov.io/github/tonioo/sievelib?branch=master
         
 Keywords: sieve,managesieve,parser,client
 Platform: UNKNOWN

sievelib-0.5.2.tar.gz/README.rst -> sievelib-1.2.1.tar.gz/README.rst Changed

@@ -1,12 +1,27 @@
 sievelib
 ========
 
+|travis| |codecov| |latest-version|
+
 Client-side Sieve and Managesieve library written in Python.
 
 * Sieve : An Email Filtering Language
   (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
 * ManageSieve : A Protocol for Remotely Managing Sieve Scripts
-  (`Draft <http://tools.ietf.org/html/draft-martin-managesieve-12>`_)
+  (`RFC 5804 <http://tools.ietf.org/html/rfc5804>`_)
+
+Installation
+------------
+
+To install ``sievelib`` from PyPI::
+
+  pip install sievelib
+
+To install sievelib from git::
+
+  git clone git@github.com:tonioo/sievelib.git
+  cd sievelib
+  python ./setup.py install
 
 Sieve tools
 -----------
@@ -21,7 +36,40 @@
 
 The following extensions are also supported:
 
+* Copying Without Side Effects (`RFC 3894 <https://tools.ietf.org/html/rfc3894>`_)
+* Body (`RFC 5173 <https://tools.ietf.org/html/rfc5173>`_)
 * Vacation (`RFC 5230 <http://tools.ietf.org/html/rfc5230>`_)
+* Relational (`RFC 5231 <https://tools.ietf.org/html/rfc5231>`_)
+* Imap4flags (`RFC 5232 <https://tools.ietf.org/html/rfc5232>`_)
+
+The following extensions are partially supported:
+
+* Date and Index (`RFC 5260 <https://tools.ietf.org/html/rfc5260>`_)
+* Checking Mailbox Status and Accessing Mailbox Metadata (`RFC 5490 <https://tools.ietf.org/html/rfc5490>`_)
+
+Extending the parser
+^^^^^^^^^^^^^^^^^^^^
+
+It is possible to extend the parser by adding new supported
+commands. For example::
+
+  import sievelib
+
+  class MyCommand(sievelib.commands.ActionCommand):
+      args_definition = 
+          {"name": "testtag",
+              "type": "tag",
+              "write_tag": True,
+              "values": ":testtag",
+              "extra_arg": {"type": "number",
+                            "required": False},
+              "required": False},
+          {"name": "recipients",
+              "type": "string", "stringlist",
+              "required": True}
+      
+
+  sievelib.commands.add_commands(MyCommand)
 
 Basic usage
 ^^^^^^^^^^^
@@ -55,7 +103,8 @@
 Some high-level classes are provided with the ``factory`` module, they
 make the generation of Sieve rules easier::
 
-  >>> from sievelib.factory import FilterSet
+  >>> from sievelib.factory import FiltersSet
+  >>> fs = FiltersSet("test")
   >>> fs.addfilter("rule1",
   ...              ("Sender", ":is", "toto@toto.com"),,
   ...              ("fileinto", "Toto"),)
@@ -68,7 +117,7 @@
   }
   >>> 
 
-Additionnal documentation is available with source code.
+Additional documentation is available within source code.
 
 ManageSieve tools
 -----------------
@@ -101,4 +150,11 @@
   True
   >>>
 
-Additionnal documentation is available with source code.
+Additional documentation is available with source code.
+
+.. |latest-version| image:: https://badge.fury.io/py/sievelib.svg
+   :target: https://badge.fury.io/py/sievelib
+.. |travis| image:: https://travis-ci.org/tonioo/sievelib.png?branch=master
+   :target: https://travis-ci.org/tonioo/sievelib
+.. |codecov| image:: http://codecov.io/github/tonioo/sievelib/coverage.svg?branch=master
+   :target: http://codecov.io/github/tonioo/sievelib?branch=master

sievelib-1.2.1.tar.gz/requirements.txt Added

sievelib-0.5.2.tar.gz/setup.cfg -> sievelib-1.2.1.tar.gz/setup.cfg Changed

sievelib-0.5.2.tar.gz/setup.py -> sievelib-1.2.1.tar.gz/setup.py Changed

@@ -1,24 +1,42 @@
-from setuptools import setup
+#!/usr/bin/env python
 
-setup(
-    name = "sievelib",
-    packages = "sievelib",
-    version = "0.5.1",
-    description = "Client-side SIEVE library",
-    author = "Antoine Nguyen",
-    author_email = "tonio@ngyn.org",
-    url = "http://bitbucket.org/tonioo/sievelib",
-    license = "MIT",
-    keywords = "sieve", "managesieve", "parser", "client",
-    classifiers = 
-        "Programming Language :: Python",
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Topic :: Communications :: Email :: Filters"
+"""
+A setuptools based setup module.
+
+See:
+https://packaging.python.org/en/latest/distributing.html
+"""
+
+import io
+from os import path
+from setuptools import setup, find_packages
+
+
+if __name__ == "__main__":
+    HERE = path.abspath(path.dirname(__file__))
+    with io.open(path.join(HERE, "README.rst"), encoding="utf-8") as readme:
+        LONG_DESCRIPTION = readme.read()
+    setup(
+        name="sievelib",
+        packages=find_packages(),
+        include_package_data=True,
+        description="Client-side SIEVE library",
+        author="Antoine Nguyen",
+        author_email="tonio@ngyn.org",
+        url="https://github.com/tonioo/sievelib",
+        license="MIT",
+        keywords="sieve", "managesieve", "parser", "client",
+        install_requires=,
+        setup_requires="setuptools_scm",
+        use_scm_version=True,
+        classifiers=
+            "Programming Language :: Python",
+            "Development Status :: 4 - Beta",
+            "Intended Audience :: Developers",
+            "License :: OSI Approved :: MIT License",
+            "Operating System :: OS Independent",
+            "Topic :: Software Development :: Libraries :: Python Modules",
+            "Topic :: Communications :: Email :: Filters"
         ,
-    
-    long_description = open("README.rst").read()
-)
+        long_description=LONG_DESCRIPTION
+    )

sievelib-1.2.1.tar.gz/sievelib.egg-info Added

sievelib-1.2.1.tar.gz/sievelib.egg-info/PKG-INFO Added

@@ -0,0 +1,178 @@
+Metadata-Version: 1.1
+Name: sievelib
+Version: 1.2.1
+Summary: Client-side SIEVE library
+Home-page: https://github.com/tonioo/sievelib
+Author: Antoine Nguyen
+Author-email: tonio@ngyn.org
+License: MIT
+Description: sievelib
+        ========
+        
+        |travis| |codecov| |latest-version|
+        
+        Client-side Sieve and Managesieve library written in Python.
+        
+        * Sieve : An Email Filtering Language
+          (`RFC 5228 <http://tools.ietf.org/html/rfc5228>`_)
+        * ManageSieve : A Protocol for Remotely Managing Sieve Scripts
+          (`RFC 5804 <http://tools.ietf.org/html/rfc5804>`_)
+        
+        Installation
+        ------------
+        
+        To install ``sievelib`` from PyPI::
+        
+          pip install sievelib
+        
+        To install sievelib from git::
+        
+          git clone git@github.com:tonioo/sievelib.git
+          cd sievelib
+          python ./setup.py install
+        
+        Sieve tools
+        -----------
+        
+        What is supported
+        ^^^^^^^^^^^^^^^^^
+        
+        Currently, the provided parser supports most of the functionalities
+        described in the RFC. The only exception concerns section
+        *2.4.2.4. Encoding Characters Using "encoded-character"* which is not
+        supported.
+        
+        The following extensions are also supported:
+        
+        * Copying Without Side Effects (`RFC 3894 <https://tools.ietf.org/html/rfc3894>`_)
+        * Body (`RFC 5173 <https://tools.ietf.org/html/rfc5173>`_)
+        * Vacation (`RFC 5230 <http://tools.ietf.org/html/rfc5230>`_)
+        * Relational (`RFC 5231 <https://tools.ietf.org/html/rfc5231>`_)
+        * Imap4flags (`RFC 5232 <https://tools.ietf.org/html/rfc5232>`_)
+        
+        The following extensions are partially supported:
+        
+        * Date and Index (`RFC 5260 <https://tools.ietf.org/html/rfc5260>`_)
+        * Checking Mailbox Status and Accessing Mailbox Metadata (`RFC 5490 <https://tools.ietf.org/html/rfc5490>`_)
+        
+        Extending the parser
+        ^^^^^^^^^^^^^^^^^^^^
+        
+        It is possible to extend the parser by adding new supported
+        commands. For example::
+        
+          import sievelib
+        
+          class MyCommand(sievelib.commands.ActionCommand):
+              args_definition = 
+                  {"name": "testtag",
+                      "type": "tag",
+                      "write_tag": True,
+                      "values": ":testtag",
+                      "extra_arg": {"type": "number",
+                                    "required": False},
+                      "required": False},
+                  {"name": "recipients",
+                      "type": "string", "stringlist",
+                      "required": True}
+              
+        
+          sievelib.commands.add_commands(MyCommand)
+        
+        Basic usage
+        ^^^^^^^^^^^
+        
+        The parser can either be used from the command-line::
+        
+          $ cd sievelib
+          $ python parser.py test.sieve
+          Syntax OK
+          $
+        
+        Or can be used from a python environment (or script/module)::
+        
+          >>> from sievelib.parser import Parser
+          >>> p = Parser()
+          >>> p.parse('require "fileinto";')
+          True
+          >>> p.dump()
+          require (type: control)
+              "fileinto"
+          >>> 
+          >>> p.parse('require "fileinto"')
+          False
+          >>> p.error
+          'line 1: parsing error: end of script reached while semicolon expected'
+          >>>
+        
+        Simple filters creation
+        ^^^^^^^^^^^^^^^^^^^^^^^
+        
+        Some high-level classes are provided with the ``factory`` module, they
+        make the generation of Sieve rules easier::
+        
+          >>> from sievelib.factory import FiltersSet
+          >>> fs = FiltersSet("test")
+          >>> fs.addfilter("rule1",
+          ...              ("Sender", ":is", "toto@toto.com"),,
+          ...              ("fileinto", "Toto"),)
+          >>> fs.tosieve()
+          require "fileinto";
+          
+          # Filter: rule1
+          if anyof (header :is "Sender" "toto@toto.com") {
+              fileinto "Toto";
+          }
+          >>> 
+        
+        Additional documentation is available within source code.
+        
+        ManageSieve tools
+        -----------------
+        
+        What is supported
+        ^^^^^^^^^^^^^^^^^
+        
+        All mandatory commands are supported. The ``RENAME`` extension is
+        supported, with a simulated behaviour for server that do not support
+        it.
+        
+        For the ``AUTHENTICATE`` command, supported mechanisms are ``DIGEST-MD5``,
+        ``PLAIN`` and ``LOGIN``.
+            
+        Basic usage
+        ^^^^^^^^^^^
+        
+        The ManageSieve client is intended to be used from another python
+        application (there isn't any shell provided)::
+        
+          >>> from sievelib.managesieve import Client
+          >>> c = Client("server.example.com")
+          >>> c.connect("user", "password", starttls=False, authmech="DIGEST-MD5")
+          True
+          >>> c.listscripts()
+          ("active_script", "script1", "script2")
+          >>> c.setactive("script1")
+          True
+          >>> c.havespace("script3", 45)
+          True
+          >>>
+        
+        Additional documentation is available with source code.
+        
+        .. |latest-version| image:: https://badge.fury.io/py/sievelib.svg
+           :target: https://badge.fury.io/py/sievelib
+        .. |travis| image:: https://travis-ci.org/tonioo/sievelib.png?branch=master
+           :target: https://travis-ci.org/tonioo/sievelib
+        .. |codecov| image:: http://codecov.io/github/tonioo/sievelib/coverage.svg?branch=master
+           :target: http://codecov.io/github/tonioo/sievelib?branch=master
+        
+Keywords: sieve,managesieve,parser,client
+Platform: UNKNOWN
+Classifier: Programming Language :: Python
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Communications :: Email :: Filters

sievelib-1.2.1.tar.gz/sievelib.egg-info/SOURCES.txt Added

sievelib-1.2.1.tar.gz/sievelib.egg-info/dependency_links.txt Added

sievelib-1.2.1.tar.gz/sievelib.egg-info/top_level.txt Added

sievelib-0.5.2.tar.gz/sievelib/__init__.py -> sievelib-1.2.1.tar.gz/sievelib/__init__.py Changed

sievelib-0.5.2.tar.gz/sievelib/commands.py -> sievelib-1.2.1.tar.gz/sievelib/commands.py Changed

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
 SIEVE commands representation
 
@@ -22,17 +20,29 @@
 
 """
 import sys
+from collections.abc import Iterable
+from . import tools
+
+
+class CommandError(Exception):
+    """Base command exception class."""
+
+    pass
 
-class UnknownCommand(Exception):
+
+class UnknownCommand(CommandError):
     """Specific exception raised when an unknown command is encountered"""
+
     def __init__(self, name):
         self.name = name
 
     def __str__(self):
         return "unknown command %s" % self.name
 
-class BadArgument(Exception):
+
+class BadArgument(CommandError):
     """Specific exception raised when a bad argument is encountered"""
+
     def __init__(self, command, seen, expected):
         self.command = command
         self.seen = seen
@@ -40,108 +50,124 @@
 
     def __str__(self):
         return "bad argument %s for command %s (%s expected)" \
-            % (self.seen, self.command, self.expected)
+               % (self.seen, self.command, self.expected)
+
 
-class BadValue(Exception):
+class BadValue(CommandError):
     """Specific exception raised when a bad argument value is encountered"""
+
     def __init__(self, argument, value):
         self.argument = argument
         self.value = value
 
     def __str__(self):
         return "bad value %s for argument %s" \
-            % (self.value, self.argument)
+               % (self.value, self.argument)
+
+
+class ExtensionNotLoaded(CommandError):
+    """Raised when an extension is not loaded."""
+
+    def __init__(self, name):
+        self.name = name
+
+    def __str__(self):
+        return "extension '{}' not loaded".format(self.name)
 
 
 # Statement elements (see RFC, section 8.3)
 # They are used in different commands.
-comparator = {
-        "name": "comparator",
-        "type":  "tag" ,
-        "values":  ":comparator" ,
-        "extra_arg": {
-                "type" : "string",
-                "values" :  '"i;octet"', '"i;ascii-casemap"' ,
-            },
-        "required": False
-    }
-
-address_part = {
-        "name": "address-part",
-        "values":  ":localpart", ":domain", ":all" ,
-        "type" :  "tag" ,
-        "required" : False
-    }
-
+comparator = {"name": "comparator",
+              "type": "tag",
+              "values": ":comparator",
+              "extra_arg": {"type": "string",
+                            "values": '"i;octet"', '"i;ascii-casemap"'},
+              "required": False}
+address_part = {"name": "address-part",
+                "values": ":localpart", ":domain", ":all",
+                "type": "tag",
+                "required": False}
 match_type = {
-        "name": "match-type",
-        "values":  ":is", ":contains", ":matches" ,
-        "type":  "tag" ,
-        "required": False
-    }
-
-namespace = {
-        "name": "namespace",
-        "values":  ":personal", ":global" ,
-        "type":  "tag" ,
-        "required": False
-    }
+    "name": "match-type",
+    "values": ":is", ":contains", ":matches",
+    "extension_values": {
+        ":count": "relational",
+        ":value": "relational"
+    },
+    "extra_arg": {
+        "type": "string",
+        "values": '"gt"', '"ge"', '"lt"', '"le"', '"eq"', '"ne"',
+        "valid_for": ":count", ":value"
+    },
+    "type": "tag",
+    "required": False,
+}
 
-class Command(object):
-    """
-        Generic command representation.
 
-        A command is described as follow:
+class Command(object):
+    """Generic command representation.
 
-            * A name
-            * A type
-            * A description of supported arguments
-            * Does it accept an unkwown quantity of arguments? (ex: anyof, allof)
-            * Does it accept children? (ie. subcommands)
-            * Is it an extension?
-            * Must follow only certain commands
+    A command is described as follow:
+     * A name
+     * A type
+     * A description of supported arguments
+     * Does it accept an unknown quantity of arguments? (ex: anyof, allof)
+     * Does it accept children? (ie. subcommands)
+     * Is it an extension?
+     * Must follow only certain commands
 
     """
     _type = None
     variable_args_nb = False
+    non_deterministic_args = False
     accept_children = False
     must_follow = None
-    is_extension = False
+    extension = None
 
     def __init__(self, parent=None):
         self.parent = parent
         self.arguments = {}
+        self.extra_arguments = {}  # to store tag arguments
         self.children = 
 
         self.nextargpos = 0
         self.required_args = -1
         self.rargs_cnt = 0
-
-        # for arguments that expect an argument :p (ex: :comparator)
-        self.curarg = None
+        self.curarg = None  # for arguments that expect an argument :p (ex: :comparator)
 
         self.name = self.__class__.__name__.replace("Command", "")
         self.name = self.name.lower()
 
+        self.hash_comments = 
+
     def __repr__(self):
         return "%s (type: %s)" % (self.name, self._type)
 
     def tosieve(self, indentlevel=0, target=sys.stdout):
-        """
-            Generate the sieve syntax corresponding to this command
+        """Generate the sieve syntax corresponding to this command
 
-            Recursive method.
+        Recursive method.
 
-            :param indentlevel: current indentation level
-            :param target: opened file pointer where the content will be printed
+        :param indentlevel: current indentation level
+        :param target: opened file pointer where the content will be printed
         """
         self.__print(self.name, indentlevel, nocr=True, target=target)
         if self.has_arguments():
             for arg in self.args_definition:
-                if not self.arguments.has_key(arg"name"):
+                if not arg"name" in self.arguments:
                     continue
                 target.write(" ")
                 value = self.argumentsarg"name"
+                atype = arg"type"
+                if "tag" in atype:
+                    target.write(value)
+                    if arg"name" in self.extra_arguments:
+                        value = self.extra_argumentsarg"name"
+                        atype = arg"extra_arg""type"
+                        target.write(" ")
+                    else:
+                        continue
+
                 if type(value) == list:
                     if self.__get_arg_type(arg"name") == "testlist":
                         target.write("(")
@@ -151,38 +177,32 @@
                                 target.write(", ")
                         target.write(")")
                     else:
-                        target.write("" + (", ".join(map(lambda v: '"%s"' % v.strip('"'), value))) + "")
+                        target.write(
+                            "{}".format(", ".join(
+                                '"%s"' % v.strip('"') for v in value)
+                            )
+                        )
                     continue
                 if isinstance(value, Command):
                     value.tosieve(indentlevel, target=target)
                     continue
 
-                if type(value) is unicode:
-                    value = value.encode("utf-8")
-
-                if "tag" in arg"type" and arg.get("write_tag", False):
-                    target.write("%s " % arg"values"0)
-
-                if "string" in arg"type":
-                    target.write('"%s"' % value.strip('"'))
-                elif arg.has_key('extra_arg') and "string" in arg'extra_arg''type':
-                    target.write('"%s"' % value.strip('"'))
+                if "string" in atype:
+                    target.write(value)
+                    if not value.startswith('"') and not value.startswith(""):
+                        target.write("\n")
                 else:
-                    target.write("%s" % value)
+                    target.write(value)
 
         if not self.accept_children:
             if self.get_type() != "test":
-                print >>target, ";"
+                target.write(";\n")
             return
-
         if self.get_type() != "control":
             return
-
-        print >>target, " {"
-
+        target.write(" {\n")
         for ch in self.children:
             ch.tosieve(indentlevel + 4, target=target)
-
         self.__print("}", indentlevel, target=target)
 
     def __print(self, data, indentlevel, nocr=False, target=sys.stdout):
@@ -190,62 +210,70 @@
         if nocr:
             target.write(text)
         else:
-            print >>target, text
+            target.write(text + "\n")
 
     def __get_arg_type(self, arg):
-        """
-            Return the type corresponding to the given name.
+        """Return the type corresponding to the given name.
 
-            :param arg: a defined argument name
+        :param arg: a defined argument name
         """
-
         for a in self.args_definition:
             if a"name" == arg:
                 return a"type"
         return None
 
     def complete_cb(self):
-        """
-            Completion callback
+        """Completion callback
 
-            Called when a command is considered as complete by the parser.
+        Called when a command is considered as complete by the parser.
         """
-
         pass
 
     def get_expected_first(self):
-        """
-            Return the first expected token for this command
-        """
-
+        """Return the first expected token for this command"""
         return None
 
     def has_arguments(self):
         return len(self.args_definition) != 0
 
-    def dump(self, indentlevel=0, target=sys.stdout):
+    def reassign_arguments(self):
+        """Reassign arguments to proper slots.
+
+        Should be called when parsing of commands with non
+        deterministic arguments is considered done.
         """
-            Display the command
+        raise NotImplementedError
+
+    def dump(self, indentlevel=0, target=sys.stdout):
+        """Display the command
 
-            Pretty printing of this command and its eventual arguments and
-            children. (recursively)
+        Pretty printing of this command and its eventual arguments and
+        children. (recursively)
 
-            :param indentlevel: integer that indicates indentation level to apply
+        :param indentlevel: integer that indicates indentation level to apply
         """
-
         self.__print(self, indentlevel, target=target)
         indentlevel += 4
         if self.has_arguments():
             for arg in self.args_definition:
-                if not self.arguments.has_key(arg"name"):
+                if not arg"name" in self.arguments:
                     continue
                 value = self.argumentsarg"name"
+                atype = arg"type"
+                if "tag" in atype:
+                    self.__print(str(value), indentlevel, target=target)
+                    if arg"name" in self.extra_arguments:
+                        value = self.extra_argumentsarg"name"
+                        atype = arg"extra_arg""type"
+                    else:
+                        continue
                 if type(value) == list:
                     if self.__get_arg_type(arg"name") == "testlist":
                         for t in value:
                             t.dump(indentlevel, target)
                     else:
-                        self.__print("" + (",".join(value)) + "", indentlevel, target=target)
+                        self.__print("" + (",".join(value)) + "",
+                                     indentlevel, target=target)
                     continue
                 if isinstance(value, Command):
                     value.dump(indentlevel, target)
@@ -254,166 +282,220 @@
         for ch in self.children:
             ch.dump(indentlevel, target)
 
+    def walk(self):
+        """Walk through commands."""
+        yield self
+        if self.has_arguments():
+            for arg in self.args_definition:
+                if not arg"name" in self.arguments:
+                    continue
+                value = self.argumentsarg"name"
+                if type(value) == list:
+                    if self.__get_arg_type(arg"name") == "testlist":
+                        for t in value:
+                            for node in t.walk():
+                                yield node
+                if isinstance(value, Command):
+                    for node in value.walk():
+                        yield node
+        for ch in self.children:
+            for node in ch.walk():
+                yield node
+
     def addchild(self, child):
-        """
-            Add a new child to the command
+        """Add a new child to the command
 
-            A child corresponds to a command located into a block (this
-            command's block). It can be either an action or a control.
+        A child corresponds to a command located into a block (this
+        command's block). It can be either an action or a control.
 
-            :param child: the new child
-            :return: True on succes, False otherwise
+        :param child: the new child
+        :return: True on succes, False otherwise
         """
-
         if not self.accept_children:
             return False
         self.children += child
         return True
 
-    def iscomplete(self):
-        """
-            Check if the command is complete
+    def iscomplete(self, atype=None, avalue=None):
+        """Check if the command is complete
 
-            Check if all required arguments have been encountered. For
-            commands that allow an undefined number of arguments, this
-            method always returns False.
+        Check if all required arguments have been encountered. For
+        commands that allow an undefined number of arguments, this
+        method always returns False.
 
-            :return: True if command is complete, False otherwise
+        :return: True if command is complete, False otherwise
         """
-
         if self.variable_args_nb:
             return False
         if self.required_args == -1:
             self.required_args = 0
             for arg in self.args_definition:
-                if arg"required":
+                if arg.get("required", False):
                     self.required_args += 1
-        return self.rargs_cnt == self.required_args
+        return (
+            (not self.curarg or
+             "extra_arg" not in self.curarg or
+             ("valid_for" in self.curarg"extra_arg" and
+              atype and atype in self.curarg"extra_arg""type" and
+              avalue not in self.curarg"extra_arg""valid_for")) and
+            (self.rargs_cnt == self.required_args)
+        )
 
     def get_type(self):
-        """
-            Return the command's type
-        """
-
+        """Return the command's type"""
         if self._type is None:
-            raise NotImplemented
+            raise NotImplementedError
         return self._type
 
-    def __is_valid_value_for_arg(self, arg, value):
-        """
-            Check if value is allowed for arg
+    def __is_valid_value_for_arg(self, arg, value, check_extension=True):
+        """Check if value is allowed for arg
 
-            Some commands only allow a limited set of values. The method
-            always returns True for methods that do not provide such a
-            set.
+        Some commands only allow a limited set of values. The method
+        always returns True for methods that do not provide such a
+        set.
 
-            :param arg: the argument's name
-            :param value: the value to check
-            :return: True on succes, False otherwise
+        :param arg: the argument's name
+        :param value: the value to check
+        :param check_extension: check if value requires an extension
+        :return: True on succes, False otherwise
         """
-
-        if not arg.has_key("values"):
+        if "values" not in arg and "extension_values" not in arg:
             return True
-
-        if not isinstance(value, str) and not isinstance(value, basestring):
-            if arg.has_key('type') and "stringlist" in arg'type':
+        if "values" in arg and value.lower() in arg"values":
+            return True
+        if "extension_values" in arg:
+            extension = arg"extension_values".get(value.lower())
+            if extension:
+                condition = (
+                    check_extension and
+                    extension not in RequireCommand.loaded_extensions
+                )
+                if condition:
+                    raise ExtensionNotLoaded(extension)
                 return True
-            else:
-                return False
+        return False
 
-        return value.lower() in arg"values"
+    def __is_valid_type(self, typ, typlist):
+        """ Check if type is valid based on input type list
+            "string" is special because it can be used for stringlist
 
-    def check_next_arg(self, atype, avalue, add=True):
+        :param typ: the type to check
+        :param typlist: the list of type to check
+        :return: True on success, False otherwise
         """
-            Argument validity checking
+        typ_is_str = typ == "string"
+        str_list_in_typlist = "stringlist" in typlist
 
-            This method is usually used by the parser to check if detected
-            argument is allowed for this command.
+        return typ in typlist or (typ_is_str and str_list_in_typlist)
 
-            We make a distinction between required and optional
-            arguments. Optional (or tagged) arguments can be provided
-            unordered but the required ones.
+    def check_next_arg(self, atype, avalue, add=True, check_extension=True):
+        """Argument validity checking
 
-            A special handling is also for arguments that require an
-            argument (example: the :comparator argument expects a string
-            argument).
+        This method is usually used by the parser to check if detected
+        argument is allowed for this command.
 
-            The "testlist" type is checked separately as we can't know in
-            advance how many arguments will be provided.
+        We make a distinction between required and optional
+        arguments. Optional (or tagged) arguments can be provided
+        unordered but not the required ones.
 
-            If the argument is incorrect, the method raises the
-            appropriate exception, or return False to let the parser
-            handle the exception.
+        A special handling is also done for arguments that require an
+        argument (example: the :comparator argument expects a string
+        argument).
 
-            :param atype: the argument's type
-            :param avalue: the argument's value
-            :param add: indicates if this argument should be recorded on success
-            :return: True on success, False otherwise
-        """
+        The "testlist" type is checked separately as we can't know in
+        advance how many arguments will be provided.
+
+        If the argument is incorrect, the method raises the
+        appropriate exception, or return False to let the parser
+        handle the exception.
 
+        :param atype: the argument's type
+        :param avalue: the argument's value
+        :param add: indicates if this argument should be recorded on success
+        :param check_extension: raise ExtensionNotLoaded if extension not
+                                loaded
+        :return: True on success, False otherwise
+        """
         if not self.has_arguments():
             return False
-
-        if self.iscomplete():
+        if self.iscomplete(atype, avalue):
             return False
 
-        if self.curarg is not None:
-            if atype == self.curarg"extra_arg""type":
-                if not self.curarg"extra_arg".has_key("values") or \
-                        avalue in self.curarg"extra_arg""values":
-                    if add:
-                        self.argumentsself.curarg"name" = avalue
-                    self.nextargpos += 1
-                    self.curarg = None
-                    return True
-
+        if self.curarg is not None and "extra_arg" in self.curarg:
+            condition = (
+                atype in self.curarg"extra_arg""type" and
+                ("values" not in self.curarg"extra_arg" or
+                 avalue in self.curarg"extra_arg""values")
+            )
+            if condition:
+                if add:
+                    self.extra_argumentsself.curarg"name" = avalue
+                self.curarg = None
+                return True
             raise BadValue(self.curarg"name", avalue)
 
         failed = False
-
-        for arg in self.args_definitionself.nextargpos::
-            if self.arguments.has_key(arg"name"):
-                continue
-
-            if arg"required":
-                if arg"type" == "testlist":
-                    if not atype == "test":
+        pos = self.nextargpos
+        while pos < len(self.args_definition):
+            curarg = self.args_definitionpos
+            if curarg.get("required", False):
+                if curarg"type" == "testlist":
+                    if atype != "test":
                         failed = True
                     elif add:
-                        if not self.arguments.has_key(arg"name"):
-                            self.argumentsarg"name" = 
-                        self.argumentsarg"name".append(avalue)
-                elif atype not in arg"type" or \
-                    not self.__is_valid_value_for_arg(arg, avalue):
-
+                        if not curarg"name" in self.arguments:
+                            self.argumentscurarg"name" = 
+                        self.argumentscurarg"name" += avalue
+                elif not self.__is_valid_type(atype, curarg"type") or \
+                        not self.__is_valid_value_for_arg(
+                            curarg, avalue, check_extension):
                     failed = True
                 else:
-                    self.nextargpos += 1
+                    self.curarg = curarg
+                    self.rargs_cnt += 1
+                    self.nextargpos = pos + 1
                     if add:
-                        self.argumentsarg"name" = avalue
-
+                        self.argumentscurarg"name" = avalue
                 break
 
-            if self.__is_valid_value_for_arg(arg, avalue):
-                self.argumentsarg"name" = avalue
-                if arg.has_key('extra_arg'):
-                    self.curarg = arg
-                    break
-                self.nextargpos += 1
+            condition = (
+                atype in curarg"type" and
+                self.__is_valid_value_for_arg(curarg, avalue, check_extension)
+            )
+            if condition:
+                ext = curarg.get("extension")
+                condition = (
+                    check_extension and ext and
+                    ext not in RequireCommand.loaded_extensions)
+                if condition:
+                    raise ExtensionNotLoaded(ext)
+                condition = (
+                    "extra_arg" in curarg and
+                    ("valid_for" not in curarg"extra_arg" or
+                     avalue in curarg"extra_arg""valid_for")
+                )
+                if condition:
+                    self.curarg = curarg
+                if add:
+                    self.argumentscurarg"name" = avalue
                 break
 
+            pos += 1
+
         if failed:
             raise BadArgument(self.name, avalue,
-                              self.args_definitionself.nextargpos"type")
+                              self.args_definitionpos"type")
         return True
 
+    def __contains__(self, name):
+        """Check if argument is provided with command."""
+        return name in self.arguments
+
     def __getitem__(self, name):
-        """
-            Shorcut to access a command argument
+        """Shorcut to access a command argument
 
-            :param name: the argument's name
+        :param name: the argument's name
         """
-
         found = False
         for ad in self.args_definition:
             if ad"name" == name:
@@ -421,158 +503,225 @@
                 break
         if not found:
             raise KeyError(name)
-        if not self.arguments.has_key(name):
+        if name not in self.arguments:
             raise KeyError(name)
         return self.argumentsname
 
-class ControlCommand(Command):
-    """
-        Indermediate class to represent "control" commands
-    """
 
+class ControlCommand(Command):
+    """Indermediate class to represent "control" commands"""
     _type = "control"
 
+
 class RequireCommand(ControlCommand):
-    """
-        The 'require' command
+    """The 'require' command
 
-        This class has one big difference with others as it is used to
-        store loaded extension names. (The result is we can check for
-        unloaded extensions during the parsing)
+    This class has one big difference with others as it is used to
+    store loaded extension names. (The result is we can check for
+    unloaded extensions during the parsing)
     """
-
     args_definition = 
-                {
-                    "name": "capabilities",
-                    "type":  "string", "stringlist" ,
-                    "required": True
-            }
-        
+        {"name": "capabilities",
+         "type": "string", "stringlist",
+         "required": True}
+    
 
     loaded_extensions = 
 
     def complete_cb(self):
-        if type(self.arguments"capabilities") == str:
+        if type(self.arguments"capabilities") != list:
             exts = self.arguments"capabilities"
         else:
             exts = self.arguments"capabilities"
         for ext in exts:
             ext = ext.strip('"')
-            if not ext in RequireCommand.loaded_extensions:
+            if ext not in RequireCommand.loaded_extensions:
                 RequireCommand.loaded_extensions += ext
 
-class StopCommand(ControlCommand):
-    args_definition = 
 
 class IfCommand(ControlCommand):
     accept_children = True
 
     args_definition = 
-            {
-                    "name": "test",
-                    "type":  "test" ,
-                    "required": True
-                }
-        
+        {"name": "test",
+         "type": "test",
+         "required": True}
+    
 
     def get_expected_first(self):
         return "identifier"
 
+
 class ElsifCommand(ControlCommand):
     accept_children = True
     must_follow = "if", "elsif"
     args_definition = 
         {"name": "test",
-         "type":  "test" ,
+         "type": "test",
          "required": True}
-        
+    
 
     def get_expected_first(self):
         return "identifier"
 
+
 class ElseCommand(ControlCommand):
     accept_children = True
     must_follow = "if", "elsif"
     args_definition = 
 
+
 class ActionCommand(Command):
     """Indermediate class to represent "action" commands"""
+
     _type = "action"
 
+    def args_as_tuple(self):
+        args = 
+        for name, value in list(self.arguments.items()):
+            unquote = False
+            for argdef in self.args_definition:
+                if name == argdef"name":
+                    condition = (
+                        "string" in argdef"type" or
+                        "stringlist" in argdef"type"
+                    )
+                    if condition:
+                        unquote = True
+                        break
+            if unquote:
+                if "," in value:
+                    args += tools.to_list(value)
+                else:
+                    args.append(value.strip('"'))
+                continue
+            args.append(value)
+        return (self.name, ) + tuple(args)
+
+
+class StopCommand(ActionCommand):
+    args_definition = 
+
+
 class FileintoCommand(ActionCommand):
-    is_extension = True
+    extension = "fileinto"
     args_definition = 
+        {"name": "copy",
+         "type": "tag",
+         "values": ":copy",
+         "required": False,
+         "extension": "copy"},
+        {"name": "create",
+         "type": "tag",
+         "values": ":create",
+         "required": False,
+         "extension": "mailbox"},
+        {"name": "flags",
+         "type": "tag",
+         "values": ":flags",
+         "extra_arg": {"type": "string", "stringlist"},
+         "extension": "imap4flags"},
         {"name": "mailbox",
-         "type":  "string" ,
+         "type": "string",
          "required": True}
-        
+    
 
-class IncludeCommand(ControlCommand):
-    is_extension = True
-    accept_children = False
+
+class RedirectCommand(ActionCommand):
     args_definition = 
-        namespace,
-        {"name": "script",
-         "type":  "string" ,
+        {"name": "copy",
+         "type": "tag",
+         "values": ":copy",
+         "required": False,
+         "extension": "copy"},
+        {"name": "address",
+         "type": "string",
          "required": True}
-        
+    
 
-class AddflagCommand(ActionCommand):
-    args_definition = 
-            {
-                    "name": "flag",
-                    "type":  "string" ,
-                    "required": True
-                }
-        
 
-class SetflagCommand(ActionCommand):
+class RejectCommand(ActionCommand):
+    extension = "reject"
     args_definition = 
-            {
-                    "name": "flag",
-                    "type":  "string" ,
-                    "required": True
-                }
-        
+        {"name": "text",
+         "type": "string",
+         "required": True}
+    
 
-class RedirectCommand(ActionCommand):
-    is_extension = False
-    args_definition = 
-            {
-                    "name": "copy",
-                    "values":  ":copy" ,
-                    "type":  "tag" ,
-                    "required": False
-                },
-            {
-                    "name": "address",
-                    "type":  "string", "stringlist" ,
-                    "required": True
-                },
-        
 
 class KeepCommand(ActionCommand):
-    args_definition = 
+    args_definition = 
+        {"name": "flags",
+         "type": "tag",
+         "values": ":flags",
+         "extra_arg": {"type": "string", "stringlist"},
+         "extension": "imap4flags"},
+    
+
 
 class DiscardCommand(ActionCommand):
     args_definition = 
 
+
+class SetflagCommand(ActionCommand):
+    """imap4flags extension: setflag."""
+
+    args_definition = 
+        {"name": "variable-name",
+         "type": "string",
+         "required": False},
+        {"name": "list-of-flags",
+         "type": "string", "stringlist",
+         "required": True}
+    
+    extension = "imap4flags"
+
+
+class AddflagCommand(ActionCommand):
+    """imap4flags extension: addflag."""
+
+    args_definition = 
+        {"name": "variable-name",
+         "type": "string",
+         "required": False},
+        {"name": "list-of-flags",
+         "type": "string", "stringlist",
+         "required": True}
+    
+    extension = "imap4flags"
+
+
+class RemoveflagCommand(ActionCommand):
+    """imap4flags extension: removeflag."""
+
+    args_definition = 
+        {"name": "variable-name",
+         "type": "string"},
+        {"name": "list-of-flags",
+         "type": "string", "stringlist",
+         "required": True}
+    
+    extension = "imap4flags"
+
+
 class TestCommand(Command):
     """Indermediate class to represent "test" commands"""
     _type = "test"
 
+
 class AddressCommand(TestCommand):
     args_definition = 
         comparator,
         address_part,
         match_type,
         {"name": "header-list",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True},
         {"name": "key-list",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True}
-        
+    
+
 
 class AllofCommand(TestCommand):
     accept_children = True
@@ -580,128 +729,360 @@
 
     args_definition = 
         {"name": "tests",
-         "type":  "testlist" ,
+         "type": "testlist",
          "required": True}
-        
+    
 
     def get_expected_first(self):
         return "left_parenthesis"
 
+
 class AnyofCommand(TestCommand):
     accept_children = True
     variable_args_nb = True
 
     args_definition = 
         {"name": "tests",
-         "type":  "testlist" ,
+         "type": "testlist",
          "required": True}
-        
+    
 
     def get_expected_first(self):
         return "left_parenthesis"
 
+
 class EnvelopeCommand(TestCommand):
     args_definition = 
         comparator,
         address_part,
         match_type,
         {"name": "header-list",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True},
         {"name": "key-list",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True}
-        
+    
+    extension = "envelope"
+
+    def args_as_tuple(self):
+        """Return arguments as a list."""
+        result = ("envelope", self.arguments"match-type")
+        value = self.arguments"header-list"
+        if isinstance(value, list):
+            # FIXME
+            value = "{}".format(
+                ",".join('"{}"'.format(item) for item in value))
+        if value.startswith(""):
+            result += (tools.to_list(value),)
+        else:
+            result += (value.strip('"'),)
+        value = self.arguments"key-list"
+        if isinstance(value, list):
+            # FIXME
+            value = "{}".format(
+                ",".join('"{}"'.format(item) for item in value))
+        if value.startswith(""):
+            result += (tools.to_list(value), )
+        else:
+            result = result + (value.strip('"'),)
+        return result
+
 
 class ExistsCommand(TestCommand):
     args_definition = 
         {"name": "header-names",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True}
-        
+    
+
+    def args_as_tuple(self):
+        """FIXME: en fonction de la manière dont la commande a été générée
+        (factory ou parser), le type des arguments est différent :
+        string quand ça vient de la factory ou type normal depuis le
+        parser. Il faut uniformiser tout ça !!
+
+        """
+        value = self.arguments"header-names"
+        if isinstance(value, list):
+            value = "{}".format(
+                ",".join('"{}"'.format(item) for item in value))
+        if not value.startswith(""):
+            return ('exists', value.strip('"'))
+        return ("exists", ) + tuple(tools.to_list(value))
+
 
 class TrueCommand(TestCommand):
     args_definition = 
 
+
 class FalseCommand(TestCommand):
     args_definition = 
 
+
 class HeaderCommand(TestCommand):
     args_definition = 
         comparator,
         match_type,
         {"name": "header-names",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True},
         {"name": "key-list",
-         "type":  "string", "stringlist" ,
+         "type": "string", "stringlist",
          "required": True}
-        
+    
+
+    def args_as_tuple(self):
+        """Return arguments as a list."""
+        if "," in self.arguments"header-names":
+            result = tuple(tools.to_list(self.arguments"header-names"))
+        else:
+            result = (self.arguments"header-names".strip('"'),)
+        result = result + (self.arguments"match-type",)
+        if "," in self.arguments"key-list":
+            result = result + tuple(
+                tools.to_list(self.arguments"key-list", unquote=False))
+        else:
+            result = result + (self.arguments"key-list".strip('"'),)
+        return result
+
+
+class BodyCommand(TestCommand):
+    """Body extension.
+
+    See https://tools.ietf.org/html/rfc5173.
+    """
+
+    args_definition = 
+        comparator,
+        match_type,
+        {"name": "body-transform",
+         "values": ":raw", ":content", ":text",
+         "extra_arg": {"type": "stringlist", "valid_for": ":content"},
+         "type": "tag",
+         "required": False},
+        {"name": "key-list",
+         "type": "string", "stringlist",
+         "required": True},
+    
+    extension = "body"
+
+    def args_as_tuple(self):
+        """Return arguments as a list."""
+        result = ("body", )
+        result = result + (
+            self.arguments"body-transform", self.arguments"match-type")
+        value = self.arguments"key-list"
+        if isinstance(value, list):
+            # FIXME
+            value = "{}".format(
+                ",".join('"{}"'.format(item) for item in value))
+        if value.startswith(""):
+            result += tuple(tools.to_list(value))
+        else:
+            result += (value.strip('"'),)
+        return result
+
 
 class NotCommand(TestCommand):
     accept_children = True
 
     args_definition = 
         {"name": "test",
-         "type":  "test" ,
+         "type": "test",
          "required": True}
-        
+    
 
     def get_expected_first(self):
         return "identifier"
 
+
 class SizeCommand(TestCommand):
     args_definition = 
         {"name": "comparator",
-         "type":  "tag" ,
-         "values":  ":over", ":under" ,
+         "type": "tag",
+         "values": ":over", ":under",
          "required": True},
         {"name": "limit",
-         "type":  "number" ,
+         "type": "number",
+         "required": True},
+    
+
+    def args_as_tuple(self):
+        return ("size", self.arguments"comparator", self.arguments"limit")
+
+
+class HasflagCommand(TestCommand):
+    """imap4flags extension: hasflag."""
+
+    args_definition = 
+        comparator,
+        match_type,
+        {"name": "variable-list",
+         "type": "string", "stringlist",
+         "required": False},
+        {"name": "list-of-flags",
+         "type": "string", "stringlist",
+         "required": True}
+    
+    extension = "imap4flags"
+    non_deterministic_args = True
+
+    def reassign_arguments(self):
+        """Deal with optional stringlist before a required one."""
+        condition = (
+            "variable-list" in self.arguments and
+            "list-of-flags" not in self.arguments
+        )
+        if condition:
+            self.arguments"list-of-flags" = (
+                self.arguments.pop("variable-list"))
+            self.rargs_cnt = 1
+
+
+class DateCommand(TestCommand):
+    """date command, part of the date extension.
+
+    https://tools.ietf.org/html/rfc5260#section-4
+    """
+
+    extension = "date"
+    args_definition = 
+        {"name": "zone",
+         "type": "tag",
+         "values": ":zone", ":originalzone",
+         "extra_arg": {"type": "string", "valid_for": ":zone"},
+         "required": False},
+        comparator,
+        match_type,
+        {"name": "header-name",
+         "type": "string",
+         "required": True},
+        {"name": "date-part",
+         "type": "string",
+         "required": True},
+        {"name": "key-list",
+         "type": "string", "stringlist",
+         "required": True}
+    
+
+
+class CurrentdateCommand(TestCommand):
+    """currentdate command, part of the date extension.
+
+    http://tools.ietf.org/html/rfc5260#section-5
+    """
+
+    extension = "date"
+    args_definition = 
+        {"name": "zone",
+         "type": "tag",
+         "values": ":zone",
+         "extra_arg": {"type": "string"},
+         "required": False},
+        comparator,
+        match_type,
+        {"name": "date-part",
+         "type": "string",
          "required": True},
-        
+        {"name": "key-list",
+         "type": "string", "stringlist",
+         "required": True}
+    
+
+    def args_as_tuple(self):
+        """Return arguments as a list."""
+        result = ("currentdate", )
+        result += (
+            ":zone",
+            self.extra_arguments"zone".strip('"'),
+            self.arguments"match-type",
+        )
+        if self.arguments"match-type" in ":count", ":value":
+            result += (self.extra_arguments"match-type".strip('"'), )
+        result += (self.arguments"date-part".strip('"'), )
+        value = self.arguments"key-list"
+        if isinstance(value, list):
+            # FIXME
+            value = "{}".format(
+                ",".join('"{}"'.format(item) for item in value))
+        if value.startswith(""):
+            result = result + tuple(tools.to_list(value))
+        else:
+            result = result + (value.strip('"'),)
+        return result
+
 
 class VacationCommand(ActionCommand):
     args_definition = 
-        {"name": "days",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":days" ,
-          "extra_arg": {"type": "number"},
-          "required": False},
         {"name": "subject",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":subject" ,
-          "extra_arg": {"type": "string"},
-          "required": False},
+         "type": "tag",
+         "values": ":subject",
+         "extra_arg": {"type": "string"},
+         "required": False},
+        {"name": "days",
+         "type": "tag",
+         "values": ":days",
+         "extra_arg": {"type": "number"},
+         "required": False},
         {"name": "from",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":from" ,
-          "extra_arg": {"type": "string"},
-          "required": False},
+         "type": "tag",
+         "values": ":from",
+         "extra_arg": {"type": "string"},
+         "required": False},
         {"name": "addresses",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":addresses" ,
-          "extra_arg": {"type": "stringlist"},
-          "required": False},
+         "type": "tag",
+         "values": ":addresses",
+         "extra_arg": {"type": "string", "stringlist"},
+         "required": False},
         {"name": "handle",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":handle" ,
-          "extra_arg": {"type": "string"},
-          "required": False},
+         "type": "tag",
+         "values": ":handle",
+         "extra_arg": {"type": "string"},
+         "required": False},
         {"name": "mime",
-          "type":  "tag" ,
-          "write_tag": True,
-          "values":  ":mime" ,
-          "required": False},
+         "type": "tag",
+         "values": ":mime",
+         "required": False},
         {"name": "reason",
-         "type":  "string" ,
+         "type": "string",
+         "required": True},
+    
+
+
+class SetCommand(ControlCommand):
+
+    """set command, part of the variables extension
+
+    http://tools.ietf.org/html/rfc5229
+    """
+
+    extension = "variables"
+    args_definition = 
+        {"name": "startend",
+         "type": "string",
          "required": True},
-        
+        {"name": "date",
+         "type": "string",
+         "required": True}
+    
+
+
+def add_commands(cmds):
+    """
+    Adds one or more commands to the module namespace.
+    Commands must end in "Command" to be added.
+    Example (see tests/parser.py):
+    sievelib.commands.add_commands(MytestCommand)
+
+    :param cmds: a single Command Object or list of Command Objects
+    """
+    if not isinstance(cmds, Iterable):
+        cmds = cmds
+
+    for command in cmds:
+        if command.__name__.endswith("Command"):
+            globals()command.__name__ = command
 
 
 def get_command_instance(name, parent=None, checkexists=True):
@@ -718,8 +1099,12 @@
     :return: a new class instance
     """
     cname = "%sCommand" % name.lower().capitalize()
-    if not globals().has_key(cname) or \
-            (checkexists and globals()cname.is_extension and \
-                 not name in RequireCommand.loaded_extensions):
+    gl = globals()
+    condition = (
+        cname not in gl or
+        (checkexists and glcname.extension and
+         glcname.extension not in RequireCommand.loaded_extensions)
+    )
+    if condition:
         raise UnknownCommand(name)
-    return globals()cname(parent)
+    return glcname(parent)

sievelib-0.5.2.tar.gz/sievelib/digest_md5.py -> sievelib-1.2.1.tar.gz/sievelib/digest_md5.py Changed

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
 Simple Digest-MD5 implementation (client side)
 
@@ -12,13 +10,14 @@
 import re
 import random
 
+
 class DigestMD5(object):
     def __init__(self, challenge, digesturi):
         self.__digesturi = digesturi
         self.__challenge = challenge
 
         self.__params = {}
-        pexpr = re.compile('(\w+)="(.+)"')
+        pexpr = re.compile(r'(\w+)="(.+)"')
         for elt in base64.b64decode(challenge).split(","):
             m = pexpr.match(elt)
             if m is None:
@@ -38,32 +37,39 @@
         return binascii.hexlify(hashlib.md5(value).digest())
 
     def __make_response(self, username, password, check=False):
-        a1 = "%s:%s:%s" % (self.__digest("%s:%s:%s" % (username, self.realm, password)), 
-                           self.__params"nonce", self.cnonce)
+        a1 = "%s:%s:%s" % (
+            self.__digest("%s:%s:%s" % (username, self.realm, password)),
+            self.__params"nonce", self.cnonce
+        )
         if check:
             a2 = ":%s" % self.__digesturi
         else:
             a2 = "AUTHENTICATE:%s" % self.__digesturi
         resp = "%s:%s:00000001:%s:auth:%s" \
-            % (self.__hexdigest(a1), self.__params"nonce",
-               self.cnonce, self.__hexdigest(a2))
+               % (self.__hexdigest(a1), self.__params"nonce",
+                  self.cnonce, self.__hexdigest(a2))
 
         return self.__hexdigest(resp)
 
-    def response(self, username, password):
-        self.realm = self.__params"realm" if self.__params.has_key("realm") else ""
+    def response(self, username, password, authz_id=''):
+        self.realm = self.__params"realm" \
+            if self.__params.has_key("realm") else ""
         self.cnonce = self.__make_cnonce()
         respvalue = self.__make_response(username, password)
 
         dgres = 'username="%s",%snonce="%s",cnonce="%s",nc=00000001,qop=auth,' \
-            'digest-uri="%s",response=%s' \
-            % (username, ('realm="%s",' % self.realm) if len(self.realm) else "", 
+                'digest-uri="%s",response=%s' \
+            % (username,
+               ('realm="%s",' % self.realm) if len(self.realm) else "",
                self.__params"nonce", self.cnonce, self.__digesturi, respvalue)
+        if authz_id:
+            if type(authz_id) is unicode:
+                authz_id = authz_id.encode("utf-8")
+            dgres += ',authzid="%s"' % authz_id
 
         return base64.b64encode(dgres)
 
     def check_last_challenge(self, username, password, value):
         challenge = base64.b64decode(value.strip('"'))
         return challenge == \
-            ("rspauth=%s" % self.__make_response(username, password, True))
-        
+               ("rspauth=%s" % self.__make_response(username, password, True))

sievelib-0.5.2.tar.gz/sievelib/factory.py -> sievelib-1.2.1.tar.gz/sievelib/factory.py Changed

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
 Tools for simpler sieve filters generation.
 
@@ -9,18 +7,35 @@
 Only commands (control/test/action) defined in the ``commands`` module
 are supported.
 """
+
+import io
 import sys
-import cStringIO
-from commands import *
+
+from sievelib import commands
+
 
 class FiltersSet(object):
-    def __init__(self, name):
+
+    """A set of filters."""
+
+    def __init__(self, name, filter_name_pretext=u"# Filter: ",
+                 filter_desc_pretext=u"# Description: "):
+        """Represents a set of one or more filters
+
+        :param name: the filterset's name
+        :param filter_name_pretext: the text that is used to mark a filter name
+                                    (as comment preceding the filter)
+        :param filter_desc_pretext: the text that is used to mark a filter
+                                     description
+        """
         self.name = name
+        self.filter_name_pretext = filter_name_pretext
+        self.filter_desc_pretext = filter_desc_pretext
         self.requires = 
         self.filters = 
 
     def __str__(self):
-        target = cStringIO.StringIO()
+        target = io.StringIO()
         self.tosieve(target)
         ret = target.getvalue()
         target.close()
@@ -31,30 +46,37 @@
 
         Simply checks if the filter is surrounded by a "if false" test.
 
-        :param name: the filter's name
+        :param fcontent: the filter's name
         """
-        if not isinstance(fcontent, IfCommand):
+        if not isinstance(fcontent, commands.IfCommand):
             return False
-        if not isinstance(fcontent"test", FalseCommand):
+        if not isinstance(fcontent"test", commands.FalseCommand):
             return False
         return True
 
     def from_parser_result(self, parser):
         cpt = 1
         for f in parser.result:
-            if isinstance(f, RequireCommand):
+            if isinstance(f, commands.RequireCommand):
                 if type(f.arguments"capabilities") == list:
-                    map(self.require, f.arguments"capabilities")
+                    self.require(c) for c in f.arguments"capabilities"
                 else:
                     self.require(f.arguments"capabilities")
                 continue
-            if cpt - 1 >= len(parser.hash_comments):
-                name =  "Unnamed rule %d" % cpt
-            else:
-                name = parser.hash_commentscpt - 1.replace("# Filter: ", "")
-            self.filters += {"name" : name,
-                              "content" : f,
-                              "enabled" : not self.__isdisabled(f)}
+
+            name = "Unnamed rule %d" % cpt
+            description = ""
+            for comment in f.hash_comments:
+                if isinstance(comment, bytes):
+                    comment = comment.decode("utf-8")
+                if comment.startswith(self.filter_name_pretext):
+                    name = comment.replace(self.filter_name_pretext, "")
+                if comment.startswith(self.filter_desc_pretext):
+                    description = comment.replace(self.filter_desc_pretext, "")
+            self.filters += {"name": name,
+                              "description": description,
+                              "content": f,
+                              "enabled": not self.__isdisabled(f)}
             cpt += 1
 
     def require(self, name):
@@ -62,20 +84,56 @@
 
         :param name: the extension's name
         """
-
         name = name.strip('"')
-        if not name in self.requires:
+        if name not in self.requires:
             self.requires += name
 
+    def check_if_arg_is_extension(self, arg):
+        """Include extension if arg requires one."""
+        args_using_extensions = {
+            ":copy": "copy"
+        }
+        if arg in args_using_extensions:
+            self.require(args_using_extensionsarg)
+
     def __gen_require_command(self):
         """Internal method to create a RequireCommand based on requirements
 
         Called just before this object is going to be dumped.
         """
-        reqcmd = get_command_instance("require")
+        if not len(self.requires):
+            return None
+        reqcmd = commands.get_command_instance("require")
         reqcmd.check_next_arg("stringlist", self.requires)
         return reqcmd
 
+    def __quote_if_necessary(self, value):
+        """Add double quotes to the given string if necessary
+
+        :param value: the string to check
+        :return: the string between quotes
+        """
+        if not value.startswith(('"', "'")):
+            return '"%s"' % value
+        return value
+
+    def __build_condition(self, condition, parent, tag=None):
+        """Translate a condition to a valid sievelib Command.
+
+        :param list condition: condition's definition
+        :param ``Command`` parent: the parent
+        :param str tag: tag to use instead of the one included into :keyword:`condition`
+        :rtype: Command
+        :return: the generated command
+        """
+        if tag is None:
+            tag = condition1
+        cmd = commands.get_command_instance("header", parent)
+        cmd.check_next_arg("tag", tag)
+        cmd.check_next_arg("string", self.__quote_if_necessary(condition0))
+        cmd.check_next_arg("string", self.__quote_if_necessary(condition2))
+        return cmd
+
     def __create_filter(self, conditions, actions, matchtype="anyof"):
         """Create a new filter
 
@@ -99,85 +157,121 @@
         :param actions: the list of actions
         :param matchtype: "anyof" or "allof"
         """
-        ifcontrol = get_command_instance("if")
-        mtypeobj = get_command_instance(matchtype, ifcontrol)
+        ifcontrol = commands.get_command_instance("if")
+        mtypeobj = commands.get_command_instance(matchtype, ifcontrol)
         for c in conditions:
-            _cmd = None
-
-            if c0 == "not":
-                _cmd = get_command_instance(c0, ifcontrol)
-                c = c1
-
-            if c0 in "true", "false":
-                cmd = get_command_instance(c0, ifcontrol)
-            elif c in "true", "false":
-                cmd = get_command_instance(c, ifcontrol)
-            elif c0 == "size":
-                cmd = get_command_instance("size", ifcontrol)
+            if c0.startswith("not"):
+                negate = True
+                cname = c0.replace("not", "", 1)
+            else:
+                negate = False
+                cname = c0
+            if cname in ("true", "false"):
+                cmd = commands.get_command_instance(c0, ifcontrol)
+            elif cname == "size":
+                cmd = commands.get_command_instance("size", ifcontrol)
                 cmd.check_next_arg("tag", c1)
                 cmd.check_next_arg("number", c2)
-            elif c0 == "envelope":
-                cmd = get_command_instance("envelope", ifcontrol)
-                for param in c1::
-                    try:
-                        cmd.check_next_arg("tag", param)
-                    except:
-                        try:
-                            cmd.check_next_arg("string", param)
-                        except:
-                            try:
-                                cmd.check_next_arg("stringlist", param)
-                            except:
-                                pass
-
-            else:
-                cmd = get_command_instance("header", ifcontrol)
-                if c0 == "header":
-                    params = c1:
+            elif cname == "exists":
+                cmd = commands.get_command_instance("exists", ifcontrol)
+                cmd.check_next_arg(
+                    "stringlist",
+                    "%s" % (",".join('"%s"' % val for val in c1:))
+                )
+            elif cname == "envelope":
+                cmd = commands.get_command_instance(
+                    "envelope", ifcontrol, False)
+                self.require("envelope")
+                if c1.startswith(":not"):
+                    comp_tag = c1.replace("not", "")
+                    negate = True
+                else:
+                    comp_tag = c1
+                cmd.check_next_arg("tag", comp_tag)
+                cmd.check_next_arg(
+                    "stringlist",
+                    "{}".format(",".join('"{}"'.format(val) for val in c2))
+                )
+                cmd.check_next_arg(
+                    "stringlist",
+                    "{}".format(",".join('"{}"'.format(val) for val in c3))
+                )
+            elif cname == "body":
+                cmd = commands.get_command_instance("body", ifcontrol, False)
+                self.require(cmd.extension)
+                cmd.check_next_arg("tag", c1)
+                if c2.startswith(":not"):
+                    comp_tag = c2.replace("not", "")
+                    negate = True
+                else:
+                    comp_tag = c2
+                cmd.check_next_arg("tag", comp_tag)
+                cmd.check_next_arg(
+                    "stringlist",
+                    "%s" % (",".join('"%s"' % val for val in c3:))
+                )
+            elif cname == "currentdate":
+                cmd = commands.get_command_instance(
+                    "currentdate", ifcontrol, False)
+                self.require(cmd.extension)
+                cmd.check_next_arg("tag", c1)
+                cmd.check_next_arg("string", self.__quote_if_necessary(c2))
+                if c3.startswith(":not"):
+                    comp_tag = c3.replace("not", "")
+                    negate = True
                 else:
-                    params = c
-
-                for param in params:
-                    try:
-                        cmd.check_next_arg("tag", param)
-                    except:
-                        try:
-                            cmd.check_next_arg("string", param)
-                        except:
-                            try:
-                                cmd.check_next_arg("stringlist", param)
-                            except:
-                                pass
-
-            if not _cmd == None:
-                _cmd.check_next_arg("test", cmd)
-                mtypeobj.check_next_arg("test", _cmd)
+                    comp_tag = c3
+                cmd.check_next_arg("tag", comp_tag, check_extension=False)
+                next_arg_pos = 4
+                if comp_tag == ":value":
+                    self.require("relational")
+                    cmd.check_next_arg(
+                        "string", self.__quote_if_necessary(cnext_arg_pos))
+                    next_arg_pos += 1
+                cmd.check_next_arg(
+                    "string", self.__quote_if_necessary(cnext_arg_pos))
+                next_arg_pos += 1
+                cmd.check_next_arg(
+                    "stringlist",
+                    "%s" %
+                    (",".join('"%s"' % val for val in cnext_arg_pos:))
+                )
             else:
-                mtypeobj.check_next_arg("test", cmd)
-
+                # header command fallback
+                if c1.startswith(':not'):
+                    cmd = self.__build_condition(
+                        c, ifcontrol, c1.replace("not", "", 1))
+                    negate = True
+                else:
+                    cmd = self.__build_condition(c, ifcontrol)
+            if negate:
+                not_cmd = commands.get_command_instance("not", ifcontrol)
+                not_cmd.check_next_arg("test", cmd)
+                cmd = not_cmd
+            mtypeobj.check_next_arg("test", cmd)
         ifcontrol.check_next_arg("test", mtypeobj)
 
         for actdef in actions:
-            if actdef in  "discard", "keep", "stop":
-                action = get_command_instance(actdef, ifcontrol, False)
-            else:
-                #self.require(actdef0)
-                action = get_command_instance(actdef0, ifcontrol, False)
-                if len(actdef) > 1:
-                    for arg in actdef1::
-                        if isinstance(arg, basestring) or isinstance(arg, str):
-                            try:
-                                action.check_next_arg("string", arg)
-                            except:
-                                action.check_next_arg("tag", arg)
-                        elif isinstance(arg, list):
-                            action.check_next_arg("stringlist", arg)
-                        elif isinstance(arg, int):
-                            action.check_next_arg("number", arg)
-
+            action = commands.get_command_instance(actdef0, ifcontrol, False)
+            if action.extension is not None:
+                self.require(action.extension)
+            for arg in actdef1::
+                self.check_if_arg_is_extension(arg)
+                if arg.startswith(":"):
+                    atype = "tag"
+                else:
+                    atype = "string"
+                    arg = self.__quote_if_necessary(arg)
+                action.check_next_arg(atype, arg, check_extension=False)
             ifcontrol.addchild(action)
         return ifcontrol
 
+    def _unicode_filter_name(self, name):
+        """Convert name to unicode if necessary."""
+        return (
+            name.decode("utf-8") if isinstance(name, bytes) else name
+        )
+
     def addfilter(self, name, conditions, actions, matchtype="anyof"):
         """Add a new filter to this filters set
 
@@ -187,19 +281,26 @@
         :param matchtype: "anyof" or "allof"
         """
         ifcontrol = self.__create_filter(conditions, actions, matchtype)
-        self.filters += {"name" : name, "content" : ifcontrol, "enabled" : True}
+        self.filters += {
+            "name": self._unicode_filter_name(name), "content": ifcontrol,
+            "enabled": True}
+        
 
-    def updatefilter(self, oldname, newname, conditions, actions, matchtype="anyof"):
+    def updatefilter(
+            self, oldname, newname, conditions, actions, matchtype="anyof"):
         """Update a specific filter
 
         Instead of removing and re-creating the filter, we update the
-        content in order to keep the original ordre between filters.
+        content in order to keep the original order between filters.
 
-        :param name: the filter's name
+        :param oldname: the filter's current name
+        :param newname: the filter's new name
         :param conditions: the list of conditions
         :param actions: the list of actions
         :param matchtype: "anyof" or "allof"
         """
+        oldname = self._unicode_filter_name(oldname)
+        newname = self._unicode_filter_name(newname)
         for f in self.filters:
             if f"name" == oldname:
                 f"name" = newname
@@ -210,12 +311,40 @@
                 return True
         return False
 
+    def replacefilter(
+            self, oldname, sieve_filter, newname=None, description=None):
+        """replace a specific sieve_filter
+
+        Instead of removing and re-creating the sieve_filter, we update the
+        content in order to keep the original order between filters.
+
+        :param oldname: the sieve_filter's current name
+        :param newname: the sieve_filter's new name
+        :param sieve_filter: the sieve_filter object as get from
+                             FiltersSet.getfilter()
+        """
+        oldname = self._unicode_filter_name(oldname)
+        newname = self._unicode_filter_name(newname)
+        if newname is None:
+            newname = oldname
+        for f in self.filters:
+            if f"name" == oldname:
+                f"name" = newname
+                f"content" = sieve_filter
+                if description is not None:
+                    f'description' = description
+                if not f"enabled":
+                    return self.disablefilter(newname)
+                return True
+        return False
+
     def getfilter(self, name):
         """Search for a specific filter
 
         :param name: the filter's name
         :return: the Command object if found, None otherwise
         """
+        name = self._unicode_filter_name(name)
         for f in self.filters:
             if f"name" == name:
                 if not f"enabled":
@@ -223,11 +352,80 @@
                 return f"content"
         return None
 
+    def get_filter_matchtype(self, name):
+        """Retrieve matchtype of the given filter."""
+        flt = self.getfilter(name)
+        if not flt:
+            return None
+        for node in flt.walk():
+            if isinstance(node, (commands.AllofCommand,
+                                 commands.AnyofCommand)):
+                return node.__class__.__name__.lower().replace("command", "")
+        return None
+
+    def get_filter_conditions(self, name):
+        """Retrieve conditions of the given filter."""
+        flt = self.getfilter(name)
+        if not flt:
+            return None
+        conditions = 
+        negate = False
+        for node in flt.walk():
+            if isinstance(node, commands.NotCommand):
+                negate = True
+            elif isinstance(node, (commands.HeaderCommand,
+                                   commands.SizeCommand,
+                                   commands.ExistsCommand,
+                                   commands.BodyCommand,
+                                   commands.EnvelopeCommand,
+                                   commands.CurrentdateCommand)):
+                args = node.args_as_tuple()
+                if negate:
+                    if node.name in "header", "envelope":
+                        nargs = (
+                            args0,
+                            ":not{}".format(args11:)
+                        )
+                        if len(args) > 3:
+                            nargs += (args2:)
+                        else:
+                            nargs += (args2,)
+                        args = nargs
+                    elif node.name == "body":
+                        args = (
+                            args:2 +
+                            (":not{}".format(args21:),) +
+                            args3:
+                        )
+                    elif node.name == "currentdate":
+                        args = (
+                            args:3 +
+                            (":not{}".format(args31:),) +
+                            args4:
+                        )
+                    elif node.name == "exists":
+                        args = ("not{}".format(args0),) + args1:
+                    negate = False
+                conditions.append(args)
+        return conditions
+
+    def get_filter_actions(self, name):
+        """Retrieve actions of the given filter."""
+        flt = self.getfilter(name)
+        if not flt:
+            return None
+        actions = 
+        for node in flt.walk():
+            if isinstance(node, commands.ActionCommand):
+                actions.append(node.args_as_tuple())
+        return actions
+
     def removefilter(self, name):
         """Remove a specific filter
 
         :param name: the filter's name
         """
+        name = self._unicode_filter_name(name)
         for f in self.filters:
             if f"name" == name:
                 self.filters.remove(f)
@@ -241,6 +439,7 @@
 
         :param name: the filter's name
         """
+        name = self._unicode_filter_name(name)
         for f in self.filters:
             if f"name" != name:
                 continue
@@ -249,13 +448,14 @@
             f"content" = f"content".children0
             f"enabled" = True
             return True
-        return False # raise NotFound
+        return False  # raise NotFound
 
     def is_filter_disabled(self, name):
         """Tells if the filter is currently disabled or not
 
         :param name: the filter's name
         """
+        name = self._unicode_filter_name(name)
         for f in self.filters:
             if f"name" == name:
                 return self.__isdisabled(f"content")
@@ -268,9 +468,11 @@
         "if false { }" test.
 
         :param name: the filter's name
+        :return: True if filter was disabled, False otherwise
         """
-        ifcontrol = get_command_instance("if")
-        falsecmd = get_command_instance("false", ifcontrol)
+        name = self._unicode_filter_name(name)
+        ifcontrol = commands.get_command_instance("if")
+        falsecmd = commands.get_command_instance("false", ifcontrol)
         ifcontrol.check_next_arg("test", falsecmd)
         for f in self.filters:
             if f"name" != name:
@@ -287,6 +489,7 @@
         :param name: the filter's name
         :param direction: string "up" or "down"
         """
+        name = self._unicode_filter_name(name)
         cpt = 0
         for f in self.filters:
             if f"name" == name:
@@ -302,17 +505,23 @@
                 self.filters.insert(cpt + 1, f)
                 return True
             cpt += 1
-        return False # raise not found
+        return False  # raise not found
 
     def dump(self):
         """Dump this object
 
         Available for debugging purposes
         """
-
-        self.__gen_require_command().dump()
+        print("Dumping filters set %s\n" % self.name)
+        cmd = self.__gen_require_command()
+        if cmd:
+            print("Dumping requirements")
+            cmd.dump()
+            print
 
         for f in self.filters:
+            print("Filter Name: %s" % f"name")
+            print("Filter Description: %s" % f"description")
             f"content".dump()
 
     def tosieve(self, target=sys.stdout):
@@ -325,9 +534,15 @@
 
         :param target: file pointer where the sieve syntax will be printed
         """
-        self.__gen_require_command().tosieve(target=target)
-        target.write("\n")
+        cmd = self.__gen_require_command()
+        if cmd:
+            cmd.tosieve(target=target)
+            target.write(u"\n")
         for f in self.filters:
+            target.write("{}{}\n".format(self.filter_name_pretext, f"name"))
+            if "description" in f and f"description":
+                target.write(u"{}{}\n".format(
+                    self.filter_desc_pretext, f"description"))
             f"content".tosieve(target=target)
 
 
@@ -335,7 +550,6 @@
     fs = FiltersSet("test")
 
     fs.addfilter("rule1",
-                 ("Sender", ":is", "toto@toto.com"),,
-                 ("fileinto", "Toto"),)
+                 ("Sender", ":is", "toto@toto.com"), ,
+                 ("fileinto", "Toto"), )
     fs.tosieve()
-

sievelib-0.5.2.tar.gz/sievelib/managesieve.py -> sievelib-1.2.1.tar.gz/sievelib/managesieve.py Changed

@@ -1,38 +1,34 @@
-#!/usr/bin/env python
-# coding: utf-8
-
 """
-A MANAGESIEVE client
+A MANAGESIEVE client.
 
 A protocol for securely managing Sieve scripts on a remote server.
 This protocol allows a user to have multiple scripts, and also alerts
 a user to syntactically flawed scripts.
 
-Implementation based on <draft-martin-managesieve-12>.
+Implementation based on RFC 5804.
 """
-
-import sys, os
-import socket
-import re
 import base64
+import re
+import socket
 import ssl
 
-from digest_md5 import DigestMD5
+from .digest_md5 import DigestMD5
+from . import tools
 
-from binascii import b2a_base64
 
-CRLF = '\r\n'
+CRLF = b"\r\n"
 
-KNOWN_CAPABILITIES = "IMPLEMENTATION", "SASL", "SIEVE",
-                      "STARTTLS", "NOTIFY", "LANGUAGE",
-                      "RENAME"
+KNOWN_CAPABILITIES = u"IMPLEMENTATION", u"SASL", u"SIEVE",
+                      u"STARTTLS", u"NOTIFY", u"LANGUAGE",
+                      u"VERSION"
 
-SUPPORTED_AUTH_MECHS = "DIGEST-MD5", "PLAIN", "LOGIN"
+SUPPORTED_AUTH_MECHS = u"DIGEST-MD5", u"PLAIN", u"LOGIN"
 
 
 class Error(Exception):
     pass
 
+
 class Response(Exception):
     def __init__(self, code, data):
         self.code = code
@@ -41,6 +37,7 @@
     def __str__(self):
         return "%s %s" % (self.code, self.data)
 
+
 class Literal(Exception):
     def __init__(self, value):
         self.value = value
@@ -48,6 +45,7 @@
     def __str__(self):
         return "{%d}" % self.value
 
+
 def authentication_required(meth):
     """Simple class method decorator.
 
@@ -55,30 +53,33 @@
 
     :param meth: the original called method
     """
+
     def check(cls, *args, **kwargs):
         if cls.authenticated:
             return meth(cls, *args, **kwargs)
         raise Error("Authentication required")
+
     return check
 
+
 class Client(object):
     read_size = 4096
     read_timeout = 5
 
-    def __init__(self, srvaddr, srvport=2000, debug=False):
+    def __init__(self, srvaddr, srvport=4190, debug=False):
         self.srvaddr = srvaddr
         self.srvport = srvport
         self.__debug = debug
         self.sock = None
-        self.__read_buffer = ""
+        self.__read_buffer = b""
         self.authenticated = False
         self.errcode = None
 
         self.__capabilities = {}
-        self.__respcode_expr = re.compile("(OK|NO|BYE)\s*(.+)?")
-        self.__error_expr = re.compile('($\w+$)?\s*(".+")')
-        self.__size_expr = re.compile("\{(\d+)\+?\}")
-        self.__active_expr = re.compile("ACTIVE", re.IGNORECASE)
+        self.__respcode_expr = re.compile(br"(OK|NO|BYE)\s*(.+)?")
+        self.__error_expr = re.compile(br'($\w/-+$)?\s*(".+")')
+        self.__size_expr = re.compile(br"\{(\d+)\+?\}")
+        self.__active_expr = re.compile(br"ACTIVE", re.IGNORECASE)
 
     def __del__(self):
         if self.sock is not None:
@@ -88,7 +89,7 @@
     def __dprint(self, message):
         if not self.__debug:
             return
-        print(message)
+        print("DEBUG: %s" % message)
 
     def __read_block(self, size):
         """Read a block of 'size' bytes from the server.
@@ -105,9 +106,12 @@
         :rtype: string
         :returns: the read block (can be empty)
         """
-        buf = ""
+        buf = b""
         if len(self.__read_buffer):
-            limit = size if size <= len(self.__read_buffer) else len(self.__read_buffer)
+            limit = (
+                size if size <= len(self.__read_buffer) else
+                len(self.__read_buffer)
+            )
             buf = self.__read_buffer:limit
             self.__read_buffer = self.__read_bufferlimit:
             size -= limit
@@ -115,9 +119,9 @@
             return buf
         try:
             buf += self.sock.recv(size)
-        except (socket.timeout, ssl.SSLError) as err:
+        except (socket.timeout, ssl.SSLError):
             raise Error("Failed to read %d bytes from the server" % size)
-        self.__dprint("S: %s" % buf)
+        self.__dprint(buf)
         return buf
 
     def __read_line(self):
@@ -135,17 +139,18 @@
         :rtype: string
         :return: the read line
         """
-        ret = ""
+        ret = b""
         while True:
             try:
                 pos = self.__read_buffer.index(CRLF)
-                ret = self.__read_buffer0:pos
-                self.__read_buffer = self.__read_bufferpos+len(CRLF):
+                ret = self.__read_buffer:pos
+                self.__read_buffer = self.__read_bufferpos + len(CRLF):
                 break
             except ValueError:
                 pass
             try:
                 nval = self.sock.recv(self.read_size)
+                self.__dprint(nval)
                 if not len(nval):
                     break
                 self.__read_buffer += nval
@@ -159,12 +164,11 @@
 
             m = self.__respcode_expr.match(ret)
             if m:
-                if m.group(1) == "BYE":
+                if m.group(1) == b"BYE":
                     raise Error("Connection closed by server")
-                if m.group(1) == "NO":
+                if m.group(1) == b"NO":
                     self.__parse_error(m.group(2))
                 raise Response(m.group(1), m.group(2))
-        self.__dprint("S: %s" % ret)
         return ret
 
     def __read_response(self, nblines=-1):
@@ -180,7 +184,7 @@
         :return: a tuple of the form (code, data, response). If
         nblines is provided, code and data can be equal to None.
         """
-        resp, code, data = ("", None, None)
+        resp, code, data = (b"", None, None)
         cpt = 0
         while True:
             try:
@@ -191,6 +195,8 @@
                 break
             except Literal as inst:
                 resp += self.__read_block(inst.value)
+                if not resp.endswith(CRLF):
+                    resp += self.__read_line() + CRLF
                 continue
             if not len(line):
                 continue
@@ -212,38 +218,65 @@
         """
         ret = 
         for a in args:
-            if type(a) in str, unicode and self.__size_expr.match(a) is None:
-                ret += '"%s"' % a.encode('utf-8')
+            if isinstance(a, bytes):
+                if self.__size_expr.match(a):
+                    ret += a
+                else:
+                    ret += b'"' + a + b'"'
                 continue
-            ret += "%s" % str(a)
+            ret += bytes(str(a).encode("utf-8"))
         return ret
 
-    def __send_command(self, name, args=, withcontent=False, extralines=, nblines=-1):
+    def __prepare_content(self, content):
+        """Format script content before sending it.
+
+        Script length must be inserted before the content,
+        enclosed in curly braces, separated by CRLF.
+
+        :param content: script content as str or bytes
+        :return: transformed script as bytes
+        """
+        if isinstance(content, str):
+            content = content.encode('utf-8')
+        return b"{%d+}%s%s" % (len(content), CRLF, content)
+
+    def __send_command(
+            self, name, args=None, withcontent=False, extralines=None,
+            nblines=-1):
         """Send a command to the server.
 
         If args is not empty, we concatenate the given command with
         the content of this list. If extralines is not empty, they are
-        sent one by one to the server. (CLRF are automatically appended to them)
+        sent one by one to the server. (CLRF are automatically
+        appended to them)
 
         We wait for a response just after the command has been sent.
 
         :param name: the command to sent
         :param args: a list of arguments for this command
-        :param withcontent: tells the function to return the server's response or not
+        :param withcontent: tells the function to return the server's response
+                            or not
         :param extralines: a list of extra lines to sent after the command
         :param nblines: the number of response lines to read (all by default)
 
         :returns: a tuple of the form (code, data, response)
+
         """
-        tosend = name
-        if len(args):
-            tosend += " " + " ".join(self.__prepare_args(args))
-        self.__dprint("C: %s" % tosend)
-        self.sock.send("%s%s" % (tosend, CRLF))
-        for l in extralines:
-            self.sock.send("%s%s" % (l, CRLF))
+        tosend = name.encode("utf-8")
+        if args:
+            tosend += b" " + b" ".join(self.__prepare_args(args))
+        self.__dprint(b"Command: " + tosend)
+        self.sock.sendall(tosend + CRLF)
+        if extralines:
+            for l in extralines:
+                self.sock.sendall(l + CRLF)
         code, data, content = self.__read_response(nblines)
 
+        if isinstance(code, bytes):
+            code = code.decode("utf-8")
+        if isinstance(data, bytes):
+            data = data.decode("utf-8")
+
         if withcontent:
             return (code, data, content)
         return (code, data)
@@ -253,13 +286,15 @@
         if code == "NO":
             return False
 
-        for l in capabilities.splitlines()0:-1:
+        for l in capabilities.splitlines():
             parts = l.split(None, 1)
-            cname = parts0.strip('"')
-            if not cname in KNOWN_CAPABILITIES:
+            cname = parts0.strip(b'"').decode("utf-8")
+            if cname not in KNOWN_CAPABILITIES:
                 continue
-            self.__capabilitiescname = \
-                parts1.strip('"') if len(parts) > 1 else None
+            self.__capabilitiescname = (
+                parts1.strip(b'"').decode("utf-8")
+                if len(parts) > 1 else None
+            )
         return True
 
     def __parse_error(self, text):
@@ -277,7 +312,7 @@
         """
         m = self.__size_expr.match(text)
         if m is not None:
-            self.errcode = ""
+            self.errcode = b""
             self.errmsg = self.__read_block(int(m.group(1)) + 2)
             return
 
@@ -285,45 +320,44 @@
         if m is None:
             raise Error("Bad error message")
         if m.group(1) is not None:
-            self.errcode = m.group(1).strip("()")
+            self.errcode = m.group(1).strip(b"()")
         else:
-            self.errcode = ""
-        self.errmsg = m.group(2).strip('"')
+            self.errcode = b""
+        self.errmsg = m.group(2).strip(b'"')
 
-    def _plain_authentication(self, login, password, authzid=None):
+    def _plain_authentication(self, login, password, authz_id=b""):
         """SASL PLAIN authentication
 
         :param login: username
         :param password: clear password
         :return: True on success, False otherwise.
         """
-        if not authzid == None:
-            params = b2a_base64("%s\0%s\0%s" % (authzid, login, password)).strip()
-        else:
-            params = base64.b64encode('\0' + '\0'.join(login, password))
-
-        code, data = self.__send_command("AUTHENTICATE", "PLAIN", params)
-
+        if isinstance(login, str):
+            login = login.encode("utf-8")
+        if isinstance(password, str):
+            password = password.encode("utf-8")
+        params = base64.b64encode(b'\0'.join(authz_id, login, password))
+        code, data = self.__send_command("AUTHENTICATE", b"PLAIN", params)
         if code == "OK":
             return True
         return False
 
-    def _login_authentication(self, login, password):
+    def _login_authentication(self, login, password, authz_id=""):
         """SASL LOGIN authentication
 
         :param login: username
         :param password: clear password
         :return: True on success, False otherwise.
         """
-        extralines = '"%s"' % base64.b64encode(login),
-                      '"%s"' % base64.b64encode(password)
-        code, data = self.__send_command("AUTHENTICATE", "LOGIN",
+        extralines = b'"%s"' % base64.b64encode(login.encode("utf-8")),
+                      b'"%s"' % base64.b64encode(password.encode("utf-8"))
+        code, data = self.__send_command("AUTHENTICATE", b"LOGIN",
                                          extralines=extralines)
         if code == "OK":
             return True
         return False
 
-    def _digest_md5_authentication(self, login, password):
+    def _digest_md5_authentication(self, login, password, authz_id=""):
         """SASL DIGEST-MD5 authentication
 
         :param login: username
@@ -331,14 +365,15 @@
         :return: True on success, False otherwise.
         """
         code, data, challenge = \
-            self.__send_command("AUTHENTICATE", "DIGEST-MD5",
+            self.__send_command("AUTHENTICATE", b"DIGEST-MD5",
                                 withcontent=True, nblines=1)
         dmd5 = DigestMD5(challenge, "sieve/%s" % self.srvaddr)
 
-        code, data, challenge = \
-            self.__send_command('"%s"' % dmd5.response(login, password),
-                                withcontent=True, nblines=1)
-        if not len(challenge):
+        code, data, challenge = self.__send_command(
+            '"%s"' % dmd5.response(login, password, authz_id),
+            withcontent=True, nblines=1
+        )
+        if not challenge:
             return False
         if not dmd5.check_last_challenge(login, password, challenge):
             self.errmsg = "Bad challenge received from server"
@@ -348,7 +383,7 @@
             return True
         return False
 
-    def __authenticate(self, login, password, authmech=None):
+    def __authenticate(self, login, password, authz_id=b"", authmech=None):
         """AUTHENTICATE command
 
         Actually, it is just a wrapper to the real commands (one by
@@ -360,10 +395,11 @@
 
         :param login: username
         :param password: clear password
+        :param authz_id: authorization ID
         :param authmech: prefered authentication mechanism
         :return: True on success, False otherwise
         """
-        if not self.__capabilities.has_key("SASL"):
+        if "SASL" not in self.__capabilities:
             raise Error("SASL not supported by the server")
         srv_mechanisms = self.get_sasl_mechanisms()
 
@@ -373,16 +409,16 @@
             mech_list = authmech
 
         for mech in mech_list:
-            if not mech in srv_mechanisms:
+            if mech not in srv_mechanisms:
                 continue
-            mech = mech.lower()
-            mech = re.sub("-", "_", mech)
-            if getattr(self, "_%s_authentication" % mech.lower())(login, password):
+            mech = mech.lower().replace("-", "_")
+            auth_method = getattr(self, "_%s_authentication" % mech)
+            if auth_method(login, password, authz_id):
                 self.authenticated = True
                 return True
             return False
 
-        self.errmsg = "No suitable mechanism found"
+        self.errmsg = b"No suitable mechanism found"
         return False
 
     def __starttls(self, keyfile=None, certfile=None):
@@ -401,8 +437,8 @@
             return False
         try:
             nsock = ssl.wrap_socket(self.sock, keyfile, certfile)
-        except ssl.SSLError as err:
-            raise Error("SSL error: %s" % str(err))
+        except ssl.SSLError as e:
+            raise Error("SSL error: %s" % str(e))
         self.sock = nsock
         self.__capabilities = {}
         self.__get_capabilities()
@@ -436,7 +472,7 @@
 
         :rtype: boolean
         """
-        return self.__capabilities.has_key("STARTTLS")
+        return "STARTTLS" in self.__capabilities
 
     def get_sieve_capabilities(self):
         """Returns the SIEVE extensions supported by the server.
@@ -446,11 +482,13 @@
 
         :rtype: string
         """
-        if type(self.__capabilities"SIEVE") == str:
+        if isinstance(self.__capabilities"SIEVE", str):
             self.__capabilities"SIEVE" = self.__capabilities"SIEVE".split()
         return self.__capabilities"SIEVE"
 
-    def connect(self, login=None, password=None, starttls=False, authmech=None):
+    def connect(
+            self, login, password, authz_id=b"", starttls=False,
+            authmech=None):
         """Establish a connection with the server.
 
         This function must be used. It read the server capabilities
@@ -463,25 +501,18 @@
         :rtype: boolean
         """
         try:
-            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            self.sock.connect((self.srvaddr, self.srvport))
+            self.sock = socket.create_connection((self.srvaddr, self.srvport))
             self.sock.settimeout(Client.read_timeout)
         except socket.error as msg:
             raise Error("Connection to server failed: %s" % str(msg))
 
         if not self.__get_capabilities():
             raise Error("Failed to read capabilities from server")
-
         if starttls and not self.__starttls():
             return False
-
-        if not login == None and not password == None:
-            if self.__authenticate(login, password, authmech):
-                return True
-            else:
-                return False
-        else:
+        if self.__authenticate(login, password, authz_id, authmech):
             return True
+        return False
 
     def logout(self):
         """Disconnect from the server
@@ -498,8 +529,8 @@
 
         :rtype: string
         """
-        code, data, capabilities = \
-            self.__send_command("CAPABILITY", withcontent=True)
+        code, data, capabilities = (
+            self.__send_command("CAPABILITY", withcontent=True))
         if code == "OK":
             return capabilities
         return None
@@ -514,7 +545,8 @@
         :param scriptsize: script's size
         :rtype: boolean
         """
-        code, data = self.__send_command("HAVESPACE", scriptname, scriptsize)
+        code, data = self.__send_command(
+            "HAVESPACE", scriptname.encode("utf-8"), scriptsize)
         if code == "OK":
             return True
         return False
@@ -527,7 +559,8 @@
 
         :returns: a 2-uple (active script, script1, ...)
         """
-        code, data, listing = self.__send_command("LISTSCRIPTS", withcontent=True)
+        code, data, listing = self.__send_command(
+            "LISTSCRIPTS", withcontent=True)
         if code == "NO":
             return None
         ret = 
@@ -535,14 +568,15 @@
         for l in listing.splitlines():
             if self.__size_expr.match(l):
                 continue
-            m = re.match('"(^"+)"\s*(.+)', l)
+            m = re.match(br'"(^"+)"\s*(.+)', l)
             if m is None:
-                ret += l.strip('"')
-            else:
-                if self.__active_expr.match(m.group(2)):
-                    active_script = m.group(1)
-                else:
-                    ret += m.group(1)
+                ret += l.strip(b'"').decode("utf-8")
+                continue
+            script = m.group(1).decode("utf-8")
+            if self.__active_expr.match(m.group(2)):
+                active_script = script
+                continue
+            ret += script
         self.__dprint(ret)
         return (active_script, ret)
 
@@ -556,12 +590,13 @@
         :rtype: string
         :returns: the script's content on succes, None otherwise
         """
-        code, data, content = self.__send_command("GETSCRIPT", name, withcontent=True)
+        code, data, content = self.__send_command(
+            "GETSCRIPT", name.encode("utf-8"), withcontent=True)
         if code == "OK":
             lines = content.splitlines()
             if self.__size_expr.match(lines0) is not None:
                 lines = lines1:
-            return "\n".join(lines)
+            return u"\n".join(line.decode("utf-8") for line in lines)
         return None
 
     @authentication_required
@@ -574,14 +609,9 @@
         :param content: script's content
         :rtype: boolean
         """
-        if type(content) is unicode:
-            content = content.encode("utf-8")
-
-        content = "{%d+}%s%s" % (len(content), CRLF, content)
-        code, data = \
-            self.__send_command("PUTSCRIPT", name, content)
-
-
+        content = self.__prepare_content(content)
+        code, data = (
+            self.__send_command("PUTSCRIPT", name.encode("utf-8"), content))
         if code == "OK":
             return True
         return False
@@ -595,7 +625,8 @@
         :param name: script's name
         :rtype: boolean
         """
-        code, data = self.__send_command("DELETESCRIPT", name)
+        code, data = self.__send_command(
+            "DELETESCRIPT", name.encode("utf-8"))
         if code == "OK":
             return True
         return False
@@ -613,18 +644,24 @@
         :param newname: new script's name
         :rtype: boolean
         """
-        if self.__capabilities.has_key("RENAMESCRIPT"):
-            code, data = self.__send_command("RENAMESCRIPT", oldname, newname)
+        if "VERSION" in self.__capabilities:
+            code, data = self.__send_command(
+                "RENAMESCRIPT",
+                oldname.encode("utf-8"), newname.encode("utf-8"))
             if code == "OK":
                 return True
             return False
 
         (active_script, scripts) = self.listscripts()
-        if scripts == None or not oldname in scripts:
-            self.errmsg = "Old script does not exist"
+        condition = (
+            oldname != active_script and
+            (scripts is None or oldname not in scripts)
+        )
+        if condition:
+            self.errmsg = b"Old script does not exist"
             return False
         if newname in scripts:
-            self.errmsg = "New script already exists"
+            self.errmsg = b"New script already exists"
             return False
         oldscript = self.getscript(oldname)
         if oldscript is None:
@@ -650,8 +687,26 @@
         :param scriptname: script's name
         :rtype: boolean
         """
-        code, data = self.__send_command("SETACTIVE", scriptname)
+        code, data = self.__send_command(
+            "SETACTIVE", scriptname.encode("utf-8"))
         if code == "OK":
             return True
         return False
 
+    @authentication_required
+    def checkscript(self, content):
+        """Check whether a script is valid
+
+        See MANAGESIEVE specifications, section 2.12
+
+        :param name: script's content
+        :rtype: boolean
+        """
+        if "VERSION" not in self.__capabilities:
+            raise NotImplementedError(
+                "server does not support CHECKSCRIPT command")
+        content = self.__prepare_content(content)
+        code, data = self.__send_command("CHECKSCRIPT", content)
+        if code == "OK":
+            return True
+        return False

sievelib-0.5.2.tar.gz/sievelib/parser.py -> sievelib-1.2.1.tar.gz/sievelib/parser.py Changed

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 """
 This module provides a simple but functional parser for the SIEVE
@@ -11,16 +10,20 @@
 import re
 import sys
 
-from commands import get_command_instance, UnknownCommand, BadArgument, BadValue
+from sievelib.commands import (
+    get_command_instance, CommandError, RequireCommand)
+
 
 class ParseError(Exception):
     """Generic parsing error"""
+
     def __init__(self, msg):
         self.msg = msg
 
     def __str__(self):
         return "parsing error: %s" % self.msg
 
+
 class Lexer(object):
     """
     The lexical analysis part.
@@ -31,20 +34,26 @@
     Patterns are provided into a list of 2-uple. Each 2-uple consists
     of a token name and an associated pattern, example:
 
-      ("left_bracket", r'\'),
+      (b"left_bracket", br'\'),
     """
+
     def __init__(self, definitions):
         self.definitions = definitions
         parts = 
         for name, part in definitions:
-            parts.append("(?P<%s>%s)" % (name, part))
-        self.regexpString = "|".join(parts)
+            param = b"(?P<%s>%s)" % (name, part)
+            parts.append(param)
+        self.regexpString = b"|".join(parts)
         self.regexp = re.compile(self.regexpString, re.MULTILINE)
-        self.wsregexp = re.compile(r'\s+', re.M)
+        self.wsregexp = re.compile(br'\s+', re.M)
 
     def curlineno(self):
         """Return the current line number"""
-        return self.text:self.pos.count('\n') + 1
+        return self.text:self.pos.count(b'\n') + 1
+
+    def curcolno(self):
+        """Return the current column number"""
+        return self.pos - self.text.rfind(b'\n', 0, self.pos)
 
     def scan(self, text):
         """Analyse some data
@@ -55,7 +64,7 @@
 
         On error, a ParseError exception is raised.
 
-        :param text: a string containing the data to parse
+        :param text: a binary string containing the data to parse
         """
         self.pos = 0
         self.text = text
@@ -67,11 +76,15 @@
 
             m = self.regexp.match(text, self.pos)
             if m is None:
-                lineno = self.curlineno()
-                raise ParseError("unknown token %s" % textself.pos:)
+                token = textself.pos:
+                m = self.wsregexp.search(token)
+                if m is not None:
+                    token = token:m.start()
+                raise ParseError("unknown token %s" % token)
 
-            self.pos = m.end()
             yield (m.lastgroup, m.group(m.lastgroup))
+            self.pos += len(m.group(0))
+
 
 class Parser(object):
     """The grammatical analysis part.
@@ -80,22 +93,22 @@
     works with a Lexer object in order to check for grammar validity.
     """
     lrules = 
-        ("left_bracket", r'\'),
-        ("right_bracket", r'\'),
-        ("left_parenthesis", r'$'),
-        ("right_parenthesis", r'$'),
-        ("left_cbracket", r'{'),
-        ("right_cbracket", r'}'),
-        ("semicolon", r';'),
-        ("comma", r','),
-        ("hash_comment", r'#.*$'),
-        ("bracket_comment", r'/\*\s\S*?\*/'),
-        ("multiline", r'text:^$*\r\n+\.$'),
-        ("string", r'"(^"\\|\\.)*"'),
-        ("identifier", r'a-zA-Z_\w*'),
-        ("tag", r':a-zA-Z_\w*'),
-        ("number", r'0-9+KMGkmg?'),
-        
+        (b"left_bracket", br'\'),
+        (b"right_bracket", br'\'),
+        (b"left_parenthesis", br'$'),
+        (b"right_parenthesis", br'$'),
+        (b"left_cbracket", br'{'),
+        (b"right_cbracket", br'}'),
+        (b"semicolon", br';'),
+        (b"comma", br','),
+        (b"hash_comment", br'#.*$'),
+        (b"bracket_comment", br'/\*\s\S*?\*/'),
+        (b"multiline", br'text:^$*?\r\n+\.$'),
+        (b"string", br'"(^"\\|\\.)*"'),
+        (b"identifier", br'a-zA-Z_\w*'),
+        (b"tag", br':a-zA-Z_\w*'),
+        (b"number", br'0-9+KMGkmg?'),
+    
 
     def __init__(self, debug=False):
         self.debug = debug
@@ -120,7 +133,8 @@
         self.__curcommand = None
         self.__curstringlist = None
         self.__expected = None
-        self.__opened_blocks = 0
+        self.__expected_brackets = 
+        RequireCommand.loaded_extensions = 
 
     def __set_expected(self, *args, **kwargs):
         """Set the next expected token.
@@ -130,6 +144,28 @@
         """
         self.__expected = args
 
+    def __push_expected_bracket(self, ttype, tvalue):
+        """Append a new expected bracket.
+
+        Next time a bracket is closed, it must match the one provided here.
+        """
+        self.__expected_brackets.append((ttype, tvalue))
+
+    def __pop_expected_bracket(self, ttype, tvalue):
+        """Drop the last expected bracket.
+
+        If the given bracket doesn't match the dropped expected bracket,
+        or if no bracket is expected at all, a ParseError will be raised.
+        """
+        try:
+            etype, evalue = self.__expected_brackets.pop()
+        except IndexError:
+            raise ParseError("unexpected closing bracket %s (none opened)" %
+                             (tvalue,))
+        if ttype != etype:
+            raise ParseError("unexpected closing bracket %s (expected %s)" %
+                             (tvalue, evalue))
+
     def __up(self, onlyrecord=False):
         """Return to the current command's parent
 
@@ -146,15 +182,41 @@
                 prevcmd = self.__curcommand.parent.children-2 \
                     if len(self.__curcommand.parent.children) >= 2 else None
             if prevcmd is None or prevcmd.name not in self.__curcommand.must_follow:
-                raise ParseError("the %s command must follow an %s command" % \
-                                     (self.__curcommand.name,
-                                      " or ".join(self.__curcommand.must_follow)))
+                raise ParseError("the %s command must follow an %s command" %
+                                 (self.__curcommand.name,
+                                  " or ".join(self.__curcommand.must_follow)))
 
         if not self.__curcommand.parent:
+            # collect current amount of hash comments for later
+            # parsing into names and desciptions
+            self.__curcommand.hash_comments = self.hash_comments
+            self.hash_comments = 
             self.result += self.__curcommand
 
-        if not onlyrecord:
+        if onlyrecord:
+            # We are done
+            return
+
+        while self.__curcommand:
             self.__curcommand = self.__curcommand.parent
+            if not self.__curcommand:
+                break
+            # Make sure to detect all done tests (including 'not' ones).
+            condition = (
+                self.__curcommand.get_type() == "test" and
+                self.__curcommand.iscomplete()
+            )
+            if condition:
+                continue
+            # If we are on a control accepting a test list, next token
+            # must be a comma or a right parenthesis.
+            condition = (
+                self.__curcommand.get_type() == "test" and
+                self.__curcommand.variable_args_nb
+            )
+            if condition:
+                self.__set_expected("comma", "right_parenthesis")
+            break
 
     def __check_command_completion(self, testsemicolon=True):
         """Check for command(s) completion
@@ -174,9 +236,11 @@
             return True
 
         ctype = self.__curcommand.get_type()
-        if ctype == "action" or \
-                (ctype == "control" and \
-                     not self.__curcommand.accept_children):
+        condition = (
+            ctype == "action" or
+            (ctype == "control" and not self.__curcommand.accept_children)
+        )
+        if condition:
             if testsemicolon:
                 self.__set_expected("semicolon")
             return True
@@ -187,6 +251,7 @@
             if self.__curcommand.get_type() in "control", "test":
                 if self.__curcommand.iscomplete():
                     if self.__curcommand.get_type() == "control":
+                        self.__set_expected("left_cbracket")
                         break
                     continue
                 if not self.__curcommand.check_next_arg("test", cmd, add=False):
@@ -195,7 +260,6 @@
                     if self.__curcommand.variable_args_nb:
                         self.__set_expected("comma", "right_parenthesis")
                     break
-
         return True
 
     def __stringlist(self, ttype, tvalue):
@@ -207,13 +271,14 @@
                             ; are optional
         """
         if ttype == "string":
-            self.__curstringlist += tvalue
+            self.__curstringlist += tvalue.decode("utf-8")
             self.__set_expected("comma", "right_bracket")
             return True
         if ttype == "comma":
             self.__set_expected("string")
             return True
         if ttype == "right_bracket":
+            self.__pop_expected_bracket(ttype, tvalue)
             self.__curcommand.check_next_arg("stringlist", self.__curstringlist)
             self.__cstate = self.__arguments
             return self.__check_command_completion()
@@ -231,17 +296,29 @@
         :param tvalue: current token value
         :return: False if an error is encountered, True otherwise
         """
-        if ttype == "multiline":
-            return self.__curcommand.check_next_arg("string", tvalue)
+        if ttype in "multiline", "string":
+            return self.__curcommand.check_next_arg("string", tvalue.decode("utf-8"))
 
-        if ttype in "number", "tag", "string":
-            return self.__curcommand.check_next_arg(ttype, tvalue)
+        if ttype in "number", "tag":
+            return self.__curcommand.check_next_arg(ttype, tvalue.decode("ascii"))
 
         if ttype == "left_bracket":
+            self.__push_expected_bracket("right_bracket", b'}')
             self.__cstate = self.__stringlist
             self.__curstringlist = 
             self.__set_expected("string")
             return True
+
+        condition = (
+            ttype in "left_cbracket", "comma" and
+            self.__curcommand.non_deterministic_args
+        )
+        if condition:
+            self.__curcommand.reassign_arguments()
+            # rewind lexer
+            self.lexer.pos -= 1
+            return True
+
         return False
 
     def __arguments(self, ttype, tvalue):
@@ -259,13 +336,19 @@
         :return: False if an error is encountered, True otherwise
         """
         if ttype == "identifier":
-            test = get_command_instance(tvalue, self.__curcommand)
+            test = get_command_instance(tvalue.decode("ascii"), self.__curcommand)
+            if test.get_type() != "test":
+                raise ParseError(
+                    "Expected test command, '{}' found instead"
+                    .format(test.name)
+                )
             self.__curcommand.check_next_arg("test", test)
             self.__expected = test.get_expected_first()
             self.__curcommand = test
             return self.__check_command_completion(testsemicolon=False)
 
         if ttype == "left_parenthesis":
+            self.__push_expected_bracket("right_parenthesis", b')')
             self.__set_expected("identifier")
             return True
 
@@ -274,11 +357,12 @@
             return True
 
         if ttype == "right_parenthesis":
+            self.__pop_expected_bracket(ttype, tvalue)
             self.__up()
             return True
 
         if self.__argument(ttype, tvalue):
-            return self.__check_command_completion()
+            return self.__check_command_completion(testsemicolon=False)
 
         return False
 
@@ -300,32 +384,25 @@
         """
         if self.__cstate is None:
             if ttype == "right_cbracket":
+                self.__pop_expected_bracket(ttype, tvalue)
                 self.__up()
-                self.__opened_blocks -= 1
                 self.__cstate = None
                 return True
 
             if ttype != "identifier":
                 return False
-
-            command = get_command_instance(tvalue, self.__curcommand)
-
+            command = get_command_instance(
+                tvalue.decode("ascii"), self.__curcommand)
             if command.get_type() == "test":
-                raise ParseError("%s may not appear as a first command" % command.name)
-
+                raise ParseError(
+                    "%s may not appear as a first command" % command.name)
             if command.get_type() == "control" and command.accept_children \
-                    and command.has_arguments():
+               and command.has_arguments():
                 self.__set_expected("identifier")
-
             if self.__curcommand is not None:
-                cur_parent = self.__curcommand
-                while not cur_parent.addchild(command):
-                    if hasattr(cur_parent, 'parent'):
-                        cur_parent = cur_parent.parent
-                    else:
-                        raise ParseError("%s unexpected after a %s" % \
-                                (tvalue, self.__curcommand.name))
-
+                if not self.__curcommand.addchild(command):
+                    raise ParseError("%s unexpected after a %s" %
+                                     (tvalue, self.__curcommand.name))
             self.__curcommand = command
             self.__cstate = self.__arguments
 
@@ -335,7 +412,7 @@
             return True
 
         if ttype == "left_cbracket":
-            self.__opened_blocks += 1
+            self.__push_expected_bracket("right_cbracket", b'}')
             self.__cstate = None
             return True
 
@@ -363,37 +440,49 @@
         :param text: a string containing the data to parse
         :return: True on success (no error detected), False otherwise
         """
+        if isinstance(text, str):
+            text = text.encode("utf-8")
+
         self.__reset_parser()
         try:
+            tvalue = ''
             for ttype, tvalue in self.lexer.scan(text):
                 if ttype == "hash_comment":
-                    self.hash_comments += tvalue
+                    self.hash_comments += tvalue.strip()
                     continue
                 if ttype == "bracket_comment":
                     continue
                 if self.__expected is not None:
-                    if not ttype in self.__expected:
-                        if self.lexer.pos < len(text):
-                            msg = "%s found while %s expected near '%s'" \
-                                % (ttype, "|".join(self.__expected), textself.lexer.pos)
+                    if ttype not in self.__expected:
+                        if self.lexer.pos < len(text) + len(tvalue):
+                            msg = (
+                                "{} found while {} expected near '{}'"
+                                .format(ttype, "|".join(self.__expected),
+                                        text.decode()self.lexer.pos)
+                            )
                         else:
-                            msg = "%s found while %s expected at end of file" \
+                            msg = (
+                                "%s found while %s expected at end of file"
                                 % (ttype, "|".join(self.__expected))
+                            )
                         raise ParseError(msg)
                     self.__expected = None
 
                 if not self.__command(ttype, tvalue):
-                    msg = "unexpected token '%s' found near '%s'" \
-                        % (tvalue, textself.lexer.pos)
+                    msg = (
+                        "unexpected token '%s' found near '%s'"
+                        % (tvalue.decode(), text.decode()self.lexer.pos)
+                    )
                     raise ParseError(msg)
-            if self.__opened_blocks:
-                self.__set_expected("right_cbracket")
+            if self.__expected_brackets:
+                self.__set_expected(self.__expected_brackets-10)
             if self.__expected is not None:
-                raise ParseError("end of script reached while %s expected" % \
-                                     "|".join(self.__expected))
+                raise ParseError("end of script reached while %s expected" %
+                                 "|".join(self.__expected))
 
-        except (ParseError, UnknownCommand, BadArgument, BadValue) as err:
-            self.error = "line %d: %s" % (self.lexer.curlineno(), str(err))
+        except (ParseError, CommandError) as e:
+            self.error_pos = (self.lexer.curlineno(), self.lexer.curcolno(), len(tvalue))
+            self.error = "line %d: %s" % (self.error_pos0, str(e))
             return False
         return True
 
@@ -405,10 +494,8 @@
         :param name: the pathname of the file to parse
         :return: True on success (no error detected), False otherwise
         """
-        fp = open(name)
-        content = fp.read()
-        fp.close()
-        return self.parse(content)
+        with open(name, "rb") as fp:
+            return self.parse(fp.read())
 
     def dump(self, target=sys.stdout):
         """Dump the parsing tree.
@@ -418,6 +505,7 @@
         for r in self.result:
             r.dump(target=target)
 
+
 if __name__ == "__main__":
     from optparse import OptionParser
 
@@ -427,6 +515,8 @@
                   help="Activate verbose mode")
     op.add_option("-d", "--debug", action="store_true", default=False,
                   help="Activate debug traces")
+    op.add_option("--tosieve", action="store_true",
+                  help="Print parser results using sieve")
     options, args = op.parse_args()
 
     if not len(args):
@@ -435,12 +525,14 @@
 
     for a in args:
         p = Parser(debug=options.debug)
-        print("Parsing file %s... " % (a))
+        print("Parsing file %s... " % a, end=' ')
         if p.parse_file(a):
             print("OK")
             if options.verbose:
                 p.dump()
+            if options.tosieve:
+                for r in p.result:
+                    r.tosieve()
             continue
         print("ERROR")
         print(p.error)
-

sievelib-1.2.1.tar.gz/sievelib/tests Added

sievelib-1.2.1.tar.gz/sievelib/tests/__init__.py Added

sievelib-1.2.1.tar.gz/sievelib/tests/files Added

sievelib-1.2.1.tar.gz/sievelib/tests/files/utf8_sieve.txt Added

sievelib-1.2.1.tar.gz/sievelib/tests/test_factory.py Added

@@ -0,0 +1,409 @@
+import unittest
+import io
+
+from sievelib.factory import FiltersSet
+from .. import parser
+
+
+class FactoryTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.fs = FiltersSet("test")
+
+    def test_get_filter_conditions(self):
+        """Test get_filter_conditions method."""
+        orig_conditions = ('Sender', ":is", 'toto@toto.com')
+        self.fs.addfilter(
+            "ruleX",
+            orig_conditions,
+            ("fileinto", ":copy", "Toto"), )
+        conditions = self.fs.get_filter_conditions("ruleX")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = ("exists", "list-help", "list-unsubscribe",
+                            "list-subscribe", "list-owner")
+        self.fs.addfilter(
+            "ruleY",
+            orig_conditions,
+            ("fileinto", 'List')
+        )
+        conditions = self.fs.get_filter_conditions("ruleY")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = ('Sender', ":notis", 'toto@toto.com')
+        self.fs.addfilter(
+            "ruleZ",
+            orig_conditions,
+            ("fileinto", ":copy", "Toto"), )
+        conditions = self.fs.get_filter_conditions("ruleZ")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = ("notexists", "list-help", "list-unsubscribe",
+                            "list-subscribe", "list-owner")
+        self.fs.addfilter(
+            "ruleA",
+            orig_conditions,
+            ("fileinto", 'List')
+        )
+        conditions = self.fs.get_filter_conditions("ruleA")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = ("envelope", ":is", "From", "hello")
+        self.fs.addfilter(
+            "ruleB",
+            orig_conditions,
+            ("fileinto", "INBOX")
+        )
+        conditions = self.fs.get_filter_conditions("ruleB")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = ("body", ":raw", ":notcontains", "matteo")
+        self.fs.addfilter(
+            "ruleC",
+            orig_conditions,
+            ("fileinto", "INBOX")
+        )
+        conditions = self.fs.get_filter_conditions("ruleC")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = (
+            "currentdate", ":zone", "+0100", ":notis", "date", "2019-02-26"
+        )
+        self.fs.addfilter(
+            "ruleD",
+            orig_conditions,
+            ("fileinto", "INBOX")
+        )
+        conditions = self.fs.get_filter_conditions("ruleD")
+        self.assertEqual(orig_conditions, conditions)
+
+        orig_conditions = (
+            "currentdate", ":zone", "+0100", ":value", "gt", "date",
+            "2019-02-26"
+        )
+        self.fs.addfilter(
+            "ruleE",
+            orig_conditions,
+            ("fileinto", "INBOX")
+        )
+        conditions = self.fs.get_filter_conditions("ruleE")
+        self.assertEqual(orig_conditions, conditions)
+
+    def test_get_filter_conditions_from_parser_result(self):
+        res = """require "fileinto";
+
+# rule:test
+if anyof (exists "Subject") {
+    fileinto "INBOX";
+}
+"""
+        p = parser.Parser()
+        p.parse(res)
+        fs = FiltersSet("test", '# rule:')
+        fs.from_parser_result(p)
+        c = fs.get_filter_conditions('test')
+        self.assertEqual(c, ("exists", "Subject"))
+
+        res = """require "date", "fileinto";
+
+# rule:aaa
+if anyof (currentdate :zone "+0100" :is "date" "2019-03-27") {
+    fileinto "INBOX";
+}
+"""
+        p = parser.Parser()
+        p.parse(res)
+        fs = FiltersSet("aaa", "# rule:")
+        fs.from_parser_result(p)
+        c = fs.get_filter_conditions('aaa')
+        self.assertEqual(
+            c, ('currentdate', ':zone', '+0100', ':is', 'date', '2019-03-27')
+        )
+
+        res = """require "envelope", "fileinto";
+
+# rule:aaa
+if anyof (envelope :contains "To" "hello@world.it") {
+    fileinto "INBOX";
+}
+"""
+        p = parser.Parser()
+        p.parse(res)
+        fs = FiltersSet("aaa", "# rule:")
+        fs.from_parser_result(p)
+        c = fs.get_filter_conditions('aaa')
+        self.assertEqual(
+            c, ('envelope', ':contains', 'To', 'hello@world.it')
+        )
+
+    def test_get_filter_matchtype(self):
+        """Test get_filter_matchtype method."""
+        self.fs.addfilter(
+            "ruleX",
+            ('Sender', ":is", 'toto@toto.com'), ,
+            ("fileinto", ":copy", "Toto"), )
+        match_type = self.fs.get_filter_matchtype("ruleX")
+        self.assertEqual(match_type, "anyof")
+
+    def test_get_filter_actions(self):
+        """Test get_filter_actions method."""
+        self.fs.addfilter(
+            "ruleX",
+            ('Sender', ":is", 'toto@toto.com'), ,
+            ("fileinto", ":copy", "Toto"), )
+        actions = self.fs.get_filter_actions("ruleX")
+        self.assertIn("fileinto", actions0)
+        self.assertIn(":copy", actions0)
+        self.assertIn("Toto", actions0)
+
+        self.fs.addfilter(
+            "ruleY",
+            ("Subject", ":contains", "aaa"),
+            ("stop",)
+        )
+        actions = self.fs.get_filter_actions("ruleY")
+        self.assertIn("stop", actions0)
+
+    def test_add_header_filter(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('Sender', ":is", 'toto@toto.com'), ,
+            ("fileinto", ":copy", "Toto"), )
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto", "copy";
+
+# Filter: rule1
+if anyof (header :is "Sender" "toto@toto.com") {
+    fileinto :copy "Toto";
+}
+""")
+        output.close()
+
+    def test_use_action_with_tag(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('Sender', ":is", 'toto@toto.com'), ,
+            ("redirect", ":copy", "toto@titi.com"), )
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "copy";
+
+# Filter: rule1
+if anyof (header :is "Sender" "toto@toto.com") {
+    redirect :copy "toto@titi.com";
+}
+""")
+        output.close()
+
+    def test_add_header_filter_with_not(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('Sender', ":notcontains", 'toto@toto.com'),
+            ("fileinto", 'Toto'))
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto";
+
+# Filter: rule1
+if anyof (not header :contains "Sender" "toto@toto.com") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_exists_filter(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('exists', "list-help", "list-unsubscribe",
+              "list-subscribe", "list-owner"),
+            ("fileinto", 'Toto')
+        )
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto";
+
+# Filter: rule1
+if anyof (exists "list-help","list-unsubscribe","list-subscribe","list-owner") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_exists_filter_with_not(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('notexists', "list-help", "list-unsubscribe",
+              "list-subscribe", "list-owner"),
+            ("fileinto", 'Toto')
+        )
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto";
+
+# Filter: rule1
+if anyof (not exists "list-help","list-unsubscribe","list-subscribe","list-owner") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_size_filter(self):
+        output = io.StringIO()
+        self.fs.addfilter(
+            "rule1",
+            ('size', ":over", "100k"),
+            ("fileinto", 'Totoéé')
+        )
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto";
+
+# Filter: rule1
+if anyof (size :over 100k) {
+    fileinto "Totoéé";
+}
+""")
+
+    def test_remove_filter(self):
+        self.fs.addfilter("rule1",
+                          ('Sender', ":is", 'toto@toto.com'),
+                          ("fileinto", 'Toto'))
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.assertEqual(self.fs.removefilter("rule1"), True)
+        self.assertIs(self.fs.getfilter("rule1"), None)
+
+    def test_disablefilter(self):
+        """
+        FIXME: Extra spaces are written between if and anyof, why?!
+        """
+        self.fs.addfilter("rule1",
+                          ('Sender', ":is", 'toto@toto.com'),
+                          ("fileinto", 'Toto'))
+        self.assertIsNot(self.fs.getfilter("rule1"), None)
+        self.assertEqual(self.fs.disablefilter("rule1"), True)
+        output = io.StringIO()
+        self.fs.tosieve(output)
+        self.assertEqual(output.getvalue(), """require "fileinto";
+
+# Filter: rule1
+if false {
+    if     anyof (header :is "Sender" "toto@toto.com") {
+        fileinto "Toto";
+    }
+}
+""")
+        output.close()
+        self.assertEqual(self.fs.is_filter_disabled("rule1"), True)
+
+    def test_add_filter_unicode(self):
+        """Add a filter containing unicode data."""
+        name = u"Test\xe9".encode("utf-8")
+        self.fs.addfilter(
+            name,
+            ('Sender', ":is", 'toto@toto.com'), ,
+            ("fileinto", 'Toto'), )
+        self.assertIsNot(self.fs.getfilter("Testé"), None)
+        self.assertEqual("{}".format(self.fs), """require "fileinto";
+
+# Filter: Testé
+if anyof (header :is "Sender" "toto@toto.com") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_body_filter(self):
+        """Add a body filter."""
+        self.fs.addfilter(
+            "test",
+            ("body", ":raw", ":contains", "matteo"),
+            ("fileinto", "Toto")
+        )
+        self.assertEqual("{}".format(self.fs), """require "body", "fileinto";
+
+# Filter: test
+if anyof (body :contains :raw "matteo") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_notbody_filter(self):
+        """Add a not body filter."""
+        self.fs.addfilter(
+            "test",
+            ("body", ":raw", ":notcontains", "matteo"),
+            ("fileinto", "Toto")
+        )
+        self.assertEqual("{}".format(self.fs), """require "body", "fileinto";
+
+# Filter: test
+if anyof (not body :contains :raw "matteo") {
+    fileinto "Toto";
+}
+""")
+
+    def test_add_envelope_filter(self):
+        """Add a envelope filter."""
+        self.fs.addfilter(
+            "test",
+            ("envelope", ":is", "From", "hello"),
+            ("fileinto", "INBOX")
+        )
+        self.assertEqual("{}".format(self.fs), """require "envelope", "fileinto";
+
+# Filter: test
+if anyof (envelope :is "From" "hello") {
+    fileinto "INBOX";
+}
+""")
+
+    def test_add_notenvelope_filter(self):
+        """Add a not envelope filter."""
+        self.fs.addfilter(
+            "test",
+            ("envelope", ":notis", "From", "hello"),
+            ("fileinto", "INBOX")
+        )
+        self.assertEqual("{}".format(self.fs), """require "envelope", "fileinto";
+
+# Filter: test
+if anyof (not envelope :is "From" "hello") {
+    fileinto "INBOX";
+}
+""")
+
+    def test_add_currentdate_filter(self):
+        """Add a currentdate filter."""
+        self.fs.addfilter(
+            "test",
+            ("currentdate", ":zone", "+0100", ":is", "date", "2019-02-26"),
+            ("fileinto", "INBOX")
+        )
+        self.assertEqual("{}".format(self.fs), """require "date", "fileinto";
+
+# Filter: test
+if anyof (currentdate :zone "+0100" :is "date" "2019-02-26") {
+    fileinto "INBOX";
+}
+""")
+
+        self.fs.removefilter("test")
+        self.fs.addfilter(
+            "test",
+            ("currentdate", ":zone", "+0100", ":value", "gt", "date",
+              "2019-02-26"),
+            ("fileinto", "INBOX")
+        )
+        self.assertEqual("{}".format(self.fs), """require "date", "fileinto", "relational";
+
+# Filter: test
+if anyof (currentdate :zone "+0100" :value "gt" "date" "2019-02-26") {
+    fileinto "INBOX";
+}
+""")
+
+
+if __name__ == "__main__":
+    unittest.main()

sievelib-1.2.1.tar.gz/sievelib/tests/test_managesieve.py Added

@@ -0,0 +1,161 @@
+"""Managesieve test cases."""
+
+import unittest
+from unittest import mock
+
+from sievelib import managesieve
+
+CAPABILITIES = (
+    b'"IMPLEMENTATION" "Example1 ManageSieved v001"\r\n'
+    b'"VERSION" "1.0"\r\n'
+    b'"SASL" "PLAIN SCRAM-SHA-1 GSSAPI"\r\n'
+    b'"SIEVE" "fileinto vacation"\r\n'
+    b'"STARTTLS"\r\n'
+)
+
+CAPABILITIES_WITHOUT_VERSION = (
+    b'"IMPLEMENTATION" "Example1 ManageSieved v001"\r\n'
+    b'"SASL" "PLAIN SCRAM-SHA-1 GSSAPI"\r\n'
+    b'"SIEVE" "fileinto vacation"\r\n'
+    b'"STARTTLS"\r\n'
+)
+
+AUTHENTICATION = (
+    CAPABILITIES +
+    b'OK "Dovecot ready."\r\n'
+    b'OK "Logged in."\r\n'
+)
+
+LISTSCRIPTS = (
+    b'"summer_script"\r\n'
+    b'"vac\xc3\xa0tion_script"\r\n'
+    b'{13}\r\n'
+    b'clever"script\r\n'
+    b'"main_script" ACTIVE\r\n'
+    b'OK "Listscripts completed."\r\n'
+)
+
+GETSCRIPT = (
+    b'{54}\r\n'
+    b'#this is my wonderful script\r\n'
+    b'reject "I reject all";\r\n'
+    b'OK "Getscript completed."\r\n'
+)
+
+
+@mock.patch("socket.socket")
+class ManageSieveTestCase(unittest.TestCase):
+    """Managesieve test cases."""
+
+    def setUp(self):
+        """Create client."""
+        self.client = managesieve.Client("127.0.0.1")
+
+    def authenticate(self, mock_socket):
+        """Authenticate client."""
+        mock_socket.return_value.recv.side_effect = (AUTHENTICATION, )
+        self.client.connect(b"user", b"password")
+
+    def test_connection(self, mock_socket):
+        """Test connection."""
+        self.authenticate(mock_socket)
+        self.assertEqual(
+            self.client.get_sieve_capabilities(), "fileinto", "vacation")
+        mock_socket.return_value.recv.side_effect = (b"OK test\r\n", )
+        self.client.logout()
+
+    def test_capabilities(self, mock_socket):
+        """Test capabilities command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            CAPABILITIES + b'OK "Capability completed."\r\n', )
+        capabilities = self.client.capability()
+        self.assertEqual(capabilities, CAPABILITIES)
+
+    def test_listscripts(self, mock_socket):
+        """Test listscripts command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (LISTSCRIPTS, )
+        active_script, others = self.client.listscripts()
+        self.assertEqual(active_script, "main_script")
+        self.assertEqual(
+            others, u'summer_script', u'vacàtion_script', u'clever"script')
+
+    def test_getscript(self, mock_socket):
+        """Test getscript command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (GETSCRIPT, )
+        content = self.client.getscript("main_script")
+        self.assertEqual(
+            content, u'#this is my wonderful script\nreject "I reject all";')
+
+    def test_putscript(self, mock_socket):
+        """Test putscript command."""
+        self.authenticate(mock_socket)
+        script = """require "fileinto";
+
+if envelope :contains "to" "tmartin+sent" {
+  fileinto "INBOX.sent";
+}
+"""
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "putscript completed."\r\n', )
+        self.assertTrue(self.client.putscript(u"test_script", script))
+
+    def test_deletescript(self, mock_socket):
+        """Test deletescript command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "deletescript completed."\r\n', )
+        self.assertTrue(self.client.deletescript(u"test_script"))
+
+    def test_checkscript(self, mock_socket):
+        """Test checkscript command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "checkscript completed."\r\n', )
+        script = "#comment\r\nInvalidSieveCommand\r\n"
+        self.assertTrue(self.client.checkscript(script))
+
+    def test_setactive(self, mock_socket):
+        """Test setactive command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "setactive completed."\r\n', )
+        self.assertTrue(self.client.setactive(u"test_script"))
+
+    def test_havespace(self, mock_socket):
+        """Test havespace command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "havespace completed."\r\n', )
+        self.assertTrue(self.client.havespace(u"test_script", 1000))
+
+    def test_renamescript(self, mock_socket):
+        """Test renamescript command."""
+        self.authenticate(mock_socket)
+        mock_socket.return_value.recv.side_effect = (
+            b'OK "renamescript completed."\r\n', )
+        self.assertTrue(self.client.renamescript(u"old_script", u"new_script"))
+
+    def test_renamescript_simulated(self, mock_socket):
+        """Test renamescript command simulation."""
+        mock_socket.return_value.recv.side_effect = (
+            CAPABILITIES_WITHOUT_VERSION +
+            b'OK "Dovecot ready."\r\n'
+            b'OK "Logged in."\r\n',
+        )
+        self.client.connect(b"user", b"password")
+        mock_socket.return_value.recv.side_effect = (
+            LISTSCRIPTS,
+            GETSCRIPT,
+            b'OK "putscript completed."\r\n',
+            b'OK "setactive completed."\r\n',
+            b'OK "deletescript completed."\r\n'
+        )
+        self.assertTrue(
+            self.client.renamescript(u"main_script", u"new_script"))
+
+
+if __name__ == "__main__":
+    unittest.main()

sievelib-1.2.1.tar.gz/sievelib/tests/test_parser.py Added

@@ -0,0 +1,911 @@
+"""
+Unit tests for the SIEVE language parser.
+"""
+import unittest
+import os.path
+import codecs
+import io
+
+from sievelib.parser import Parser
+from sievelib.factory import FiltersSet
+import sievelib.commands
+
+
+class MytestCommand(sievelib.commands.ActionCommand):
+    args_definition = 
+        {"name": "testtag",
+         "type": "tag",
+         "write_tag": True,
+         "values": ":testtag",
+         "extra_arg": {"type": "number",
+                       "required": False},
+         "required": False},
+        {"name": "recipients",
+         "type": "string", "stringlist",
+         "required": True}
+    
+
+
+class Quota_notificationCommand(sievelib.commands.ActionCommand):
+    args_definition = 
+        {"name": "subject",
+         "type": "tag",
+         "write_tag": True,
+         "values": ":subject",
+         "extra_arg": {"type": "string"},
+         "required": False},
+        {"name": "recipient",
+         "type": "tag",
+         "write_tag": True,
+         "values": ":recipient",
+         "extra_arg": {"type": "stringlist"},
+         "required": True}
+    
+
+
+class SieveTest(unittest.TestCase):
+    def setUp(self):
+        self.parser = Parser()
+
+    def __checkCompilation(self, script, result):
+        self.assertEqual(self.parser.parse(script), result)
+
+    def compilation_ok(self, script, **kwargs):
+        self.__checkCompilation(script, True, **kwargs)
+
+    def compilation_ko(self, script):
+        self.__checkCompilation(script, False)
+
+    def representation_is(self, content):
+        target = io.StringIO()
+        self.parser.dump(target)
+        repr_ = target.getvalue()
+        target.close()
+        self.assertEqual(repr_, content.lstrip())
+
+    def sieve_is(self, content):
+        filtersset = FiltersSet("Testfilterset")
+        filtersset.from_parser_result(self.parser)
+        target = io.StringIO()
+        filtersset.tosieve(target)
+        repr_ = target.getvalue()
+        target.close()
+        self.assertEqual(repr_, content)
+
+
+class AdditionalCommands(SieveTest):
+    def test_add_command(self):
+        self.assertRaises(
+            sievelib.commands.UnknownCommand,
+            sievelib.commands.get_command_instance, 'mytest'
+        )
+        sievelib.commands.add_commands(MytestCommand)
+        sievelib.commands.get_command_instance('mytest')
+        self.compilation_ok(b"""
+        mytest :testtag 10 "testrecp1@example.com";
+        """)
+
+    def test_quota_notification(self):
+        sievelib.commands.add_commands(Quota_notificationCommand)
+        quota_notification_sieve = """# Filter: Testrule\nquota_notification :subject "subject here" :recipient "somerecipient@example.com";\n"""
+        self.compilation_ok(quota_notification_sieve)
+        self.sieve_is(quota_notification_sieve)
+
+
+class ValidEncodings(SieveTest):
+    def test_utf8_file(self):
+        utf8_sieve = os.path.join(
+            os.path.dirname(__file__), 'files', 'utf8_sieve.txt'
+        )
+        with codecs.open(utf8_sieve, encoding='utf8') as fobj:
+            source_sieve = fobj.read()
+        self.parser.parse_file(utf8_sieve)
+        self.sieve_is(source_sieve)
+
+
+class ValidSyntaxes(SieveTest):
+    def test_hash_comment(self):
+        self.compilation_ok(b"""
+if size :over 100k { # this is a comment
+    discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    size (type: test)
+        :over
+        100k
+    discard (type: action)
+""")
+
+    def test_bracket_comment(self):
+        self.compilation_ok(b"""
+if size :over 100K { /* this is a comment
+    this is still a comment */ discard /* this is a comment
+    */ ;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    size (type: test)
+        :over
+        100K
+    discard (type: action)
+""")
+
+    def test_string_with_bracket_comment(self):
+        self.compilation_ok(b"""
+if header :contains "Cc" "/* comment */" {
+    discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    header (type: test)
+        :contains
+        "Cc"
+        "/* comment */"
+    discard (type: action)
+""")
+
+    def test_multiline_string(self):
+        self.compilation_ok(b"""
+require "reject";
+
+if allof (false, address :is "From", "Sender" "blka@bla.com") {
+    reject text:
+noreply
+============================
+Your email has been canceled
+============================
+.
+;
+    stop;
+} else {
+    reject text:
+================================
+Your email has been canceled too
+================================
+.
+;
+}
+""")
+        self.representation_is("""
+require (type: control)
+    "reject"
+if (type: control)
+    allof (type: test)
+        false (type: test)
+        address (type: test)
+            :is
+            "From","Sender"
+            "blka@bla.com"
+    reject (type: action)
+        text:
+noreply
+============================
+Your email has been canceled
+============================
+.
+    stop (type: action)
+else (type: control)
+    reject (type: action)
+        text:
+================================
+Your email has been canceled too
+================================
+.
+""")
+
+    def test_complex_allof_with_not(self):
+        """Test for allof/anyof commands including a not test.
+
+        See https://github.com/tonioo/sievelib/issues/69.
+        """
+        self.compilation_ok(b"""
+require "fileinto", "reject";
+
+if allof (not allof (address :is "From","sender" "test1@test2.priv","test2@test2.priv", header :matches "Subject" "INACTIVE*"), address :is "From" "user3@test3.priv")
+{
+    reject;
+}
+""")
+        self.representation_is("""
+require (type: control)
+    "fileinto","reject"
+if (type: control)
+    allof (type: test)
+        not (type: test)
+            allof (type: test)
+                address (type: test)
+                    :is
+                    "From","sender"
+                    "test1@test2.priv","test2@test2.priv"
+                header (type: test)
+                    :matches
+                    "Subject"
+                    "INACTIVE*"
+        address (type: test)
+            :is
+            "From"
+            "user3@test3.priv"
+    reject (type: action)
+""")
+
+    def test_nested_blocks(self):
+        self.compilation_ok(b"""
+if header :contains "Sender" "example.com" {
+  if header :contains "Sender" "me@" {
+    discard;
+  } elsif header :contains "Sender" "you@" {
+    keep;
+  }
+}
+""")
+        self.representation_is("""
+if (type: control)
+    header (type: test)
+        :contains
+        "Sender"
+        "example.com"
+    if (type: control)
+        header (type: test)
+            :contains
+            "Sender"
+            "me@"
+        discard (type: action)
+    elsif (type: control)
+        header (type: test)
+            :contains
+            "Sender"
+            "you@"
+        keep (type: action)
+""")
+
+    def test_true_test(self):
+        self.compilation_ok(b"""
+if true {
+
+}
+""")
+        self.representation_is("""
+if (type: control)
+    true (type: test)
+""")
+
+    def test_rfc5228_extended(self):
+        self.compilation_ok(b"""
+#
+# Example Sieve Filter
+# Declare any optional features or extension used by the script
+#
+require "fileinto";
+
+#
+# Handle messages from known mailing lists
+# Move messages from IETF filter discussion list to filter mailbox
+#
+if header :is "Sender" "owner-ietf-mta-filters@imc.org"
+        {
+        fileinto "filter";  # move to "filter" mailbox
+        }
+#
+# Keep all messages to or from people in my company
+#
+elsif address :domain :is "From", "To" "example.com"
+        {
+        keep;               # keep in "In" mailbox
+        }
+
+#
+# Try and catch unsolicited email.  If a message is not to me,
+# or it contains a subject known to be spam, file it away.
+#
+elsif anyof (NOT address :all :contains
+               "To", "Cc", "Bcc" "me@example.com",
+             header :matches "subject"
+               "*make*money*fast*", "*university*dipl*mas*")
+        {
+        fileinto "spam";   # move to "spam" mailbox
+        }
+else
+        {
+        # Move all other (non-company) mail to "personal"
+        # mailbox.
+        fileinto "personal";
+        }
+""")
+        self.representation_is("""
+require (type: control)
+    "fileinto"
+if (type: control)
+    header (type: test)
+        :is
+        "Sender"
+        "owner-ietf-mta-filters@imc.org"
+    fileinto (type: action)
+        "filter"
+elsif (type: control)
+    address (type: test)
+        :domain
+        :is
+        "From","To"
+        "example.com"
+    keep (type: action)
+elsif (type: control)
+    anyof (type: test)
+        not (type: test)
+            address (type: test)
+                :all
+                :contains
+                "To","Cc","Bcc"
+                "me@example.com"
+        header (type: test)
+            :matches
+            "subject"
+            "*make*money*fast*","*university*dipl*mas*"
+    fileinto (type: action)
+        "spam"
+else (type: control)
+    fileinto (type: action)
+        "personal"
+""")
+
+    def test_explicit_comparator(self):
+        self.compilation_ok(b"""
+if header :contains :comparator "i;octet" "Subject" "MAKE MONEY FAST" {
+  discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    header (type: test)
+        :comparator
+        "i;octet"
+        :contains
+        "Subject"
+        "MAKE MONEY FAST"
+    discard (type: action)
+""")
+
+    def test_non_ordered_args(self):
+        self.compilation_ok(b"""
+if address :all :is "from" "tim@example.com" {
+    discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    address (type: test)
+        :all
+        :is
+        "from"
+        "tim@example.com"
+    discard (type: action)
+""")
+
+    def test_multiple_not(self):
+        self.compilation_ok(b"""
+if not not not not true {
+    stop;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    not (type: test)
+        not (type: test)
+            not (type: test)
+                not (type: test)
+                    true (type: test)
+    stop (type: action)
+""")
+
+    def test_just_one_command(self):
+        self.compilation_ok(b"keep;")
+        self.representation_is("""
+keep (type: action)
+""")
+
+    def test_singletest_testlist(self):
+        self.compilation_ok(b"""
+if anyof (true) {
+    discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    anyof (type: test)
+        true (type: test)
+    discard (type: action)
+""")
+
+    def test_multitest_testlist(self):
+        self.compilation_ok(b"""
+if anyof(allof(address :contains "From" ""), allof(header :contains "Subject" "")) {}
+""")
+
+    def test_truefalse_testlist(self):
+        self.compilation_ok(b"""
+if anyof(true, false) {
+    discard;
+}
+""")
+        self.representation_is("""
+if (type: control)
+    anyof (type: test)
+        true (type: test)
+        false (type: test)
+    discard (type: action)
+""")
+
+    def test_vacationext_basic(self):
+        self.compilation_ok(b"""
+require "vacation";
+if header :contains "subject" "cyrus" {
+    vacation "I'm out -- send mail to cyrus-bugs";
+} else {
+    vacation "I'm out -- call me at +1 304 555 0123";
+}
+""")
+
+    def test_vacationext_medium(self):
+        self.compilation_ok(b"""
+require "vacation";
+if header :contains "subject" "lunch" {
+    vacation :handle "ran-away" "I'm out and can't meet for lunch";
+} else {
+    vacation :handle "ran-away" "I'm out";
+}
+""")
+
+    def test_vacationext_with_limit(self):
+        self.compilation_ok(b"""
+require "vacation";
+vacation :days 23 :addresses "tjs@example.edu",
+                              "ts4z@landru.example.edu"
+   "I'm away until October 19.
+   If it's an emergency, call 911, I guess." ;
+""")
+
+    def test_vacationext_with_single_mail_address(self):
+        self.compilation_ok("""
+require "vacation";
+vacation :days 23 :addresses "tjs@example.edu"
+   "I'm away until October 19.
+   If it's an emergency, call 911, I guess." ;
+""")
+
+    def test_vacationext_with_multiline(self):
+        self.compilation_ok(b"""
+require "vacation";
+vacation :mime text:
+Content-Type: multipart/alternative; boundary=foo
+
+--foo
+
+I'm at the beach relaxing.  Mmmm, surf...
+
+--foo
+Content-Type: text/html; charset=us-ascii
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
+ "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML><HEAD><TITLE>How to relax</TITLE>
+<BASE HREF="http://home.example.com/pictures/"></HEAD>
+<BODY><P>I'm at the <A HREF="beach.gif">beach</A> relaxing.
+Mmmm, <A HREF="ocean.gif">surf</A>...
+</BODY></HTML>
+
+--foo--
+.
+;
+""")
+
+    def test_reject_extension(self):
+        self.compilation_ok(b"""
+require "reject";
+
+if header :contains "subject" "viagra" {
+    reject;
+}
+""")
+
+    def test_fileinto_create(self):
+        self.compilation_ok(b"""require "fileinto", "mailbox";
+if header :is "Sender" "owner-ietf-mta-filters@imc.org"
+        {
+        fileinto :create "filter";  # move to "filter" mailbox
+        }
+""")
+
+    def test_imap4flags_extension(self):
+        self.compilation_ok(b"""
+require "fileinto", "imap4flags", "variables";
+if size :over 1M {
+    addflag "MyFlags" "Big";
+    if header :is "From" "boss@company.example.com" {
+       # The message will be marked as "\Flagged Big" when filed into
+       # mailbox "Big messages"
+       addflag "MyFlags" "\\Flagged";
+    }
+    fileinto :flags "${MyFlags}" "Big messages";
+}
+""")
+
+    def test_imap4flags_hasflag(self):
+        self.compilation_ok(b"""
+require "imap4flags", "fileinto";
+
+if hasflag "test", "toto" {
+    fileinto "Test";
+}
+addflag "Var1" "Truc";
+if hasflag "Var1" "Truc" {
+    fileinto "Truc";
+}
+""")
+
+    def test_body_extension(self):
+        self.compilation_ok(b"""
+require "body", "fileinto";
+
+if body :content "text" :contains "missile", "coordinates" {
+    fileinto "secrets";
+}
+""")
+        self.compilation_ok(b"""
+require "body";
+
+if body :raw :contains "MAKE MONEY FAST" {
+    discard;
+}
+""")
+        self.compilation_ok(b"""
+require "body", "fileinto";
+
+# Save messages mentioning the project schedule in the
+# project/schedule folder.
+if body :text :contains "project schedule" {
+    fileinto "project/schedule";
+}
+""")
+
+
+class InvalidSyntaxes(SieveTest):
+    def test_nested_comments(self):
+        self.compilation_ko(b"""
+/* this is a comment /* with a nested comment inside */
+it is allowed by the RFC :p */
+""")
+
+    def test_nonopened_block(self):
+        self.compilation_ko(b"""
+if header :is "Sender" "me@example.com"
+    discard;
+}
+""")
+
+    def test_nonclosed_block(self):
+        self.compilation_ko(b"""
+if header :is "Sender" "me@example.com" {
+    discard;
+
+""")
+
+    def test_nonopened_parenthesis(self):
+        self.compilation_ko(b"""
+if header :is "Sender" "me@example.com") {
+    discard;
+}
+""")
+
+    def test_nonopened_block2(self):
+        self.compilation_ko(b"""}""")
+
+    def test_unknown_token(self):
+        self.compilation_ko(b"""
+if header :is "Sender" "Toto" & header :contains "Cc" "Tata" {
+
+}
+""")
+
+    def test_empty_string_list(self):
+        self.compilation_ko(b"require ;")
+
+    def test_unopened_string_list(self):
+        self.compilation_ko(b'require "fileinto";')
+
+    def test_unclosed_string_list(self):
+        self.compilation_ko(b'require "toto", "tata";')
+
+    def test_misplaced_comma_in_string_list(self):
+        self.compilation_ko(b'require "toto",;')
+
+    def test_nonopened_tests_list(self):
+        self.compilation_ko(b"""
+if anyof header :is "Sender" "me@example.com",
+          header :is "Sender" "myself@example.com") {
+    fileinto "trash";
+}
+""")
+
+    def test_nonclosed_tests_list(self):
+        self.compilation_ko(b"""
+if anyof (header :is "Sender" "me@example.com",
+          header :is "Sender" "myself@example.com" {
+    fileinto "trash";
+}
+""")
+
+    def test_nonclosed_tests_list2(self):
+        self.compilation_ko(b"""
+if anyof (header :is "Sender" {
+    fileinto "trash";
+}
+""")
+
+    def test_misplaced_comma_in_tests_list(self):
+        self.compilation_ko(b"""
+if anyof (header :is "Sender" "me@example.com",) {
+
+}
+""")
+
+    def test_comma_inside_arguments(self):
+        self.compilation_ko(b"""
+require "fileinto", "enveloppe";
+""")
+
+    def test_non_ordered_args(self):
+        self.compilation_ko(b"""
+if address "From" :is "tim@example.com" {
+    discard;
+}
+""")
+
+    def test_extra_arg(self):
+        self.compilation_ko(b"""
+if address :is "From" "tim@example.com" "tutu" {
+    discard;
+}
+""")
+
+    def test_empty_not(self):
+        self.compilation_ko(b"""
+if not {
+    discard;
+}
+""")
+
+    def test_missing_semicolon(self):
+        self.compilation_ko(b"""
+require "fileinto"
+""")
+
+    def test_missing_semicolon_in_block(self):
+        self.compilation_ko(b"""
+if true {
+    stop
+}
+""")
+
+    def test_misplaced_parenthesis(self):
+        self.compilation_ko(b"""
+if (true) {
+
+}
+""")
+
+    def test_control_command_in_test(self):
+        self.compilation_ko(b"""
+if stop;
+""")
+
+    def test_extra_test_in_simple_control(self):
+        self.compilation_ko(b"""
+if address "From" "example.com" header "Subject" "Example" { stop; }
+""")
+
+    def test_missing_comma_in_test_list(self):
+        self.compilation_ko(b"""
+if allof(anyof(address "From" "example.com") header "Subject" "Example") { stop; }
+""")
+
+
+class LanguageRestrictions(SieveTest):
+    def test_unknown_control(self):
+        self.compilation_ko(b"""
+macommande "Toto";
+""")
+
+    def test_misplaced_elsif(self):
+        self.compilation_ko(b"""
+elsif true {
+
+}
+""")
+
+    def test_misplaced_elsif2(self):
+        self.compilation_ko(b"""
+elsif header :is "From" "toto" {
+
+}
+""")
+
+    def test_misplaced_nested_elsif(self):
+        self.compilation_ko(b"""
+if true {
+  elsif false {
+
+  }
+}
+""")
+
+    def test_unexpected_argument(self):
+        self.compilation_ko(b'stop "toto";')
+
+    def test_bad_arg_value(self):
+        self.compilation_ko(b"""
+if header :isnot "Sent" "me@example.com" {
+  stop;
+}
+""")
+
+    def test_bad_arg_value2(self):
+        self.compilation_ko(b"""
+if header :isnot "Sent" 10000 {
+  stop;
+}
+""")
+
+    def test_bad_comparator_value(self):
+        self.compilation_ko(b"""
+if header :contains :comparator "i;prout" "Subject" "MAKE MONEY FAST" {
+  discard;
+}
+""")
+
+    def test_not_included_extension(self):
+        self.compilation_ko(b"""
+if header :contains "Subject" "MAKE MONEY FAST" {
+  fileinto "spam";
+}
+""")
+
+    def test_test_outside_control(self):
+        self.compilation_ko(b"true;")
+
+    def test_fileinto_create_without_mailbox(self):
+        self.compilation_ko(b"""require "fileinto";
+if header :is "Sender" "owner-ietf-mta-filters@imc.org"
+        {
+        fileinto :create "filter";  # move to "filter" mailbox
+        }
+""")
+        self.assertEqual(
+            self.parser.error, "line 4: extension 'mailbox' not loaded")
+
+    def test_fileinto_create_without_fileinto(self):
+        self.compilation_ko(b"""require "mailbox";
+if header :is "Sender" "owner-ietf-mta-filters@imc.org"
+        {
+        fileinto :create "filter";  # move to "filter" mailbox
+        }
+""")
+        self.assertEqual(
+            self.parser.error, "line 4: unknown command fileinto")
+
+    def test_exists_get_string_or_list(self):
+        self.compilation_ok(b"""
+if exists "subject"
+{
+       discard;
+}
+""")
+        self.compilation_ok(b"""
+if exists "subject"
+{
+       discard;
+}
+""")
+
+
+class DateCommands(SieveTest):
+
+    def test_date_command(self):
+        self.compilation_ok(b"""require "date", "relational", "fileinto";
+if allof(header :is "from" "boss@example.com",
+         date :value "ge" :originalzone "date" "hour" "09",
+         date :value "lt" :originalzone "date" "hour" "17")
+{ fileinto "urgent"; }
+""")
+
+    def test_currentdate_command(self):
+        self.compilation_ok(b"""require "date", "relational";
+
+if allof(currentdate :value "ge" "date" "2013-10-23",
+         currentdate :value "le" "date" "2014-10-12")
+{
+    discard;
+}
+""")
+
+    def test_currentdate_command_timezone(self):
+        self.compilation_ok(b"""require "date", "relational";
+
+if allof(currentdate :zone "+0100" :value "ge" "date" "2013-10-23",
+         currentdate :value "le" "date" "2014-10-12")
+{
+    discard;
+}
+""")
+
+    def test_currentdate_norel(self):
+        self.compilation_ok(b"""require "date";
+
+if allof (
+  currentdate :zone "+0100" :is "date" "2013-10-23"
+)
+{
+    discard;
+}""")
+
+    def test_currentdate_extension_not_loaded(self):
+        self.compilation_ko(b"""require "date";
+
+if allof ( currentdate :value "ge" "date" "2013-10-23" , currentdate :value "le" "date" "2014-10-12" )
+{
+    discard;
+}
+""")
+
+
+class VariablesCommands(SieveTest):
+    def test_set_command(self):
+        self.compilation_ok(b"""require "variables";
+
+set "matchsub" "testsubject";
+
+if allof (
+  header :contains "Subject" "${header}"
+)
+{
+  discard;
+}
+""")
+
+
+class CopyWithoutSideEffectsTestCase(SieveTest):
+    """RFC3894 test cases."""
+
+    def test_redirect_with_copy(self):
+        self.compilation_ko(b"""
+if header :contains "subject" "test" {
+    redirect :copy "dev@null.com";
+}
+""")
+
+        self.compilation_ok(b"""require "copy";
+if header :contains "subject" "test" {
+    redirect :copy "dev@null.com";
+}
+""")
+
+    def test_fileinto_with_copy(self):
+        self.compilation_ko(b"""require "fileinto";
+if header :contains "subject" "test" {
+    fileinto :copy "Spam";
+}
+""")
+        self.assertEqual(
+            self.parser.error, "line 3: extension 'copy' not loaded")
+
+        self.compilation_ok(b"""require "fileinto", "copy";
+if header :contains "subject" "test" {
+    fileinto :copy "Spam";
+}
+""")
+
+
+if __name__ == "__main__":
+    unittest.main()

sievelib-1.2.1.tar.gz/sievelib/tools.py Added

Build Results
RPM Lint

Refresh

Submit package home:molleko...:Winterfell / python-twisted to package Kolab:16:Testing / python-twisted

python-twisted.spec Added

@@ -0,0 +1,131 @@
+%global pypi_name twisted
+
+%global common_description %{expand:
+Twisted is a networking engine written in Python, supporting numerous protocols.
+It contains a web server, numerous chat clients, chat servers, mail servers
+and more.}
+
+Name:           python-%{pypi_name}
+Version:        21.7.0
+Release:        %autorelease
+Summary:        Twisted is a networking engine written in Python
+
+License:        MIT
+URL:            http://twistedmatrix.com/
+VCS:            https://github.com/twisted/twisted
+Source0:        %{pypi_source Twisted}
+# Import gobject from gi.repository for Python 3
+# https://twistedmatrix.com/trac/ticket/9642
+Patch1:         0001-Import-gobject-from-gi.repository-in-Python-3.patch
+
+BuildArch:      noarch
+
+%description %{common_description}
+
+%package -n python3-%{pypi_name}
+Summary:        %{summary}
+
+BuildRequires:  gcc
+BuildRequires:  git-core
+BuildRequires:  python3-devel >= 3.3
+BuildRequires:  python3dist(pip) >= 19
+BuildRequires:  python3dist(packaging)
+BuildRequires:  python3dist(setuptools) >= 40.8
+BuildRequires:  python3dist(wheel)
+BuildRequires:  python3-Cython
+BuildRequires:  python3dist(appdirs) >= 1.4
+BuildRequires:  python3dist(automat) >= 0.8
+BuildRequires:  python3dist(attrs) >= 19.2.0
+BuildRequires:  python3dist(bcrypt) >= 3.0.0
+BuildRequires:  python3dist(constantly) >= 15.1
+BuildRequires:  python3dist(cryptography) >= 2.6
+BuildRequires:  (python3dist(h2) >= 3 with python3dist(h2) < 5)
+BuildRequires:  python3dist(pyhamcrest) >= 1.9
+BuildRequires:  python3dist(hyperlink) >= 17.1.1
+BuildRequires:  python3dist(idna) >= 2.4
+BuildRequires:  python3dist(incremental) >= 21.3
+BuildRequires:  (python3dist(priority) >= 1.1 with python3dist(priority) < 3)
+BuildRequires:  python3dist(pyasn1)
+BuildRequires:  python3dist(pyopenssl) >= 16
+BuildRequires:  python3dist(pyserial) >= 3
+BuildRequires:  python3dist(service-identity) >= 18.1
+BuildRequires:  python3dist(setuptools)
+BuildRequires:  python3dist(sphinx) >= 1.3.1
+BuildRequires:  python3dist(sphinx-rtd-theme)
+BuildRequires:  python3dist(typing-extensions) >= 3.6.5
+BuildRequires:  python3dist(zope-interface) >= 4.4.2
+
+%{?python_extras_subpkg:Recommends:  python3-%{pypi_name}+tls}
+%{!?python_extras_subpkg:Recommends: python3dist(service-identity) >= 18.1}
+
+%description -n python3-%{pypi_name} %{common_description}
+
+%{?python_extras_subpkg:%python_extras_subpkg -n python3-%{pypi_name} -i %{python3_sitelib}/*.dist-info tls}
+
+%prep
+%autosetup -p1 -n Twisted-%{version}
+# Relax python priority dep
+sed -i "s|priority >= 1.1.0, < 2.0|priority >= 1.1.0, < 3.0|" setup.cfg
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+
+# no-manual-page-for-binary
+mkdir -p %{buildroot}%{_mandir}/man1/
+for s in conch core mail; do
+cp -a docs/$s/man/*.1 %{buildroot}%{_mandir}/man1/
+done
+
+# Packages that install arch-independent twisted plugins install here.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1252140
+mkdir -p %{buildroot}%{python3_sitelib}/twisted/plugins
+
+# Move and symlink python3 scripts
+# no-manual-page-for-binary: man page is trial and twistd
+mv %{buildroot}%{_bindir}/trial %{buildroot}%{_bindir}/trial-%{python3_version}
+ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial-3
+ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial
+
+mv %{buildroot}%{_bindir}/twistd %{buildroot}%{_bindir}/twistd-%{python3_version}
+ln -s ./twistd-%{python3_version} %{buildroot}%{_bindir}/twistd-3
+ln -s ./twistd-%{python3_version} %{buildroot}%{_bindir}/twistd
+
+# ambiguous shebangs
+pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib}
+
+%pyproject_save_files twisted
+echo "%ghost %{python3_sitelib}/twisted/plugins/dropin.cache" >> %{pyproject_files}
+
+%check
+# can't get this to work within the buildroot yet due to multicast
+# https://twistedmatrix.com/trac/ticket/7494
+PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib} %{buildroot}%{_bindir}/trial twisted ||:
+
+%files -n python3-twisted  -f %{pyproject_files}
+%doc NEWS.rst README.rst
+%license LICENSE
+%{_bindir}/trial-3*
+%{_bindir}/twistd-3*
+%{_bindir}/cftp
+%{_bindir}/ckeygen
+%{_bindir}/conch
+%{_bindir}/mailmail
+%{_bindir}/pyhtmlizer
+%{_bindir}/tkconch
+%{_bindir}/trial
+%{_bindir}/twist
+%{_bindir}/twistd
+%{_mandir}/man1/cftp.1*
+%{_mandir}/man1/ckeygen.1*
+%{_mandir}/man1/conch.1*
+%{_mandir}/man1/mailmail.1*
+%{_mandir}/man1/pyhtmlizer.1*
+%{_mandir}/man1/tkconch.1*
+%{_mandir}/man1/trial.1*
+%{_mandir}/man1/twistd.1*
+
+%changelog
+%autochangelog

0001-Import-gobject-from-gi.repository-in-Python-3.patch Added

@@ -0,0 +1,32 @@
+From 2e99044f6785e9bd0c252cee4349feab9bb9bb66 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Wed, 22 May 2019 18:13:32 +0200
+Subject: PATCH 1/2 Import gobject from gi.repository in Python 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ src/twisted/internet/gtk2reactor.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/internet/gtk2reactor.py b/src/twisted/internet/gtk2reactor.py
+index faf123464..19d97445c 100644
+--- a/src/twisted/internet/gtk2reactor.py
++++ b/src/twisted/internet/gtk2reactor.py
+@@ -43,7 +43,10 @@ try:
+ except (ImportError, AttributeError):
+     pass  # maybe we're using pygtk before this hack existed.
+ 
+-import gobject  # type: ignoreimport
++try:
++    import gobject # type: ignoreimport
++except ImportError:
++    from gi.repository import GObject as gobject
+ 
+ if hasattr(gobject, "threads_init"):
+     # recent versions of python-gtk expose this. python-gtk=2.4.1
+-- 
+2.21.0
+

Twisted-21.7.0.tar.gz Added

changelog Added

@@ -0,0 +1,320 @@
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.2.0-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 21.2.0-3
+- Rebuilt for Python 3.10
+
+* Fri Mar 05 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.0-2
+- Reintroduce twistedtls subpackage
+- Fixes: rhbz#1935872
+- Fixes: rhbz#1935873
+- Fixes: rhbz#1935869
+- Fixes: rhbz#1935870
+- Fixes: rhbz#1935871
+
+* Fri Mar  5 09:54:54 CET 2021 Robert-André Mauchin <zebob.m@gmail.com> - 21.2.0-1
+- Update to 21.2.0
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.3.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Dec 20 2020 Robert-André Mauchin <zebob.m@gmail.com> - 20.3.0-4
+- Bump h2 dependency
+- Fix: rhbz#1909413
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3.0-2
+- Add twistedtls subpackage
+
+* Thu Jun 18 05:29:03 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 20.3.0-1
+- Update to 20.3.0
+
+* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 19.10.0-3
+- Rebuilt for Python 3.9
+
+* Tue Mar 17 16:31:05 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 19.10.0-2
+- Security fix for CVE-2020-10108 (#1813439, #1813441)
+- Security fix for CVE-2020-10109 (#1813447, #1813449)
+
+* Tue Mar 17 15:15:48 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 19.10.0-1
+- Update to 19.10.0
+- Revert removal of %%{python3_sitelib}/twisted/plugins/
+
+* Sun Oct 13 23:35:33 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 19.7.0-2
+- Drop Python 2 support (#1761204)
+
+* Mon Sep 16 2019 Jeremy Cline <jcline@redhat.com> - 19.7.0-1
+- Update to 19.7.0
+
+* Tue Sep 03 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.1-6
+- Stop running Python 2 tests at build time, reduce the build dependencies
+
+* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.1-5
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 09 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.1-3
+- Security fix for CVE-2019-12855 (Check certificates for XMPP TLS) (#1728206) (#1728207)
+
+* Wed Jul 03 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.1-2
+- Rebuilt to update automatic Python dependencies
+
+* Sun Jun 09 18:40:31 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 19.2.1-1
+- Release 19.2.1
+
+* Wed May 22 18:26:29 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 19.2.0-3
+- Add patch to import gobject from gi.repository for Python 3
+- Fix #1712748
+
+* Tue May 14 16:00:42 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 19.2.0-2
+- Add patch regenerating raiser.c to use with Python 3.8a4
+- Fix #11709817
+
+* Wed Apr 10 17:38:50 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 19.2.0-1
+- Release 19.2.0 (#1698490)
+
+* Thu Mar 07 2019 Robert-André Mauchin <zebob.m@gmail.com> - 18.9.0-1
+- Release 18.9.0
+- Run tests
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 22 2018 Miro Hrončok <mhroncok@redhat.com> - 18.7.0-3
+- Recommend pythonX-service-identity
+
+* Sat Jul 21 2018 Robert-André Mauchin <zebob.m@gmail.com> - 18.7.0-2
+- Remove erroneous symlink to binaries
+
+* Sun Jul 15 2018 Robert-André Mauchin <zebob.m@gmail.com> - 18.7.0-1
+- Update to 18.7.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 27 2018 Robert-André Mauchin <zebob.m@gmail.com> - 18.4.0-1
+- Update to 18.4.0
+- Default binaries to Python 3
+- Drop old Obsoletes/Provides
+- Refresh BR
+- Remove useless macros
+- Use python_enable_dependency_generator
+
+* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 16.4.1-11
+- Rebuilt for Python 3.7
+
+* Wed May 23 2018 Miro Hrončok <mhroncok@redhat.com> - 16.4.1-10
+- Fix ambiguous shebangs
+
+* Fri Apr 27 2018 Petr Viktorin <pviktori@redhat.com> - 16.4.1-9
+- No longer require python-crypto
+
+* Mon Mar 26 2018 Iryna Shcherbina <ishcherb@redhat.com> - 16.4.1-8
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.4.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Sep 29 2017 Troy Dawson <tdawson@redhat.com> - 16.4.1-6
+- Cleanup spec file conditionals
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.4.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Dec 13 2016 Stratakis Charalampos <cstratak@redhat.com> - 16.4.1-2
+- rebuilt
+
+* Wed Oct 26 2016 Jonathan Steffan <jsteffan@fedoraproject.org> - 16.4.1-1
+- Update to 16.4.1
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 16.3.0-2
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Jul 8 2016 Jonathan Steffan <jsteffan@fedoraproject.org> - 16.3.0-1
+- Update to 16.3.0
+- mahole, tap2deb, tap2rpm are removed upstream
+
+* Sun Jun 26 2016 Jonathan Steffan <jsteffan@fedoraproject.org> - 16.2.0-2
+- Add rpmlint notes
+- Fix unneeded py3 conditional for py2 script chmod
+
+* Sun Jun 26 2016 Jonathan Steffan <jsteffan@fedoraproject.org> - 16.2.0-1
+- Update to 16.2.0
+- Update upstream source location
+
+* Thu Jun  2 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 16.1.1-3
+- Drop tkinter dependency (only required for tkconch)
+- Use python3 conditionals
+- Move BR under the proper subpackage
+
+* Tue May 10 2016 Petr Viktorin <pviktori@redhat.com> - 16.1.1-2
+- Update to better conform to Python packaging guidelines
+
+* Thu May 05 2016 Julien Enselme <jujens@jujens.eu> - 16.1.1-1
+- Update to 16.1.1 (#1287381)
+
+* Thu Mar 10 2016 Julien Enselme <jujens@jujens.eu> - 15.5.0-2
+- Add python3 support
+
+* Thu Mar 10 2016 Julien Enselme <jujens@jujens.eu> - 15.5.0-1
+- Update to 15.5.0 (#1287381)
+- Use new python macros
+- Remove deprecated %%clean section
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 15.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Nov 27 2015 Tom Prince <tom.prince@twistedmatrix.com> - 15.4.0-2
+- Add arch-independent plugin directory to package. (RHBZ#1252140)
+
+* Thu Oct 29 2015 Tom Prince <tom.prince@twistedmatrix.com> - 15.4.0-1
+- Update to 15.4.0
+- Include test certificates.
+
+* Mon Jul 20 2015 Jonathan Steffan <jsteffan@fedoraproject.org> - 15.2.1-1
+- Update to 15.2.1
+
+* Sat May 09 2015 Jonathan Steffan <jsteffan@fedoraproject.org> - 15.1.0-1
+- Update to 15.1.0 (RHBZ#1187921,RHBZ#1192707)
+- Require python-service-identity (RHBZ#1119067)
+- Obsolete python-twisted-core-doc (RHBZ#1187025)
+
+* Sat Nov 22 2014 Jonathan Steffan <jsteffan@fedoraproject.org> - 14.0.2-1
+- Update to 14.0.2 (RHBZ#1143002)
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Jonathan Steffan <jsteffan@fedoraproject.org> - 14.0.0-1
+- Update to 14.0.0
+- Ship Twisted as a fully featured package without subpackages on the advice
+  of upstream and to mirror what pypi provides
+- Explictly build for python2 with new macros
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Sep 03 2012 Julian Sikorski <belegdol@fedoraproject.org> - 12.2.0-1
+- Updated to 12.2.0
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jun 17 2012 Julian Sikorski <belegdol@fedoraproject.org> - 12.1.0-1
+- Updated to 12.1.0
+
+* Sun Feb 12 2012 Julian Sikorski <belegdol@fedoraproject.org> - 12.0.0-1
+- Updated to 12.0.0
+
+* Sat Jan 07 2012 Julian Sikorski <belegdol@fedoraproject.org> - 11.1.0-2
+- Rebuilt for gcc-4.7
+
+* Fri Nov 18 2011 Julian Sikorski <belegdol@fedoraproject.org> - 11.1.0-1
+- Updated to 11.1.0
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
+* Sat Apr 30 2011 Julian Sikorski <belegdol@fedoraproject.org> - 11.0.0-1
+- Updated to 11.0.0
+- Added comment on how to obtain the PKG-INFO file
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Jan 15 2011 Julian Sikorski <belegdol@fedoraproject.org> - 10.2.0-1
+- Updated to 10.2.0
+
+* Mon Nov 08 2010 Julian Sikorski <belegdol@fedoraproject.org> - 10.1.0-3
+- Use python_sitelib instead of python-sitearch
+- The aforementioned macros are defined in Fedora 13 and above
+
+* Sun Nov 07 2010 Julian Sikorski <belegdol@fedoraproject.org> - 10.1.0-2
+- Added egg-info file
+
+* Tue Sep 21 2010 Julian Sikorski <belegdol@fedoraproject.org> - 10.1.0-1
+- Updated to 10.1.0
+- Switched to macros for versioned dependencies
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 29 2008 Matthias Saou <http://freshrpms.net/> 8.2.0-1
+- Update to 8.2.0.
+- Change back spec cosmetic details from Paul's to Thomas' preference.
+
+* Wed Jul 16 2008 Matthias Saou <http://freshrpms.net/> 8.1.0-2
+- Update to 8.1.0.
+- Minor spec file cleanups.
+- Merge back changes from Paul Howarth.
+
+* Wed May 21 2008 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.5.0-1
+- update to 2.5.0 release (only the umbrella package was missing)
+
+* Tue Jan 16 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.4.0-3
+- list packages in README.fedora
+
+* Wed Jan 03 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.4.0-2
+- add a README.fedora
+- made noarch, since it doesn't actually install any python twisted/ module
+  code
+- fixed provides/obsoletes
+
+* Wed Jun 07 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.4.0-1
+- this is now a pure umbrella package
+
+* Mon Oct 10 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.1.0-1
+- upstream release
+
+* Tue Aug 23 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.1-1
+- upstream release
+
+* Mon Apr 04 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0-2
+- add zsh support
+
+* Fri Mar 25 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0-1
+- final release
+
+* Thu Mar 17 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0-0.2.a3
+- dropped web2
+
+* Wed Mar 16 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0-0.1.a3
+- upstream release
+
+* Sat Mar 12 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0-0.1.a2
+- new prerelease; FE versioning
+
+* Mon Feb 07 2005 Jeff Pitman <symbiont+pyvault@berlios.de> 2.0.0a1-1
+- prep for split
+
+* Fri Aug 20 2004 Jeff Pitman <symbiont+pyvault@berlios.de> 1.3.0-1
+- new version
+
+* Mon Apr 19 2004 Jeff Pitman <symbiont+pyvault@berlios.de> 1.2.0-3
+- vaultize
+
+* Mon Apr 12 2004 Jeff Pitman <symbiont+pyvault@berlios.de> 1.2.0-2
+- require pyOpenSSL, SOAPpy, openssh-clients, crypto, dia so trial can run