pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail
Module Name: pkgsrc
Committed By: adam
Date: Sat Mar 18 07:08:23 UTC 2017
Modified Files:
pkgsrc/mail/exim: Makefile distinfo
pkgsrc/mail/exim-html: Makefile PLIST distinfo
Added Files:
pkgsrc/mail/exim/patches: patch-Local_Makefile.pkgsrc
patch-OS_Makefile-Default patch-scripts_exim__install
Removed Files:
pkgsrc/mail/exim/patches: patch-aa patch-ab patch-ae
Log Message:
Version 4.89
------------
1. Allow relative config file names for ".include"
2. A main-section config option "debug_store" to control the checks on
variable locations during store-reset. Normally false but can be enabled
when a memory corrution issue is suspected on a production system.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/exim-html/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/exim-html/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/exim-html/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc \
pkgsrc/mail/exim/patches/patch-OS_Makefile-Default \
pkgsrc/mail/exim/patches/patch-scripts_exim__install
cvs rdiff -u -r1.24 -r0 pkgsrc/mail/exim/patches/patch-aa
cvs rdiff -u -r1.16 -r0 pkgsrc/mail/exim/patches/patch-ab
cvs rdiff -u -r1.13 -r0 pkgsrc/mail/exim/patches/patch-ae
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.152 pkgsrc/mail/exim/Makefile:1.153
--- pkgsrc/mail/exim/Makefile:1.152 Thu Jan 19 18:52:15 2017
+++ pkgsrc/mail/exim/Makefile Sat Mar 18 07:08:23 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2017/01/19 18:52:15 agc Exp $
+# $NetBSD: Makefile,v 1.153 2017/03/18 07:08:23 adam Exp $
-DISTNAME= exim-4.88
+DISTNAME= exim-4.89
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
MASTER_SITES+= http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
@@ -114,7 +114,7 @@ post-build:
${FILESDIR}/mailer.conf.exim \
> ${WRKDIR}/mailer.conf
-INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
+INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/exim share/doc/exim
post-install:
${INSTALL_DATA} ${WRKDIR}/mailer.conf ${DESTDIR}${EXAMPLESDIR}
Index: pkgsrc/mail/exim/distinfo
diff -u pkgsrc/mail/exim/distinfo:1.66 pkgsrc/mail/exim/distinfo:1.67
--- pkgsrc/mail/exim/distinfo:1.66 Sun Dec 25 11:29:54 2016
+++ pkgsrc/mail/exim/distinfo Sat Mar 18 07:08:23 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.66 2016/12/25 11:29:54 wiedi Exp $
+$NetBSD: distinfo,v 1.67 2017/03/18 07:08:23 adam Exp $
-SHA1 (exim-4.88.tar.bz2) = f77cd027284ebf5bdf5fb7a7bd2755238722bfde
-RMD160 (exim-4.88.tar.bz2) = cbcacf3f8f45975c68a450f2fa595b802c76b345
-SHA512 (exim-4.88.tar.bz2) = ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf
-Size (exim-4.88.tar.bz2) = 1824610 bytes
-SHA1 (patch-aa) = 4df21c2497e9fee8dfbcd4386bb1b70d69ca2932
-SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
-SHA1 (patch-ae) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
+SHA1 (exim-4.89.tar.bz2) = 6e4c042d55c57152d56dfa9745abd9e9665a85f5
+RMD160 (exim-4.89.tar.bz2) = db87de7a5bef115efe062153a8a14e10b4ee884b
+SHA512 (exim-4.89.tar.bz2) = 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+Size (exim-4.89.tar.bz2) = 1844430 bytes
+SHA1 (patch-Local_Makefile.pkgsrc) = de19076443c4d89a7ead97a0cabdec9bb784dd9f
+SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
+SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
Index: pkgsrc/mail/exim-html/Makefile
diff -u pkgsrc/mail/exim-html/Makefile:1.34 pkgsrc/mail/exim-html/Makefile:1.35
--- pkgsrc/mail/exim-html/Makefile:1.34 Thu Jan 19 18:52:15 2017
+++ pkgsrc/mail/exim-html/Makefile Sat Mar 18 07:08:23 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:15 agc Exp $
+# $NetBSD: Makefile,v 1.35 2017/03/18 07:08:23 adam Exp $
-DISTNAME= exim-html-4.87
+DISTNAME= exim-html-4.89
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/
MASTER_SITES+= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/
Index: pkgsrc/mail/exim-html/PLIST
diff -u pkgsrc/mail/exim-html/PLIST:1.15 pkgsrc/mail/exim-html/PLIST:1.16
--- pkgsrc/mail/exim-html/PLIST:1.15 Sat Apr 9 10:49:39 2016
+++ pkgsrc/mail/exim-html/PLIST Sat Mar 18 07:08:23 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/04/09 10:49:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/03/18 07:08:23 adam Exp $
share/doc/exim/html/spec_html/ch-access_control_lists.html
share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -140,6 +140,7 @@ share/doc/exim/html/spec_html/index_toc.
share/doc/exim/html/static/css/common.css
share/doc/exim/html/static/css/index.css
share/doc/exim/html/static/doc/CVE-2016-1531.txt
+share/doc/exim/html/static/doc/CVE-2016-9963.txt
share/doc/exim/html/static/doc/chapter.css
share/doc/exim/html/static/doc/chapter.js
share/doc/exim/html/static/doc/contents.png
Index: pkgsrc/mail/exim-html/distinfo
diff -u pkgsrc/mail/exim-html/distinfo:1.27 pkgsrc/mail/exim-html/distinfo:1.28
--- pkgsrc/mail/exim-html/distinfo:1.27 Sat Apr 9 10:49:39 2016
+++ pkgsrc/mail/exim-html/distinfo Sat Mar 18 07:08:23 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2016/04/09 10:49:39 adam Exp $
+$NetBSD: distinfo,v 1.28 2017/03/18 07:08:23 adam Exp $
-SHA1 (exim-html-4.87.tar.bz2) = 30ef36561866be1f9a1edd193739585cf4deea1b
-RMD160 (exim-html-4.87.tar.bz2) = 1015c6a19a72eeae724efb5490698ad0e7dc3fe4
-SHA512 (exim-html-4.87.tar.bz2) = 224884abfd7ab9a2410dbdd24bb65545faf427f1b83a942c6c72309e7d85771f78bf7dc5ec1439de95e1038959cdfc4ab549abb98852c8b17c8310b51ad0385c
-Size (exim-html-4.87.tar.bz2) = 478953 bytes
+SHA1 (exim-html-4.89.tar.bz2) = 3a3979fba7df3697cec10d3dee846b18384e5de7
+RMD160 (exim-html-4.89.tar.bz2) = de3d3b70f4a653880e8b2d6fe4c407cf37a7eb14
+SHA512 (exim-html-4.89.tar.bz2) = 083678e5dc5acc23cd7f72b6b3e2e6d4e60bab8af25b21e2e6c8f4c1f07e070f9fabc9c8a337784e6d7436cc4aa8d7674700c61030b0c23e4b9c7d3c909e5db0
+Size (exim-html-4.89.tar.bz2) = 480222 bytes
Added files:
Index: pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc
diff -u /dev/null pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc:1.1
--- /dev/null Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc Sat Mar 18 07:08:23 2017
@@ -0,0 +1,128 @@
+$NetBSD: patch-Local_Makefile.pkgsrc,v 1.1 2017/03/18 07:08:23 adam Exp $
+
+--- Local/Makefile.pkgsrc.orig 2017-03-18 06:47:43.000000000 +0000
++++ Local/Makefile.pkgsrc
+@@ -98,7 +98,7 @@
+ # /usr/local/sbin. The installation script will try to create this directory,
+ # and any superior directories, if they do not exist.
+
+-BIN_DIRECTORY=/usr/exim/bin
++BIN_DIRECTORY=@PREFIX@/sbin
+
+
+ #------------------------------------------------------------------------------
+@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
+ # don't exist. It will also install a default runtime configuration if this
+ # file does not exist.
+
+-CONFIGURE_FILE=/usr/exim/configure
++CONFIGURE_FILE=@PKG_SYSCONFDIR@/configure
+
+ # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
+ # In this case, Exim will use the first of them that exists when it is run.
+@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
+ # deliveries. (Local deliveries run as various non-root users, typically as the
+ # owner of a local mailbox.) Specifying these values as root is not supported.
+
+-EXIM_USER=
++EXIM_USER=ref:@EXIM_USER@
+
+ # If you specify EXIM_USER as a name, this is looked up at build time, and the
+ # uid number is built into the binary. However, you can specify that this
+@@ -152,7 +152,7 @@ EXIM_USER=
+ # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
+ # you want to use a group other than the default group for the given user.
+
+-# EXIM_GROUP=
++EXIM_GROUP=ref:@EXIM_GROUP@
+
+ # Many sites define a user called "exim", with an appropriate default group,
+ # and use
+@@ -173,7 +173,7 @@ EXIM_USER=
+
+ # Almost all installations choose this:
+
+-SPOOL_DIRECTORY=/var/spool/exim
++SPOOL_DIRECTORY=@VARBASE@/spool/exim
+
+
+
+@@ -380,7 +380,7 @@ PCRE_CONFIG=yes
+ # files are defaulted in the OS/Makefile-Default file, but can be overridden in
+ # local OS-specific make files.
+
+-EXIM_MONITOR=eximon.bin
++# EXIM_MONITOR=eximon.bin
+
+
+ #------------------------------------------------------------------------------
+@@ -622,7 +622,7 @@ FIXED_NEVER_USERS=root
+ # included in the Exim binary. You will then need to set up the run time
+ # configuration to make use of the mechanism(s) selected.
+
+-# AUTH_CRAM_MD5=yes
++AUTH_CRAM_MD5=yes
+ # AUTH_CYRUS_SASL=yes
+ # AUTH_DOVECOT=yes
+ # AUTH_GSASL=yes
+@@ -630,8 +630,8 @@ FIXED_NEVER_USERS=root
+ # AUTH_HEIMDAL_GSSAPI=yes
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
+ # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
+-# AUTH_PLAINTEXT=yes
+-# AUTH_SPA=yes
++AUTH_PLAINTEXT=yes
++AUTH_SPA=yes
+ # AUTH_TLS=yes
+
+ # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
+@@ -831,7 +831,7 @@ HEADERS_CHARSET="ISO-8859-1"
+ # %s. This will be replaced by one of the strings "main", "panic", or "reject"
+ # to form the final file names. Some installations may want something like this:
+
+-# LOG_FILE_PATH=/var/log/exim_%slog
++LOG_FILE_PATH=@VARBASE@/log/exim/%s
+
+ # which results in files with names /var/log/exim_mainlog, etc. The directory
+ # in which the log files are placed must exist; Exim does not try to create
+@@ -1119,13 +1119,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+ # haven't got Perl, Exim will still build and run; you just won't be able to
+ # use those utilities.
+
+-# CHOWN_COMMAND=/usr/bin/chown
+-# CHGRP_COMMAND=/usr/bin/chgrp
+-# CHMOD_COMMAND=/usr/bin/chmod
+-# MV_COMMAND=/bin/mv
+-# RM_COMMAND=/bin/rm
+-# TOUCH_COMMAND=/usr/bin/touch
+-# PERL_COMMAND=/usr/bin/perl
++CHOWN_COMMAND=@CHOWN@
++CHGRP_COMMAND=@CHGRP@
++CHMOD_COMMAND=@CHMOD@
++MV_COMMAND=@MV@
++RM_COMMAND=@RM@
++TOUCH_COMMAND=@TOUCH@
++PERL_COMMAND=@PERL5@
+
+
+ #------------------------------------------------------------------------------
+@@ -1327,7 +1327,7 @@ EXIM_TMPDIR="/tmp"
+ # (process id) to a file so that it can easily be identified. The path of the
+ # file can be specified here. Some installations may want something like this:
+
+-# PID_FILE_PATH=/var/lock/exim.pid
++PID_FILE_PATH=/var/run/exim.pid
+
+ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
+ # using the name "exim-daemon.pid".
+@@ -1399,3 +1399,10 @@ EXIM_TMPDIR="/tmp"
+ # ENABLE_DISABLE_FSYNC=yes
+
+ # End of EDITME for Exim 4.
++
++EXTRALIBS_EXIM=-liconv
++
++@EXIM_USE_DB_CONFIG@
++@EXIM_DBMLIB@
++INCLUDE=@EXIM_INCLUDE@
++LOOKUP_LIBS=@LOOKUP_LIBS@
Index: pkgsrc/mail/exim/patches/patch-OS_Makefile-Default
diff -u /dev/null pkgsrc/mail/exim/patches/patch-OS_Makefile-Default:1.1
--- /dev/null Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim/patches/patch-OS_Makefile-Default Sat Mar 18 07:08:23 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-OS_Makefile-Default,v 1.1 2017/03/18 07:08:23 adam Exp $
+
+--- OS/Makefile-Default.orig 2012-05-31 00:40:15.000000000 +0000
++++ OS/Makefile-Default
+@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
+
+ # CC contains the name of the C compiler to be used.
+
+-CC=gcc
++# CC=gcc
+
+
+ # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
+@@ -84,7 +84,7 @@ CC=gcc
+ # here; instead each OS-dependent Makefile contains a default setting if one
+ # is needed.
+
+-# LFLAGS=
++LFLAGS=$(LDFLAGS)
+
+
+ # PCRE_LIBS contains the library to be linked for PCRE
Index: pkgsrc/mail/exim/patches/patch-scripts_exim__install
diff -u /dev/null pkgsrc/mail/exim/patches/patch-scripts_exim__install:1.1
--- /dev/null Sat Mar 18 07:08:23 2017
+++ pkgsrc/mail/exim/patches/patch-scripts_exim__install Sat Mar 18 07:08:23 2017
@@ -0,0 +1,42 @@
+$NetBSD: patch-scripts_exim__install,v 1.1 2017/03/18 07:08:23 adam Exp $
+
+--- scripts/exim_install.orig 2016-12-18 14:02:28.000000000 +0000
++++ scripts/exim_install
+@@ -83,6 +83,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
+ SYSTEM_ALIASES_FILE=/etc/aliases
+ fi
+
++INST_CONFIGURE_FILE=${PREFIX}/share/examples/exim/configure
++
+ # Allow INST_xx to over-ride xx
+ case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
+ case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
+@@ -220,6 +222,9 @@ while [ $# -gt 0 ]; do
+ exim="./exim -bV -C /dev/null"
+ version=exim-`$exim 2>/dev/null | \
+ awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
++ # only for pkgsrc: ./exim cannot run during install to DESTDIR because
++ # EXIM_USER may not exist at this time, so we fake the version information
++ version=@PKGSRC_EXIM_VERSION@${EXE}
+
+ if [ "${version}" = "exim-${EXE}" ]; then
+ echo $com ""
+@@ -416,16 +421,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+ echo $com "*** Exim installation ${ver}failed ***"
+ exit 1
+ fi
+- if [ ! -f ${SYSTEM_ALIASES_FILE} ]; then
+- echo $com '****'
+- echo $com Installing a dummy ${SYSTEM_ALIASES_FILE} file because you do not have
+- echo $com one, and the default configuration requires it. You should
+- echo $com edit ${SYSTEM_ALIASES_FILE} and at least create an alias for postmaster.
+- echo $com '***'
+- echo ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
+- ${real} ${CP} ../src/aliases.default ${SYSTEM_ALIASES_FILE}
+- fi
+-
++ echo ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases
++ ${real} ${CP} ../src/aliases.default ${DESTDIR}${PREFIX}/share/examples/exim/aliases
+ else
+ echo $com Configuration file ${CONFIGURE_FILE} already exists
+ fi
Home |
Main Index |
Thread Index |
Old Index