[packages/courier] - updated to 1.1.8 - updated start_scripts,certs patches - removed obsolete ac patch
qboosh
qboosh at pld-linux.org
Mon May 23 18:28:23 CEST 2022
commit ed6810506ee742c6952c425b281f8954a1d43cf3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon May 23 18:29:16 2022 +0200
- updated to 1.1.8
- updated start_scripts,certs patches
- removed obsolete ac patch
ac.patch | 22 -----------------
courier-certs.patch | 57 ---------------------------------------------
courier-start_scripts.patch | 11 ++++-----
courier.spec | 23 +++++++++---------
4 files changed, 17 insertions(+), 96 deletions(-)
---
diff --git a/courier.spec b/courier.spec
index 221adfe..d7b1014 100644
--- a/courier.spec
+++ b/courier.spec
@@ -12,23 +12,22 @@
Summary: Courier mail server
Summary(pl.UTF-8): Serwer poczty Courier
Name: courier
-Version: 1.0.9
-Release: 4
+Version: 1.1.8
+Release: 1
License: GPL v3 with OpenSSL exception
Group: Networking/Daemons
-Source0: http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 3a716dd3eabadb991ffcc4ee9d06afa0
+Source0: https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+# Source0-md5: 13de4bf23524c64f270161d22e59a593
Patch1: %{name}-withoutfam.patch
Patch2: %{name}-maildir.patch
Patch3: %{name}-sendmail_dir.patch
Patch4: %{name}-start_scripts.patch
Patch5: %{name}-certs.patch
Patch6: %{name}-filterbindir.patch
-Patch7: ac.patch
URL: http://www.courier-mta.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
-BuildRequires: courier-authlib-devel >= 0.66
+BuildRequires: courier-authlib-devel >= 0.71
%{?with_socks:BuildRequires: courier-sox-devel}
BuildRequires: courier-unicode-devel >= 2.1
BuildRequires: db-devel
@@ -48,7 +47,7 @@ BuildRequires: openldap-devel >= 2.3.0
%{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
BuildRequires: openssl-tools >= 0.9.7d
BuildRequires: pam-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-8-devel
BuildRequires: perl-devel >= 5
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.268
@@ -57,7 +56,7 @@ BuildRequires: sysconftool
Requires(post,preun): /sbin/chkconfig
# even if using OpenSSL libraries, Courier uses certtool from GnuTLS
Requires: /usr/bin/certtool
-Requires: courier-authlib >= 0.66
+Requires: courier-authlib >= 0.71
Requires: courier-unicode >= 2.1
Requires: rc-scripts
Provides: smtpdaemon
@@ -306,7 +305,6 @@ wysyłać faksy wysyłając po prostu e-maila na numertelefonu at fax.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
cat >apache.conf <<EOF
Alias /webmail %{_imagedir}
@@ -328,7 +326,7 @@ find -type f -a -name configure.ac | while read FILE; do
sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am
fi
- %{__aclocal} -I m4
+ %{__aclocal} $(test ! -d m4 || echo -I m4)
%{__autoconf}
if grep -q AC_CONFIG_HEADER configure.ac; then
%{__autoheader}
@@ -373,7 +371,7 @@ install -d -p $RPM_BUILD_ROOT/etc/{cron.hourly,pam.d,rc.d/init.d} \
DESTDIR=$RPM_BUILD_ROOT
# fix pam problem
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.authpam
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/*.authpam
for X in imap esmtp pop3 webmail calendar
do
cat > $RPM_BUILD_ROOT/etc/pam.d/$X <<'EOF'
@@ -392,6 +390,9 @@ done
%{__mv} $RPM_BUILD_ROOT%{_libexecdir}/courier/webmail/webadmin \
$RPM_BUILD_ROOT%{_cgibindir}/webadmin
+# noinst program (as of 1.1.8)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/maildirwatch.1
+
# install a cron job to clean out webmail's cache
install libs/sqwebmail/cron.cmd $RPM_BUILD_ROOT/etc/cron.hourly/courier-webmail-cleancache
diff --git a/ac.patch b/ac.patch
deleted file mode 100644
index 1d2dad4..0000000
--- a/ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- courier-1.0.9/libs/pcp/configure.ac~ 2018-07-29 04:31:27.000000000 +0200
-+++ courier-1.0.9/libs/pcp/configure.ac 2019-12-05 22:20:54.236362325 +0100
-@@ -23,7 +23,7 @@
-
- CFLAGS="-I.. -I${srcdir}/.. -I$srcdir/../.. -I../.. $CFLAGS"
- ALL_LINGUAS=""
--AM_GNU_GETTEXT
-+AM_GNU_GETTEXT([external])
-
- AC_PATH_PROGS(COURIERAUTHCONFIG, courierauthconfig)
-
---- courier-1.0.9/libs/sqwebmail/configure.ac~ 2019-08-29 02:09:32.000000000 +0200
-+++ courier-1.0.9/libs/sqwebmail/configure.ac 2019-12-05 22:33:09.629079684 +0100
-@@ -252,8 +252,6 @@
- fi
- AC_DEFINE_UNQUOTED(USE_LIBCHARSET, 1,
- [ Set this to 1 to use libcharset library. ])
--else
-- AM_LANGINFO_CODESET
- fi
-
- dnl Other
diff --git a/courier-certs.patch b/courier-certs.patch
index ffdb8f6..883f541 100644
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -30,33 +30,6 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier/imapd-ssl.rc.in courier-1.0.9/c
if test "$TLS_CACHEFILE" != ""
then
rm -f "$TLS_CACHEFILE"
-diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/configure.ac courier-1.0.9/courier/module.esmtp/configure.ac
---- courier-1.0.9.org/courier/module.esmtp/configure.ac 2018-07-29 05:16:41.000000000 +0200
-+++ courier-1.0.9/courier/module.esmtp/configure.ac 2021-05-07 22:54:47.564469723 +0200
-@@ -288,6 +288,11 @@ mydatadir="$datadir"
- AC_SUBST(mydatadir) # Quell automake warning
-
-
-+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ],
-+certsdir="$withval", certsdir=$datadir)
-+
-+AC_SUBST(certsdir)
-+
- dnl
- dnl Check what libraries are available
- dnl
-diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.dist.in courier-1.0.9/courier/module.esmtp/esmtpd-ssl.dist.in
---- courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.dist.in 2018-11-10 01:50:19.000000000 +0100
-+++ courier-1.0.9/courier/module.esmtp/esmtpd-ssl.dist.in 2021-05-07 22:54:47.567803074 +0200
-@@ -236,7 +236,7 @@ COURIERTLS=@bindir@/couriertls
- # In all cases, $TLS_CERTFILE needs to be linked to one of the existing
- # certificate files.
-
--TLS_CERTFILE=@mydatadir@/esmtpd.pem
-+TLS_CERTFILE=@certsdir@/esmtpd.pem
-
- ##NAME: TLS_PRIVATE_KEYFILE:0
- #
diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.in courier-1.0.9/courier/module.esmtp/esmtpd-ssl.in
--- courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.in 2021-05-07 22:54:46.201129431 +0200
+++ courier-1.0.9/courier/module.esmtp/esmtpd-ssl.in 2021-05-07 22:54:47.567803074 +0200
@@ -71,30 +44,9 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/esmtpd-ssl.in cour
;;
stop)
${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
-diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/esmtpd.dist.in courier-1.0.9/courier/module.esmtp/esmtpd.dist.in
---- courier-1.0.9.org/courier/module.esmtp/esmtpd.dist.in 2018-11-10 01:50:19.000000000 +0100
-+++ courier-1.0.9/courier/module.esmtp/esmtpd.dist.in 2021-05-07 22:54:47.564469723 +0200
-@@ -211,7 +211,7 @@ COURIERTLS=@bindir@/couriertls
- # In all cases, $TLS_CERTFILE needs to be linked to one of the existing
- # certificate files.
-
--TLS_CERTFILE=@mydatadir@/esmtpd.pem
-+TLS_CERTFILE=@certsdir@/esmtpd.pem
-
- ##NAME: TLS_DHPARAMS:0
- #
diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/mkesmtpdcert.in courier-1.0.9/courier/module.esmtp/mkesmtpdcert.in
--- courier-1.0.9.org/courier/module.esmtp/mkesmtpdcert.in 2017-01-28 04:06:06.000000000 +0100
+++ courier-1.0.9/courier/module.esmtp/mkesmtpdcert.in 2021-05-07 22:54:47.567803074 +0200
-@@ -11,7 +11,7 @@
- PEMFILE="$1"
-
- if [ -z "$PEMFILE" ]; then
-- PEMFILE=@mydatadir@/esmtpd.pem
-+ PEMFILE=@certsdir@/esmtpd.pem
- fi
-
- if test "@ssllib@" = "openssl"
@@ -35,7 +35,7 @@ cleanup() {
exit 1
}
@@ -104,15 +56,6 @@ diff -urNp -x '*.orig' courier-1.0.9.org/courier/module.esmtp/mkesmtpdcert.in co
umask 077
BITS="$BITS"
set -e
-@@ -50,7 +50,7 @@ then
- -config @sysconfdir@/esmtpd.cnf -out "$PEMFILE" -keyout "$PEMFILE" || cleanup
- @OPENSSL@ dhparam -2 -rand "$PEMFILE".rand 512 >>"$PEMFILE" || cleanup
- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in "$PEMFILE" || cleanup
-- rm -f @mydatadir@/esmtpd.rand
-+ rm -f @certsdir@/esmtpd.rand
- else
- if test "$BITS" = ""
- then
diff -urNp -x '*.orig' courier-1.0.9.org/courier/pop3d-ssl.in courier-1.0.9/courier/pop3d-ssl.in
--- courier-1.0.9.org/courier/pop3d-ssl.in 2021-05-07 22:54:46.201129431 +0200
+++ courier-1.0.9/courier/pop3d-ssl.in 2021-05-07 22:54:47.567803074 +0200
diff --git a/courier-start_scripts.patch b/courier-start_scripts.patch
index 2194671..b6ca0ef 100644
--- a/courier-start_scripts.patch
+++ b/courier-start_scripts.patch
@@ -9,17 +9,16 @@ diff -urN courier-0.64.2.orig//courier/imapd.rc.in courier-0.64.2/courier/imapd.
;;
restart)
@courierlogger@ -pid=$PIDFILE -restart
-diff -urN courier-0.64.2.orig//courier/imapd-ssl.rc.in courier-0.64.2/courier/imapd-ssl.rc.in
---- courier-0.64.2.orig//courier/imapd-ssl.rc.in 2005-07-03 00:53:19.000000000 +0200
-+++ courier-0.64.2/courier/imapd-ssl.rc.in 2010-05-08 23:30:04.685962634 +0200
-@@ -49,6 +49,7 @@
+--- courier-1.1.8.orig//courier/imapd-ssl.rc.in 2005-07-03 00:53:19.000000000 +0200
++++ courier-1.1.8/courier/imapd-ssl.rc.in 2010-05-08 23:30:04.685962634 +0200
+@@ -73,6 +73,7 @@ start)
;;
stop)
@courierlogger@ -pid=$SSLPIDFILE -stop
+ rm -f $SSLPIDFILE
;;
- esac
- exit 0
+ restart)
+ @courierlogger@ -pid=$SSLPIDFILE -restart
diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.in courier-0.64.2/courier/module.esmtp/esmtpd.in
--- courier-0.64.2.orig//courier/module.esmtp/esmtpd.in 2009-07-30 04:29:54.000000000 +0200
+++ courier-0.64.2/courier/module.esmtp/esmtpd.in 2010-05-08 23:30:04.695962596 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/courier.git/commitdiff/ed6810506ee742c6952c425b281f8954a1d43cf3
More information about the pld-cvs-commit
mailing list