Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package courier-imap for openSUSE:Factory checked in at 2022-12-05 18:01:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/courier-imap (Old) and /work/SRC/openSUSE:Factory/.courier-imap.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "courier-imap" Mon Dec 5 18:01:20 2022 rev:66 rq:1040092 version:5.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/courier-imap/courier-imap.changes 2022-09-03 23:19:09.227827449 +0200 +++ /work/SRC/openSUSE:Factory/.courier-imap.new.1835/courier-imap.changes 2022-12-05 18:01:25.868656723 +0100 @@ -1,0 +2,14 @@ +Sun Dec 4 20:16:13 UTC 2022 - Arjen de Korte <[email protected]> + +- update to 5.2.0 + * Switch to libidn2. + * Debian/Ubuntu: update lintian overrides + * make install: replace absolute links with relative links. + +- update to 5.1.9 + * Adjust deb packaging. Check /etc/lsb-release and include the + distribution release in the deb package version, to faciliate + updating to the same version of the package in an updated release. + * Fix build dependencies. + +------------------------------------------------------------------- Old: ---- courier-imap-5.1.8.tar.bz2 courier-imap-5.1.8.tar.bz2.sig New: ---- courier-imap-5.2.0.tar.bz2 courier-imap-5.2.0.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-imap.spec ++++++ --- /var/tmp/diff_new_pack.fQhD5B/_old 2022-12-05 18:01:26.580660600 +0100 +++ /var/tmp/diff_new_pack.fQhD5B/_new 2022-12-05 18:01:26.584660622 +0100 @@ -19,7 +19,7 @@ %bcond_with valgrind Name: courier-imap -Version: 5.1.8 +Version: 5.2.0 Release: 0 Summary: An IMAP and POP3 Server for Maildir MTAs License: GPL-3.0-or-later @@ -53,7 +53,7 @@ BuildRequires: pcre2-devel BuildRequires: procps BuildRequires: zlib-devel -BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libidn2) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(systemd) %if %{with valgrind} ++++++ courier-imap-5.1.8.tar.bz2 -> courier-imap-5.2.0.tar.bz2 ++++++ ++++ 35543 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/INSTALL new/courier-imap-5.2.0/INSTALL --- old/courier-imap-5.1.8/INSTALL 2022-05-27 03:54:08.000000000 +0200 +++ new/courier-imap-5.2.0/INSTALL 2022-12-03 02:14:33.000000000 +0100 @@ -1,17 +1,17 @@ Courier-IMAP - * Installation - * Requirements - * Upgrading - * Manual compilation and installation - * IMAP configuration file - * Account initialization hook - * Using shared folders - * CRAM-MD5 Authentication - * Certificate Authentication - * Sending mail via an IMAP connection - * Account OPTIONS - * SMAP + â¢Â Installation + â¢Â Requirements + â¢Â Upgrading + â¢Â Manual compilation and installation + â¢Â IMAP configuration file + â¢Â Account initialization hook + â¢Â Using shared folders + â¢Â CRAM-MD5 Authentication + â¢Â Certificate Authentication + â¢Â Sending mail via an IMAP connection + â¢Â Account OPTIONS + â¢Â SMAP INSTALLATION @@ -109,27 +109,27 @@ # Start the authdaemond process - NOTE + > NOTE - You MUST run the configure script as normal user, not root. Did you - extract the tarball as root? It won't work. Remove the extracted source - code. Log in as a normal user. Extract the source code as a normal user, - then run configure. You will do everything as a normal user, except for - the final step of installing the compiled software. + > You MUST run the configure script as normal user, not root. Did you + > extract the tarball as root? It won't work. Remove the extracted source + > code. Log in as a normal user. Extract the source code as a normal user, + > then run configure. You will do everything as a normal user, except for + > the final step of installing the compiled software. Requirements - * C++ compiler - A C++ compiler is required. The server is written in C, + â¢Â C++ compiler - A C++ compiler is required. The server is written in C, but there are some configuration scripts that use C++ code. - * make - The GNU make is recommended. Solaris's make is to be avoided. + â¢Â make - The GNU make is recommended. Solaris's make is to be avoided. xBSD already has a gmake port, install it and use it (use gmake everywhere this document refers to make). - * GDBM/DB - either the GDBM or the Berkeley DB library is required. - * The GNU IDN library (http://www.gnu.org/software/libidn/). - * The Courier authentication library. Before installing Courier-IMAP, + â¢Â GDBM/DB - either the GDBM or the Berkeley DB library is required. + â¢Â The GNU IDN library (https://www.gnu.org/software/libidn/). + â¢Â The Courier authentication library. Before installing Courier-IMAP, download and install https://www.courier-mta.org/authlib/. - * The GNU IDN) library is required. - * The Courier unicode library. Before installing Courier-IMAP, download + â¢Â The GNU IDN) library is required. + â¢Â The Courier unicode library. Before installing Courier-IMAP, download and install https://www.courier-mta.org/unicode/. UPGRADING @@ -289,9 +289,9 @@ The recommended upgrade procedure is as follows: - * Back up /usr/lib/courier-imap/etc - * Follow the installation procedures, below - * After installing, manually edit all configuration files. Restore, by + â¢Â Back up /usr/lib/courier-imap/etc + â¢Â Follow the installation procedures, below + â¢Â After installing, manually edit all configuration files. Restore, by hand, any custom configuration settings. All configuration files are kept in the configuration directory. Nothing @@ -328,7 +328,7 @@ As mentioned in "Requirements", above, if you are using xBSD, you must use gmake instead of make. - -------------------------------------------------------------------------- + ââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââââ NOTE: The configure script may run as much as 5-10 minutes on slow machines. It may appear that configure is stuck in a loop, but that's an @@ -390,16 +390,16 @@ Follow OpenSSL's or GnuTLS's installation instructions, then build Courier-IMAP. - NOTE: Most systems already have an available OpenSSL or GnuTLS package. - Do not build OpenSSL or GnuTLS yourself, if a prebuilt package is - already available. Just install the prebuilt package. - - NOTE: The development libraries must be installed in addition to the - runtime package, in order to build Courier-IMAP. On most systems, the - development files (header files, libraries, etc...) are provided in a - separate "devel" package. The base OpenSSL/GnuTLS package is not - sufficient to build Courier-IMAP, the development libraries must be - installed. + > NOTE: Most systems already have an available OpenSSL or GnuTLS package. + > Do not build OpenSSL or GnuTLS yourself, if a prebuilt package is + > already available. Just install the prebuilt package. + + > NOTE: The development libraries must be installed in addition to the + > runtime package, in order to build Courier-IMAP. On most systems, the + > development files (header files, libraries, etc...) are provided in a + > separate "devel" package. The base OpenSSL/GnuTLS package is not + > sufficient to build Courier-IMAP, the development libraries must be + > installed. The OpenSSL library is selected when both OpenSSL and GnuTLS libraries are found by the configure script. Use the --with-gnutls option to explicitly @@ -467,8 +467,8 @@ Options to configure: - * --prefix=pathname - install here, instead of /usr/lib/courier-imap - * --without-ipv6 - do not compile IPv6 support. The configure + â¢Â --prefix=pathname - install here, instead of /usr/lib/courier-imap + â¢Â --without-ipv6 - do not compile IPv6 support. The configure automatically checks if IPv6 support is available, and enables it automatically. This option suppresses IPv6 support, even if it's available. IPv6 support means that Courier-IMAP will create an IPv6 @@ -479,21 +479,21 @@ modprobe regularly complaining in /var/log/messages about the fact that it can't load the IPv6 module. Use --without-ipv6 to turn off IPv6 support, if that bothers you. - * --bindir=pathname , --mandir=pathname - override default names of + â¢Â --bindir=pathname , --mandir=pathname - override default names of subdirectories under prefix. See below for more information. - * --with-db=db - Use the DB library instead of the GDBM library You must + â¢Â --with-db=db - Use the DB library instead of the GDBM library You must have either the GDBM or the DB library installed. If both are present, GDBM is selected unless you use this option. The GDBM/DB library is used by Courier for certain functions. - * --with-gnutls - Use the GnuTLS library even if the OpenSSL library is + â¢Â --with-gnutls - Use the GnuTLS library even if the OpenSSL library is also installed. Courier-IMAP automatically uses whichever one is available. The OpenSSL library is selected if both are present. Use this option to override and select GnuTLS instead. - * --with-piddir=dir - use dir/imapd.pid to store couriertcpd's process + â¢Â --with-piddir=dir - use dir/imapd.pid to store couriertcpd's process ID. - * --with-userdb=file - use file instead of /etc/userdb (also means that + â¢Â --with-userdb=file - use file instead of /etc/userdb (also means that userdb.dat and userdbshadow.dat are appropriately renamed). - * --enable-workarounds-for-imap-client-bugs - there are a number of + â¢Â --enable-workarounds-for-imap-client-bugs - there are a number of various bugs in certain IMAP clients. The current list of broken IMAP clients consists of Netscape Messenger and Sun's StarOffice. This option enables some workarounds for some bugs in these clients, @@ -503,7 +503,7 @@ information. NOTE - if this option is used, make check WILL FAIL. You should first configure Courier-IMAP without this option, run make check, then reconfigure Courier-IMAP with this option. - * --with-trashquota - include deleted messages, and the Trash folder, in + â¢Â --with-trashquota - include deleted messages, and the Trash folder, in the estimated quota usage for maildirs. Quotas are optional, see the file maildir/README.maildirquota.html for more information. The default configuration does not count messages marked as deleted (but @@ -512,7 +512,7 @@ this option is used, make check WILL FAIL. You should first configure Courier-IMAP without this option, run make check, then reconfigure Courier-IMAP with this option. - * --with-dirsync - after saving a new message to a maildir (the IMAP + â¢Â --with-dirsync - after saving a new message to a maildir (the IMAP COPY and APPEND commands) explicitly sync the maildir's directory directory. There's a school of thought which believes that the Linux ext2 filesystem requires the parent directory to be synced, in @@ -531,13 +531,13 @@ Use the --prefix option to specify a different directory. This directory will have the following subdirectories: - * etc - configuration files - * bin - binaries - * sbin - superuser binaries - * libexec - additional binaries - * man - manual pages - * share - scripts and data files - * var - temporary files used by the authdaemond, daemon process (if the + â¢Â etc - configuration files + â¢Â bin - binaries + â¢Â sbin - superuser binaries + â¢Â libexec - additional binaries + â¢Â man - manual pages + â¢Â share - scripts and data files + â¢Â var - temporary files used by the authdaemond, daemon process (if the authdaemon authentication module is selected). Having everything installed underneath one directory allows its contents @@ -634,9 +634,9 @@ attempted only when you are comfortable with, and fully understand how Courier-IMAP works in general. Here's an overview of this procedure: - * Install and implement /etc/userdb, because CRAM-MD5 authentication + â¢Â Install and implement /etc/userdb, because CRAM-MD5 authentication uses the /etc/userdb database (but see below for LDAP-specific notes). - * Figure out which accounts are going to use CRAM-MD5 authentication. + â¢Â Figure out which accounts are going to use CRAM-MD5 authentication. People who do not use an IMAP client that supports CRAM-MD5 can continue and log in with the existing system password. But everyone who runs a client that supports CRAM-MD5 authentication will need a @@ -653,7 +653,7 @@ Then run the makeuserdb command, as always. - * NOTE: CRAM-MD5 authentication is also be supported by authldap, + â¢Â NOTE: CRAM-MD5 authentication is also be supported by authldap, authpgsql and authmysql, as long as clear-text passwords are used. See below for more information. Therefore, if you use LDAP, PostgreSQL, or MySQL, and you store clear-text passwords, you should all set and @@ -679,8 +679,8 @@ certificates' subject must match the login ID in the authentication database. Consider the following certificate: - ... - Subject: C=US,ST=New York,L=New York,O=Acme Widgets Inc,CN=John Smith,[email protected] + ... + Subject: C=US,ST=New York,L=New York,O=Acme Widgets Inc,CN=John Smith,[email protected] If the emailAddress field is configured as the login ID, the authentication database must provide login details for @@ -688,22 +688,22 @@ imapd-ssl and pop3d-ssl configuration files, and make the following changes: - * Set TLS_TRUSTCERTS to the filename with your certificate authority's + â¢Â Set TLS_TRUSTCERTS to the filename with your certificate authority's X.509 certificate. - * Change the TLS_VERIFYPEER setting to "PEER". The setting can also be + â¢Â Change the TLS_VERIFYPEER setting to "PEER". The setting can also be changed to "REQUIREPEER" to require all SSL/TLS connections to provide a certificate. Otherwise, it is optional. If the mail client provides an SSL certificate, it may be used to authenticate. Without a certificate, password-based authentication remains an option. - * Change the TLS_EXTERNAL setting to the name of the certificate subject + â¢Â Change the TLS_EXTERNAL setting to the name of the certificate subject field that gives the login ID. In the above example, this would be "TLS_EXTERNAL=emailaddress". - NOTE: GnuTLS's certtool uses "email" as the name of this field. If - Courier-IMAP is compiled with GnuTLS, you should still specify this - field as "emailaddress". + > NOTE: GnuTLS's certtool uses "email" as the name of this field. If + > Courier-IMAP is compiled with GnuTLS, you should still specify this + > field as "emailaddress". SENDING MAIL VIA AN IMAP CONNECTION @@ -736,26 +736,26 @@ message was sent, so it's a good idea to include your own E-mail address on the Cc: list. - NOTE: it is tempting to configure the IMAP mail client to use Outbox as - its default folder for saving drafts. Resist the temptation. If you - forget, you'll save a partially completed draft, which will be then - obediently mailed out. - - NOTE: the message, in addition to being sent, will be saved in the - folder in the normal fashion. After saving the message, reopen the - Outbox folder and delete the sent message, or move it someplace else. - - NOTE: when enabled, the Courier-IMAP server will advertize a private - XCOURIEROUTBOX IMAP capability. It is theoretically possible to code an - IMAP mail client that reads this capability and automatically configures - itself accordingly -- when this IMAP capability is present -- to send - E-mail in the normal way but using the IMAP connection. At this time, - I'm not aware of any actual mail clients that know how to do this. - - NOTE: many mail clients save some additional internal information in - headers of draft messages. The internal information is normally removed - before the mail client sends the message. Make sure that none of this - extra information is something that should not be mailed out. + > NOTE: it is tempting to configure the IMAP mail client to use Outbox as + > its default folder for saving drafts. Resist the temptation. If you + > forget, you'll save a partially completed draft, which will be then + > obediently mailed out. + + > NOTE: the message, in addition to being sent, will be saved in the + > folder in the normal fashion. After saving the message, reopen the + > Outbox folder and delete the sent message, or move it someplace else. + + > NOTE: when enabled, the Courier-IMAP server will advertize a private + > XCOURIEROUTBOX IMAP capability. It is theoretically possible to code an + > IMAP mail client that reads this capability and automatically configures + > itself accordingly -- when this IMAP capability is present -- to send + > E-mail in the normal way but using the IMAP connection. At this time, + > I'm not aware of any actual mail clients that know how to do this. + + > NOTE: many mail clients save some additional internal information in + > headers of draft messages. The internal information is normally removed + > before the mail client sends the message. Make sure that none of this + > extra information is something that should not be mailed out. Account OPTIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/INSTALL.html.in new/courier-imap-5.2.0/INSTALL.html.in --- old/courier-imap-5.1.8/INSTALL.html.in 2022-04-22 16:29:08.000000000 +0200 +++ new/courier-imap-5.2.0/INSTALL.html.in 2022-12-02 14:33:40.000000000 +0100 @@ -164,8 +164,8 @@ this document refers to make).</li> <li>GDBM/DB - either the GDBM or the Berkeley DB library is required.</li> <li> - <a href="http://www.gnu.org/software/libidn/";>The GNU IDN library</a> - (http://www.gnu.org/software/libidn/). + <a href="https://www.gnu.org/software/libidn/";>The GNU IDN library</a> + (https://www.gnu.org/software/libidn/). </li> <li>The Courier authentication library. Before installing Courier-IMAP, download and install <a href= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/Makefile.am new/courier-imap-5.2.0/Makefile.am --- old/courier-imap-5.1.8/Makefile.am 2022-04-22 16:29:08.000000000 +0200 +++ new/courier-imap-5.2.0/Makefile.am 2022-11-26 02:55:07.000000000 +0100 @@ -152,7 +152,7 @@ $(mkinstalldirs) $(DESTDIR)$(sbindir) for f in mkimapdcert mkpop3dcert mkdhparams; \ do rm -f $(DESTDIR)$(sbindir)/$$f ; \ - $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done + $(LN_S) `realpath -m --relative-to $(sbindir)` $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done $(mkinstalldirs) $(DESTDIR)$(localstatedir) install-exec-hook: @@ -209,6 +209,19 @@ cd @PACKAGE@-@VERSION@ && ./courier-debuild -us -uc && mv deb ../deb && cd .. && rm -rf @PACKAGE@-@VERSION@ $$HOME/bin/debrepos.sh +deb-pbuild: bump.deb.release + @test -z "$(PBUILD)" || exit 0; echo "Set PBUILD please"; exit 1 + . deb.release; \ + R="`echo $(PBUILD) | tr '.' '+'`"; \ + sed 's/^\([^ ][^ ]*\).*/\1 (@VERSION@-'$$RELEASE'+'$$R') devel; urgency=medium/' \ + <packaging/debian/changelog >packaging/debian/changelog.new; \ + mv packaging/debian/changelog.new packaging/debian/changelog + $(MAKE) dist + rm -rf @PACKAGE@-@VERSION@ deb/pbuild + tar xf @PACKAGE@-@[email protected] + cd @PACKAGE@-@VERSION@ && chmod +x ./courier-debuild && ./courier-debuild -us -uc && mv deb ../deb/pbuild + rm -rf @PACKAGE@-@VERSION@ + bump.deb.release: packaging/debian/changelog VERSION="x"; \ test -f $(srcdir)/deb.release && . $(srcdir)/deb.release; \ @@ -217,7 +230,9 @@ RELEASE=`expr $$NEXT_RELEASE + 1`; \ echo "VERSION=@PACKAGE_VERSION@" >$(srcdir)/deb.release; \ echo "RELEASE=$$RELEASE" >>$(srcdir)/deb.release; \ - sed 's/^\([^ ][^ ]*\).*/\1 (@VERSION@-'$$RELEASE') devel; urgency=medium/' \ + . /etc/lsb-release; \ + R=`echo $$DISTRIB_RELEASE | tr '.' '+'`; \ + sed 's/^\([^ ][^ ]*\).*/\1 (@VERSION@-'$$RELEASE'+'$$R') devel; urgency=medium/' \ <packaging/debian/changelog >packaging/debian/changelog.new; \ mv packaging/debian/changelog.new packaging/debian/changelog @@ -335,7 +350,7 @@ WWW=$$HOME/www/hostrocket/courier-mta.org -htmldoc: INSTALL.html libs/imap/README.html libs/maildir/README.maildirquota.html libs/maildir/README.sharedfolders.html libs/maildir/README.imapkeywords.html libs/imap/BUGS.html libs/imap/README.proxy.html libs/imap/README.html +htmldoc: INSTALL.html libs/maildir/README.maildirquota.html libs/maildir/README.sharedfolders.html libs/maildir/README.imapkeywords.html libs/imap/BUGS.html libs/imap/README.proxy.html for f in $^; do xsltproc --nonet $(srcdir)/imap-format.xsl $$f | perl -ne 's~\$(id):.*\$$~\$(id):'"$$h"'\$$~; print' >$(WWW)/imap/`basename $$f`; done rm -rf doc mkdir doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/configure.ac new/courier-imap-5.2.0/configure.ac --- old/courier-imap-5.1.8/configure.ac 2022-05-26 04:02:42.000000000 +0200 +++ new/courier-imap-5.2.0/configure.ac 2022-12-02 13:10:39.000000000 +0100 @@ -3,10 +3,10 @@ dnl Copyright 1998 - 2022 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT([courier-imap],[5.1.8],[[email protected]]) +AC_INIT([courier-imap],[5.2.0],[[email protected]]) AC_CONFIG_SRCDIR(libs/imap/imapd.c) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(foreign) >confdefs.h # Kill PACKAGE_ macros AC_PROG_CC @@ -66,7 +66,7 @@ ;; esac -PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) if test "$libidn" != "yes" then AC_MSG_ERROR([libidn not found]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/courier-debuild new/courier-imap-5.2.0/courier-debuild --- old/courier-imap-5.1.8/courier-debuild 2022-05-27 03:39:49.000000000 +0200 +++ new/courier-imap-5.2.0/courier-debuild 2022-12-02 15:27:59.000000000 +0100 @@ -9,14 +9,14 @@ set -e shopt -s extglob -f=`cd .. && ls courier-imap-5.1.8.tar* | sed -n 1p` +f=`cd .. && ls courier-imap-5.2.0.tar* | sed -n 1p` rm -rf deb mkdir deb cp ../$f deb/`echo $f | sed 's/courier-imap-/courier-imap_/;s/.tar./.orig.tar./'` cd deb tar xf * -cd courier-imap-5.1.8 +cd courier-imap-5.2.0 cp -pr packaging/debian . if test "$DEBGCC" = "" @@ -48,5 +48,5 @@ debuild "$@" cd .. -rm -rf courier-imap-5.1.8 +rm -rf courier-imap-5.2.0 echo "Built packages in the deb subdirectory." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/courier-imap.spec new/courier-imap-5.2.0/courier-imap.spec --- old/courier-imap-5.1.8/courier-imap.spec 2022-05-27 03:54:08.000000000 +0200 +++ new/courier-imap-5.2.0/courier-imap.spec 2022-12-03 02:14:33.000000000 +0100 @@ -26,13 +26,13 @@ %define _missing_doc_files_terminate_build 1 %define _unpackaged_files_terminate_build 1 -Summary: Courier-IMAP 5.1.8 IMAP server +Summary: Courier-IMAP 5.2.0 IMAP server Name: courier-imap -Version: 5.1.8 -Release: 1%{courier_release} +Version: 5.2.0 +Release: 2%{courier_release} License: GPL Group: Applications/Mail -Source: %{name}-5.1.8.tar.bz2 +Source: %{name}-5.2.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: coreutils sed %if %suse_version @@ -52,7 +52,7 @@ BuildRequires: gdbm-devel BuildRequires: coreutils perl BuildRequires: courier-authlib-devel >= 0.60.6.20080629 -BuildRequires: libidn-devel +BuildRequires: libidn2-devel BuildRequires: courier-unicode-devel BuildRequires: %{__make} @@ -93,7 +93,7 @@ # SuSE specific settings %if %suse_version # some templates for SuSE distribs. -%define templdir ${RPM_BUILD_DIR}/%{name}-5.1.8/packaging/suse +%define templdir ${RPM_BUILD_DIR}/%{name}-5.2.0/packaging/suse %define _sysconfdir /etc/courier-imap %define _mandir /usr/share/man %define initlndir /usr/sbin @@ -171,7 +171,7 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/dhparams.pem.dist.tmp %{__mkdir_p} $RPM_BUILD_ROOT/etc/cron.monthly -%{__ln_s} %{_sbindir}/mkdhparams $RPM_BUILD_ROOT/etc/cron.monthly/courier-imap-mkdhparams +%{__ln_s} `realpath -m --relative-to /etc/cron.monthly %{_sbindir}/mkdhparams` $RPM_BUILD_ROOT/etc/cron.monthly/courier-imap-mkdhparams # # Fix imapd.dist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/courier-imap.spec.in new/courier-imap-5.2.0/courier-imap.spec.in --- old/courier-imap-5.1.8/courier-imap.spec.in 2022-05-26 04:02:42.000000000 +0200 +++ new/courier-imap-5.2.0/courier-imap.spec.in 2022-11-29 01:49:16.000000000 +0100 @@ -52,7 +52,7 @@ BuildRequires: gdbm-devel BuildRequires: coreutils perl BuildRequires: courier-authlib-devel >= 0.60.6.20080629 -BuildRequires: libidn-devel +BuildRequires: libidn2-devel BuildRequires: courier-unicode-devel BuildRequires: %{__make} @@ -171,7 +171,7 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/dhparams.pem.dist.tmp %{__mkdir_p} $RPM_BUILD_ROOT/etc/cron.monthly -%{__ln_s} %{_sbindir}/mkdhparams $RPM_BUILD_ROOT/etc/cron.monthly/courier-imap-mkdhparams +%{__ln_s} `realpath -m --relative-to /etc/cron.monthly %{_sbindir}/mkdhparams` $RPM_BUILD_ROOT/etc/cron.monthly/courier-imap-mkdhparams # # Fix imapd.dist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/imap/ChangeLog new/courier-imap-5.2.0/libs/imap/ChangeLog --- old/courier-imap-5.1.8/libs/imap/ChangeLog 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/imap/ChangeLog 2022-12-02 13:48:24.000000000 +0100 @@ -1,3 +1,22 @@ +5.2.0 + +2022-11-28 Sam Varshavchik <[email protected]> + + * Switch to libidn2. + + * Debian/Ubuntu: update lintian overrides + +2022-11-23 Sam Varshavchik <[email protected]> + + * make install: replace absolute links with relative links. + +5.1.9 + * Adjust deb packaging. Check /etc/lsb-release and include the + distribution release in the deb package version, to faciliate + updating to the same version of the package in an updated release. + + Fix build dependencies. + 5.1.8 2022-05-22 Sam Varshavchik <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/imap/configure.ac new/courier-imap-5.2.0/libs/imap/configure.ac --- old/courier-imap-5.1.8/libs/imap/configure.ac 2022-05-26 03:57:47.000000000 +0200 +++ new/courier-imap-5.2.0/libs/imap/configure.ac 2022-12-02 13:48:24.000000000 +0100 @@ -4,7 +4,7 @@ dnl Copyright 1998 - 2022 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT([courier-imap],[5.1.8],[[email protected]]) +AC_INIT([courier-imap],[5.2.0],[[email protected]]) >confdefs.h # Kill PACKAGE_ macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/liblock/locktest.c new/courier-imap-5.2.0/libs/liblock/locktest.c --- old/courier-imap-5.1.8/libs/liblock/locktest.c 2021-05-22 11:00:04.000000000 +0200 +++ new/courier-imap-5.2.0/libs/liblock/locktest.c 2022-11-25 11:00:04.000000000 +0100 @@ -70,7 +70,8 @@ char c; close(fd[1]); - read(fd[0], &c, 1); + if (read(fd[0], &c, 1)) + ; close(fd[0]); if ((f=open(name, O_RDWR)) < 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/maildir/deliverquota.8.in new/courier-imap-5.2.0/libs/maildir/deliverquota.8.in --- old/courier-imap-5.1.8/libs/maildir/deliverquota.8.in 2020-07-12 22:16:01.000000000 +0200 +++ new/courier-imap-5.2.0/libs/maildir/deliverquota.8.in 2022-11-13 04:04:45.000000000 +0100 @@ -4,12 +4,12 @@ .\" Title: deliverquota .\" Author: Sam Varshavchik .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 07/12/2020 +.\" Date: 11/12/2022 .\" Manual: Double Precision, Inc. .\" Source: Courier Mail Server .\" Language: English .\" -.TH "DELIVERQUOTA" "8" "07/12/2020" "Courier Mail Server" "Double Precision, Inc\&." +.TH "DELIVERQUOTA" "8" "11/12/2022" "Courier Mail Server" "Double Precision, Inc\&." .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -94,9 +94,11 @@ \fBdeliverquota\fR delivers the message to the maildir and terminates with exit code 0 if the message can be delivered without going over quota\&. .PP -If the maildir is over its specified quota, +If the maildir is over its specified quota: the maildrop version of \fBdeliverquota\fR -terminates with exit code 77 (EX_NOPERM)\&. +terminates with an exit code 77 (EX_NOPERM); the Courier version of +\fBdeliverquota\fR +terminates with an exit code 75 (EX_TEMPFAIL)\&. .SH "SEE ALSO" .PP \m[blue]\fB\fBmaildirquota\fR(7)\fR\m[]\&\s-2\u[1]\d\s+2, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/maildir/deliverquota.html.in new/courier-imap-5.2.0/libs/maildir/deliverquota.html.in --- old/courier-imap-5.1.8/libs/maildir/deliverquota.html.in 2020-07-12 22:16:01.000000000 +0200 +++ new/courier-imap-5.2.0/libs/maildir/deliverquota.html.in 2022-11-13 04:04:45.000000000 +0100 @@ -57,8 +57,11 @@ <span class="command"><strong>deliverquota</strong></span> delivers the message to the maildir and terminates with exit code 0 if the message can be delivered without going over quota.</p><p> -If the maildir is over its specified quota, <span class="command"><strong>deliverquota</strong></span> -terminates with exit code 77 (EX_NOPERM).</p></div><div class="refsect1"><a id="seealso" shape="rect"> </a><h2>SEE ALSO</h2><p> + If the maildir is over its specified quota: the maildrop version of + <span class="command"><strong>deliverquota</strong></span> + terminates with an exit code 77 (EX_NOPERM); the Courier version of + <span class="command"><strong>deliverquota</strong></span> + terminates with an exit code 75 (EX_TEMPFAIL).</p></div><div class="refsect1"><a id="seealso" shape="rect"> </a><h2>SEE ALSO</h2><p> <a class="ulink" href="maildirquota.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">maildirquota</span>(7)</span></a>, <a class="ulink" href="maildirmake.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">maildirmake</span>(1)</span></a>. </p></div></div></body></html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc1035/configure.ac new/courier-imap-5.2.0/libs/rfc1035/configure.ac --- old/courier-imap-5.1.8/libs/rfc1035/configure.ac 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/rfc1035/configure.ac 2022-11-29 11:00:09.000000000 +0100 @@ -22,11 +22,11 @@ dnl Checks for libraries. -PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) if test "$libidn" = "no" then - AC_MSG_ERROR(libidn not found) + AC_MSG_ERROR(libidn2 not found) fi dnl Checks for header files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc1035/rfc1035qa.c new/courier-imap-5.2.0/libs/rfc1035/rfc1035qa.c --- old/courier-imap-5.1.8/libs/rfc1035/rfc1035qa.c 2019-12-06 05:23:52.000000000 +0100 +++ new/courier-imap-5.2.0/libs/rfc1035/rfc1035qa.c 2022-11-29 11:00:09.000000000 +0100 @@ -8,7 +8,7 @@ #include <string.h> #include <stdlib.h> #include <arpa/inet.h> -#include <idna.h> +#include <idn2.h> /* Convenient function to do forward IP lookup */ @@ -249,7 +249,7 @@ /* Convert requested hostname to UTF-8, with fallback */ - if (idna_to_unicode_8z8z(name, &p, 0) != IDNA_SUCCESS) + if (idn2_to_unicode_8z8z(name, &p, 0) != IDNA_SUCCESS) return rfc1035_unicode(res, name, iaptr, iasize); r=rfc1035_unicode(res, p, iaptr, iasize); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc1035/rfc1035reply.c new/courier-imap-5.2.0/libs/rfc1035/rfc1035reply.c --- old/courier-imap-5.1.8/libs/rfc1035/rfc1035reply.c 2020-05-08 11:00:06.000000000 +0200 +++ new/courier-imap-5.2.0/libs/rfc1035/rfc1035reply.c 2022-11-29 11:00:09.000000000 +0100 @@ -7,7 +7,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <idna.h> +#include <idn2.h> void rfc1035_replyfree(struct rfc1035_reply *p) { @@ -77,7 +77,7 @@ namebuf[i]=0; - if (idna_to_unicode_8z8z(namebuf, &p, 0) != IDNA_SUCCESS) + if (idn2_to_unicode_8z8z(namebuf, &p, 0) != IDNA_SUCCESS) return (0); if (strlen(p) >= RFC1035_MAXNAMESIZE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc1035/rfc1035resolve.c new/courier-imap-5.2.0/libs/rfc1035/rfc1035resolve.c --- old/courier-imap-5.1.8/libs/rfc1035/rfc1035resolve.c 2021-03-01 23:59:56.000000000 +0100 +++ new/courier-imap-5.2.0/libs/rfc1035/rfc1035resolve.c 2022-11-29 11:00:09.000000000 +0100 @@ -13,7 +13,7 @@ #endif #include <stdlib.h> #include <string.h> -#include <idna.h> +#include <idn2.h> static void putqbuf(const char *p, unsigned l, void *q) { @@ -58,7 +58,7 @@ for (n=0; n<nqueries; ++n) { idna_queries[n]=queries[n]; - if (idna_to_ascii_8z(idna_queries[n].name, &buffers[n], 0) + if (idn2_to_ascii_8z(idna_queries[n].name, &buffers[n], 0) != IDNA_SUCCESS) { errno=EINVAL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc1035/spf.c new/courier-imap-5.2.0/libs/rfc1035/spf.c --- old/courier-imap-5.1.8/libs/rfc1035/spf.c 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/rfc1035/spf.c 2022-11-29 11:00:09.000000000 +0100 @@ -16,7 +16,7 @@ #if HAVE_SYS_TIME_H #include <sys/time.h> #endif -#include <idna.h> +#include <idn2.h> struct rfc1035_spf_info { const char *mailfrom; @@ -1327,7 +1327,7 @@ p=strrchr(v, '@'); /* Find domain, convert to ACE */ - if (!p || idna_to_ascii_8z(++p, &buf, 0) != IDNA_SUCCESS) + if (!p || idn2_to_ascii_8z(++p, &buf, 0) != IDNA_SUCCESS) break; /* Buffer for local part + ACE domain */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc822/configure.ac new/courier-imap-5.2.0/libs/rfc822/configure.ac --- old/courier-imap-5.1.8/libs/rfc822/configure.ac 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/rfc822/configure.ac 2022-11-29 11:00:09.000000000 +0100 @@ -42,7 +42,7 @@ if test "$libidn" != "no" then - PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) + PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) if test "$libidn" != "yes" then libidn=no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc822/rfc2047.c new/courier-imap-5.2.0/libs/rfc822/rfc2047.c --- old/courier-imap-5.1.8/libs/rfc822/rfc2047.c 2017-03-09 14:32:38.000000000 +0100 +++ new/courier-imap-5.2.0/libs/rfc822/rfc2047.c 2022-11-29 11:00:09.000000000 +0100 @@ -14,8 +14,7 @@ #include "rfc822hdr.h" #include "rfc2047.h" #if LIBIDN -#include <idna.h> -#include <stringprep.h> +#include <idn2.h> #endif @@ -61,7 +60,7 @@ memset(cpy, 0, s); strcpy(cpy, domain); - err=idna_to_ascii_8z(cpy, &p, 0); + err=idn2_to_ascii_8z(cpy, &p, 0); free(cpy); if (err != IDNA_SUCCESS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/rfc822/rfc2047u.c new/courier-imap-5.2.0/libs/rfc822/rfc2047u.c --- old/courier-imap-5.1.8/libs/rfc822/rfc2047u.c 2022-04-17 13:56:50.000000000 +0200 +++ new/courier-imap-5.2.0/libs/rfc822/rfc2047u.c 2022-11-29 11:00:09.000000000 +0100 @@ -15,8 +15,7 @@ #include "rfc2047.h" #if LIBIDN -#include <idna.h> -#include <stringprep.h> +#include <idn2.h> #endif @@ -344,7 +343,7 @@ memset(cpy, 0, s); strcpy(cpy, p); - err=idna_to_unicode_8z8z(cpy, &utf8_ptr, 0); + err=idn2_to_unicode_8z8z(cpy, &utf8_ptr, 0); free(cpy); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/tcpd/configure.ac new/courier-imap-5.2.0/libs/tcpd/configure.ac --- old/courier-imap-5.1.8/libs/tcpd/configure.ac 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/tcpd/configure.ac 2022-11-29 11:00:09.000000000 +0100 @@ -60,7 +60,7 @@ AC_CHECK_LIB(dl, dlopen, [ LIBDL="-ldl" ]) LIBS="$saveLIBS" -PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) if test "$libidn" != "yes" then AC_MSG_ERROR([libidn not found]) @@ -170,7 +170,7 @@ dnl Checks for library functions. -PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) if test "$libidn" != "yes" then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/tcpd/libcouriergnutls.c new/courier-imap-5.2.0/libs/tcpd/libcouriergnutls.c --- old/courier-imap-5.1.8/libs/tcpd/libcouriergnutls.c 2021-03-01 23:59:53.000000000 +0100 +++ new/courier-imap-5.2.0/libs/tcpd/libcouriergnutls.c 2022-11-29 11:00:09.000000000 +0100 @@ -18,7 +18,7 @@ #include <stdlib.h> #include <ctype.h> #include <netdb.h> -#include <idna.h> +#include <idn2.h> #if HAVE_DIRENT_H #include <dirent.h> #define NAMLEN(dirent) strlen((dirent)->d_name) @@ -578,7 +578,7 @@ const char *p; int rc; - if (idna_to_unicode_8z8z(ssl->info_cpy.peer_verify_domain, + if (idn2_to_unicode_8z8z(ssl->info_cpy.peer_verify_domain, &idn_domain, 0) != IDNA_SUCCESS) idn_domain=0; @@ -976,7 +976,7 @@ char *p; char *retfile; - if (idna_to_ascii_8z(req_dn, &p, 0) != IDNA_SUCCESS) + if (idn2_to_ascii_8z(req_dn, &p, 0) != IDNA_SUCCESS) p=0; if (p) @@ -1167,7 +1167,7 @@ char *namebuf; /* Convert to UTF8 */ - if (idna_to_unicode_8z8z(vhost_buf, &utf8, 0) + if (idn2_to_unicode_8z8z(vhost_buf, &utf8, 0) != IDNA_SUCCESS) utf8=0; @@ -1543,7 +1543,7 @@ const char *p; int rc; - if (idna_to_unicode_8z8z(ctx->info_cpy.peer_verify_domain, + if (idn2_to_unicode_8z8z(ctx->info_cpy.peer_verify_domain, &idn_domain, 0) != IDNA_SUCCESS) idn_domain=0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/tcpd/libcouriertls.c new/courier-imap-5.2.0/libs/tcpd/libcouriertls.c --- old/courier-imap-5.1.8/libs/tcpd/libcouriertls.c 2022-05-25 03:17:14.000000000 +0200 +++ new/courier-imap-5.2.0/libs/tcpd/libcouriertls.c 2022-11-29 11:00:09.000000000 +0100 @@ -22,7 +22,7 @@ #include <stdlib.h> #include <ctype.h> #include <netdb.h> -#include <idna.h> +#include <idn2.h> #if HAVE_DIRENT_H #include <dirent.h> #define NAMLEN(dirent) strlen((dirent)->d_name) @@ -205,11 +205,11 @@ } } - if (idna_to_unicode_8z8z(verify_domain, &idn_domain1, 0) + if (idn2_to_unicode_8z8z(verify_domain, &idn_domain1, 0) != IDNA_SUCCESS) idn_domain1=0; - if (idna_to_unicode_8z8z(p, &idn_domain2, 0) + if (idn2_to_unicode_8z8z(p, &idn_domain2, 0) != IDNA_SUCCESS) idn_domain2=0; @@ -1558,7 +1558,7 @@ if (info->peer_verify_domain) { - if (idna_to_unicode_8z8z(info->peer_verify_domain, + if (idn2_to_unicode_8z8z(info->peer_verify_domain, &idn_domain1, 0) != IDNA_SUCCESS) idn_domain1=0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/libs/waitlib/confwait.c new/courier-imap-5.2.0/libs/waitlib/confwait.c --- old/courier-imap-5.1.8/libs/waitlib/confwait.c 2022-05-23 11:00:05.000000000 +0200 +++ new/courier-imap-5.2.0/libs/waitlib/confwait.c 2022-11-25 11:00:04.000000000 +0100 @@ -72,7 +72,8 @@ close(pipefd[1]); close(pipefd2[0]); close(pipefd2[1]); - read(pipefd[0], &c, 1); + if (read(pipefd[0], &c, 1)) + ; _exit(0); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/packaging/debian/auto_install.sh.in new/courier-imap-5.2.0/packaging/debian/auto_install.sh.in --- old/courier-imap-5.1.8/packaging/debian/auto_install.sh.in 2022-04-22 16:29:08.000000000 +0200 +++ new/courier-imap-5.2.0/packaging/debian/auto_install.sh.in 2022-11-26 02:55:07.000000000 +0100 @@ -44,7 +44,7 @@ rm -f $DESTDIR$datadir/dhparams.pem.dist.tmp mkdir -p $DESTDIR/etc/cron.monthly -ln -s $sbindir/mkdhparams $DESTDIR/etc/cron.monthly/courier-imap-mkdhparams +ln -s `realpath -m --relative-to /etc/cron.monthly $sbindir/mkdhparams` $DESTDIR/etc/cron.monthly/courier-imap-mkdhparams # # Fix imapd.dist # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/packaging/debian/changelog new/courier-imap-5.2.0/packaging/debian/changelog --- old/courier-imap-5.1.8/packaging/debian/changelog 2022-05-27 03:54:08.000000000 +0200 +++ new/courier-imap-5.2.0/packaging/debian/changelog 2022-12-03 02:14:33.000000000 +0100 @@ -1,5 +1,5 @@ -courier-imap (5.1.8-100) devel; urgency=medium +courier-imap (5.2.0-100) devel; urgency=medium * Upstream release - -- Sam Varshavchik <[email protected]> Thu, 26 May 2022 21:54:08 -0400 + -- Sam Varshavchik <[email protected]> Fri, 02 Dec 2022 20:14:33 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/packaging/debian/changelog.in new/courier-imap-5.2.0/packaging/debian/changelog.in --- old/courier-imap-5.1.8/packaging/debian/changelog.in 2022-05-27 03:54:08.000000000 +0200 +++ new/courier-imap-5.2.0/packaging/debian/changelog.in 2022-12-03 02:14:33.000000000 +0100 @@ -2,4 +2,4 @@ * Upstream release - -- Sam Varshavchik <[email protected]> Thu, 26 May 2022 21:54:08 -0400 + -- Sam Varshavchik <[email protected]> Fri, 02 Dec 2022 20:14:33 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/packaging/debian/control new/courier-imap-5.2.0/packaging/debian/control --- old/courier-imap-5.1.8/packaging/debian/control 2022-04-22 16:29:08.000000000 +0200 +++ new/courier-imap-5.2.0/packaging/debian/control 2022-11-29 04:41:10.000000000 +0100 @@ -4,16 +4,19 @@ Maintainer: Sam Varshavchik <[email protected]> Build-Depends: perl:any, + pkg-config, debhelper-compat (= 12), gcc%DEBGCC%, g++%DEBGCC%, libcourier-auth-dev, libcourier-unicode-dev, + sysconftool, gnutls-dev, gnutls-bin, libgdbm-dev, libpcre2-dev, - libidn11-dev + libgcrypt-dev, + libidn2-dev Standards-Version: 4.4.1 Homepage: https://www.courier-mta.org/imap/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/packaging/debian/rules new/courier-imap-5.2.0/packaging/debian/rules --- old/courier-imap-5.1.8/packaging/debian/rules 2022-04-22 16:29:08.000000000 +0200 +++ new/courier-imap-5.2.0/packaging/debian/rules 2022-08-25 03:32:14.000000000 +0200 @@ -27,3 +27,6 @@ override_dh_fixperms: dh_fixperms set -ex; . debian/fixperms.sh + +override_dh_builddeb: + dh_builddeb -- $(DEB_BUILDDEB_OPTIONS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/rpm.release new/courier-imap-5.2.0/rpm.release --- old/courier-imap-5.1.8/rpm.release 2022-05-27 03:54:08.000000000 +0200 +++ new/courier-imap-5.2.0/rpm.release 2022-12-03 02:14:33.000000000 +0100 @@ -1,2 +1,2 @@ -VERSION=5.1.8 -RELEASE=1 +VERSION=5.2.0 +RELEASE=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/courier-imap-5.1.8/sysconftool new/courier-imap-5.2.0/sysconftool --- old/courier-imap-5.1.8/sysconftool 2022-05-22 19:47:25.000000000 +0200 +++ new/courier-imap-5.2.0/sysconftool 2022-11-22 18:52:05.000000000 +0100 @@ -1,9 +1,11 @@ #!/usr/bin/perl # Copyright 2000 Double Precision, Inc. See COPYING for # distribution information. - + use IO::File; use Getopt::Long; +use strict; +use warnings; my $exitcode=0; @@ -12,7 +14,7 @@ my $force; my $require; -my $myversion="0.19"; +my $myversion="0.20"; exit 1 unless GetOptions("v" => \$ver, "n" => \$noclobber, "f" => \$force, "r=s" => \$require); @@ -106,7 +108,7 @@ if ($line =~ /^\#\#NAME:(.*):(.*)/) { ($configname, $configversion)=($1, $2); - + $configname =~ s/[ \t]//g; $configversion =~ s/[ \t]//g; @@ -210,6 +212,9 @@ my $last_setting=undef; my $prev_setting=undef; + my $configname; + my $configversion; + while (defined($line=<$oldfile>)) { if (! ($line =~ /^\#/))
