Hello community, here is the log from the commit of package courier-imap for openSUSE:Factory checked in at 2013-01-17 15:09:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/courier-imap (Old) and /work/SRC/openSUSE:Factory/.courier-imap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "courier-imap", Maintainer is "hvo...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/courier-imap/courier-imap.changes 2012-09-23 08:01:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.courier-imap.new/courier-imap.changes 2013-01-17 15:09:37.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 15 18:05:58 UTC 2013 - ch...@computersalat.de + +- update to 4.12.0 + * tcpd/libcouriergnutls.c (get_server_cert): Fix size of malloced + buffer. + * configure.in: Fix typo in configure check for setvbuf(). +- rebase patches + * sbindir (remove version), ulimit_conf (rename diff -> patch) + +------------------------------------------------------------------- Old: ---- courier-imap-4.11.0-sbindir.patch courier-imap-4.11.0.tar.bz2 courier-imap-ulimit_conf.diff New: ---- courier-imap-4.12.0.tar.bz2 courier-imap-4.12.0.tar.bz2.sig courier-imap-sbindir.patch courier-imap-ulimit_conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ courier-imap.spec ++++++ --- /var/tmp/diff_new_pack.WHQr7s/_old 2013-01-17 15:09:39.000000000 +0100 +++ /var/tmp/diff_new_pack.WHQr7s/_new 2013-01-17 15:09:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package courier-imap # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,20 +20,21 @@ Summary: An IMAP and POP3 Server for Maildir MTAs License: GPL-3.0 Group: Productivity/Networking/Email/Servers -Version: 4.11.0 +Version: 4.12.0 Release: 0 Url: http://www.courier-mta.org/imap/ Source0: %{name}-%{version}.tar.bz2 -Source1: pop3.pamd -Source2: imap.pamd +Source1: %{name}-%{version}.tar.bz2.sig +Source2: pop3.pamd +Source3: imap.pamd Source4: courier-imap.init Source5: courier-imap-ssl.init Source6: courier-pop.init Source7: courier-pop-ssl.init Source8: %{name}.firewall Source9: %{name}-ssl.firewall -Patch0: %{name}-4.11.0-sbindir.patch -Patch2: %{name}-ulimit_conf.diff +Patch0: %{name}-sbindir.patch +Patch2: %{name}-ulimit_conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 910 BuildRequires: audit-libs ++++++ courier-imap-4.11.0.tar.bz2 -> courier-imap-4.12.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/Makefile.in new/courier-imap-4.12.0/Makefile.in --- old/courier-imap-4.11.0/Makefile.in 2012-09-06 02:43:13.000000000 +0200 +++ new/courier-imap-4.12.0/Makefile.in 2013-01-12 23:26:58.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -22,6 +22,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -111,6 +128,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man1dir = $(mandir)/man1 man8dir = $(mandir)/man8 NROFF = nroff @@ -411,8 +433,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -454,8 +479,11 @@ rm -f $$list install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -497,8 +525,11 @@ rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -540,8 +571,11 @@ rm -f $$list install-databinSCRIPTS: $(databin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(databindir)" || $(MKDIR_P) "$(DESTDIR)$(databindir)" @list='$(databin_SCRIPTS)'; test -n "$(databindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(databindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(databindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -572,8 +606,11 @@ dir='$(DESTDIR)$(databindir)'; $(am__uninstall_files_from_dir) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -604,8 +641,11 @@ dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -645,11 +685,18 @@ -rm -f libtool config.lt install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -681,11 +728,18 @@ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -717,8 +771,11 @@ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -916,13 +973,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -1011,7 +1065,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/aclocal.m4 new/courier-imap-4.12.0/aclocal.m4 --- old/courier-imap-4.11.0/aclocal.m4 2012-09-06 02:43:12.000000000 +0200 +++ new/courier-imap-4.12.0/aclocal.m4 2013-01-12 23:26:57.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -8667,7 +8667,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8683,7 +8683,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/config.guess new/courier-imap-4.12.0/config.guess --- old/courier-imap-4.11.0/config.guess 2012-02-03 12:02:58.000000000 +0100 +++ new/courier-imap-4.12.0/config.guess 2012-09-18 04:53:51.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -863,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -1320,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/config.sub new/courier-imap-4.12.0/config.sub --- old/courier-imap-4.11.0/config.sub 2012-02-03 12:02:58.000000000 +0100 +++ new/courier-imap-4.12.0/config.sub 2012-09-18 04:53:51.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-01-01' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,6 +249,7 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -319,7 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -332,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -355,6 +361,7 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/configure new/courier-imap-4.12.0/configure --- old/courier-imap-4.11.0/configure 2012-09-06 02:43:13.000000000 +0200 +++ new/courier-imap-4.12.0/configure 2013-01-12 23:26:58.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for courier-imap 4.11.0. +# Generated by GNU Autoconf 2.68 for courier-imap 4.12.0. # # Report bugs to <courier-i...@lists.sourceforge.net>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='courier-imap' PACKAGE_TARNAME='courier-imap' -PACKAGE_VERSION='4.11.0' -PACKAGE_STRING='courier-imap 4.11.0' +PACKAGE_VERSION='4.12.0' +PACKAGE_STRING='courier-imap 4.12.0' PACKAGE_BUGREPORT='courier-i...@lists.sourceforge.net' PACKAGE_URL='' @@ -1318,7 +1318,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 4.11.0 to adapt to many kinds of systems. +\`configure' configures courier-imap 4.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1388,7 +1388,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of courier-imap 4.11.0:";; + short | recursive ) echo "Configuration of courier-imap 4.12.0:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -courier-imap configure 4.11.0 +courier-imap configure 4.12.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1773,7 +1773,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 4.11.0, which was +It was created by courier-imap $as_me 4.12.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2591,7 +2591,7 @@ # Define the identity of the package. PACKAGE='courier-imap' - VERSION='4.11.0' + VERSION='4.12.0' cat >>confdefs.h <<_ACEOF @@ -12515,7 +12515,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 4.11.0, which was +This file was extended by courier-imap $as_me 4.12.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12581,7 +12581,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -courier-imap config.status 4.11.0 +courier-imap config.status 4.12.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/configure.in new/courier-imap-4.12.0/configure.in --- old/courier-imap-4.11.0/configure.in 2012-09-06 02:42:15.000000000 +0200 +++ new/courier-imap-4.12.0/configure.in 2013-01-12 23:25:36.000000000 +0100 @@ -4,7 +4,7 @@ dnl distribution information. AC_PREREQ(2.59) -AC_INIT(courier-imap, 4.11.0, [courier-i...@lists.sourceforge.net]) +AC_INIT(courier-imap, 4.12.0, [courier-i...@lists.sourceforge.net]) AC_CONFIG_SRCDIR(imap/imapd.c) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/courier-imap.lpspec new/courier-imap-4.12.0/courier-imap.lpspec --- old/courier-imap-4.11.0/courier-imap.lpspec 2012-09-06 03:05:57.000000000 +0200 +++ new/courier-imap-4.12.0/courier-imap.lpspec 2013-01-12 23:34:57.000000000 +0100 @@ -13,9 +13,9 @@ %define _unpackaged_files_terminate_build 1 Name: courier-imap -Version: 4.11.0 +Version: 4.12.0 Release: 1 -Source: %{__name}-4.11.0.tar.bz2 +Source: %{__name}-4.12.0.tar.bz2 Repository(pgpkeys.txt): http://www.lpmtool.com/repositories/courier-imap BuildRequires: textutils fileutils perl BuildRequires: courier-authlib-devel >= 0.60.6.20080629 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/courier-imap.spec new/courier-imap-4.12.0/courier-imap.spec --- old/courier-imap-4.11.0/courier-imap.spec 2012-09-06 03:05:57.000000000 +0200 +++ new/courier-imap-4.12.0/courier-imap.spec 2013-01-12 23:34:57.000000000 +0100 @@ -26,13 +26,13 @@ %define _missing_doc_files_terminate_build 1 %define _unpackaged_files_terminate_build 1 -Summary: Courier-IMAP 4.11.0 IMAP server +Summary: Courier-IMAP 4.12.0 IMAP server Name: courier-imap -Version: 4.11.0 +Version: 4.12.0 Release: 1%{courier_release} License: GPL Group: Applications/Mail -Source: %{name}-4.11.0.tar.bz2 +Source: %{name}-4.12.0.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: fileutils textutils sh-utils sed %if %suse_version @@ -85,7 +85,7 @@ # SuSE specific settings %if %suse_version # some templates for SuSE distribs. -%define templdir ${RPM_BUILD_DIR}/%{name}-4.11.0/packaging/suse +%define templdir ${RPM_BUILD_DIR}/%{name}-4.12.0/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-4.11.0/depcomp new/courier-imap-4.12.0/depcomp --- old/courier-imap-4.11.0/depcomp 2012-02-03 12:02:58.000000000 +0100 +++ new/courier-imap-4.12.0/depcomp 2012-09-18 04:53:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/imap/ChangeLog new/courier-imap-4.12.0/imap/ChangeLog --- old/courier-imap-4.11.0/imap/ChangeLog 2012-09-06 02:40:30.000000000 +0200 +++ new/courier-imap-4.12.0/imap/ChangeLog 2013-01-12 23:25:03.000000000 +0100 @@ -1,3 +1,14 @@ +4.12.0 + +2013-01-12 Gordon Messmer <yiny...@eburg.com> + + * tcpd/libcouriergnutls.c (get_server_cert): Fix size of malloced + buffer. + +2012-12-20 Sam Varshavchik <mr...@courier-mta.com> + + * configure.in: Fix typo in configure check for setvbuf(). + 4.11.0 2012-09-05 Sam Varshavchik <mr...@courier-mta.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/imap/Makefile.in new/courier-imap-4.12.0/imap/Makefile.in --- old/courier-imap-4.11.0/imap/Makefile.in 2012-09-06 02:43:40.000000000 +0200 +++ new/courier-imap-4.12.0/imap/Makefile.in 2013-01-12 23:27:11.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -23,6 +23,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -125,6 +142,11 @@ DIST_SOURCES = $(libimapd_la_SOURCES) $(libimaplogin_la_SOURCES) \ $(libpop3d_la_SOURCES) $(imapd_SOURCES) $(imaplogin_SOURCES) \ $(pop3d_SOURCES) $(pop3login_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(noinst_DATA) ETAGS = etags CTAGS = ctags @@ -678,7 +700,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/imap/aclocal.m4 new/courier-imap-4.12.0/imap/aclocal.m4 --- old/courier-imap-4.11.0/imap/aclocal.m4 2012-09-06 02:43:38.000000000 +0200 +++ new/courier-imap-4.12.0/imap/aclocal.m4 2013-01-12 23:27:10.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -8629,7 +8629,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8645,7 +8645,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/imap/configure new/courier-imap-4.12.0/imap/configure --- old/courier-imap-4.11.0/imap/configure 2012-09-06 02:43:39.000000000 +0200 +++ new/courier-imap-4.12.0/imap/configure 2013-01-12 23:27:12.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for courier-imap 4.11.0. +# Generated by GNU Autoconf 2.68 for courier-imap 4.12.0. # # Report bugs to <courier-us...@lists.sourceforge.net>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='courier-imap' PACKAGE_TARNAME='courier-imap' -PACKAGE_VERSION='4.11.0' -PACKAGE_STRING='courier-imap 4.11.0' +PACKAGE_VERSION='4.12.0' +PACKAGE_STRING='courier-imap 4.12.0' PACKAGE_BUGREPORT='courier-us...@lists.sourceforge.net' PACKAGE_URL='' @@ -1337,7 +1337,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 4.11.0 to adapt to many kinds of systems. +\`configure' configures courier-imap 4.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1408,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of courier-imap 4.11.0:";; + short | recursive ) echo "Configuration of courier-imap 4.12.0:";; esac cat <<\_ACEOF @@ -1525,7 +1525,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -courier-imap configure 4.11.0 +courier-imap configure 4.12.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2069,7 +2069,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 4.11.0, which was +It was created by courier-imap $as_me 4.12.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2998,7 +2998,7 @@ # Define the identity of the package. PACKAGE='courier-imap' - VERSION='4.11.0' + VERSION='4.12.0' # Some tools Automake needs. @@ -17519,13 +17519,6 @@ setvbuf(stderr, NULL, _IOLBF, BUFSIZ); } -int -main () -{ - - ; - return 0; -} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : @@ -18088,7 +18081,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 4.11.0, which was +This file was extended by courier-imap $as_me 4.12.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18154,7 +18147,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -courier-imap config.status 4.11.0 +courier-imap config.status 4.12.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/imap/configure.in new/courier-imap-4.12.0/imap/configure.in --- old/courier-imap-4.11.0/imap/configure.in 2012-09-06 02:40:30.000000000 +0200 +++ new/courier-imap-4.12.0/imap/configure.in 2013-01-12 23:25:17.000000000 +0100 @@ -4,7 +4,7 @@ dnl Copyright 1998 - 2012 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT(courier-imap, 4.11.0, [courier-us...@lists.sourceforge.net]) +AC_INIT(courier-imap, 4.12.0, [courier-us...@lists.sourceforge.net]) >confdefs.h # Kill PACKAGE_ macros @@ -350,7 +350,7 @@ fi AC_SUBST(ssllib) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/rfc2045/makemime.c new/courier-imap-4.12.0/rfc2045/makemime.c --- old/courier-imap-4.11.0/rfc2045/makemime.c 2011-04-04 17:03:42.000000000 +0200 +++ new/courier-imap-4.12.0/rfc2045/makemime.c 2012-12-04 14:33:42.000000000 +0100 @@ -48,21 +48,56 @@ /****************************************************************************** +Check if a file is a regular file. + +******************************************************************************/ + +static int isreg(int fd) +{ + struct stat st; + if (fstat(fd, &st)) + { + perror("fstat"); + exit(1); + } + return S_ISREG(st.st_mode); +} + +/****************************************************************************** + +Determine the file descriptor wanted, if any. + +******************************************************************************/ + +static int fd_wanted(const char *filename, const char *mode) +{ + if (strcmp(filename, "-") == 0) /* stdin or stdout */ + return strcmp(mode, "r") ? 1:0; + if (*filename == '&') + return atoi(filename+1); /* file descriptor */ + return -1; /* or a file */ +} + +/****************************************************************************** + Open some file or a pipe for reading and writing. ******************************************************************************/ static FILE *openfile_or_pipe(const char *filename, const char *mode) { -int fd; +int fd, fd_to_dup = fd_wanted(filename, mode); FILE *fp; - if (strcmp(filename, "-") == 0) /* stdin or stdout */ - fd=dup( strcmp(mode, "r") ? 1:0); - else if (*filename == '&') - fd=dup( atoi(filename+1)); /* file descriptor */ - else fd=open(filename, (strcmp(mode, "r") ? O_WRONLY|O_CREAT|O_TRUNC: - O_RDONLY), 0666); /* or a file */ + if (fd_to_dup == 0) + return stdin; + + if (fd_to_dup >= 0) + fd = dup(fd_to_dup); + else + fd=open(filename, (strcmp(mode, "r") ? + O_WRONLY|O_CREAT|O_TRUNC:O_RDONLY), 0666); + if (fd < 0) { perror(filename); @@ -88,12 +123,8 @@ { FILE *fp=openfile_or_pipe(filename, "r"); int fd=fileno(fp); -off_t orig_pos; - if ((orig_pos=lseek(fd, 0L, SEEK_CUR)) == -1 || - lseek(fd, 0L, SEEK_END) == -1 || - lseek(fd, 0L, SEEK_CUR) == -1 || - lseek(fd, orig_pos, SEEK_SET) == -1) /* Must be a pipe */ + if (!isreg(fd)) /* Must be a pipe */ { FILE *t=tmpfile(); int c; @@ -115,6 +146,17 @@ fclose(fp); fp=t; } + else + { + off_t orig_pos = lseek(fd, 0L, SEEK_CUR); + + if (orig_pos == -1 || + fseek(fp, orig_pos, SEEK_SET) == -1) + { + perror("fseek"); + exit(1); + } + } return (fp); } @@ -149,7 +191,20 @@ ++q; if (!*q) continue; if (*q == '#') continue; - if (strcmp(buffer, "-") == 0) break; + if (strcmp(buffer, "-") == 0) + { + if (isreg(fileno(fp))) + { + long orig_pos = ftell(fp); + if (orig_pos == -1 || + lseek(fileno(fp), orig_pos, SEEK_SET) == -1) + { + perror("seek"); + exit(1); + } + } + break; + } argp=(struct arg_list *)malloc(sizeof(struct arg_list)+1+ strlen(q)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/rpm.release new/courier-imap-4.12.0/rpm.release --- old/courier-imap-4.11.0/rpm.release 2012-09-06 03:05:57.000000000 +0200 +++ new/courier-imap-4.12.0/rpm.release 2013-01-12 23:34:56.000000000 +0100 @@ -1,2 +1,2 @@ -VERSION=4.11.0 +VERSION=4.12.0 RELEASE=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/courier-imap-4.11.0/tcpd/libcouriergnutls.c new/courier-imap-4.12.0/tcpd/libcouriergnutls.c --- old/courier-imap-4.11.0/tcpd/libcouriergnutls.c 2012-06-22 14:25:14.000000000 +0200 +++ new/courier-imap-4.12.0/tcpd/libcouriergnutls.c 2013-01-12 22:52:42.000000000 +0100 @@ -988,7 +988,7 @@ vhost_max_size=vhost_size; } - vhost_buf=malloc(vhost_size); + vhost_buf=malloc(vhost_max_size); if (!vhost_buf) return GNUTLS_E_MEMORY_ERROR; ++++++ courier-imap-sbindir.patch ++++++ Index: imap/imapd.8.in =================================================================== --- imap/imapd.8.in.orig +++ imap/imapd.8.in @@ -24,9 +24,9 @@ imapd \- The Courier IMAP server .SH "SYNOPSIS" .HP \w'\fB@libexecdir@/couriertcpd\fR\ 'u -\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\&./Maildir} -.HP \w'\fB@prefix@/bin/imapd\fR\ 'u -\fB@prefix@/bin/imapd\fR {\&./Maildir} +\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@sbindir@/imaplogin} [\fImodules\fR...] {@sbindir@/imapd} {\&./Maildir} +.HP \w'\fB@sbindir@/imapd\fR\ 'u +\fB@sbindir@/imapd\fR {\&./Maildir} .SH "DESCRIPTION" .PP Index: imap/imapd-ssl.dist.in =================================================================== --- imap/imapd-ssl.dist.in.orig +++ imap/imapd-ssl.dist.in @@ -102,7 +102,7 @@ IMAP_TLS_REQUIRED=0 ##NAME: COURIERTLS:0 # -COURIERTLS=@bindir@/couriertls +COURIERTLS=@sbindir@/couriertls ##NAME: TLS_PRIORITY:0 # Index: imap/pop3d-ssl.dist.in =================================================================== --- imap/pop3d-ssl.dist.in.orig +++ imap/pop3d-ssl.dist.in @@ -87,7 +87,7 @@ POP3_TLS_REQUIRED=0 # at your own risk. Only the basic SSL/TLS functionality is known to be # working. Keep this in mind as you play with the following variables. -COURIERTLS=@bindir@/couriertls +COURIERTLS=@sbindir@/couriertls ##NAME: TLS_PRIORITY:0 # ++++++ courier-imap-ulimit_conf.patch ++++++ Index: imap/pop3d.dist.in =================================================================== --- imap/pop3d.dist.in.orig +++ imap/pop3d.dist.in @@ -28,6 +28,25 @@ MAXDAEMONS=40 MAXPERIP=4 +##NAME: POP3_ULIMITD:0 +# +# POP3_ULIMITD sets the maximum size of the data segment of the server +# process. The value of POP3_ULIMITD is simply passed to the "ulimit -d" +# command (or ulimit -v). The argument to ulimi sets the upper limit on the +# size of the data segment of the server process, in kilobytes. The default +# value of 65536 sets a very generous limit of 64 megabytes, which should +# be more than plenty for anyone. +# +# This feature is used as an additional safety check that should stop +# any potential denial-of-service attacks that exploit any kind of +# a memory leak to exhaust all the available memory on the server. +# It is theoretically possible that obscenely huge folders will also +# result in the server running out of memory when doing server-side +# sorting (by my calculations you have to have at least 100,000 messages +# in a single folder, for that to happen). + +POP3_ULIMITD=65536 + ##NAME: POP3AUTH:1 # # To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
