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 2023-04-07 18:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/courier-imap (Old) and /work/SRC/openSUSE:Factory/.courier-imap.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "courier-imap" Fri Apr 7 18:18:00 2023 rev:70 rq:1077878 version:5.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/courier-imap/courier-imap.changes 2023-02-20 17:47:24.923960935 +0100 +++ /work/SRC/openSUSE:Factory/.courier-imap.new.19717/courier-imap.changes 2023-04-07 18:18:01.877135767 +0200 @@ -1,0 +2,7 @@ +Wed Apr 5 11:27:09 UTC 2023 - Arjen de Korte <[email protected]> + +- update to 5.2.3 + * all: update configure.ac to require at least version 2.0.5 of + libidn + +------------------------------------------------------------------- Old: ---- courier-imap-5.2.2.tar.bz2 courier-imap-5.2.2.tar.bz2.sig New: ---- courier-imap-5.2.3.tar.bz2 courier-imap-5.2.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-imap.spec ++++++ --- /var/tmp/diff_new_pack.IjSzO6/_old 2023-04-07 18:18:02.801141117 +0200 +++ /var/tmp/diff_new_pack.IjSzO6/_new 2023-04-07 18:18:02.805141141 +0200 @@ -19,7 +19,7 @@ %bcond_with valgrind Name: courier-imap -Version: 5.2.2 +Version: 5.2.3 Release: 0 Summary: An IMAP and POP3 Server for Maildir MTAs License: GPL-3.0-or-later @@ -54,7 +54,7 @@ BuildRequires: pcre2-devel BuildRequires: procps BuildRequires: zlib-devel -BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(libidn2) >= 2.0.5 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(systemd) %if %{with valgrind} ++++++ courier-imap-5.2.2.tar.bz2 -> courier-imap-5.2.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/configure new/courier-imap-5.2.3/configure --- old/courier-imap-5.2.2/configure 2023-02-19 03:04:03.000000000 +0100 +++ new/courier-imap-5.2.3/configure 2023-04-03 02:15:46.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for courier-imap 5.2.2. +# Generated by GNU Autoconf 2.71 for courier-imap 5.2.3. # # Report bugs to <[email protected]>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='courier-imap' PACKAGE_TARNAME='courier-imap' -PACKAGE_VERSION='5.2.2' -PACKAGE_STRING='courier-imap 5.2.2' +PACKAGE_VERSION='5.2.3' +PACKAGE_STRING='courier-imap 5.2.3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1393,7 +1393,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures courier-imap 5.2.2 to adapt to many kinds of systems. +\`configure' configures courier-imap 5.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1464,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of courier-imap 5.2.2:";; + short | recursive ) echo "Configuration of courier-imap 5.2.3:";; esac cat <<\_ACEOF @@ -1589,7 +1589,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -courier-imap configure 5.2.2 +courier-imap configure 5.2.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1807,7 +1807,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by courier-imap $as_me 5.2.2, which was +It was created by courier-imap $as_me 5.2.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3079,7 +3079,7 @@ # Define the identity of the package. PACKAGE='courier-imap' - VERSION='5.2.2' + VERSION='5.2.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -13050,12 +13050,12 @@ pkg_cv_LIBIDN_CFLAGS="$LIBIDN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13067,12 +13067,12 @@ pkg_cv_LIBIDN_LIBS="$LIBIDN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13093,9 +13093,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` else - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBIDN_PKG_ERRORS" >&5 @@ -14216,7 +14216,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by courier-imap $as_me 5.2.2, which was +This file was extended by courier-imap $as_me 5.2.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14284,7 +14284,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -courier-imap config.status 5.2.2 +courier-imap config.status 5.2.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/configure.ac new/courier-imap-5.2.3/configure.ac --- old/courier-imap-5.2.2/configure.ac 2023-02-17 02:44:01.000000000 +0100 +++ new/courier-imap-5.2.3/configure.ac 2023-04-03 02:03:35.000000000 +0200 @@ -3,7 +3,7 @@ dnl Copyright 1998 - 2022 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT([courier-imap],[5.2.2],[[email protected]]) +AC_INIT([courier-imap],[5.2.3],[[email protected]]) AC_CONFIG_SRCDIR(libs/imap/imapd.c) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE(foreign) @@ -66,7 +66,7 @@ ;; esac -PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 2.0.5, [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' old/courier-imap-5.2.2/courier-debuild new/courier-imap-5.2.3/courier-debuild --- old/courier-imap-5.2.2/courier-debuild 2023-02-19 03:04:08.000000000 +0100 +++ new/courier-imap-5.2.3/courier-debuild 2023-04-03 02:15:51.000000000 +0200 @@ -9,14 +9,14 @@ set -e shopt -s extglob -f=`cd .. && ls courier-imap-5.2.2.tar* | sed -n 1p` +f=`cd .. && ls courier-imap-5.2.3.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.2.2 +cd courier-imap-5.2.3 cp -pr packaging/debian . if test "$DEBGCC" = "" @@ -48,5 +48,5 @@ debuild "$@" cd .. -rm -rf courier-imap-5.2.2 +rm -rf courier-imap-5.2.3 echo "Built packages in the deb subdirectory." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/courier-imap.spec new/courier-imap-5.2.3/courier-imap.spec --- old/courier-imap-5.2.2/courier-imap.spec 2023-02-19 15:26:44.000000000 +0100 +++ new/courier-imap-5.2.3/courier-imap.spec 2023-04-03 17:46:33.000000000 +0200 @@ -26,13 +26,13 @@ %define _missing_doc_files_terminate_build 1 %define _unpackaged_files_terminate_build 1 -Summary: Courier-IMAP 5.2.2 IMAP server +Summary: Courier-IMAP 5.2.3 IMAP server Name: courier-imap -Version: 5.2.2 +Version: 5.2.3 Release: 2%{courier_release} License: GPL Group: Applications/Mail -Source: %{name}-5.2.2.tar.bz2 +Source: %{name}-5.2.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: coreutils sed %if %suse_version @@ -93,7 +93,7 @@ # SuSE specific settings %if %suse_version # some templates for SuSE distribs. -%define templdir ${RPM_BUILD_DIR}/%{name}-5.2.2/packaging/suse +%define templdir ${RPM_BUILD_DIR}/%{name}-5.2.3/packaging/suse %define _sysconfdir /etc/courier-imap %define _mandir /usr/share/man %define initlndir /usr/sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/imap/ChangeLog new/courier-imap-5.2.3/libs/imap/ChangeLog --- old/courier-imap-5.2.2/libs/imap/ChangeLog 2023-02-16 11:00:03.000000000 +0100 +++ new/courier-imap-5.2.3/libs/imap/ChangeLog 2023-04-03 02:14:21.000000000 +0200 @@ -1,3 +1,10 @@ +5.2.3 + +2023-02-19 Sam Varshavchik <[email protected]> + + * all: update configure.ac to require at least version 2.0.5 of + libidn + 5.2.2 2023-02-14 Sam Varshavchik <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/imap/configure new/courier-imap-5.2.3/libs/imap/configure --- old/courier-imap-5.2.2/libs/imap/configure 2023-02-19 03:04:15.000000000 +0100 +++ new/courier-imap-5.2.3/libs/imap/configure 2023-04-03 02:16:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for courier-imap 5.2.2. +# Generated by GNU Autoconf 2.71 for courier-imap 5.2.3. # # Report bugs to <[email protected]>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='courier-imap' PACKAGE_TARNAME='courier-imap' -PACKAGE_VERSION='5.2.2' -PACKAGE_STRING='courier-imap 5.2.2' +PACKAGE_VERSION='5.2.3' +PACKAGE_STRING='courier-imap 5.2.3' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1403,7 +1403,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures courier-imap 5.2.2 to adapt to many kinds of systems. +\`configure' configures courier-imap 5.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of courier-imap 5.2.2:";; + short | recursive ) echo "Configuration of courier-imap 5.2.3:";; esac cat <<\_ACEOF @@ -1602,7 +1602,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -courier-imap configure 5.2.2 +courier-imap configure 5.2.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2001,7 +2001,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by courier-imap $as_me 5.2.2, which was +It was created by courier-imap $as_me 5.2.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3609,7 +3609,7 @@ # Define the identity of the package. PACKAGE='courier-imap' - VERSION='5.2.2' + VERSION='5.2.3' # Some tools Automake needs. @@ -20132,7 +20132,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by courier-imap $as_me 5.2.2, which was +This file was extended by courier-imap $as_me 5.2.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20200,7 +20200,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -courier-imap config.status 5.2.2 +courier-imap config.status 5.2.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/imap/configure.ac new/courier-imap-5.2.3/libs/imap/configure.ac --- old/courier-imap-5.2.2/libs/imap/configure.ac 2023-02-16 11:00:03.000000000 +0100 +++ new/courier-imap-5.2.3/libs/imap/configure.ac 2023-04-03 02:14:21.000000000 +0200 @@ -4,7 +4,7 @@ dnl Copyright 1998 - 2022 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT([courier-imap],[5.2.2],[[email protected]]) +AC_INIT([courier-imap],[5.2.3],[[email protected]]) >confdefs.h # Kill PACKAGE_ macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/numlib/changeuidgid.c new/courier-imap-5.2.3/libs/numlib/changeuidgid.c --- old/courier-imap-5.2.2/libs/numlib/changeuidgid.c 2022-03-07 11:00:05.000000000 +0100 +++ new/courier-imap-5.2.3/libs/numlib/changeuidgid.c 2023-02-25 11:00:04.000000000 +0100 @@ -52,10 +52,11 @@ */ uid_t libmail_getuid(const char *uname, gid_t *pw_gid) { - size_t bufsize; + int bufsize; char *buf; struct passwd pwbuf; struct passwd *pw; + int s; /* ** uname might be a pointer returned from a previous called to getpw(), @@ -70,35 +71,39 @@ } strcpy(p, uname); -#ifdef _SC_GETGR_R_SIZE_MAX - bufsize = sysconf(_SC_GETGR_R_SIZE_MAX); +#ifdef _SC_GETPW_R_SIZE_MAX + bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); if (bufsize == -1) /* Value was indeterminate */ - { #endif - bufsize = 16384; /* Should be more than enough */ - } - - buf = malloc(bufsize); - if (buf == NULL) { - perror("malloc"); - exit(1); + bufsize = 16384; /* Should be more than enough */ } + do { + buf = malloc(bufsize); + if (buf == NULL) + { + perror("malloc"); + exit(1); + } - errno=ENOENT; - - getpwnam_r(p, &pwbuf, buf, bufsize, &pw); + s = getpwnam_r(p, &pwbuf, buf, bufsize, &pw); + if (s == ERANGE) { + free(buf); + bufsize += 1024; + } + } while (s == ERANGE && bufsize <= 65536); - free(buf); + free(p); if (pw == 0) { - free(p); - perror("getpwnam"); + errno = s; + perror("getpwnam_r"); exit(1); } - free(p); + + free(buf); if ( pw_gid ) *pw_gid = pw->pw_gid; @@ -149,7 +154,7 @@ struct group grp; struct group *result; char *buf; - size_t bufsize; + int bufsize; int s; char *p=malloc(strlen(gname)+1); @@ -168,14 +173,21 @@ bufsize = 16384; /* Should be more than enough */ } - buf = malloc(bufsize); - if (buf == NULL) - { - perror("malloc"); - exit(1); - } + do { + buf = malloc(bufsize); + if (buf == NULL) + { + perror("malloc"); + exit(1); + } + + s = getgrnam_r(p, &grp, buf, bufsize, &result); + if (s == ERANGE) { + free(buf); + bufsize += 1024; + } + } while (s == ERANGE && bufsize <= 65536); - s = getgrnam_r(p, &grp, buf, bufsize, &result); free(p); if (result == NULL) @@ -187,7 +199,7 @@ else { errno = s; - perror("getpwnam_r"); + perror("getgrnam_r"); } exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc1035/configure new/courier-imap-5.2.3/libs/rfc1035/configure --- old/courier-imap-5.2.2/libs/rfc1035/configure 2022-12-02 15:28:07.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc1035/configure 2023-04-03 02:16:06.000000000 +0200 @@ -12991,12 +12991,12 @@ pkg_cv_LIBIDN_CFLAGS="$LIBIDN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13008,12 +13008,12 @@ pkg_cv_LIBIDN_LIBS="$LIBIDN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13034,9 +13034,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` else - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBIDN_PKG_ERRORS" >&5 @@ -13059,6 +13059,7 @@ as_fn_error $? "libidn2 not found" "$LINENO" 5 fi + ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" if test "x$ac_cv_header_sys_types_h" = xyes then : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc1035/configure.ac new/courier-imap-5.2.3/libs/rfc1035/configure.ac --- old/courier-imap-5.2.2/libs/rfc1035/configure.ac 2022-11-29 11:00:09.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc1035/configure.ac 2023-02-20 11:00:04.000000000 +0100 @@ -22,12 +22,13 @@ dnl Checks for libraries. -PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 2.0.5, [libidn=yes], [libidn=no]) if test "$libidn" = "no" then AC_MSG_ERROR(libidn2 not found) fi + dnl Checks for header files. AC_CHECK_HEADERS(sys/types.h sys/time.h unistd.h arpa/inet.h netinet/in.h strings.h stdint.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc822/config.h.in new/courier-imap-5.2.3/libs/rfc822/config.h.in --- old/courier-imap-5.2.2/libs/rfc822/config.h.in 2022-12-02 15:28:05.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc822/config.h.in 2023-04-03 02:16:02.000000000 +0200 @@ -42,9 +42,6 @@ /* Define to 1 if you have the <wchar.h> header file. */ #undef HAVE_WCHAR_H -/* Define to 1 if you want Libidn. */ -#undef LIBIDN - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc822/configure new/courier-imap-5.2.3/libs/rfc822/configure --- old/courier-imap-5.2.2/libs/rfc822/configure 2022-12-02 15:28:01.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc822/configure 2023-04-03 02:15:53.000000000 +0200 @@ -801,7 +801,6 @@ with_sysroot enable_libtool_lock enable_largefile -with_libidn ' ac_precious_vars='build_alias host_alias @@ -1468,7 +1467,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-libidn=DIR Support IDN (needs GNU Libidn) Some influential environment variables: CC C compiler command @@ -14043,18 +14041,6 @@ -# Check whether --with-libidn was given. -if test ${with_libidn+y} -then : - withval=$with_libidn; libidn=$withval -else $as_nop - libidn=yes -fi - - -if test "$libidn" != "no" -then - @@ -14193,12 +14179,12 @@ pkg_cv_LIBIDN_CFLAGS="$LIBIDN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14210,12 +14196,12 @@ pkg_cv_LIBIDN_LIBS="$LIBIDN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14236,9 +14222,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` else - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBIDN_PKG_ERRORS" >&5 @@ -14255,22 +14241,11 @@ printf "%s\n" "yes" >&6; } libidn=yes fi - if test "$libidn" != "yes" - then - libidn=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libidn not found" >&5 -printf "%s\n" "$as_me: WARNING: Libidn not found" >&2;} - else - libidn=yes -printf "%s\n" "#define LIBIDN 1" >>confdefs.h - - fi +if test "$libidn" = "no" +then + as_fn_error $? "libidn2 not found" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Libidn should be used" >&5 -printf %s "checking if Libidn should be used... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libidn" >&5 -printf "%s\n" "$libidn" >&6; } ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" if test "x$ac_cv_func_setlocale" = xyes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc822/configure.ac new/courier-imap-5.2.3/libs/rfc822/configure.ac --- old/courier-imap-5.2.2/libs/rfc822/configure.ac 2022-11-29 11:00:09.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc822/configure.ac 2023-02-20 11:00:04.000000000 +0100 @@ -37,23 +37,12 @@ dnl Checks for library functions. -AC_ARG_WITH(libidn, AS_HELP_STRING([--with-libidn=[DIR]],[Support IDN (needs GNU Libidn)]), - libidn=$withval, libidn=yes) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 2.0.5, [libidn=yes], [libidn=no]) -if test "$libidn" != "no" +if test "$libidn" = "no" then - PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) - if test "$libidn" != "yes" - then - libidn=no - AC_MSG_WARN([Libidn not found]) - else - libidn=yes - AC_DEFINE(LIBIDN, 1, [Define to 1 if you want Libidn.]) - fi + AC_MSG_ERROR(libidn2 not found) fi -AC_MSG_CHECKING([if Libidn should be used]) -AC_MSG_RESULT($libidn) AC_CHECK_FUNCS(setlocale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc822/rfc2047.c new/courier-imap-5.2.3/libs/rfc822/rfc2047.c --- old/courier-imap-5.2.2/libs/rfc822/rfc2047.c 2022-11-29 11:00:09.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc822/rfc2047.c 2023-02-20 11:00:04.000000000 +0100 @@ -13,9 +13,7 @@ #include "rfc822hdr.h" #include "rfc2047.h" -#if LIBIDN #include <idn2.h> -#endif #define RFC2047_ENCODE_FOLDLENGTH 76 @@ -43,7 +41,6 @@ { char *q; -#if LIBIDN int err; char *p; size_t s=strlen(domain)+16; @@ -68,14 +65,6 @@ errno=EINVAL; return NULL; } -#else - char *p; - - p=strdup(domain); - - if (!p) - return NULL; -#endif q=malloc(strlen(p)+pfix_len+1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/rfc822/rfc2047u.c new/courier-imap-5.2.3/libs/rfc822/rfc2047u.c --- old/courier-imap-5.2.2/libs/rfc822/rfc2047u.c 2022-11-29 11:00:09.000000000 +0100 +++ new/courier-imap-5.2.3/libs/rfc822/rfc2047u.c 2023-02-20 11:00:04.000000000 +0100 @@ -14,9 +14,7 @@ #include "rfc822hdr.h" #include "rfc2047.h" -#if LIBIDN #include <idn2.h> -#endif static ssize_t rfc822_decode_rfc2047_atom(const char *str, @@ -321,15 +319,12 @@ if (chset != NULL) { -#if LIBIDN int err=0; -#endif char *utf8_ptr; if (p > tok) (*print_func)(tok, p-tok, ptr); -#if LIBIDN /* ** Invalid UTF-8 can make libidn go off the deep end. Add ** padding as a workaround. @@ -349,9 +344,6 @@ if (err != IDNA_SUCCESS) utf8_ptr=0; -#else - utf8_ptr=0; -#endif if (utf8_ptr == 0) (*print_func)(p, strlen(p), ptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/tcpd/configure new/courier-imap-5.2.3/libs/tcpd/configure --- old/courier-imap-5.2.2/libs/tcpd/configure 2022-12-02 15:28:16.000000000 +0100 +++ new/courier-imap-5.2.3/libs/tcpd/configure 2023-04-03 02:16:17.000000000 +0200 @@ -13227,12 +13227,12 @@ pkg_cv_LIBIDN_CFLAGS="$LIBIDN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_CFLAGS=`$PKG_CONFIG --cflags "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13244,12 +13244,12 @@ pkg_cv_LIBIDN_LIBS="$LIBIDN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 0.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libidn2 >= 0.0.0") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libidn2 >= 2.0.5\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libidn2 >= 2.0.5") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 0.0.0" 2>/dev/null` + pkg_cv_LIBIDN_LIBS=`$PKG_CONFIG --libs "libidn2 >= 2.0.5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13270,9 +13270,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` else - LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 0.0.0" 2>&1` + LIBIDN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libidn2 >= 2.0.5" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBIDN_PKG_ERRORS" >&5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/libs/tcpd/configure.ac new/courier-imap-5.2.3/libs/tcpd/configure.ac --- old/courier-imap-5.2.2/libs/tcpd/configure.ac 2022-11-29 11:00:09.000000000 +0100 +++ new/courier-imap-5.2.3/libs/tcpd/configure.ac 2023-02-20 11:00:04.000000000 +0100 @@ -60,7 +60,7 @@ AC_CHECK_LIB(dl, dlopen, [ LIBDL="-ldl" ]) LIBS="$saveLIBS" -PKG_CHECK_MODULES(LIBIDN, libidn2 >= 0.0.0, [libidn=yes], [libidn=no]) +PKG_CHECK_MODULES(LIBIDN, libidn2 >= 2.0.5, [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' old/courier-imap-5.2.2/packaging/debian/changelog new/courier-imap-5.2.3/packaging/debian/changelog --- old/courier-imap-5.2.2/packaging/debian/changelog 2023-02-19 15:26:44.000000000 +0100 +++ new/courier-imap-5.2.3/packaging/debian/changelog 2023-04-03 17:46:33.000000000 +0200 @@ -1,5 +1,5 @@ -courier-imap (5.2.2-100) devel; urgency=medium +courier-imap (5.2.3-100) devel; urgency=medium * Upstream release - -- Sam Varshavchik <[email protected]> Sun, 19 Feb 2023 09:26:44 -0500 + -- Sam Varshavchik <[email protected]> Mon, 03 Apr 2023 11:46:33 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/packaging/debian/changelog.in new/courier-imap-5.2.3/packaging/debian/changelog.in --- old/courier-imap-5.2.2/packaging/debian/changelog.in 2023-02-19 15:26:44.000000000 +0100 +++ new/courier-imap-5.2.3/packaging/debian/changelog.in 2023-04-03 17:46:33.000000000 +0200 @@ -2,4 +2,4 @@ * Upstream release - -- Sam Varshavchik <[email protected]> Sun, 19 Feb 2023 09:26:44 -0500 + -- Sam Varshavchik <[email protected]> Mon, 03 Apr 2023 11:46:33 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-5.2.2/rpm.release new/courier-imap-5.2.3/rpm.release --- old/courier-imap-5.2.2/rpm.release 2023-02-19 15:26:44.000000000 +0100 +++ new/courier-imap-5.2.3/rpm.release 2023-04-03 17:46:33.000000000 +0200 @@ -1,2 +1,2 @@ -VERSION=5.2.2 +VERSION=5.2.3 RELEASE=2
