cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 3.16; submitted by seb@gosh.todesplanet.de

Browse Source 
- move config file handling to (DE)INSTALL; requested by brad@
- switch maintainer; offered by Peter
This commit is contained in:
naddy 2000-08-12 23:57:45 +00:00
parent da9686bef0
commit de4154f558
11 changed files with 232 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mail/exim/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.14 2000/08/02 15:44:11 naddy Exp $
# $OpenBSD: Makefile,v 1.15 2000/08/12 23:57:45 naddy Exp $
DISTNAME= exim-3.14
DISTNAME= exim-3.16
CATEGORIES= mail
NEED_VERSION= 1.319
HOMEPAGE= http://www.exim.org/
MAINTAINER= peter.galbavy@knowledge.com
MAINTAINER= seb@gosh.todesplanet.de
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -16,14 +16,16 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
ftp://ftp.exim.org/pub/exim/ \
ftp://ftp.fu-berlin.de/unix/mail/exim/
DISTFILES= exim-3.14.tar.gz exim-texinfo-3.10.tar.gz
DISTFILES= exim-3.16.tar.gz exim-texinfo-3.10.tar.gz
FLAVORS= no_x11
FLAVOR?=
MAKE_ENV= FLAVOR="${FLAVOR}"
SUBST_VARS= SYSCONFDIR
.if !${FLAVOR:L:Mno_x11}
USE_X11= Yes
.endif
MAKE_ENV= FLAVOR="${FLAVOR}"
do-configure:
@mkdir -p ${WRKSRC}/Local
@ -35,11 +37,10 @@ do-configure:
done
pre-install:
${INSTALL} -d ${DESTDIR}/etc/exim
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
${INSTALL_DATA} ${WRKSRC}/src/configure.default \
${PREFIX}/share/examples/exim/configure.sample
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/exim
${INSTALL_DATA} ${WRKSRC}/doc/spec.txt ${PREFIX}/share/doc/exim/spec.txt
.include <bsd.port.mk>

6
mail/exim/files/md5
View File

@ -1,6 +1,6 @@
MD5 (exim-3.14.tar.gz) = 271b4b7f5a2e6c292d0c69f1d44dc013
MD5 (exim-3.16.tar.gz) = 9d943d05c4cf22da32f3bddf97c7e8bf
MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
RMD160 (exim-3.14.tar.gz) = 9b38689a4f5bbaa8fd7b5ee64fa298d7f86652df
RMD160 (exim-3.16.tar.gz) = 92b892084837f5a4ad3762b1c769d5c5f0713b8c
RMD160 (exim-texinfo-3.10.tar.gz) = b2cab8092eb776a1551f418e6af94a9ccc8f2023
SHA1 (exim-3.14.tar.gz) = bdf1bc27fa9a5d2ec09eb5148ee1024f58e01dfe
SHA1 (exim-3.16.tar.gz) = ed5802d1b20d0707a78cfa21ef1e6421651e7391
SHA1 (exim-texinfo-3.10.tar.gz) = 2c89fb3073dd079c19682d33a56a46c9fd863978

12
mail/exim/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1 2000/06/04 22:42:06 espie Exp $
--- Makefile.orig Wed Apr 12 11:44:50 2000
+++ Makefile Mon Jun 5 00:34:11 2000
$OpenBSD: patch-Makefile,v 1.2 2000/08/12 23:57:45 naddy Exp $
--- Makefile.orig Thu Jul 20 13:08:44 2000
+++ Makefile Wed Aug 9 02:11:09 2000
@@ -65,7 +65,12 @@ go:; @cd build-$(buildname); $(MAKE) SHE
# The installation commands are kept in a separate script, which expects
# to be run from inside the build directory.
@ -8,9 +8,9 @@ $OpenBSD: patch-Makefile,v 1.1 2000/06/04 22:42:06 espie Exp $
-install:; @cd build-$(buildname); $(SHELL) ../scripts/exim_install
+install:
+ @cd build-$(buildname); \
+ INST_BIN_DIRECTORY=$(DESTDIR)/usr/local/sbin \
+ INST_INFO_DIRECTORY=${DESTDIR}/usr/local/info \
+ INST_CONFIGURE_FILE=${DESTDIR}/etc/exim/configure \
+ INST_BIN_DIRECTORY=$(PREFIX)/sbin \
+ INST_INFO_DIRECTORY=$(PREFIX)/info \
+ INST_CONFIGURE_FILE=$(PREFIX)/share/examples/exim/configure \
+ $(SHELL) ../scripts/exim_install
# Tidy-up targets

8
mail/exim/patches/patch-OS_Makefile-Default
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-OS_Makefile-Default,v 1.1 2000/08/02 15:44:12 naddy Exp $
--- OS/Makefile-Default.orig Thu Jul 27 14:37:08 2000
+++ OS/Makefile-Default Thu Jul 27 14:37:22 2000
@@ -53,7 +53,7 @@
$OpenBSD: patch-OS_Makefile-Default,v 1.2 2000/08/12 23:57:45 naddy Exp $
--- OS/Makefile-Default.orig Wed Apr 12 11:44:50 2000
+++ OS/Makefile-Default Tue Aug 8 17:48:01 2000
@@ -53,7 +53,7 @@ PERL_COMMAND=/usr/bin/perl
# CC contains the name of the C compiler to be used.

10
mail/exim/patches/patch-OS_Makefile-OpenBSD
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-OS_Makefile-OpenBSD,v 1.1 2000/08/02 15:44:12 naddy Exp $
--- OS/Makefile-OpenBSD.orig Thu Jul 27 14:38:00 2000
+++ OS/Makefile-OpenBSD Thu Jul 27 14:38:12 2000
@@ -1,7 +1,6 @@
# Exim: OS-specific make file for OpenBSD
$OpenBSD: patch-OS_Makefile-OpenBSD,v 1.2 2000/08/12 23:57:45 naddy Exp $
--- OS/Makefile-OpenBSD.orig Thu Jul 20 13:08:45 2000
+++ OS/Makefile-OpenBSD Wed Aug 9 02:11:09 2000
@@ -2,7 +2,6 @@
CHOWN_COMMAND=/usr/sbin/chown
CHGRP_COMMAND=/usr/sbin/chgrp
-CFLAGS=-O
HAVE_SA_LEN=YES

42
mail/exim/patches/patch-configure_default Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-configure_default,v 1.1 2000/08/12 23:57:45 naddy Exp $
--- src/configure.default.orig Thu Jul 20 13:08:47 2000
+++ src/configure.default Wed Aug 9 15:51:33 2000
@@ -23,6 +23,15 @@
# MAIN CONFIGURATION SETTINGS #
######################################################################
+
+# Uncomment these if you want exim to run under a non-root UID/GID.
+# Also remember to uncomment the "user = exim" line in the system
+# aliases director.
+
+#exim_user = "exim"
+#exim_group = "mail"
+
+
# Specify your host's canonical name here. This should normally be the fully
# qualified "official" name of your host. If this option is not set, the
# uname() function is called to obtain the name.
@@ -204,8 +213,7 @@ local_delivery:
delivery_date_add
envelope_to_add
return_path_add
-# group = mail
-# mode = 0660
+ mode = 0600
# This transport is used for handling pipe deliveries generated by alias
@@ -266,9 +274,10 @@ end
system_aliases:
driver = aliasfile
- file = /etc/aliases
+ file = /etc/mail/aliases
search_type = lsearch
-# user = exim
+ user = daemon
+ group = guest
file_transport = address_file
pipe_transport = address_pipe

8
mail/exim/patches/patch-src_transports_appendfile_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_transports_appendfile_c,v 1.1 2000/08/02 15:44:12 naddy Exp $
--- src/transports/appendfile.c.orig Wed Apr 12 11:44:59 2000
+++ src/transports/appendfile.c Mon Jun 5 00:14:52 2000
@@ -2330,9 +2330,16 @@ opened, so that it goes away on closure.
$OpenBSD: patch-src_transports_appendfile_c,v 1.2 2000/08/12 23:57:45 naddy Exp $
--- src/transports/appendfile.c.orig Thu Jul 20 13:08:51 2000
+++ src/transports/appendfile.c Wed Aug 9 02:11:10 2000
@@ -2343,9 +2343,16 @@ opened, so that it goes away on closure.
#ifdef SUPPORT_MBX
if (yield == OK && ob->mbx_format)
{

49
mail/exim/pkg/DEINSTALL Normal file
View File

@ -0,0 +1,49 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1 2000/08/12 23:57:46 naddy Exp $
#
# De-installation setup of exim
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/exim
# Function: tell the user what they need to do to delete the port completely
#
do_notice()
{
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you need to perform"
echo "| these steps as root:"
echo "|"
echo "| rm -rf ${CONFIG_DIR}"
echo "|"
echo "| Do not do this if you plan on re-installing $1"
echo "| at some future time."
echo "+---------------"
echo
}
# Verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname DEINSTALL" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
DEINSTALL)
do_notice "$1"
;;
*)
echo "usage: $0 distname DEINSTALL" >&2
exit 1
;;
esac
exit 0

96
mail/exim/pkg/INSTALL Normal file
View File

@ -0,0 +1,96 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2000/08/12 23:57:46 naddy Exp $
#
# Pre/post-installation setup of exim
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/exim
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/exim
# Function: tell the user what they need to do to use the port just installed
#
do_notice()
{
echo
echo "+---------------"
echo "| It is strongly advised that you configure exim to use"
echo "| a UID and GID other that 0/0. You can do this by adding"
echo "| lines to the configure file like this:"
echo "| "
echo "| exim_user = \"exim\""
echo "| exim_group = \"mail\""
echo "| "
echo "| but you must remember to allow that user write"
echo "| permissions to /var/spool/exim."
echo "| "
echo "| If you want to do local deliveries as another user"
echo "| (e.g. if you allow users to put procmail into their"
echo "| .forward file) make the exim binary setuid root."
echo "| "
echo "| If you intend replacing sendmail with exim, then don't"
echo "| forget to modify /etc/mailer.conf accordingly; see"
echo "| mailwrapper(8)."
}
# Function: install configuration files
#
do_install_conf()
{
install -d -o root -g wheel ${CONFIG_DIR}
install -o root -g wheel ${SAMPLE_CONFIG_DIR}/configure \
${CONFIG_DIR}/configure
echo "| "
echo "| The $1 configuration files have been installed in ${CONFIG_DIR}."
echo "| Please view these files and change the configuration to meet"
echo "| your needs."
echo "+---------------"
echo
}
# Function: tell the user what they need to do to use the port just installed
#
do_notice_conf()
{
echo "| "
echo "| The existing $1 configuration files in ${CONFIG_DIR} have NOT"
echo "| been changed. You may want to compare them to the current samples"
echo "| in ${SAMPLE_CONFIG_DIR}, and update your configuration files"
echo "| as needed."
echo "+---------------"
echo
}
# Verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port
;;
POST-INSTALL)
do_notice "$1"
if [ ! -d ${CONFIG_DIR} ]; then
do_install_conf "$1"
elif [ ! -f ${CONFIG_DIR}/configure ]; then
do_install_conf "$1"
else
do_notice_conf "$1"
fi
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

16
mail/exim/pkg/MESSAGE
View File

@ -1,16 +0,0 @@
EXIM is installed. You must now edit /etc/exim/configure
and set the correct values for your system.
It is strongly advised that you configure exim to use
a UID and GID other that 0/0. You can do this by adding
lines to the configure file like this:
\texim_user = "nobody"
\texim_group = "nogroup"
but you must remember to allow that user write
permissions to /var/log/exim and /var/spool/exim
If you intend replacing sendmail with exim, then don't
forget to modify /etc/mail/mailer.conf accordingly.

27
mail/exim/pkg/PLIST
View File

@ -1,4 +1,13 @@
@comment $OpenBSD: PLIST,v 1.6 2000/08/02 15:44:12 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2000/08/12 23:57:46 naddy Exp $
info/exim.info
info/exim_filter.info
info/exim_overview.info
@exec install-info --section="Exim" --entry "* Overview: (exim_overview). Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
@exec install-info --section="Exim" --entry "* User guide: (exim). Exim manual" %D/info/exim.info %D/info/dir
@exec install-info --section="Exim" --entry "* Filtering: (exim_filter). Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
@unexec install-info --delete %D/info/exim.info %D/info/dir
@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
sbin/exim
!%%no_x11%%
sbin/exim_dumpdb
@ -12,17 +21,7 @@ sbin/exigrep
sbin/eximstats
sbin/exiqsumm
sbin/exim_lock
info/exim_overview.info
info/exim.info
info/exim_filter.info
@exec install-info --section="Exim" --entry "* Overview: (exim_overview). Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
@exec install-info --section="Exim" --entry "* User guide: (exim). Exim manual" %D/info/exim.info %D/info/dir
@exec install-info --section="Exim" --entry "* Filtering: (exim_filter). Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
@unexec install-info --delete %D/info/exim.info %D/info/dir
@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
share/examples/exim/configure.sample
@exec [ -d /etc/exim ] || mkdir /etc/exim
@exec [ -f /etc/exim/configure ] || install -m 644 %D/%F /etc/exim/configure
share/doc/exim/spec.txt
@dirrm share/doc/exim
share/examples/exim/configure
@dirrm share/examples/exim
@unexec echo "Please remove the /etc/exim directory manually"