- updated to 4.18.2

- updated dirs,certsdir,maildir,drop-makedat patches
- added disable-courierlogger-check patch (don't require courierlogger at build time)
- honour _libexecdir

diff --git a/courier-imap-certsdir.patch b/courier-imap-certsdir.patch
index 3f9eee3269f9223c9b873276fc8d971ae67b3aff..11eb0329a216f4091f853869b06cf03dfa44085c 100644 (file)
--- a/courier-imap-certsdir.patch
+++ b/courier-imap-certsdir.patch
@@ -1,34 +1,6 @@
---- courier-imap-4.3.0.orig/configure.in       2007-11-24 04:20:18.000000000 +0100
-+++ courier-imap-4.3.0/configure.in    2008-01-19 19:53:07.090124292 +0100
-@@ -222,6 +222,11 @@
- 
- # Neither does it use the change password feature
- 
-+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$datadir)
-+
-+AC_SUBST(certsdir)
-+
- AC_ARG_WITH(authchangepwdir, [], ,
-       ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null")
- 
---- courier-imap-4.3.0.orig/imap/configure.in  2007-11-24 04:20:18.000000000 +0100
-+++ courier-imap-4.3.0/imap/configure.in       2008-01-19 19:53:07.090124292 +0100
-@@ -52,6 +52,11 @@
- eval "exec_prefix=$exec_prefix"
- eval "bindir=$bindir"
- 
-+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$datadir)
-+
-+AC_SUBST(certsdir)
-+
- AC_ARG_WITH(mailer,
- [  --with-mailer=prog  Your mail submission program],
-    SENDMAIL="$withval",
---- courier-imap-4.8.0/imap/mkpop3dcert.8.in~  2010-02-20 06:12:44.000000000 +0200
-+++ courier-imap-4.8.0/imap/mkpop3dcert.8.in   2010-06-04 15:19:49.481836220 +0300
-@@ -29,18 +29,18 @@
+--- courier-imap-4.18.2/libs/imap/mkpop3dcert.8.in.orig        2017-07-25 01:42:48.000000000 +0200
++++ courier-imap-4.18.2/libs/imap/mkpop3dcert.8.in     2018-03-20 19:53:03.097255662 +0100
+@@ -37,17 +37,17 @@
  .SH "DESCRIPTION"
  .PP
  POP3 over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is
@@ -37,7 +9,6 @@
  \fBmkpop3dcert\fR
  generates a self\-signed X\&.509 certificate, mainly for testing\&. For production use the X\&.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\&.
  .PP
- 
 -@datadir@/pop3d\&.pem
 +@certsdir@/pop3d\&.pem
  must be owned by the @mailuser@ user and have no group or world permissions\&. The
@@ -49,8 +20,8 @@
 +\fB@certsdir@/pop3d\&.pem\fR
  already exists\&.
  .PP
- 
-@@ -50,7 +50,7 @@
+ \fBmkpop3dcert\fR
+@@ -56,7 +56,7 @@
  to be installed\&.
  .SH "FILES"
  .PP

diff --git a/courier-imap-dirs.patch b/courier-imap-dirs.patch
index 924f6a07b2676cfaff18f431c98c04c89277ee3b..f20bc9c90d8dbbb9f5c5c20ab48db2ebad4fe7fe 100644 (file)
--- a/courier-imap-dirs.patch
+++ b/courier-imap-dirs.patch
@@ -1,6 +1,5 @@
-diff -Nur old/configure.in new/configure.in
---- old/configure.in   2004-06-12 01:38:04.000000000 +0000
-+++ new/configure.in   2004-07-08 14:53:47.000000000 +0000
+--- old/configure.ac   2004-06-12 01:38:04.000000000 +0000
++++ new/configure.ac   2004-07-08 14:53:47.000000000 +0000
 @@ -234,5 +234,6 @@
                pop3d.rc pop3d-ssl.rc
                courier-imap.sysvinit courier-imap.spec index.html

diff --git a/courier-imap-disable-courierlogger-check.patch b/courier-imap-disable-courierlogger-check.patch
new file mode 100644 (file)
index 0000000..5a54255
--- /dev/null
+++ b/courier-imap-disable-courierlogger-check.patch
@@ -0,0 +1,13 @@
+--- courier-imap-4.18.2/configure.ac.orig      2018-03-20 21:09:55.290536331 +0100
++++ courier-imap-4.18.2/configure.ac   2018-03-20 21:14:20.837199967 +0100
+@@ -104,10 +104,6 @@
+ $COURIERAUTHCONFIG --configfiles >conftest || exit 1
+ sed 's/^/auth/' <conftest >conftest2
+ . ./conftest2
+-if test ! -x $authsbindir/courierlogger$EXEEXT
+-then
+-      AC_MSG_ERROR(authlib configuration error - $authsbindir/courierlogger$EXEEXT not found)
+-fi
+ courierlogger=$authsbindir/courierlogger$EXEEXT
+ AC_SUBST(courierlogger)
+ 

diff --git a/courier-imap-drop-makedat.patch b/courier-imap-drop-makedat.patch
index f58284bea555db85ac860e321d5228e4f6b7d354..a53fa3c8829d3515dbcd172c5aaaba81840059c1 100644 (file)
--- a/courier-imap-drop-makedat.patch
+++ b/courier-imap-drop-makedat.patch
@@ -1,17 +1,20 @@
---- courier-imap-4.4.1.orig/Makefile.am        2008-07-15 00:26:58.000000000 +0200
-+++ courier-imap-4.4.1/Makefile.am     2008-10-08 08:23:14.968691362 +0200
-@@ -10,7 +10,7 @@
-       packaging/suse/pop3.pam
- 
- SUBDIRS=numlib md5 sha1 bdbobj gdbmobj soxwrap unicode rfc822 random128 \
--      rfc1035 rfc2045 liblock maildir makedat libhmac \
-+      rfc1035 rfc2045 liblock maildir libhmac \
-       waitlib tcpd rootcerts imap
+--- courier-imap-4.18.2/Makefile.am.orig       2017-01-18 02:48:31.000000000 +0100
++++ courier-imap-4.18.2/Makefile.am    2018-03-20 20:38:44.933891020 +0100
+@@ -11,7 +11,7 @@
+ SUBDIRS=libs/numlib libs/bdbobj libs/gdbmobj libs/soxwrap \
+       libs/rfc822 libs/rfc2045 \
+       libs/md5 libs/sha1 libs/random128 libs/rfc1035 libs/liblock \
+-      libs/maildir libs/makedat libs/libhmac \
++      libs/maildir libs/libhmac \
+       libs/waitlib libs/tcpd libs/rootcerts libs/imap
  
  sbin_SCRIPTS=sharedindexinstall sharedindexsplit
-@@ -20,7 +20,7 @@
+@@ -20,9 +20,9 @@
+ databin_SCRIPTS=mkimapdcert mkpop3dcert mkdhparams
  
- binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw
+ binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-      makeimapaccess makedat
++      makeimapaccess
  sbinPROGRAMS=imaplogin pop3login
 -libexecPROGRAMS=makedatprog couriertcpd
 +libexecPROGRAMS=couriertcpd

diff --git a/courier-imap-maildir.patch b/courier-imap-maildir.patch
index 7dfc3ac0061cfc981bfd75abd467cea8b04b7b7f..9a034e63874fbd29b16088973bbfcd3a143fd73f 100644 (file)
--- a/courier-imap-maildir.patch
+++ b/courier-imap-maildir.patch
@@ -1,33 +1,29 @@
-diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in
---- old/imap/imapd.dist.in     2004-04-18 15:54:39.000000000 +0000
-+++ new/imap/imapd.dist.in     2004-07-08 19:00:52.000000000 +0000
+--- old/libs/imap/imapd.dist.in        2004-04-18 15:54:39.000000000 +0000
++++ new/libs/imap/imapd.dist.in        2004-07-08 19:00:52.000000000 +0000
 @@ -376,4 +376,4 @@
  #
  # MAILDIRPATH - directory name of the maildir directory.
  #
 -MAILDIRPATH=Maildir
 +MAILDIRPATH=Mail/Maildir
-diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in
---- old/imap/imapd-ssl.dist.in 2004-06-26 15:11:50.000000000 +0000
-+++ new/imap/imapd-ssl.dist.in 2004-07-20 12:06:12.000000000 +0000
+--- old/libs/imap/imapd-ssl.dist.in    2004-06-26 15:11:50.000000000 +0000
++++ new/libs/imap/imapd-ssl.dist.in    2004-07-20 12:06:12.000000000 +0000
 @@ -194,4 +194,4 @@
  #
  # MAILDIRPATH - directory name of the maildir directory.
  #
 -MAILDIRPATH=Maildir
 +MAILDIRPATH=Mail/Maildir
-diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in
---- old/imap/pop3d.dist.in     2004-04-18 15:54:39.000000000 +0000
-+++ new/imap/pop3d.dist.in     2004-07-08 19:00:59.000000000 +0000
+--- old/libs/imap/pop3d.dist.in        2004-04-18 15:54:39.000000000 +0000
++++ new/libs/imap/pop3d.dist.in        2004-07-08 19:00:59.000000000 +0000
 @@ -151,4 +151,4 @@
  #
  # MAILDIRPATH - directory name of the maildir directory.
  #
 -MAILDIRPATH=Maildir
 +MAILDIRPATH=Mail/Maildir
-diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in
---- old/imap/pop3d-ssl.dist.in 2004-06-26 15:11:50.000000000 +0000
-+++ new/imap/pop3d-ssl.dist.in 2004-07-20 12:06:17.000000000 +0000
+--- old/libs/imap/pop3d-ssl.dist.in    2004-06-26 15:11:50.000000000 +0000
++++ new/libs/imap/pop3d-ssl.dist.in    2004-07-20 12:06:17.000000000 +0000
 @@ -182,4 +182,4 @@
  #
  # MAILDIRPATH - directory name of the maildir directory.

diff --git a/courier-imap.spec b/courier-imap.spec
index 3fb1be53c5c442419e3f28e0d9878a0b92536e5b..bc9615045dab40b0d3fc963e59789a61f12458cf 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -9,16 +9,18 @@
 # Conditional build:
 %bcond_with    toplevel        # Allow toplevel folders. More info: http://www.ricky-chan.co.uk/courier/
 %bcond_without fam             # FAM for enhanced IMAP IDLE and locking
+%bcond_with    gnutls          # GnuTLS instead of OpenSSL
+%bcond_with    socks           # (Courier) Socks support
 
 Summary:       Courier-IMAP server
 Summary(pl.UTF-8):     Serwer Courier-IMAP
 Name:          courier-imap
-Version:       4.13
+Version:       4.18.2
 Release:       1
-License:       GPL
+License:       GPL v3 with OpenSSL exception
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 0bbaffd067199ee35de5b15ea02e6d53
+# Source0-md5: 6af3e78d3206518aab5510638cd620c2
 Source1:       %{name}.init
 Source2:       %{name}-ssl.init
 Source3:       %{name}-pop3.init
@@ -30,18 +32,23 @@ Patch1:             %{name}-certsdir.patch
 Patch2:                %{name}-maildir.patch
 Patch3:                %{name}-toplevel.patch
 Patch4:                %{name}-drop-makedat.patch
+Patch5:                %{name}-disable-courierlogger-check.patch
 URL:           http://www.courier-mta.org/imap/
-BuildRequires: autoconf >= 2.54
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: courier-authlib-devel >= 0.61
+BuildRequires: courier-authlib-devel >= 0.61.0
+%{?with_socks:BuildRequires:   courier-sox-devel}
+BuildRequires: courier-unicode-devel >= 2.0
 BuildRequires: db-devel
-BuildRequires: gdbm-devel
-BuildRequires: gnet-devel
-BuildRequires: libidn-devel
+BuildRequires: libidn-devel >= 0.0.0
 %{?with_fam:BuildRequires:     gamin-devel}
+%{?with_gnutls:BuildRequires:  gnutls-devel >= 3.0}
+%{?with_gnutls:BuildRequires:  libgcrypt-devel}
+%{?with_gnutls:BuildRequires:  libgpg-error-devel}
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
-BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: libtool >= 2:1.5
+%{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
+BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: procps
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -50,6 +57,7 @@ BuildRequires:        sysconftool
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      /sbin/chkconfig
+Requires:      courier-unicode >= 2.0
 Requires:      pam >= 0.79.0
 Requires:      rc-scripts
 Provides:      imapdaemon
@@ -58,7 +66,6 @@ Conflicts:    cyrus-imapd
 Conflicts:     imap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _libexecdir     /usr/%{_lib}/courier-imap
 %define                _sysconfdir     /etc/courier-imap
 %define                _certsdir       %{_sysconfdir}/certs
 %define                _localstatedir  /var/spool/courier-imap
@@ -75,7 +82,9 @@ Summary(pl.UTF-8):    Pliki wspólne dla serwerów imap i pop3
 Group:         Networking/Daemons
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /sbin/chkconfig
-Requires:      courier-authlib
+# even if using OpenSSL libraries, Courier uses certtool from GnuTLS
+Requires:      /usr/bin/certtool
+Requires:      courier-authlib >= 0.61.0
 Requires:      procps
 Requires:      rc-scripts
 
@@ -139,27 +148,24 @@ Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 cp -p %{SOURCE1} courier-imap.in
 cp -p %{SOURCE2} courier-imap-ssl.in
 cp -p %{SOURCE3} courier-pop3.in
 cp -p %{SOURCE4} courier-pop3-ssl.in
-rm -f makedat/configure.in
 
 %build
+%{__libtoolize}
 # Change Makefile.am files and force recreate Makefile.in's.
-find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FILE; do
+find -type f -a -name configure.ac | while read FILE; do
        cd "$(dirname "$FILE")"
 
-       if [ -f Makefile.am ]; then
-               %{__sed} -i -e '/_[L]DFLAGS=-static/d' Makefile.am
-       fi
-        %{__sed}  -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
+       %{__sed} -i -e '/_[L]DFLAGS=-static/d' Makefile.am
 
-       %{__libtoolize}
        %{__aclocal}
        %{__autoconf}
-       if grep -q AC_CONFIG_HEADER configure.in; then
+       if grep -q AC_CONFIG_HEADER configure.ac; then
                %{__autoheader}
        fi
        %{__automake}
@@ -167,16 +173,20 @@ find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FI
        cd -
 done
 
+%configure \
+       CERTOOL=/usr/bin/certtool \
 %if %{without fam}
-ac_cv_header_fam_h=no \
-ac_cv_lib_fam_FAMOpen=no \
+       ac_cv_header_fam_h=no \
+       ac_cv_lib_fam_FAMOpen=no \
 %endif
-%configure \
-       --with-db=db \
+       --libexecdir=%{_libexecdir}/courier-imap \
        --enable-unicode \
        --with-authchangepwdir=/var/tmp \
        --with-certsdir=%{_certsdir} \
-       --with-mailer=/usr/lib/sendmail
+       --with-db=db \
+       %{?with_gnutls:--with-gnutls} \
+       --with-mailer=/usr/lib/sendmail \
+       %{!?with_socks:--without-socks}
 
 %{__make} -j1
 
@@ -194,16 +204,15 @@ install -p courier-pop3-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3-ssl
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/imap
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3
 
-rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert
-
-cp -pf imap/README README.imap
-cp -pf imap/ChangeLog ChangeLog
-cp -pf maildir/README.maildirquota.txt README.maildirquota
+# install directly instead of symlinking
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/mk{dhparams,imapdcert,pop3dcert}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/mk{dhparams,imapdcert,pop3dcert} $RPM_BUILD_ROOT%{_sbindir}
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert $RPM_BUILD_ROOT%{_sbindir}
+cp -pf libs/imap/README README.imap
 
-cp -p tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
-cp -p imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
+# missing from make install
+cp -p libs/imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -p libs/tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/shared/index
@@ -216,7 +225,7 @@ sed -i 's/^POP3DSTART.*/POP3DSTART=YES/' $RPM_BUILD_ROOT%{_sysconfdir}/pop3d
 sed -i 's/^IMAPDSTART.*/IMAPDSTART=YES/' $RPM_BUILD_ROOT%{_sysconfdir}/imapd
 
 # remove unpackaged files
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.dist
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/*.dist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -289,7 +298,7 @@ if [ -f /etc/sysconfig/authdaemon ]; then
 fi
 echo
 echo Changes to version 3.0.5 :
-echo - config files has been splited and moved to %{_sysconfdir}
+echo - config files has been split and moved to %{_sysconfdir}
 echo - certificates directory has changed to %{_certsdir}
 echo
 
@@ -345,7 +354,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc maildir/README.sharedfolders.txt imap/README.proxy tcpd/README.couriertls
+%doc libs/maildir/README.sharedfolders.txt libs/imap/README.proxy libs/tcpd/README.couriertls
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/imap
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd
@@ -359,39 +368,43 @@ fi
 %attr(755,root,root) %{_bindir}/imapd
 %attr(755,root,root) %{_bindir}/maildiracl
 %attr(755,root,root) %{_bindir}/maildirkw
+%attr(755,root,root) %{_bindir}/makeimapaccess
 %attr(755,root,root) %{_sbindir}/imaplogin
 %attr(755,root,root) %{_sbindir}/mkimapdcert
 %attr(755,root,root) %{_sbindir}/sharedindexinstall
 %attr(755,root,root) %{_sbindir}/sharedindexsplit
-%attr(755,root,root) %{_libexecdir}/imapd.rc
-%attr(755,root,root) %{_libexecdir}/imapd-ssl.rc
-%{_mandir}/man8/imapd*
+%attr(755,root,root) %{_libexecdir}/courier-imap/imapd.rc
+%attr(755,root,root) %{_libexecdir}/courier-imap/imapd-ssl.rc
 %{_mandir}/man1/maildiracl.1*
 %{_mandir}/man1/maildirkw.1*
+%{_mandir}/man8/imapd.8*
+%{_mandir}/man8/makeimapaccess.8*
+%{_mandir}/man8/mkimapdcert.8*
 
 %files common
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog imap/BUGS INSTALL README*
+%doc AUTHORS COPYING INSTALL NEWS README README.imap libs/imap/{BUGS,ChangeLog} libs/maildir/README.maildirquota.txt
 %attr(751,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_certsdir}
 %attr(770,daemon,daemon) %dir %{_localstatedir}
-%dir %{_libexecdir}
+%dir %{_libexecdir}/courier-imap
 %{_sysconfdir}/quotawarnmsg.example
 %attr(755,root,root) %{_bindir}/couriertls
-%attr(755,root,root) %{_libexecdir}/couriertcpd
-%{_mandir}/man1/couriert*
-%{_mandir}/man8/couriert*
-%{_mandir}/man8/mk*
+%attr(755,root,root) %{_sbindir}/mkdhparams
+%attr(755,root,root) %{_libexecdir}/courier-imap/couriertcpd
+%{_mandir}/man1/couriertcpd.1*
+%{_mandir}/man1/couriertls.1*
+%{_mandir}/man8/mkdhparams.8*
 
 %files deliverquota
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/deliverquota
-%{_mandir}/man8/deliverquota*
+%{_mandir}/man8/deliverquota.8*
 
 %files maildirmake
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/maildirmake
-%{_mandir}/man1/maildirmake*
+%{_mandir}/man1/maildirmake.1*
 
 %files pop3
 %defattr(644,root,root,755)
@@ -405,6 +418,7 @@ fi
 %attr(755,root,root) %{_bindir}/pop3d
 %attr(755,root,root) %{_sbindir}/mkpop3dcert
 %attr(755,root,root) %{_sbindir}/pop3login
-%attr(755,root,root) %{_libexecdir}/pop3d.rc
-%attr(755,root,root) %{_libexecdir}/pop3d-ssl.rc
-%{_mandir}/man8/courierpop*
+%attr(755,root,root) %{_libexecdir}/courier-imap/pop3d.rc
+%attr(755,root,root) %{_libexecdir}/courier-imap/pop3d-ssl.rc
+%{_mandir}/man8/courierpop3d.8*
+%{_mandir}/man8/mkpop3dcert.8*